Author: [log in to unmask]
Date: Wed May 27 19:00:38 2015
New Revision: 3043
Log:
Change return values to objects and not primitives.
Modified:
java/trunk/conditions/src/main/java/org/hps/conditions/api/ConditionsRecord.java
java/trunk/conditions/src/test/java/org/hps/conditions/EngRunConditionsTest.java
Modified: java/trunk/conditions/src/main/java/org/hps/conditions/api/ConditionsRecord.java
=============================================================================
--- java/trunk/conditions/src/main/java/org/hps/conditions/api/ConditionsRecord.java (original)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/api/ConditionsRecord.java Wed May 27 19:00:38 2015
@@ -279,7 +279,7 @@
* @return the collection ID
*/
@Field(names = {"collection_id"})
- public int getCollectionId() {
+ public Integer getCollectionId() {
return getFieldValue("collection_id");
}
@@ -330,7 +330,7 @@
* @return the ending run number
*/
@Field(names = {"run_end"})
- public int getRunEnd() {
+ public Integer getRunEnd() {
return getFieldValue("run_end");
}
@@ -340,7 +340,7 @@
* @return the starting run number
*/
@Field(names = {"run_start"})
- public int getRunStart() {
+ public Integer getRunStart() {
return getFieldValue("run_start");
}
Modified: java/trunk/conditions/src/test/java/org/hps/conditions/EngRunConditionsTest.java
=============================================================================
--- java/trunk/conditions/src/test/java/org/hps/conditions/EngRunConditionsTest.java (original)
+++ java/trunk/conditions/src/test/java/org/hps/conditions/EngRunConditionsTest.java Wed May 27 19:00:38 2015
@@ -121,12 +121,12 @@
/**
* Collection ID of calibrations.
*/
- private static final int CALIBRATIONS_COLLECTION_ID = 4;
+ private static final Integer CALIBRATIONS_COLLECTION_ID = 4;
/**
* Collection ID of gains.
*/
- private static final int GAINS_COLLECTION_ID = 4;
+ private static final Integer GAINS_COLLECTION_ID = 4;
/**
* Flag if {@link #detectorChanged(Detector)} is activated.
@@ -151,7 +151,7 @@
final EcalChannelCollection channels = conditionsManager.getCachedConditions(
EcalChannelCollection.class, "ecal_channels").getCachedData();
assertEquals("Wrong number of channels.", CHANNEL_COUNT, channels.size());
- assertEquals("Wrong channel collection ID.", 2, channels.getConditionsRecord().getCollectionId());
+ assertEquals("Wrong channel collection ID.", new Integer(2), channels.getConditionsRecord().getCollectionId());
checkRunNumbers(channels);
final EcalGainCollection gains = conditionsManager.getCachedConditions(
|