Fix Java Code Conventions non-compliance issues

Update locations of the constructor and private variable to comply with the Java Code Conventions.

Issue-ID: SDC-3121
Signed-off-by: xuegao <xg353y@intl.att.com>
Change-Id: I0114c880e389f0ed167262c9cd513583be35ba56
Signed-off-by: xuegao <xg353y@intl.att.com>

diff --git a/common/onap-generic-artifact-browser/onap-generic-artifact-browser-service/src/main/java/org/onap/sdc/gab/yaml/YamlParser.java b/common/onap-generic-artifact-browser/onap-generic-artifact-browser-service/src/main/java/org/onap/sdc/gab/yaml/YamlParser.java
index ec4ff13..2dbb8ad 100644 (file)
--- a/common/onap-generic-artifact-browser/onap-generic-artifact-browser-service/src/main/java/org/onap/sdc/gab/yaml/YamlParser.java
+++ b/common/onap-generic-artifact-browser/onap-generic-artifact-browser-service/src/main/java/org/onap/sdc/gab/yaml/YamlParser.java
@@ -58,6 +58,10 @@ public class YamlParser implements AutoCloseable {
     private Stream<Object> parsedYamlContent;
     private InputStream inputStream;
     private Set<String> filters;
+    private Function<Object, List<SimpleEntry<String, ? extends Collection<Object>>>> containsKeys = parsedYamlSingleDocument -> {
+        JsonElement jsonElement = new Gson().toJsonTree(parsedYamlSingleDocument);
+        return findInJson(filters, jsonElement);
+    };
 
     public YamlParser() {
         this.parsedYamlContent = Stream.empty();
@@ -141,11 +145,6 @@ public class YamlParser implements AutoCloseable {
         }
     }
 
-    private Function<Object, List<SimpleEntry<String, ? extends Collection<Object>>>> containsKeys = parsedYamlSingleDocument -> {
-        JsonElement jsonElement = new Gson().toJsonTree(parsedYamlSingleDocument);
-        return findInJson(filters, jsonElement);
-    };
-
     private List<SimpleEntry<String, ? extends Collection<Object>>> findInJson(Set<String> keys,
         JsonElement document) {
         return keys.stream()

diff --git a/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/CapabilityFilter.java b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/CapabilityFilter.java
index ce0391d..dc868c9 100644 (file)
--- a/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/CapabilityFilter.java
+++ b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/CapabilityFilter.java
@@ -41,7 +41,4 @@ public class CapabilityFilter {
         return "CapabilityFilter{" + "properties=" + properties + '}';
     }
 
-    public CapabilityFilter() {
-        //default constructor
-    }
 }