Author: [log in to unmask]
Date: Thu Apr 2 18:23:51 2015
New Revision: 2662
Log:
Revert some unwanted changes from last commit to conditions module.
Modified:
java/trunk/conditions/src/main/java/org/hps/conditions/api/BaseConditionsObjectCollection.java
java/trunk/conditions/src/main/java/org/hps/conditions/api/ConditionsObjectCollection.java
java/trunk/conditions/src/main/java/org/hps/conditions/database/AbstractConditionsObjectConverter.java
java/trunk/conditions/src/main/java/org/hps/conditions/database/ConnectionParameters.java
java/trunk/conditions/src/main/java/org/hps/conditions/database/DatabaseConditionsManager.java
java/trunk/conditions/src/main/java/org/hps/conditions/svt/SvtConditionsLoader.java
java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/EcalCalibrationsDriver.java
java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/EcalPedestalCalculator.java
java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/EcalLedSequenceMonitor.java
Modified: java/trunk/conditions/src/main/java/org/hps/conditions/api/BaseConditionsObjectCollection.java
=============================================================================
--- java/trunk/conditions/src/main/java/org/hps/conditions/api/BaseConditionsObjectCollection.java (original)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/api/BaseConditionsObjectCollection.java Thu Apr 2 18:23:51 2015
@@ -30,7 +30,7 @@
/**
* The collection ID which is -1 if the collection is not in the database.
*/
- private int collectionID = -1;
+ private int collectionId = -1;
/**
* The associated conditions record information including run validity.
@@ -54,7 +54,7 @@
public BaseConditionsObjectCollection(final ConditionsRecord conditionsRecord, final TableMetaData tableMetaData) {
this.conditionsRecord = conditionsRecord;
this.tableMetaData = tableMetaData;
- this.collectionID = conditionsRecord.getCollectionId();
+ this.collectionId = conditionsRecord.getCollectionId();
}
/**
@@ -68,7 +68,7 @@
final int collectionID) {
this.conditionsRecord = conditionsRecord;
this.tableMetaData = tableMetaData;
- this.collectionID = collectionID;
+ this.collectionId = collectionID;
}
/**
@@ -136,7 +136,7 @@
if (conditionsRecord != null) {
return conditionsRecord.getCollectionId();
} else {
- return collectionID;
+ return collectionId;
}
}
@@ -155,18 +155,18 @@
/**
* Set the collection ID. Once set it cannot be assigned again.
* <p>
- * Implements {@link ConditionsObjectCollection#setCollectionID(int)}.
+ * Implements {@link ConditionsObjectCollection#setCollectionId(int)}.
*
* @param collectionId The new collection ID.
* @throws ConditionsObjectException If the ID was already assigned.
*/
@Override
- public final void setCollectionID(final int collectionId) throws ConditionsObjectException {
- if (this.collectionID != -1) {
+ public final void setCollectionId(final int collectionId) throws ConditionsObjectException {
+ if (this.collectionId != -1) {
throw new ConditionsObjectException("The collectionId already has the value " + collectionId
+ " and cannot be reset.");
}
- this.collectionID = collectionId;
+ this.collectionId = collectionId;
}
/**
@@ -191,7 +191,7 @@
*/
@Override
public final int select() {
- throw new UnsupportedOperationException("The select operation is not implemented yet.");
+ return 0;
}
/**
@@ -203,7 +203,7 @@
*/
@Override
public int delete() {
- throw new UnsupportedOperationException("The delete operation is not implemented yet.");
+ return 0;
}
/**
@@ -215,7 +215,7 @@
*/
@Override
public final int update() {
- throw new UnsupportedOperationException("The update operation is not implemented yet.");
+ return 0;
}
/**
Modified: java/trunk/conditions/src/main/java/org/hps/conditions/api/ConditionsObjectCollection.java
=============================================================================
--- java/trunk/conditions/src/main/java/org/hps/conditions/api/ConditionsObjectCollection.java (original)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/api/ConditionsObjectCollection.java Thu Apr 2 18:23:51 2015
@@ -12,7 +12,6 @@
* @author <a href="mailto:[log in to unmask]">Jeremy McCormick</a>
* @param <ObjectType> The type of the conditions object contained in the collection.
*/
-// TODO: Rename to ConditionsObjectSet.
public interface ConditionsObjectCollection<ObjectType extends ConditionsObject> extends Set<ObjectType> {
/**
@@ -42,7 +41,7 @@
* @param collectionId The collection ID.
* @throws ConditionsObjectException If reassignment is attempted.
*/
- void setCollectionID(int collectionId) throws ConditionsObjectException;
+ void setCollectionId(int collectionId) throws ConditionsObjectException;
/**
* Insert all objects from the collection into the database.
Modified: java/trunk/conditions/src/main/java/org/hps/conditions/database/AbstractConditionsObjectConverter.java
=============================================================================
--- java/trunk/conditions/src/main/java/org/hps/conditions/database/AbstractConditionsObjectConverter.java (original)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/database/AbstractConditionsObjectConverter.java Thu Apr 2 18:23:51 2015
@@ -217,7 +217,7 @@
if (conditionsRecord != null) {
collection.setConditionsRecord(conditionsRecord);
collection.setTableMetaData(tableMetaData);
- collection.setCollectionID(conditionsRecord.getCollectionId());
+ collection.setCollectionId(conditionsRecord.getCollectionId());
}
} catch (InstantiationException | IllegalAccessException e) {
throw new ConditionsObjectException("Error creating conditions object collection.", e);
Modified: java/trunk/conditions/src/main/java/org/hps/conditions/database/ConnectionParameters.java
=============================================================================
--- java/trunk/conditions/src/main/java/org/hps/conditions/database/ConnectionParameters.java (original)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/database/ConnectionParameters.java Thu Apr 2 18:23:51 2015
@@ -60,7 +60,7 @@
* @param password The password.
* @param hostname The hostname.
* @param port The port number.
- * @param conditionsTable The table containing conditions validity data.
+ * @param database The database name.
*/
public ConnectionParameters(final String user, final String password, final String database, final String hostname,
final int port) {
@@ -130,17 +130,19 @@
/**
* Get the connection string for these parameters.
- *
+ * <p>
+ * This is public because the DQM database manager is using it.
+ *
* @return The connection string.
*/
- String getConnectionString() {
+ public String getConnectionString() {
return "jdbc:mysql://" + hostname + ":" + port + "/";
}
/**
* Create a database connection from these parameters. The caller becomes the "owner" and is responsible for closing
* it when finished.
- *
+ *
* @return The Connection object.
*/
public Connection createConnection() {
Modified: java/trunk/conditions/src/main/java/org/hps/conditions/database/DatabaseConditionsManager.java
=============================================================================
--- java/trunk/conditions/src/main/java/org/hps/conditions/database/DatabaseConditionsManager.java (original)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/database/DatabaseConditionsManager.java Thu Apr 2 18:23:51 2015
@@ -721,7 +721,7 @@
}
if (collection.getCollectionId() == -1) {
try {
- collection.setCollectionID(getNextCollectionID(tableMetaData.getTableName()));
+ collection.setCollectionId(getNextCollectionID(tableMetaData.getTableName()));
} catch (ConditionsObjectException e) {
throw new RuntimeException(e);
}
Modified: java/trunk/conditions/src/main/java/org/hps/conditions/svt/SvtConditionsLoader.java
=============================================================================
--- java/trunk/conditions/src/main/java/org/hps/conditions/svt/SvtConditionsLoader.java (original)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/svt/SvtConditionsLoader.java Thu Apr 2 18:23:51 2015
@@ -114,7 +114,7 @@
// Set the collection ID
int collectionID = DatabaseConditionsManager.getInstance().getNextCollectionID(SvtConditionsLoader.CALIBRATIONS_TABLE_NAME);
- calibrations.setCollectionID(collectionID);
+ calibrations.setCollectionId(collectionID);
logger.info("Using collection ID " + collectionID);
// Load the calibrations
@@ -155,7 +155,7 @@
// Set the collection ID
int collectionID = DatabaseConditionsManager.getInstance().getNextCollectionID(SvtConditionsLoader.DAQ_MAP_TABLE_NAME);
- daqMapping.setCollectionID(collectionID);
+ daqMapping.setCollectionId(collectionID);
logger.info("Using collection ID " + collectionID);
// Load the DAQ map
@@ -184,7 +184,7 @@
// Set the collection ID
collectionID = DatabaseConditionsManager.getInstance().getNextCollectionID(SvtConditionsLoader.SVT_CHANNELS_TABLE_NAME);
- svtChannels.setCollectionID(collectionID);
+ svtChannels.setCollectionId(collectionID);
logger.info("Using collection ID " + collectionID);
svtChannels.insert();
Modified: java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/EcalCalibrationsDriver.java
=============================================================================
--- java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/EcalCalibrationsDriver.java (original)
+++ java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/EcalCalibrationsDriver.java Thu Apr 2 18:23:51 2015
@@ -288,7 +288,7 @@
private void loadCalibrations(EcalCalibrationCollection calibrations) {
int collectionId = conditionsManager.getNextCollectionID(ECAL_CALIBRATIONS);
try {
- calibrations.setCollectionID(collectionId);
+ calibrations.setCollectionId(collectionId);
calibrations.insert();
ConditionsRecord conditionsRecord = new ConditionsRecord(
calibrations.getCollectionId(),
Modified: java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/EcalPedestalCalculator.java
=============================================================================
--- java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/EcalPedestalCalculator.java (original)
+++ java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/EcalPedestalCalculator.java Thu Apr 2 18:23:51 2015
@@ -163,7 +163,7 @@
int collectionId = conditionsManager.getNextCollectionID(dbTableName);
try {
- calibrations.setCollectionID(collectionId);
+ calibrations.setCollectionId(collectionId);
System.err.println("CollectionID: "+collectionId);
Modified: java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/EcalLedSequenceMonitor.java
=============================================================================
--- java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/EcalLedSequenceMonitor.java (original)
+++ java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/EcalLedSequenceMonitor.java Thu Apr 2 18:23:51 2015
@@ -680,7 +680,7 @@
int collectionId = conditionsManager.getNextCollectionID(dbTableName);
try {
- led_calibrations.setCollectionID(collectionId);
+ led_calibrations.setCollectionId(collectionId);
System.err.println("CollectionID: "+collectionId);
led_calibrations.insert();
ConditionsRecord conditionsRecord = new ConditionsRecord(
