From 1885741f27d74104a34cadf1f4d9c73f82c4fcff Mon Sep 17 00:00:00 2001
From: xg353y <xg353y@intl.att.com>
Date: Wed, 20 Feb 2019 12:45:04 +0100
Subject: Fix the bugs

Fix the bugs in tosca model related code, due to the json removal
activity.

Issue-ID: CLAMP-292
Change-Id: I6306930052b876b1ba8b0e1ce71689d4499e165c

Change-Id: I6306930052b876b1ba8b0e1ce71689d4499e165c
Signed-off-by: xg353y <xg353y@intl.att.com>
---
 .../org/onap/clamp/clds/model/CldsToscaModel.java  | 24 ++++++----------------
 .../onap/clamp/clds/service/CldsToscaService.java  | 14 ++++++-------
 2 files changed, 12 insertions(+), 26 deletions(-)

(limited to 'src/main/java')

diff --git a/src/main/java/org/onap/clamp/clds/model/CldsToscaModel.java b/src/main/java/org/onap/clamp/clds/model/CldsToscaModel.java
index 25b8d4016..6184b3946 100644
--- a/src/main/java/org/onap/clamp/clds/model/CldsToscaModel.java
+++ b/src/main/java/org/onap/clamp/clds/model/CldsToscaModel.java
@@ -36,7 +36,12 @@ public class CldsToscaModel extends CldsToscaModelRevision {
     private String id;
     private String policyType;
     private String toscaModelName;
-    private String toscaModelYaml;
+
+    /**
+     * Construct
+     */
+    public CldsToscaModel () {
+    }
 
     /**
      * Creates or updates Tosca Model to DB
@@ -123,21 +128,4 @@ public class CldsToscaModel extends CldsToscaModelRevision {
         this.toscaModelName = toscaModelName;
     }
 
-    /**
-     * @return the toscaModelYaml
-     */
-    @Override
-    public String getToscaModelYaml() {
-        return toscaModelYaml;
-    }
-
-    /**
-     * @param toscaModelYaml
-     *        the toscaModelYaml to set
-     */
-    @Override
-    public void setToscaModelYaml(String toscaModelYaml) {
-        this.toscaModelYaml = toscaModelYaml;
-    }
-
 }
diff --git a/src/main/java/org/onap/clamp/clds/service/CldsToscaService.java b/src/main/java/org/onap/clamp/clds/service/CldsToscaService.java
index 04205b704..adebd7853 100644
--- a/src/main/java/org/onap/clamp/clds/service/CldsToscaService.java
+++ b/src/main/java/org/onap/clamp/clds/service/CldsToscaService.java
@@ -101,7 +101,7 @@ public class CldsToscaService extends SecureServiceBase {
      * 
      * @return clds tosca models - list of CLDS tosca models
      */
-    public ResponseEntity<List<CldsToscaModel>> getAllToscaModels() {
+    public List<CldsToscaModel> getAllToscaModels() {
 
         Date startTime = new Date();
         LoggingUtils.setRequestContext("CldsToscaService: Get All tosca models", getPrincipalName());
@@ -111,7 +111,7 @@ public class CldsToscaService extends SecureServiceBase {
         LoggingUtils.setTimeContext(startTime, new Date());
         LoggingUtils.setResponseContext("0", "Get All tosca models success", this.getClass().getName());
         auditLogger.info("Get All tosca models");
-        return new ResponseEntity<>(cldsToscaModels, HttpStatus.OK);
+        return cldsToscaModels;
     }
 
     /**
@@ -123,7 +123,7 @@ public class CldsToscaService extends SecureServiceBase {
      * 
      * @return clds tosca model - CLDS tosca model for a given tosca model name
      */
-    public ResponseEntity<CldsToscaModel> getToscaModel(String toscaModelName) {
+    public CldsToscaModel getToscaModel(String toscaModelName) {
         Date startTime = new Date();
         LoggingUtils.setRequestContext("CldsToscaService: Get tosca models by model name", getPrincipalName());
         // TODO revisit based on new permissions
@@ -132,8 +132,7 @@ public class CldsToscaService extends SecureServiceBase {
         LoggingUtils.setTimeContext(startTime, new Date());
         LoggingUtils.setResponseContext("0", "Get tosca models by model name success", this.getClass().getName());
         auditLogger.info("GET tosca models by model name completed");
-        return new ResponseEntity<>(Optional.ofNullable(cldsToscaModels).get().stream().findFirst().get(),
-                HttpStatus.OK);
+        return cldsToscaModels.get(0);
     }
 
     /**
@@ -143,7 +142,7 @@ public class CldsToscaService extends SecureServiceBase {
      * @param policyType
      * @return clds tosca model - CLDS tosca model for a given policy type
      */
-    public ResponseEntity<CldsToscaModel> getToscaModelsByPolicyType(String policyType) {
+    public CldsToscaModel getToscaModelsByPolicyType(String policyType) {
         Date startTime = new Date();
         LoggingUtils.setRequestContext("CldsToscaService: Get tosca models by policyType", getPrincipalName());
         // TODO revisit based on new permissions
@@ -152,8 +151,7 @@ public class CldsToscaService extends SecureServiceBase {
         LoggingUtils.setTimeContext(startTime, new Date());
         LoggingUtils.setResponseContext("0", "Get tosca models by policyType success", this.getClass().getName());
         auditLogger.info("GET tosca models by policyType completed");
-        return new ResponseEntity<>(Optional.ofNullable(cldsToscaModels).get().stream().findFirst().get(),
-                HttpStatus.OK);
+        return cldsToscaModels.get(0);
     }
 
     public ResponseEntity<?> deleteToscaModelById(String toscaModeId) {
-- 
cgit 1.2.3-korg