Author: [log in to unmask]
Date: Thu Oct 22 17:15:56 2015
New Revision: 3884
Log:
Add file size to datacat API.
Modified:
java/trunk/datacat-client/src/main/java/org/hps/datacat/client/DatacatClient.java
java/trunk/datacat-client/src/main/java/org/hps/datacat/client/DatacatClientImpl.java
java/trunk/datacat-client/src/test/java/org/hps/datacat/client/DatacatClientTest.java
Modified: java/trunk/datacat-client/src/main/java/org/hps/datacat/client/DatacatClient.java
=============================================================================
--- java/trunk/datacat-client/src/main/java/org/hps/datacat/client/DatacatClient.java (original)
+++ java/trunk/datacat-client/src/main/java/org/hps/datacat/client/DatacatClient.java Thu Oct 22 17:15:56 2015
@@ -17,14 +17,16 @@
* @param folder the folder which must already exist
* @param dataType the data type
* @param resource the resource (path)
+ * @param size the size of the file in bytes
* @param site the site of the file
* @param fileFormat the file format
* @param name the name of the dataset
* @param metadata metadata to assign to the dataset
* @return the HTTP status code from the request
*/
- int addDataset(String folder, DatasetDataType dataType, String resource, DatasetSite site,
- DatasetFileFormat fileFormat, String name, Map<String, Object> metadata);
+ public int addDataset(final String folder, final DatasetDataType dataType, final String resource,
+ final long size, final DatasetSite site, final DatasetFileFormat fileFormat, final String name,
+ final Map<String, Object> metadata);
/**
* Add metadata to an existing dataset.
Modified: java/trunk/datacat-client/src/main/java/org/hps/datacat/client/DatacatClientImpl.java
=============================================================================
--- java/trunk/datacat-client/src/main/java/org/hps/datacat/client/DatacatClientImpl.java (original)
+++ java/trunk/datacat-client/src/main/java/org/hps/datacat/client/DatacatClientImpl.java Thu Oct 22 17:15:56 2015
@@ -77,6 +77,7 @@
* @param folder the logical folder in the datacat, which must already exist
* @param dataType the data type
* @param resource the resource (path on the file system)
+ * @param size the size of the file in bytes
* @param site the site of the file
* @param fileFormat the file format
* @param name the name of the dataset
@@ -84,8 +85,14 @@
* @return the HTTP status code from the request
*/
@Override
- public int addDataset(final String folder, final DatasetDataType dataType, final String resource,
- final DatasetSite site, final DatasetFileFormat fileFormat, final String name,
+ public int addDataset(
+ final String folder,
+ final DatasetDataType dataType,
+ final String resource,
+ final long size,
+ final DatasetSite site,
+ final DatasetFileFormat fileFormat,
+ final String name,
final Map<String, Object> metadata) {
final Map<String, Object> parameters = new HashMap<String, Object>();
parameters.put("dataType", dataType.toString());
@@ -93,6 +100,7 @@
parameters.put("site", DatasetSite.SLAC.name());
parameters.put("fileFormat", fileFormat.toString());
parameters.put("name", name);
+ parameters.put("size", size);
final JSONObject jsonDataset = JSONUtilities.createJSONDataset(parameters, metadata);
final String urlLocation = url + "/datasets.json/" + this.rootDir + "/" + folder;
LOGGER.info("addDataset: " + urlLocation);
Modified: java/trunk/datacat-client/src/test/java/org/hps/datacat/client/DatacatClientTest.java
=============================================================================
--- java/trunk/datacat-client/src/test/java/org/hps/datacat/client/DatacatClientTest.java (original)
+++ java/trunk/datacat-client/src/test/java/org/hps/datacat/client/DatacatClientTest.java Thu Oct 22 17:15:56 2015
@@ -37,7 +37,7 @@
dsMetadata.put("testFloat", 1.1f);
dsMetadata.put("testDouble", 1.2d);
dsMetadata.put("testString", "herpderp");
- response = client.addDataset(FOLDER, DatasetDataType.TEST, RESOURCE, DatasetSite.SLAC, DatasetFileFormat.TEST,
+ response = client.addDataset(FOLDER, DatasetDataType.TEST, RESOURCE, 0L, DatasetSite.SLAC, DatasetFileFormat.TEST,
DATASET_NAME, dsMetadata);
// Patch the dataset with some meta data.
|