Update snapshot and/or references of policy/models to latest snapshots

[policy/models.git] / models-interactions / model-simulators / src / main / java / org / onap / policy / simulators / SdncSimulatorJaxRs.java

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 0492c4e..20e1811 100644 (file)
--- 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
@@ -3,8 +3,8 @@
  * simulators
  * ================================================================================
  * 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, 2023 Nordix Foundation.
+ * Modifications Copyright (C) 2019-2021 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.
@@ -22,12 +22,12 @@
 
 package org.onap.policy.simulators;
 
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
 import java.util.UUID;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
 import org.onap.policy.sdnc.SdncResponse;
 import org.onap.policy.sdnc.SdncResponseOutput;
 import org.onap.policy.sdnc.util.Serialization;
@@ -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,9 +60,14 @@ public class SdncSimulatorJaxRs {
     @Consumes(MediaType.APPLICATION_JSON)
     @Produces("application/json")
     public String sdncVnfTopologyOperation() {
-        final SdncResponse response = new SdncResponse();
+        return makeSuccessResponse();
+    }
+
+
+    private String makeSuccessResponse() {
+        final var response = new SdncResponse();
         response.setRequestId(UUID.randomUUID().toString());
-        SdncResponseOutput responseOutput = new SdncResponseOutput();
+        var responseOutput = new SdncResponseOutput();
         responseOutput.setResponseCode("200");
         responseOutput.setAckFinalIndicator("Y");
         responseOutput.setSvcRequestId(UUID.randomUUID().toString());