From: Determe, Sebastien (sd378r) <sd378r@intl.att.com>
Date: Thu, 14 Sep 2017 14:08:55 +0000 (+0200)
Subject: Some rework around DAO classes
X-Git-Tag: 6.0.0~11^2~1000^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=729ad06baa65151578399f13173cc5de35e1be8c;p=policy%2Fclamp.git

Some rework around DAO classes

Remove the useless return parameter in setModel, remove the
runtimeService in cldsTemplateService

Change-Id: Ia6d82cc3167f2e82b0da9cdb14d93c64ccee19c4
Issue-ID: CLAMP-54
Signed-off-by: Determe, Sebastien (sd378r) <sd378r@intl.att.com>
---

diff --git a/src/main/java/org/onap/clamp/clds/dao/CldsDao.java b/src/main/java/org/onap/clamp/clds/dao/CldsDao.java
index 3cc6a325a..b64978346 100644
--- a/src/main/java/org/onap/clamp/clds/dao/CldsDao.java
+++ b/src/main/java/org/onap/clamp/clds/dao/CldsDao.java
@@ -407,9 +407,8 @@ public class CldsDao {
      *
      * @param template
      * @param userid
-     * @return
      */
-    public CldsTemplate setTemplate(CldsTemplate template, String userid) {
+    public void setTemplate(CldsTemplate template, String userid) {
         SqlParameterSource in = new MapSqlParameterSource().addValue("v_template_name", template.getName())
                 .addValue("v_user_id", userid).addValue("v_template_bpmn_text", template.getBpmnText())
                 .addValue("v_template_image_text", template.getImageText())
@@ -425,7 +424,6 @@ public class CldsDao {
         template.setPropId((String) (out.get("v_template_doc_id")));
         template.setPropUserid((String) out.get("v_template_doc_user_id"));
         template.setPropText((String) out.get("v_template_doc_text"));
-        return template;
     }
 
     /**
diff --git a/src/main/java/org/onap/clamp/clds/service/CldsService.java b/src/main/java/org/onap/clamp/clds/service/CldsService.java
index 920bce181..0d62be55b 100644
--- a/src/main/java/org/onap/clamp/clds/service/CldsService.java
+++ b/src/main/java/org/onap/clamp/clds/service/CldsService.java
@@ -402,7 +402,6 @@ public class CldsService extends SecureServiceBase {
             }
         }
         cldsModel.save(cldsDao, getUserId());
-        cldsModel.save(cldsDao, getUserId());
         // audit log
         LoggingUtils.setTimeContext(startTime, new Date());
         LoggingUtils.setResponseContext("0", "Put model success", this.getClass().getName());