From: mpriyank <priyank.maheshwari@est.tech>
Date: Wed, 14 Aug 2024 14:52:01 +0000 (+0100)
Subject: Corrected Resource location for Stub
X-Git-Tag: 1.6.0~32
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=202fc696cdf0a2503b2d5f738f892b8cb5da7bd9;p=cps%2Fncmp-dmi-plugin.git

Corrected Resource location for Stub

- eliminate nullpointerexception from the DMI Stub logs

Issue-ID: CPS-2313
Change-Id: Iccfce28b3ccacb55b14a16525dcc621b4e1ae675
Signed-off-by: mpriyank <priyank.maheshwari@est.tech>
---

diff --git a/dmi-stub/dmi-plugin-demo-and-csit-stub-service/src/main/java/org/onap/cps/ncmp/dmi/rest/stub/controller/DmiRestStubController.java b/dmi-stub/dmi-plugin-demo-and-csit-stub-service/src/main/java/org/onap/cps/ncmp/dmi/rest/stub/controller/DmiRestStubController.java
index 5021ae76..e06c528d 100644
--- a/dmi-stub/dmi-plugin-demo-and-csit-stub-service/src/main/java/org/onap/cps/ncmp/dmi/rest/stub/controller/DmiRestStubController.java
+++ b/dmi-stub/dmi-plugin-demo-and-csit-stub-service/src/main/java/org/onap/cps/ncmp/dmi/rest/stub/controller/DmiRestStubController.java
@@ -225,7 +225,7 @@ public class DmiRestStubController {
         log.info("Logging request body {}", requestBody);
 
         final String sampleJson = ResourceFileReaderUtil.getResourceFileContent(applicationContext.getResource(
-                ResourceLoader.CLASSPATH_URL_PREFIX + "data/operational/ietf-network-topology-sample-rfc8345.json"));
+                ResourceLoader.CLASSPATH_URL_PREFIX + "data/ietf-network-topology-sample-rfc8345.json"));
         return ResponseEntity.ok(sampleJson);
     }
 
@@ -347,7 +347,7 @@ public class DmiRestStubController {
         response.setOptions(dataOperationRequest.getOptions());
         final String ietfNetworkTopologySample = ResourceFileReaderUtil.getResourceFileContent(
                 applicationContext.getResource(ResourceLoader.CLASSPATH_URL_PREFIX
-                        + "data/operational/ietf-network-topology-sample-rfc8345.json"));
+                        + "data/ietf-network-topology-sample-rfc8345.json"));
         final JSONParser jsonParser = new JSONParser();
         try {
             response.setResult(jsonParser.parse(ietfNetworkTopologySample));
diff --git a/dmi-stub/dmi-plugin-demo-and-csit-stub-service/src/main/resources/data.operational/ietf-network-topology-sample-rfc8345.json b/dmi-stub/dmi-plugin-demo-and-csit-stub-service/src/main/resources/data/ietf-network-topology-sample-rfc8345.json
similarity index 100%
rename from dmi-stub/dmi-plugin-demo-and-csit-stub-service/src/main/resources/data.operational/ietf-network-topology-sample-rfc8345.json
rename to dmi-stub/dmi-plugin-demo-and-csit-stub-service/src/main/resources/data/ietf-network-topology-sample-rfc8345.json