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

add query filter to cdmi_objectid
SNIA · Jun 20, 2016 · 1a67ff8 · 1a67ff8
2 parents b6acc43 + b63bc2d
commit 1a67ff8
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 8 deletions.
diff --git a/pom.xml b/pom.xml
@@ -103,6 +103,14 @@
 				<groupId>org.jacoco</groupId>
 				<artifactId>jacoco-maven-plugin</artifactId>
 				<version>0.7.7.201606060606</version>
+				<configuration>
+					<excludes>
+						<exclude>**/cdmiserver/exception/*</exclude>
+						<exclude>**/cdmiserver/provider/*</exclude>
+						<exclude>**/cdmiserver/resource/*</exclude>
+						<exclude>**/cdmiserver/filter/*</exclude>
+					</excludes>
+				</configuration>
 				<executions>
 					<execution>
 						<id>default-prepare-agent</id>

diff --git a/src/main/java/edu/kit/scc/CdmiRestController.java b/src/main/java/edu/kit/scc/CdmiRestController.java
@@ -183,30 +183,47 @@ public ResponseEntity<?> getCdmiObjectById(
 
     log.debug("Get objectID {}", objectId);
 
+    String query = request.getQueryString();
+    log.debug("Requested capabilities query {}", query);
+
     CdmiObject cdmiObject = cdmiObjectDao.getCdmiObject(objectId);
 
     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);
   }