Merge "Fix createSDNCResource bpmn"

diff --git a/INFO.yaml b/INFO.yaml
index 0dadcf2..78fb0f3 100644 (file)
--- a/INFO.yaml
+++ b/INFO.yaml
@@ -33,11 +33,6 @@ committers:
         company: 'Ericsson'
         id: 'byungwoojun'
         timezone: ''
-    - name: 'Hui Deng'
-        email: 'denghui12@huawei.com'
-        company: 'Huawei'
-        id: 'denghui02'
-        timezone: 'China/Beijing'
     - name: 'DeWayne Filppi'
         email: 'dewayne@cloudify.co'
         company: 'Cloudify'
@@ -53,36 +48,11 @@ committers:
         company: 'VMware'
         id: 'ethanlynnl'
         timezone: 'France/Lannion'
-    - name: 'Jie Feng'
-        email: 'feng.jie2@zte.com.cn'
-        company: 'ZTE'
-        id: 'fengjie'
-        timezone: ''
-    - name: 'Fu Jinhua'
-        email: 'fu.jinhua@zte.com.cn'
-        company: 'ZTE'
-        id: 'fujinhua'
-        timezone: ''
-    - name: 'maopeng zhang'
-        email: 'zhang.maopeng1@zte.com.cn'
-        company: 'ZTE'
-        id: 'maopengzhang'
-        timezone: 'China/Nanjing'
-    - name: 'Bin Hou'
-        email: 'bin.hou@huawei.com'
-        company: 'Huawei'
-        id: 'piggie-hou'
-        timezone: 'China/Beijing'
     - name: 'Rob Daugherty'
         email: 'rd472p@att.com'
         company: 'ATT'
         id: 'rd472p'
         timezone: ''
-    - name: 'jackie tian'
-        email: 'tian.yi@zte.com.cn'
-        company: 'ZTE'
-        id: 'tianyi'
-        timezone: 'China/Beijing'
     - name: 'Chengli Wang'
         email: 'wangchengli@chinamobile.com'
         company: 'China Mobile'
@@ -107,6 +77,12 @@ tsc:
             name: 'Yuanwei Yang'
             name: 'Christophe Closset'
             name: 'Claude Noshpitz'
+            name: 'maopeng zhang'
+            name: 'Bin Hou'
+            name: 'Fu Jinhua'
+            name: 'Jie Feng'
+            name: 'jackie tian'
+            name: 'Deng Hui'
             link: 'https://lists.onap.org/pipermail/onap-tsc/2018-May/004802.html'
         - type: 'addition'
             name: 'Marcus Williams'

diff --git a/adapters/mso-vnf-adapter/src/main/java/org/openecomp/mso/adapters/vnf/MsoVnfPluginAdapterImpl.java b/adapters/mso-vnf-adapter/src/main/java/org/openecomp/mso/adapters/vnf/MsoVnfPluginAdapterImpl.java
index 4e0d514..a6d0a00 100644 (file)
--- a/adapters/mso-vnf-adapter/src/main/java/org/openecomp/mso/adapters/vnf/MsoVnfPluginAdapterImpl.java
+++ b/adapters/mso-vnf-adapter/src/main/java/org/openecomp/mso/adapters/vnf/MsoVnfPluginAdapterImpl.java
@@ -630,7 +630,7 @@ public class MsoVnfPluginAdapterImpl implements MsoVnfAdapter {
 
         if (inputs == null) {
                // Create an empty set of inputs
-               inputs = new HashMap<String,String>();
+               inputs = new HashMap<>();
                LOGGER.debug("inputs == null - setting to empty");
         } else {
                this.sendMapToDebug(inputs);

diff --git a/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/service/ServicePluginFactory.java b/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/service/ServicePluginFactory.java
index 344d8cd..96768ba 100644 (file)
--- a/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/service/ServicePluginFactory.java
+++ b/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/service/ServicePluginFactory.java
@@ -213,14 +213,14 @@ public class ServicePluginFactory {
        }
 
        private List<Object> queryTerminalPointsFromServiceProviderSystem(String srcLocation, String dstLocation) {
-               Map<String, String> locationSrc = new HashMap<String, String>();
+               Map<String, String> locationSrc = new HashMap<>();
                locationSrc.put("location", srcLocation);
-               Map<String, String> locationDst = new HashMap<String, String>();
+               Map<String, String> locationDst = new HashMap<>();
                locationDst.put("location", dstLocation);
-               List<Map<String, String>> locations = new ArrayList<Map<String, String>>();
+               List<Map<String, String>> locations = new ArrayList<>();
                locations.add(locationSrc);
                locations.add(locationDst);
-               List<Object> returnList = new ArrayList<Object>();
+               List<Object> returnList = new ArrayList<>();
                String reqContent = getJsonString(locations);
                String url = getThirdSPEndPoint();
                String responseContent = sendRequest(url, "POST", reqContent);
@@ -262,7 +262,7 @@ public class ServicePluginFactory {
                Map<String, Object> serviceObject = (Map<String, Object>) uuiObject.get("service");
                Map<String, Object> serviceParametersObject = (Map<String, Object>) serviceObject.get("parameters");
                Map<String, Object> serviceRequestInputs = (Map<String, Object>) serviceParametersObject.get("requestInputs");
-               Map<String, Object> oofQueryObject = new HashMap<String, Object>();
+               Map<String, Object> oofQueryObject = new HashMap<>();
                List<Object> resources = (List<Object>) serviceParametersObject.get("resources");
                oofQueryObject.put("src-access-provider-id", serviceRequestInputs.get("inner-src-access-provider-id"));
                oofQueryObject.put("src-access-client-id", serviceRequestInputs.get("inner-src-access-client-id"));
@@ -278,7 +278,7 @@ public class ServicePluginFactory {
                String url = getOOFCalcEndPoint();
                String responseContent = sendRequest(url, "POST", oofRequestReq);
 
-               List<Object> returnList = new ArrayList<Object>();
+               List<Object> returnList = new ArrayList<>();
                if (null != responseContent) {
                        returnList = getJsonObject(responseContent, List.class);
                }
@@ -291,7 +291,7 @@ public class ServicePluginFactory {
        }
        
        private Map<String, Object> getReturnRoute(List<Object> returnList){
-               Map<String, Object> returnRoute = new HashMap<String,Object>();
+               Map<String, Object> returnRoute = new HashMap<>();
                for(Object returnVpn :returnList){
                        Map<String, Object> returnVpnInfo = (Map<String, Object>) returnVpn;
                    String accessTopoId = (String)returnVpnInfo.get("access-topology-id");