From 53f06d93dc2c4d292ea1c7dad24df0d72cc01dc5 Mon Sep 17 00:00:00 2001 From: Jim Hahn Date: Fri, 28 Sep 2018 09:53:14 -0400 Subject: Add junit coverage to rest of policy-endpoint bus Also extracted out common code from tests. Fix checkstyle issues. Be consistent in returning IllegalStateException when topic is not found by any Topic Factory. Added/updated some comments. Use better name for "validate" argument. Renamed test() to testDestroy(). Added NoopTopicPropertyBuilder. Renamed BusTopicTestBase to TopicTestBase. Change-Id: Id4c7ab9f2b5572dc5195b0da116e285c5e9b6f06 Issue-ID: POLICY-1148 Signed-off-by: Jim Hahn --- .../endpoints/event/comm/bus/DmaapTopicSinkFactory.java | 2 +- .../endpoints/event/comm/bus/DmaapTopicSourceFactory.java | 2 +- .../endpoints/event/comm/bus/NoopTopicSinkFactory.java | 10 +++------- .../common/endpoints/event/comm/bus/UebTopicSinkFactory.java | 12 +++++++++++- .../endpoints/event/comm/bus/UebTopicSourceFactory.java | 12 +++++++++++- 5 files changed, 27 insertions(+), 11 deletions(-) (limited to 'policy-endpoints/src/main/java/org/onap/policy/common/endpoints/event') diff --git a/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/event/comm/bus/DmaapTopicSinkFactory.java b/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/event/comm/bus/DmaapTopicSinkFactory.java index 09078720..dc207a84 100644 --- a/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/event/comm/bus/DmaapTopicSinkFactory.java +++ b/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/event/comm/bus/DmaapTopicSinkFactory.java @@ -395,7 +395,7 @@ class IndexedDmaapTopicSinkFactory implements DmaapTopicSinkFactory { if (dmaapTopicWriters.containsKey(topic)) { return dmaapTopicWriters.get(topic); } else { - throw new IllegalArgumentException("DmaapTopicSink for " + topic + " not found"); + throw new IllegalStateException("DmaapTopicSink for " + topic + " not found"); } } } diff --git a/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/event/comm/bus/DmaapTopicSourceFactory.java b/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/event/comm/bus/DmaapTopicSourceFactory.java index f45164f8..ae6c6c3b 100644 --- a/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/event/comm/bus/DmaapTopicSourceFactory.java +++ b/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/event/comm/bus/DmaapTopicSourceFactory.java @@ -448,7 +448,7 @@ class IndexedDmaapTopicSourceFactory implements DmaapTopicSourceFactory { if (dmaapTopicSources.containsKey(topic)) { return dmaapTopicSources.get(topic); } else { - throw new IllegalArgumentException("DmaapTopiceSource for " + topic + " not found"); + throw new IllegalStateException("DmaapTopiceSource for " + topic + " not found"); } } } diff --git a/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/event/comm/bus/NoopTopicSinkFactory.java b/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/event/comm/bus/NoopTopicSinkFactory.java index d418bfac..b2c50184 100644 --- a/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/event/comm/bus/NoopTopicSinkFactory.java +++ b/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/event/comm/bus/NoopTopicSinkFactory.java @@ -101,7 +101,7 @@ class IndexedNoopTopicSinkFactory implements NoopTopicSinkFactory { /** * Logger. */ - private static Logger logger = LoggerFactory.getLogger(IndexedUebTopicSinkFactory.class); + private static Logger logger = LoggerFactory.getLogger(IndexedNoopTopicSinkFactory.class); /** * noop topic sinks map. @@ -153,12 +153,8 @@ class IndexedNoopTopicSinkFactory implements NoopTopicSinkFactory { public NoopTopicSink build(List servers, String topic, boolean managed) { List noopSinkServers = servers; - if (noopSinkServers == null) { - noopSinkServers = new ArrayList<>(); - } - - if (noopSinkServers.isEmpty()) { - noopSinkServers.add("noop"); + if (noopSinkServers == null || noopSinkServers.isEmpty()) { + noopSinkServers = Arrays.asList("noop"); } if (topic == null || topic.isEmpty()) { diff --git a/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/event/comm/bus/UebTopicSinkFactory.java b/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/event/comm/bus/UebTopicSinkFactory.java index bc107c1a..c200af5a 100644 --- a/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/event/comm/bus/UebTopicSinkFactory.java +++ b/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/event/comm/bus/UebTopicSinkFactory.java @@ -134,7 +134,7 @@ class IndexedUebTopicSinkFactory implements UebTopicSinkFactory { return uebTopicSinks.get(busTopicParams.getTopic()); } - UebTopicSink uebTopicWriter = new InlineUebTopicSink(busTopicParams); + UebTopicSink uebTopicWriter = makeSink(busTopicParams); if (busTopicParams.isManaged()) { uebTopicSinks.put(busTopicParams.getTopic(), uebTopicWriter); @@ -286,6 +286,16 @@ class IndexedUebTopicSinkFactory implements UebTopicSinkFactory { return new ArrayList<>(this.uebTopicSinks.values()); } + /** + * Makes a new sink. + * + * @param busTopicParams parameters to use to configure the sink + * @return a new sink + */ + protected UebTopicSink makeSink(BusTopicParams busTopicParams) { + return new InlineUebTopicSink(busTopicParams); + } + @Override public String toString() { diff --git a/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/event/comm/bus/UebTopicSourceFactory.java b/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/event/comm/bus/UebTopicSourceFactory.java index f3f3e156..96315881 100644 --- a/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/event/comm/bus/UebTopicSourceFactory.java +++ b/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/event/comm/bus/UebTopicSourceFactory.java @@ -145,7 +145,7 @@ class IndexedUebTopicSourceFactory implements UebTopicSourceFactory { return uebTopicSources.get(busTopicParams.getTopic()); } - UebTopicSource uebTopicSource = new SingleThreadedUebTopicSource(busTopicParams); + UebTopicSource uebTopicSource = makeSource(busTopicParams); if (busTopicParams.isManaged()) { uebTopicSources.put(busTopicParams.getTopic(), uebTopicSource); @@ -284,6 +284,16 @@ class IndexedUebTopicSourceFactory implements UebTopicSourceFactory { return this.build(servers, topic, null, null); } + /** + * Makes a new source. + * + * @param busTopicParams parameters to use to configure the source + * @return a new source + */ + protected UebTopicSource makeSource(BusTopicParams busTopicParams) { + return new SingleThreadedUebTopicSource(busTopicParams); + } + @Override public void destroy(String topic) { -- cgit 1.2.3-korg