From d41aae5d068ef5a2f8db9fbb2cbfafe8f781bde4 Mon Sep 17 00:00:00 2001 From: Rupinder Date: Wed, 13 May 2020 13:43:29 +0530 Subject: removed code smells Issue-ID: APPC-1859 Change-Id: I02807b0d4bbc3b1d47945e4ff397647a06eb5e03 Signed-off-by: Rupinder --- .../src/main/java/org/onap/appc/adapter/iaas/impl/ProviderCache.java | 2 +- .../src/main/java/org/onap/appc/adapter/rest/RequestFactory.java | 2 +- .../src/main/java/org/onap/appc/adapter/ssh/SshConnectionMock.java | 2 -- .../src/main/java/org/onap/appc/client/impl/core/CoreManager.java | 4 ++-- .../main/java/org/onap/appc/flow/controller/node/RestServiceNode.java | 1 - .../appc-common-bundle/src/main/java/org/onap/appc/pool/Pool.java | 1 - .../src/main/java/org/onap/appc/dg/aai/impl/Constants.java | 2 +- 7 files changed, 5 insertions(+), 9 deletions(-) diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/onap/appc/adapter/iaas/impl/ProviderCache.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/onap/appc/adapter/iaas/impl/ProviderCache.java index c411385e5..9f3d34661 100644 --- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/onap/appc/adapter/iaas/impl/ProviderCache.java +++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/onap/appc/adapter/iaas/impl/ProviderCache.java @@ -57,7 +57,7 @@ public class ProviderCache { /** * The map of tenant cache objects by tenant id */ - private Map tenants = new HashMap(); + private Map tenants = new HashMap<>(); /** * @return the value of providerType diff --git a/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/main/java/org/onap/appc/adapter/rest/RequestFactory.java b/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/main/java/org/onap/appc/adapter/rest/RequestFactory.java index 685ae13a9..d1cd27455 100644 --- a/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/main/java/org/onap/appc/adapter/rest/RequestFactory.java +++ b/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/src/main/java/org/onap/appc/adapter/rest/RequestFactory.java @@ -32,7 +32,7 @@ import java.util.function.Supplier; public class RequestFactory { private final EELFLogger logger = EELFManager.getInstance().getLogger(RequestFactory.class); - final static Map> map = new HashMap<>(); + static final Map> map = new HashMap<>(); static { map.put("GET", HttpGet::new); diff --git a/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-tests/src/main/java/org/onap/appc/adapter/ssh/SshConnectionMock.java b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-tests/src/main/java/org/onap/appc/adapter/ssh/SshConnectionMock.java index b61fc136f..57e66c10b 100644 --- a/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-tests/src/main/java/org/onap/appc/adapter/ssh/SshConnectionMock.java +++ b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-tests/src/main/java/org/onap/appc/adapter/ssh/SshConnectionMock.java @@ -28,8 +28,6 @@ import java.io.OutputStream; import java.util.ArrayList; import java.util.List; -import org.onap.appc.adapter.ssh.SshConnection; - public class SshConnectionMock implements SshConnection { private static final int DEF_SUCCESS_STATUS = 0; diff --git a/appc-client/client-lib/src/main/java/org/onap/appc/client/impl/core/CoreManager.java b/appc-client/client-lib/src/main/java/org/onap/appc/client/impl/core/CoreManager.java index 4c0c535d4..0b231de36 100644 --- a/appc-client/client-lib/src/main/java/org/onap/appc/client/impl/core/CoreManager.java +++ b/appc-client/client-lib/src/main/java/org/onap/appc/client/impl/core/CoreManager.java @@ -45,8 +45,8 @@ class CoreManager{ private final ITimerService timerService; private final TaskQueueManager queueManager; private String DEFAULT_TIMEOUT = "300000"; - private final static String RESPONSE_TIMEOUT = "client.response.timeout"; - private final static String GRACEFUL_SHUTDOWN_TIMEOUT = "client.graceful.shutdown.timeout"; + private static final String RESPONSE_TIMEOUT = "client.response.timeout"; + private static final String GRACEFUL_SHUTDOWN_TIMEOUT = "client.graceful.shutdown.timeout"; private boolean isForceShutdown = false; private AtomicBoolean isGracefulShutdown = new AtomicBoolean(false); private long shutdownTimeout; diff --git a/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/node/RestServiceNode.java b/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/node/RestServiceNode.java index 074310986..51e95c28a 100644 --- a/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/node/RestServiceNode.java +++ b/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/node/RestServiceNode.java @@ -20,7 +20,6 @@ package org.onap.appc.flow.controller.node; -import static org.onap.appc.flow.controller.utils.FlowControllerConstants.APPC_SOUTHBOUND; import static org.onap.appc.flow.controller.utils.FlowControllerConstants.INPUT_PARAM_RESPONSE_PREFIX; import static org.onap.appc.flow.controller.utils.FlowControllerConstants.OUTPUT_PARAM_ERROR_MESSAGE; import static org.onap.appc.flow.controller.utils.FlowControllerConstants.OUTPUT_PARAM_STATUS; diff --git a/appc-core/appc-common-bundle/src/main/java/org/onap/appc/pool/Pool.java b/appc-core/appc-common-bundle/src/main/java/org/onap/appc/pool/Pool.java index 1faf0fe42..aeb1fcd5e 100644 --- a/appc-core/appc-common-bundle/src/main/java/org/onap/appc/pool/Pool.java +++ b/appc-core/appc-common-bundle/src/main/java/org/onap/appc/pool/Pool.java @@ -28,7 +28,6 @@ package org.onap.appc.pool; import java.io.Closeable; import java.util.ArrayDeque; import java.util.ArrayList; -import java.util.Collections; import java.util.Deque; import java.util.List; import java.util.ListIterator; diff --git a/appc-dg/appc-dg-shared/appc-dg-aai/src/main/java/org/onap/appc/dg/aai/impl/Constants.java b/appc-dg/appc-dg-shared/appc-dg-aai/src/main/java/org/onap/appc/dg/aai/impl/Constants.java index 3d226df47..b62968a4b 100644 --- a/appc-dg/appc-dg-shared/appc-dg-aai/src/main/java/org/onap/appc/dg/aai/impl/Constants.java +++ b/appc-dg/appc-dg-shared/appc-dg-aai/src/main/java/org/onap/appc/dg/aai/impl/Constants.java @@ -25,7 +25,7 @@ package org.onap.appc.dg.aai.impl; public class Constants { - public final static String VNF_ID_PARAM_NAME = "aai.vnfID"; + public static final String VNF_ID_PARAM_NAME = "aai.vnfID"; public static final String AAI_PREFIX_PARAM_NAME = "aai.prefix"; public static final String AAI_INPUT_DATA = "aai.input.data"; public static final String AAI_ERROR_MESSAGE = "org.onap.appc.dg.error"; -- cgit 1.2.3-korg