summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormpriyank <priyank.maheshwari@est.tech>2024-08-14 15:52:01 +0100
committermpriyank <priyank.maheshwari@est.tech>2024-08-14 15:52:05 +0100
commit202fc696cdf0a2503b2d5f738f892b8cb5da7bd9 (patch)
tree599531f7430396f2c4e3834e69bd6ad657be4730
parent372b29c094bb8968a6e09051055c460fe73c09f7 (diff)
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>
-rw-r--r--dmi-stub/dmi-plugin-demo-and-csit-stub-service/src/main/java/org/onap/cps/ncmp/dmi/rest/stub/controller/DmiRestStubController.java4
-rw-r--r--dmi-stub/dmi-plugin-demo-and-csit-stub-service/src/main/resources/data/ietf-network-topology-sample-rfc8345.json (renamed from dmi-stub/dmi-plugin-demo-and-csit-stub-service/src/main/resources/data.operational/ietf-network-topology-sample-rfc8345.json)0
2 files changed, 2 insertions, 2 deletions
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
index 8f9dbc22..8f9dbc22 100644
--- 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