From: Rupinder Date: Thu, 14 May 2020 07:44:50 +0000 (+0530) Subject: reduced code smells X-Git-Url: https://gerrit.onap.org/r/gitweb?p=appc.git;a=commitdiff_plain;h=14496b672e66416ef3915777059c7971176a3967 reduced code smells Issue-ID: APPC-1859 Change-Id: I7d0fae3e0ebc9ad3512fb0010381a4506e81128d Signed-off-by: Rupinder --- diff --git a/appc-event-listener/appc-event-listener-bundle/src/main/java/org/onap/appc/listener/LCM/model/DmaapOutgoingMessage.java b/appc-event-listener/appc-event-listener-bundle/src/main/java/org/onap/appc/listener/LCM/model/DmaapOutgoingMessage.java index b74680eb5..9befaee70 100644 --- a/appc-event-listener/appc-event-listener-bundle/src/main/java/org/onap/appc/listener/LCM/model/DmaapOutgoingMessage.java +++ b/appc-event-listener/appc-event-listener-bundle/src/main/java/org/onap/appc/listener/LCM/model/DmaapOutgoingMessage.java @@ -33,7 +33,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; @JsonInclude(JsonInclude.Include.NON_NULL) @JsonIgnoreProperties(ignoreUnknown = true) public class DmaapOutgoingMessage extends DmaapMessage{ - private final static String defaultCambriaPartition = "MSO"; + private static final String defaultCambriaPartition = "MSO"; public DmaapOutgoingMessage() { super(); diff --git a/appc-event-listener/appc-event-listener-bundle/src/main/java/org/onap/appc/listener/demo/impl/ProviderOperations.java b/appc-event-listener/appc-event-listener-bundle/src/main/java/org/onap/appc/listener/demo/impl/ProviderOperations.java index 6cd2f2d76..33cb4b348 100644 --- a/appc-event-listener/appc-event-listener-bundle/src/main/java/org/onap/appc/listener/demo/impl/ProviderOperations.java +++ b/appc-event-listener/appc-event-listener-bundle/src/main/java/org/onap/appc/listener/demo/impl/ProviderOperations.java @@ -54,7 +54,7 @@ public class ProviderOperations { //@formatter:off @SuppressWarnings("nls") - private final static String TEMPLATE = "{\"input\": {\"common-request-header\": {\"service-request-id\": \"%s\"},\"config-payload\": {\"config-url\": \"%s\",\"config-json\":\"%s\"}}}"; + private static final String TEMPLATE = "{\"input\": {\"common-request-header\": {\"service-request-id\": \"%s\"},\"config-payload\": {\"config-url\": \"%s\",\"config-json\":\"%s\"}}}"; //@formatter:on /** diff --git a/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/onap/appc/sdc/artifacts/impl/ToscaCsarArtifactProcessor.java b/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/onap/appc/sdc/artifacts/impl/ToscaCsarArtifactProcessor.java index 94159e146..b1d65cf42 100644 --- a/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/onap/appc/sdc/artifacts/impl/ToscaCsarArtifactProcessor.java +++ b/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/onap/appc/sdc/artifacts/impl/ToscaCsarArtifactProcessor.java @@ -50,7 +50,6 @@ import java.util.Iterator; import java.util.LinkedList; import java.util.List; import java.util.Map; -import java.net.URI; import java.util.*; import java.util.zip.ZipEntry; import java.util.zip.ZipInputStream; diff --git a/services/appc-dmaap-service/appc-event-listener-bundle/src/main/java/org/onap/appc/listener/LCM/operation/GenericProviderOperationRequestFormatter.java b/services/appc-dmaap-service/appc-event-listener-bundle/src/main/java/org/onap/appc/listener/LCM/operation/GenericProviderOperationRequestFormatter.java index ca0f52ac7..394d79a51 100644 --- a/services/appc-dmaap-service/appc-event-listener-bundle/src/main/java/org/onap/appc/listener/LCM/operation/GenericProviderOperationRequestFormatter.java +++ b/services/appc-dmaap-service/appc-event-listener-bundle/src/main/java/org/onap/appc/listener/LCM/operation/GenericProviderOperationRequestFormatter.java @@ -43,7 +43,7 @@ public class GenericProviderOperationRequestFormatter implements ProviderOperati //@formatter:off @SuppressWarnings("nls") - private final static String TEMPLATE = "{\"input\": %s}"; + private static final String TEMPLATE = "{\"input\": %s}"; //@formatter:on @Override diff --git a/services/appc-dmaap-service/appc-event-listener-bundle/src/main/java/org/onap/appc/listener/demo/model/CommonMessage.java b/services/appc-dmaap-service/appc-event-listener-bundle/src/main/java/org/onap/appc/listener/demo/model/CommonMessage.java index e0dbbab67..8bdbbc5c9 100644 --- a/services/appc-dmaap-service/appc-event-listener-bundle/src/main/java/org/onap/appc/listener/demo/model/CommonMessage.java +++ b/services/appc-dmaap-service/appc-event-listener-bundle/src/main/java/org/onap/appc/listener/demo/model/CommonMessage.java @@ -26,7 +26,6 @@ package org.onap.appc.listener.demo.model; import java.io.Serializable; -import java.util.Collection; import org.json.JSONObject; import org.onap.appc.listener.util.Mapper; @@ -293,7 +292,7 @@ public class CommonMessage implements Serializable { - }; + } @JsonIgnoreProperties(ignoreUnknown = true) public static class Streams { @@ -308,6 +307,6 @@ public class CommonMessage implements Serializable { this.activeStreams = activeStreams; } - }; + } } diff --git a/services/appc-dmaap-service/appc-message-adapter-api/src/main/java/org/onap/appc/adapter/message/MessageAdapterFactory.java b/services/appc-dmaap-service/appc-message-adapter-api/src/main/java/org/onap/appc/adapter/message/MessageAdapterFactory.java index 03bc2b28a..e99631d53 100644 --- a/services/appc-dmaap-service/appc-message-adapter-api/src/main/java/org/onap/appc/adapter/message/MessageAdapterFactory.java +++ b/services/appc-dmaap-service/appc-message-adapter-api/src/main/java/org/onap/appc/adapter/message/MessageAdapterFactory.java @@ -25,9 +25,6 @@ package org.onap.appc.adapter.message; import java.util.Collection; import java.util.Set; -import org.onap.appc.adapter.message.Consumer; -import org.onap.appc.adapter.message.Producer; - public interface MessageAdapterFactory { // TODO: how do you configure the MessageService type?