Query data NCMP-Operational with CPSpath

[cps.git] / cps-ncmp-rest / src / main / java / org / onap / cps / ncmp / rest / controller / handlers / NcmpDatastoreOperationalResourceRequestHandler.java

diff --git a/cps-ncmp-rest/src/main/java/org/onap/cps/ncmp/rest/controller/handlers/NcmpDatastoreOperationalResourceRequestHandler.java b/cps-ncmp-rest/src/main/java/org/onap/cps/ncmp/rest/controller/handlers/NcmpDatastoreOperationalResourceRequestHandler.java
index 6ed9b8c..a4720b2 100644 (file)
--- a/cps-ncmp-rest/src/main/java/org/onap/cps/ncmp/rest/controller/handlers/NcmpDatastoreOperationalResourceRequestHandler.java
+++ b/cps-ncmp-rest/src/main/java/org/onap/cps/ncmp/rest/controller/handlers/NcmpDatastoreOperationalResourceRequestHandler.java
@@ -27,7 +27,7 @@ import org.onap.cps.ncmp.rest.executor.CpsNcmpTaskExecutor;
 import org.onap.cps.spi.FetchDescendantsOption;
 
 @Slf4j
-public class NcmpDatastoreOperationalResourceRequestHandler extends NcmpDatastoreResourceRequestHandler {
+public class NcmpDatastoreOperationalResourceRequestHandler extends NcmpDatastoreRequestHandler {
 
     public NcmpDatastoreOperationalResourceRequestHandler(final NetworkCmProxyDataService networkCmProxyDataService,
                                                           final CpsNcmpTaskExecutor cpsNcmpTaskExecutor,
@@ -37,16 +37,14 @@ public class NcmpDatastoreOperationalResourceRequestHandler extends NcmpDatastor
     }
 
     @Override
-    public Supplier<Object> getTask(final String cmHandle,
-                                    final String resourceIdentifier,
-                                    final String optionsParamInQuery,
-                                    final String topicParamInQuery,
-                                    final String requestId,
-                                    final Boolean includeDescendant) {
-
-        final FetchDescendantsOption fetchDescendantsOption =
-                Boolean.TRUE.equals(includeDescendant) ? FetchDescendantsOption.INCLUDE_ALL_DESCENDANTS
-                        : FetchDescendantsOption.OMIT_DESCENDANTS;
+    public Supplier<Object> getTaskSupplier(final String cmHandle,
+                                            final String resourceIdentifier,
+                                            final String optionsParamInQuery,
+                                            final String topicParamInQuery,
+                                            final String requestId,
+                                            final Boolean includeDescendant) {
+
+        final FetchDescendantsOption fetchDescendantsOption = getFetchDescendantsOption(includeDescendant);
 
         return () -> networkCmProxyDataService.getResourceDataOperational(cmHandle, resourceIdentifier,
                 fetchDescendantsOption);