From 222018349b49d229fc95a3939f4eaad3a3b663a8 Mon Sep 17 00:00:00 2001 From: Jim Hahn Date: Fri, 12 Feb 2021 09:26:24 -0500 Subject: [PATCH] More sonars in models Addressed the following issues: - change visibility of constructor - assert exception type Issue-ID: POLICY-2905 Change-Id: Iaededb32802e4facbbc776ae51d05d2ef5c60b93 Signed-off-by: Jim Hahn --- .../src/main/java/org/onap/policy/simulators/TopicServer.java | 4 ++-- .../test/java/org/onap/policy/models/simulators/MainTest.java | 11 +++++++---- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/models-interactions/model-simulators/src/main/java/org/onap/policy/simulators/TopicServer.java b/models-interactions/model-simulators/src/main/java/org/onap/policy/simulators/TopicServer.java index 4c01511da..004a2e20c 100644 --- a/models-interactions/model-simulators/src/main/java/org/onap/policy/simulators/TopicServer.java +++ b/models-interactions/model-simulators/src/main/java/org/onap/policy/simulators/TopicServer.java @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * ONAP * ================================================================================ - * Copyright (C) 2020 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2020-2021 AT&T Intellectual Property. All rights reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -43,7 +43,7 @@ public abstract class TopicServer implements TopicListener { * @param sink sink to which responses should be published * @param source source from which requests arrive */ - public TopicServer(TopicSink sink, TopicSource source, Coder coder, Class reqClass) { + protected TopicServer(TopicSink sink, TopicSource source, Coder coder, Class reqClass) { this.sink = sink; this.source = source; this.coder = coder; diff --git a/models-sim/policy-models-simulators/src/test/java/org/onap/policy/models/simulators/MainTest.java b/models-sim/policy-models-simulators/src/test/java/org/onap/policy/models/simulators/MainTest.java index f5598e2e1..1f52ed124 100644 --- a/models-sim/policy-models-simulators/src/test/java/org/onap/policy/models/simulators/MainTest.java +++ b/models-sim/policy-models-simulators/src/test/java/org/onap/policy/models/simulators/MainTest.java @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * ONAP * ================================================================================ - * Copyright (C) 2020 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2020-2021 AT&T Intellectual Property. All rights reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -242,7 +242,8 @@ public class MainTest { */ @Test public void testBuildTopicServerInvalidProvider() { - assertThatThrownBy(() -> new Main("invalidTopicServer.json").start()); + assertThatThrownBy(() -> new Main("invalidTopicServer.json").start()) + .hasCauseInstanceOf(IllegalArgumentException.class); } /** @@ -250,7 +251,8 @@ public class MainTest { */ @Test public void testBuildTopicServerNoSink() { - assertThatThrownBy(() -> new Main("missingSink.json").start()); + assertThatThrownBy(() -> new Main("missingSink.json").start()) + .hasCauseInstanceOf(IllegalArgumentException.class); } /** @@ -258,6 +260,7 @@ public class MainTest { */ @Test public void testBuildTopicServerNoSource() { - assertThatThrownBy(() -> new Main("missingSource.json").start()); + assertThatThrownBy(() -> new Main("missingSource.json").start()) + .hasCauseInstanceOf(IllegalArgumentException.class); } } -- 2.16.6