Merge "Removal of unused variables and replace type specification. Removal of unused local variables. Replace type specifications with diamond operator as per guide lines. Issue-ID: SO-1490"

3 files changed, 12 insertions, 12 deletions

diff --git a/adapters/mso-adapter-utils/src/main/java/org/onap/so/openstack/utils/MsoHeatEnvironmentEntry.java b/adapters/mso-adapter-utils/src/main/java/org/onap/so/openstack/utils/MsoHeatEnvironmentEntry.java
index a21db78cee..723bed17f7 100644
--- a/adapters/mso-adapter-utils/src/main/java/org/onap/so/openstack/utils/MsoHeatEnvironmentEntry.java
+++ b/adapters/mso-adapter-utils/src/main/java/org/onap/so/openstack/utils/MsoHeatEnvironmentEntry.java
@@ -70,7 +70,7 @@ public class MsoHeatEnvironmentEntry {
             logger.debug("Exception:", e);
             this.valid = false;
             this.errorString = e.getMessage();
-            // e.printStackTrace();
+
         }
     }
 
@@ -173,7 +173,7 @@ public class MsoHeatEnvironmentEntry {
         // Basically give back the envt - but exclude the params that aren't in the HeatTemplate
 
         StringBuilder sb = new StringBuilder();
-        ArrayList<String> paramNameList = new ArrayList<String>(params.size());
+        ArrayList<String> paramNameList = new ArrayList<>(params.size());
         for (HeatTemplateParam htp : params) {
             paramNameList.add(htp.getParamName());
         }
diff --git a/adapters/mso-adapter-utils/src/main/java/org/onap/so/openstack/utils/MsoKeystoneUtils.java b/adapters/mso-adapter-utils/src/main/java/org/onap/so/openstack/utils/MsoKeystoneUtils.java
index cfc8c23c5f..ab93a6c4c6 100644
--- a/adapters/mso-adapter-utils/src/main/java/org/onap/so/openstack/utils/MsoKeystoneUtils.java
+++ b/adapters/mso-adapter-utils/src/main/java/org/onap/so/openstack/utils/MsoKeystoneUtils.java
@@ -58,6 +58,7 @@ import org.springframework.stereotype.Component;
 @Component
 public class MsoKeystoneUtils extends MsoTenantUtils {
 
+    public static final String DELETE_TENANT = "Delete Tenant";
     private static Logger logger = LoggerFactory.getLogger(MsoKeystoneUtils.class);
 
     @Autowired
@@ -207,7 +208,7 @@ public class MsoKeystoneUtils extends MsoTenantUtils {
                 return null;
             }
 
-            Map<String, String> metadata = new HashMap<String, String>();
+            Map<String, String> metadata = new HashMap<>();
             if (cloudSite.getIdentityService().getTenantMetadata()) {
                 OpenStackRequest<Metadata> request = keystoneAdminClient.tenants().showMetadata(tenant.getId());
                 Metadata tenantMetadata = executeAndRecordOpenstackRequest(request);
@@ -252,7 +253,7 @@ public class MsoKeystoneUtils extends MsoTenantUtils {
                 return null;
             }
 
-            Map<String, String> metadata = new HashMap<String, String>();
+            Map<String, String> metadata = new HashMap<>();
             if (cloudSite.getIdentityService().getTenantMetadata()) {
                 OpenStackRequest<Metadata> request = keystoneAdminClient.tenants().showMetadata(tenant.getId());
                 Metadata tenantMetadata = executeAndRecordOpenstackRequest(request);
@@ -304,10 +305,10 @@ public class MsoKeystoneUtils extends MsoTenantUtils {
             logger.debug("Deleted Tenant {} ({})", tenant.getId(), tenant.getName());
         } catch (OpenStackBaseException e) {
             // Convert Keystone OpenStackResponseException to MsoOpenstackException
-            throw keystoneErrorToMsoException(e, "Delete Tenant");
+            throw keystoneErrorToMsoException(e, DELETE_TENANT);
         } catch (RuntimeException e) {
             // Catch-all
-            throw runtimeExceptionToMsoException(e, "DeleteTenant");
+            throw runtimeExceptionToMsoException(e, DELETE_TENANT);
         }
 
         return true;
@@ -354,10 +355,10 @@ public class MsoKeystoneUtils extends MsoTenantUtils {
         } catch (OpenStackBaseException e) {
             // Note: It doesn't seem to matter if tenant doesn't exist, no exception is thrown.
             // Convert Keystone OpenStackResponseException to MsoOpenstackException
-            throw keystoneErrorToMsoException(e, "DeleteTenant");
+            throw keystoneErrorToMsoException(e, DELETE_TENANT);
         } catch (RuntimeException e) {
             // Catch-all
-            throw runtimeExceptionToMsoException(e, "DeleteTenant");
+            throw runtimeExceptionToMsoException(e, DELETE_TENANT);
         }
 
         return true;
@@ -379,7 +380,6 @@ public class MsoKeystoneUtils extends MsoTenantUtils {
     public Keystone getKeystoneAdminClient(CloudSite cloudSite) throws MsoException {
         CloudIdentity cloudIdentity = cloudSite.getIdentityService();
 
-        String cloudId = cloudIdentity.getId();
         String adminTenantName = cloudIdentity.getAdminTenant();
         String region = cloudSite.getRegionId();
 
diff --git a/adapters/mso-adapter-utils/src/main/java/org/onap/so/openstack/utils/MsoNeutronUtils.java b/adapters/mso-adapter-utils/src/main/java/org/onap/so/openstack/utils/MsoNeutronUtils.java
index 78db27f65e..6f08afc55f 100644
--- a/adapters/mso-adapter-utils/src/main/java/org/onap/so/openstack/utils/MsoNeutronUtils.java
+++ b/adapters/mso-adapter-utils/src/main/java/org/onap/so/openstack/utils/MsoNeutronUtils.java
@@ -373,7 +373,7 @@ public class MsoNeutronUtils extends MsoCommonUtils {
         final String keystoneUrl = tenantUtils.getKeystoneUrl(cloudId, cloudIdentity);
         String neutronUrl = null;
         String tokenId = null;
-        Calendar expiration = null;
+
         try {
             if (ServerType.KEYSTONE.equals(cloudIdentity.getIdentityServerType())) {
                 Keystone keystoneTenantClient = new Keystone(keystoneUrl);
@@ -396,12 +396,12 @@ public class MsoNeutronUtils extends MsoCommonUtils {
                     throw new MsoAdapterException(error, e);
                 }
                 tokenId = access.getToken().getId();
-                expiration = access.getToken().getExpires();
+
             } else if (ServerType.KEYSTONE_V3.equals(cloudIdentity.getIdentityServerType())) {
                 try {
                     KeystoneAuthHolder holder = keystoneV3Authentication.getToken(cloudSite, tenantId, "network");
                     tokenId = holder.getId();
-                    expiration = holder.getexpiration();
+
                     neutronUrl = holder.getServiceUrl();
                     if (!neutronUrl.endsWith("/")) {
                         neutronUrl += "/v2.0/";