Replaced all tabs with spaces in java and pom.xml

[so.git] / adapters / mso-openstack-adapters / src / main / java / org / onap / so / adapters / vnf / VnfAdapterRestUtils.java

diff --git a/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/vnf/VnfAdapterRestUtils.java b/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/vnf/VnfAdapterRestUtils.java
index 8c96acc..b53ac0f 100644 (file)
--- a/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/vnf/VnfAdapterRestUtils.java
+++ b/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/vnf/VnfAdapterRestUtils.java
@@ -23,7 +23,6 @@
 package org.onap.so.adapters.vnf;
 
 import java.util.Optional;
-
 import org.onap.so.cloud.CloudConfig;
 import org.onap.so.db.catalog.beans.CloudSite;
 import org.slf4j.Logger;
@@ -32,80 +31,74 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 @Component
-public class VnfAdapterRestUtils
-{
-       private static Logger logger = LoggerFactory.getLogger(VnfAdapterRestUtils.class);
-
-       private static final String HEAT_MODE = "HEAT";
-       private static final String CLOUDIFY_MODE = "CLOUDIFY";
-       private static final String MULTICLOUD_MODE = "MULTICLOUD";
-
-       @Autowired
-       private CloudConfig cloudConfig;
-
-       @Autowired
-       private MsoVnfCloudifyAdapterImpl cloudifyImpl;
-
-       @Autowired
-       private MsoVnfAdapterImpl vnfImpl;
-
-       @Autowired
-       private MsoVnfPluginAdapterImpl vnfPluginImpl;
-
-       /*
-        * Choose which implementation of VNF Adapter to use, based on the orchestration mode.
-        * Currently, the two supported orchestrators are HEAT and CLOUDIFY.
-        */
-       public MsoVnfAdapter getVnfAdapterImpl (String mode, String cloudSiteId)
-       {
-               // First, determine the orchestration mode to use.
-               // If was explicitly provided as a parameter, use that.  Else if specified for the
-               // cloudsite, use that.  Otherwise, the default is the (original) HEAT-based impl.
-
-               logger.debug("Entered GetVnfAdapterImpl: mode=" + mode + ", cloudSite=" + cloudSiteId);
-
-               if (mode == null) {
-                       // Didn't get an explicit mode type requested.
-                       // Use the CloudSite to determine which Impl to use, based on whether the target cloutSite
-                       // has a CloudifyManager assigned to it
-                       Optional<CloudSite> cloudSite = cloudConfig.getCloudSite(cloudSiteId);
-                       if (cloudSite.isPresent()) {
-                               logger.debug("Got CloudSite: " + cloudSite.toString());
-                               if (cloudConfig.getCloudifyManager(cloudSite.get().getCloudifyId()) != null) {
-                                       mode = CLOUDIFY_MODE;
-                               } else if (MULTICLOUD_MODE.equalsIgnoreCase(cloudSite.get().getOrchestrator())) {
-                                       mode = MULTICLOUD_MODE;
-                               }
-                               else {
-                                       mode = HEAT_MODE;
-                               }
-                       }
-               }
-
-               logger.debug ("GetVnfAdapterImpl: mode=" + mode);
-
-               MsoVnfAdapter vnfAdapter = null;
-
-               // TODO:  Make this more dynamic (e.g. Service Loader)
-               if (CLOUDIFY_MODE.equalsIgnoreCase(mode)) {
-                       logger.debug("GetVnfAdapterImpl: Return Cloudify Adapter");
-                       vnfAdapter = cloudifyImpl;
-               }
-               else if (HEAT_MODE.equalsIgnoreCase(mode)) {
-                       logger.debug("GetVnfAdapterImpl: Return Heat Adapter");
-                       vnfAdapter = vnfImpl;
-               }
-               else if (MULTICLOUD_MODE.equalsIgnoreCase(mode)) {
-                       logger.debug("GetVnfAdapterImpl: Return Plugin (multicloud) Adapter");
-                       vnfAdapter = vnfPluginImpl;
-               }
-               else {
-                       // Don't expect this, but default is the HEAT adapter
-                       logger.debug("GetVnfAdapterImpl: Return Default (Heat) Adapter");
-                       vnfAdapter = vnfImpl;
-               }
-
-               return vnfAdapter;
-       }
+public class VnfAdapterRestUtils {
+    private static Logger logger = LoggerFactory.getLogger(VnfAdapterRestUtils.class);
+
+    private static final String HEAT_MODE = "HEAT";
+    private static final String CLOUDIFY_MODE = "CLOUDIFY";
+    private static final String MULTICLOUD_MODE = "MULTICLOUD";
+
+    @Autowired
+    private CloudConfig cloudConfig;
+
+    @Autowired
+    private MsoVnfCloudifyAdapterImpl cloudifyImpl;
+
+    @Autowired
+    private MsoVnfAdapterImpl vnfImpl;
+
+    @Autowired
+    private MsoVnfPluginAdapterImpl vnfPluginImpl;
+
+    /*
+     * Choose which implementation of VNF Adapter to use, based on the orchestration mode. Currently, the two supported
+     * orchestrators are HEAT and CLOUDIFY.
+     */
+    public MsoVnfAdapter getVnfAdapterImpl(String mode, String cloudSiteId) {
+        // First, determine the orchestration mode to use.
+        // If was explicitly provided as a parameter, use that. Else if specified for the
+        // cloudsite, use that. Otherwise, the default is the (original) HEAT-based impl.
+
+        logger.debug("Entered GetVnfAdapterImpl: mode=" + mode + ", cloudSite=" + cloudSiteId);
+
+        if (mode == null) {
+            // Didn't get an explicit mode type requested.
+            // Use the CloudSite to determine which Impl to use, based on whether the target cloutSite
+            // has a CloudifyManager assigned to it
+            Optional<CloudSite> cloudSite = cloudConfig.getCloudSite(cloudSiteId);
+            if (cloudSite.isPresent()) {
+                logger.debug("Got CloudSite: " + cloudSite.toString());
+                if (cloudConfig.getCloudifyManager(cloudSite.get().getCloudifyId()) != null) {
+                    mode = CLOUDIFY_MODE;
+                } else if (MULTICLOUD_MODE.equalsIgnoreCase(cloudSite.get().getOrchestrator())) {
+                    mode = MULTICLOUD_MODE;
+                } else {
+                    mode = HEAT_MODE;
+                }
+            }
+        }
+
+        logger.debug("GetVnfAdapterImpl: mode=" + mode);
+
+        MsoVnfAdapter vnfAdapter = null;
+
+        // TODO: Make this more dynamic (e.g. Service Loader)
+        if (CLOUDIFY_MODE.equalsIgnoreCase(mode)) {
+            logger.debug("GetVnfAdapterImpl: Return Cloudify Adapter");
+            vnfAdapter = cloudifyImpl;
+        } else if (HEAT_MODE.equalsIgnoreCase(mode)) {
+            logger.debug("GetVnfAdapterImpl: Return Heat Adapter");
+            vnfAdapter = vnfImpl;
+        } else if (MULTICLOUD_MODE.equalsIgnoreCase(mode)) {
+            logger.debug("GetVnfAdapterImpl: Return Plugin (multicloud) Adapter");
+            vnfAdapter = vnfPluginImpl;
+        } else {
+            // Don't expect this, but default is the HEAT adapter
+            logger.debug("GetVnfAdapterImpl: Return Default (Heat) Adapter");
+            vnfAdapter = vnfImpl;
+        }
+
+        return vnfAdapter;
+    }
 
 }