From 82c26b5b8e7e92dfd9108684290e3a596b800e62 Mon Sep 17 00:00:00 2001 From: s00370346 Date: Tue, 19 Mar 2019 16:22:00 +0530 Subject: Issue-ID: DCAEGEN2-1055 RestConfCollector UnitTest Change-Id: I513ddb61d710f12ab3ccc6fca2329f3f74b4e39c Signed-off-by: s00370346 --- src/main/java/org/onap/dcae/ApplicationSettings.java | 15 +++------------ src/main/java/org/onap/dcae/RestConfCollector.java | 8 ++++---- src/main/java/org/onap/dcae/common/Constants.java | 4 ++-- .../org/onap/dcae/common/DataChangeEventListener.java | 2 +- src/main/java/org/onap/dcae/common/EventProcessor.java | 4 ++-- .../java/org/onap/dcae/common/RestapiCallNode.java | 8 ++++---- src/main/java/org/onap/dcae/common/XmlParser.java | 2 +- .../org/onap/dcae/controller/AccessController.java | 18 ++++++++++++------ src/main/java/org/onap/dcae/controller/EnvProps.java | 5 +++++ .../dcae/controller/PersistentEventConnection.java | 4 ++-- src/main/java/org/onap/dcae/restapi/ServletConfig.java | 4 ++-- 11 files changed, 38 insertions(+), 36 deletions(-) (limited to 'src/main/java/org') diff --git a/src/main/java/org/onap/dcae/ApplicationSettings.java b/src/main/java/org/onap/dcae/ApplicationSettings.java index c7e42c5..45f01ce 100644 --- a/src/main/java/org/onap/dcae/ApplicationSettings.java +++ b/src/main/java/org/onap/dcae/ApplicationSettings.java @@ -120,11 +120,11 @@ public class ApplicationSettings { return httpsPort() > 0; } - public String rcc_keystorePasswordFileLocation() { + public String rccKeystorePasswordFileLocation() { return prependWithUserDirOnRelative(properties.getString("collector.keystore.passwordfile", "etc/rcc_passwordfile")); } - public String rcc_keystoreFileLocation() { + public String rccKeystoreFileLocation() { return prependWithUserDirOnRelative(properties.getString("collector.keystore.file.location", "etc/keystore")); } @@ -163,7 +163,7 @@ public class ApplicationSettings { return prependWithUserDirOnRelative(properties.getString("collector.rcc.truststore.file.location", "etc/truststore.onap.client.jks")); } - public String rcc_policy() { + public String rccPolicy() { return properties.getString("rcc_policy", ""); } @@ -175,15 +175,6 @@ public class ApplicationSettings { return properties.getString("collector.rcc.dmaap.streamid", null); } - private void updateProperty(String key, String value) { - if (properties.containsKey(key)) { - properties.setProperty(key, value); - log.info("Retrives property: " + key + "Value " + value); - } else { - properties.addProperty(key, value); - } - } - public void addOrUpdate(String key, String value) { if (properties.containsKey(key)) { properties.setProperty(key, value); diff --git a/src/main/java/org/onap/dcae/RestConfCollector.java b/src/main/java/org/onap/dcae/RestConfCollector.java index 1812d23..27fccd6 100644 --- a/src/main/java/org/onap/dcae/RestConfCollector.java +++ b/src/main/java/org/onap/dcae/RestConfCollector.java @@ -131,9 +131,9 @@ public class RestConfCollector { } private static void controllerConfig(ApplicationSettings properties) { - oplog.info("Policy received " + properties.rcc_policy()); - if (!properties.rcc_policy().equals("")) { - JSONArray contollers = new JSONArray(properties.rcc_policy()); + oplog.info("Policy received " + properties.rccPolicy()); + if (!properties.rccPolicy().equals("")) { + JSONArray contollers = new JSONArray(properties.rccPolicy()); for (int i = 0; i < contollers.length(); i++) { JSONObject controller = contollers.getJSONObject(i); oplog.info(" object " + controller.toString()); @@ -152,7 +152,7 @@ public class RestConfCollector { public static void handleEvents(EventData ev) throws Exception { if (!fProcessingInputQueue.offer(ev)) { - throw new Exception(); + throw new InterruptedException(); } log.info("RestConfCollector.handleEvents:EVENTS has been published successfully!"); } diff --git a/src/main/java/org/onap/dcae/common/Constants.java b/src/main/java/org/onap/dcae/common/Constants.java index 1fe5624..4c2c7b5 100755 --- a/src/main/java/org/onap/dcae/common/Constants.java +++ b/src/main/java/org/onap/dcae/common/Constants.java @@ -25,7 +25,7 @@ public class Constants { public static final String KDEFAULT_REQUESTBODY = "requestBody"; public static final String KSETTING_REST_API_URL = "restapiUrl"; public static final String KSETTING_REST_UNAME = "restapiUser"; - public static final String KSETTING_REST_PASSWORD = "restapiPassword"; + public static final String KSETTING_REST_PASSWD = "restapiPassword"; public static final String KSETTING_HTTP_METHOD = "httpMethod"; public static final String KSETTING_RESP_PREFIX = "responsePrefix"; public static final String KSETTING_SKIP_SENDING = "skipSending"; @@ -44,5 +44,5 @@ public class Constants { public static final String KSETTING_TRUST_STORE_FILENAME = "trustStoreFileName"; public static final String KSETTING_TRUST_STORE_PASSWORD = "trustStorePassword"; public static final String KSETTING_KEY_STORE_FILENAME = "keyStoreFileName"; - public static final String KSETTING_KEY_STORE_PASSWORD = "keyStorePassword"; + public static final String KSETTING_KEY_STORE_PASSWD = "keyStorePassword"; } diff --git a/src/main/java/org/onap/dcae/common/DataChangeEventListener.java b/src/main/java/org/onap/dcae/common/DataChangeEventListener.java index 6e13f73..2492c21 100755 --- a/src/main/java/org/onap/dcae/common/DataChangeEventListener.java +++ b/src/main/java/org/onap/dcae/common/DataChangeEventListener.java @@ -61,7 +61,7 @@ public class DataChangeEventListener implements EventListener { log.info("Received heart beat "); } } catch (Exception e) { - e.printStackTrace(); + log.info("InboundEvent event is malformed"); } } diff --git a/src/main/java/org/onap/dcae/common/EventProcessor.java b/src/main/java/org/onap/dcae/common/EventProcessor.java index bb0f095..164aed3 100644 --- a/src/main/java/org/onap/dcae/common/EventProcessor.java +++ b/src/main/java/org/onap/dcae/common/EventProcessor.java @@ -36,7 +36,7 @@ public class EventProcessor implements Runnable { private static final Logger log = LoggerFactory.getLogger(EventProcessor.class); private Map streamidHash = new HashMap<>(); - public EventData ev; + private EventPublisher eventPublisher; public EventProcessor(EventPublisher eventPublisher, Map streamidHash) { @@ -48,7 +48,7 @@ public class EventProcessor implements Runnable { @Override public void run() { try { - + EventData ev; while (true) { ev = RestConfCollector.fProcessingInputQueue.take(); diff --git a/src/main/java/org/onap/dcae/common/RestapiCallNode.java b/src/main/java/org/onap/dcae/common/RestapiCallNode.java index af0245d..01da72d 100755 --- a/src/main/java/org/onap/dcae/common/RestapiCallNode.java +++ b/src/main/java/org/onap/dcae/common/RestapiCallNode.java @@ -265,7 +265,7 @@ public class RestapiCallNode { byte[] encoded = Files.readAllBytes(Paths.get(fileName)); return new String(encoded, "UTF-8"); } catch (IOException | SecurityException e) { - throw new Exception("Unable to read file " + fileName + e.getLocalizedMessage(), e); + throw new IOException("Unable to read file " + fileName + e.getLocalizedMessage(), e); } } @@ -289,14 +289,14 @@ public class RestapiCallNode { if (p.restapiUser != null && p.restapiPassword != null) { client.addFilter(new HTTPDigestAuthFilter(p.restapiUser, p.restapiPassword)); } else { - throw new Exception("oAUTH authentication type selected but all restapiUser and restapiPassword " + + throw new SecurityException("oAUTH authentication type selected but all restapiUser and restapiPassword " + "parameters doesn't exist", new Throwable()); } } else if (p.authtype == AuthType.BASIC) { if (p.restapiUser != null && p.restapiPassword != null) { client.addFilter(new HTTPBasicAuthFilter(p.restapiUser, p.restapiPassword)); } else { - throw new Exception("oAUTH authentication type selected but all restapiUser and restapiPassword " + + throw new SecurityException("oAUTH authentication type selected but all restapiUser and restapiPassword " + "parameters doesn't exist", new Throwable()); } } else if (p.authtype == AuthType.OAUTH) { @@ -310,7 +310,7 @@ public class RestapiCallNode { .consumerSecret(p.oAuthConsumerSecret); client.addFilter(new OAuthClientFilter(client.getProviders(), params, secrets)); } else { - throw new Exception("oAUTH authentication type selected but all oAuthConsumerKey, voAuthConsumerSecret " + + throw new SecurityException("oAUTH authentication type selected but all oAuthConsumerKey, voAuthConsumerSecret " + "and oAuthSignatureMethod parameters doesn't exist", new Throwable()); } } diff --git a/src/main/java/org/onap/dcae/common/XmlParser.java b/src/main/java/org/onap/dcae/common/XmlParser.java index 06a4a66..a9902d2 100755 --- a/src/main/java/org/onap/dcae/common/XmlParser.java +++ b/src/main/java/org/onap/dcae/common/XmlParser.java @@ -59,7 +59,7 @@ public class XmlParser { InputStream in = new ByteArrayInputStream(s.getBytes()); saxParser.parse(in, handler); } catch (ParserConfigurationException | IOException | SAXException | NumberFormatException e) { - throw new Exception("Unable to convert XML to properties" + e.getLocalizedMessage(), e); + throw new IOException("Unable to convert XML to properties" + e.getLocalizedMessage(), e); } return handler.getProperties(); } diff --git a/src/main/java/org/onap/dcae/controller/AccessController.java b/src/main/java/org/onap/dcae/controller/AccessController.java index 83673b8..165c468 100644 --- a/src/main/java/org/onap/dcae/controller/AccessController.java +++ b/src/main/java/org/onap/dcae/controller/AccessController.java @@ -29,7 +29,6 @@ import org.onap.dcae.common.RestapiCallNode; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.IOException; import java.nio.file.Path; import java.nio.file.Paths; import java.util.HashMap; @@ -100,6 +99,13 @@ public class AccessController { public RestapiCallNode getRestApiCallNode() { return restApiCallNode; } + public void setRestApiCallNode(RestapiCallNode node) { + this.restApiCallNode = node; + } + + public void setExecutor(ExecutorService executor) { + this.executor = executor; + } private void fetch_TokenId() { @@ -107,13 +113,13 @@ public class AccessController { modifyControllerParamMap(Constants.KSETTING_REST_API_URL, getUriMethod(this.properties.authorizationEnabled()) + cfgInfo.getController_restapiUrl() + cfgInfo.getController_accessTokenUrl()); modifyControllerParamMap(Constants.KDEFAULT_TEMP_FILENAME, cfgInfo.getController_accessTokenFile()); modifyControllerParamMap(Constants.KSETTING_REST_UNAME, cfgInfo.getController_restapiUser()); - modifyControllerParamMap(Constants.KSETTING_REST_PASSWORD, cfgInfo.getController_restapiPassword()); + modifyControllerParamMap(Constants.KSETTING_REST_PASSWD, cfgInfo.getController_restapiPassword()); modifyControllerParamMap(Constants.KSETTING_HTTP_METHOD, cfgInfo.getController_accessTokenMethod()); String httpResponse = null; try { - restApiCallNode.sendRequest(this.paraMap, ctx, null); + getRestApiCallNode().sendRequest(this.paraMap, ctx, null); String key = getControllerParamMapValue(Constants.KSETTING_RESP_PREFIX).concat(".").concat("httpResponse"); httpResponse = ctx.getAttribute(key); log.info("httpResponse ", httpResponse + " key " + key); @@ -136,7 +142,7 @@ public class AccessController { fetch_TokenId(); printControllerParamMap(); /* Create eventlist from properties */ - JSONArray contollers = new JSONArray(properties.rcc_policy()); + JSONArray contollers = new JSONArray(properties.rccPolicy()); for (int i = 0; i < contollers.length(); i++) { JSONObject controller = contollers.getJSONObject(i); if (controller.get("controller_name").equals(this.getCfgInfo().getController_name())) { @@ -188,7 +194,7 @@ public class AccessController { paraMap.put(Constants.KSETTING_FORMAT, "json"); paraMap.put(Constants.KSETTING_REST_UNAME, null); - paraMap.put(Constants.KSETTING_REST_PASSWORD, null); + paraMap.put(Constants.KSETTING_REST_PASSWD, null); paraMap.put(Constants.KDEFAULT_REQUESTBODY, null); paraMap.put(Constants.KSETTING_AUTH_TYPE, "unspecified"); @@ -208,7 +214,7 @@ public class AccessController { paraMap.put(Constants.KSETTING_TRUST_STORE_PASSWORD, trustPassword); paraMap.put(Constants.KSETTING_KEY_STORE_FILENAME, this.getProperties().keystoreFileLocation()); String KeyPassword = getKeyStorePassword(toAbsolutePath(this.getProperties().keystorePasswordFileLocation())); - paraMap.put(Constants.KSETTING_KEY_STORE_PASSWORD, KeyPassword); + paraMap.put(Constants.KSETTING_KEY_STORE_PASSWD, KeyPassword); } diff --git a/src/main/java/org/onap/dcae/controller/EnvProps.java b/src/main/java/org/onap/dcae/controller/EnvProps.java index a2d381d..568ff78 100644 --- a/src/main/java/org/onap/dcae/controller/EnvProps.java +++ b/src/main/java/org/onap/dcae/controller/EnvProps.java @@ -71,4 +71,9 @@ final class EnvProps { Objects.equals(cbsName, envProps.cbsName) && Objects.equals(appName, envProps.appName); } + + @Override + public int hashCode() { + return Objects.hash(consulProtocol, consulHost, consulPort, cbsName, cbsProtocol, appName); + } } \ No newline at end of file diff --git a/src/main/java/org/onap/dcae/controller/PersistentEventConnection.java b/src/main/java/org/onap/dcae/controller/PersistentEventConnection.java index 1c0d85b..99ad1af 100644 --- a/src/main/java/org/onap/dcae/controller/PersistentEventConnection.java +++ b/src/main/java/org/onap/dcae/controller/PersistentEventConnection.java @@ -44,7 +44,7 @@ import java.util.Map; import static org.onap.dcae.common.RestapiCallNodeUtil.*; public class PersistentEventConnection implements Runnable { - public String event_name; + private String event_name; private String event_description; private boolean event_sseventUrlEmbed; private String event_sseventsField; @@ -100,7 +100,7 @@ public class PersistentEventConnection implements Runnable { + parentCtrllr.getCfgInfo().getController_subscriptionUrl()); modifyEventParamMap(Constants.KDEFAULT_TEMP_FILENAME, event_subscriptionTemplate); modifyEventParamMap(Constants.KSETTING_REST_UNAME, parentCtrllr.getCfgInfo().getController_restapiUser()); - modifyEventParamMap(Constants.KSETTING_REST_PASSWORD, parentCtrllr.getCfgInfo().getController_restapiPassword()); + modifyEventParamMap(Constants.KSETTING_REST_PASSWD, parentCtrllr.getCfgInfo().getController_restapiPassword()); modifyEventParamMap(Constants.KSETTING_HTTP_METHOD, parentCtrllr.getCfgInfo().getController_subsMethod()); parentCtrllr.getRestApiCallNode().sendRequest(eventParaMap, ctx, null); diff --git a/src/main/java/org/onap/dcae/restapi/ServletConfig.java b/src/main/java/org/onap/dcae/restapi/ServletConfig.java index 6a6a761..3bb174e 100644 --- a/src/main/java/org/onap/dcae/restapi/ServletConfig.java +++ b/src/main/java/org/onap/dcae/restapi/ServletConfig.java @@ -62,10 +62,10 @@ public class ServletConfig implements WebServerFactoryCustomizer