RESTConf - Switch CBS client library to 1.8.7 or higher

Issue-ID: DCAEGEN2-2857

Signed-off-by: Mukesh Paliwal <mukesh.paliwal1@huawei.com>
Change-Id: I3242a29e2e09fae65dd1738b6883970ce436bf2a

2 files changed, 67 insertions, 83 deletions

diff --git a/src/test/java/org/onap/dcae/ApplicationConfigurationListenerTest.java b/src/test/java/org/onap/dcae/ApplicationConfigurationListenerTest.java
new file mode 100755
index 0000000..fca296b
--- /dev/null
+++ b/src/test/java/org/onap/dcae/ApplicationConfigurationListenerTest.java
@@ -0,0 +1,67 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * org.onap.dcaegen2.restconfcollector
+ * ================================================================================
+ * Copyright (C) 2022 Huawei. 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+package org.onap.dcae;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.Spy;
+import org.mockito.junit.MockitoJUnitRunner;
+import org.onap.dcae.configuration.ConfigurationHandler;
+
+import java.time.Duration;
+
+import static org.mockito.ArgumentMatchers.any;
+
+@RunWith(MockitoJUnitRunner.class)
+public class ApplicationConfigurationListenerTest {
+
+    @Mock
+    private ConfigurationHandler configurationHandler;
+
+    @InjectMocks
+    @Spy
+    private ApplicationConfigurationListener applicationConfigurationListener;
+
+    @Test
+    public void shouldStopJobAndCloseConnectionWhenErrorOccurredDuringListenAtConfigChange() {
+
+       // given
+       Mockito.doThrow(new RuntimeException("Simulate exception")).when(configurationHandler).startListen(any());
+
+       // when
+       applicationConfigurationListener.run();
+
+       // then
+        Mockito.verify(applicationConfigurationListener).stopListeningForConfigurationUpdates(any());
+    }
+
+    @Test
+    public void shouldSendReloadAction() {
+
+        // when
+        applicationConfigurationListener.reload(Duration.ofMillis(1));
+
+        // then
+        Mockito.verify(applicationConfigurationListener).sendReloadAction();
+    }
+}
diff --git a/src/test/java/org/onap/dcae/common/publishing/DMaaPEventPublisherTest.java b/src/test/java/org/onap/dcae/common/publishing/DMaaPEventPublisherTest.java
deleted file mode 100644
index 79ac03b..0000000
--- a/src/test/java/org/onap/dcae/common/publishing/DMaaPEventPublisherTest.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * org.onap.dcaegen2.restconfcollector
- * ================================================================================
- * Copyright (C) 2018 Nokia. All rights reserved.
- * Copyright (C) 2018-2019 Huawei. 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.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.dcae.common.publishing;
-
-import static io.vavr.API.Option;
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.BDDMockito.given;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import com.att.nsa.cambria.client.CambriaBatchingPublisher;
-import java.io.IOException;
-import org.json.JSONObject;
-import org.junit.Before;
-import org.junit.Test;
-import org.slf4j.Logger;
-
-public class DMaaPEventPublisherTest {
-
-    private static final String STREAM_ID = "sampleStreamId";
-
-    private DMaaPEventPublisher eventPublisher;
-    private CambriaBatchingPublisher cambriaPublisher;
-    private DMaaPPublishersCache dmaapPublishersCache;
-
-    /**
-     * Setup before test.
-     */
-    @Before
-    public void setUp() {
-        cambriaPublisher = mock(CambriaBatchingPublisher.class);
-        dmaapPublishersCache = mock(DMaaPPublishersCache.class);
-        when(dmaapPublishersCache.getPublisher(anyString())).thenReturn(Option(cambriaPublisher));
-        eventPublisher = new DMaaPEventPublisher(dmaapPublishersCache, mock(Logger.class));
-    }
-
-    @Test
-    public void shouldSendEventToTopic() throws Exception {
-        // given
-        JSONObject event = new JSONObject("{}");
-
-        // when
-        eventPublisher.sendEvent(event, STREAM_ID);
-
-        // then
-        verify(cambriaPublisher).send("MyPartitionKey", event.toString());
-    }
-
-
-
-    @Test
-    public void shouldCloseConnectionWhenExceptionOccurred() throws Exception {
-        // given
-        JSONObject event = new JSONObject("{}");
-        given(cambriaPublisher.send(anyString(), anyString())).willThrow(new IOException("epic fail"));
-
-        // when
-        eventPublisher.sendEvent(event, STREAM_ID);
-
-        // then
-        verify(dmaapPublishersCache).closePublisherFor(STREAM_ID);
-    }
-}
\ No newline at end of file