Merge "Swap StringBuilder with string where makes sense"
diff --git a/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/openstack/utils/MsoHeatUtils.java b/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/openstack/utils/MsoHeatUtils.java
index 699bd7c..6862492 100644
--- a/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/openstack/utils/MsoHeatUtils.java
+++ b/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/openstack/utils/MsoHeatUtils.java
@@ -143,7 +143,7 @@
String tenantId,
String stackName,
String heatTemplate,
- Map <String, ? extends Object> stackInputs,
+ Map <String, ?> stackInputs,
boolean pollForCompletion,
int timeoutMinutes) throws MsoException {
// Just call the new method with the environment & files variable set to null
@@ -165,7 +165,7 @@
String tenantId,
String stackName,
String heatTemplate,
- Map <String, ? extends Object> stackInputs,
+ Map <String, ?> stackInputs,
boolean pollForCompletion,
int timeoutMinutes,
String environment) throws MsoException {
@@ -188,7 +188,7 @@
String tenantId,
String stackName,
String heatTemplate,
- Map <String, ? extends Object> stackInputs,
+ Map <String, ?> stackInputs,
boolean pollForCompletion,
int timeoutMinutes,
String environment,
@@ -211,7 +211,7 @@
String tenantId,
String stackName,
String heatTemplate,
- Map <String, ? extends Object> stackInputs,
+ Map <String, ?> stackInputs,
boolean pollForCompletion,
int timeoutMinutes,
String environment,
@@ -275,7 +275,7 @@
String tenantId,
String stackName,
String heatTemplate,
- Map <String, ? extends Object> stackInputs,
+ Map <String, ?> stackInputs,
boolean pollForCompletion,
int timeoutMinutes,
String environment,
diff --git a/adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/CatalogDbAdapterRest.java b/adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/CatalogDbAdapterRest.java
index d0d3999..c1c5aee 100644
--- a/adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/CatalogDbAdapterRest.java
+++ b/adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/CatalogDbAdapterRest.java
@@ -531,44 +531,43 @@
@Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
public Response resourceRecipe(@QueryParam("resourceModelUuid") String rmUuid, @QueryParam("action") String action) {
int respStatus = HttpStatus.SC_OK;
- CatalogDatabase db = CatalogDatabase.getInstance();
- String entity = "";
- try{
- if(rmUuid != null && !"".equals(rmUuid)){
- LOGGER.debug ("Query recipe by resource model uuid: " + rmUuid);
- //check vnf and network and ar, the resource could be any resource.
- Recipe recipe = db.getVnfRecipeByModuleUuid(rmUuid, action);
- if(null == recipe){
- recipe = db.getNetworkRecipeByModuleUuid(rmUuid, action);
- }
- if(null == recipe){
- recipe = db.getArRecipeByModuleUuid(rmUuid, action);
- }
- if(recipe != null){
- QueryResourceRecipe resourceRecipe = new QueryResourceRecipe(recipe);
- entity = resourceRecipe.JSON2(false, false);
- }
- else{
- respStatus = HttpStatus.SC_NOT_FOUND;
- }
- }else{
- throw(new Exception("Incoming parameter is null or blank"));
- }
- LOGGER.debug ("Query recipe exit");
- return Response
- .status(respStatus)
- .entity(entity)
- .header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
- .build();
- }catch(Exception e){
- LOGGER.error (MessageEnum.RA_QUERY_VNF_ERR, rmUuid, "", "resourceRecipe", MsoLogger.ErrorCode.BusinessProcesssError, "Exception during query recipe by resource model uuid: ", e);
- CatalogQueryException excResp = new CatalogQueryException(e.getMessage(), CatalogQueryExceptionCategory.INTERNAL, Boolean.FALSE, null);
- return Response
- .status(HttpStatus.SC_INTERNAL_SERVER_ERROR)
- .entity(new GenericEntity<CatalogQueryException>(excResp) {})
- .build();
- }finally {
- db.close();
- }
+ String entity = "";
+ try (CatalogDatabase db = CatalogDatabase.getInstance()) {
+ if (rmUuid != null && !"".equals(rmUuid)) {
+ LOGGER.debug("Query recipe by resource model uuid: " + rmUuid);
+ //check vnf and network and ar, the resource could be any resource.
+ Recipe recipe = db.getVnfRecipeByModuleUuid(rmUuid, action);
+ if (null == recipe) {
+ recipe = db.getNetworkRecipeByModuleUuid(rmUuid, action);
+ }
+ if (null == recipe) {
+ recipe = db.getArRecipeByModuleUuid(rmUuid, action);
+ }
+ if (recipe != null) {
+ QueryResourceRecipe resourceRecipe = new QueryResourceRecipe(recipe);
+ entity = resourceRecipe.JSON2(false, false);
+ } else {
+ respStatus = HttpStatus.SC_NOT_FOUND;
+ }
+ } else {
+ throw (new Exception("Incoming parameter is null or blank"));
+ }
+ LOGGER.debug("Query recipe exit");
+ return Response
+ .status(respStatus)
+ .entity(entity)
+ .header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
+ .build();
+ } catch (Exception e) {
+ LOGGER.error(MessageEnum.RA_QUERY_VNF_ERR, rmUuid, "", "resourceRecipe",
+ MsoLogger.ErrorCode.BusinessProcesssError, "Exception during query recipe by resource model uuid: ", e);
+ CatalogQueryException excResp = new CatalogQueryException(e.getMessage(),
+ CatalogQueryExceptionCategory.INTERNAL, Boolean.FALSE, null);
+ return Response
+ .status(HttpStatus.SC_INTERNAL_SERVER_ERROR)
+ .entity(new GenericEntity<CatalogQueryException>(excResp) {
+ })
+ .build();
+ }
}
}
diff --git a/adapters/mso-vnf-adapter/src/main/java/org/openecomp/mso/vdu/utils/VduPlugin.java b/adapters/mso-vnf-adapter/src/main/java/org/openecomp/mso/vdu/utils/VduPlugin.java
index 856b713..2118eec 100755
--- a/adapters/mso-vnf-adapter/src/main/java/org/openecomp/mso/vdu/utils/VduPlugin.java
+++ b/adapters/mso-vnf-adapter/src/main/java/org/openecomp/mso/vdu/utils/VduPlugin.java
@@ -88,7 +88,7 @@
String tenantId,
String vduInstanceName,
VduBlueprint vduBlueprint,
- Map <String, ? extends Object> inputs,
+ Map <String, ?> inputs,
String environmentFile,
int timeoutMinutes,
boolean suppressBackout)
@@ -198,7 +198,7 @@
String tenantId,
String vduInstanceId,
VduBlueprint vduBlueprint,
- Map <String, ? extends Object> inputs,
+ Map <String, ?> inputs,
String environmentFile,
int timeoutMinutes)
throws MsoException;
diff --git a/asdc-controller/src/main/java/org/openecomp/mso/asdc/installer/heat/ToscaResourceInstaller.java b/asdc-controller/src/main/java/org/openecomp/mso/asdc/installer/heat/ToscaResourceInstaller.java
index e0f338e..8c08d3e 100644
--- a/asdc-controller/src/main/java/org/openecomp/mso/asdc/installer/heat/ToscaResourceInstaller.java
+++ b/asdc-controller/src/main/java/org/openecomp/mso/asdc/installer/heat/ToscaResourceInstaller.java
@@ -419,39 +419,34 @@
toscaResourceStruct.getSdcCsarHelper().getVfModulesByVf(vfCustomizationUUID);
logger.debug("vfGroups:" + vfGroups.toString());
- Collections.sort(vfGroups, new Comparator<org.openecomp.sdc.toscaparser.api.Group>() {
+ vfGroups.sort((group1, group2) -> {
- @Override
- public int compare(org.openecomp.sdc.toscaparser.api.Group group1,
- org.openecomp.sdc.toscaparser.api.Group group2) {
+ // Field name1Field = group1.class.getDeclaredField("name");
+ // name1Field.setAccessible(true);
+ String thisName = group1.getName(); // (String)
+ // name1Field.get(group1);
+ String thatName = group2.getName(); // (String)
+ // name1Field.get(group2);
- // Field name1Field = group1.class.getDeclaredField("name");
- // name1Field.setAccessible(true);
- String thisName = group1.getName(); // (String)
- // name1Field.get(group1);
- String thatName = group2.getName(); // (String)
- // name1Field.get(group2);
+ Matcher m = lastDigit.matcher(thisName);
+ Matcher m2 = lastDigit.matcher(thatName);
- Matcher m = lastDigit.matcher(thisName);
- Matcher m2 = lastDigit.matcher(thatName);
+ String thisDigit = "0";
+ String thatDigit = "0";
+ if (m.find()) {
+ thisDigit = m.group();
+ } else {
+ return -1;
+ }
+ if (m2.find()) {
+ thatDigit = m2.group();
+ } else {
+ return 1;
+ }
- String thisDigit = "0";
- String thatDigit = "0";
- if(m.find()) {
- thisDigit = m.group();
- } else {
- return -1;
- }
- if(m2.find()) {
- thatDigit = m2.group();
- } else {
- return 1;
- }
+ return new Integer(thisDigit).compareTo(new Integer(thatDigit));
- return new Integer(thisDigit).compareTo(new Integer(thatDigit));
-
- }
- });
+ });
logger.debug("vfGroupsAfter:" + vfGroups.toString());
diff --git a/asdc-controller/src/main/java/org/openecomp/mso/asdc/util/NotificationLogging.java b/asdc-controller/src/main/java/org/openecomp/mso/asdc/util/NotificationLogging.java
index c0a1f53..f9871b7 100644
--- a/asdc-controller/src/main/java/org/openecomp/mso/asdc/util/NotificationLogging.java
+++ b/asdc-controller/src/main/java/org/openecomp/mso/asdc/util/NotificationLogging.java
@@ -43,19 +43,15 @@
private static Map<Object, List<Method>> objectMethodsToLog = new HashMap<>();
protected static final MsoLogger LOGGER = MsoLogger.getMsoLogger (MsoLogger.Catalog.ASDC);
-
- private static InvocationHandler handler = new InvocationHandler() {
- @Override
- public Object invoke(Object arg0, Method arg1, Object[] arg2)
- throws Throwable {
- List<Method> methods = objectMethodsToLog.get(arg0);
- if ((methods == null) || (methods.isEmpty())) {
- // Do nothing for now...
- return null;
- }
- methods.add(arg1);
- return arg1.invoke(arg0, arg2);
+
+ private static InvocationHandler handler = (arg0, arg1, arg2) -> {
+ List<Method> methods = objectMethodsToLog.get(arg0);
+ if ((methods == null) || (methods.isEmpty())) {
+ // Do nothing for now...
+ return null;
}
+ methods.add(arg1);
+ return arg1.invoke(arg0, arg2);
};
public static InvocationHandler getHandler() {
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/util/CryptoUtils.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/util/CryptoUtils.java
index 2ad1e30..846b87a 100644
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/util/CryptoUtils.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/util/CryptoUtils.java
@@ -94,23 +94,5 @@
return b;
}
- /**
- * Not Used...
- *
- * Call Rttp utility jar to encrypt pwd
- * @param clearPassword
- * @return
- * @throws GeneralSecurityException
- * @throws Exception
- *
- public static String encryptRttpPwd(String clearPassword) throws GeneralSecurityException {
- try {
- return RttpBasicAuth.encrypt(clearPassword);
- } catch (Exception e) {
- // wrap generic exception
- throw new GeneralSecurityException(e);
- }
- }
- */
}
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/BPMNUtil.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/BPMNUtil.java
index 9fcde31..0bb5186 100644
--- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/BPMNUtil.java
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/BPMNUtil.java
@@ -68,7 +68,7 @@
}
@SuppressWarnings("unchecked")
- public static <T extends Object> T getRawVariable(ProcessEngineServices processEngineServices, String processDefinitionID, String name) {
+ public static <T> T getRawVariable(ProcessEngineServices processEngineServices, String processDefinitionID, String name) {
String pID = getProcessInstanceId(processEngineServices,
processDefinitionID);
assertProcessInstanceFinished(processEngineServices, pID);
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/mock/FileUtil.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/mock/FileUtil.java
index 2ebb44a..38d0584 100644
--- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/mock/FileUtil.java
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/mock/FileUtil.java
@@ -35,11 +35,6 @@
private static final MsoLogger LOGGER = MsoLogger.getMsoLogger (MsoLogger.Catalog.RA);
- private FileUtil() {
- /**
- * Constructor.
- */
- }
/**
* Read the specified resource file and return the contents as a String.
*
diff --git a/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/plugins/LoggingAndURNMappingPlugin.java b/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/plugins/LoggingAndURNMappingPlugin.java
index c346308..730c145 100644
--- a/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/plugins/LoggingAndURNMappingPlugin.java
+++ b/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/plugins/LoggingAndURNMappingPlugin.java
@@ -321,14 +321,8 @@
}
private void loadFromDB(DelegateExecution execution, ProcessEngineConfigurationImpl processEngineConfiguration) {
- Command<List<URNMapping>> command = new Command<List<URNMapping>>() {
- @SuppressWarnings("unchecked")
- @Override
- public List<URNMapping> execute(CommandContext commandContext) {
- return (List<URNMapping>) commandContext.getDbSqlSession().selectList(
- "mso.urnMapping.selectAll", null);
- }
- };
+ Command<List<URNMapping>> command = commandContext -> (List<URNMapping>) commandContext.getDbSqlSession()
+ .selectList("mso.urnMapping.selectAll", null);
CustomMyBatisSessionFactory sessionFactory = new CustomMyBatisSessionFactory();
sessionFactory.initFromProcessEngineConfiguration(processEngineConfiguration,
diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/NetworkInfoHandler.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/NetworkInfoHandler.java
index 4e1468c..2c7bd1c 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/NetworkInfoHandler.java
+++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/NetworkInfoHandler.java
@@ -130,33 +130,35 @@
if (ar.getVnfType () != null) {
vi.setNetworkType (ar.getVnfType ());
}
- if (version.equals(Constants.SCHEMA_VERSION_V1)) {
- if (ar.getServiceType () != null) {
- vi.setServiceType (ar.getServiceType ());
- }
- if (ar.getAicNodeClli () != null) {
- vi.setAicNodeClli (ar.getAicNodeClli ());
- }
- }
- else if (version.equals(Constants.SCHEMA_VERSION_V2)) {
- if (ar.getAaiServiceId () != null) {
- vi.setServiceId (ar.getAaiServiceId ());
- }
- if (ar.getAicCloudRegion () != null) {
- vi.setAicCloudRegion (ar.getAicCloudRegion ());
- }
- }
- else if (version.equals(Constants.SCHEMA_VERSION_V3)) {
- if (ar.getAaiServiceId () != null) {
- vi.setServiceId (ar.getAaiServiceId ());
- }
- if (ar.getAicCloudRegion () != null) {
- vi.setAicCloudRegion (ar.getAicCloudRegion ());
- }
- if (ar.getServiceInstanceId () != null) {
- vi.setServiceInstanceId (ar.getServiceInstanceId ());
- }
-
+ switch (version) {
+ case Constants.SCHEMA_VERSION_V1:
+ if (ar.getServiceType() != null) {
+ vi.setServiceType(ar.getServiceType());
+ }
+ if (ar.getAicNodeClli() != null) {
+ vi.setAicNodeClli(ar.getAicNodeClli());
+ }
+ break;
+ case Constants.SCHEMA_VERSION_V2:
+ if (ar.getAaiServiceId() != null) {
+ vi.setServiceId(ar.getAaiServiceId());
+ }
+ if (ar.getAicCloudRegion() != null) {
+ vi.setAicCloudRegion(ar.getAicCloudRegion());
+ }
+ break;
+ case Constants.SCHEMA_VERSION_V3:
+ if (ar.getAaiServiceId() != null) {
+ vi.setServiceId(ar.getAaiServiceId());
+ }
+ if (ar.getAicCloudRegion() != null) {
+ vi.setAicCloudRegion(ar.getAicCloudRegion());
+ }
+ if (ar.getServiceInstanceId() != null) {
+ vi.setServiceInstanceId(ar.getServiceInstanceId());
+ }
+
+ break;
}
if (ar.getTenantId () != null) {
diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/NetworkMsoInfraRequest.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/NetworkMsoInfraRequest.java
index c87b4f3..3d41992 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/NetworkMsoInfraRequest.java
+++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/NetworkMsoInfraRequest.java
@@ -147,24 +147,27 @@
}
// Verify that the elements correspond to the version
-
- if (version.equals(Constants.SCHEMA_VERSION_V1)) {
- if (this.networkInputs.getBackoutOnFailure() != null || this.networkInputs.getAicCloudRegion() != null ||
- this.networkInputs.getServiceInstanceId() != null) {
- throw new ValidationException ("format for v1 version of network request");
- }
+
+ switch (version) {
+ case Constants.SCHEMA_VERSION_V1:
+ if (this.networkInputs.getBackoutOnFailure() != null || this.networkInputs.getAicCloudRegion() != null
+ ||
+ this.networkInputs.getServiceInstanceId() != null) {
+ throw new ValidationException("format for v1 version of network request");
+ }
+ break;
+ case Constants.SCHEMA_VERSION_V2:
+ if (this.networkInputs.getServiceType() != null || this.networkInputs.getAicNodeClli() != null ||
+ this.networkInputs.getServiceInstanceId() != null) {
+ throw new ValidationException("format for v2 version of network request");
+ }
+ break;
+ case Constants.SCHEMA_VERSION_V3:
+ if (this.networkInputs.getServiceType() != null || this.networkInputs.getAicNodeClli() != null) {
+ throw new ValidationException("format for v3 version of network request");
+ }
+ break;
}
- else if (version.equals(Constants.SCHEMA_VERSION_V2)) {
- if (this.networkInputs.getServiceType() != null || this.networkInputs.getAicNodeClli() != null ||
- this.networkInputs.getServiceInstanceId() != null) {
- throw new ValidationException ("format for v2 version of network request");
- }
- }
- else if (version.equals(Constants.SCHEMA_VERSION_V3)) {
- if (this.networkInputs.getServiceType() != null || this.networkInputs.getAicNodeClli() != null) {
- throw new ValidationException ("format for v3 version of network request");
- }
- }
switch (action) {
case UPDATE:
diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/NetworkRequestHandler.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/NetworkRequestHandler.java
index 79247de..6a77020 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/NetworkRequestHandler.java
+++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/NetworkRequestHandler.java
@@ -158,33 +158,35 @@
if (ar.getVnfType () != null) {
vi.setNetworkType (ar.getVnfType ());
}
- if (version.equals(Constants.SCHEMA_VERSION_V1)) {
- if (ar.getServiceType () != null) {
- vi.setServiceType (ar.getServiceType ());
- }
- if (ar.getAicNodeClli () != null) {
- vi.setAicNodeClli (ar.getAicNodeClli ());
- }
- }
- else if (version.equals(Constants.SCHEMA_VERSION_V2)) {
- if (ar.getAaiServiceId () != null) {
- vi.setServiceId (ar.getAaiServiceId ());
- }
- if (ar.getAicCloudRegion () != null) {
- vi.setAicCloudRegion (ar.getAicCloudRegion ());
- }
- }
- else if (version.equals(Constants.SCHEMA_VERSION_V3)) {
- if (ar.getAaiServiceId () != null) {
- vi.setServiceId (ar.getAaiServiceId ());
- }
- if (ar.getAicCloudRegion () != null) {
- vi.setAicCloudRegion (ar.getAicCloudRegion ());
- }
- if (ar.getServiceInstanceId () != null) {
- vi.setServiceInstanceId (ar.getServiceInstanceId ());
- }
-
+ switch (version) {
+ case Constants.SCHEMA_VERSION_V1:
+ if (ar.getServiceType() != null) {
+ vi.setServiceType(ar.getServiceType());
+ }
+ if (ar.getAicNodeClli() != null) {
+ vi.setAicNodeClli(ar.getAicNodeClli());
+ }
+ break;
+ case Constants.SCHEMA_VERSION_V2:
+ if (ar.getAaiServiceId() != null) {
+ vi.setServiceId(ar.getAaiServiceId());
+ }
+ if (ar.getAicCloudRegion() != null) {
+ vi.setAicCloudRegion(ar.getAicCloudRegion());
+ }
+ break;
+ case Constants.SCHEMA_VERSION_V3:
+ if (ar.getAaiServiceId() != null) {
+ vi.setServiceId(ar.getAaiServiceId());
+ }
+ if (ar.getAicCloudRegion() != null) {
+ vi.setAicCloudRegion(ar.getAicCloudRegion());
+ }
+ if (ar.getServiceInstanceId() != null) {
+ vi.setServiceInstanceId(ar.getServiceInstanceId());
+ }
+
+ break;
}
if (ar.getTenantId () != null) {
diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/VnfInfoHandler.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/VnfInfoHandler.java
index a5e1f6f..d13212a 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/VnfInfoHandler.java
+++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/VnfInfoHandler.java
@@ -148,50 +148,52 @@
if (ar.getVolumeGroupId () != null) {
vi.setVolumeGroupId (ar.getVolumeGroupId ());
}
- if (version.equals(Constants.SCHEMA_VERSION_V1)) {
- if (ar.getServiceType () != null) {
- vi.setServiceType (ar.getServiceType ());
- }
- if (ar.getAicNodeClli () != null) {
- vi.setAicNodeClli (ar.getAicNodeClli ());
- }
- }
- else if (version.equals(Constants.SCHEMA_VERSION_V2)) {
- if (ar.getAaiServiceId () != null) {
- vi.setServiceId (ar.getAaiServiceId ());
- }
- if (ar.getAicCloudRegion () != null) {
- vi.setAicCloudRegion (ar.getAicCloudRegion ());
- }
- if (ar.getVfModuleName () != null) {
- vi.setVfModuleName (ar.getVfModuleName ());
- }
- if (ar.getVfModuleId () != null) {
- vi.setVfModuleId (ar.getVfModuleId ());
- }
- if (ar.getVfModuleModelName () != null) {
- vi.setVfModuleModelName (ar.getVfModuleModelName ());
- }
- }
- else if (version.equals(Constants.SCHEMA_VERSION_V3)) {
- if (ar.getAaiServiceId () != null) {
- vi.setServiceId (ar.getAaiServiceId ());
- }
- if (ar.getAicCloudRegion () != null) {
- vi.setAicCloudRegion (ar.getAicCloudRegion ());
- }
- if (ar.getVfModuleName () != null) {
- vi.setVfModuleName (ar.getVfModuleName ());
- }
- if (ar.getVfModuleId () != null) {
- vi.setVfModuleId (ar.getVfModuleId ());
- }
- if (ar.getVfModuleModelName () != null) {
- vi.setVfModuleModelName (ar.getVfModuleModelName ());
- }
- if (ar.getServiceInstanceId () != null) {
- vi.setServiceInstanceId (ar.getServiceInstanceId ());
- }
+ switch (version) {
+ case Constants.SCHEMA_VERSION_V1:
+ if (ar.getServiceType() != null) {
+ vi.setServiceType(ar.getServiceType());
+ }
+ if (ar.getAicNodeClli() != null) {
+ vi.setAicNodeClli(ar.getAicNodeClli());
+ }
+ break;
+ case Constants.SCHEMA_VERSION_V2:
+ if (ar.getAaiServiceId() != null) {
+ vi.setServiceId(ar.getAaiServiceId());
+ }
+ if (ar.getAicCloudRegion() != null) {
+ vi.setAicCloudRegion(ar.getAicCloudRegion());
+ }
+ if (ar.getVfModuleName() != null) {
+ vi.setVfModuleName(ar.getVfModuleName());
+ }
+ if (ar.getVfModuleId() != null) {
+ vi.setVfModuleId(ar.getVfModuleId());
+ }
+ if (ar.getVfModuleModelName() != null) {
+ vi.setVfModuleModelName(ar.getVfModuleModelName());
+ }
+ break;
+ case Constants.SCHEMA_VERSION_V3:
+ if (ar.getAaiServiceId() != null) {
+ vi.setServiceId(ar.getAaiServiceId());
+ }
+ if (ar.getAicCloudRegion() != null) {
+ vi.setAicCloudRegion(ar.getAicCloudRegion());
+ }
+ if (ar.getVfModuleName() != null) {
+ vi.setVfModuleName(ar.getVfModuleName());
+ }
+ if (ar.getVfModuleId() != null) {
+ vi.setVfModuleId(ar.getVfModuleId());
+ }
+ if (ar.getVfModuleModelName() != null) {
+ vi.setVfModuleModelName(ar.getVfModuleModelName());
+ }
+ if (ar.getServiceInstanceId() != null) {
+ vi.setServiceInstanceId(ar.getServiceInstanceId());
+ }
+ break;
}
qr.setVnfInputs (vi);
diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/VnfMsoInfraRequest.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/VnfMsoInfraRequest.java
index 80d0c48..1f3008a 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/VnfMsoInfraRequest.java
+++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/VnfMsoInfraRequest.java
@@ -157,26 +157,29 @@
throw new ValidationException ("format for vnf request");
}
// Verify that the elements correspond to the version
-
-
- if (version.equals(Constants.SCHEMA_VERSION_V1)) {
- if (this.vnfInputs.getVfModuleName () != null || this.vnfInputs.getVfModuleId () != null ||
- this.vnfInputs.getVfModuleModelName () != null || this.vnfInputs.getAsdcServiceModelVersion () != null ||
- this.vnfInputs.getBackoutOnFailure() != null || this.vnfInputs.getAicCloudRegion() != null ||
- this.vnfInputs.getServiceInstanceId () != null) {
- throw new ValidationException ("format for v1 version of vnf request");
- }
+
+ switch (version) {
+ case Constants.SCHEMA_VERSION_V1:
+ if (this.vnfInputs.getVfModuleName() != null || this.vnfInputs.getVfModuleId() != null ||
+ this.vnfInputs.getVfModuleModelName() != null || this.vnfInputs.getAsdcServiceModelVersion() != null
+ ||
+ this.vnfInputs.getBackoutOnFailure() != null || this.vnfInputs.getAicCloudRegion() != null ||
+ this.vnfInputs.getServiceInstanceId() != null) {
+ throw new ValidationException("format for v1 version of vnf request");
+ }
+ break;
+ case Constants.SCHEMA_VERSION_V2:
+ if (this.vnfInputs.getServiceType() != null || this.vnfInputs.getAicNodeClli() != null
+ || this.vnfInputs.getServiceInstanceId() != null) {
+ throw new ValidationException("format for v2 version of vnf request");
+ }
+ break;
+ case Constants.SCHEMA_VERSION_V3:
+ if (this.vnfInputs.getServiceType() != null || this.vnfInputs.getAicNodeClli() != null) {
+ throw new ValidationException("format for v3 version of vnf request");
+ }
+ break;
}
- else if (version.equals(Constants.SCHEMA_VERSION_V2)) {
- if (this.vnfInputs.getServiceType() != null || this.vnfInputs.getAicNodeClli() != null || this.vnfInputs.getServiceInstanceId () != null) {
- throw new ValidationException ("format for v2 version of vnf request");
- }
- }
- else if (version.equals(Constants.SCHEMA_VERSION_V3)) {
- if (this.vnfInputs.getServiceType() != null || this.vnfInputs.getAicNodeClli() != null) {
- throw new ValidationException ("format for v3 version of vnf request");
- }
- }
if (!InfraUtils.isActionAllowed (props, "vnf", version, action.value ())) {
diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/VnfRequestHandler.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/VnfRequestHandler.java
index 2b7e71a..098ed31 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/VnfRequestHandler.java
+++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/VnfRequestHandler.java
@@ -179,50 +179,52 @@
if (ar.getVolumeGroupId () != null) {
vi.setVolumeGroupId (ar.getVolumeGroupId ());
}
- if (version.equals(Constants.SCHEMA_VERSION_V1)) {
- if (ar.getServiceType () != null) {
- vi.setServiceType (ar.getServiceType ());
- }
- if (ar.getAicNodeClli () != null) {
- vi.setAicNodeClli (ar.getAicNodeClli ());
- }
- }
- else if (version.equals(Constants.SCHEMA_VERSION_V2)) {
- if (ar.getAaiServiceId () != null) {
- vi.setServiceId (ar.getAaiServiceId ());
- }
- if (ar.getAicCloudRegion () != null) {
- vi.setAicCloudRegion (ar.getAicCloudRegion ());
- }
- if (ar.getVfModuleName () != null) {
- vi.setVfModuleName (ar.getVfModuleName ());
- }
- if (ar.getVfModuleId () != null) {
- vi.setVfModuleId (ar.getVfModuleId ());
- }
- if (ar.getVfModuleModelName () != null) {
- vi.setVfModuleModelName (ar.getVfModuleModelName ());
- }
- }
- else if (version.equals(Constants.SCHEMA_VERSION_V3)) {
- if (ar.getAaiServiceId () != null) {
- vi.setServiceId (ar.getAaiServiceId ());
- }
- if (ar.getAicCloudRegion () != null) {
- vi.setAicCloudRegion (ar.getAicCloudRegion ());
- }
- if (ar.getVfModuleName () != null) {
- vi.setVfModuleName (ar.getVfModuleName ());
- }
- if (ar.getVfModuleId () != null) {
- vi.setVfModuleId (ar.getVfModuleId ());
- }
- if (ar.getVfModuleModelName () != null) {
- vi.setVfModuleModelName (ar.getVfModuleModelName ());
- }
- if (ar.getServiceInstanceId () != null) {
- vi.setServiceInstanceId (ar.getServiceInstanceId ());
- }
+ switch (version) {
+ case Constants.SCHEMA_VERSION_V1:
+ if (ar.getServiceType() != null) {
+ vi.setServiceType(ar.getServiceType());
+ }
+ if (ar.getAicNodeClli() != null) {
+ vi.setAicNodeClli(ar.getAicNodeClli());
+ }
+ break;
+ case Constants.SCHEMA_VERSION_V2:
+ if (ar.getAaiServiceId() != null) {
+ vi.setServiceId(ar.getAaiServiceId());
+ }
+ if (ar.getAicCloudRegion() != null) {
+ vi.setAicCloudRegion(ar.getAicCloudRegion());
+ }
+ if (ar.getVfModuleName() != null) {
+ vi.setVfModuleName(ar.getVfModuleName());
+ }
+ if (ar.getVfModuleId() != null) {
+ vi.setVfModuleId(ar.getVfModuleId());
+ }
+ if (ar.getVfModuleModelName() != null) {
+ vi.setVfModuleModelName(ar.getVfModuleModelName());
+ }
+ break;
+ case Constants.SCHEMA_VERSION_V3:
+ if (ar.getAaiServiceId() != null) {
+ vi.setServiceId(ar.getAaiServiceId());
+ }
+ if (ar.getAicCloudRegion() != null) {
+ vi.setAicCloudRegion(ar.getAicCloudRegion());
+ }
+ if (ar.getVfModuleName() != null) {
+ vi.setVfModuleName(ar.getVfModuleName());
+ }
+ if (ar.getVfModuleId() != null) {
+ vi.setVfModuleId(ar.getVfModuleId());
+ }
+ if (ar.getVfModuleModelName() != null) {
+ vi.setVfModuleModelName(ar.getVfModuleModelName());
+ }
+ if (ar.getServiceInstanceId() != null) {
+ vi.setServiceInstanceId(ar.getServiceInstanceId());
+ }
+ break;
}
qr.setVnfInputs (vi);
diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/VolumeInfoHandler.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/VolumeInfoHandler.java
index 3de945a..c74bb07 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/VolumeInfoHandler.java
+++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/VolumeInfoHandler.java
@@ -134,43 +134,45 @@
if (ar.getVnfType () != null) {
vi.setVnfType (ar.getVnfType ());
}
-
- if (version.equals(Constants.SCHEMA_VERSION_V1)) {
- if (ar.getServiceType () != null) {
- vi.setServiceType (ar.getServiceType ());
- }
- if (ar.getAicNodeClli () != null) {
- vi.setAicNodeClli (ar.getAicNodeClli ());
- }
- }
- else if (version.equals(Constants.SCHEMA_VERSION_V2)) {
- if (ar.getAaiServiceId () != null) {
- vi.setServiceId (ar.getAaiServiceId ());
- }
- if (ar.getAicCloudRegion () != null) {
- vi.setAicCloudRegion (ar.getAicCloudRegion ());
- }
- if (ar.getVfModuleModelName () != null) {
- vi.setVfModuleModelName (ar.getVfModuleModelName ());
- }
- }
- else if (version.equals(Constants.SCHEMA_VERSION_V3)) {
- if (ar.getAaiServiceId () != null) {
- vi.setServiceId (ar.getAaiServiceId ());
- }
- if (ar.getAicCloudRegion () != null) {
- vi.setAicCloudRegion (ar.getAicCloudRegion ());
- }
- if (ar.getVfModuleModelName () != null) {
- vi.setVfModuleModelName (ar.getVfModuleModelName ());
- }
- if (ar.getServiceInstanceId () != null) {
- vi.setServiceInstanceId (ar.getServiceInstanceId ());
- }
- if (ar.getVnfId () != null) {
- vi.setVnfId (ar.getVnfId ());
- }
- }
+
+ switch (version) {
+ case Constants.SCHEMA_VERSION_V1:
+ if (ar.getServiceType() != null) {
+ vi.setServiceType(ar.getServiceType());
+ }
+ if (ar.getAicNodeClli() != null) {
+ vi.setAicNodeClli(ar.getAicNodeClli());
+ }
+ break;
+ case Constants.SCHEMA_VERSION_V2:
+ if (ar.getAaiServiceId() != null) {
+ vi.setServiceId(ar.getAaiServiceId());
+ }
+ if (ar.getAicCloudRegion() != null) {
+ vi.setAicCloudRegion(ar.getAicCloudRegion());
+ }
+ if (ar.getVfModuleModelName() != null) {
+ vi.setVfModuleModelName(ar.getVfModuleModelName());
+ }
+ break;
+ case Constants.SCHEMA_VERSION_V3:
+ if (ar.getAaiServiceId() != null) {
+ vi.setServiceId(ar.getAaiServiceId());
+ }
+ if (ar.getAicCloudRegion() != null) {
+ vi.setAicCloudRegion(ar.getAicCloudRegion());
+ }
+ if (ar.getVfModuleModelName() != null) {
+ vi.setVfModuleModelName(ar.getVfModuleModelName());
+ }
+ if (ar.getServiceInstanceId() != null) {
+ vi.setServiceInstanceId(ar.getServiceInstanceId());
+ }
+ if (ar.getVnfId() != null) {
+ vi.setVnfId(ar.getVnfId());
+ }
+ break;
+ }
if (ar.getTenantId () != null) {
vi.setTenantId (ar.getTenantId ());
}
diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/VolumeMsoInfraRequest.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/VolumeMsoInfraRequest.java
index 0524a85..f908a3f 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/VolumeMsoInfraRequest.java
+++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/VolumeMsoInfraRequest.java
@@ -144,24 +144,27 @@
// Verify that the elements correspond to the version
- if (version.equals(Constants.SCHEMA_VERSION_V1)) {
- if (this.volumeInputs.getBackoutOnFailure() != null || this.volumeInputs.getAicCloudRegion() != null ||
- this.volumeInputs.getVfModuleModelName () != null || this.volumeInputs.getAsdcServiceModelVersion () != null ||
- this.volumeInputs.getServiceInstanceId () != null || this.volumeInputs.getVnfId () != null) {
- throw new ValidationException ("format for v1 version of volume request");
- }
- }
- else if (version.equals(Constants.SCHEMA_VERSION_V2)) {
- if (this.volumeInputs.getServiceType() != null || this.volumeInputs.getAicNodeClli() != null ||
- this.volumeInputs.getServiceInstanceId () != null || this.volumeInputs.getVnfId () != null) {
- throw new ValidationException ("format for v2 version of volume request");
- }
- }
- else if (version.equals(Constants.SCHEMA_VERSION_V3)) {
- if (this.volumeInputs.getServiceType() != null || this.volumeInputs.getAicNodeClli() != null) {
- throw new ValidationException ("format for v3 version of volume request");
- }
- }
+ switch (version) {
+ case Constants.SCHEMA_VERSION_V1:
+ if (this.volumeInputs.getBackoutOnFailure() != null || this.volumeInputs.getAicCloudRegion() != null ||
+ this.volumeInputs.getVfModuleModelName() != null
+ || this.volumeInputs.getAsdcServiceModelVersion() != null ||
+ this.volumeInputs.getServiceInstanceId() != null || this.volumeInputs.getVnfId() != null) {
+ throw new ValidationException("format for v1 version of volume request");
+ }
+ break;
+ case Constants.SCHEMA_VERSION_V2:
+ if (this.volumeInputs.getServiceType() != null || this.volumeInputs.getAicNodeClli() != null ||
+ this.volumeInputs.getServiceInstanceId() != null || this.volumeInputs.getVnfId() != null) {
+ throw new ValidationException("format for v2 version of volume request");
+ }
+ break;
+ case Constants.SCHEMA_VERSION_V3:
+ if (this.volumeInputs.getServiceType() != null || this.volumeInputs.getAicNodeClli() != null) {
+ throw new ValidationException("format for v3 version of volume request");
+ }
+ break;
+ }
if (!InfraUtils.isActionAllowed (props, "volume", version, action.value ())) {
diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/VolumeRequestHandler.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/VolumeRequestHandler.java
index d1c1c18..e3af83d 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/VolumeRequestHandler.java
+++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/VolumeRequestHandler.java
@@ -166,43 +166,45 @@
if (ar.getVnfType () != null) {
vi.setVnfType (ar.getVnfType ());
}
-
- if (version.equals(Constants.SCHEMA_VERSION_V1)) {
- if (ar.getServiceType () != null) {
- vi.setServiceType (ar.getServiceType ());
- }
- if (ar.getAicNodeClli () != null) {
- vi.setAicNodeClli (ar.getAicNodeClli ());
- }
- }
- else if (version.equals(Constants.SCHEMA_VERSION_V2)) {
- if (ar.getAaiServiceId () != null) {
- vi.setServiceId (ar.getAaiServiceId ());
- }
- if (ar.getAicCloudRegion () != null) {
- vi.setAicCloudRegion (ar.getAicCloudRegion ());
- }
- if (ar.getVfModuleModelName () != null) {
- vi.setVfModuleModelName (ar.getVfModuleModelName ());
- }
- }
- else if (version.equals(Constants.SCHEMA_VERSION_V3)) {
- if (ar.getAaiServiceId () != null) {
- vi.setServiceId (ar.getAaiServiceId ());
- }
- if (ar.getAicCloudRegion () != null) {
- vi.setAicCloudRegion (ar.getAicCloudRegion ());
- }
- if (ar.getVfModuleModelName () != null) {
- vi.setVfModuleModelName (ar.getVfModuleModelName ());
- }
- if (ar.getServiceInstanceId () != null) {
- vi.setServiceInstanceId (ar.getServiceInstanceId ());
- }
- if (ar.getVnfId () != null) {
- vi.setVnfId (ar.getVnfId ());
- }
- }
+
+ switch (version) {
+ case Constants.SCHEMA_VERSION_V1:
+ if (ar.getServiceType() != null) {
+ vi.setServiceType(ar.getServiceType());
+ }
+ if (ar.getAicNodeClli() != null) {
+ vi.setAicNodeClli(ar.getAicNodeClli());
+ }
+ break;
+ case Constants.SCHEMA_VERSION_V2:
+ if (ar.getAaiServiceId() != null) {
+ vi.setServiceId(ar.getAaiServiceId());
+ }
+ if (ar.getAicCloudRegion() != null) {
+ vi.setAicCloudRegion(ar.getAicCloudRegion());
+ }
+ if (ar.getVfModuleModelName() != null) {
+ vi.setVfModuleModelName(ar.getVfModuleModelName());
+ }
+ break;
+ case Constants.SCHEMA_VERSION_V3:
+ if (ar.getAaiServiceId() != null) {
+ vi.setServiceId(ar.getAaiServiceId());
+ }
+ if (ar.getAicCloudRegion() != null) {
+ vi.setAicCloudRegion(ar.getAicCloudRegion());
+ }
+ if (ar.getVfModuleModelName() != null) {
+ vi.setVfModuleModelName(ar.getVfModuleModelName());
+ }
+ if (ar.getServiceInstanceId() != null) {
+ vi.setServiceInstanceId(ar.getServiceInstanceId());
+ }
+ if (ar.getVnfId() != null) {
+ vi.setVnfId(ar.getVnfId());
+ }
+ break;
+ }
if (ar.getTenantId () != null) {
vi.setTenantId (ar.getTenantId ());
}
diff --git a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/CatalogDatabase.java b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/CatalogDatabase.java
index cf8ef47..6b27c50 100644
--- a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/CatalogDatabase.java
+++ b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/CatalogDatabase.java
@@ -1192,7 +1192,7 @@
return null;
}
- Collections.sort(resultList, new MavenLikeVersioningComparator());
+ resultList.sort(new MavenLikeVersioningComparator());
Collections.reverse(resultList);
LOGGER.recordMetricEvent(startTime, MsoLogger.StatusCode.COMPLETE, MsoLogger.ResponseCode.Suc, "Successfully", "CatalogDB", "getVnfRecipe", null);
@@ -4573,7 +4573,7 @@
return null;
}
- Collections.sort (resultList, new MavenLikeVersioningComparator ());
+ resultList.sort(new MavenLikeVersioningComparator());
Collections.reverse (resultList);
return resultList.get (0);
@@ -5158,7 +5158,7 @@
return null;
}
- Collections.sort (resultList, new MavenLikeVersioningComparator ());
+ resultList.sort(new MavenLikeVersioningComparator());
Collections.reverse (resultList);
return resultList.get (0);
diff --git a/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/test/MavenVersioningTest.java b/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/test/MavenVersioningTest.java
index 3dddb17..c99a714 100644
--- a/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/test/MavenVersioningTest.java
+++ b/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/test/MavenVersioningTest.java
@@ -167,7 +167,7 @@
list.add(test11);
list.add(test12);
- Collections.sort(list,new MavenLikeVersioningComparator());
+ list.sort(new MavenLikeVersioningComparator());
//Collections.reverse(list);
assertTrue(list.get(0).getVersion().equals("0.02"));
assertTrue(list.get(1).getVersion().equals("1.1"));