Merge "Use diamond op in place of type spec"

diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/common/resource/InstanceResourceList.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/common/resource/InstanceResourceList.java
index cc3ec52..3a4df68 100644 (file)
--- a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/common/resource/InstanceResourceList.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/common/resource/InstanceResourceList.java
@@ -68,7 +68,7 @@ public class InstanceResourceList {
 
 
     public static List<Resource> getInstanceResourceList(final VnfResource vnfResource, final String uuiRequest) {
-        List<Resource> sequencedResourceList = new ArrayList<Resource>();
+        List<Resource> sequencedResourceList = new ArrayList<>();
         Gson gson = new Gson();
         JsonObject servJsonObject = gson.fromJson(uuiRequest, JsonObject.class);
         JsonObject reqInputJsonObj = servJsonObject.getAsJsonObject("service").getAsJsonObject("parameters")
@@ -117,7 +117,7 @@ public class InstanceResourceList {
     }
 
     private static List<Resource> getGroupResourceInstanceList(VnfResource vnfResource, JsonObject vfObj) {
-        List<Resource> sequencedResourceList = new ArrayList<Resource>();
+        List<Resource> sequencedResourceList = new ArrayList<>();
         if (vnfResource.getGroupOrder() != null && !StringUtils.isEmpty(vnfResource.getGroupOrder())) {
             String[] grpSequence = vnfResource.getGroupOrder().split(",");
             for (String grpType : grpSequence) {

diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/Metadata.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/Metadata.java
index f56fad3..84b162e 100644 (file)
--- a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/Metadata.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/Metadata.java
@@ -31,7 +31,7 @@ public class Metadata implements Serializable {
     private static final long serialVersionUID = 4981393122007858950L;
 
     @JsonProperty("metadatum")
-    private List<Metadatum> metadatum = new ArrayList<Metadatum>();
+    private List<Metadatum> metadatum = new ArrayList<>();
 
     public List<Metadatum> getMetadatum() {
         return metadatum;

diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/GenericVnf.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/GenericVnf.java
index 841546b..ebf722e 100644 (file)
--- a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/GenericVnf.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/GenericVnf.java
@@ -133,7 +133,7 @@ public class GenericVnf implements Serializable, ShallowCopy<GenericVnf> {
     @JsonProperty("model-info-generic-vnf")
     private ModelInfoGenericVnf modelInfoGenericVnf;
     @JsonProperty("instance-groups")
-    private List<InstanceGroup> instanceGroups = new ArrayList<InstanceGroup>();
+    private List<InstanceGroup> instanceGroups = new ArrayList<>();
     @JsonProperty("call-homing")
     private Boolean callHoming;
     @JsonProperty("nf-function")

diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/LInterface.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/LInterface.java
index 387d191..db27859 100644 (file)
--- a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/LInterface.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/LInterface.java
@@ -65,15 +65,15 @@ public class LInterface implements Serializable, ShallowCopy<LInterface> {
     @JsonProperty("allowed-address-pairs")
     private String allowedAddressPairs;
     @JsonProperty("vlans")
-    private List<Vlan> vlans = new ArrayList<Vlan>();
+    private List<Vlan> vlans = new ArrayList<>();
     @JsonProperty("sriov-vfs")
-    private List<SriovVf> sriovVfs = new ArrayList<SriovVf>();
+    private List<SriovVf> sriovVfs = new ArrayList<>();
     @JsonProperty("l-interfaces")
-    private List<LInterface> lInterfaces = new ArrayList<LInterface>();
+    private List<LInterface> lInterfaces = new ArrayList<>();
     @JsonProperty("l3-interface-ipv4-address-list")
-    private List<L3InterfaceIpv4AddressList> l3InterfaceIpv4AddressList = new ArrayList<L3InterfaceIpv4AddressList>();
+    private List<L3InterfaceIpv4AddressList> l3InterfaceIpv4AddressList = new ArrayList<>();
     @JsonProperty("l3-interface-ipv6-address-list")
-    private List<L3InterfaceIpv6AddressList> l3InterfaceIpv6AddressList = new ArrayList<L3InterfaceIpv6AddressList>();
+    private List<L3InterfaceIpv6AddressList> l3InterfaceIpv6AddressList = new ArrayList<>();
 
     public String getInterfaceName() {
         return interfaceName;

diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/PServer.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/PServer.java
index d0bf1f5..f3e28fa 100644 (file)
--- a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/PServer.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/PServer.java
@@ -41,9 +41,9 @@ public class PServer implements Serializable, ShallowCopy<PServer> {
     @JsonProperty("hostname")
     private String hostname;
     @JsonProperty("physical-links")
-    private List<PhysicalLink> physicalLinks = new ArrayList<PhysicalLink>(); // TODO techincally there is a pInterface
-                                                                              // between (pserver <--> physical-link)
-                                                                              // but dont really need that pojo
+    private List<PhysicalLink> physicalLinks = new ArrayList<>(); // TODO techincally there is a pInterface
+                                                                  // between (pserver <--> physical-link)
+                                                                  // but dont really need that pojo
 
     public String getPserverId() {
         return pserverId;

diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/ServiceInstance.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/ServiceInstance.java
index 0803bed..6cc8aa3 100644 (file)
--- a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/ServiceInstance.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/ServiceInstance.java
@@ -79,7 +79,7 @@ public class ServiceInstance implements Serializable, ShallowCopy<ServiceInstanc
     @JsonProperty("instance-groups")
     private List<InstanceGroup> instanceGroups = new ArrayList<>();
     @JsonProperty("service-proxies")
-    private List<ServiceProxy> serviceProxies = new ArrayList<ServiceProxy>();
+    private List<ServiceProxy> serviceProxies = new ArrayList<>();
 
     public void setServiceProxies(List<ServiceProxy> serviceProxies) {
         this.serviceProxies = serviceProxies;

diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/ServiceSubscription.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/ServiceSubscription.java
index 05199b7..b677b1e 100644 (file)
--- a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/ServiceSubscription.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/ServiceSubscription.java
@@ -41,7 +41,7 @@ public class ServiceSubscription implements Serializable, ShallowCopy<ServiceSub
     @JsonProperty("temp-ub-sub-account-id")
     private String tempUbSubAccountId;
     @JsonProperty("service-instances")
-    private List<ServiceInstance> serviceInstances = new ArrayList<ServiceInstance>();
+    private List<ServiceInstance> serviceInstances = new ArrayList<>();
 
     public String getServiceType() {
         return serviceType;

diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/Vlan.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/Vlan.java
index 6951a23..8c0db18 100644 (file)
--- a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/Vlan.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/Vlan.java
@@ -62,9 +62,9 @@ public class Vlan implements Serializable, ShallowCopy<Vlan> {
     @JsonProperty("is-ip-unnumbered")
     private Boolean isIpUnnumbered;
     @JsonProperty("l3-interface-ipv4-address-list")
-    private List<L3InterfaceIpv4AddressList> l3InterfaceIpv4AddressList = new ArrayList<L3InterfaceIpv4AddressList>();
+    private List<L3InterfaceIpv4AddressList> l3InterfaceIpv4AddressList = new ArrayList<>();
     @JsonProperty("l3-interface-ipv6-address-list")
-    private List<L3InterfaceIpv6AddressList> l3InterfaceIpv6AddressList = new ArrayList<L3InterfaceIpv6AddressList>();
+    private List<L3InterfaceIpv6AddressList> l3InterfaceIpv6AddressList = new ArrayList<>();
 
     public String getVlanInterface() {
         return vlanInterface;

diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/VpnBondingLink.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/VpnBondingLink.java
index 4ee8213..4e5b355 100644 (file)
--- a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/VpnBondingLink.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/bbobjects/VpnBondingLink.java
@@ -41,10 +41,10 @@ public class VpnBondingLink implements Serializable, ShallowCopy<VpnBondingLink>
     private String vpnBondingLinkId;
 
     @JsonProperty("configurations")
-    private List<Configuration> configurations = new ArrayList<Configuration>();
+    private List<Configuration> configurations = new ArrayList<>();
 
     @JsonProperty("service-proxies")
-    private List<ServiceProxy> serviceProxies = new ArrayList<ServiceProxy>();
+    private List<ServiceProxy> serviceProxies = new ArrayList<>();
 
     public String getVpnBondingLinkId() {
         return vpnBondingLinkId;