diff options
11 files changed, 33 insertions, 13 deletions
diff --git a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/onap/appc/adapter/chef/chefclient/Utils.java b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/onap/appc/adapter/chef/chefclient/Utils.java index dbaf1d3f2..33b20dc4d 100644 --- a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/onap/appc/adapter/chef/chefclient/Utils.java +++ b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/onap/appc/adapter/chef/chefclient/Utils.java @@ -25,7 +25,6 @@ package org.onap.appc.adapter.chef.chefclient; import java.io.BufferedReader; -import java.io.FileNotFoundException; import java.io.FileReader; import java.io.IOException; import java.security.InvalidKeyException; @@ -48,7 +47,6 @@ public class Utils { public static String sha1AndBase64(String inStr) { MessageDigest md = null; - String outStr = null; byte[] outbty = null; try { md = MessageDigest.getInstance("SHA-1"); diff --git a/appc-adapters/appc-dmaap-adapter/appc-message-adapter-factory/src/main/java/org/onap/appc/adapter/factory/DmaapMessageAdapterFactoryImpl.java b/appc-adapters/appc-dmaap-adapter/appc-message-adapter-factory/src/main/java/org/onap/appc/adapter/factory/DmaapMessageAdapterFactoryImpl.java index cb23f5faa..5fe2d0391 100644 --- a/appc-adapters/appc-dmaap-adapter/appc-message-adapter-factory/src/main/java/org/onap/appc/adapter/factory/DmaapMessageAdapterFactoryImpl.java +++ b/appc-adapters/appc-dmaap-adapter/appc-message-adapter-factory/src/main/java/org/onap/appc/adapter/factory/DmaapMessageAdapterFactoryImpl.java @@ -36,16 +36,19 @@ import org.onap.appc.adapter.messaging.dmaap.impl.DmaapProducerImpl; public class DmaapMessageAdapterFactoryImpl implements MessageAdapterFactory { + @Override public Producer createProducer(Collection<String> pools, String writeTopic, String apiKey, String apiSecret) { return new DmaapProducerImpl(pools, writeTopic,apiKey, apiSecret); } + @Override public Producer createProducer(Collection<String> pools, Set<String> writeTopics, String apiKey, String apiSecret) { return new DmaapProducerImpl(pools, writeTopics, apiKey, apiSecret); } + @Override public Consumer createConsumer(Collection<String> pool, String readTopic, - String clientName, String clientId, String filter_json, String apiKey, String apiSecret) { - return new DmaapConsumerImpl(pool, readTopic, clientName, clientId, apiKey, apiSecret, filter_json); + String clientName, String clientId, String filterJson, String apiKey, String apiSecret) { + return new DmaapConsumerImpl(pool, readTopic, clientName, clientId, apiKey, apiSecret, filterJson); } } diff --git a/appc-adapters/appc-dmaap-adapter/appc-message-adapter-factory/src/main/java/org/onap/appc/adapter/factory/MessageService.java b/appc-adapters/appc-dmaap-adapter/appc-message-adapter-factory/src/main/java/org/onap/appc/adapter/factory/MessageService.java index 952f903b1..9418a40ee 100644 --- a/appc-adapters/appc-dmaap-adapter/appc-message-adapter-factory/src/main/java/org/onap/appc/adapter/factory/MessageService.java +++ b/appc-adapters/appc-dmaap-adapter/appc-message-adapter-factory/src/main/java/org/onap/appc/adapter/factory/MessageService.java @@ -49,7 +49,7 @@ public enum MessageService { public static MessageService parse(String input) { if (input != null) { for (MessageService ms : MessageService.values()) { - if (ms.getValue().equals(input.toLowerCase())) { + if (input.equalsIgnoreCase(ms.getValue())) { return ms; } } diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/onap/appc/adapter/iaas/provider/operation/common/constants/Constants.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/onap/appc/adapter/iaas/provider/operation/common/constants/Constants.java index 503cb1ae8..819118f48 100644 --- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/onap/appc/adapter/iaas/provider/operation/common/constants/Constants.java +++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/onap/appc/adapter/iaas/provider/operation/common/constants/Constants.java @@ -29,6 +29,9 @@ package org.onap.appc.adapter.iaas.provider.operation.common.constants; */ public class Constants { + private Constants() { + } + public static final String DATE_FORMAT = "yyyy-MM-dd HH:mm:ss"; public static final String MDC_SERVICE = "service"; diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/onap/appc/adapter/iaas/provider/operation/common/constants/Property.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/onap/appc/adapter/iaas/provider/operation/common/constants/Property.java index 90532b92d..363b7a6e9 100644 --- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/onap/appc/adapter/iaas/provider/operation/common/constants/Property.java +++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/onap/appc/adapter/iaas/provider/operation/common/constants/Property.java @@ -29,6 +29,8 @@ package org.onap.appc.adapter.iaas.provider.operation.common.constants; */ public class Property { + private Property() { + } public static final String PROVIDER = "provider"; public static final String PROVIDER_IDENTITY = "identity"; public static final String PROVIDER_TENANT = "tenant"; diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/onap/appc/adapter/iaas/provider/operation/common/enums/Operation.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/onap/appc/adapter/iaas/provider/operation/common/enums/Operation.java index 34f763144..81e1c9289 100644 --- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/onap/appc/adapter/iaas/provider/operation/common/enums/Operation.java +++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/onap/appc/adapter/iaas/provider/operation/common/enums/Operation.java @@ -27,76 +27,91 @@ package org.onap.appc.adapter.iaas.provider.operation.common.enums; */ public enum Operation { EVACUATE_SERVICE { + @Override public String toString() { return "evacuateServer"; } }, MIGRATE_SERVICE { + @Override public String toString() { return "migrateServer"; } }, REBUILD_SERVICE { + @Override public String toString() { return "rebuildServer"; } }, RESTART_SERVICE { + @Override public String toString() { return "restartServer"; } }, VMSTATUSCHECK_SERVICE { + @Override public String toString() { return "vmStatuschecker"; } }, SNAPSHOT_SERVICE { + @Override public String toString() { return "createSnapshot"; } }, TERMINATE_STACK { + @Override public String toString() { return "terminateStack"; } }, SNAPSHOT_STACK { + @Override public String toString() { return "snapshotStack"; } }, START_SERVICE { + @Override public String toString() { return "startServer"; } }, STOP_SERVICE { + @Override public String toString() { return "stopServer"; } }, TERMINATE_SERVICE { + @Override public String toString() { return "terminateServer"; } }, LOOKUP_SERVICE { + @Override public String toString() { return "lookupServer"; } }, RESTORE_STACK { + @Override public String toString() { return "restoreStack"; } }, ATTACHVOLUME_SERVICE { + @Override public String toString(){ return "attachVolume"; } }, DETACHVOLUME_SERVICE { + @Override public String toString(){ return "dettachVolume"; } diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/onap/appc/adapter/iaas/provider/operation/common/enums/Outcome.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/onap/appc/adapter/iaas/provider/operation/common/enums/Outcome.java index 972409174..5760879e1 100644 --- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/onap/appc/adapter/iaas/provider/operation/common/enums/Outcome.java +++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/onap/appc/adapter/iaas/provider/operation/common/enums/Outcome.java @@ -29,11 +29,13 @@ package org.onap.appc.adapter.iaas.provider.operation.common.enums; */ public enum Outcome { FAILURE { + @Override public String toString() { return "failure"; } }, SUCCESS { + @Override public String toString() { return "success"; } diff --git a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/onap/appc/adapter/netconf/exception/DataAccessException.java b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/onap/appc/adapter/netconf/exception/DataAccessException.java index 0c4964da0..390a30ea1 100644 --- a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/onap/appc/adapter/netconf/exception/DataAccessException.java +++ b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/onap/appc/adapter/netconf/exception/DataAccessException.java @@ -30,6 +30,7 @@ public class DataAccessException extends RuntimeException { private static final long serialVersionUID = -155423437162622414L; public DataAccessException(){ + // DataAccessException } public DataAccessException(String message){ diff --git a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/onap/appc/adapter/netconf/exception/NetconfDAOException.java b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/onap/appc/adapter/netconf/exception/NetconfDAOException.java index 5ff1a331e..dccab85a8 100644 --- a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/onap/appc/adapter/netconf/exception/NetconfDAOException.java +++ b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/onap/appc/adapter/netconf/exception/NetconfDAOException.java @@ -29,6 +29,7 @@ public class NetconfDAOException extends RuntimeException { private static final long serialVersionUID = -155423437162622414L; public NetconfDAOException(){ + // for NetconfDAOException } public NetconfDAOException(String message){ diff --git a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/onap/appc/adapter/netconf/util/Constants.java b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/onap/appc/adapter/netconf/util/Constants.java index e8b8e9378..86d175081 100644 --- a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/onap/appc/adapter/netconf/util/Constants.java +++ b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/src/main/java/org/onap/appc/adapter/netconf/util/Constants.java @@ -26,6 +26,9 @@ package org.onap.appc.adapter.netconf.util; public class Constants { + private Constants() { + } + public static final String CONFIGURE_PATH = "/restconf/config/opendaylight-inventory:nodes/node/"; public static final String CONNECT_PATH = "/restconf/config/opendaylight-inventory:nodes/node/controller-config/yang-ext:mount/config:modules"; public static final String CHECK_CONNECTION_PATH = "/restconf/operational/opendaylight-inventory:nodes/node/"; diff --git a/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/src/main/java/org/onap/appc/adapter/restHealthcheck/RestHealthcheckActivator.java b/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/src/main/java/org/onap/appc/adapter/restHealthcheck/RestHealthcheckActivator.java index 6dc413494..296ef6019 100644 --- a/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/src/main/java/org/onap/appc/adapter/restHealthcheck/RestHealthcheckActivator.java +++ b/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/src/main/java/org/onap/appc/adapter/restHealthcheck/RestHealthcheckActivator.java @@ -24,11 +24,8 @@ */ package org.onap.appc.adapter.restHealthcheck; -import org.onap.appc.Constants; import org.onap.appc.adapter.restHealthcheck.impl.RestHealthcheckAdapterImpl; import org.onap.appc.configuration.Configuration; -import org.onap.appc.configuration.ConfigurationFactory; -import org.onap.appc.i18n.Msg; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; import org.osgi.framework.BundleActivator; @@ -43,11 +40,6 @@ public class RestHealthcheckActivator implements BundleActivator { private static final EELFLogger logger = EELFManager.getInstance().getLogger(RestHealthcheckActivator.class); /** - * The configuration object used to configure this bundle - */ - private Configuration configuration; - - /** * Called when this bundle is started so the Framework can perform the bundle-specific activities necessary to start * this bundle. This method can be used to register services or to allocate any resources that this bundle needs. * <p> |