summaryrefslogtreecommitdiffstats
path: root/prh-app-server/src/main/java
diff options
context:
space:
mode:
Diffstat (limited to 'prh-app-server/src/main/java')
-rw-r--r--prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/AAIProducerTask.java2
-rw-r--r--prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/AAIProducerTaskImpl.java29
-rw-r--r--prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/DmaapConsumerTaskImpl.java4
-rw-r--r--prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/DmaapPublisherTaskImpl.java4
4 files changed, 24 insertions, 15 deletions
diff --git a/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/AAIProducerTask.java b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/AAIProducerTask.java
index 8545949f..23d5e93d 100644
--- a/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/AAIProducerTask.java
+++ b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/AAIProducerTask.java
@@ -28,5 +28,5 @@ public abstract class AAIProducerTask<T, U, V> extends Task {
protected abstract V publish(U message) throws AAINotFoundException;
- protected abstract T resolveConfiguration();
+ protected abstract T resolveClient();
}
diff --git a/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/AAIProducerTaskImpl.java b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/AAIProducerTaskImpl.java
index 505d2a9a..3f78e7cd 100644
--- a/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/AAIProducerTaskImpl.java
+++ b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/AAIProducerTaskImpl.java
@@ -19,6 +19,7 @@
*/
package org.onap.dcaegen2.services.prh.tasks;
+import java.io.IOException;
import org.onap.dcaegen2.services.config.AAIClientConfiguration;
import org.onap.dcaegen2.services.model.ConsumerDmaapModel;
import org.onap.dcaegen2.services.prh.configuration.AppConfig;
@@ -31,18 +32,16 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
-import java.io.IOException;
-
/**
* @author <a href="mailto:przemyslaw.wasala@nokia.com">Przemysław Wąsala</a> on 4/13/18
*/
@Component
-public class AAIProducerTaskImpl extends AAIProducerTask<AAIClientConfiguration, ConsumerDmaapModel, Object> {
+public class AAIProducerTaskImpl extends AAIProducerTask<AAIProducerClient, ConsumerDmaapModel, Object> {
private static final Logger logger = LoggerFactory.getLogger(AAIProducerTaskImpl.class);
private final Config prhAppConfig;
-
+ private AAIProducerClient aaiProducerClient;
@Autowired
public AAIProducerTaskImpl(AppConfig prhAppConfig) {
@@ -51,11 +50,12 @@ public class AAIProducerTaskImpl extends AAIProducerTask<AAIClientConfiguration,
@Override
protected Object publish(ConsumerDmaapModel consumerDmaapModel) throws AAINotFoundException {
- logger.trace("Method %M called with arg {}", consumerDmaapModel);
- AAIProducerClient producerClient = new AAIProducerClient(resolveConfiguration());
+ logger.trace("Method called with arg {}", consumerDmaapModel);
+
try {
- return producerClient.getHttpResponse(consumerDmaapModel)
- .filter(HttpUtils::isSuccessfulResponseCode);
+ return aaiProducerClient.getHttpResponse(consumerDmaapModel)
+ .filter(HttpUtils::isSuccessfulResponseCode).map(response -> consumerDmaapModel).orElseThrow(() ->
+ new AAINotFoundException("Incorrect response code for continuation of tasks workflow"));
} catch (IOException e) {
logger.warn("Patch request not successful", e);
throw new AAINotFoundException("Patch request not successful");
@@ -64,7 +64,8 @@ public class AAIProducerTaskImpl extends AAIProducerTask<AAIClientConfiguration,
@Override
public Object execute(Object object) throws AAINotFoundException {
- logger.trace("Method %M called with arg {}", object);
+ setAAIClientConfig();
+ logger.trace("Method called with arg {}", object);
if (object instanceof ConsumerDmaapModel) {
return publish((ConsumerDmaapModel) object);
@@ -78,8 +79,16 @@ public class AAIProducerTaskImpl extends AAIProducerTask<AAIClientConfiguration,
logger.trace("initConfigs for AAIProducerTaskImpl not needed/supported");
}
- @Override
+ protected void setAAIClientConfig() {
+ aaiProducerClient = resolveClient();
+ }
+
protected AAIClientConfiguration resolveConfiguration() {
return prhAppConfig.getAAIClientConfiguration();
}
+
+ @Override
+ protected AAIProducerClient resolveClient() {
+ return new AAIProducerClient(resolveConfiguration());
+ }
}
diff --git a/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/DmaapConsumerTaskImpl.java b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/DmaapConsumerTaskImpl.java
index 69911f33..e9f8ec42 100644
--- a/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/DmaapConsumerTaskImpl.java
+++ b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/DmaapConsumerTaskImpl.java
@@ -51,13 +51,13 @@ public class DmaapConsumerTaskImpl extends DmaapConsumerTask<DmaapConsumerConfig
@Override
protected ConsumerDmaapModel consume(String message) throws DmaapNotFoundException {
- logger.trace("Method %M called with arg {}", message);
+ logger.trace("Method called with arg {}", message);
return DmaapConsumerJsonParser.getJsonObject(message);
}
@Override
public Object execute(Object object) throws PrhTaskException {
- logger.trace("Method %M called with arg {}", object);
+ logger.trace("Method called with arg {}", object);
ExtendedDmaapConsumerHttpClientImpl dmaapConsumerHttpClient = new ExtendedDmaapConsumerHttpClientImpl(
resolveConfiguration());
return consume((dmaapConsumerHttpClient.getHttpConsumerResponse().orElseThrow(() ->
diff --git a/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/DmaapPublisherTaskImpl.java b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/DmaapPublisherTaskImpl.java
index 4fef0353..27742d18 100644
--- a/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/DmaapPublisherTaskImpl.java
+++ b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/DmaapPublisherTaskImpl.java
@@ -51,7 +51,7 @@ public class DmaapPublisherTaskImpl extends
@Override
protected String publish(ConsumerDmaapModel consumerDmaapModel) throws DmaapNotFoundException {
- logger.trace("Method %M called with arg {}", consumerDmaapModel);
+ logger.trace("Method called with arg {}", consumerDmaapModel);
ExtendedDmaapProducerHttpClientImpl dmaapProducerHttpClient = new ExtendedDmaapProducerHttpClientImpl(
resolveConfiguration());
@@ -63,7 +63,7 @@ public class DmaapPublisherTaskImpl extends
@Override
public Object execute(Object object) throws PrhTaskException {
if (object instanceof ConsumerDmaapModel) {
- logger.trace("Method %M called with arg {}", object);
+ logger.trace("Method called with arg {}", object);
return publish((ConsumerDmaapModel) object);
}
throw new DmaapNotFoundException("Incorrect object type");