summaryrefslogtreecommitdiffstats
path: root/prh-app-server/src/main
diff options
context:
space:
mode:
authorwasala <przemyslaw.wasala@nokia.com>2018-05-17 13:36:01 +0200
committerwasala <przemyslaw.wasala@nokia.com>2018-05-17 13:38:25 +0200
commit269250a5700086cc68d20706ee6a9b345e0387be (patch)
tree13f42250b129c113829800892cd28f2925f19b25 /prh-app-server/src/main
parentf24307ddd8fd1d8235bcf4e790cdd15bbf9db514 (diff)
Added tests for DmaapConsumerTask
Change-Id: I1068eb44eba5871f5c1e44e34f149584e056a7a2 Issue-ID: DCAEGEN2-396 Signed-off-by: wasala <przemyslaw.wasala@nokia.com>
Diffstat (limited to 'prh-app-server/src/main')
-rw-r--r--prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/AAIConsumerTask.java2
-rw-r--r--prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/AAIConsumerTaskImpl.java10
-rw-r--r--prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/AAIProducerTaskImpl.java5
-rw-r--r--prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/DmaapConsumerTask.java6
-rw-r--r--prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/DmaapConsumerTaskImpl.java26
-rw-r--r--prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/DmaapPublisherTask.java4
-rw-r--r--prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/DmaapPublisherTaskImpl.java16
-rw-r--r--prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/ScheduledTasks.java6
-rw-r--r--prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/Task.java4
9 files changed, 42 insertions, 37 deletions
diff --git a/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/AAIConsumerTask.java b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/AAIConsumerTask.java
index b4b66036..ffc81324 100644
--- a/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/AAIConsumerTask.java
+++ b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/AAIConsumerTask.java
@@ -22,7 +22,7 @@ package org.onap.dcaegen2.services.prh.tasks;
import org.onap.dcaegen2.services.prh.exceptions.AAINotFoundException;
-public abstract class AAIConsumerTask<T, U, V> extends Task {
+public abstract class AAIConsumerTask<T, U, V, Z> extends Task<Z> {
protected abstract V consume(U message) throws AAINotFoundException;
diff --git a/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/AAIConsumerTaskImpl.java b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/AAIConsumerTaskImpl.java
index 31af9c80..3c2b2974 100644
--- a/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/AAIConsumerTaskImpl.java
+++ b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/AAIConsumerTaskImpl.java
@@ -33,7 +33,8 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@Component
-public class AAIConsumerTaskImpl extends AAIConsumerTask<AAIConsumerClient, ConsumerDmaapModel, Object> {
+public class AAIConsumerTaskImpl extends
+ AAIConsumerTask<AAIConsumerClient, ConsumerDmaapModel, Object, AAIClientConfiguration> {
private static final Logger logger = LoggerFactory.getLogger(AAIConsumerTaskImpl.class);
@@ -66,16 +67,11 @@ public class AAIConsumerTaskImpl extends AAIConsumerTask<AAIConsumerClient, Cons
throw new AAINotFoundException("Incorrect object type");
}
- @Override
- void initConfigs() {
- logger.trace("initConfigs for AAIConsumerTaskImpl not needed/supported");
- }
-
-
protected void setAAIClientConfig() {
aaiConsumerClient = resolveClient();
}
+ @Override
AAIClientConfiguration resolveConfiguration() {
return prhAppConfig.getAAIClientConfiguration();
}
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 5d022f85..79d9b88d 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
@@ -74,11 +74,6 @@ public class AAIProducerTaskImpl extends AAIProducerTask<AAIProducerClient, Cons
throw new AAINotFoundException("Incorrect object type");
}
- @Override
- void initConfigs() {
- logger.trace("initConfigs for AAIProducerTaskImpl not needed/supported");
- }
-
void setAAIClientConfig() {
aaiProducerClient = resolveClient();
}
diff --git a/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/DmaapConsumerTask.java b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/DmaapConsumerTask.java
index 3e827075..195eee7c 100644
--- a/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/DmaapConsumerTask.java
+++ b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/DmaapConsumerTask.java
@@ -24,9 +24,11 @@ import org.onap.dcaegen2.services.prh.exceptions.DmaapNotFoundException;
/**
* @author <a href="mailto:przemyslaw.wasala@nokia.com">Przemysław Wąsala</a> on 4/13/18
*/
-public abstract class DmaapConsumerTask<T, U, V> extends Task {
+public abstract class DmaapConsumerTask<T, U, V, Z> extends Task<Z> {
protected abstract V consume(U message) throws DmaapNotFoundException;
- protected abstract T resolveConfiguration();
+ protected abstract T resolveClient();
+
+ abstract void initConfigs();
}
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 3b5a164e..d5cf91d3 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
@@ -37,12 +37,14 @@ import org.springframework.stereotype.Component;
* @author <a href="mailto:przemyslaw.wasala@nokia.com">Przemysław Wąsala</a> on 3/23/18
*/
@Component
-public class DmaapConsumerTaskImpl extends DmaapConsumerTask<DmaapConsumerConfiguration, String, ConsumerDmaapModel> {
+public class DmaapConsumerTaskImpl extends
+ DmaapConsumerTask<ExtendedDmaapConsumerHttpClientImpl, String, ConsumerDmaapModel, DmaapConsumerConfiguration> {
private static final Logger logger = LoggerFactory.getLogger(DmaapConsumerTaskImpl.class);
private final Config prhAppConfig;
+ private ExtendedDmaapConsumerHttpClientImpl extendedDmaapConsumerHttpClient;
@Autowired
public DmaapConsumerTaskImpl(AppConfig prhAppConfig) {
@@ -57,20 +59,30 @@ public class DmaapConsumerTaskImpl extends DmaapConsumerTask<DmaapConsumerConfig
@Override
public Object execute(Object object) throws PrhTaskException {
+ setDmaapClientConfig();
logger.trace("Method called with arg {}", object);
- ExtendedDmaapConsumerHttpClientImpl dmaapConsumerHttpClient = new ExtendedDmaapConsumerHttpClientImpl(
- resolveConfiguration());
- return consume((dmaapConsumerHttpClient.getHttpConsumerResponse().orElseThrow(() ->
+ return consume((extendedDmaapConsumerHttpClient.getHttpConsumerResponse().orElseThrow(() ->
new PrhTaskException("DmaapConsumerTask has returned null"))));
}
@Override
- protected DmaapConsumerConfiguration resolveConfiguration() {
+ void initConfigs() {
+ prhAppConfig.initFileStreamReader();
+ }
+
+ protected void setDmaapClientConfig() {
+ extendedDmaapConsumerHttpClient = resolveClient();
+ }
+
+ @Override
+ DmaapConsumerConfiguration resolveConfiguration() {
return prhAppConfig.getDmaapConsumerConfiguration();
}
@Override
- protected void initConfigs() {
- prhAppConfig.initFileStreamReader();
+ protected ExtendedDmaapConsumerHttpClientImpl resolveClient() {
+ return new ExtendedDmaapConsumerHttpClientImpl(resolveConfiguration());
}
+
+
} \ No newline at end of file
diff --git a/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/DmaapPublisherTask.java b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/DmaapPublisherTask.java
index 2329274b..8985133a 100644
--- a/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/DmaapPublisherTask.java
+++ b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/DmaapPublisherTask.java
@@ -24,9 +24,9 @@ import org.onap.dcaegen2.services.prh.exceptions.DmaapNotFoundException;
/**
* @author <a href="mailto:przemyslaw.wasala@nokia.com">Przemysław Wąsala</a> on 3/23/18
*/
-public abstract class DmaapPublisherTask<T, U> extends Task {
+public abstract class DmaapPublisherTask<T, U, V> extends Task<V> {
protected abstract String publish(U message) throws DmaapNotFoundException;
- protected abstract T resolveConfiguration();
+ protected abstract T resolveClient();
}
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 77373e41..d03f8061 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
@@ -38,7 +38,7 @@ import org.springframework.stereotype.Component;
*/
@Component
public class DmaapPublisherTaskImpl extends
- DmaapPublisherTask<DmaapPublisherConfiguration, ConsumerDmaapModel> {
+ DmaapPublisherTask<ExtendedDmaapProducerHttpClientImpl, ConsumerDmaapModel, DmaapPublisherConfiguration> {
private static final Logger logger = LoggerFactory.getLogger(DmaapPublisherTaskImpl.class);
private static final Gson gson = new Gson();
@@ -53,11 +53,11 @@ public class DmaapPublisherTaskImpl extends
protected String publish(ConsumerDmaapModel consumerDmaapModel) throws DmaapNotFoundException {
logger.trace("Method called with arg {}", consumerDmaapModel);
ExtendedDmaapProducerHttpClientImpl dmaapProducerHttpClient = new ExtendedDmaapProducerHttpClientImpl(
- resolveConfiguration());
+ resolveConfiguration());
return dmaapProducerHttpClient.getHttpProducerResponse(consumerDmaapModel)
- .filter(x -> !x.isEmpty() && x.equals(String.valueOf(HttpStatus.OK.value())))
- .orElseThrow(() -> new DmaapNotFoundException("Incorrect response from Dmaap"));
+ .filter(x -> !x.isEmpty() && x.equals(String.valueOf(HttpStatus.OK.value())))
+ .orElseThrow(() -> new DmaapNotFoundException("Incorrect response from Dmaap"));
}
@Override
@@ -70,12 +70,12 @@ public class DmaapPublisherTaskImpl extends
}
@Override
- void initConfigs() {
- logger.trace("initConfigs for DmaapPublisherTaskImpl not needed/supported");
+ DmaapPublisherConfiguration resolveConfiguration() {
+ return prhAppConfig.getDmaapPublisherConfiguration();
}
@Override
- protected DmaapPublisherConfiguration resolveConfiguration() {
- return prhAppConfig.getDmaapPublisherConfiguration();
+ protected ExtendedDmaapProducerHttpClientImpl resolveClient() {
+ return null;
}
} \ No newline at end of file
diff --git a/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/ScheduledTasks.java b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/ScheduledTasks.java
index 07c0a58a..6b868d67 100644
--- a/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/ScheduledTasks.java
+++ b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/ScheduledTasks.java
@@ -33,9 +33,9 @@ public class ScheduledTasks {
private static final Logger logger = LoggerFactory.getLogger(ScheduledTasks.class);
- private final Task dmaapConsumerTask;
- private final Task dmaapProducerTask;
- private final Task aaiProducerTask;
+ private final DmaapConsumerTask dmaapConsumerTask;
+ private final DmaapPublisherTask dmaapProducerTask;
+ private final AAIProducerTask aaiProducerTask;
@Autowired
public ScheduledTasks(DmaapConsumerTask dmaapConsumerTask, DmaapPublisherTask dmaapPublisherTask,
diff --git a/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/Task.java b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/Task.java
index 97202146..42f0405c 100644
--- a/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/Task.java
+++ b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/Task.java
@@ -26,7 +26,7 @@ import org.onap.dcaegen2.services.prh.exceptions.PrhTaskException;
*/
-public abstract class Task {
+public abstract class Task<T> {
private Task taskProcess;
@@ -44,5 +44,5 @@ public abstract class Task {
abstract Object execute(Object object) throws PrhTaskException;
- abstract void initConfigs();
+ abstract T resolveConfiguration();
}