Enhancements for the aai-common library

[aai/aai-common.git] / aai-core / src / main / java / org / onap / aai / serialization / queryformats / Count.java

diff --git a/aai-core/src/main/java/org/onap/aai/serialization/queryformats/Count.java b/aai-core/src/main/java/org/onap/aai/serialization/queryformats/Count.java
index 8ee4e3a..60a10c5 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/serialization/queryformats/Count.java
+++ b/aai-core/src/main/java/org/onap/aai/serialization/queryformats/Count.java
@@ -23,6 +23,7 @@ package org.onap.aai.serialization.queryformats;
 import com.google.gson.JsonObject;
 
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
 import java.util.stream.Collectors;
 
@@ -37,8 +38,7 @@ import org.onap.aai.serialization.queryformats.exceptions.AAIFormatVertexExcepti
 public class Count implements FormatMapper {
 
     @Override
-    public Optional<JsonObject> formatObject(Object o)
-            throws AAIFormatVertexException, AAIFormatQueryResultFormatNotSupported {
+    public Optional<JsonObject> formatObject(Object o) {
         @SuppressWarnings("unchecked")
         List<Object> list = (List<Object>) o;
 
@@ -46,11 +46,16 @@ public class Count implements FormatMapper {
 
         list.stream().map(this::getCount).filter(Optional::isPresent).map(Optional::get)
                 .collect(Collectors.toConcurrentMap(Pair::getValue0, Pair::getValue1, Long::sum))
-                .forEach((k, v) -> countResult.addProperty(k, v));
+                .forEach(countResult::addProperty);
 
         return Optional.of(countResult);
     }
 
+    @Override
+    public Optional<JsonObject> formatObject(Object o, Map<String, List<String>> properties) throws AAIFormatVertexException, AAIFormatQueryResultFormatNotSupported {
+        return Optional.empty();
+    }
+
     @Override
     public int parallelThreshold() {
         return 20;
@@ -72,10 +77,10 @@ public class Count implements FormatMapper {
         }
 
         if (pair == null) {
-            return Optional.<Pair<String, Long>>empty();
+            return Optional.empty();
         }
 
-        return Optional.<Pair<String, Long>>of(pair);
+        return Optional.of(pair);
     }
 
 }