1 files changed, 13 insertions, 13 deletions
diff --git a/src/main/java/org/onap/pomba/contextbuilder/sdnc/model/VnfList.java b/src/main/java/org/onap/pomba/contextbuilder/sdnc/model/VnfList.java
index e6360fb..5610414 100644
--- a/src/main/java/org/onap/pomba/contextbuilder/sdnc/model/VnfList.java
+++ b/src/main/java/org/onap/pomba/contextbuilder/sdnc/model/VnfList.java
@@ -32,21 +32,10 @@ public class VnfList {
 
     @SerializedName("vnf-list")
     @Expose
-    private List<Vnf> vnfList = new ArrayList<Vnf>();
+    private List<Vnf> vnfList = new ArrayList<>();
 
     private static final Gson gson = new GsonBuilder().disableHtmlEscaping().create();
 
-    public static VnfList fromJson(String payload) throws AuditException {
-        try {
-            if (payload == null || payload.isEmpty()) {
-                throw new Exception(AuditError.JSON_EMPTY_RESPONSE);
-            }
-            return gson.fromJson(payload, VnfList.class);
-        } catch (Exception ex) {
-            throw new AuditException(AuditError.JSON_PARSE_ERROR, ex);
-        }
-    }
-
 
     /**
      * No args constructor for use in serialization
@@ -64,6 +53,17 @@ public class VnfList {
         this.vnfList = vnfList;
     }
 
+    public static VnfList fromJson(String payload) throws AuditException {
+        try {
+            if (payload == null || payload.isEmpty()) {
+                throw new AuditException(AuditError.JSON_EMPTY_RESPONSE);
+            }
+            return gson.fromJson(payload, VnfList.class);
+        } catch (Exception ex) {
+            throw new AuditException(AuditError.JSON_PARSE_ERROR, ex);
+        }
+    }
+
     public List<Vnf> getVnfList() {
         return vnfList;
     }
@@ -100,7 +100,7 @@ public class VnfList {
         if (other == this) {
             return true;
         }
-        if ((other instanceof VnfList) == false) {
+        if (!(other instanceof VnfList)) {
             return false;
         }
         VnfList rhs = ((VnfList) other);