Merge pull request #71 from usnistgov/feature/Updated-bundlePlan-results

Provide additional stats in bundle plan response to enable user evaluation

.gitignore

@@ -13,3 +13,5 @@
 hs_err_pid*
 /bin/
 /target/
+*.classpath
+*.project

pom.xml

@@ -280,4 +280,4 @@
         </repository>
     </repositories>
 
-</project>
+</project>

src/main/java/gov/nist/oar/distrib/datapackage/BundleDownloadPlan.java

@@ -53,6 +53,12 @@ public class BundleDownloadPlan {
      * List of files not included in the bundle
      */
     private NotIncludedFile[] notIncluded;
+
+    private long size;
+
+    private long bundleCount;
+
+    private long filesCount;
 
     /**
      * Default Constructor
@@ -77,13 +83,17 @@ public BundleDownloadPlan() {
      *            If files are not included in the bundle.
      */
     public BundleDownloadPlan(String postEachTo, String status, BundleRequest[] requests, 
-                              String[] messages, NotIncludedFile[] notIncluded)
+                              String[] messages, NotIncludedFile[] notIncluded, long size, long bundleCount, long filesCount)
     {
 	this.postEachTo = postEachTo;
 	this.status = status;
 	this.requests = requests;
 	this.messages = messages;
 	this.notIncluded = notIncluded;
+	this.size = size;
+	this.bundleCount = bundleCount;
+	this.filesCount = filesCount;
+
     }
 
     /**
@@ -132,7 +142,31 @@ public void setMessages(String[] msgs) {
     public void setNotIncluded(NotIncludedFile[] notIncluded) {
 	this.notIncluded = notIncluded;
     }
+
+    public void setSize(long size) {
+    	this.size = size;
+    }
+
+    public long getSize() {
+    	return this.size;
+    }
+
+
+    public void setBundleCount(long bCount) {
+    	this.bundleCount = bCount;
+    }
 
+    public long getBundleCount() {
+    	return this.bundleCount;
+    }
+
+    public void setFilesCount(long fCount) {
+    	this.filesCount = fCount;
+    }
+
+    public long getFilesCount() {
+    	return this.filesCount;
+    }
     /**
      * return the API endpoint to POST each request in the plan to. 
      * 
@@ -183,5 +217,6 @@ public String[] getMessages() {
     public NotIncludedFile[] getNotIncluded() {
 	return this.notIncluded;
     }
+
 
 }

src/main/java/gov/nist/oar/distrib/datapackage/BundleRequest.java

@@ -28,6 +28,8 @@ public class BundleRequest {
      * FilePAths and Urls json array
      */
     private FileRequest[] includeFiles;
+
+    private long bundleSize;
 
     /**
      * Default Constructor
@@ -42,11 +44,30 @@ public BundleRequest() {
      * @param bundleName
      * @param includeFiles
      */
-    public BundleRequest(String bundleName, FileRequest[] includeFiles) {
+    public BundleRequest(String bundleName, FileRequest[] includeFiles, long bundleSize) {
 	this.bundleName = bundleName;
 	this.includeFiles = includeFiles;
+	this.bundleSize = bundleSize;
     }
 
+    /**
+     * Set  the bundle size
+     * 
+     * @param bundleName  the name to give to the bundle
+     */
+    public void setBundleSize(long size) {
+	this.bundleSize = size;
+    }
+
+    /**
+     * Return the name requested to be assigned to the bundle
+     * 
+     * @return String -- the desired name for the bundle
+     */
+    public long getBundleSize() {
+	return this.bundleSize;
+    }
+
     /**
      * Set the requested name to give to the bundle
      *