Merge "Reorder modifiers. Reorder modifiers to complt with Java code specifications Issue-ID: SO-1490"

4 files changed, 10 insertions, 9 deletions

diff --git a/asdc-controller/src/main/java/org/onap/so/asdc/client/test/emulators/NotificationDataImpl.java b/asdc-controller/src/main/java/org/onap/so/asdc/client/test/emulators/NotificationDataImpl.java
index c61306fb77..9fd5c2adeb 100644
--- a/asdc-controller/src/main/java/org/onap/so/asdc/client/test/emulators/NotificationDataImpl.java
+++ b/asdc-controller/src/main/java/org/onap/so/asdc/client/test/emulators/NotificationDataImpl.java
@@ -124,7 +124,7 @@ public class NotificationDataImpl implements INotificationData {
 
     @Override
     public List<IResourceInstance> getResources() {
-        List<IResourceInstance> ret = new ArrayList<IResourceInstance>();
+        List<IResourceInstance> ret = new ArrayList<>();
         if (resources != null) {
             ret.addAll(resources);
         }
@@ -145,7 +145,7 @@ public class NotificationDataImpl implements INotificationData {
 
     @Override
     public List<IArtifactInfo> getServiceArtifacts() {
-        List<IArtifactInfo> temp = new ArrayList<IArtifactInfo>();
+        List<IArtifactInfo> temp = new ArrayList<>();
         if (serviceArtifacts != null) {
             temp.addAll(serviceArtifacts);
         }
diff --git a/asdc-controller/src/main/java/org/onap/so/asdc/client/test/emulators/ResourceInfoImpl.java b/asdc-controller/src/main/java/org/onap/so/asdc/client/test/emulators/ResourceInfoImpl.java
index 62d11ffec9..2f109cd9d3 100644
--- a/asdc-controller/src/main/java/org/onap/so/asdc/client/test/emulators/ResourceInfoImpl.java
+++ b/asdc-controller/src/main/java/org/onap/so/asdc/client/test/emulators/ResourceInfoImpl.java
@@ -31,7 +31,6 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class ResourceInfoImpl implements IResourceInstance {
-    public ResourceInfoImpl() {}
 
     private String resourceInstanceName;
     private String resourceCustomizationUUID;
@@ -44,6 +43,8 @@ public class ResourceInfoImpl implements IResourceInstance {
     private String subcategory;
     private List<ArtifactInfoImpl> artifacts;
 
+    public ResourceInfoImpl() {}
+
     private ResourceInfoImpl(IResourceInstance resourceInstance) {
         resourceInstanceName = resourceInstance.getResourceInstanceName();
         resourceCustomizationUUID = resourceInstance.getResourceCustomizationUUID();
@@ -58,7 +59,7 @@ public class ResourceInfoImpl implements IResourceInstance {
     }
 
     public static List<ResourceInfoImpl> convertToJsonContainer(List<IResourceInstance> resources) {
-        List<ResourceInfoImpl> buildResources = new ArrayList<ResourceInfoImpl>();
+        List<ResourceInfoImpl> buildResources = new ArrayList<>();
         if (resources != null) {
             for (IResourceInstance resourceInstance : resources) {
                 buildResources.add(new ResourceInfoImpl(resourceInstance));
@@ -114,7 +115,7 @@ public class ResourceInfoImpl implements IResourceInstance {
 
     @Override
     public List<IArtifactInfo> getArtifacts() {
-        List<IArtifactInfo> temp = new ArrayList<IArtifactInfo>();
+        List<IArtifactInfo> temp = new ArrayList<>();
         if (artifacts != null) {
             temp.addAll(artifacts);
         }
diff --git a/asdc-controller/src/main/java/org/onap/so/asdc/client/test/rest/ASDCRestInterface.java b/asdc-controller/src/main/java/org/onap/so/asdc/client/test/rest/ASDCRestInterface.java
index 14ea0cde4b..46ec34e8d3 100644
--- a/asdc-controller/src/main/java/org/onap/so/asdc/client/test/rest/ASDCRestInterface.java
+++ b/asdc-controller/src/main/java/org/onap/so/asdc/client/test/rest/ASDCRestInterface.java
@@ -103,10 +103,10 @@ public class ASDCRestInterface {
             distributionClientEmulator = new DistributionClientEmulator("resource-examples/");
             statusData = JsonStatusData.instantiateNotifFromJsonFile("resource-examples/");
 
-            ASDCController asdcController = new ASDCController("asdc-controller1", distributionClientEmulator);
-            asdcController.initASDC();
+            ASDCController controller = new ASDCController("asdc-controller1", distributionClientEmulator);
+            controller.initASDC();
             toscaInstaller.installTheComponentStatus(statusData);
-            asdcController.closeASDC();
+            controller.closeASDC();
         } catch (Exception e) {
             logger.info("Error caught " + e.getMessage());
             logger.error("{} {} {} {} {} {}", MessageEnum.ASDC_GENERAL_EXCEPTION.toString(),
diff --git a/asdc-controller/src/main/java/org/onap/so/asdc/installer/ASDCElementInfo.java b/asdc-controller/src/main/java/org/onap/so/asdc/installer/ASDCElementInfo.java
index 043055e23c..81b0843671 100644
--- a/asdc-controller/src/main/java/org/onap/so/asdc/installer/ASDCElementInfo.java
+++ b/asdc-controller/src/main/java/org/onap/so/asdc/installer/ASDCElementInfo.java
@@ -47,7 +47,7 @@ public class ASDCElementInfo {
      * <li>{@link ASDCElementTypeEnum#VNF_RESOURCE}</li>
      * <ul>
      */
-    public static enum ASDCElementTypeEnum {
+    public enum ASDCElementTypeEnum {
         /**
          * The type VNF_RESOURCE. Represents a VNF_RESOURCE element.
          */