summaryrefslogtreecommitdiffstats
path: root/models-interactions/model-simulators
diff options
context:
space:
mode:
authorJim Hahn <jrh3@att.com>2020-04-08 10:04:29 -0400
committerJim Hahn <jrh3@att.com>2020-04-08 10:17:53 -0400
commitb2e61a292bc8a9edbed1569ab5655e2ee17a8f3b (patch)
tree402ed27ef8c89e2b0333e3578bad941ba7c3529c /models-interactions/model-simulators
parent9b3ff5f270572a6760ff07dda9577cdadb53b088 (diff)
More sonar fixes in models
Addressed the following sonar issues: - missing assert in junit - duplicate code blocks - fixed those in the simulators - leaving the others in the concept classes for Liam/"G" Issue-ID: POLICY-2305 Change-Id: Icfe80afb378b4cdec4de3d33d0e33227e04845d8 Signed-off-by: Jim Hahn <jrh3@att.com>
Diffstat (limited to 'models-interactions/model-simulators')
-rw-r--r--models-interactions/model-simulators/src/main/java/org/onap/policy/simulators/SdncSimulatorJaxRs.java16
-rw-r--r--models-interactions/model-simulators/src/main/java/org/onap/policy/simulators/SoSimulatorJaxRs.java21
2 files changed, 12 insertions, 25 deletions
diff --git a/models-interactions/model-simulators/src/main/java/org/onap/policy/simulators/SdncSimulatorJaxRs.java b/models-interactions/model-simulators/src/main/java/org/onap/policy/simulators/SdncSimulatorJaxRs.java
index 0492c4e55..b6e8b04bc 100644
--- a/models-interactions/model-simulators/src/main/java/org/onap/policy/simulators/SdncSimulatorJaxRs.java
+++ b/models-interactions/model-simulators/src/main/java/org/onap/policy/simulators/SdncSimulatorJaxRs.java
@@ -4,7 +4,7 @@
* ================================================================================
* Copyright (C) 2018 Huawei. All rights reserved.
* Modifications Copyright (C) 2019 Nordix Foundation.
- * Modifications Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2019-2020 AT&T Intellectual Property. All rights reserved.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -46,14 +46,7 @@ public class SdncSimulatorJaxRs {
@Consumes(MediaType.APPLICATION_JSON)
@Produces("application/json")
public String sdncPostQuery() {
- final SdncResponse response = new SdncResponse();
- response.setRequestId(UUID.randomUUID().toString());
- SdncResponseOutput responseOutput = new SdncResponseOutput();
- responseOutput.setResponseCode("200");
- responseOutput.setAckFinalIndicator("Y");
- responseOutput.setSvcRequestId(UUID.randomUUID().toString());
- response.setResponseOutput(responseOutput);
- return Serialization.gsonPretty.toJson(response);
+ return makeSuccessResponse();
}
@@ -67,6 +60,11 @@ public class SdncSimulatorJaxRs {
@Consumes(MediaType.APPLICATION_JSON)
@Produces("application/json")
public String sdncVnfTopologyOperation() {
+ return makeSuccessResponse();
+ }
+
+
+ private String makeSuccessResponse() {
final SdncResponse response = new SdncResponse();
response.setRequestId(UUID.randomUUID().toString());
SdncResponseOutput responseOutput = new SdncResponseOutput();
diff --git a/models-interactions/model-simulators/src/main/java/org/onap/policy/simulators/SoSimulatorJaxRs.java b/models-interactions/model-simulators/src/main/java/org/onap/policy/simulators/SoSimulatorJaxRs.java
index b06a66f41..ed6bce9e0 100644
--- a/models-interactions/model-simulators/src/main/java/org/onap/policy/simulators/SoSimulatorJaxRs.java
+++ b/models-interactions/model-simulators/src/main/java/org/onap/policy/simulators/SoSimulatorJaxRs.java
@@ -53,22 +53,7 @@ public class SoSimulatorJaxRs {
@Produces("application/json")
public String soPostQuery(@PathParam("serviceInstanceId") final String serviceInstanceId,
@PathParam("vnfInstanceId") final String vnfInstanceId) {
- final SoRequest request = new SoRequest();
- final SoRequestStatus requestStatus = new SoRequestStatus();
- requestStatus.setRequestState("COMPLETE");
- request.setRequestStatus(requestStatus);
- request.setRequestId(UUID.randomUUID());
-
- final SoResponse response = new SoResponse();
-
- final SoRequestReferences requestReferences = new SoRequestReferences();
- final String requestId = UUID.randomUUID().toString();
- requestReferences.setRequestId(requestId);
- response.setRequestReferences(requestReferences);
-
- response.setRequest(request);
-
- return new Gson().toJson(response);
+ return makeCompleteSuccess();
}
/**
@@ -85,6 +70,10 @@ public class SoSimulatorJaxRs {
public String soDelete(@PathParam("serviceInstanceId") final String serviceInstanceId,
@PathParam("vnfInstanceId") final String vnfInstanceId,
@PathParam("vfModuleInstanceId") final String vfModuleInstanceId) {
+ return makeCompleteSuccess();
+ }
+
+ private String makeCompleteSuccess() {
final SoRequest request = new SoRequest();
final SoRequestStatus requestStatus = new SoRequestStatus();
requestStatus.setRequestState("COMPLETE");