Changing resource identifier to a query param
[cps.git] / cps-ncmp-service / src / main / java / org / onap / cps / ncmp / api / impl / operation / DmiOperations.java
index 2b13d16..c295e03 100644 (file)
@@ -30,28 +30,30 @@ import org.springframework.stereotype.Component;
 
 @Component
 public class DmiOperations {
-
     @Getter
-    public enum PassThroughEnum {
-        OPERATIONAL("/ncmp-datastore:passthrough-operational/"),
-        RUNNING("/ncmp-datastore:passthrough-running/");
+    public enum DataStoreEnum {
+        PASSTHROUGH_OPERATIONAL("ncmp-datastore:passthrough-operational"),
+        PASSTHROUGH_RUNNING("ncmp-datastore:passthrough-running");
         private String value;
 
-        PassThroughEnum(final String value) {
+        DataStoreEnum(final String value) {
             this.value = value;
         }
 
         @Override
         @JsonValue
         public String toString() {
-            return String.valueOf(value);
+            return value;
         }
     }
 
     private DmiRestClient dmiRestClient;
-    private static final String PARENT_CM_HANDLE_URI =
-            "/v1/ch/{cmHandle}/data/ds";
-    private final int indexCmHandleInUri;
+    private static final String DMI_API_PATH = "/dmi";
+    private static final String DMI_CM_HANDLE_PATH = "/v1/ch/{cmHandle}";
+    private static final String DMI_CM_HANDLE_DATASTORE_PATH = DMI_CM_HANDLE_PATH + "/data/ds";
+    private static final String URL_SEPARATOR = "/";
+    private static final String RESOURCE_IDENTIFIER = "resourceIdentifier";
+
 
     /**
      * Constructor for {@code DmiOperations}. This method also manipulates url properties.
@@ -60,88 +62,158 @@ public class DmiOperations {
      */
     public DmiOperations(final DmiRestClient dmiRestClient) {
         this.dmiRestClient = dmiRestClient;
-        indexCmHandleInUri = PARENT_CM_HANDLE_URI.indexOf("{cmHandle}");
+    }
+
+    /**
+     * Get resources from DMI.
+     *
+     * @param dmiServiceName dmi service name
+     * @param cmHandle cmHandle
+     * @param resourceName name of the resource(s)
+     * @return {@code ResponseEntity} response entity
+     */
+    public ResponseEntity<String> getResourceFromDmi(final String dmiServiceName,
+                                                     final String cmHandle,
+                                                     final String resourceName) {
+        final var dmiResourceDataUrl = getDmiResourceUrl(dmiServiceName, cmHandle, resourceName);
+        final var httpHeaders = new HttpHeaders();
+        return dmiRestClient.postOperation(dmiResourceDataUrl, httpHeaders);
+    }
+
+    /**
+     * Get resources from DMI for modules.
+     *
+     * @param dmiServiceName dmi service name
+     * @param jsonData module names and revisions as JSON
+     * @param cmHandle cmHandle
+     * @param resourceName name of the resource(s)
+     * @return {@code ResponseEntity} response entity
+     */
+    public ResponseEntity<String> getResourceFromDmiWithJsonData(final String dmiServiceName,
+                                                               final String jsonData,
+                                                               final String cmHandle,
+                                                               final String resourceName) {
+        final String dmiResourceDataUrl = getDmiResourceUrl(dmiServiceName, cmHandle, resourceName);
+        return dmiRestClient.postOperationWithJsonData(dmiResourceDataUrl, jsonData, new HttpHeaders());
     }
 
     /**
      * This method fetches the resource data from operational data store for given cm handle
      * identifier on given resource using dmi client.
      *
-     * @param dmiBasePath dmi base path
-     * @param cmHandle network resource identifier
-     * @param resourceId resource identifier
+     * @param dmiServiceName dmi service name
+     * @param cmHandle    network resource identifier
+     * @param resourceId  resource identifier
      * @param fieldsQuery fields query
-     * @param depthQuery depth query
+     * @param depthQuery  depth query
      * @param acceptParam accept parameter
-     * @param jsonBody json body for put operation
+     * @param jsonBody    json body for put operation
      * @return {@code ResponseEntity} response entity
      */
-    public ResponseEntity<Object> getResouceDataOperationalFromDmi(final String dmiBasePath,
-                                                                   final String cmHandle,
-                                                                   final String resourceId,
-                                                                   final String fieldsQuery,
-                                                                   final Integer depthQuery,
-                                                                   final String acceptParam,
-                                                                   final String jsonBody) {
-        final var builder = getDmiResourceDataUrl(dmiBasePath, cmHandle, resourceId,
-                fieldsQuery, depthQuery, PassThroughEnum.OPERATIONAL);
+    public ResponseEntity<Object> getResourceDataOperationalFromDmi(final String dmiServiceName,
+                                                                    final String cmHandle,
+                                                                    final String resourceId,
+                                                                    final String fieldsQuery,
+                                                                    final Integer depthQuery,
+                                                                    final String acceptParam,
+                                                                    final String jsonBody) {
+        final var dmiResourceDataUrl = getDmiDatastoreUrl(dmiServiceName, cmHandle, resourceId,
+            fieldsQuery, depthQuery, DataStoreEnum.PASSTHROUGH_OPERATIONAL);
         final var httpHeaders = prepareHeader(acceptParam);
-        return dmiRestClient.putOperationWithJsonData(builder.toString(), jsonBody, httpHeaders);
+        return dmiRestClient.putOperationWithJsonData(dmiResourceDataUrl, jsonBody, httpHeaders);
     }
 
     /**
      * This method fetches the resource data from pass-through running data store for given cm handle
      * identifier on given resource using dmi client.
      *
-     * @param dmiBasePath dmi base path
-     * @param cmHandle network resource identifier
-     * @param resourceId resource identifier
+     * @param dmiServiceName dmi service name
+     * @param cmHandle    network resource identifier
+     * @param resourceId  resource identifier
      * @param fieldsQuery fields query
-     * @param depthQuery depth query
+     * @param depthQuery  depth query
      * @param acceptParam accept parameter
-     * @param jsonBody json body for put operation
+     * @param jsonBody    json body for put operation
      * @return {@code ResponseEntity} response entity
      */
-    public ResponseEntity<Object> getResouceDataPassThroughRunningFromDmi(final String dmiBasePath,
-                                                                   final String cmHandle,
-                                                                   final String resourceId,
-                                                                   final String fieldsQuery,
-                                                                   final Integer depthQuery,
-                                                                   final String acceptParam,
-                                                                   final String jsonBody) {
-        final var builder = getDmiResourceDataUrl(dmiBasePath, cmHandle, resourceId,
-                fieldsQuery, depthQuery, PassThroughEnum.RUNNING);
+    public ResponseEntity<Object> getResourceDataPassThroughRunningFromDmi(final String dmiServiceName,
+                                                                           final String cmHandle,
+                                                                           final String resourceId,
+                                                                           final String fieldsQuery,
+                                                                           final Integer depthQuery,
+                                                                           final String acceptParam,
+                                                                           final String jsonBody) {
+        final var dmiResourceDataUrl = getDmiDatastoreUrl(dmiServiceName, cmHandle, resourceId,
+            fieldsQuery, depthQuery, DataStoreEnum.PASSTHROUGH_RUNNING);
         final var httpHeaders = prepareHeader(acceptParam);
-        return dmiRestClient.putOperationWithJsonData(builder.toString(), jsonBody, httpHeaders);
+        return dmiRestClient.putOperationWithJsonData(dmiResourceDataUrl, jsonBody, httpHeaders);
+    }
+
+    /**
+     * This method creates the resource data from pass-through running data store for given cm handle
+     * identifier on given resource using dmi client.
+     *
+     * @param dmiServiceName dmi service name
+     * @param cmHandle    network resource identifier
+     * @param resourceId  resource identifier
+     * @param jsonBody    json body for put operation
+     * @return {@code ResponseEntity} response entity
+     */
+    public ResponseEntity<String> createResourceDataPassThroughRunningFromDmi(final String dmiServiceName,
+                                                                            final String cmHandle,
+                                                                            final String resourceId,
+                                                                            final String jsonBody) {
+        final var stringBuilder = getStringBuilderForPassThroughRunningUrl(dmiServiceName,
+            cmHandle, resourceId, DataStoreEnum.PASSTHROUGH_RUNNING);
+        return dmiRestClient.postOperationWithJsonData(stringBuilder.toString(), jsonBody, new HttpHeaders());
     }
 
     @NotNull
-    private StringBuilder getDmiResourceDataUrl(final String dmiBasePath,
-                                                final String cmHandle,
-                                                final String resourceId,
-                                                final String fieldsQuery,
-                                                final Integer depthQuery,
-                                       final PassThroughEnum passThrough) {
-        final var builder =  new StringBuilder(PARENT_CM_HANDLE_URI.replace("{cmHandle}", cmHandle));
-        builder.append(passThrough.getValue());
-        builder.insert(builder.length(), resourceId);
-        appendFieldsAndDepth(fieldsQuery, depthQuery, builder);
-        builder.insert(0, dmiBasePath);
-        return builder;
+    private String getDmiResourceUrl(final String dmiServiceName,
+                                     final String cmHandle,
+                                     final String resourceName) {
+        final var stringBuilder = new StringBuilder(dmiServiceName);
+        stringBuilder.append(DMI_API_PATH);
+        stringBuilder.append(DMI_CM_HANDLE_PATH.replace("{cmHandle}", cmHandle));
+        stringBuilder.append(URL_SEPARATOR + resourceName);
+        return stringBuilder.toString();
+    }
+
+    @NotNull
+    private String getDmiDatastoreUrl(final String dmiServiceName,
+                                      final String cmHandle,
+                                      final String resourceId,
+                                      final String fieldsQuery,
+                                      final Integer depthQuery,
+                                      final DataStoreEnum dataStoreEnum) {
+        final var stringBuilder = getStringBuilderForPassThroughRunningUrl(dmiServiceName,
+            cmHandle, resourceId, dataStoreEnum);
+        appendFieldsAndDepth(stringBuilder, fieldsQuery, depthQuery);
+        return stringBuilder.toString();
+    }
+
+    @NotNull
+    private StringBuilder getStringBuilderForPassThroughRunningUrl(final String dmiServiceName,
+                                                                   final String cmHandle,
+                                                                   final String resourceId,
+                                                                   final DataStoreEnum dataStoreEnum) {
+        final var stringBuilder = new StringBuilder(dmiServiceName);
+        stringBuilder.append(DMI_API_PATH);
+        stringBuilder.append(DMI_CM_HANDLE_DATASTORE_PATH.replace("{cmHandle}", cmHandle));
+        stringBuilder.append(URL_SEPARATOR + dataStoreEnum.getValue());
+        stringBuilder.append("?" + RESOURCE_IDENTIFIER + "=" + resourceId);
+        return stringBuilder;
     }
 
-    private void appendFieldsAndDepth(final String fieldsQuery, final Integer depthQuery, final StringBuilder builder) {
+    private void appendFieldsAndDepth(final StringBuilder stringBuilder,
+                                      final String fieldsQuery,
+                                      final Integer depthQuery) {
         final var doesFieldExists = (fieldsQuery != null && !fieldsQuery.isEmpty());
         if (doesFieldExists) {
-            builder.append("?").append("fields=").append(fieldsQuery);
+            stringBuilder.append("&").append("fields=").append(fieldsQuery);
         }
         if (depthQuery != null) {
-            if (!doesFieldExists) {
-                builder.append("?");
-            } else {
-                builder.append("&");
-            }
-            builder.append("depth=").append(depthQuery);
+            stringBuilder.append("&").append("depth=").append(depthQuery);
         }
     }