Author: [log in to unmask]
Date: Wed Apr 22 14:08:45 2015
New Revision: 2788
Log:
Restore Iterable functionality to ConditionsObjectCollection.
Modified:
java/branches/conditions-HPSJAVA-488/src/main/java/org/hps/conditions/api/BaseConditionsObject.java
java/branches/conditions-HPSJAVA-488/src/main/java/org/hps/conditions/api/BaseConditionsObjectCollection.java
java/branches/conditions-HPSJAVA-488/src/main/java/org/hps/conditions/api/ConditionsObject.java
java/branches/conditions-HPSJAVA-488/src/main/java/org/hps/conditions/api/ConditionsObjectCollection.java
java/branches/conditions-HPSJAVA-488/src/main/java/org/hps/conditions/api/ConditionsRecord.java
java/branches/conditions-HPSJAVA-488/src/main/java/org/hps/conditions/cli/PrintCommand.java
java/branches/conditions-HPSJAVA-488/src/main/java/org/hps/conditions/cli/TagCommand.java
java/branches/conditions-HPSJAVA-488/src/main/java/org/hps/conditions/database/ConditionsSeriesConverter.java
java/branches/conditions-HPSJAVA-488/src/main/java/org/hps/conditions/database/DatabaseConditionsManager.java
java/branches/conditions-HPSJAVA-488/src/main/java/org/hps/conditions/ecal/EcalChannel.java
java/branches/conditions-HPSJAVA-488/src/main/java/org/hps/conditions/ecal/EcalConditions.java
java/branches/conditions-HPSJAVA-488/src/main/java/org/hps/conditions/ecal/EcalConditionsConverter.java
java/branches/conditions-HPSJAVA-488/src/main/java/org/hps/conditions/ecal/EcalCrystalChannelMap.java
java/branches/conditions-HPSJAVA-488/src/main/java/org/hps/conditions/svt/AbstractSvtChannel.java
java/branches/conditions-HPSJAVA-488/src/main/java/org/hps/conditions/svt/AbstractSvtConditionsConverter.java
java/branches/conditions-HPSJAVA-488/src/main/java/org/hps/conditions/svt/SvtChannel.java
java/branches/conditions-HPSJAVA-488/src/main/java/org/hps/conditions/svt/SvtConditions.java
java/branches/conditions-HPSJAVA-488/src/main/java/org/hps/conditions/svt/SvtDaqMapping.java
java/branches/conditions-HPSJAVA-488/src/main/java/org/hps/conditions/svt/SvtT0Shift.java
java/branches/conditions-HPSJAVA-488/src/main/java/org/hps/conditions/svt/TestRunSvtChannel.java
java/branches/conditions-HPSJAVA-488/src/main/java/org/hps/conditions/svt/TestRunSvtConditions.java
java/branches/conditions-HPSJAVA-488/src/main/java/org/hps/conditions/svt/TestRunSvtDaqMapping.java
java/branches/conditions-HPSJAVA-488/src/main/java/org/hps/conditions/svt/TestRunSvtT0Shift.java
java/branches/conditions-HPSJAVA-488/src/test/java/org/hps/conditions/EngRunConditionsTest.java
java/branches/conditions-HPSJAVA-488/src/test/java/org/hps/conditions/api/BaseConditionsObjectTest.java
java/branches/conditions-HPSJAVA-488/src/test/java/org/hps/conditions/beam/BeamConditionsTest.java
java/branches/conditions-HPSJAVA-488/src/test/java/org/hps/conditions/beam/BeamCurrentTest.java
java/branches/conditions-HPSJAVA-488/src/test/java/org/hps/conditions/ecal/EcalLedTest.java
java/branches/conditions-HPSJAVA-488/src/test/java/org/hps/conditions/svt/SvtConfigurationTest.java
java/branches/conditions-HPSJAVA-488/src/test/java/org/hps/conditions/svt/SvtDaqMappingTest.java
java/branches/conditions-HPSJAVA-488/src/test/java/org/hps/conditions/svt/TestRunSvtDaqMappingTest.java
Modified: java/branches/conditions-HPSJAVA-488/src/main/java/org/hps/conditions/api/BaseConditionsObject.java
=============================================================================
--- java/branches/conditions-HPSJAVA-488/src/main/java/org/hps/conditions/api/BaseConditionsObject.java (original)
+++ java/branches/conditions-HPSJAVA-488/src/main/java/org/hps/conditions/api/BaseConditionsObject.java Wed Apr 22 14:08:45 2015
@@ -33,7 +33,7 @@
protected static String defaultToString(final BaseConditionsObject object) {
final StringBuffer sb = new StringBuffer();
- sb.append("id: " + object.getId() + ", ");
+ sb.append("id: " + object.getRowId() + ", ");
for (final String field : object.getFieldValues().getFieldNames()) {
sb.append(field + "=" + object.getFieldValue(Object.class, field) + ", ");
}
@@ -129,7 +129,7 @@
if (isNew()) {
throw new ConditionsObjectException("Object is not in database and so cannot be deleted.");
}
- final String sql = "DELETE FROM " + this.tableMetaData.getTableName() + " WHERE id=" + this.getId();
+ final String sql = "DELETE FROM " + this.tableMetaData.getTableName() + " WHERE id=" + this.getRowId();
// if (this.verbose) {
// System.out.println(sql);
// }
@@ -162,7 +162,7 @@
}
@Override
- public final int getId() {
+ public final int getRowId() {
return this.id;
}
@@ -231,7 +231,7 @@
@Override
public final boolean isNew() {
- return getId() == UNSET_ID;
+ return getRowId() == UNSET_ID;
}
@Override
@@ -247,7 +247,7 @@
}
sb.setLength(sb.length() - 1);
sb.append(" FROM " + this.tableMetaData.getTableName());
- sb.append(" WHERE id = " + this.getId());
+ sb.append(" WHERE id = " + this.getRowId());
final String sql = sb.toString();
// if (this.verbose) {
// System.out.println(sql);
@@ -336,7 +336,7 @@
}
}
sb.setLength(sb.length() - 2);
- sb.append(" WHERE id=" + this.getId());
+ sb.append(" WHERE id=" + this.getRowId());
final String sql = sb.toString();
// if (this.verbose) {
// System.out.println(sql);
Modified: java/branches/conditions-HPSJAVA-488/src/main/java/org/hps/conditions/api/BaseConditionsObjectCollection.java
=============================================================================
--- java/branches/conditions-HPSJAVA-488/src/main/java/org/hps/conditions/api/BaseConditionsObjectCollection.java (original)
+++ java/branches/conditions-HPSJAVA-488/src/main/java/org/hps/conditions/api/BaseConditionsObjectCollection.java Wed Apr 22 14:08:45 2015
@@ -6,7 +6,6 @@
import java.sql.SQLException;
import java.sql.Statement;
import java.util.ArrayList;
-import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
import java.util.Iterator;
@@ -103,12 +102,6 @@
}
@Override
- public Collection<ObjectType> getObjects() {
- // return Collections.unmodifiableCollection(this.objects);
- return this.objects;
- }
-
- @Override
public TableMetaData getTableMetaData() {
return this.tableMetaData;
}
@@ -143,7 +136,7 @@
try {
this.connection.setAutoCommit(false);
insertObjects = this.connection.prepareStatement(updateStatement, Statement.RETURN_GENERATED_KEYS);
- for (final ObjectType object : this.getObjects()) {
+ for (final ObjectType object : this) {
object.setCollectionId(this.collectionId);
for (int fieldIndex = 0; fieldIndex < this.getTableMetaData().getFieldNames().length; fieldIndex++) {
final String fieldName = this.getTableMetaData().getFieldNames()[fieldIndex];
@@ -266,15 +259,15 @@
*/
@Override
public final void sort(final Comparator<ObjectType> comparator) {
- final List<ObjectType> list = new ArrayList<ObjectType>(this.getObjects());
+ final List<ObjectType> list = new ArrayList<ObjectType>(this.objects);
Collections.sort(list, comparator);
- this.getObjects().clear();
- this.getObjects().addAll(list);
+ this.objects.clear();
+ this.objects.addAll(list);
}
@Override
public ConditionsObjectCollection<ObjectType> sorted(final Comparator<ObjectType> comparator) {
- final List<ObjectType> list = new ArrayList<ObjectType>(this.getObjects());
+ final List<ObjectType> list = new ArrayList<ObjectType>(this.objects);
Collections.sort(list, comparator);
BaseConditionsObjectCollection<ObjectType> collection;
try {
@@ -282,17 +275,26 @@
} catch (InstantiationException | IllegalAccessException e) {
throw new RuntimeException("Error creating new collection instance.", e);
}
- collection.getObjects().addAll(list);
+ for (final ObjectType object : list) {
+ collection.add(object);
+ }
return collection;
}
@Override
public boolean contains(final Object object) {
- return getObjects().contains(object);
+ return this.objects.contains(object);
}
@Override
public void addAll(final ConditionsObjectCollection<ObjectType> collection) {
- this.objects.addAll(collection.getObjects());
+ for (final ObjectType object : collection) {
+ this.objects.add(object);
+ }
+ }
+
+ @Override
+ public Iterator<ObjectType> iterator() {
+ return this.objects.iterator();
}
}
Modified: java/branches/conditions-HPSJAVA-488/src/main/java/org/hps/conditions/api/ConditionsObject.java
=============================================================================
--- java/branches/conditions-HPSJAVA-488/src/main/java/org/hps/conditions/api/ConditionsObject.java (original)
+++ java/branches/conditions-HPSJAVA-488/src/main/java/org/hps/conditions/api/ConditionsObject.java Wed Apr 22 14:08:45 2015
@@ -22,7 +22,7 @@
/**
* @return
*/
- int getId();
+ int getRowId();
/**
* @return
Modified: java/branches/conditions-HPSJAVA-488/src/main/java/org/hps/conditions/api/ConditionsObjectCollection.java
=============================================================================
--- java/branches/conditions-HPSJAVA-488/src/main/java/org/hps/conditions/api/ConditionsObjectCollection.java (original)
+++ java/branches/conditions-HPSJAVA-488/src/main/java/org/hps/conditions/api/ConditionsObjectCollection.java Wed Apr 22 14:08:45 2015
@@ -2,10 +2,9 @@
import java.sql.Connection;
import java.sql.SQLException;
-import java.util.Collection;
import java.util.Comparator;
-public interface ConditionsObjectCollection<ObjectType extends ConditionsObject> {
+public interface ConditionsObjectCollection<ObjectType extends ConditionsObject> extends Iterable<ObjectType> {
boolean add(final ObjectType object);
@@ -14,8 +13,6 @@
ObjectType get(final int index);
int getCollectionId();
-
- Collection<ObjectType> getObjects();
TableMetaData getTableMetaData();
Modified: java/branches/conditions-HPSJAVA-488/src/main/java/org/hps/conditions/api/ConditionsRecord.java
=============================================================================
--- java/branches/conditions-HPSJAVA-488/src/main/java/org/hps/conditions/api/ConditionsRecord.java (original)
+++ java/branches/conditions-HPSJAVA-488/src/main/java/org/hps/conditions/api/ConditionsRecord.java Wed Apr 22 14:08:45 2015
@@ -121,7 +121,7 @@
*/
public final Set<String> getConditionsKeys() {
final Set<String> conditionsKeys = new HashSet<String>();
- for (final ConditionsRecord record : this.getObjects()) {
+ for (final ConditionsRecord record : this) {
conditionsKeys.add(record.getName());
}
return conditionsKeys;
@@ -338,7 +338,7 @@
@Override
public String toString() {
final StringBuffer sb = new StringBuffer();
- sb.append("id: " + getId() + '\n');
+ sb.append("id: " + getRowId() + '\n');
sb.append("name: " + getName() + '\n');
sb.append("runStart: " + getRunStart() + '\n');
sb.append("runEnd: " + getRunEnd() + '\n');
Modified: java/branches/conditions-HPSJAVA-488/src/main/java/org/hps/conditions/cli/PrintCommand.java
=============================================================================
--- java/branches/conditions-HPSJAVA-488/src/main/java/org/hps/conditions/cli/PrintCommand.java (original)
+++ java/branches/conditions-HPSJAVA-488/src/main/java/org/hps/conditions/cli/PrintCommand.java Wed Apr 22 14:08:45 2015
@@ -176,7 +176,7 @@
*/
private void printCollection(final ConditionsObjectCollection<?> collection) {
final StringBuffer buffer = new StringBuffer();
- for (final Object object : collection.getObjects()) {
+ for (final Object object : collection) {
for (final String columnName : collection.getTableMetaData().getFieldNames()) {
buffer.append(((ConditionsObject) object).getFieldValue(columnName));
buffer.append(this.fieldDelimiter);
Modified: java/branches/conditions-HPSJAVA-488/src/main/java/org/hps/conditions/cli/TagCommand.java
=============================================================================
--- java/branches/conditions-HPSJAVA-488/src/main/java/org/hps/conditions/cli/TagCommand.java (original)
+++ java/branches/conditions-HPSJAVA-488/src/main/java/org/hps/conditions/cli/TagCommand.java Wed Apr 22 14:08:45 2015
@@ -23,6 +23,7 @@
*
* @author <a href="mailto:[log in to unmask]">Jeremy McCormick</a>
*/
+// TODO: Add multiple records strategy (last updated, last created, etc.).
public class TagCommand extends AbstractCommand {
/**
@@ -104,11 +105,8 @@
throw new RuntimeException(e);
}
- // The records from this run.
- final ConditionsRecordCollection records = manager.getConditionsRecords();
-
// The unique conditions keys from this run.
- final Set<String> keys = records.getConditionsKeys();
+ final Set<String> keys = manager.getConditionsRecords().getConditionsKeys();
// Scan through all the unique keys.
for (final String key : keys) {
@@ -116,19 +114,19 @@
// Get the table meta data for the key.
final TableMetaData tableMetaData = manager.findTableMetaData(key);
+ // Get the ConditionsRecord from the collection.
+ final ConditionsRecordCollection records = manager.findConditionsRecords(key);
+ records.sortByUpdated();
+ final ConditionsRecord record = records.get(records.size() - 1);
+
manager.getCachedConditions(tableMetaData.getCollectionClass(), tableMetaData.getTableName())
.getCachedData();
- // Get the ConditionsRecord from the collection.
- // final ConditionsRecord record = collection.getConditionsRecord();
- final ConditionsRecord record = null;
-
// Is this record already part of the new tag?
- if (!addedIds.contains(record.getId())) {
+ if (!addedIds.contains(record.getRowId())) {
// Create a new record copied from the old one.
final ConditionsRecord newRecord = new ConditionsRecord(record);
- // FIXME: This is berken because collection no longer directly links to ConditionsRecord.
// Set the tag value.
newRecord.setFieldValue("tag", newTag);
@@ -136,14 +134,14 @@
tagRecords.add(newRecord);
// Flag the record's ID as used so it is only added once.
- addedIds.add(record.getId());
+ addedIds.add(record.getRowId());
}
}
}
// Print out all the records that were found.
LOGGER.info("found ConditionsRecords for tag " + newTag + " ...");
- for (final ConditionsRecord record : tagRecords.getObjects()) {
+ for (final ConditionsRecord record : tagRecords) {
LOGGER.info(record.toString());
}
Modified: java/branches/conditions-HPSJAVA-488/src/main/java/org/hps/conditions/database/ConditionsSeriesConverter.java
=============================================================================
--- java/branches/conditions-HPSJAVA-488/src/main/java/org/hps/conditions/database/ConditionsSeriesConverter.java (original)
+++ java/branches/conditions-HPSJAVA-488/src/main/java/org/hps/conditions/database/ConditionsSeriesConverter.java Wed Apr 22 14:08:45 2015
@@ -81,7 +81,7 @@
// Get the ConditionsRecord with the meta-data, which will use the current run number from the manager.
final ConditionsRecordCollection conditionsRecords = conditionsManager.findConditionsRecords(tableName);
- for (final ConditionsRecord conditionsRecord : conditionsRecords.getObjects()) {
+ for (final ConditionsRecord conditionsRecord : conditionsRecords) {
ConditionsObjectCollection<?> collection = null;
try {
Modified: java/branches/conditions-HPSJAVA-488/src/main/java/org/hps/conditions/database/DatabaseConditionsManager.java
=============================================================================
--- java/branches/conditions-HPSJAVA-488/src/main/java/org/hps/conditions/database/DatabaseConditionsManager.java (original)
+++ java/branches/conditions-HPSJAVA-488/src/main/java/org/hps/conditions/database/DatabaseConditionsManager.java Wed Apr 22 14:08:45 2015
@@ -386,13 +386,13 @@
"conditions").getCachedData();
logger.fine("searching for conditions with name " + name + " in " + runConditionsRecords.size() + " records");
final ConditionsRecordCollection foundConditionsRecords = new ConditionsRecordCollection();
- for (final ConditionsRecord record : runConditionsRecords.getObjects()) {
+ for (final ConditionsRecord record : runConditionsRecords) {
if (record.getName().equals(name)) {
if (matchesTag(record)) {
foundConditionsRecords.add(record);
- logger.finer("found matching conditions record " + record.getId());
+ logger.finer("found matching conditions record " + record.getRowId());
} else {
- logger.finer("conditions record " + record.getId() + " rejected from non-matching tag "
+ logger.finer("conditions record " + record.getRowId() + " rejected from non-matching tag "
+ record.getTag());
}
}
@@ -605,7 +605,7 @@
* @return <code>true</code> if a conditions record exists with the given name
*/
public boolean hasConditionsRecord(final String name) {
- return !findConditionsRecords(name).getObjects().isEmpty();
+ return !(findConditionsRecords(name).size() == 0);
}
/**
@@ -720,12 +720,12 @@
try {
this.connection.setAutoCommit(false);
logger.fine("starting insert transaction");
- final String sql = QueryBuilder.buildPreparedInsert(tableMetaData.getTableName(), collection.getObjects()
- .iterator().next());
+ final String sql = QueryBuilder.buildPreparedInsert(tableMetaData.getTableName(), collection.iterator()
+ .next());
preparedStatement = this.connection.prepareStatement(sql);
logger.fine("using prepared statement: " + sql);
final int collectionId = collection.getCollectionId();
- for (final ConditionsObject object : collection.getObjects()) {
+ for (final ConditionsObject object : collection) {
preparedStatement.setObject(1, collectionId);
int parameterIndex = 2;
if (object instanceof ConditionsRecord) {
Modified: java/branches/conditions-HPSJAVA-488/src/main/java/org/hps/conditions/ecal/EcalChannel.java
=============================================================================
--- java/branches/conditions-HPSJAVA-488/src/main/java/org/hps/conditions/ecal/EcalChannel.java (original)
+++ java/branches/conditions-HPSJAVA-488/src/main/java/org/hps/conditions/ecal/EcalChannel.java Wed Apr 22 14:08:45 2015
@@ -198,7 +198,7 @@
* @param system the system ID of the subdetector
*/
void buildGeometryMap(final IIdentifierHelper helper, final int system) {
- for (final EcalChannel channel : this.getObjects()) {
+ for (final EcalChannel channel : this) {
final GeometryId geometryId = channel.createGeometryId(helper, system);
this.geometryMap.put(geometryId.encode(), channel);
}
Modified: java/branches/conditions-HPSJAVA-488/src/main/java/org/hps/conditions/ecal/EcalConditions.java
=============================================================================
--- java/branches/conditions-HPSJAVA-488/src/main/java/org/hps/conditions/ecal/EcalConditions.java (original)
+++ java/branches/conditions-HPSJAVA-488/src/main/java/org/hps/conditions/ecal/EcalConditions.java Wed Apr 22 14:08:45 2015
@@ -42,7 +42,7 @@
/**
* Class constructor.
- *
+ *
* @param subdetector the ECAL subdetector object
*/
EcalConditions(final Subdetector subdetector) {
@@ -54,7 +54,7 @@
/**
* Set the channel map.
- *
+ *
* @param channelCollection the channel map
*/
void setChannelCollection(final EcalChannelCollection channelCollection) {
@@ -67,7 +67,7 @@
/**
* Get the map between database IDs and <code>EcalChannel</code> objects.
- *
+ *
* @return the channel map
*/
public EcalChannelCollection getChannelCollection() {
@@ -76,7 +76,7 @@
/**
* Get the channel information for a geometric crystal.
- *
+ *
* @param crystal the geometric crystal
* @return the channel information or null if does not exist
*/
@@ -87,7 +87,7 @@
/**
* Get the conditions constants for a specific channel. These will be created if they do not exist for the given
* channel, BUT only channels in the channel map are accepted as an argument.
- *
+ *
* @param channel the ECAL channel
* @return the conditions constants for the channel
* @throws IllegalArgumentException if channel does not exist in the channel map
@@ -112,7 +112,7 @@
/**
* Convert this object to a string.
- *
+ *
* @return A string representation of this object.
*/
// FIXME: The print out from this method looks like a mess.
@@ -154,7 +154,7 @@
sb.append('\n');
// Loop over all channels.
- for (final EcalChannel channel : this.channelCollection.getObjects()) {
+ for (final EcalChannel channel : this.channelCollection) {
final EcalChannelConstants constants = getChannelConstants(channel);
Modified: java/branches/conditions-HPSJAVA-488/src/main/java/org/hps/conditions/ecal/EcalConditionsConverter.java
=============================================================================
--- java/branches/conditions-HPSJAVA-488/src/main/java/org/hps/conditions/ecal/EcalConditionsConverter.java (original)
+++ java/branches/conditions-HPSJAVA-488/src/main/java/org/hps/conditions/ecal/EcalConditionsConverter.java Wed Apr 22 14:08:45 2015
@@ -30,7 +30,7 @@
/**
* Get the default {@link EcalChannel} collection.
- *
+ *
* @param manager the conditions manager
* @return the default ECAL channel object collection
*/
@@ -40,7 +40,7 @@
/**
* Get the default {@link EcalGain} collection.
- *
+ *
* @param manager the conditions manager
* @return the ECAL channel gain collection
*/
@@ -50,7 +50,7 @@
/**
* Get the default collections of {@link EcalBadChannel} objects.
- *
+ *
* @param manager the conditions manager
* @return the collections of ECAL bad channel objects
*/
@@ -61,7 +61,7 @@
/**
* Get the default {@link EcalCalibration} collection.
- *
+ *
* @param manager the conditions manager
* @return the collection of ECAL channel calibration objects
*/
@@ -71,7 +71,7 @@
/**
* Get the default {@link EcalTimeShift} collection.
- *
+ *
* @param manager the conditions manager
* @return the collection of ECAL time shift objects
*/
@@ -81,7 +81,7 @@
/**
* Create combined ECAL conditions object containing all data for the current run.
- *
+ *
* @param manager the conditions manager
* @param name the conditions set name (unused but must satisfy conditions API)
*/
@@ -105,7 +105,7 @@
// Get the ECal gains from the conditions database and add them to the
// conditions set
final EcalGainCollection gains = getEcalGainCollection(databaseConditionsManager);
- for (final EcalGain gain : gains.getObjects()) {
+ for (final EcalGain gain : gains) {
final ChannelId channelId = new ChannelId(new int[] {gain.getChannelId()});
final EcalChannel channel = channels.findChannel(channelId);
conditions.getChannelConstants(channel).setGain(gain);
@@ -115,7 +115,7 @@
// FIXME: How to get EcalBadChannelCollection here instead for the collection type?
// API of ConditionsSeries and ConditionsSeriesConverter needs to be changed!
for (final ConditionsObjectCollection<EcalBadChannel> badChannels : badChannelSeries) {
- for (final EcalBadChannel badChannel : badChannels.getObjects()) {
+ for (final EcalBadChannel badChannel : badChannels) {
final ChannelId channelId = new ChannelId(new int[] {badChannel.getChannelId()});
final EcalChannel channel = channels.findChannel(channelId);
conditions.getChannelConstants(channel).setBadChannel(true);
@@ -125,7 +125,7 @@
// Get the ECal calibrations from the conditions database and add them
// to the conditions set.
final EcalCalibrationCollection calibrations = getEcalCalibrationCollection(databaseConditionsManager);
- for (final EcalCalibration calibration : calibrations.getObjects()) {
+ for (final EcalCalibration calibration : calibrations) {
final ChannelId channelId = new ChannelId(new int[] {calibration.getChannelId()});
final EcalChannel channel = channels.findChannel(channelId);
conditions.getChannelConstants(channel).setCalibration(calibration);
@@ -135,7 +135,7 @@
// the conditions set.
if (databaseConditionsManager.hasConditionsRecord("ecal_time_shifts")) {
final EcalTimeShiftCollection timeShifts = getEcalTimeShiftCollection(databaseConditionsManager);
- for (final EcalTimeShift timeShift : timeShifts.getObjects()) {
+ for (final EcalTimeShift timeShift : timeShifts) {
final ChannelId channelId = new ChannelId(new int[] {timeShift.getChannelId()});
final EcalChannel channel = channels.findChannel(channelId);
conditions.getChannelConstants(channel).setTimeShift(timeShift);
@@ -150,7 +150,7 @@
/**
* Get the type handled by this converter.
- *
+ *
* @return the type handled by this converter
*/
@Override
Modified: java/branches/conditions-HPSJAVA-488/src/main/java/org/hps/conditions/ecal/EcalCrystalChannelMap.java
=============================================================================
--- java/branches/conditions-HPSJAVA-488/src/main/java/org/hps/conditions/ecal/EcalCrystalChannelMap.java (original)
+++ java/branches/conditions-HPSJAVA-488/src/main/java/org/hps/conditions/ecal/EcalCrystalChannelMap.java Wed Apr 22 14:08:45 2015
@@ -27,7 +27,7 @@
/**
* Creates the map between crystals and channels.
- *
+ *
* @param api the ECAL geometry API
* @param channels the list of channels
*/
@@ -43,7 +43,7 @@
}
// Map channels to crystals.
- for (final EcalChannel channel : channels.getObjects()) {
+ for (final EcalChannel channel : channels) {
final EcalCrystal crystal = api.getCrystal(channel.getX(), channel.getY());
if (crystal == null) {
throw new RuntimeException("ECAl crystal was not found for channel X Y: " + channel.getX() + " "
@@ -55,7 +55,7 @@
/**
* Get a channel from a crystal.
- *
+ *
* @param crystal the crystal's geometry object
* @return the channel information or <code>null</code> if does not exist
*/
@@ -65,7 +65,7 @@
/**
* Get a crystal from a channel.
- *
+ *
* @param channel the ECAL channel object
* @return the crystal's geometry object or <code>null</code> if does not exist
*/
Modified: java/branches/conditions-HPSJAVA-488/src/main/java/org/hps/conditions/svt/AbstractSvtChannel.java
=============================================================================
--- java/branches/conditions-HPSJAVA-488/src/main/java/org/hps/conditions/svt/AbstractSvtChannel.java (original)
+++ java/branches/conditions-HPSJAVA-488/src/main/java/org/hps/conditions/svt/AbstractSvtChannel.java Wed Apr 22 14:08:45 2015
@@ -82,7 +82,7 @@
@Override
public final String toString() {
final StringBuffer buff = new StringBuffer();
- for (final T channel : this.getObjects()) {
+ for (final T channel : this) {
buff.append(channel.toString() + '\n');
}
return buff.toString();
Modified: java/branches/conditions-HPSJAVA-488/src/main/java/org/hps/conditions/svt/AbstractSvtConditionsConverter.java
=============================================================================
--- java/branches/conditions-HPSJAVA-488/src/main/java/org/hps/conditions/svt/AbstractSvtConditionsConverter.java (original)
+++ java/branches/conditions-HPSJAVA-488/src/main/java/org/hps/conditions/svt/AbstractSvtConditionsConverter.java Wed Apr 22 14:08:45 2015
@@ -34,7 +34,7 @@
/**
* Get the default {@link SvtShapeFitParametersCollection} collection from the manager.
- *
+ *
* @param manager the current conditions manager
* @return the default {@link SvtShapeFitParametersCollection}
*/
@@ -45,7 +45,7 @@
/**
* Get the default {@link SvtBadChannelCollection} collection from the manager.
- *
+ *
* @param manager the current conditions manager
* @return the default {@link SvtBadChannelCollection}
*/
@@ -55,7 +55,7 @@
/**
* Get the default series of {@link SvtBadChannelCollection} collections from the manager.
- *
+ *
* @param manager the current conditions manager
* @return the default series of {@link SvtBadChannelCollection}
*/
@@ -66,7 +66,7 @@
/**
* Get the default {@link SvtCalibrationCollection} collection from the manager.
- *
+ *
* @param manager the current conditions manager
* @return the default {@link SvtCalibrationCollection}
*/
@@ -76,7 +76,7 @@
/**
* Get the default {@link SvtGainCollection} collection from the manager.
- *
+ *
* @param manager the current conditions manager
* @return the default {@link SvtGainCollection}
*/
@@ -98,14 +98,14 @@
// Get the SVT calibrations (baseline, noise) from the conditions database
final SvtCalibrationCollection calibrations = getSvtCalibrationCollection(dbConditionsManager);
- for (final SvtCalibration calibration : calibrations.getObjects()) {
+ for (final SvtCalibration calibration : calibrations) {
final AbstractSvtChannel channel = this.conditions.getChannelMap().findChannel(calibration.getChannelID());
this.conditions.getChannelConstants(channel).setCalibration(calibration);
}
// Get the Channel pulse fit parameters from the conditions database
final SvtShapeFitParametersCollection shapeFitParametersCollection = getSvtShapeFitParametersCollection(dbConditionsManager);
- for (final SvtShapeFitParameters shapeFitParameters : shapeFitParametersCollection.getObjects()) {
+ for (final SvtShapeFitParameters shapeFitParameters : shapeFitParametersCollection) {
final AbstractSvtChannel channel = this.conditions.getChannelMap().findChannel(
shapeFitParameters.getChannelID());
this.conditions.getChannelConstants(channel).setShapeFitParameters(shapeFitParameters);
@@ -116,7 +116,7 @@
try {
final ConditionsSeries<SvtBadChannel, SvtBadChannelCollection> badChannelSeries = getSvtBadChannelSeries(dbConditionsManager);
for (final ConditionsObjectCollection<SvtBadChannel> badChannelCollection : badChannelSeries) {
- for (final SvtBadChannel badChannel : badChannelCollection.getObjects()) {
+ for (final SvtBadChannel badChannel : badChannelCollection) {
final AbstractSvtChannel channel = this.conditions.getChannelMap().findChannel(
badChannel.getChannelId());
this.conditions.getChannelConstants(channel).setBadChannel(true);
@@ -128,7 +128,7 @@
// Get the gains and offsets from the conditions database
final SvtGainCollection channelGains = getSvtGainCollection(dbConditionsManager);
- for (final SvtGain channelGain : channelGains.getObjects()) {
+ for (final SvtGain channelGain : channelGains) {
final int channelId = channelGain.getChannelID();
final AbstractSvtChannel channel = this.conditions.getChannelMap().findChannel(channelId);
this.conditions.getChannelConstants(channel).setGain(channelGain);
Modified: java/branches/conditions-HPSJAVA-488/src/main/java/org/hps/conditions/svt/SvtChannel.java
=============================================================================
--- java/branches/conditions-HPSJAVA-488/src/main/java/org/hps/conditions/svt/SvtChannel.java (original)
+++ java/branches/conditions-HPSJAVA-488/src/main/java/org/hps/conditions/svt/SvtChannel.java Wed Apr 22 14:08:45 2015
@@ -90,7 +90,7 @@
final List<SvtChannel> channels = new ArrayList<SvtChannel>();
final int febID = pair.getFirstElement();
final int febHybridID = pair.getSecondElement();
- for (final SvtChannel channel : this.getObjects()) {
+ for (final SvtChannel channel : this) {
if (channel.getFebID() == febID && channel.getFebHybridID() == febHybridID) {
channels.add(channel);
}
@@ -108,7 +108,7 @@
* @throws {@link RuntimeException} if the channel ID can't be found
*/
public final int findChannelID(final int febID, final int febHybridID, final int channel) {
- for (final SvtChannel svtChannel : this.getObjects()) {
+ for (final SvtChannel svtChannel : this) {
if (svtChannel.getFebID() == febID && svtChannel.getFebHybridID() == febHybridID
&& svtChannel.getChannel() == channel) {
return svtChannel.getChannelID();
Modified: java/branches/conditions-HPSJAVA-488/src/main/java/org/hps/conditions/svt/SvtConditions.java
=============================================================================
--- java/branches/conditions-HPSJAVA-488/src/main/java/org/hps/conditions/svt/SvtConditions.java (original)
+++ java/branches/conditions-HPSJAVA-488/src/main/java/org/hps/conditions/svt/SvtConditions.java Wed Apr 22 14:08:45 2015
@@ -114,7 +114,7 @@
}
buff.append('\n');
// Loop over channels.
- for (final SvtChannel channel : this.getChannelMap().getObjects()) {
+ for (final SvtChannel channel : this.getChannelMap()) {
// Get the conditions for the channel.
final ChannelConstants constants = getChannelConstants(channel);
Modified: java/branches/conditions-HPSJAVA-488/src/main/java/org/hps/conditions/svt/SvtDaqMapping.java
=============================================================================
--- java/branches/conditions-HPSJAVA-488/src/main/java/org/hps/conditions/svt/SvtDaqMapping.java (original)
+++ java/branches/conditions-HPSJAVA-488/src/main/java/org/hps/conditions/svt/SvtDaqMapping.java Wed Apr 22 14:08:45 2015
@@ -33,7 +33,7 @@
public Pair<Integer, Integer> getDaqPair(final HpsSiSensor sensor) {
final String svtHalf = sensor.isTopLayer() ? TOP_HALF : BOTTOM_HALF;
- for (final SvtDaqMapping object : this.getObjects()) {
+ for (final SvtDaqMapping object : this) {
if (svtHalf.equals(object.getSvtHalf()) && object.getLayerNumber() == sensor.getLayerNumber()
&& object.getSide().equals(sensor.getSide())) {
@@ -53,7 +53,7 @@
*/
@Override
public String getOrientation(final Pair<Integer, Integer> daqPair) {
- for (final SvtDaqMapping daqMapping : this.getObjects()) {
+ for (final SvtDaqMapping daqMapping : this) {
if (daqPair.getFirstElement() == daqMapping.getFebID()
&& daqPair.getSecondElement() == daqMapping.getFebHybridID()) {
return daqMapping.getOrientation();
@@ -85,7 +85,7 @@
buff.append('\n');
buff.append("----------------------");
buff.append('\n');
- for (final SvtDaqMapping object : this.getObjects()) {
+ for (final SvtDaqMapping object : this) {
buff.append(object.getFebID());
buff.append(" ");
buff.append(object.getFebHybridID());
Modified: java/branches/conditions-HPSJAVA-488/src/main/java/org/hps/conditions/svt/SvtT0Shift.java
=============================================================================
--- java/branches/conditions-HPSJAVA-488/src/main/java/org/hps/conditions/svt/SvtT0Shift.java (original)
+++ java/branches/conditions-HPSJAVA-488/src/main/java/org/hps/conditions/svt/SvtT0Shift.java Wed Apr 22 14:08:45 2015
@@ -33,7 +33,7 @@
public SvtT0Shift getT0Shift(final Pair<Integer, Integer> pair) {
final int febID = pair.getFirstElement();
final int febHybridID = pair.getSecondElement();
- for (final SvtT0Shift t0Shift : this.getObjects()) {
+ for (final SvtT0Shift t0Shift : this) {
if (t0Shift.getFebID() == febID && t0Shift.getFebHybridID() == febHybridID) {
return t0Shift;
}
Modified: java/branches/conditions-HPSJAVA-488/src/main/java/org/hps/conditions/svt/TestRunSvtChannel.java
=============================================================================
--- java/branches/conditions-HPSJAVA-488/src/main/java/org/hps/conditions/svt/TestRunSvtChannel.java (original)
+++ java/branches/conditions-HPSJAVA-488/src/main/java/org/hps/conditions/svt/TestRunSvtChannel.java Wed Apr 22 14:08:45 2015
@@ -37,7 +37,7 @@
final List<TestRunSvtChannel> channels = new ArrayList<TestRunSvtChannel>();
final int fpga = pair.getFirstElement();
final int hybrid = pair.getSecondElement();
- for (final TestRunSvtChannel channel : this.getObjects()) {
+ for (final TestRunSvtChannel channel : this) {
if (channel.getFpgaID() == fpga && channel.getHybridID() == hybrid) {
channels.add(channel);
}
@@ -68,7 +68,7 @@
/**
* Implementation of equals.
- *
+ *
* @param o the other object
* @return <code>true</code> if the object equals this one; false if not.
*/
Modified: java/branches/conditions-HPSJAVA-488/src/main/java/org/hps/conditions/svt/TestRunSvtConditions.java
=============================================================================
--- java/branches/conditions-HPSJAVA-488/src/main/java/org/hps/conditions/svt/TestRunSvtConditions.java (original)
+++ java/branches/conditions-HPSJAVA-488/src/main/java/org/hps/conditions/svt/TestRunSvtConditions.java Wed Apr 22 14:08:45 2015
@@ -5,6 +5,7 @@
import org.hps.conditions.svt.TestRunSvtChannel.TestRunSvtChannelCollection;
import org.hps.conditions.svt.TestRunSvtDaqMapping.TestRunSvtDaqMappingCollection;
import org.hps.conditions.svt.TestRunSvtT0Shift.TestRunSvtT0ShiftCollection;
+
// TODO: Move all constants to their own class
/**
@@ -119,7 +120,7 @@
}
buff.append('\n');
// Loop over channels.
- for (final TestRunSvtChannel channel : this.getChannelMap().getObjects()) {
+ for (final TestRunSvtChannel channel : this.getChannelMap()) {
System.out.println("Channel: " + channel.toString());
Modified: java/branches/conditions-HPSJAVA-488/src/main/java/org/hps/conditions/svt/TestRunSvtDaqMapping.java
=============================================================================
--- java/branches/conditions-HPSJAVA-488/src/main/java/org/hps/conditions/svt/TestRunSvtDaqMapping.java (original)
+++ java/branches/conditions-HPSJAVA-488/src/main/java/org/hps/conditions/svt/TestRunSvtDaqMapping.java Wed Apr 22 14:08:45 2015
@@ -32,7 +32,7 @@
public Pair<Integer, Integer> getDaqPair(final HpsSiSensor sensor) {
final String svtHalf = sensor.isTopLayer() ? TOP_HALF : BOTTOM_HALF;
- for (final TestRunSvtDaqMapping daqMapping : this.getObjects()) {
+ for (final TestRunSvtDaqMapping daqMapping : this) {
if (svtHalf.equals(daqMapping.getSvtHalf()) && daqMapping.getLayerNumber() == sensor.getLayerNumber()) {
@@ -51,7 +51,7 @@
*/
@Override
public String getOrientation(final Pair<Integer, Integer> daqPair) {
- for (final TestRunSvtDaqMapping daqMapping : this.getObjects()) {
+ for (final TestRunSvtDaqMapping daqMapping : this) {
if (daqPair.getFirstElement() == daqMapping.getFpgaID()
&& daqPair.getSecondElement() == daqMapping.getHybridID()) {
return daqMapping.getOrientation();
@@ -81,7 +81,7 @@
buffer.append('\n');
buffer.append("----------------------");
buffer.append('\n');
- for (final TestRunSvtDaqMapping daqMapping : this.getObjects()) {
+ for (final TestRunSvtDaqMapping daqMapping : this) {
final TestRunSvtDaqMapping testRunDaqMapping = daqMapping;
buffer.append(testRunDaqMapping.getFpgaID());
buffer.append(" ");
Modified: java/branches/conditions-HPSJAVA-488/src/main/java/org/hps/conditions/svt/TestRunSvtT0Shift.java
=============================================================================
--- java/branches/conditions-HPSJAVA-488/src/main/java/org/hps/conditions/svt/TestRunSvtT0Shift.java (original)
+++ java/branches/conditions-HPSJAVA-488/src/main/java/org/hps/conditions/svt/TestRunSvtT0Shift.java Wed Apr 22 14:08:45 2015
@@ -32,7 +32,7 @@
public TestRunSvtT0Shift getT0Shift(final Pair<Integer, Integer> pair) {
final int fpgaID = pair.getFirstElement();
final int hybridID = pair.getSecondElement();
- for (final TestRunSvtT0Shift t0Shift : this.getObjects()) {
+ for (final TestRunSvtT0Shift t0Shift : this) {
if (t0Shift.getFpgaID() == fpgaID && t0Shift.getHybridID() == hybridID) {
return t0Shift;
}
Modified: java/branches/conditions-HPSJAVA-488/src/test/java/org/hps/conditions/EngRunConditionsTest.java
=============================================================================
--- java/branches/conditions-HPSJAVA-488/src/test/java/org/hps/conditions/EngRunConditionsTest.java (original)
+++ java/branches/conditions-HPSJAVA-488/src/test/java/org/hps/conditions/EngRunConditionsTest.java Wed Apr 22 14:08:45 2015
@@ -165,7 +165,7 @@
this.ecalConditions = conditionsManager.getCachedConditions(EcalConditions.class, "ecal_conditions")
.getCachedData();
final Set<EcalChannelConstants> channelConstants = new LinkedHashSet<EcalChannelConstants>();
- for (final EcalChannel channel : this.ecalConditions.getChannelCollection().sorted().getObjects()) {
+ for (final EcalChannel channel : this.ecalConditions.getChannelCollection().sorted()) {
channelConstants.add(this.ecalConditions.getChannelConstants(channel));
}
assertEquals("Wrong number of channel constants.", CHANNEL_COUNT, channelConstants.size());
Modified: java/branches/conditions-HPSJAVA-488/src/test/java/org/hps/conditions/api/BaseConditionsObjectTest.java
=============================================================================
--- java/branches/conditions-HPSJAVA-488/src/test/java/org/hps/conditions/api/BaseConditionsObjectTest.java (original)
+++ java/branches/conditions-HPSJAVA-488/src/test/java/org/hps/conditions/api/BaseConditionsObjectTest.java Wed Apr 22 14:08:45 2015
@@ -43,7 +43,7 @@
newObject.setFieldValue("dummy", 1.0);
final boolean inserted = newObject.insert();
assertTrue("Insert failed.", inserted);
- System.out.println("Inserted new object with id " + newObject.getId());
+ System.out.println("Inserted new object with id " + newObject.getRowId());
// Update the same object.
newObject.setFieldValue("dummy", 2.0);
@@ -57,9 +57,9 @@
// Select into another object using the row ID.
final DummyConditionsObject anotherObject = new DummyConditionsObject(connection, tableMetaData);
- final boolean selected = anotherObject.select(newObject.getId());
+ final boolean selected = anotherObject.select(newObject.getRowId());
assertTrue("Select failed.", selected);
- assertEquals("Select object has wrong row ID.", newObject.getId(), anotherObject.getId());
+ assertEquals("Select object has wrong row ID.", newObject.getRowId(), anotherObject.getRowId());
assertEquals("Select object has wrong collcetion ID.", newObject.getFieldValue(Integer.class, "collection_id"),
anotherObject.getFieldValue(Integer.class, "collection_id"));
assertEquals("Select object has wrong value.", newObject.getFieldValue(Double.class, "dummy"),
Modified: java/branches/conditions-HPSJAVA-488/src/test/java/org/hps/conditions/beam/BeamConditionsTest.java
=============================================================================
--- java/branches/conditions-HPSJAVA-488/src/test/java/org/hps/conditions/beam/BeamConditionsTest.java (original)
+++ java/branches/conditions-HPSJAVA-488/src/test/java/org/hps/conditions/beam/BeamConditionsTest.java Wed Apr 22 14:08:45 2015
@@ -57,7 +57,7 @@
"beam").getCachedData();
final BeamConditions beam = beamCollection.get(0);
System.out.print(run + " ");
- System.out.print(beam.getId() + " ");
+ System.out.print(beam.getRowId() + " ");
System.out.print(beam.getCurrent() + " ");
System.out.print(beam.getPositionX() + " ");
System.out.print(beam.getPositionY() + " ");
Modified: java/branches/conditions-HPSJAVA-488/src/test/java/org/hps/conditions/beam/BeamCurrentTest.java
=============================================================================
--- java/branches/conditions-HPSJAVA-488/src/test/java/org/hps/conditions/beam/BeamCurrentTest.java (original)
+++ java/branches/conditions-HPSJAVA-488/src/test/java/org/hps/conditions/beam/BeamCurrentTest.java Wed Apr 22 14:08:45 2015
@@ -76,7 +76,7 @@
/**
* This method will check the beam current against the answer key for the first event of a new run.
- *
+ *
* @param the LCSim event
*/
@Override
@@ -85,7 +85,7 @@
this.currentRun = event.getRunNumber();
final BeamCurrentCollection collection = DatabaseConditionsManager.getInstance()
.getCachedConditions(BeamCurrentCollection.class, "beam_current").getCachedData();
- final BeamCurrent beamCurrent = collection.getObjects().iterator().next();
+ final BeamCurrent beamCurrent = collection.iterator().next();
System.out.println("Run " + event.getRunNumber() + " has integrated beam current "
+ beamCurrent.getIntegratedBeamCurrent() + " nC.");
assertEquals("Wrong beam current for run.", ANSWER_KEY.get(this.currentRun),
Modified: java/branches/conditions-HPSJAVA-488/src/test/java/org/hps/conditions/ecal/EcalLedTest.java
=============================================================================
--- java/branches/conditions-HPSJAVA-488/src/test/java/org/hps/conditions/ecal/EcalLedTest.java (original)
+++ java/branches/conditions-HPSJAVA-488/src/test/java/org/hps/conditions/ecal/EcalLedTest.java Wed Apr 22 14:08:45 2015
@@ -46,14 +46,14 @@
// LED channel information.
final EcalLedCollection leds = conditionsManager.getCachedConditions(EcalLedCollection.class, "ecal_leds")
.getCachedData();
- for (final EcalLed led : leds.getObjects()) {
+ for (final EcalLed led : leds) {
System.out.println(led);
}
// LED calibration data.
final EcalLedCalibrationCollection calibrations = conditionsManager.getCachedConditions(
EcalLedCalibrationCollection.class, "ecal_led_calibrations").getCachedData();
- for (final EcalLedCalibration calibration : calibrations.getObjects()) {
+ for (final EcalLedCalibration calibration : calibrations) {
System.out.println(calibration);
}
}
Modified: java/branches/conditions-HPSJAVA-488/src/test/java/org/hps/conditions/svt/SvtConfigurationTest.java
=============================================================================
--- java/branches/conditions-HPSJAVA-488/src/test/java/org/hps/conditions/svt/SvtConfigurationTest.java (original)
+++ java/branches/conditions-HPSJAVA-488/src/test/java/org/hps/conditions/svt/SvtConfigurationTest.java Wed Apr 22 14:08:45 2015
@@ -23,7 +23,7 @@
final DatabaseConditionsManager manager = DatabaseConditionsManager.getInstance();
final SvtConfigurationCollection collection = manager.getCachedConditions(SvtConfigurationCollection.class,
"svt_configurations").getCachedData();
- for (final SvtConfiguration config : collection.getObjects()) {
+ for (final SvtConfiguration config : collection) {
Document doc = null;
try {
doc = config.createDocument();
Modified: java/branches/conditions-HPSJAVA-488/src/test/java/org/hps/conditions/svt/SvtDaqMappingTest.java
=============================================================================
--- java/branches/conditions-HPSJAVA-488/src/test/java/org/hps/conditions/svt/SvtDaqMappingTest.java (original)
+++ java/branches/conditions-HPSJAVA-488/src/test/java/org/hps/conditions/svt/SvtDaqMappingTest.java Wed Apr 22 14:08:45 2015
@@ -30,7 +30,7 @@
/**
* Load the DAQ map from the database.
- *
+ *
* @throws Exception if there is a test error
*/
public void test() throws Exception {
@@ -41,7 +41,7 @@
int totalSensors = 0;
int febHybridID;
// this.printDebug("");
- for (final SvtDaqMapping daqMapping : daqMappingCollection.getObjects()) {
+ for (final SvtDaqMapping daqMapping : daqMappingCollection) {
// this.printDebug("Sensor: \n" + daqMapping.toString());
// Check that the FEB Hybrid ID is within the allowable limits
febHybridID = daqMapping.getFebHybridID();
Modified: java/branches/conditions-HPSJAVA-488/src/test/java/org/hps/conditions/svt/TestRunSvtDaqMappingTest.java
=============================================================================
--- java/branches/conditions-HPSJAVA-488/src/test/java/org/hps/conditions/svt/TestRunSvtDaqMappingTest.java (original)
+++ java/branches/conditions-HPSJAVA-488/src/test/java/org/hps/conditions/svt/TestRunSvtDaqMappingTest.java Wed Apr 22 14:08:45 2015
@@ -55,7 +55,7 @@
/**
* Perform checks of SVT DAQ mapping for Test Run.
- *
+ *
* @throws Exception if there is a test or conditions error
*/
public void test() throws Exception {
@@ -69,7 +69,7 @@
int totalSensors = 0;
this.printDebug("");
- for (final TestRunSvtDaqMapping daqMapping : daqMappingCollection.getObjects()) {
+ for (final TestRunSvtDaqMapping daqMapping : daqMappingCollection) {
this.printDebug("Sensor: \n" + daqMapping.toString());
@@ -96,7 +96,7 @@
/**
* Print debug message.
- *
+ *
* @param debugMessage the message
*/
private void printDebug(final String debugMessage) {
