From: SRINIVAS V <srinivasa.mohan@huawei.com>
Date: Sat, 6 Jan 2018 17:07:33 +0000 (+0530)
Subject: Fixed as per Java Code Conventions
X-Git-Tag: v0.2.1~19
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=ef57280a782d3d009bcaa2481c9f26b2b7e1b877;p=ccsdk%2Fsli%2Fnorthbound.git

Fixed as per Java Code Conventions

*Removed the commented code of addParameter function
*Code optimized

Change-Id: Ibd711561d1f94854df464d6e94de6ef2fc8b6cd6
Issue-ID: CCSDK-151
Signed-off-by: SRINIVAS V <srinivasa.mohan@huawei.com>
---

diff --git a/asdcApi/provider/src/main/java/org/onap/ccsdk/sli/northbound/asdcapi/AsdcApiProvider.java b/asdcApi/provider/src/main/java/org/onap/ccsdk/sli/northbound/asdcapi/AsdcApiProvider.java
index 7f830bcc..0c2ce2fc 100644
--- a/asdcApi/provider/src/main/java/org/onap/ccsdk/sli/northbound/asdcapi/AsdcApiProvider.java
+++ b/asdcApi/provider/src/main/java/org/onap/ccsdk/sli/northbound/asdcapi/AsdcApiProvider.java
@@ -189,11 +189,7 @@ public class AsdcApiProvider implements AutoCloseable, ASDCAPIService {
 
         }
 
-        if (data.isPresent()) {
-            return true;
-        } else {
-            return false;
-        }
+        return data.isPresent();
     }
 
     protected void addArtifactVersion(String aName, String aVersion) {
diff --git a/ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncARModel.java b/ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncARModel.java
index b26c50fb..65215593 100644
--- a/ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncARModel.java
+++ b/ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncARModel.java
@@ -43,8 +43,6 @@ public class SdncARModel extends SdncBaseModel {
 		addParameter("type", extractValue (nodeTemplate, "nf_type"));
 		addParameter("ecomp_generated_naming", extractBooleanValue (nodeTemplate, "nf_naming#ecomp_generated_naming"));
 		addParameter("naming_policy", extractValue (nodeTemplate, "nf_naming#naming_policy"));
-		//addParameter("depending_service", extractValue (sdcCsarHelper, nodeTemplate, SdcPropertyNames.PROPERTY_NAME_DEPENDINGSERVICE));
-		//addParameter("service_dependency", extractValue (sdcCsarHelper, nodeTemplate, SdcPropertyNames.PROPERTY_NAME_SERVICEDEPENDENCY));
 	}
 
 }