From 6a91fa496b5464a9f96b43851968eee4c837d80c Mon Sep 17 00:00:00 2001 From: "Smokowski, Kevin (ks6305)" Date: Thu, 28 Mar 2019 14:45:52 +0000 Subject: message router publisher changes resolve message router publisher namespace issues Resolve issues loading message-router in odlsli container Change-Id: Ib36bced43129c735c61d5ff7bb0cf29362bb7779 Issue-ID: CCSDK-1186 Signed-off-by: Smokowski, Kevin (ks6305) --- features/ccsdk-sli-adaptors-all/pom.xml | 2 +- .../messagerouter/publisher/api/PublisherApi.java | 5 - .../messagerouter/publisher/api/PublisherApi.java | 5 + .../features/ccsdk-messagerouter-publisher/pom.xml | 30 +++++ .../features-messagerouter-publisher/pom.xml | 33 +++++ message-router/publisher/features/pom.xml | 81 ++++------- message-router/publisher/installer/pom.xml | 2 +- .../publisher/provider/impl/PublisherApiImpl.java | 149 --------------------- .../publisher/provider/impl/PublisherApiImpl.java | 149 +++++++++++++++++++++ .../resources/OSGI-INF/blueprint/blueprint.xml | 6 +- .../publisher/client/impl/ClientImpl.java | 33 ----- .../publisher/client/impl/ClientImpl.java | 33 +++++ .../resources/OSGI-INF/blueprint/blueprint.xml | 6 +- 13 files changed, 286 insertions(+), 248 deletions(-) delete mode 100755 message-router/publisher/api/src/main/java/org/onap/ccsdk/messagerouter/publisher/api/PublisherApi.java create mode 100755 message-router/publisher/api/src/main/java/org/onap/ccsdk/sli/adaptors/messagerouter/publisher/api/PublisherApi.java create mode 100755 message-router/publisher/features/ccsdk-messagerouter-publisher/pom.xml create mode 100755 message-router/publisher/features/features-messagerouter-publisher/pom.xml mode change 100755 => 100644 message-router/publisher/features/pom.xml delete mode 100755 message-router/publisher/provider/src/main/java/org/onap/ccsdk/messagerouter/publisher/provider/impl/PublisherApiImpl.java create mode 100755 message-router/publisher/provider/src/main/java/org/onap/ccsdk/sli/adaptors/messagerouter/publisher/provider/impl/PublisherApiImpl.java delete mode 100755 message-router/publisher/sample.client/src/main/java/org/onap/ccsdk/messagerouter/publisher/client/impl/ClientImpl.java create mode 100755 message-router/publisher/sample.client/src/main/java/org/onap/ccsdk/sli/adaptors/messagerouter/publisher/client/impl/ClientImpl.java diff --git a/features/ccsdk-sli-adaptors-all/pom.xml b/features/ccsdk-sli-adaptors-all/pom.xml index 59966087..e68a59bf 100644 --- a/features/ccsdk-sli-adaptors-all/pom.xml +++ b/features/ccsdk-sli-adaptors-all/pom.xml @@ -82,7 +82,7 @@ ${project.groupId}.messagerouter - publisher.features + ccsdk-messagerouter-publisher ${project.version} xml features diff --git a/message-router/publisher/api/src/main/java/org/onap/ccsdk/messagerouter/publisher/api/PublisherApi.java b/message-router/publisher/api/src/main/java/org/onap/ccsdk/messagerouter/publisher/api/PublisherApi.java deleted file mode 100755 index 6d4bddcd..00000000 --- a/message-router/publisher/api/src/main/java/org/onap/ccsdk/messagerouter/publisher/api/PublisherApi.java +++ /dev/null @@ -1,5 +0,0 @@ -package org.onap.ccsdk.messagerouter.publisher.api; - -public interface PublisherApi { - public Boolean publish(String topic, String body); -} diff --git a/message-router/publisher/api/src/main/java/org/onap/ccsdk/sli/adaptors/messagerouter/publisher/api/PublisherApi.java b/message-router/publisher/api/src/main/java/org/onap/ccsdk/sli/adaptors/messagerouter/publisher/api/PublisherApi.java new file mode 100755 index 00000000..3551e044 --- /dev/null +++ b/message-router/publisher/api/src/main/java/org/onap/ccsdk/sli/adaptors/messagerouter/publisher/api/PublisherApi.java @@ -0,0 +1,5 @@ +package org.onap.ccsdk.sli.adaptors.messagerouter.publisher.api; + +public interface PublisherApi { + public Boolean publish(String topic, String body); +} diff --git a/message-router/publisher/features/ccsdk-messagerouter-publisher/pom.xml b/message-router/publisher/features/ccsdk-messagerouter-publisher/pom.xml new file mode 100755 index 00000000..939fb7a7 --- /dev/null +++ b/message-router/publisher/features/ccsdk-messagerouter-publisher/pom.xml @@ -0,0 +1,30 @@ + + + 4.0.0 + + + org.onap.ccsdk.parent + single-feature-parent + 1.2.2-SNAPSHOT + + + org.onap.ccsdk.sli.adaptors.messagerouter + ccsdk-messagerouter-publisher + 0.4.2-SNAPSHOT + feature + + + + ${project.groupId} + publisher.api + ${project.version} + + + ${project.groupId} + publisher.provider + ${project.version} + + + + + diff --git a/message-router/publisher/features/features-messagerouter-publisher/pom.xml b/message-router/publisher/features/features-messagerouter-publisher/pom.xml new file mode 100755 index 00000000..eae14670 --- /dev/null +++ b/message-router/publisher/features/features-messagerouter-publisher/pom.xml @@ -0,0 +1,33 @@ + + + 4.0.0 + + + org.onap.ccsdk.parent + feature-repo-parent + 1.2.2-SNAPSHOT + + + + org.onap.ccsdk.sli.adaptors.messagerouter + features-messagerouter-publisher + 0.4.2-SNAPSHOT + feature + + ccsdk-sli-adaptors :: messagerouter :: ${project.artifactId} + + + ${project.version} + + + + + ${project.groupId} + ccsdk-messagerouter-publisher + ${project.version} + xml + features + + + + diff --git a/message-router/publisher/features/pom.xml b/message-router/publisher/features/pom.xml old mode 100755 new mode 100644 index 7b1c7bed..45e1f5d8 --- a/message-router/publisher/features/pom.xml +++ b/message-router/publisher/features/pom.xml @@ -1,58 +1,33 @@ + - 4.0.0 + 4.0.0 + + odlparent-lite + org.onap.ccsdk.parent + 1.2.2-SNAPSHOT + + + org.onap.ccsdk.sli.adaptors.messagerouter + publisher.features + 0.4.2-SNAPSHOT + ccsdk-sli-adaptors :: messagerouter :: ${project.artifactId} - - org.onap.ccsdk.sli.adaptors.messagerouter - publisher.aggregate - 0.4.2-SNAPSHOT - + pom - publisher.features - pom - - - - - src/main/feature - true - ${project.build.directory}/feature - - - - - org.apache.maven.plugins - maven-resources-plugin - - - - resources - - - - - - org.codehaus.mojo - build-helper-maven-plugin - - - attach-artifacts - package - - attach-artifact - - - - - target/feature/feature.xml - xml - features - - - - - - - - + + ccsdk-messagerouter-publisher + features-messagerouter-publisher + diff --git a/message-router/publisher/installer/pom.xml b/message-router/publisher/installer/pom.xml index c2c14819..8a8dc411 100644 --- a/message-router/publisher/installer/pom.xml +++ b/message-router/publisher/installer/pom.xml @@ -23,7 +23,7 @@ ${project.groupId} - publisher.features + ccsdk-messagerouter-publisher ${project.version} xml features diff --git a/message-router/publisher/provider/src/main/java/org/onap/ccsdk/messagerouter/publisher/provider/impl/PublisherApiImpl.java b/message-router/publisher/provider/src/main/java/org/onap/ccsdk/messagerouter/publisher/provider/impl/PublisherApiImpl.java deleted file mode 100755 index 3e8ab333..00000000 --- a/message-router/publisher/provider/src/main/java/org/onap/ccsdk/messagerouter/publisher/provider/impl/PublisherApiImpl.java +++ /dev/null @@ -1,149 +0,0 @@ -package org.onap.ccsdk.messagerouter.publisher.provider.impl; - -import java.io.BufferedReader; -import java.io.DataOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.net.HttpURLConnection; -import java.net.SocketException; -import java.net.URL; -import java.util.Base64; - -import org.onap.ccsdk.messagerouter.publisher.api.PublisherApi; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -public class PublisherApiImpl implements PublisherApi { - private static final Logger logger = LoggerFactory.getLogger(PublisherApiImpl.class); - protected final Integer DEFAULT_CONNECT_TIMEOUT = 30000; // will be treated as 30 seconds - protected final Integer DEFAULT_READ_TIMEOUT = 180000; // will be treated as 3 minutes - private String authorizationString; - protected Integer connectTimeout; - protected Integer readTimeout; - protected String baseUrl; - protected String username; - protected String[] hosts; - private String password; - - public void setUsername(String username) { - this.username = username; - buildAuthorizationString(); - } - - public void setPassword(String password) { - this.password = password; - buildAuthorizationString(); - } - - public void setHost(String hostString) { - // a comma separated list of hosts can be passed in or a single host may be used - if (!hostString.contains(",")) { - this.hosts = new String[] { hostString }; - } else { - this.hosts = hostString.split(","); - } - } - - public PublisherApiImpl() { - connectTimeout = DEFAULT_CONNECT_TIMEOUT; - readTimeout = DEFAULT_READ_TIMEOUT; - } - - public void init() { - buildAuthorizationString(); - } - - private String buildUrlString(Integer hostIndex, String topic) { - return hosts[hostIndex] + "/events/" + topic; - } - - protected void configureHttpURLConnection(HttpURLConnection httpUrlConnection) { - httpUrlConnection.setRequestProperty("Content-Type", "application/json"); - } - - public Boolean publish(String topic, String body) { - for (int hostIndex = 0; hostIndex < hosts.length; hostIndex++) { - HttpURLConnection httpUrlConnection = null; - URL url = null; - try { - url = new URL(buildUrlString(hostIndex, topic)); - logger.info("Publishing body to topic {} using the url {}", topic, url); - logger.info("Message to publish is\n{}", body); - httpUrlConnection = buildHttpURLConnection(url); - httpUrlConnection.setDoInput(true); - httpUrlConnection.setDoOutput(true); - httpUrlConnection.setUseCaches(false); - httpUrlConnection.setRequestMethod("POST"); - - // Write message - httpUrlConnection.setRequestProperty("Content-Length", Integer.toString(body.length())); - DataOutputStream outStr = new DataOutputStream(httpUrlConnection.getOutputStream()); - outStr.write(body.getBytes()); - outStr.close(); - - int status = httpUrlConnection.getResponseCode(); - logger.info("Publishing body for topic {} using url {} returned status {}.", topic, url, status); - if (status < 300) { - String responseFromDMaaP = readFromStream(httpUrlConnection.getInputStream()); - logger.info("Message router response is\n{}", responseFromDMaaP); - return true; - } else { - if (httpUrlConnection.getErrorStream() != null) { - String responseFromDMaaP = readFromStream(httpUrlConnection.getErrorStream()); - logger.warn("Publishing body for topic {} using url {} failed." + " Error message is\n{}", - topic, url, responseFromDMaaP); - } - return false; - } - - } catch (SocketException socketException) { - logger.error("SocketException was thrown during publishing message to DMaaP on url {}.", url, - socketException); - if (hostIndex < hosts.length) { - logger.info("Message sent to {} failed with a SocketException, but will be tried on {}", - hosts[hostIndex], hosts[hostIndex + 1]); - } - } catch (Exception e) { - logger.warn("Exception was thrown during publishing message to DMaaP on url {}.", url, e); - return false; - } finally { - if (httpUrlConnection != null) { - httpUrlConnection.disconnect(); - } - } - } - return false; - } - - private void buildAuthorizationString() { - String basicAuthString = username + ":" + password; - basicAuthString = Base64.getEncoder().encodeToString(basicAuthString.getBytes()); - this.authorizationString = "Basic " + basicAuthString; - } - - protected HttpURLConnection buildHttpURLConnection(URL url) throws IOException { - HttpURLConnection httpUrlConnection = (HttpURLConnection) url.openConnection(); - if (authorizationString != null) { - httpUrlConnection.setRequestProperty("Authorization", authorizationString); - } - httpUrlConnection.setRequestProperty("Accept", "application/json"); - httpUrlConnection.setUseCaches(false); - httpUrlConnection.setConnectTimeout(connectTimeout); - httpUrlConnection.setReadTimeout(readTimeout); - configureHttpURLConnection(httpUrlConnection); - return httpUrlConnection; - } - - protected String readFromStream(InputStream stream) throws IOException { - BufferedReader br = new BufferedReader(new InputStreamReader(stream)); - StringBuilder sb = new StringBuilder(); - String line; - while ((line = br.readLine()) != null) { - sb.append(line); - } - br.close(); - return sb.toString(); - } - -} \ No newline at end of file diff --git a/message-router/publisher/provider/src/main/java/org/onap/ccsdk/sli/adaptors/messagerouter/publisher/provider/impl/PublisherApiImpl.java b/message-router/publisher/provider/src/main/java/org/onap/ccsdk/sli/adaptors/messagerouter/publisher/provider/impl/PublisherApiImpl.java new file mode 100755 index 00000000..d88dc66b --- /dev/null +++ b/message-router/publisher/provider/src/main/java/org/onap/ccsdk/sli/adaptors/messagerouter/publisher/provider/impl/PublisherApiImpl.java @@ -0,0 +1,149 @@ +package org.onap.ccsdk.sli.adaptors.messagerouter.publisher.provider.impl; + +import java.io.BufferedReader; +import java.io.DataOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.net.HttpURLConnection; +import java.net.SocketException; +import java.net.URL; +import java.util.Base64; + +import org.onap.ccsdk.sli.adaptors.messagerouter.publisher.api.PublisherApi; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class PublisherApiImpl implements PublisherApi { + private static final Logger logger = LoggerFactory.getLogger(PublisherApiImpl.class); + protected final Integer DEFAULT_CONNECT_TIMEOUT = 30000; // will be treated as 30 seconds + protected final Integer DEFAULT_READ_TIMEOUT = 180000; // will be treated as 3 minutes + private String authorizationString; + protected Integer connectTimeout; + protected Integer readTimeout; + protected String baseUrl; + protected String username; + protected String[] hosts; + private String password; + + public void setUsername(String username) { + this.username = username; + buildAuthorizationString(); + } + + public void setPassword(String password) { + this.password = password; + buildAuthorizationString(); + } + + public void setHost(String hostString) { + // a comma separated list of hosts can be passed in or a single host may be used + if (!hostString.contains(",")) { + this.hosts = new String[] { hostString }; + } else { + this.hosts = hostString.split(","); + } + } + + public PublisherApiImpl() { + connectTimeout = DEFAULT_CONNECT_TIMEOUT; + readTimeout = DEFAULT_READ_TIMEOUT; + } + + public void init() { + buildAuthorizationString(); + } + + private String buildUrlString(Integer hostIndex, String topic) { + return hosts[hostIndex] + "/events/" + topic; + } + + protected void configureHttpURLConnection(HttpURLConnection httpUrlConnection) { + httpUrlConnection.setRequestProperty("Content-Type", "application/json"); + } + + public Boolean publish(String topic, String body) { + for (int hostIndex = 0; hostIndex < hosts.length; hostIndex++) { + HttpURLConnection httpUrlConnection = null; + URL url = null; + try { + url = new URL(buildUrlString(hostIndex, topic)); + logger.info("Publishing body to topic {} using the url {}", topic, url); + logger.info("Message to publish is\n{}", body); + httpUrlConnection = buildHttpURLConnection(url); + httpUrlConnection.setDoInput(true); + httpUrlConnection.setDoOutput(true); + httpUrlConnection.setUseCaches(false); + httpUrlConnection.setRequestMethod("POST"); + + // Write message + httpUrlConnection.setRequestProperty("Content-Length", Integer.toString(body.length())); + DataOutputStream outStr = new DataOutputStream(httpUrlConnection.getOutputStream()); + outStr.write(body.getBytes()); + outStr.close(); + + int status = httpUrlConnection.getResponseCode(); + logger.info("Publishing body for topic {} using url {} returned status {}.", topic, url, status); + if (status < 300) { + String responseFromDMaaP = readFromStream(httpUrlConnection.getInputStream()); + logger.info("Message router response is\n{}", responseFromDMaaP); + return true; + } else { + if (httpUrlConnection.getErrorStream() != null) { + String responseFromDMaaP = readFromStream(httpUrlConnection.getErrorStream()); + logger.warn("Publishing body for topic {} using url {} failed." + " Error message is\n{}", + topic, url, responseFromDMaaP); + } + return false; + } + + } catch (SocketException socketException) { + logger.error("SocketException was thrown during publishing message to DMaaP on url {}.", url, + socketException); + if (hostIndex < hosts.length) { + logger.info("Message sent to {} failed with a SocketException, but will be tried on {}", + hosts[hostIndex], hosts[hostIndex + 1]); + } + } catch (Exception e) { + logger.warn("Exception was thrown during publishing message to DMaaP on url {}.", url, e); + return false; + } finally { + if (httpUrlConnection != null) { + httpUrlConnection.disconnect(); + } + } + } + return false; + } + + private void buildAuthorizationString() { + String basicAuthString = username + ":" + password; + basicAuthString = Base64.getEncoder().encodeToString(basicAuthString.getBytes()); + this.authorizationString = "Basic " + basicAuthString; + } + + protected HttpURLConnection buildHttpURLConnection(URL url) throws IOException { + HttpURLConnection httpUrlConnection = (HttpURLConnection) url.openConnection(); + if (authorizationString != null) { + httpUrlConnection.setRequestProperty("Authorization", authorizationString); + } + httpUrlConnection.setRequestProperty("Accept", "application/json"); + httpUrlConnection.setUseCaches(false); + httpUrlConnection.setConnectTimeout(connectTimeout); + httpUrlConnection.setReadTimeout(readTimeout); + configureHttpURLConnection(httpUrlConnection); + return httpUrlConnection; + } + + protected String readFromStream(InputStream stream) throws IOException { + BufferedReader br = new BufferedReader(new InputStreamReader(stream)); + StringBuilder sb = new StringBuilder(); + String line; + while ((line = br.readLine()) != null) { + sb.append(line); + } + br.close(); + return sb.toString(); + } + +} \ No newline at end of file diff --git a/message-router/publisher/provider/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/message-router/publisher/provider/src/main/resources/OSGI-INF/blueprint/blueprint.xml index da25fd23..4702a626 100755 --- a/message-router/publisher/provider/src/main/resources/OSGI-INF/blueprint/blueprint.xml +++ b/message-router/publisher/provider/src/main/resources/OSGI-INF/blueprint/blueprint.xml @@ -3,12 +3,12 @@ xmlns:cm="http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.2.0"> + class="org.onap.ccsdk.sli.adaptors.messagerouter.publisher.provider.impl.PublisherApiImpl"> - + \ No newline at end of file diff --git a/message-router/publisher/sample.client/src/main/java/org/onap/ccsdk/messagerouter/publisher/client/impl/ClientImpl.java b/message-router/publisher/sample.client/src/main/java/org/onap/ccsdk/messagerouter/publisher/client/impl/ClientImpl.java deleted file mode 100755 index dbf49fe9..00000000 --- a/message-router/publisher/sample.client/src/main/java/org/onap/ccsdk/messagerouter/publisher/client/impl/ClientImpl.java +++ /dev/null @@ -1,33 +0,0 @@ -package org.onap.ccsdk.messagerouter.publisher.client.impl; - -import org.onap.ccsdk.messagerouter.publisher.api.PublisherApi; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -public class ClientImpl { - private static final Logger logger = LoggerFactory.getLogger(ClientImpl.class); - private String topic; - private PublisherApi publisher; - - public void setPublisher(PublisherApi publisherApi) { - this.publisher = publisherApi; - } - - public void setTopic(String topic) { - this.topic = topic; - } - - public ClientImpl() { - - } - - public void init() { - for (int i = 0; i < 5; i++) { - String body = "{\"hello\":\"world " + String.valueOf(Math.random()) + "\"}"; - logger.error("Loop iteration " + i + " sending body " + body + " to the topic " + topic); - Boolean result = publisher.publish(topic, body); - logger.error("Loop iteration " + i + " returned the boolean value " + result); - } - } - -} \ No newline at end of file diff --git a/message-router/publisher/sample.client/src/main/java/org/onap/ccsdk/sli/adaptors/messagerouter/publisher/client/impl/ClientImpl.java b/message-router/publisher/sample.client/src/main/java/org/onap/ccsdk/sli/adaptors/messagerouter/publisher/client/impl/ClientImpl.java new file mode 100755 index 00000000..25fc87ea --- /dev/null +++ b/message-router/publisher/sample.client/src/main/java/org/onap/ccsdk/sli/adaptors/messagerouter/publisher/client/impl/ClientImpl.java @@ -0,0 +1,33 @@ +package org.onap.ccsdk.sli.adaptors.messagerouter.publisher.client.impl; + +import org.onap.ccsdk.sli.adaptors.messagerouter.publisher.api.PublisherApi; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class ClientImpl { + private static final Logger logger = LoggerFactory.getLogger(ClientImpl.class); + private String topic; + private PublisherApi publisher; + + public void setPublisher(PublisherApi publisherApi) { + this.publisher = publisherApi; + } + + public void setTopic(String topic) { + this.topic = topic; + } + + public ClientImpl() { + + } + + public void init() { + for (int i = 0; i < 5; i++) { + String body = "{\"hello\":\"world " + String.valueOf(Math.random()) + "\"}"; + logger.error("Loop iteration " + i + " sending body " + body + " to the topic " + topic); + Boolean result = publisher.publish(topic, body); + logger.error("Loop iteration " + i + " returned the boolean value " + result); + } + } + +} \ No newline at end of file diff --git a/message-router/publisher/sample.client/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/message-router/publisher/sample.client/src/main/resources/OSGI-INF/blueprint/blueprint.xml index c44a68ad..c2e981da 100755 --- a/message-router/publisher/sample.client/src/main/resources/OSGI-INF/blueprint/blueprint.xml +++ b/message-router/publisher/sample.client/src/main/resources/OSGI-INF/blueprint/blueprint.xml @@ -3,14 +3,14 @@ xmlns:cm="http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.2.0"> - + \ No newline at end of file -- cgit 1.2.3-korg