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 7f830bc..0c2ce2f 100644 (file)
--- 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 b26c50f..6521559 100644 (file)
--- 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));
        }
 
 }