Merge "Removed deprecated Matcher imports"

diff --combined bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/adapter/network/mapper/NetworkAdapterObjectMapperTest.java
index 0a6310b,7da4e87..4bdbd1a
--- 1/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/adapter/network/mapper/NetworkAdapterObjectMapperTest.java
--- 2/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/adapter/network/mapper/NetworkAdapterObjectMapperTest.java
+++ b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/adapter/network/mapper/NetworkAdapterObjectMapperTest.java
@@@ -22,7 -22,7 +22,7 @@@ package org.onap.so.client.adapter.netw
  import static com.shazam.shazamcrest.MatcherAssert.assertThat;
  import static com.shazam.shazamcrest.matcher.Matchers.sameBeanAs;
  import static org.junit.Assert.*;
- import static org.mockito.Matchers.isA;
+ import static org.mockito.ArgumentMatchers.isA;
  import static org.mockito.Mockito.doReturn;
  
  import java.io.UnsupportedEncodingException;
@@@ -30,7 -30,6 +30,7 @@@ import java.nio.file.Files
  import java.nio.file.Paths;
  import java.util.ArrayList;
  import java.util.Arrays;
 +import java.util.HashMap;
  import java.util.List;
  import java.util.Map;
  
@@@ -99,6 -98,24 +99,6 @@@ public class NetworkAdapterObjectMapper
                customer.getServiceSubscription().getServiceInstances().add(serviceInstance);
        }
        
 -      @Test
 -      public void testSetNetworkTechnology() {
 -              String networkTechnology = "Contrail";
 -              NetworkTechnology expectedNetworkTechnology = NetworkTechnology.CONTRAIL;
 -              NetworkTechnology actualNetworkTechnology = SPY_networkAdapterObjectMapper.setNetworkTechnology(networkTechnology);
 -              assertEquals("NetworkTechnology matches", expectedNetworkTechnology, actualNetworkTechnology);
 -              
 -              networkTechnology = "Neutron";
 -              expectedNetworkTechnology = NetworkTechnology.NEUTRON;
 -              actualNetworkTechnology = SPY_networkAdapterObjectMapper.setNetworkTechnology(networkTechnology);
 -              assertEquals("NetworkTechnology matches", expectedNetworkTechnology, actualNetworkTechnology);
 -              
 -              networkTechnology = "Vmware";
 -              expectedNetworkTechnology = NetworkTechnology.VMWARE;
 -              actualNetworkTechnology = SPY_networkAdapterObjectMapper.setNetworkTechnology(networkTechnology);
 -              assertEquals("NetworkTechnology matches", expectedNetworkTechnology, actualNetworkTechnology);
 -              
 -      }
        @Test
        public void buildCreateNetworkRequestFromBbobjectTest() throws Exception {
  
@@@ -112,17 -129,12 +112,17 @@@
                expectedCreateNetworkRequest.setNetworkType(l3Network.getNetworkType());
                expectedCreateNetworkRequest.setBackout(false);
                expectedCreateNetworkRequest.setFailIfExists(true);
 -              expectedCreateNetworkRequest.setNetworkTechnology(NetworkTechnology.CONTRAIL);
 +              expectedCreateNetworkRequest.setNetworkTechnology("CONTRAIL");
                MsoRequest msoRequest = new MsoRequest();
                msoRequest.setRequestId(requestContext.getMsoRequestId());
                msoRequest.setServiceInstanceId(serviceInstance.getServiceInstanceId());
                expectedCreateNetworkRequest.setMsoRequest(msoRequest);
                expectedCreateNetworkRequest.setSkipAAI(true);
 +              HashMap<String, String> networkParams = new HashMap<String, String>();
 +              networkParams.put("shared", "true");
 +              networkParams.put("external", "false");
 +              networkParams.put("testUserInputKey", "testUserInputValue");
 +              expectedCreateNetworkRequest.setNetworkParams(networkParams);
                
                expectedCreateNetworkRequest.setNotificationUrl("endpoint/NetworkAResponse/messageId");
                
@@@ -136,15 -148,13 +136,15 @@@
                subnetList.add(openstackSubnet);
                l3Network.getSubnets().add(openstackSubnet);
                l3Network.setNetworkTechnology("Contrail");
 +              l3Network.setIsSharedNetwork(true);
 +              l3Network.setIsExternalNetwork(false);
  
                doReturn("endpoint/").when(SPY_networkAdapterObjectMapper).getEndpoint();
                doReturn("messageId").when(SPY_networkAdapterObjectMapper).getRandomUuid();
                
                CreateNetworkRequest createNetworkRequest  = SPY_networkAdapterObjectMapper.createNetworkRequestMapper(requestContext, cloudRegion, orchestrationContext, serviceInstance, l3Network, userInput, cloudRegionPo, customer);
                
 -              assertThat(createNetworkRequest, sameBeanAs(expectedCreateNetworkRequest).ignoring("contrailRequest").ignoring("contrailNetwork").ignoring("providerVlanNetwork").ignoring("subnets").ignoring("networkParams").ignoring("messageId"));
 +              assertThat(createNetworkRequest, sameBeanAs(expectedCreateNetworkRequest).ignoring("contrailRequest").ignoring("contrailNetwork").ignoring("providerVlanNetwork").ignoring("subnets").ignoring("messageId"));
        }
        
        @Test
@@@ -233,12 -243,6 +233,12 @@@
                l3Network.getSubnets().add(actualSubnet);
                l3Network.getNetworkPolicies().add(networkPolicy);
                l3Network.getContrailNetworkRouteTableReferences().add(routeTableReference);
 +              l3Network.setIsSharedNetwork(false);
 +              l3Network.setIsExternalNetwork(false);
 +              HashMap<String, String> networkParams = new HashMap<String, String>();
 +              networkParams.put("shared", "false");
 +              networkParams.put("external", "false");
 +              networkParams.put("testUserInputKey", "testUserInputValue");
                                
                UpdateNetworkRequest expectedUpdateNetworkRequest = new UpdateNetworkRequest();
                expectedUpdateNetworkRequest.setCloudSiteId(cloudRegion.getLcpCloudRegionId());
@@@ -252,7 -256,7 +252,7 @@@
                expectedUpdateNetworkRequest.setSubnets(subnets);
                expectedUpdateNetworkRequest.setProviderVlanNetwork(providerVlanNetwork);
                expectedUpdateNetworkRequest.setContrailNetwork(contrailNetwork);
 -              expectedUpdateNetworkRequest.setNetworkParams(userInput);
 +              expectedUpdateNetworkRequest.setNetworkParams(networkParams);
                expectedUpdateNetworkRequest.setMsoRequest(msoRequest);
                expectedUpdateNetworkRequest.setSkipAAI(true);
                expectedUpdateNetworkRequest.setBackout(Boolean.TRUE.equals(orchestrationContext.getIsRollbackEnabled()));

diff --combined bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/orchestration/AAINetworkResourcesTest.java
index f20c646,f5ce1d3..82ffdf9
--- 1/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/orchestration/AAINetworkResourcesTest.java
--- 2/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/orchestration/AAINetworkResourcesTest.java
+++ b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/orchestration/AAINetworkResourcesTest.java
@@@ -26,7 -26,7 +26,7 @@@ import static org.junit.Assert.assertEq
  import static org.junit.Assert.assertNotNull;
  import static org.junit.Assert.assertTrue;
  import static org.mockito.ArgumentMatchers.any;
- import static org.mockito.Matchers.eq;
+ import static org.mockito.ArgumentMatchers.eq;
  import static org.mockito.ArgumentMatchers.isA;
  import static org.mockito.Mockito.doNothing;
  import static org.mockito.Mockito.doReturn;
@@@ -159,7 -159,7 +159,7 @@@ public class AAINetworkResourcesTest ex
                final String content = new String(Files.readAllBytes(Paths.get(JSON_FILE_LOCATION + "queryAaiVpnBinding.json")));
                AAIResultWrapper aaiResultWrapper = new AAIResultWrapper(content);
                Optional<VpnBinding> oVpnBinding = Optional.empty();
 -              AAIResourceUri aaiUri = AAIUriFactory.createResourceUri(AAIObjectType.VPN_BINDING, "ModelInvariantUUID", "serviceModelVersionId");
 +              AAIResourceUri aaiUri = AAIUriFactory.createResourceUri(AAIObjectType.VPN_BINDING, "ModelInvariantUUID");
                
                doReturn(aaiResultWrapper).when(MOCK_aaiResourcesClient).get(isA(AAIResourceUri.class));
                oVpnBinding = aaiNetworkResources.getVpnBinding(aaiUri);
@@@ -176,7 -176,7 +176,7 @@@
                final String content = new String(Files.readAllBytes(Paths.get(JSON_FILE_LOCATION + "queryAaiNetworkPolicy.json")));
                AAIResultWrapper aaiResultWrapper = new AAIResultWrapper(content);
                Optional<NetworkPolicy> oNetPolicy = Optional.empty();
 -              AAIResourceUri netPolicyUri = AAIUriFactory.createResourceUri(AAIObjectType.NETWORK_POLICY, "ModelInvariantUUID", "serviceModelVersionId");
 +              AAIResourceUri netPolicyUri = AAIUriFactory.createResourceUri(AAIObjectType.NETWORK_POLICY, "ModelInvariantUUID");
                
                doReturn(aaiResultWrapper).when(MOCK_aaiResourcesClient).get(isA(AAIResourceUri.class));
                oNetPolicy = aaiNetworkResources.getNetworkPolicy(netPolicyUri);
@@@ -193,7 -193,7 +193,7 @@@
                final String content = new String(Files.readAllBytes(Paths.get(JSON_FILE_LOCATION + "queryAaiNetworkTableRefs.json")));
                AAIResultWrapper aaiResultWrapper = new AAIResultWrapper(content);
                Optional<RouteTableReference> oRtref = Optional.empty();
 -              AAIResourceUri rTRefUri = AAIUriFactory.createResourceUri(AAIObjectType.ROUTE_TABLE_REFERENCE, "ModelInvariantUUID", "serviceModelVersionId");
 +              AAIResourceUri rTRefUri = AAIUriFactory.createResourceUri(AAIObjectType.ROUTE_TABLE_REFERENCE, "ModelInvariantUUID");
                
                doReturn(aaiResultWrapper).when(MOCK_aaiResourcesClient).get(isA(AAIResourceUri.class));
                oRtref = aaiNetworkResources.getRouteTable(rTRefUri);