Merge "Add SDNC Resource Create Call Common Recipe"

[so.git] / mso-api-handlers / mso-api-handler-infra / src / main / java / org / openecomp / mso / apihandlerinfra / VnfInfoHandler.java

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 7071ed5..d13212a 100644 (file)
--- 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 @@ public class VnfInfoHandler {
         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);
 
@@ -332,8 +334,8 @@ public class VnfInfoHandler {
 
     private String translateVnfRequests (List <VnfRequest> queryResponseList) {
         VnfRequests queryResponses = new VnfRequests ();
-        for (int i = 0; i < queryResponseList.size (); i++) {
-            queryResponses.getVnfRequest ().add (queryResponseList.get (i));
+        for (VnfRequest aQueryResponseList : queryResponseList) {
+            queryResponses.getVnfRequest().add(aQueryResponseList);
         }
 
         StringWriter stringWriter = new StringWriter ();