summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorToine Siebelink <toine.siebelink@est.tech>2022-07-01 15:40:56 +0000
committerGerrit Code Review <gerrit@onap.org>2022-07-01 15:40:56 +0000
commitd925a54f81d014ef279288469b6e64032c031929 (patch)
treea164f242280c3fd9fd4ba03df7c8db92e4bfff3d
parent7914c8924723092345e8b4d829f15d2a3a5c72c8 (diff)
parentfa86bb96dd2d8aaba4bd7ecd0d881305eab174e3 (diff)
Merge "cps-ncmp-rest-stub can not be compiled and executed"
-rw-r--r--cps-ncmp-rest-stub/src/main/java/org/onap/cps/ncmp/rest/stub/controller/NetworkCmProxyStubController.java31
-rw-r--r--cps-ncmp-rest-stub/src/main/resources/stubs/cmHandlesSearch.json10
-rw-r--r--pom.xml3
3 files changed, 23 insertions, 21 deletions
diff --git a/cps-ncmp-rest-stub/src/main/java/org/onap/cps/ncmp/rest/stub/controller/NetworkCmProxyStubController.java b/cps-ncmp-rest-stub/src/main/java/org/onap/cps/ncmp/rest/stub/controller/NetworkCmProxyStubController.java
index 6362cf1e15..45408b0ebf 100644
--- a/cps-ncmp-rest-stub/src/main/java/org/onap/cps/ncmp/rest/stub/controller/NetworkCmProxyStubController.java
+++ b/cps-ncmp-rest-stub/src/main/java/org/onap/cps/ncmp/rest/stub/controller/NetworkCmProxyStubController.java
@@ -24,6 +24,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import java.io.IOException;
import java.io.InputStream;
import java.nio.charset.StandardCharsets;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -32,9 +33,7 @@ import javax.validation.Valid;
import javax.validation.constraints.NotNull;
import lombok.extern.slf4j.Slf4j;
import org.onap.cps.ncmp.rest.api.NetworkCmProxyApi;
-import org.onap.cps.ncmp.rest.model.CmHandleQueryRestParameters;
-import org.onap.cps.ncmp.rest.model.CmHandles;
-import org.onap.cps.ncmp.rest.model.Conditions;
+import org.onap.cps.ncmp.rest.model.CmHandleQueryParameters;
import org.onap.cps.ncmp.rest.model.RestModuleReference;
import org.onap.cps.ncmp.rest.model.RestOutputCmHandle;
import org.onap.cps.ncmp.rest.model.RestOutputCmHandlePublicProperties;
@@ -68,18 +67,26 @@ public class NetworkCmProxyStubController implements NetworkCmProxyApi {
}
@Override
- public ResponseEntity<CmHandles> executeCmHandleSearch(@Valid final Conditions body) {
- final ObjectMapper mapper = new ObjectMapper();
- CmHandles cmHandles = new CmHandles();
+ public ResponseEntity<List<RestOutputCmHandle>> searchCmHandles(
+ final CmHandleQueryParameters cmHandleQueryParameters) {
+ List<RestOutputCmHandle> restOutputCmHandles = null;
// read JSON file and map/convert to java POJO
final ClassPathResource resource = new ClassPathResource(pathToResponseFiles + "cmHandlesSearch.json");
try (InputStream inputStream = resource.getInputStream()) {
final String string = new String(inputStream.readAllBytes(), StandardCharsets.UTF_8);
- cmHandles = mapper.readValue(string, CmHandles.class);
+ final ObjectMapper mapper = new ObjectMapper();
+ restOutputCmHandles = Arrays.asList(mapper.readValue(string, RestOutputCmHandle[].class));
} catch (final IOException exception) {
log.error("Error reading the file.", exception);
+ return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).build();
}
- return ResponseEntity.ok(cmHandles);
+ return ResponseEntity.ok(restOutputCmHandles);
+ }
+
+ @Override
+ public ResponseEntity<List<String>> searchCmHandleIds(
+ final CmHandleQueryParameters cmHandleQueryParameters) {
+ return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED);
}
@Override
@@ -107,16 +114,17 @@ public class NetworkCmProxyStubController implements NetworkCmProxyApi {
final String resourceIdentifier, final String optionsParamInQuery, final String topicParamInQuery) {
final ResponseEntity<Map<String, Object>> asyncResponse = populateAsyncResponse(topicParamInQuery);
final Map<String, Object> asyncResponseData = asyncResponse.getBody();
- final ObjectMapper mapper = new ObjectMapper();
Object responseObject = null;
// read JSON file and map/convert to java POJO
final ClassPathResource resource = new ClassPathResource(pathToResponseFiles
+ "passthrough-operational-example.json");
try (InputStream inputStream = resource.getInputStream()) {
final String string = new String(inputStream.readAllBytes(), StandardCharsets.UTF_8);
+ final ObjectMapper mapper = new ObjectMapper();
responseObject = mapper.readValue(string, Object.class);
} catch (final IOException exception) {
log.error("Error reading the file.", exception);
+ return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).build();
}
if (asyncResponseData == null) {
return ResponseEntity.ok(responseObject);
@@ -138,11 +146,6 @@ public class NetworkCmProxyStubController implements NetworkCmProxyApi {
}
@Override
- public ResponseEntity<List<String>> queryCmHandles(final CmHandleQueryRestParameters body) {
- return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED);
- }
-
- @Override
public ResponseEntity<RestOutputCmHandle> retrieveCmHandleDetailsById(final String cmHandleId) {
return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED);
}
diff --git a/cps-ncmp-rest-stub/src/main/resources/stubs/cmHandlesSearch.json b/cps-ncmp-rest-stub/src/main/resources/stubs/cmHandlesSearch.json
index 409d56fa44..9a2e1ed5d1 100644
--- a/cps-ncmp-rest-stub/src/main/resources/stubs/cmHandlesSearch.json
+++ b/cps-ncmp-rest-stub/src/main/resources/stubs/cmHandlesSearch.json
@@ -1,10 +1,8 @@
-{
- "cmHandles": [
+[
{
- "cmHandleId": "stub-cm-handle-id"
+ "cmHandle": "stub-cm-handle-id"
},
{
- "cmHandleId": "stub-cm-handle-id2"
+ "cmHandle": "stub-cm-handle-id2"
}
- ]
-} \ No newline at end of file
+ ] \ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 12d8a1f44c..bb3553b15e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
Copyright (c) 2020 Linux Foundation.
Modifications Copyright (C) 2020-2021 Nordix Foundation
Modifications Copyright (C) 2020-2021 Pantheon.tech
- Modifications Copyright (C) 2021 Bell Canada.
+ Modifications Copyright (C) 2021-2022 Bell Canada.
================================================================================
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -58,6 +58,7 @@
<module>cps-ncmp-events</module>
<module>cps-ncmp-service</module>
<module>cps-ncmp-rest</module>
+ <module>cps-ncmp-rest-stub</module>
<module>cps-path-parser</module>
<module>cps-ri</module>
<module>checkstyle</module>