Author: [log in to unmask]
Date: Tue Sep 29 13:12:32 2015
New Revision: 3737
Log:
Always interpret integers as long values in metadata.
Modified:
java/trunk/datacat-client/src/main/java/org/hps/datacat/client/DatasetMetadata.java
java/trunk/datacat-client/src/main/java/org/hps/datacat/client/DatasetMetadataImpl.java
Modified: java/trunk/datacat-client/src/main/java/org/hps/datacat/client/DatasetMetadata.java
=============================================================================
--- java/trunk/datacat-client/src/main/java/org/hps/datacat/client/DatasetMetadata.java (original)
+++ java/trunk/datacat-client/src/main/java/org/hps/datacat/client/DatasetMetadata.java Tue Sep 29 13:12:32 2015
@@ -13,16 +13,16 @@
* @param key the key name
* @return the double value
*/
- double getDouble(String key);
+ Double getDouble(String key);
/**
- * Get an integer value.
+ * Get a long value.
*
* @param key the key name
- * @return the integer value
+ * @return the long value
*/
- int getInteger(String key);
-
+ Long getLong(String key);
+
/**
* Get a string value.
*
Modified: java/trunk/datacat-client/src/main/java/org/hps/datacat/client/DatasetMetadataImpl.java
=============================================================================
--- java/trunk/datacat-client/src/main/java/org/hps/datacat/client/DatasetMetadataImpl.java (original)
+++ java/trunk/datacat-client/src/main/java/org/hps/datacat/client/DatasetMetadataImpl.java Tue Sep 29 13:12:32 2015
@@ -43,7 +43,7 @@
} else if (type.equals("decimal")) {
value = jsonObject.getDouble("value");
} else if (type.equals("integer")) {
- value = jsonObject.getInt("value");
+ value = jsonObject.getLong("value");
} else {
throw new IllegalArgumentException("Unknown type: " + type);
}
@@ -59,21 +59,21 @@
* @return the double value
*/
@Override
- public double getDouble(String key) {
+ public Double getDouble(String key) {
return Double.class.cast(metadataMap.get(key));
}
/**
- * Get an integer value.
+ * Get a long value.
*
* @param key the key name
- * @return the integer value
+ * @return the long value
*/
@Override
- public int getInteger(String key) {
- return Integer.class.cast(metadataMap.get(key));
+ public Long getLong(String key) {
+ return Long.class.cast(metadataMap.get(key));
}
-
+
/**
* Get a string value.
*
