AT&T 1712 and 1802 release code

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

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 bcea8fd..d952893 100644 (file)
--- 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
@@ -5,7 +5,7 @@ package org.openecomp.mso.apihandlerinfra;
  * #%L
  * MSO
  * %%
- * Copyright (C) 2016 OPENECOMP - MSO
+ * Copyright (C) 2016 ONAP - SO
  * %%
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -130,33 +130,35 @@ public class NetworkInfoHandler {
         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) {
@@ -295,8 +297,8 @@ public class NetworkInfoHandler {
 
     private String translateNetworkRequests (List <NetworkRequest> queryResponseList) {
         NetworkRequests queryResponses = new NetworkRequests ();
-        for (int i = 0; i < queryResponseList.size (); i++) {
-            queryResponses.getNetworkRequest ().add (queryResponseList.get (i));
+        for (NetworkRequest aQueryResponseList : queryResponseList) {
+            queryResponses.getNetworkRequest().add(aQueryResponseList);
         }
 
         StringWriter stringWriter = new StringWriter ();