From 06bfa9f289b1960a3ac692b2e58dac3da6abb968 Mon Sep 17 00:00:00 2001 From: Rupinder Date: Wed, 13 May 2020 14:02:09 +0530 Subject: [PATCH] lower code smells Issue-ID: APPC-1859 Change-Id: If95047a9f6b568c8ef4796d48572c23a36ac36fc Signed-off-by: Rupinder --- .../java/org/onap/appc/requesthandler/impl/DmaapOutgoingMessage.java | 2 +- .../java/org/onap/appc/requesthandler/impl/RequestValidatorImpl.java | 1 - .../main/java/org/onap/appc/workflow/impl/WorkFlowManagerImpl.java | 3 --- .../org/onap/appc/interfaces/service/InterfacesServiceProvider.java | 1 - appc-oam/appc-oam-bundle/src/main/java/org/onap/appc/oam/AppcOam.java | 2 +- .../src/main/java/org/onap/appc/oam/util/BundleHelper.java | 4 ++-- .../src/main/java/org/onap/appc/oam/util/ConfigurationHelper.java | 4 ++-- 7 files changed, 6 insertions(+), 11 deletions(-) diff --git a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/onap/appc/requesthandler/impl/DmaapOutgoingMessage.java b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/onap/appc/requesthandler/impl/DmaapOutgoingMessage.java index ba39b701c..23d0e1cfb 100644 --- a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/onap/appc/requesthandler/impl/DmaapOutgoingMessage.java +++ b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/onap/appc/requesthandler/impl/DmaapOutgoingMessage.java @@ -47,7 +47,7 @@ public class DmaapOutgoingMessage { @JsonProperty("correlation-id") private String correlationID; - private final static String defaultCambriaPartition = "MSO"; + private static final String defaultCambriaPartition = "MSO"; @JsonProperty("cambria.partition") private String cambriaPartition = defaultCambriaPartition; diff --git a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/onap/appc/requesthandler/impl/RequestValidatorImpl.java b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/onap/appc/requesthandler/impl/RequestValidatorImpl.java index 71545ab10..6605d1e83 100644 --- a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/onap/appc/requesthandler/impl/RequestValidatorImpl.java +++ b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/onap/appc/requesthandler/impl/RequestValidatorImpl.java @@ -27,7 +27,6 @@ package org.onap.appc.requesthandler.impl; import com.att.eelf.i18n.EELFResourceManager; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.node.ObjectNode; import org.apache.commons.io.IOUtils; import org.apache.commons.lang.ObjectUtils; diff --git a/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/src/main/java/org/onap/appc/workflow/impl/WorkFlowManagerImpl.java b/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/src/main/java/org/onap/appc/workflow/impl/WorkFlowManagerImpl.java index 659c3fbbb..172d8c4e6 100644 --- a/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/src/main/java/org/onap/appc/workflow/impl/WorkFlowManagerImpl.java +++ b/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/src/main/java/org/onap/appc/workflow/impl/WorkFlowManagerImpl.java @@ -23,7 +23,6 @@ package org.onap.appc.workflow.impl; import org.apache.commons.lang.ObjectUtils; -import org.apache.commons.lang3.StringUtils; import org.onap.appc.common.constant.Constants; import org.onap.appc.configuration.Configuration; import org.onap.appc.configuration.ConfigurationFactory; @@ -45,12 +44,10 @@ import org.osgi.framework.BundleContext; import org.osgi.framework.FrameworkUtil; import org.osgi.framework.ServiceReference; import java.util.ArrayList; -import java.util.List; import org.onap.ccsdk.sli.core.dblib.DbLibService; import org.onap.ccsdk.sli.core.sli.SvcLogicGraph; import javax.sql.rowset.CachedRowSet; import java.sql.SQLException; -import java.sql.Blob; import java.io.ObjectInputStream; import java.io.IOException; import org.slf4j.MDC; diff --git a/appc-inbound/appc-interfaces-service/bundle/src/main/java/org/onap/appc/interfaces/service/InterfacesServiceProvider.java b/appc-inbound/appc-interfaces-service/bundle/src/main/java/org/onap/appc/interfaces/service/InterfacesServiceProvider.java index 242f55f22..5b64c9546 100644 --- a/appc-inbound/appc-interfaces-service/bundle/src/main/java/org/onap/appc/interfaces/service/InterfacesServiceProvider.java +++ b/appc-inbound/appc-interfaces-service/bundle/src/main/java/org/onap/appc/interfaces/service/InterfacesServiceProvider.java @@ -29,7 +29,6 @@ import org.opendaylight.controller.md.sal.binding.api.DataBroker; import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.RpcRegistration; import org.opendaylight.controller.sal.binding.api.RpcProviderRegistry; import org.opendaylight.yang.gen.v1.org.onap.appc.interfaces.service.rev170818.InterfacesServiceService; -import org.onap.appc.interfaces.service.InterfacesServiceProviderImpl; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; diff --git a/appc-oam/appc-oam-bundle/src/main/java/org/onap/appc/oam/AppcOam.java b/appc-oam/appc-oam-bundle/src/main/java/org/onap/appc/oam/AppcOam.java index c41abb22d..50c6d49c7 100644 --- a/appc-oam/appc-oam-bundle/src/main/java/org/onap/appc/oam/AppcOam.java +++ b/appc-oam/appc-oam-bundle/src/main/java/org/onap/appc/oam/AppcOam.java @@ -91,7 +91,7 @@ public class AppcOam implements AutoCloseable, AppcOamService { /** * Invalid state message format with fliexible operation, appc name and state values */ - public final static String INVALID_STATE_MESSAGE_FORMAT = "%s API is not allowed when %s is in the %s state."; + public static final String INVALID_STATE_MESSAGE_FORMAT = "%s API is not allowed when %s is in the %s state."; private final EELFLogger logger = EELFManager.getInstance().getLogger(AppcOam.class); diff --git a/appc-oam/appc-oam-bundle/src/main/java/org/onap/appc/oam/util/BundleHelper.java b/appc-oam/appc-oam-bundle/src/main/java/org/onap/appc/oam/util/BundleHelper.java index 7639c4075..9559b54aa 100644 --- a/appc-oam/appc-oam-bundle/src/main/java/org/onap/appc/oam/util/BundleHelper.java +++ b/appc-oam/appc-oam-bundle/src/main/java/org/onap/appc/oam/util/BundleHelper.java @@ -44,8 +44,8 @@ import java.util.concurrent.Future; * Utility class provides general bundle operational helps. */ public class BundleHelper { - private final static String PROP_BUNDLE_TO_STOP = "appc.OAM.ToStop.properties"; - private final static String PROP_BUNDLES_TO_NOT_STOP = "appc.OAM.ToNotStop.properties"; + private static final String PROP_BUNDLE_TO_STOP = "appc.OAM.ToStop.properties"; + private static final String PROP_BUNDLES_TO_NOT_STOP = "appc.OAM.ToNotStop.properties"; private final EELFLogger logger; private final StateHelper stateHelper; diff --git a/appc-oam/appc-oam-bundle/src/main/java/org/onap/appc/oam/util/ConfigurationHelper.java b/appc-oam/appc-oam-bundle/src/main/java/org/onap/appc/oam/util/ConfigurationHelper.java index 63cff68db..d6f27195f 100644 --- a/appc-oam/appc-oam-bundle/src/main/java/org/onap/appc/oam/util/ConfigurationHelper.java +++ b/appc-oam/appc-oam-bundle/src/main/java/org/onap/appc/oam/util/ConfigurationHelper.java @@ -35,8 +35,8 @@ import java.util.concurrent.TimeUnit; * Utility class provides general configuration helps */ public class ConfigurationHelper { - final static String PROP_KEY_APPC_NAME = Constants.PROPERTY_APPLICATION_NAME; - final static String PROP_KEY_METRIC_STATE = "metric.enabled"; + static final String PROP_KEY_APPC_NAME = Constants.PROPERTY_APPLICATION_NAME; + static final String PROP_KEY_METRIC_STATE = "metric.enabled"; private final String OAM_OPERATION_TIMEOUT_SECOND = "appc.OAM.api.timeout"; /** Default operation timeout set to 1 minute */ private final int DEFAULT_OAM_OPERATION_TIMEOUT = 60; -- 2.16.6