Merge pull request #21 from indigo-dc/spring-boot

add query filter to GET object by path
SNIA · Jun 20, 2016 · c785beb · c785beb
2 parents 1a67ff8 + 0e9b413
commit c785beb
Showing 1 changed file with 26 additions and 9 deletions.
diff --git a/src/main/java/edu/kit/scc/CdmiRestController.java b/src/main/java/edu/kit/scc/CdmiRestController.java
@@ -184,7 +184,7 @@ public ResponseEntity<?> getCdmiObjectById(
     log.debug("Get objectID {}", objectId);
 
     String query = request.getQueryString();
-    log.debug("Requested capabilities query {}", query);
+    log.debug("Requested object query {}", query);
 
     CdmiObject cdmiObject = cdmiObjectDao.getCdmiObject(objectId);
 
@@ -252,30 +252,47 @@ public ResponseEntity<?> getCdmiObjectByPath(
 
     log.debug("Get path {}", path);
 
+    String query = request.getQueryString();
+    log.debug("Requested object query {}", query);
+
     CdmiObject cdmiObject = cdmiObjectDao.getCdmiObjectByPath(path);
 
     if (cdmiObject != null) {
+      String objectString = "";
       if (cdmiObject instanceof Container) {
         responseHeaders.setContentType(new MediaType("application", "cdmi-container"));
         Container container = (Container) cdmiObject;
-        return new ResponseEntity<String>(container.toJson().toString(), responseHeaders,
-            HttpStatus.OK);
+        if (query != null) {
+          objectString = filterQueryFields(container.toJson(), query).toString();
+        } else {
+          objectString = container.toJson().toString();
+        }
       } else if (cdmiObject instanceof DataObject) {
         responseHeaders.setContentType(new MediaType("application", "cdmi-object"));
         DataObject dataObject = (DataObject) cdmiObject;
-        return new ResponseEntity<String>(dataObject.toJson().toString(), responseHeaders,
-            HttpStatus.OK);
+        if (query != null) {
+          objectString = filterQueryFields(dataObject.toJson(), query).toString();
+        } else {
+          objectString = dataObject.toJson().toString();
+        }
       } else if (cdmiObject instanceof Capability) {
         responseHeaders.setContentType(new MediaType("application", "cdmi-capability"));
         Capability capability = (Capability) cdmiObject;
-        return new ResponseEntity<String>(capability.toJson().toString(), responseHeaders,
-            HttpStatus.OK);
+        if (query != null) {
+          objectString = filterQueryFields(capability.toJson(), query).toString();
+        } else {
+          objectString = capability.toJson().toString();
+        }
       } else if (cdmiObject instanceof Domain) {
         responseHeaders.setContentType(new MediaType("application", "cdmi-domain"));
         Domain domain = (Domain) cdmiObject;
-        return new ResponseEntity<String>(domain.toJson().toString(), responseHeaders,
-            HttpStatus.OK);
+        if (query != null) {
+          objectString = filterQueryFields(domain.toJson(), query).toString();
+        } else {
+          objectString = domain.toJson().toString();
+        }
       }
+      return new ResponseEntity<String>(objectString, responseHeaders, HttpStatus.OK);
     }
     return new ResponseEntity<String>("Object not found", responseHeaders, HttpStatus.NOT_FOUND);
   }