if (inputs == null) {
LOGGER.debug("convertInputMap - inputs is null - nothing to do here");
- return new HashMap<String, Object>();
+ return new HashMap<>();
}
LOGGER.debug("convertInputMap in MsoHeatUtils called, with " + inputs.size() + " inputs, and template " + template.getArtifactUuid());
if (haveFiles && haveHeatFiles) {
// Let's do this here - not in the bean
LOGGER.debug ("Found files AND heatFiles - combine and add!");
- Map <String, Object> combinedFiles = new HashMap <String, Object> ();
+ Map <String, Object> combinedFiles = new HashMap<>();
for (String keyString : files.keySet ()) {
combinedFiles.put (keyString, files.get (keyString));
}
sb.append("(outputs is empty)");
return sb;
}
- Map<String, Object> outputs = new HashMap<String,Object>();
+ Map<String, Object> outputs = new HashMap<>();
for (Output outputItem : outputList) {
outputs.put(outputItem.getOutputKey(), outputItem.getOutputValue());
}
return null;
}
- Map <String, String> metadata = new HashMap <String, String> ();
+ Map <String, String> metadata = new HashMap<>();
if (cloudSite.getIdentityService ().hasTenantMetadata ()) {
OpenStackRequest <Metadata> request = keystoneAdminClient.tenants ().showMetadata (tenant.getId ());
Metadata tenantMetadata = executeAndRecordOpenstackRequest (request, msoProps);
return null;
}
- Map <String, String> metadata = new HashMap <String, String> ();
+ Map <String, String> metadata = new HashMap<>();
if (cloudSite.getIdentityService ().hasTenantMetadata ()) {
OpenStackRequest <Metadata> request = keystoneAdminClient.tenants ().showMetadata (tenant.getId ());
Metadata tenantMetadata = executeAndRecordOpenstackRequest (request, msoProps);
// token will be used until it expires.
//
// The cache key is "tenantId:cloudId"
- private static Map<String,NeutronCacheEntry> neutronClientCache = new HashMap<String,NeutronCacheEntry>();
+ private static Map<String,NeutronCacheEntry> neutronClientCache = new HashMap<>();
// Fetch cloud configuration each time (may be cached in CloudConfig class)
private CloudConfig cloudConfig;
}
} else if (type == NetworkType.MULTI_PROVIDER) {
if (provider != null && vlans != null && vlans.size() > 0) {
- List<Segment> segments = new ArrayList<Segment>(vlans.size());
+ List<Segment> segments = new ArrayList<>(vlans.size());
for (int vlan : vlans) {
Segment segment = new Segment();
segment.setProviderPhysicalNetwork (provider);
}
} else if (type == NetworkType.MULTI_PROVIDER) {
if (provider != null && vlans != null && vlans.size() > 0) {
- List<Segment> segments = new ArrayList<Segment>(vlans.size());
+ List<Segment> segments = new ArrayList<>(vlans.size());
for (int vlan : vlans) {
Segment segment = new Segment();
segment.setProviderPhysicalNetwork (provider);
public final void testCreateStackBadCloudConfig()
throws MsoStackAlreadyExists, MsoTenantNotFound, MsoException, MsoCloudSiteNotFound {
try {
- msoHeatUtils.createStack("DOESNOTEXIST", "test", "stackName", "test", new HashMap<String, Object>(),
+ msoHeatUtils.createStack("DOESNOTEXIST", "test", "stackName", "test", new HashMap<>(),
Boolean.TRUE, 10);
} catch (MsoCloudSiteNotFound e) {
public final void testCreateStackFailedConnectionHeatClient()
throws MsoStackAlreadyExists, MsoTenantNotFound, MsoException, MsoCloudSiteNotFound {
try {
- msoHeatUtils.createStack("MT", "test", "stackName", "test", new HashMap<String, Object>(), Boolean.TRUE,
+ msoHeatUtils.createStack("MT", "test", "stackName", "test", new HashMap<>(), Boolean.TRUE,
10);
} catch (MsoIOException e) {
public final void testCreateStackFailedConnection()
throws MsoStackAlreadyExists, MsoTenantNotFound, MsoException, MsoCloudSiteNotFound {
try {
- msoHeatUtils.createStack("MT", "test", "stackName", "test", new HashMap<String, Object>(), Boolean.TRUE,
+ msoHeatUtils.createStack("MT", "test", "stackName", "test", new HashMap<>(), Boolean.TRUE,
10);
} catch (MsoIOException e) {
@Test
public final void createStackSuccessWithEnvironment() throws MsoException {
try {
- msoHeatUtils.createStack("MT", "test", "stackName", "test", new HashMap<String, Object>(), Boolean.TRUE, 10,
+ msoHeatUtils.createStack("MT", "test", "stackName", "test", new HashMap<>(), Boolean.TRUE, 10,
"environment");
} catch (MsoIOException e) {
@Test
public final void createStackSuccessWithFiles() throws MsoException {
try {
- msoHeatUtils.createStack("MT", "test", "stackName", "test", new HashMap<String, Object>(), Boolean.TRUE, 10,
- "environment", new HashMap<String, Object>());
+ msoHeatUtils.createStack("MT", "test", "stackName", "test", new HashMap<>(), Boolean.TRUE, 10,
+ "environment", new HashMap<>());
} catch (MsoIOException e) {
}
@Test
public final void createStackSuccessWithHeatFiles() throws MsoException {
try {
- msoHeatUtils.createStack("MT", "test", "stackName", "test", new HashMap<String, Object>(), Boolean.TRUE, 10,
- "environment", new HashMap<String, Object>(), new HashMap<String, Object>());
+ msoHeatUtils.createStack("MT", "test", "stackName", "test", new HashMap<>(), Boolean.TRUE, 10,
+ "environment", new HashMap<>(), new HashMap<>());
} catch (MsoIOException e) {
}
CreateStackParam param = new CreateStackParam();
param.setDisableRollback(false);
param.setEnvironment("environment");
- param.setFiles(new HashMap<String, Object>());
+ param.setFiles(new HashMap<>());
param.setParameters(new HashMap<>());
param.setStackName("stackName");
param.setTemplate("template");
*
*/
// set up mock return value
- paramList = new ArrayList<VnfResourceCustomization>();
+ paramList = new ArrayList<>();
VnfResourceCustomization d1 = new VnfResourceCustomization();
d1.setModelCustomizationUuid("16ea3e56-a8ce-4ad7-8edd-4d2eae095391");
d1.setModelInstanceName("ciVFOnboarded-FNAT-aab06c41 1");
try {
List<VnfResourceCustomization> paramList;
// set up mock return value
- paramList = new ArrayList<VnfResourceCustomization>();
+ paramList = new ArrayList<>();
VnfResourceCustomization d1 = new VnfResourceCustomization();
d1.setModelCustomizationUuid("16ea3e56-a8ce-4ad7-8edd-4d2eae095391");
d1.setModelInstanceName("RG_6-26_mog11 0");
try {
List<VnfResourceCustomization> paramList;
// set up mock return value
- paramList = new ArrayList<VnfResourceCustomization>();
+ paramList = new ArrayList<>();
VnfResourceCustomization d1 = new VnfResourceCustomization();
d1.setVnfResourceModelUuid("16ea3e56-a8ce-4ad7-8edd-4d2eae095391");
d1.setModelInstanceName("RG_6-26_mog11 0");
try {
List<VnfResourceCustomization> paramList;
// set up mock return value
- paramList = new ArrayList<VnfResourceCustomization>();
+ paramList = new ArrayList<>();
VnfResourceCustomization d1 = new VnfResourceCustomization();
d1.setModelCustomizationUuid("16ea3e56-a8ce-4ad7-8edd-4d2eae095391");
d1.setModelInstanceName("RG_6-26_mog11 0");
try {
List<NetworkResourceCustomization> paramList;
// set up mock return value
- paramList = new ArrayList<NetworkResourceCustomization>();
+ paramList = new ArrayList<>();
NetworkResourceCustomization d1 = new NetworkResourceCustomization();
d1.setNetworkResourceModelUuid("0cb9b26a-9820-48a7-86e5-16c510e993d9");
paramList.add(d1);
try {
List<NetworkResourceCustomization> paramList;
// set up mock return value
- paramList = new ArrayList<NetworkResourceCustomization>();
+ paramList = new ArrayList<>();
NetworkResourceCustomization d1 = new NetworkResourceCustomization();
d1.setNetworkResourceModelUuid("0cb9b26a-9820-48a7-86e5-16c510e993d9");
paramList.add(d1);
try {
ArrayList<NetworkResourceCustomization> paramList;
// set up mock return value
- paramList = new ArrayList<NetworkResourceCustomization>();
+ paramList = new ArrayList<>();
NetworkResourceCustomization d1 = new NetworkResourceCustomization();
d1.setNetworkResourceModelUuid("0cb9b26a-9820-48a7-86e5-16c510e993d9");
paramList.add(d1);
try {
List<AllottedResourceCustomization> paramList;
// set up mock return value
- paramList = new ArrayList<AllottedResourceCustomization>();
+ paramList = new ArrayList<>();
AllottedResourceCustomization d1 = new AllottedResourceCustomization();
d1.setArModelUuid("0cb9b26a-9820-48a7-86e5-16c510e993d9");
paramList.add(d1);
try {
List<AllottedResourceCustomization> paramList;
// set up mock return value
- paramList = new ArrayList<AllottedResourceCustomization>();
+ paramList = new ArrayList<>();
AllottedResourceCustomization d1 = new AllottedResourceCustomization();
d1.setArModelUuid("0cb9b26a-9820-48a7-86e5-16c510e993d9");
paramList.add(d1);
CatalogQuery mockCatalogQuery = Mockito.mock(CatalogQuery.class);
Mockito.doCallRealMethod().when(mockCatalogQuery).setTemplate(Mockito.anyString(), Mockito.anyMapOf(String.class, String.class));
- Map<String,String> valueMap = new HashMap<String,String>();
+ Map<String,String> valueMap = new HashMap<>();
valueMap.put("somekey", "somevalue");
String ret = mockCatalogQuery.setTemplate("<somekey>", valueMap);
@Test
public void smartToJson_Test()
{
- List<VnfResourceCustomization> paramList = new ArrayList<VnfResourceCustomization>();
+ List<VnfResourceCustomization> paramList = new ArrayList<>();
VnfResourceCustomization d1 = new VnfResourceCustomization();
d1.setModelCustomizationUuid("16ea3e56-a8ce-4ad7-8edd-4d2eae095391");
d1.setModelInstanceName("RG_6-26_mog11 0");
public void JSON2_Test()
{
List<AllottedResourceCustomization> paramList;
- paramList = new ArrayList<AllottedResourceCustomization>();
+ paramList = new ArrayList<>();
AllottedResourceCustomization d1 = new AllottedResourceCustomization();
d1.setModelInstanceName("0cb9b26a-9820-48a7-86e5-16c510e993d9");
d1.setModelCustomizationUuid("16ea3e56-a8ce-4ad7-8edd-4d2eae095391");
svc.setModelUUID("0cb9b26a-9820-48a7-86e5-16c510e993d9");
svc.setModelName("Testing Model One");
ArrayList<NetworkResourceCustomization> paramList;
- paramList = new ArrayList<NetworkResourceCustomization>();
+ paramList = new ArrayList<>();
NetworkResourceCustomization d1 = new NetworkResourceCustomization();
d1.setNetworkResourceModelUuid("0cb9b26a-9820-48a7-86e5-16c510e993d9");
paramList.add(d1);
public void JSON2_Test()
{
ArrayList<NetworkResourceCustomization> paramList;
- paramList = new ArrayList<NetworkResourceCustomization>();
+ paramList = new ArrayList<>();
NetworkResourceCustomization d1 = new NetworkResourceCustomization();
d1.setModelInstanceName("0cb9b26a-9820-48a7-86e5-16c510e993d9");
paramList.add(d1);
public void JSON2_Test()
{
List<VnfResourceCustomization> paramList;
- paramList = new ArrayList<VnfResourceCustomization>();
+ paramList = new ArrayList<>();
VnfResourceCustomization d1 = new VnfResourceCustomization();
d1.setModelInstanceName("0cb9b26a-9820-48a7-86e5-16c510e993d9");
d1.setVnfResourceModelUuid("0cb9b26a-9820-48a7-86e5-16c510e993d9");
contrailSubnet.setAddrFromStart(true);\r
contrailSubnet.setDefaultGateway("defaultGateway");\r
contrailSubnet.setEnableDhcp(true);\r
- contrailSubnet.setPools(new ArrayList<ContrailSubnetPool>());\r
+ contrailSubnet.setPools(new ArrayList<>());\r
contrailSubnet.setSubnet(new ContrailSubnetIp());\r
contrailSubnet.setSubnetName("subnetName");\r
contrailSubnet.getAllocationPools();\r
MsoTenantAdapter tenantAdapter = new MsoTenantAdapterImpl();
- Holder<String> tenantId = new Holder<String>();
- Holder<String> tenantName = new Holder<String>();
- Holder<Map<String,String>> tenantMetadata = new Holder<Map<String,String>>();
- Holder<Boolean> tenantDeleted = new Holder<Boolean>();
- Holder<TenantRollback> rollback = new Holder<TenantRollback>();
+ Holder<String> tenantId = new Holder<>();
+ Holder<String> tenantName = new Holder<>();
+ Holder<Map<String,String>> tenantMetadata = new Holder<>();
+ Holder<Boolean> tenantDeleted = new Holder<>();
+ Holder<TenantRollback> rollback = new Holder<>();
try {
tenantAdapter.queryTenant (cloudId, "934a4ac9c4bd4b8d9d8ab3ef900281b0", null, tenantId, tenantName, tenantMetadata);
vnfExists.value = Boolean.FALSE;
status.value = VnfStatus.NOTFOUND;
vnfId.value = null;
- outputs.value = new HashMap <String, String> (); // Return as an empty map
+ outputs.value = new HashMap<>(); // Return as an empty map
LOGGER.debug ("VNF " + vnfName + " not found");
} else {
if (objectMap == null) {
return null;
}
- Map<String, String> stringMap = new HashMap<String, String>();
+ Map<String, String> stringMap = new HashMap<>();
for (String key : objectMap.keySet()) {
if (!stringMap.containsKey(key)) {
Object obj = objectMap.get(key);
private String vduInstanceId = "";
private String vduInstanceName = "";
private VduStatus status = VduStatus.NOTFOUND;
- private Map<String,Object> outputs = new HashMap<String,Object>();
- private Map<String,Object> inputs = new HashMap<String,Object>();
+ private Map<String,Object> outputs = new HashMap<>();
+ private Map<String,Object> inputs = new HashMap<>();
private String lastAction;
private String actionStatus;
private String errorMessage;
try {\r
\r
instance.createVnfA("mdt1", "88a6ca3ee0394ade9403f075db23167e", "vnf", "1", "vSAMP12", "VFMOD",\r
- "volumeGroupHeatStackId|1", new HashMap<String, String>(), Boolean.FALSE, Boolean.TRUE, "messageId",\r
+ "volumeGroupHeatStackId|1", new HashMap<>(), Boolean.FALSE, Boolean.TRUE, "messageId",\r
null, "http://org.openecomp.mso/notify/adapterNotify/updateVnfNotificationRequest");\r
} catch (Exception e) {\r
\r
try {\r
instance.createVfModule("mdt1", "88a6ca3ee0394ade9403f075db23167e", "vnf", "1", "vSAMP12", "VFMOD",\r
"volumeGroupHeatStackId|1", "baseVfHeatStackId", "88a6ca3ee0394ade9403f075db23167e", map,\r
- Boolean.FALSE, Boolean.TRUE, msoRequest, new Holder<>(), new Holder<Map<String, String>>(),\r
- new Holder<VnfRollback>());\r
+ Boolean.FALSE, Boolean.TRUE, msoRequest, new Holder<>(), new Holder<>(),\r
+ new Holder<>());\r
} catch (Exception e) {\r
\r
}\r
try {\r
instance.updateVfModule("mdt1", "88a6ca3ee0394ade9403f075db23167e", "vnf", "1", "vSAMP12", "VFMOD",\r
"volumeGroupHeatStackId|1", "baseVfHeatStackId", "vfModuleStackId",\r
- "88a6ca3ee0394ade9403f075db23167e", map, msoRequest, new Holder<Map<String, String>>(),\r
- new Holder<VnfRollback>());\r
+ "88a6ca3ee0394ade9403f075db23167e", map, msoRequest, new Holder<>(),\r
+ new Holder<>());\r
} catch (Exception e) {\r
\r
}\r
msoRequest.setServiceInstanceId("12345");\r
try {\r
instance.deleteVfModule("mdt1", "88a6ca3ee0394ade9403f075db23167e", "vSAMP12", msoRequest,\r
- new Holder<Map<String, String>>());\r
+ new Holder<>());\r
} catch (Exception e) {\r
\r
}\r
String cloudId = "MT";
String tenantId = "MSO_Test";
String vnfName = "VNF_TEST1";
- Holder<Boolean> vnfExists = new Holder<Boolean>();
- Holder<String> vnfId = new Holder<String>();
- Holder<VnfStatus> status = new Holder<VnfStatus>();
- Holder<Map<String, String>> outputs = new Holder<Map<String, String>>();
+ Holder<Boolean> vnfExists = new Holder<>();
+ Holder<String> vnfId = new Holder<>();
+ Holder<VnfStatus> status = new Holder<>();
+ Holder<Map<String, String>> outputs = new Holder<>();
vnfAdapter.queryVnf(cloudId, tenantId, vnfName, null,
vnfExists, vnfId, status, outputs);
String cloudId = "MT";
String tenantId = "MSO_Test";
String vnfName = "VNF_TEST1";
- Holder<Boolean> vnfExists = new Holder<Boolean>();
- Holder<String> vnfId = new Holder<String>();
- Holder<VnfStatus> status = new Holder<VnfStatus>();
- Holder<Map<String, String>> outputs = new Holder<Map<String, String>>();
+ Holder<Boolean> vnfExists = new Holder<>();
+ Holder<String> vnfId = new Holder<>();
+ Holder<VnfStatus> status = new Holder<>();
+ Holder<Map<String, String>> outputs = new Holder<>();
vnfAdapter.queryVnf(cloudId, tenantId, vnfName, null,
vnfExists, vnfId, status, outputs);
String cloudId = "MT";
String tenantId = "MSO_Test";
String vnfName = "VNF_TEST1";
- Holder<Boolean> vnfExists = new Holder<Boolean>();
- Holder<String> vnfId = new Holder<String>();
- Holder<VnfStatus> status = new Holder<VnfStatus>();
- Holder<Map<String, String>> outputs = new Holder<Map<String, String>>();
+ Holder<Boolean> vnfExists = new Holder<>();
+ Holder<String> vnfId = new Holder<>();
+ Holder<VnfStatus> status = new Holder<>();
+ Holder<Map<String, String>> outputs = new Holder<>();
vnfAdapter.queryVnf(cloudId, tenantId, vnfName, null,
vnfExists, vnfId, status, outputs);
String tenantName = "John_Test";
String vnfType = "ApacheDemo";
String vnfName = "AdapterTest";
- Map<String,String> inputs = new HashMap<String,String>();
+ Map<String,String> inputs = new HashMap<>();
inputs.put("vnf_id", "abc");
inputs.put("extra", "whocares");
inputs.put("private_subnet_gateway", "10.4.1.1");
inputs.put("private_subnet_cidr", "10.4.1.0/29");
// Web Service Outputs
- Holder<String> vnfId = new Holder<String>();
- Holder<Map<String,String>> outputs = new Holder<Map<String,String>>();
- Holder<VnfRollback> vnfRollback = new Holder<VnfRollback>();
+ Holder<String> vnfId = new Holder<>();
+ Holder<Map<String,String>> outputs = new Holder<>();
+ Holder<VnfRollback> vnfRollback = new Holder<>();
try {
vnfAdapter.createVnf(cloudId, tenantName, vnfType,null, vnfName, null, null, inputs, false, true, null,
String cloudId = "MT";
String tenantId = "MSO_Test";
String vnfName = "VNF_TEST1";
- Holder<Boolean> vnfExists = new Holder<Boolean>();
- Holder<String> vnfId = new Holder<String>();
- Holder<VnfStatus> status = new Holder<VnfStatus>();
- Holder<Map<String,String>> outputs = new Holder<Map<String,String>>();
+ Holder<Boolean> vnfExists = new Holder<>();
+ Holder<String> vnfId = new Holder<>();
+ Holder<VnfStatus> status = new Holder<>();
+ Holder<Map<String,String>> outputs = new Holder<>();
try {
vnfAdapter.queryVnf(cloudId, tenantId, vnfName, null,
@Test
public void testGetTemplateFiles() {
byte[] templateFileData = "some template file data".getBytes();
- templateFiles = new HashMap<String, byte[]>();
+ templateFiles = new HashMap<>();
templateFiles.put("templateKey1", templateFileData);
vduBlueprint.setTemplateFiles(templateFiles);
Assert.assertNotNull(vduBlueprint.getTemplateFiles());
@Test
public void testGetAttachedFiles() {
byte[] attachedFileData = "some file data".getBytes();
- attachedFiles = new HashMap<String, byte[]>();
+ attachedFiles = new HashMap<>();
attachedFiles.put("attachedKey1", attachedFileData);
vduBlueprint.setAttachedFiles(attachedFiles);
Assert.assertNotNull(vduBlueprint.getAttachedFiles());
MsoJsonProperties msoProp;
try {
- List <String> result = new ArrayList <String> ();
+ List <String> result = new ArrayList<>();
msoProp = new MsoPropertiesFactory ().getMsoJsonProperties (MSO_PROP_ASDC);
if (msoProp.getJsonRootNode ().get (PARAMETER_PATTERN) != null) {
public class ASDCGlobalController {
private static final MsoLogger LOGGER = MsoLogger.getMsoLogger (MsoLogger.Catalog.ASDC);
- private Map <String,ASDCController> controllers = new HashMap <String,ASDCController> ();
+ private Map <String,ASDCController> controllers = new HashMap<>();
private MsoJsonProperties msoProp= null;
}
public void closeASDC () {
- List<String> controllerToRemove = new LinkedList<String>();
+ List<String> controllerToRemove = new LinkedList<>();
for (ASDCController controller : controllers.values()) {
try {
vfModuleMetadata = vfmoduleMetadata;
parentVfResource = vfParentResource;
- artifactsMap = new HashMap<String, List<VfModuleArtifact>>();
+ artifactsMap = new HashMap<>();
for (String artifactUUID:this.vfModuleMetadata.getArtifacts()) {
if (vfParentResource.getArtifactsMapByUUID().containsKey(artifactUUID)) {
artifactsMap.get(vfModuleArtifact.getArtifactInfo().getArtifactType()).add(vfModuleArtifact);
} else {
- List<VfModuleArtifact> nestedList = new LinkedList<VfModuleArtifact>();
+ List<VfModuleArtifact> nestedList = new LinkedList<>();
nestedList.add(vfModuleArtifact);
artifactsMap.put(vfModuleArtifact.getArtifactInfo().getArtifactType(), nestedList);
public List<VfModuleArtifact> getOrderedArtifactList() {
- List <VfModuleArtifact> artifactsList = new LinkedList <VfModuleArtifact>();
+ List <VfModuleArtifact> artifactsList = new LinkedList<>();
artifactsList.addAll(artifactsMap.get(ASDCConfiguration.HEAT));
artifactsList.addAll(artifactsMap.get(ASDCConfiguration.HEAT_ENV));
resourceInstance=resourceinstance;
- vfModulesStructureList = new LinkedList<VfModuleStructure>();
- artifactsMapByUUID = new HashMap<String, VfModuleArtifact>();
+ vfModulesStructureList = new LinkedList<>();
+ artifactsMapByUUID = new HashMap<>();
}
//@Override
INotificationData.class.getClassLoader(),
new Class[] { INotificationData.class },
NotificationLogging.getHandler());
- objectMethodsToLog.put(proxy, new ArrayList<Method>());
+ objectMethodsToLog.put(proxy, new ArrayList<>());
}
private static <T> void methodToLog(T methodCall) {
}
public synchronized List <String> getYamlNestedFileResourceTypeList () {
- List <String> typeList = new ArrayList <String> ();
+ List <String> typeList = new ArrayList<>();
@SuppressWarnings("unchecked")
Map <String, Object> resourceMap = (Map <String, Object>) yml.get ("resources");
}
public synchronized List <String> getYamlResourceTypeList () {
- List <String> typeList = new ArrayList <String> ();
+ List <String> typeList = new ArrayList<>();
@SuppressWarnings("unchecked")
Map <String, Object> resourceMap = (Map <String, Object>) yml.get ("resources");
// Within Heat Template, under parameters catalog, it might indicate the default value of the parameter
// If default value exist, the parameter is not mandatory, otherwise its value should be set
public synchronized Set <HeatTemplateParam> getParameterList (String artifactUUID) {
- Set <HeatTemplateParam> paramSet = new HashSet <HeatTemplateParam> ();
+ Set <HeatTemplateParam> paramSet = new HashSet<>();
@SuppressWarnings("unchecked")
Map <String, Object> resourceMap = (Map <String, Object>) yml.get ("parameters");
@SuppressWarnings("unchecked")
Map <String, Object> resourceMap = (Map <String, Object>) yml.get ("parameters");
if (resourceMap == null) {
- resourceMap = new LinkedHashMap <String, Object> ();
+ resourceMap = new LinkedHashMap<>();
this.yml.put ("parameters", resourceMap);
}
for (HeatTemplateParam heatParam : heatSet) {
- Map <String, Object> paramInfo = new HashMap <String, Object> ();
+ Map <String, Object> paramInfo = new HashMap<>();
paramInfo.put ("type", heatParam.getParamType ());
resourceMap.put (heatParam.getParamName (), paramInfo);
Mockito.when(artifactInfo1.getArtifactDescription()).thenReturn("testos artifact1");
// Now provision the NotificationData mock
- List<IArtifactInfo> listArtifact = new ArrayList<IArtifactInfo>();
+ List<IArtifactInfo> listArtifact = new ArrayList<>();
listArtifact.add(artifactInfo1);
// Create fake resource Instance
Mockito.when(artifactInfo1.getArtifactDescription()).thenReturn("testos artifact1");
// Now provision the NotificationData mock
- List<IArtifactInfo> listArtifact = new ArrayList<IArtifactInfo>();
+ List<IArtifactInfo> listArtifact = new ArrayList<>();
listArtifact.add(artifactInfo1);
// Create fake resource Instance
InputStream input = new FileInputStream(new File("src/test/resources/resource-examples/simpleTestWithoutParam.yaml"));
YamlEditor decoder = new YamlEditor (IOUtils.toByteArray(input));
- Set <HeatTemplateParam> newParamSet = new HashSet <HeatTemplateParam> ();
+ Set <HeatTemplateParam> newParamSet = new HashSet<>();
HeatTemplateParam heatParam1 = new HeatTemplateParam();
heatParam1.setHeatTemplateArtifactUuid("1");
InputStream input = new FileInputStream(new File("src/test/resources/resource-examples/simpleTest.yaml"));
YamlEditor decoder = new YamlEditor (IOUtils.toByteArray(input));
- Set <HeatTemplateParam> newParamSet = new HashSet <HeatTemplateParam> ();
+ Set <HeatTemplateParam> newParamSet = new HashSet<>();
HeatTemplateParam heatParam1 = new HeatTemplateParam();
heatParam1.setHeatTemplateArtifactUuid("1");
distributionClient = Mockito.mock(IDistributionClient.class);\r
\r
// Now provision the NotificationData mock\r
- List<IArtifactInfo> listArtifact = new ArrayList<IArtifactInfo>();\r
+ List<IArtifactInfo> listArtifact = new ArrayList<>();\r
listArtifact.add(artifactInfo1);\r
\r
// Create fake resource Instance\r
distributionClient = Mockito.mock(IDistributionClient.class);\r
\r
// Now provision the NotificationData mock\r
- List<IArtifactInfo> listArtifact = new ArrayList<IArtifactInfo>();\r
+ List<IArtifactInfo> listArtifact = new ArrayList<>();\r
listArtifact.add(artifactInfo1);\r
\r
// Create fake resource Instance\r
* Create a map to hold properties to be added to mso.bpmn.properties.
*/
public static Map<String, String> createBpmnProperties() {
- Map<String, String> properties = new HashMap<String, String>();
+ Map<String, String> properties = new HashMap<>();
properties.put("PROPERTIES-TYPE", PropertyConfiguration.MSO_BPMN_PROPERTIES);
return properties;
}
* Create a map to hold properties to be added to mso.bpmn.urn.properties.
*/
public static Map<String, String> createBpmnUrnProperties() {
- Map<String, String> properties = new HashMap<String, String>();
+ Map<String, String> properties = new HashMap<>();
properties.put("PROPERTIES-TYPE", PropertyConfiguration.MSO_BPMN_URN_PROPERTIES);
return properties;
}
private static final long serialVersionUID = 1L;
private Map<String, Map<String, Serializable>> dictionary =
- new HashMap<String, Map<String, Serializable>>();
+ new HashMap<>();
/**
* Returns true if the specified type is stored in this object.
*/
public void put(String type, String key, String value) {
Map<String, Serializable> mapForType = dictionary
- .computeIfAbsent(type, k -> new HashMap<String, Serializable>());
+ .computeIfAbsent(type, k -> new HashMap<>());
mapForType.put(key, value);
}
*/\r
public void addVnfResource(Resource vnfResource) {\r
if (vnfResources == null){\r
- vnfResources = new ArrayList<VnfResource>();\r
+ vnfResources = new ArrayList<>();\r
}\r
this.vnfResources.add((VnfResource)vnfResource);\r
}\r
*/\r
public void addNetworkResource(Resource networkResource) {\r
if (networkResources == null){\r
- networkResources = new ArrayList<NetworkResource>();\r
+ networkResources = new ArrayList<>();\r
}\r
this.networkResources.add((NetworkResource)networkResource);\r
}\r
*/\r
public void addAllottedResource(Resource allottedResource) {\r
if (allottedResources == null){\r
- allottedResources = new ArrayList<AllottedResource>();\r
+ allottedResources = new ArrayList<>();\r
}\r
this.allottedResources.add((AllottedResource)allottedResource);\r
}\r
// methods to add to the list\r
public void addVfModule(ModuleResource moduleResource) {\r
if (vfModules == null){\r
- vfModules = new ArrayList<ModuleResource>();\r
+ vfModules = new ArrayList<>();\r
}\r
this.vfModules.add(moduleResource);\r
}\r
@Override
protected Collection<? extends CommandInterceptor> getDefaultCommandInterceptorsTxRequired() {
List<CommandInterceptor> defaultCommandInterceptorsTxRequired =
- new ArrayList<CommandInterceptor>();
+ new ArrayList<>();
defaultCommandInterceptorsTxRequired.add(new LogInterceptor());
defaultCommandInterceptorsTxRequired.add(new CommandContextInterceptor(
commandContextFactory, this, true));
processEngineConfiguration.getCustomPreBPMNParseListeners();
if (preParseListeners == null) {
- preParseListeners = new ArrayList<BpmnParseListener>();
+ preParseListeners = new ArrayList<>();
processEngineConfiguration.setCustomPreBPMNParseListeners(preParseListeners);
}
@Override
public void parseProcess(Element processElement, ProcessDefinitionEntity processDefinition) {
AtomicInteger triggerTaskIndex = new AtomicInteger(1);
- List<ActivityImpl> activities = new ArrayList<ActivityImpl>(processDefinition.getActivities());
+ List<ActivityImpl> activities = new ArrayList<>(processDefinition.getActivities());
recurse(activities, triggerTaskIndex);
}
// cause the process to die.
List<PvmTransition> outTransitions =
- new ArrayList<PvmTransition>(activity.getOutgoingTransitions());
+ new ArrayList<>(activity.getOutgoingTransitions());
for (PvmTransition transition : outTransitions) {
String triggerTaskId = "WorkflowExceptionTriggerTask_" + triggerTaskIndex;
ClassDelegateActivityBehavior behavior = new ClassDelegateActivityBehavior(
WorkflowExceptionTriggerTask.class.getName(),
- new ArrayList<FieldDeclaration>(0));
+ new ArrayList<>(0));
triggerTask.setActivityBehavior(behavior);
triggerTask.setName("Workflow Exception Trigger Task " + triggerTaskIndex);
transitionImpl.setDestination(triggerTask);
}
} else if ("subProcess".equals(type)) {
- recurse(new ArrayList<ActivityImpl>(activity.getActivities()), triggerTaskIndex);
+ recurse(new ArrayList<>(activity.getActivities()), triggerTaskIndex);
}
}
}
@Test
@Deployment(resources={"BaseTaskTest.bpmn"})
public void shouldInvokeService() {
- Map<String, Object> variables = new HashMap<String, Object>();
+ Map<String, Object> variables = new HashMap<>();
variables.put("firstName", "Jane");
variables.put("lastName", "Doe");
variables.put("age", (Integer)25);
\r
@ApplicationPath("/")\r
public class WorkflowResourceApplication extends Application {\r
- private Set<Object> singletons = new HashSet<Object>();\r
- private Set<Class<?>> classes = new HashSet<Class<?>>();\r
+ private Set<Object> singletons = new HashSet<>();\r
+ private Set<Class<?>> classes = new HashSet<>();\r
\r
public WorkflowResourceApplication() {\r
singletons.add(new WorkflowResource());\r
// Success Scenario
private Map<String, String> setupVariables() {
- Map<String, String> variables = new HashMap<String, String>();
+ Map<String, String> variables = new HashMap<>();
variables.put("isDebugLogEnabled", "true");
variables.put("bpmnRequest", getRequest());
variables.put("mso-request-id", "RaaCSIRequestId-1");
// Success Scenario
private Map<String, String> setupVariables1() {
- Map<String, String> variables = new HashMap<String, String>();
+ Map<String, String> variables = new HashMap<>();
variables.put("testMessageId", "88f65519-9a38-4c4b-8445-9eb4a5a5af56");
variables.put("msoRequestId", "testRequestId");
variables.put("requestId", "testRequestId");
// Success Scenario 2
private Map<String, String> setupVariables2() {
- Map<String, String> variables = new HashMap<String, String>();
+ Map<String, String> variables = new HashMap<>();
variables.put("testMessageId", "88f65519-9a38-4c4b-8445-9eb4a5a5af56");
variables.put("msoRequestId", "testRequestId");
variables.put("serviceInstanceId", "f70e927b-6087-4974-9ef8-c5e4d5847ca4");
// Active Scenario
private Map<String, String> setupVariablesActive() {
- Map<String, String> variables = new HashMap<String, String>();
+ Map<String, String> variables = new HashMap<>();
variables.put("testMessageId", "88f65519-9a38-4c4b-8445-9eb4a5a5af56");
variables.put("msoRequestId", "testRequestId");
variables.put("serviceInstanceId", "f70e927b-6087-4974-9ef8-c5e4d5847ca4");
// Missing Name Scenario
private Map<String, String> setupVariablesMissingName() {
- Map<String, String> variables = new HashMap<String, String>();
+ Map<String, String> variables = new HashMap<>();
//variables.put("bpmnRequest", getCreateNetworkRequestMissingName());
variables.put("testMessageId", "88f65519-9a38-4c4b-8445-9eb4a5a5af56");
variables.put("msoRequestId", "testRequestId");
// SDNC Rollback Scenario
private Map<String, String> setupVariablesSDNCRollback() {
- Map<String, String> variables = new HashMap<String, String>();
+ Map<String, String> variables = new HashMap<>();
variables.put("testMessageId", "88f65519-9a38-4c4b-8445-9eb4a5a5af56");
variables.put("msoRequestId", "testRequestId");
variables.put("serviceInstanceId", "f70e927b-6087-4974-9ef8-c5e4d5847ca4");
// VID json input
private Map<String, String> setupVariablesVID1() {
- Map<String, String> variables = new HashMap<String, String>();
+ Map<String, String> variables = new HashMap<>();
variables.put("bpmnRequest", getCreateNetworkRequestVID1());
variables.put("mso-request-id", "testRequestId");
//variables.put("msoRequestId", "testRequestId");
\r
// Active Scenario\r
private Map<String, Object> setupVariablesSunnyDayVID() {\r
- Map<String, Object> variables = new HashMap<String, Object>();\r
+ Map<String, Object> variables = new HashMap<>();\r
//try {\r
//variables.put("bpmnRequest", FileUtil.readResourceFile("__files/CreateVfModule_VID_request.json"));\r
//}\r
\r
// Active Scenario\r
private Map<String, Object> setupVariablesSunnyDayVIDWVolumeAttach() {\r
- Map<String, Object> variables = new HashMap<String, Object>();\r
+ Map<String, Object> variables = new HashMap<>();\r
//try {\r
// variables.put("bpmnRequest", FileUtil.readResourceFile("__files/CreateVfModule_VID_request.json"));\r
//}\r
String businessKey = UUID.randomUUID().toString();
String createVfModuleVolRequest = FileUtil.readResourceFile("__files/CreateVfModuleVolumeInfraV1/createVfModuleVolume_VID_request.json");
- Map<String, Object> testVariables = new HashMap<String, Object>();
+ Map<String, Object> testVariables = new HashMap<>();
testVariables.put("requestId", "TEST-REQUEST-ID-0123");
testVariables.put("serviceInstanceId", "test-service-instance-id");
testVariables.put("vnfId", "TEST-VNF-ID-0123");
String businessKey = UUID.randomUUID().toString();
String createVfModuleVolRequest = FileUtil.readResourceFile("__files/CreateVfModuleVolumeInfraV1/createVfModuleVolume_VID_request.json");
- Map<String, Object> testVariables = new HashMap<String, Object>();
+ Map<String, Object> testVariables = new HashMap<>();
testVariables.put("requestId", "TEST-REQUEST-ID-0123");
testVariables.put("serviceInstanceId", "test-service-instance-id");
testVariables.put("vnfId", "TEST-VNF-ID-0123");
String businessKey = UUID.randomUUID().toString();
String createVfModuleVolRequest = FileUtil.readResourceFile("__files/CreateVfModuleVolumeInfraV1/createVfModuleVolume_VID_request.json");
- Map<String, Object> testVariables = new HashMap<String, Object>();
+ Map<String, Object> testVariables = new HashMap<>();
testVariables.put("requestId", "TEST-REQUEST-ID-0123");
testVariables.put("serviceInstanceId", "test-service-instance-id");
testVariables.put("vnfId", "TEST-VNF-ID-0123");
String businessKey = UUID.randomUUID().toString();
String createVfModuleVolRequest = FileUtil.readResourceFile("__files/CreateVfModuleVolumeInfraV1/createVfModuleVolume_VID_request.json");
- Map<String, Object> testVariables = new HashMap<String, Object>();
+ Map<String, Object> testVariables = new HashMap<>();
testVariables.put("requestId", "TEST-REQUEST-ID-0123");
testVariables.put("serviceInstanceId", "test-service-instance-id");
testVariables.put("vnfId", "TEST-VNF-ID-0123");
String businessKey = UUID.randomUUID().toString();
String createVfModuleVolRequest = FileUtil.readResourceFile("__files/CreateVfModuleVolumeInfraV1/createVfModuleVolume_VID_request_noreqparm.json");
- Map<String, Object> testVariables = new HashMap<String, Object>();
+ Map<String, Object> testVariables = new HashMap<>();
testVariables.put("requestId", "TEST-REQUEST-ID-0123");
testVariables.put("serviceInstanceId", "test-service-instance-id");
testVariables.put("vnfId", "TEST-VNF-ID-0123");
String businessKey = UUID.randomUUID().toString();
String createVfModuleVolRequest = FileUtil.readResourceFile("__files/CreateVfModuleVolumeInfraV1/createVfModuleVolume_VID_request.json");
- Map<String, Object> testVariables = new HashMap<String, Object>();
+ Map<String, Object> testVariables = new HashMap<>();
testVariables.put("requestId", "TEST-REQUEST-ID-0123");
testVariables.put("serviceInstanceId", "test-service-instance-id");
//testVariables.put("vnfId", "TEST-VNF-ID-0123");
String businessKey = UUID.randomUUID().toString();
String createVfModuleVolRequest = FileUtil.readResourceFile("__files/CreateVfModuleVolumeInfraV1/createVfModuleVolume_VID_request.json");
- Map<String, Object> testVariables = new HashMap<String, Object>();
+ Map<String, Object> testVariables = new HashMap<>();
testVariables.put("requestId", "TEST-REQUEST-ID-0123");
testVariables.put("serviceInstanceId", "test-service-instance-id");
//testVariables.put("vnfId", "TEST-VNF-ID-0123");
mockUpdateRequestDB(200, "Database/DBUpdateResponse.xml");
String businessKey = UUID.randomUUID().toString();
- Map<String, Object> variables = new HashMap<String, Object>();
+ Map<String, Object> variables = new HashMap<>();
setVariablesSuccess(variables, createVnfInfraRequest, "testRequestId123", "MIS%2F1604%2F0026%2FSW_INTERNET");
TestAsyncResponse asyncResponse = invokeAsyncProcess("CreateVnfInfra",
"v1", businessKey, createVnfInfraRequest, variables);
mockUpdateRequestDB(200, "Database/DBUpdateResponse.xml");
- Map<String, String> variables = new HashMap<String, String>();
+ Map<String, String> variables = new HashMap<>();
setVariables(variables, null, "testRequestId123", "MIS%2F1604%2F0026%2FSW_INTERNET");
WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "CreateVnfInfra", variables);
MockNodeQueryServiceInstanceById_404("MIS%2F1604%2F0026%2FSW_INTERNET");
mockUpdateRequestDB(200, "Database/DBUpdateResponse.xml");
- Map<String, String> variables = new HashMap<String, String>();
+ Map<String, String> variables = new HashMap<>();
setVariables(variables, createVnfInfraRequest, "testRequestId123", "MIS%2F1604%2F0026%2FSW_INTERNET");
WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "CreateVnfInfra", variables);
MockPutGenericVnf();
mockUpdateRequestDB(200, "Database/DBUpdateResponse.xml");
- Map<String, String> variables = new HashMap<String, String>();
+ Map<String, String> variables = new HashMap<>();
setVariables(variables, createVnfInfraRequest, "testRequestId123", "MIS%2F1604%2F0026%2FSW_INTERNET");
WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "CreateVnfInfra", variables);
\r
// Success Scenario\r
private Map<String, String> setupVariables() {\r
- Map<String, String> variables = new HashMap<String, String>();\r
+ Map<String, String> variables = new HashMap<>();\r
variables.put("isDebugLogEnabled", "true");\r
variables.put("bpmnRequest", getRequest());\r
variables.put("mso-request-id", "RaaTestRequestId-1");\r
mockUpdateRequestDB(200, "Database/DBUpdateResponse.xml");\r
MockGetCloudRegion("RDM2WAGPLCP", 200, "DeleteNetworkV2/cloudRegion30_AAIResponse_Success.xml");\r
\r
- Map<String, String> variables = new HashMap<String, String>();\r
+ Map<String, String> variables = new HashMap<>();\r
variables.put("mso-request-id", "testRequestId");\r
variables.put("requestId", "testRequestId");\r
variables.put("isBaseVfModule", "true");\r
String networkModelInfo = " {\"modelName\": \"modelName\", " + '\n' +\r
" \"networkType\": \"modelName\" }";\r
\r
- Map<String, String> variables = new HashMap<String, String>();\r
+ Map<String, String> variables = new HashMap<>();\r
variables.put("testMessageId", "88f65519-9a38-4c4b-8445-9eb4a5a5af56");\r
variables.put("msoRequestId", "testRequestId");\r
variables.put("requestId", "testRequestId");\r
String networkModelInfo = " {\"modelCustomizationId\": \"uuid-nrc-001-1234\", " + '\n' +\r
" \"modelInvariantId\": \"was-ist-das-001-1234\" }";\r
\r
- Map<String, String> variables = new HashMap<String, String>();\r
+ Map<String, String> variables = new HashMap<>();\r
variables.put("testMessageId", "88f65519-9a38-4c4b-8445-9eb4a5a5af56");\r
variables.put("msoRequestId", "testRequestId");\r
variables.put("requestId", "testRequestId");\r
\r
// Active Scenario\r
private Map<String, Object> setupVariablesSunnyDayVID() {\r
- Map<String, Object> variables = new HashMap<String, Object>();\r
+ Map<String, Object> variables = new HashMap<>();\r
//try {\r
// variables.put("bpmnRequest", FileUtil.readResourceFile("__files/CreateVfModule_VID_request.json"));\r
//}\r
}\r
\r
\r
-}
+}\r
String deleteVfModuleVolRequest =
FileUtil.readResourceFile("__files/DeleteVfModuleVolumeInfraV1/deleteVfModuleVolume_VID_request_st.json");
- Map<String, Object> testVariables = new HashMap<String, Object>();
+ Map<String, Object> testVariables = new HashMap<>();
testVariables.put("requestId", "TEST-REQUEST-ID-0123");
testVariables.put("volumeGroupId", "78987");
testVariables.put("serviceInstanceId", "test-service-instance-id-0123");
String deleteVfModuleVolRequest =
FileUtil.readResourceFile("__files/DeleteVfModuleVolumeInfraV1/deleteVfModuleVolume_VID_request_st.json");
- Map<String, Object> testVariables = new HashMap<String, Object>();
+ Map<String, Object> testVariables = new HashMap<>();
testVariables.put("requestId", "TEST-REQUEST-ID-0123");
testVariables.put("volumeGroupId", "78987");
String deleteVfModuleVolRequest =
FileUtil.readResourceFile("__files/DeleteVfModuleVolumeInfraV1/deleteVfModuleVolume_VID_request_st.json");
- Map<String, Object> testVariables = new HashMap<String, Object>();
+ Map<String, Object> testVariables = new HashMap<>();
testVariables.put("requestId", "TEST-REQUEST-ID-0123");
testVariables.put("volumeGroupId", "78987");
MockDeleteGenericVnf();
mockUpdateRequestDB(200, "Database/DBUpdateResponse.xml");
- Map<String, String> variables = new HashMap<String, String>();
+ Map<String, String> variables = new HashMap<>();
setVariables(variables, deleteVnfInfraRequest, "testRequestId123", "MIS%2F1604%2F0026%2FSW_INTERNET");
WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "DeleteVnfInfra", variables);
waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());
MockDeleteGenericVnf();
mockUpdateRequestDB(200, "Database/DBUpdateResponse.xml");
- Map<String, String> variables = new HashMap<String, String>();
+ Map<String, String> variables = new HashMap<>();
setVariables(variables, deleteVnfInfraRequestCascadeDelete, "testRequestId123", "MIS%2F1604%2F0026%2FSW_INTERNET");
WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "DeleteVnfInfra", variables);
waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());
MockDeleteGenericVnf_404();
mockUpdateRequestDB(200, "Database/DBUpdateResponse.xml");
- Map<String, String> variables = new HashMap<String, String>();
+ Map<String, String> variables = new HashMap<>();
setVariables(variables, deleteVnfInfraRequest, "testRequestId123", "MIS%2F1604%2F0026%2FSW_INTERNET");
WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "DeleteVnfInfra", variables);
MockDeleteGenericVnf();
mockUpdateRequestDB(200, "Database/DBUpdateResponse.xml");
- Map<String, String> variables = new HashMap<String, String>();
+ Map<String, String> variables = new HashMap<>();
setVariables(variables, deleteVnfInfraRequest, "testRequestId123", "MIS%2F1604%2F0026%2FSW_INTERNET");
WorkflowResponse workflowResponse = executeWorkFlow(processEngineRule, "DeleteVnfInfra", variables);
mockUpdateRequestDB(200, "DBUpdateResponse.xml");\r
String businessKey = UUID.randomUUID().toString();\r
\r
- Map<String, Object> variables = new HashMap<String, Object>();\r
+ Map<String, Object> variables = new HashMap<>();\r
setupVariables(variables);\r
invokeSubProcess("DoCreateServiceInstanceRollback", businessKey, variables);\r
injectSDNCCallbacks(callbacks, "deactivate");\r
variables.put("rollbackData",rollbackData);\r
\r
}\r
-}
+}\r
mockUpdateRequestDB(200, "DBUpdateResponse.xml");
String businessKey = UUID.randomUUID().toString();
- Map<String, Object> variables = new HashMap<String, Object>();
+ Map<String, Object> variables = new HashMap<>();
setupVariables(variables);
invokeSubProcess("DoCreateServiceInstance", businessKey, variables);
injectSDNCCallbacks(callbacks, "assign");
MockPatchVfModuleId("a27ce5a9-29c4-4c22-a017-6615ac73c721", "973ed047-d251-4fb9-bf1a-65b8949e0a73");\r
\r
String businessKey = UUID.randomUUID().toString();\r
- Map<String, Object> variables = new HashMap<String, Object>();\r
+ Map<String, Object> variables = new HashMap<>();\r
RollbackData rollbackData = new RollbackData();\r
rollbackData.put("VFMODULE", "source", "PORTAL");\r
rollbackData.put("VFMODULE", "vnfid", "a27ce5a9-29c4-4c22-a017-6615ac73c721");\r
\r
\r
private Map<String, Object> setupVariablesSunnyDayBuildingBlocks() {\r
- Map<String, Object> variables = new HashMap<String, Object>();\r
+ Map<String, Object> variables = new HashMap<>();\r
//try {\r
// variables.put("bpmnRequest", FileUtil.readResourceFile("__files/CreateVfModule_VID_request.json"));\r
//}\r
String businessKey = UUID.randomUUID().toString();\r
String createVfModuleVolRequest = FileUtil.readResourceFile("__files/DoCreateVfModuleVolumeV1/CreateVfModuleVolumeRequest.xml");\r
\r
- Map<String, Object> testVariables = new HashMap<String, Object>();\r
+ Map<String, Object> testVariables = new HashMap<>();\r
testVariables.put("volumeGroupId", "TEST-VOLUME-VOLUME-GROUP-ID-0123");\r
testVariables.put("vnfId", "TEST-VNF-ID-0123");\r
testVariables.put("lcpCloudRegionId", "AAIAIC25");\r
String businessKey = UUID.randomUUID().toString();\r
String createVfModuleVolRequest = FileUtil.readResourceFile("__files/DoCreateVfModuleVolumeV1/CreateVfModuleVolumeRequest.xml");\r
\r
- Map<String, Object> testVariables = new HashMap<String, Object>();\r
+ Map<String, Object> testVariables = new HashMap<>();\r
testVariables.put("DCVFMODVOLV2_volumeGroupId", "TEST-VOLUME-VOLUME-GROUP-ID-0123");\r
testVariables.put("vnf-id", "TEST-VNF-ID-0123");\r
testVariables.put("volume-group-id", "TEST-VOLUME-GROUP-ID-0123");\r
String businessKey = UUID.randomUUID().toString();\r
String createVfModuleVolRequest = FileUtil.readResourceFile("__files/DoCreateVfModuleVolumeV1/CreateVfModuleVolumeRequest.xml");\r
\r
- Map<String, Object> testVariables = new HashMap<String, Object>();\r
+ Map<String, Object> testVariables = new HashMap<>();\r
testVariables.put("DCVFMODVOLV2_volumeGroupId", "TEST-VOLUME-VOLUME-GROUP-ID-0123");\r
testVariables.put("vnf-id", "TEST-VNF-ID-0123");\r
testVariables.put("volume-group-id", "TEST-VOLUME-GROUP-ID-0123");\r
String businessKey = UUID.randomUUID().toString();\r
String createVfModuleVolRequest = FileUtil.readResourceFile("__files/DoCreateVfModuleVolumeV1/CreateVfModuleVolumeRequest.xml");\r
\r
- Map<String, Object> testVariables = new HashMap<String, Object>();\r
+ Map<String, Object> testVariables = new HashMap<>();\r
testVariables.put("DCVFMODVOLV2_volumeGroupId", "TEST-VOLUME-VOLUME-GROUP-ID-0123");\r
testVariables.put("vnf-id", "TEST-VNF-ID-0123");\r
testVariables.put("volume-group-id", "TEST-VOLUME-GROUP-ID-0123");\r
String businessKey = UUID.randomUUID().toString();\r
String createVfModuleVolRequest = FileUtil.readResourceFile("__files/DoCreateVfModuleVolumeV1/CreateVfModuleVolumeNoRollbackRequest.xml");\r
\r
- Map<String, Object> testVariables = new HashMap<String, Object>();\r
+ Map<String, Object> testVariables = new HashMap<>();\r
testVariables.put("DCVFMODVOLV2_volumeGroupId", "TEST-VOLUME-VOLUME-GROUP-ID-0123");\r
testVariables.put("vnf-id", "TEST-VNF-ID-0123");\r
testVariables.put("volume-group-id", "TEST-VOLUME-GROUP-ID-0123");\r
MockDeleteGenericVnf("a27ce5a9-29c4-4c22-a017-6615ac73c721", "0000021");\r
MockDeleteVfModuleId("a27ce5a9-29c4-4c22-a017-6615ac73c721", "973ed047-d251-4fb9-bf1a-65b8949e0a73", "0000073", 200);\r
String businessKey = UUID.randomUUID().toString();\r
- Map<String, Object> variables = new HashMap<String, Object>();\r
+ Map<String, Object> variables = new HashMap<>();\r
RollbackData rollbackData = new RollbackData();\r
\r
rollbackData.put("VFMODULE_BASE", "source", "PORTAL");\r
MockDoDeleteVfModule_SDNCSuccess();\r
mockUpdateRequestDB(200, "Database/DBUpdateResponse.xml");\r
String businessKey = UUID.randomUUID().toString();\r
- Map<String, Object> variables = new HashMap<String, Object>();\r
+ Map<String, Object> variables = new HashMap<>();\r
RollbackData rollbackData = new RollbackData();\r
\r
rollbackData.put("VNF", "vnfId", "testVnfId123");\r
MockDeleteGenericVnf("a27ce5a9-29c4-4c22-a017-6615ac73c721", "0000021");\r
MockDeleteVfModuleId("", "", "", 200);\r
String businessKey = UUID.randomUUID().toString();\r
- Map<String, Object> variables = new HashMap<String, Object>();\r
+ Map<String, Object> variables = new HashMap<>();\r
RollbackData rollbackData = new RollbackData();\r
\r
rollbackData.put("VFMODULE_BASE", "source", "PORTAL");\r
mockUpdateRequestDB(200, "Database/DBUpdateResponse.xml");\r
\r
String businessKey = UUID.randomUUID().toString();\r
- Map<String, Object> variables = new HashMap<String, Object>();\r
+ Map<String, Object> variables = new HashMap<>();\r
setVariablesSuccess(variables, "", "testRequestId123", "MIS%2F1604%2F0026%2FSW_INTERNET");\r
invokeSubProcess("DoCreateVnfAndModules", businessKey, variables);\r
\r
mockSDNCAdapter("VfModularity/StandardSDNCSynchResponse.xml");\r
\r
String businessKey = UUID.randomUUID().toString();\r
- Map<String, Object> variables = new HashMap<String, Object>();\r
+ Map<String, Object> variables = new HashMap<>();\r
setVariablesAddonSuccess(variables, "", "testRequestId123", "MIS%2F1604%2F0026%2FSW_INTERNET");\r
invokeSubProcess("DoCreateVnfAndModules", businessKey, variables);\r
\r
mockUpdateRequestDB(200, "Database/DBUpdateResponse.xml");
String businessKey = UUID.randomUUID().toString();
- Map<String, Object> variables = new HashMap<String, Object>();
+ Map<String, Object> variables = new HashMap<>();
setVariablesSuccess(variables, createVnfInfraRequest, "testRequestId123", "MIS%2F1604%2F0026%2FSW_INTERNET");
invokeSubProcess("DoCreateVnf", businessKey, variables);
mockUpdateRequestDB(200, "Database/DBUpdateResponse.xml");
String businessKey = UUID.randomUUID().toString();
- Map<String, Object> variables = new HashMap<String, Object>();
+ Map<String, Object> variables = new HashMap<>();
setupVariables(variables);
invokeSubProcess("DoDeleteServiceInstance", businessKey, variables);
injectSDNCCallbacks(callbacks, "deactivate");
MockAAIDeleteVfModule();\r
\r
String businessKey = UUID.randomUUID().toString();\r
- Map<String, Object> variables = new HashMap<String, Object>(); \r
+ Map<String, Object> variables = new HashMap<>();\r
variables.put("isDebugLogEnabled","true");\r
variables.put("mso-request-id", "a27ce5a9-29c4-4c22-a017-6615ac73c721");\r
variables.put("msoRequestId", "a27ce5a9-29c4-4c22-a017-6615ac73c721");\r
MockPatchVfModuleId("a27ce5a9-29c4-4c22-a017-6615ac73c721", "973ed047-d251-4fb9-bf1a-65b8949e0a73");\r
\r
String businessKey = UUID.randomUUID().toString();\r
- Map<String, Object> variables = new HashMap<String, Object>(); \r
+ Map<String, Object> variables = new HashMap<>();\r
variables.put("isDebugLogEnabled","true");\r
variables.put("mso-request-id", "a27ce5a9-29c4-4c22-a017-6615ac73c721");\r
variables.put("mso-service-instance-id", "a27ce5a9-29c4-4c22-a017-6615ac73c721");\r
MockPatchVfModuleId("a27ce5a9-29c4-4c22-a017-6615ac73c721", "973ed047-d251-4fb9-bf1a-65b8949e0a73");\r
\r
String businessKey = UUID.randomUUID().toString();\r
- Map<String, Object> variables = new HashMap<String, Object>(); \r
+ Map<String, Object> variables = new HashMap<>();\r
\r
variables.put("mso-request-id", "a27ce5a9-29c4-4c22-a017-6615ac73c721"); \r
variables.put("requestId", "a27ce5a9-29c4-4c22-a017-6615ac73c721"); \r
MockPatchVfModuleId("a27ce5a9-29c4-4c22-a017-6615ac73c721", "973ed047-d251-4fb9-bf1a-65b8949e0a73");\r
\r
String businessKey = UUID.randomUUID().toString();\r
- Map<String, Object> variables = new HashMap<String, Object>(); \r
+ Map<String, Object> variables = new HashMap<>();\r
variables.put("isDebugLogEnabled","true");\r
variables.put("mso-request-id", "a27ce5a9-29c4-4c22-a017-6615ac73c721");\r
variables.put("mso-service-instance-id", "a27ce5a9-29c4-4c22-a017-6615ac73c721");\r
MockPatchVfModuleId("a27ce5a9-29c4-4c22-a017-6615ac73c721", "973ed047-d251-4fb9-bf1a-65b8949e0a73");\r
\r
String businessKey = UUID.randomUUID().toString();\r
- Map<String, Object> variables = new HashMap<String, Object>(); \r
+ Map<String, Object> variables = new HashMap<>();\r
variables.put("isDebugLogEnabled","true");\r
variables.put("mso-request-id", "a27ce5a9-29c4-4c22-a017-6615ac73c721");\r
variables.put("mso-service-instance-id", "a27ce5a9-29c4-4c22-a017-6615ac73c721");\r
MockPatchVfModuleId("a27ce5a9-29c4-4c22-a017-6615ac73c721", "973ed047-d251-4fb9-bf1a-65b8949e0a73");\r
\r
String businessKey = UUID.randomUUID().toString();\r
- Map<String, Object> variables = new HashMap<String, Object>(); \r
+ Map<String, Object> variables = new HashMap<>();\r
variables.put("isDebugLogEnabled","true");\r
variables.put("mso-request-id", "a27ce5a9-29c4-4c22-a017-6615ac73c721");\r
variables.put("mso-service-instance-id", "a27ce5a9-29c4-4c22-a017-6615ac73c721");\r
MockPatchVfModuleId("a27ce5a9-29c4-4c22-a017-6615ac73c721", "973ed047-d251-4fb9-bf1a-65b8949e0a73");\r
\r
String businessKey = UUID.randomUUID().toString();\r
- Map<String, Object> variables = new HashMap<String, Object>(); \r
+ Map<String, Object> variables = new HashMap<>();\r
variables.put("isDebugLogEnabled","true");\r
variables.put("mso-request-id", "a27ce5a9-29c4-4c22-a017-6615ac73c721");\r
variables.put("mso-service-instance-id", "a27ce5a9-29c4-4c22-a017-6615ac73c721");\r
MockGetVolumeGroupById("AAIAIC25", "78987", "VfModularity/VolumeGroup.xml");\r
String businessKey = UUID.randomUUID().toString();\r
\r
- Map<String, Object> testVariables = new HashMap<String, Object>();\r
+ Map<String, Object> testVariables = new HashMap<>();\r
testVariables.put("mso-request-id", "TEST-REQUEST-ID-0123");\r
testVariables.put("msoRequestId", "TEST-REQUEST-ID-0123");\r
testVariables.put("isDebugLogEnabled", "true");\r
mockUpdateRequestDB(200, "Database/DBUpdateResponse.xml");\r
String businessKey = UUID.randomUUID().toString();\r
\r
- Map<String, Object> testVariables = new HashMap<String, Object>();\r
+ Map<String, Object> testVariables = new HashMap<>();\r
testVariables.put("mso-request-id", "TEST-REQUEST-ID-0123");\r
testVariables.put("msoRequestId", "TEST-REQUEST-ID-0123");\r
testVariables.put("isDebugLogEnabled", "true");\r
mockUpdateRequestDB(200, "Database/DBUpdateResponse.xml");\r
String businessKey = UUID.randomUUID().toString();\r
\r
- Map<String, Object> testVariables = new HashMap<String, Object>();\r
+ Map<String, Object> testVariables = new HashMap<>();\r
testVariables.put("mso-request-id", "TEST-REQUEST-ID-0123");\r
testVariables.put("msoRequestId", "TEST-REQUEST-ID-0123");\r
testVariables.put("isDebugLogEnabled", "true");\r
mockUpdateRequestDB(200, "Database/DBUpdateResponse.xml");\r
String businessKey = UUID.randomUUID().toString();\r
\r
- Map<String, Object> testVariables = new HashMap<String, Object>();\r
+ Map<String, Object> testVariables = new HashMap<>();\r
testVariables.put("mso-request-id", "TEST-REQUEST-ID-0123");\r
testVariables.put("msoRequestId", "TEST-REQUEST-ID-0123");\r
testVariables.put("isDebugLogEnabled", "true");\r
mockSDNCAdapter(200);\r
\r
String businessKey = UUID.randomUUID().toString();\r
- Map<String, Object> variables = new HashMap<String, Object>();\r
+ Map<String, Object> variables = new HashMap<>();\r
setVariablesVnfOnly(variables);\r
invokeSubProcess("DoDeleteVnfAndModules", businessKey, variables);\r
\r
MockAAIDeleteVfModule();\r
\r
String businessKey = UUID.randomUUID().toString();\r
- Map<String, Object> variables = new HashMap<String, Object>();\r
+ Map<String, Object> variables = new HashMap<>();\r
setVariablesVnfAndModules(variables);\r
invokeSubProcess("DoDeleteVnfAndModules", businessKey, variables);\r
\r
mockUpdateRequestDB(200, "Database/DBUpdateResponse.xml");
String businessKey = UUID.randomUUID().toString();
- Map<String, Object> variables = new HashMap<String, Object>();
+ Map<String, Object> variables = new HashMap<>();
setVariables(variables);
invokeSubProcess("DoDeleteVnf", businessKey, variables);
// Disabled until SDNC support is there
mockUpdateRequestDB(200, "Database/DBUpdateResponse.xml");
String businessKey = UUID.randomUUID().toString();
- Map<String, Object> variables = new HashMap<String, Object>();
+ Map<String, Object> variables = new HashMap<>();
setVariables(variables);
invokeSubProcess("DoDeleteVnf", businessKey, variables);
mockUpdateRequestDB(200, "Database/DBUpdateResponse.xml");
String businessKey = UUID.randomUUID().toString();
- Map<String, Object> variables = new HashMap<String, Object>();
+ Map<String, Object> variables = new HashMap<>();
setVariables(variables);
invokeSubProcess("DoDeleteVnf", businessKey, variables);
MockGetGenericVnfByIdWithPriority("skask", "supercool", 200, "VfModularity/VfModule-supercool.xml", 1);\r
\r
String businessKey = UUID.randomUUID().toString();\r
- Map<String, Object> variables = new HashMap<String, Object>();\r
+ Map<String, Object> variables = new HashMap<>();\r
variables.put("mso-request-id", "DEV-VF-0011");\r
variables.put("isDebugLogEnabled","true");\r
variables.put("DoUpdateVfModuleRequest", doUpdateVfModuleRequest);\r
MockVNFAdapterRestVfModule();\r
\r
String businessKey = UUID.randomUUID().toString();\r
- Map<String, Object> variables = new HashMap<String, Object>();\r
+ Map<String, Object> variables = new HashMap<>();\r
variables.put("mso-request-id", "DEV-VF-0011");\r
variables.put("isDebugLogEnabled","true");\r
variables.put("msoRequestId", "DEV-VF-0011");\r
mockUpdateRequestDB(200, "Database/DBUpdateResponse.xml");\r
\r
String businessKey = UUID.randomUUID().toString();\r
- Map<String, Object> variables = new HashMap<String, Object>();\r
+ Map<String, Object> variables = new HashMap<>();\r
setVariablesSuccess(variables, "", "testRequestId123", "MIS%2F1604%2F0026%2FSW_INTERNET");\r
invokeSubProcess("DoUpdateVnfAndModules", businessKey, variables);\r
\r
\r
// Active Scenario\r
private Map<String, Object> setupVariablesSunnyDayVID() {\r
- Map<String, Object> variables = new HashMap<String, Object>();\r
+ Map<String, Object> variables = new HashMap<>();\r
//try {\r
// variables.put("bpmnRequest", FileUtil.readResourceFile("__files/CreateVfModule_VID_request.json"));\r
//}\r
// Success Scenario
private Map<String, String> setupVariablesVID1() {
- Map<String, String> variables = new HashMap<String, String>();
+ Map<String, String> variables = new HashMap<>();
variables.put("bpmnRequest", getCreateNetworkRequest1());
variables.put("mso-request-id", "testRequestId");
variables.put("requestId", "testRequestId");
// Success Scenario
private Map<String, String> setupVariablesVIPER1() {
- Map<String, String> variables = new HashMap<String, String>();
+ Map<String, String> variables = new HashMap<>();
variables.put("testMessageId", "88f65519-9a38-4c4b-8445-9eb4a5a5af56");
variables.put("msoRequestId", "testRequestId");
variables.put("requestId", "testRequestId");
// Missing Name Scenario
private Map<String, String> setupVariablesMissingNetworkId() {
- Map<String, String> variables = new HashMap<String, String>();
+ Map<String, String> variables = new HashMap<>();
variables.put("mso-request-id", "88f65519-9a38-4c4b-8445-9eb4a5a5af56");
variables.put("bpmnRequest", getCreateNetworkRequestNetworkId());
variables.put("requestId", "testRequestId");
\r
// Active Scenario\r
private Map<String, Object> setupVariablesSunnyDayVID() {\r
- Map<String, Object> variables = new HashMap<String, Object>();\r
+ Map<String, Object> variables = new HashMap<>();\r
//try {\r
// variables.put("bpmnRequest", FileUtil.readResourceFile("__files/CreateVfModule_VID_request.json"));\r
//}\r
\r
// Active Scenario\r
private Map<String, Object> setupVariablesSunnyDayVID() {\r
- Map<String, Object> variables = new HashMap<String, Object>();\r
+ Map<String, Object> variables = new HashMap<>();\r
variables.put("requestId", "testRequestId"); \r
variables.put("isBaseVfModule", false);\r
variables.put("isDebugLogEnabled", "true");\r
String updaetVfModuleVolRequest =\r
FileUtil.readResourceFile("__files/UpdateVfModuleVolumeInfraV1/updateVfModuleVolume_VID_request.json");\r
\r
- Map<String, Object> testVariables = new HashMap<String, Object>();\r
+ Map<String, Object> testVariables = new HashMap<>();\r
testVariables.put("requestId", "TEST-REQUEST-ID-0123");\r
testVariables.put("serviceInstanceId", "test-service-instance-id");\r
testVariables.put("volumeGroupId", "78987");\r
String updaetVfModuleVolRequest =\r
FileUtil.readResourceFile("__files/UpdateVfModuleVolumeInfraV1/updateVfModuleVolume_VID_request_2.json");\r
\r
- Map<String, Object> testVariables = new HashMap<String, Object>();\r
+ Map<String, Object> testVariables = new HashMap<>();\r
testVariables.put("requestId", "TEST-REQUEST-ID-0123");\r
testVariables.put("serviceInstanceId", "test-service-instance-id");\r
testVariables.put("volumeGroupId", "78987");\r
\r
// Active Scenario\r
private Map<String, Object> setupVariablesSunnyDayVID() {\r
- Map<String, Object> variables = new HashMap<String, Object>();\r
+ Map<String, Object> variables = new HashMap<>();\r
//try {\r
// variables.put("bpmnRequest", FileUtil.readResourceFile("__files/CreateVfModule_VID_request.json"));\r
//}\r
* @throws RESTException if unable to create a RESTClient
*/
public RESTClient(RESTConfig cfg) throws RESTException {
- this.headers = new LinkedHashMap<String, List<String>>();
- this.parameters = new LinkedHashMap<String, List<String>>();
+ this.headers = new LinkedHashMap<>();
+ this.parameters = new LinkedHashMap<>();
this.URL = cfg.getURL();
this.proxyHost = cfg.getProxyHost();
this.proxyPort = cfg.getProxyPort();
*/
public RESTClient addParameter(String name, String value) {
if (!parameters.containsKey(name)) {
- parameters.put(name, new ArrayList<String>());
+ parameters.put(name, new ArrayList<>());
}
List<String> values = parameters.get(name);
*/
public RESTClient addHeader(String name, String value) {
if (!headers.containsKey(name)) {
- headers.put(name, new ArrayList<String>());
+ headers.put(name, new ArrayList<>());
}
List<String> values = headers.get(name);
encoder.setPattern(logPattern);
encoder.setContext(context);
encoder.start();
- RollingFileAppender<ILoggingEvent> fileAppender=new RollingFileAppender<ILoggingEvent>();
- TimeBasedRollingPolicy<ILoggingEvent> rollingPolicy=new TimeBasedRollingPolicy<ILoggingEvent>();
+ RollingFileAppender<ILoggingEvent> fileAppender= new RollingFileAppender<>();
+ TimeBasedRollingPolicy<ILoggingEvent> rollingPolicy= new TimeBasedRollingPolicy<>();
rollingPolicy.setContext(context);
rollingPolicy.setFileNamePattern(msoAlarmFile + ".%d");
rollingPolicy.setParent(fileAppender);
// Hardcode if nothing is received
prefixMsoPropertiesPath = "";
}
- msoPropertiesCache = new ConcurrentHashMap <String, MsoPropertiesParameters> ();
+ msoPropertiesCache = new ConcurrentHashMap<>();
}
private static final ReentrantReadWriteLock rwl = new ReentrantReadWriteLock ();
*/
public List <AbstractMsoProperties> getAllMsoProperties () {
- List <AbstractMsoProperties> resultList = new LinkedList <AbstractMsoProperties> ();
+ List <AbstractMsoProperties> resultList = new LinkedList<>();
rwl.readLock ().lock ();
try {
private List <CheckResult> results;
public CheckResults () {
- results = new ArrayList <CheckResult> ();
+ results = new ArrayList<>();
}
public List <CheckResult> getResults () {
public final void testGetMsoProperties()
throws MsoPropertiesException, InterruptedException, ExecutionException, FileNotFoundException {
- List<Future<Integer>> list = new ArrayList<Future<Integer>>();
+ List<Future<Integer>> list = new ArrayList<>();
ExecutorService executor = Executors.newFixedThreadPool(20);
for (int i = 0; i <= 100000; i++) {
queryValue,
getRequestType ());
- List <VnfRequest> queryResponseList = new LinkedList <VnfRequest> ();
+ List <VnfRequest> queryResponseList = new LinkedList<>();
if (activeReqList != null) {
// build response for active
}
private List <VnfRequest> infraRequestsResponses (List <? extends InfraRequests> arList, String version) {
- List <VnfRequest> queryResponseList = new LinkedList <VnfRequest> ();
+ List <VnfRequest> queryResponseList = new LinkedList<>();
for (InfraRequests ar : arList) {
VnfRequest qr = fillGeneric (ar);
queryValue,
"VOLUME");
- List <VolumeRequest> queryResponseList = new LinkedList <VolumeRequest> ();
+ List <VolumeRequest> queryResponseList = new LinkedList<>();
if (activeReqList != null) {
// build response for active
}
private List <VolumeRequest> infraRequestsResponses (List <? extends InfraRequests> arList, String version) {
- List <VolumeRequest> queryResponseList = new LinkedList <VolumeRequest> ();
+ List <VolumeRequest> queryResponseList = new LinkedList<>();
for (InfraRequests ar : arList) {
VolumeRequest qr = fillGeneric (ar);
private List<LocationConstraint> locationConstraints;
- private Map<String, Object> additionalParamForNs = new HashMap<String,Object>();
+ private Map<String, Object> additionalParamForNs = new HashMap<>();
/**
* @return Returns the locationConstraints.
*/
*/
public List<NetworkRequest> getNetworkRequest() {
if (networkRequest == null) {
- networkRequest = new ArrayList<NetworkRequest>();
+ networkRequest = new ArrayList<>();
}
return this.networkRequest;
}
*/
public List<NetworkType> getNetworkType() {
if (networkType == null) {
- networkType = new ArrayList<NetworkType>();
+ networkType = new ArrayList<>();
}
return this.networkType;
}
*/
@XmlElementDecl(namespace = "http://org.openecomp/mso/infra/network-request/v1", name = "network-params")
public JAXBElement<Object> createNetworkParams(Object value) {
- return new JAXBElement<Object>(_NetworkParams_QNAME, Object.class, null, value);
+ return new JAXBElement<>(_NetworkParams_QNAME, Object.class, null, value);
}
}
*/
public List<String> getVariables() {
if (variables == null) {
- variables = new ArrayList<String>();
+ variables = new ArrayList<>();
}
return this.variables;
}
*/
@XmlElementDecl(namespace = "http://org.openecomp/mso/infra/vnf-request/v1", name = "vnf-params")
public JAXBElement<Object> createVnfParams(Object value) {
- return new JAXBElement<Object>(_VnfParams_QNAME, Object.class, null, value);
+ return new JAXBElement<>(_VnfParams_QNAME, Object.class, null, value);
}
}
*/
public List<VfModuleModelName> getVfModuleModelName() {
if (vfModuleModelName == null) {
- vfModuleModelName = new ArrayList<VfModuleModelName>();
+ vfModuleModelName = new ArrayList<>();
}
return this.vfModuleModelName;
}
*/
public List<VnfRequest> getVnfRequest() {
if (vnfRequest == null) {
- vnfRequest = new ArrayList<VnfRequest>();
+ vnfRequest = new ArrayList<>();
}
return this.vnfRequest;
}
*/
public List<VnfType> getVnfType() {
if (vnfType == null) {
- vnfType = new ArrayList<VnfType>();
+ vnfType = new ArrayList<>();
}
return this.vnfType;
}
*/
@XmlElementDecl(namespace = "http://org.openecomp/mso/infra/volume-request/v1", name = "volume-params")
public JAXBElement<Object> createVolumeParams(Object value) {
- return new JAXBElement<Object>(_VolumeParams_QNAME, Object.class, null, value);
+ return new JAXBElement<>(_VolumeParams_QNAME, Object.class, null, value);
}
}
*/
public List<VolumeRequest> getVolumeRequest() {
if (volumeRequest == null) {
- volumeRequest = new ArrayList<VolumeRequest>();
+ volumeRequest = new ArrayList<>();
}
return this.volumeRequest;
}
return;
}
ObjectMapper mapper = new ObjectMapper();
- HashMap<String, String> instanceIdMap = new HashMap<String,String>();
+ HashMap<String, String> instanceIdMap = new HashMap<>();
instanceIdMap.put("serviceInstanceId", "3eecada1-83a4-4f33-9ed2-7937e7b8dbbc");
ServiceInstancesRequest sir = mapper.readValue(requestJSON, ServiceInstancesRequest.class);
MsoRequest msoRequest = new MsoRequest ("1234");
return;
}
ObjectMapper mapper = new ObjectMapper();
- HashMap<String, String> instanceIdMap = new HashMap<String,String>();
+ HashMap<String, String> instanceIdMap = new HashMap<>();
instanceIdMap.put("serviceInstanceId", "3eecada1-83a4-4f33-9ed2-7937e7b8dbbc");
ServiceInstancesRequest sir = mapper.readValue(requestJSON, ServiceInstancesRequest.class);
MsoRequest msoRequest = new MsoRequest ("1234");
return;
}
ObjectMapper mapper = new ObjectMapper();
- HashMap<String, String> instanceIdMap = new HashMap<String,String>();
+ HashMap<String, String> instanceIdMap = new HashMap<>();
instanceIdMap.put("serviceInstanceId", "3eecada1-83a4-4f33-9ed2-7937e7b8dbbc");
ServiceInstancesRequest sir = mapper.readValue(requestJSON, ServiceInstancesRequest.class);
MsoRequest msoRequest = new MsoRequest ("1234");
return;
}
ObjectMapper mapper = new ObjectMapper();
- HashMap<String, String> instanceIdMap = new HashMap<String,String>();
+ HashMap<String, String> instanceIdMap = new HashMap<>();
instanceIdMap.put("serviceInstanceId", "3eecada1-83a4-4f33-9ed2-7937e7b8dbbc");
ServiceInstancesRequest sir = mapper.readValue(requestJSON, ServiceInstancesRequest.class);
MsoRequest msoRequest = new MsoRequest ("1234");
return;
}
ObjectMapper mapper = new ObjectMapper();
- HashMap<String, String> instanceIdMap = new HashMap<String,String>();
+ HashMap<String, String> instanceIdMap = new HashMap<>();
instanceIdMap.put("serviceInstanceId", "3eecada1-83a4-4f33-9ed2-7937e7b8dbbc");
ServiceInstancesRequest sir = mapper.readValue(requestJSON, ServiceInstancesRequest.class);
MsoRequest msoRequest = new MsoRequest ("1234");
return;
}
ObjectMapper mapper = new ObjectMapper();
- HashMap<String, String> instanceIdMap = new HashMap<String,String>();
+ HashMap<String, String> instanceIdMap = new HashMap<>();
instanceIdMap.put("serviceInstanceId", "3eecada1-83a4-4f33-9ed2-7937e7b8dbbc");
ServiceInstancesRequest sir = mapper.readValue(requestJSON1, ServiceInstancesRequest.class);
MsoRequest msoRequest = new MsoRequest ("1234");
return;
}
ObjectMapper mapper = new ObjectMapper();
- HashMap<String, String> instanceIdMap = new HashMap<String,String>();
+ HashMap<String, String> instanceIdMap = new HashMap<>();
instanceIdMap.put("serviceInstanceId", "3eecada1-83a4-4f33-9ed2-7937e7b8dbbc");
ServiceInstancesRequest sir = mapper.readValue(requestJSON2, ServiceInstancesRequest.class);
MsoRequest msoRequest = new MsoRequest ("1234");
return;
}
ObjectMapper mapper = new ObjectMapper();
- HashMap<String, String> instanceIdMap = new HashMap<String,String>();
+ HashMap<String, String> instanceIdMap = new HashMap<>();
instanceIdMap.put("serviceInstanceId", "3eecada1-83a4-4f33-9ed2-7937e7b8dbbc");
ServiceInstancesRequest sir = mapper.readValue(requestJSON, ServiceInstancesRequest.class);
MsoRequest msoRequest = new MsoRequest ("1234");
}
ObjectMapper mapper = new ObjectMapper();
- HashMap<String, String> instanceIdMap = new HashMap<String,String>();
+ HashMap<String, String> instanceIdMap = new HashMap<>();
instanceIdMap.put("serviceInstanceId", "3eecada1-83a4-4f33-9ed2-7937e7b8dbbc");
instanceIdMap.put("vnfInstanceId", "3eecada1-83a4-4f33-9ed2-7937e7b8dbbc");
ServiceInstancesRequest sir = mapper.readValue(requestJSON, ServiceInstancesRequest.class);
}
mapper = new ObjectMapper();
- instanceIdMap = new HashMap<String,String>();
+ instanceIdMap = new HashMap<>();
instanceIdMap.put("serviceInstanceId", "3eecada1-83a4-4f33-9ed2-7937e7b8dbbc");
instanceIdMap.put("vnfInstanceId", "3eecada1-83a4-4f33-9ed2-7937e7b8dbbc");
sir = mapper.readValue(requestJSON, ServiceInstancesRequest.class);
}
ObjectMapper mapper = new ObjectMapper();
- HashMap<String, String> instanceIdMap = new HashMap<String,String>();
+ HashMap<String, String> instanceIdMap = new HashMap<>();
instanceIdMap.put("serviceInstanceId", "3eecada1-83a4-4f33-9ed2-7937e7b8dbbc");
instanceIdMap.put("vnfInstanceId", "3eecada1-83a4-4f33-9ed2-7937e7b8dbbc");
ServiceInstancesRequest sir = mapper.readValue(requestJSON, ServiceInstancesRequest.class);
public List <InfraActiveRequests> getRequestListFromInfraActive (String queryAttributeName,
String queryValue,
String requestType) {
- List <InfraActiveRequests> list = new ArrayList<InfraActiveRequests>();
+ List <InfraActiveRequests> list = new ArrayList<>();
InfraActiveRequests req = new InfraActiveRequests();
req.setAaiServiceId("299392");
req.setAction("CREATE");
new MockUp<CatalogDatabase>() {
@Mock
public List <VfModule> getAllVfModules(){
- List <VfModule> list = new ArrayList<VfModule>();
+ List <VfModule> list = new ArrayList<>();
VfModule resource = new VfModule();
list.add(resource);
return list;
public List <InfraActiveRequests> getRequestListFromInfraActive (String queryAttributeName,
String queryValue,
String requestType) {
- List <InfraActiveRequests> list = new ArrayList<InfraActiveRequests>();
+ List <InfraActiveRequests> list = new ArrayList<>();
InfraActiveRequests req = new InfraActiveRequests();
req.setAaiServiceId("299392");
req.setAction("CREATE");
public List <InfraActiveRequests> getRequestListFromInfraActive (String queryAttributeName,
String queryValue,
String requestType) {
- List <InfraActiveRequests> list = new ArrayList<InfraActiveRequests>();
+ List <InfraActiveRequests> list = new ArrayList<>();
InfraActiveRequests req = new InfraActiveRequests();
req.setAaiServiceId("299392");
req.setAction("CREATE");
new MockUp<CatalogDatabase>() {
@Mock
public List <VnfResource> getAllVnfResources(){
- List <VnfResource> list = new ArrayList<VnfResource>();
+ List <VnfResource> list = new ArrayList<>();
VnfResource resource = new VnfResource();
list.add(resource);
return list;
public List <InfraActiveRequests> getRequestListFromInfraActive (String queryAttributeName,
String queryValue,
String requestType) {
- List <InfraActiveRequests> list = new ArrayList<InfraActiveRequests>();
+ List <InfraActiveRequests> list = new ArrayList<>();
InfraActiveRequests req = new InfraActiveRequests();
req.setAaiServiceId("299392");
req.setAction("CREATE");
private Map<String, InfraActiveRequests> activeRequests;
public MockRequestsDatabase() {
- activeRequests = new HashMap<String, InfraActiveRequests>();
+ activeRequests = new HashMap<>();
}
public void addRecord(InfraActiveRequests record) {
long startTime = System.currentTimeMillis ();
msoLogger.debug ("Execute query on infra active request table");
- List <InfraActiveRequests> results = new ArrayList<InfraActiveRequests>();
+ List <InfraActiveRequests> results = new ArrayList<>();
Session session = sessionFactoryRequestDB.getSessionFactory ().openSession ();
try {
}
private void populateNetworkResourceType(List<NetworkResourceCustomization> resultList) {
- HashMap<String, NetworkResource> networkResources = new HashMap<String, NetworkResource>();
+ HashMap<String, NetworkResource> networkResources = new HashMap<>();
for (NetworkResourceCustomization nrc : resultList) {
String network_id = nrc.getNetworkResourceModelUuid();
public ServiceMacroHolder() {
super();
this.service = null;
- this.vnfResources = new ArrayList<VnfResource>();
+ this.vnfResources = new ArrayList<>();
this.networkResourceCustomizations = new ArrayList<>();
this.allottedResourceCustomizations = new ArrayList<>();
this.vnfResourceCustomizations = new ArrayList<>();
}
public List<VfModuleCustomization> getVfModuleCustomizations() {
- return this.vfModuleCustomizations == null ? new ArrayList<VfModuleCustomization>() : this.vfModuleCustomizations;
+ return this.vfModuleCustomizations == null ? new ArrayList<>() : this.vfModuleCustomizations;
}
public void setVfModuleCustomizations(ArrayList<VfModuleCustomization> vfModuleCustomizations) {
this.vfModuleCustomizations = vfModuleCustomizations;
if (this.vfModuleCustomizations != null) {
this.vfModuleCustomizations.add(vfmc);
} else {
- this.vfModuleCustomizations = new ArrayList<VfModuleCustomization>();
+ this.vfModuleCustomizations = new ArrayList<>();
this.vfModuleCustomizations.add(vfmc);
}
}
if (this.vfModules != null) {
this.vfModules.add(vfm);
} else {
- this.vfModules = new HashSet<VfModule>();
+ this.vfModules = new HashSet<>();
this.vfModules.add(vfm);
}
}
if (this.vfModules == null || this.vfModules.size() < 1) {
return null;
}
- ArrayList<VfModule> list = new ArrayList<VfModule>();
+ ArrayList<VfModule> list = new ArrayList<>();
list.addAll(this.vfModules);
return list;
}
if (this.vfModuleCustomizations != null) {
this.vfModuleCustomizations.add(vfmc);
} else {
- this.vfModuleCustomizations = new ArrayList<VfModuleCustomization>();
+ this.vfModuleCustomizations = new ArrayList<>();
this.vfModuleCustomizations.add(vfmc);
}
}
@Test(expected = Exception.class)
public void saveHeatTemplateTest(){
HeatTemplate heat = new HeatTemplate();
- Set <HeatTemplateParam> paramSet = new HashSet<HeatTemplateParam>();
+ Set <HeatTemplateParam> paramSet = new HashSet<>();
cd.saveHeatTemplate(heat,paramSet);
}
@Test(expected = Exception.class)
@Test(expected = Exception.class)
public void executeQuerySingleRow(){
VnfComponent ar = new VnfComponent();
- HashMap<String, String> variables = new HashMap<String, String>();
+ HashMap<String, String> variables = new HashMap<>();
cd.executeQuerySingleRow("tets",variables,false);
}
@Test(expected = Exception.class)
public void executeQueryMultipleRows(){
- HashMap<String, String> variables = new HashMap<String, String>();
+ HashMap<String, String> variables = new HashMap<>();
cd.executeQueryMultipleRows("select",variables,false);
}
}
MavenLikeVersioning test12 = new MavenLikeVersioning();
test12.setVersion("2.0");
- List<MavenLikeVersioning> list= new LinkedList<MavenLikeVersioning>();
+ List<MavenLikeVersioning> list= new LinkedList<>();
list.add(test1);
list.add(test2);
list.add(test3);
Code Review / so.git / commitdiff