summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuangrongFu <fu.guangrong@zte.com.cn>2021-07-19 19:09:39 +0800
committerGuangrongFu <fu.guangrong@zte.com.cn>2021-07-19 19:09:39 +0800
commita2d41239cd468bd2894336353b31007dfe99bf81 (patch)
tree3e40f67a9b4401a4d27fa37764f8851d6c379c4e
parentf6b820706df03f17fa41ad99035f7fd8761e47b7 (diff)
Updated holmes-actions to 1.3.5
Change-Id: I7c24569f762233f3bbe0805dc6d6b280a6105c0f Issue-ID: HOLMES-461 Signed-off-by: GuangrongFu <fu.guangrong@zte.com.cn>
-rw-r--r--engine-d/src/main/java/org/onap/holmes/dsa/dmaappolling/Subscriber.java6
-rw-r--r--engine-d/src/test/java/org/onap/holmes/dsa/dmaappolling/SubscriberTest.java7
-rw-r--r--pom.xml2
3 files changed, 8 insertions, 7 deletions
diff --git a/engine-d/src/main/java/org/onap/holmes/dsa/dmaappolling/Subscriber.java b/engine-d/src/main/java/org/onap/holmes/dsa/dmaappolling/Subscriber.java
index 2c9d88b..8c3d4f5 100644
--- a/engine-d/src/main/java/org/onap/holmes/dsa/dmaappolling/Subscriber.java
+++ b/engine-d/src/main/java/org/onap/holmes/dsa/dmaappolling/Subscriber.java
@@ -77,15 +77,15 @@ public class Subscriber {
}
}
- private List<String> getDMaaPData() throws Exception {
- return new JerseyClient()
+ private List<String> getDMaaPData() {
+ return JerseyClient.newInstance()
.path(consumerGroup)
.path(consumer)
.queryParam("timeout", period)
.get(url, List.class);
}
- private List<VesAlarm> extractVesAlarm(List<String> responseEntity) throws IOException {
+ private List<VesAlarm> extractVesAlarm(List<String> responseEntity) {
List<VesAlarm> vesAlarmList = new ArrayList<>();
for (String entity : responseEntity) {
vesAlarmList.add(dMaaPResponseUtil.convertJsonToVesAlarm(entity));
diff --git a/engine-d/src/test/java/org/onap/holmes/dsa/dmaappolling/SubscriberTest.java b/engine-d/src/test/java/org/onap/holmes/dsa/dmaappolling/SubscriberTest.java
index 4cf1caf..f88ddfb 100644
--- a/engine-d/src/test/java/org/onap/holmes/dsa/dmaappolling/SubscriberTest.java
+++ b/engine-d/src/test/java/org/onap/holmes/dsa/dmaappolling/SubscriberTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017-2020 ZTE Corporation.
+ * Copyright 2017-2021 ZTE Corporation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -39,7 +39,7 @@ import static org.hamcrest.CoreMatchers.*;
import static org.junit.Assert.assertThat;
@RunWith(PowerMockRunner.class)
-@PrepareForTest({ServiceLocatorHolder.class, ServiceLocator.class, Subscriber.class})
+@PrepareForTest({ServiceLocatorHolder.class, JerseyClient.class})
@PowerMockIgnore("javax.net.ssl.*")
public class SubscriberTest {
@@ -220,7 +220,8 @@ public class SubscriberTest {
subscriber.setUrl("https://www.onap.org");
subscriber.setConsumerGroup("group");
subscriber.setConsumer("consumer");
- List<VesAlarm> vesAlarms = subscriber.subscribe();
+
+ subscriber.subscribe();
PowerMock.verifyAll();
}
diff --git a/pom.xml b/pom.xml
index d32c194..661f3a4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -168,7 +168,7 @@
<dependency>
<groupId>org.onap.holmes.common</groupId>
<artifactId>holmes-actions</artifactId>
- <version>1.3.4</version>
+ <version>1.3.5</version>
<exclusions>
<exclusion>
<groupId>io.dropwizard</groupId>