Merge "Remove unused logger,replace type specification"

2 files changed, 10 insertions, 11 deletions

diff --git a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdnc/beans/SDNCRequest.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdnc/beans/SDNCRequest.java
index 5910975051..12d1b0be95 100644
--- a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdnc/beans/SDNCRequest.java
+++ b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdnc/beans/SDNCRequest.java
@@ -21,7 +21,6 @@
 package org.onap.so.client.sdnc.beans;
 
 import java.io.Serializable;
-import java.time.Duration;
 import java.util.UUID;
 import org.onap.so.client.sdnc.endpoint.SDNCTopology;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
@@ -35,8 +34,8 @@ public class SDNCRequest implements Serializable {
     private static final long serialVersionUID = 4679678988657593282L;
     private String timeOut = "PT1H";
     private SDNCTopology topology;
-    private String CorrelationValue = UUID.randomUUID().toString();
-    private String CorrelationName = "SDNCCallback";
+    private String correlationValue = UUID.randomUUID().toString();
+    private String correlationName = "SDNCCallback";
     private Object SDNCPayload;
 
 
@@ -57,19 +56,19 @@ public class SDNCRequest implements Serializable {
     }
 
     public String getCorrelationValue() {
-        return CorrelationValue;
+        return correlationValue;
     }
 
     public void setCorrelationValue(String correlationValue) {
-        CorrelationValue = correlationValue;
+        this.correlationValue = correlationValue;
     }
 
     public String getCorrelationName() {
-        return CorrelationName;
+        return correlationName;
     }
 
     public void setCorrelationName(String correlationName) {
-        CorrelationName = correlationName;
+        this.correlationName = correlationName;
     }
 
     public Object getSDNCPayload() {
@@ -86,13 +85,13 @@ public class SDNCRequest implements Serializable {
             return false;
         }
         SDNCRequest castOther = (SDNCRequest) other;
-        return new EqualsBuilder().append(CorrelationValue, castOther.CorrelationValue)
-                .append(CorrelationName, castOther.CorrelationName).isEquals();
+        return new EqualsBuilder().append(correlationValue, castOther.correlationValue)
+                .append(correlationName, castOther.correlationName).isEquals();
     }
 
     @Override
     public int hashCode() {
-        return new HashCodeBuilder().append(CorrelationValue).append(CorrelationName).toHashCode();
+        return new HashCodeBuilder().append(correlationValue).append(correlationName).toHashCode();
     }
 
 }
diff --git a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdnc/mapper/VnfTopologyOperationRequestMapper.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdnc/mapper/VnfTopologyOperationRequestMapper.java
index f31bff988a..e39e202aa3 100644
--- a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdnc/mapper/VnfTopologyOperationRequestMapper.java
+++ b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdnc/mapper/VnfTopologyOperationRequestMapper.java
@@ -126,7 +126,7 @@ public class VnfTopologyOperationRequestMapper {
         }
         List<InstanceGroup> instanceGroups = vnf.getInstanceGroups();
         List<GenericResourceApiVnfrequestinputVnfrequestinputVnfNetworkInstanceGroupIds> networkInstanceGroupIdList =
-                new ArrayList<GenericResourceApiVnfrequestinputVnfrequestinputVnfNetworkInstanceGroupIds>();
+                new ArrayList<>();
 
         for (InstanceGroup instanceGroup : instanceGroups) {
             if (ModelInfoInstanceGroup.TYPE_L3_NETWORK