diff options
Diffstat (limited to 'prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks')
6 files changed, 31 insertions, 52 deletions
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 95352d44..136f5b7f 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 @@ -20,21 +20,21 @@ package org.onap.dcaegen2.services.prh.tasks; -import java.util.Optional; import org.onap.dcaegen2.services.config.AAIClientConfiguration; import org.onap.dcaegen2.services.prh.configuration.AppConfig; import org.onap.dcaegen2.services.prh.configuration.Config; import org.onap.dcaegen2.services.prh.exceptions.AAINotFoundException; -import org.onap.dcaegen2.services.service.AAIProducerClient; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; +import java.util.Optional; + @Component public class AAIConsumerTaskImpl extends AAIConsumerTask<AAIClientConfiguration> { - private static final Logger logger = LoggerFactory.getLogger(ScheduledTasks.class); + private static final Logger logger = LoggerFactory.getLogger(AAIConsumerTaskImpl.class); private final Config prhAppConfig; private Optional<String> response; @@ -46,15 +46,11 @@ public class AAIConsumerTaskImpl extends AAIConsumerTask<AAIClientConfiguration> @Override protected void consume() throws AAINotFoundException { - //TODO: @Piotr Wielebski - AAIProducerClient producerClient = new AAIProducerClient(prhAppConfig.getAAIClientConfiguration()); - } @Override public Object execute(Object object) throws AAINotFoundException { consume(); - //TODO: @Piotr Wielebski return null; } 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 4a7d9282..505d2a9a 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,25 +19,19 @@ */ package org.onap.dcaegen2.services.prh.tasks; -import com.google.gson.Gson; import org.onap.dcaegen2.services.config.AAIClientConfiguration; +import org.onap.dcaegen2.services.model.ConsumerDmaapModel; import org.onap.dcaegen2.services.prh.configuration.AppConfig; import org.onap.dcaegen2.services.prh.configuration.Config; import org.onap.dcaegen2.services.prh.exceptions.AAINotFoundException; -import org.onap.dcaegen2.services.prh.exceptions.PrhTaskException; -import org.onap.dcaegen2.services.prh.model.ConsumerDmaapModel; -import org.onap.dcaegen2.services.prh.model.ImmutableConsumerDmaapModel; import org.onap.dcaegen2.services.service.AAIProducerClient; -import org.onap.dcaegen2.services.utils.HttpRequestDetails; +import org.onap.dcaegen2.services.service.HttpUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Component; -import java.time.LocalDateTime; -import java.time.format.DateTimeFormatter; -import java.util.Optional; +import java.io.IOException; /** * @author <a href="mailto:przemyslaw.wasala@nokia.com">Przemysław Wąsala</a> on 4/13/18 @@ -45,11 +39,10 @@ import java.util.Optional; @Component public class AAIProducerTaskImpl extends AAIProducerTask<AAIClientConfiguration, ConsumerDmaapModel, Object> { - private static final Logger logger = LoggerFactory.getLogger(ScheduledTasks.class); + private static final Logger logger = LoggerFactory.getLogger(AAIProducerTaskImpl.class); private final Config prhAppConfig; - private AAIProducerClient producerClient; - private Optional<String> response; + @Autowired public AAIProducerTaskImpl(AppConfig prhAppConfig) { @@ -59,19 +52,24 @@ public class AAIProducerTaskImpl extends AAIProducerTask<AAIClientConfiguration, @Override protected Object publish(ConsumerDmaapModel consumerDmaapModel) throws AAINotFoundException { logger.trace("Method %M called with arg {}", consumerDmaapModel); - producerClient = new AAIProducerClient(prhAppConfig.getAAIClientConfiguration()); - //TODO: @Piotr Wielebski - response = producerClient.getHttpResponse(null); - return response.get(); + AAIProducerClient producerClient = new AAIProducerClient(resolveConfiguration()); + try { + return producerClient.getHttpResponse(consumerDmaapModel) + .filter(HttpUtils::isSuccessfulResponseCode); + } catch (IOException e) { + logger.warn("Patch request not successful", e); + throw new AAINotFoundException("Patch request not successful"); + } } @Override - public Object execute(Object object) throws PrhTaskException { + public Object execute(Object object) throws AAINotFoundException { logger.trace("Method %M called with arg {}", object); + if (object instanceof ConsumerDmaapModel) { - //TODO: @Piotr Wielebski return publish((ConsumerDmaapModel) object); } + throw new AAINotFoundException("Incorrect object type"); } @@ -84,5 +82,4 @@ public class AAIProducerTaskImpl extends AAIProducerTask<AAIClientConfiguration, protected AAIClientConfiguration resolveConfiguration() { return prhAppConfig.getAAIClientConfiguration(); } - } 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 a2129fcd..69911f33 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 @@ -19,12 +19,13 @@ */ package org.onap.dcaegen2.services.prh.tasks; +import org.onap.dcaegen2.services.model.ConsumerDmaapModel; import org.onap.dcaegen2.services.config.DmaapConsumerConfiguration; import org.onap.dcaegen2.services.prh.configuration.AppConfig; import org.onap.dcaegen2.services.prh.configuration.Config; import org.onap.dcaegen2.services.prh.exceptions.DmaapNotFoundException; import org.onap.dcaegen2.services.prh.exceptions.PrhTaskException; -import org.onap.dcaegen2.services.prh.model.ConsumerDmaapModel; + import org.onap.dcaegen2.services.prh.service.DmaapConsumerJsonParser; import org.onap.dcaegen2.services.service.consumer.ExtendedDmaapConsumerHttpClientImpl; import org.slf4j.Logger; @@ -32,9 +33,6 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import java.time.LocalDateTime; -import java.time.format.DateTimeFormatter; - /** * @author <a href="mailto:przemyslaw.wasala@nokia.com">Przemysław Wąsala</a> on 3/23/18 */ 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 60ab64fd..4fef0353 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 @@ -21,14 +21,12 @@ package org.onap.dcaegen2.services.prh.tasks; import com.google.gson.Gson; import org.onap.dcaegen2.services.config.DmaapPublisherConfiguration; +import org.onap.dcaegen2.services.model.ConsumerDmaapModel; import org.onap.dcaegen2.services.prh.configuration.AppConfig; import org.onap.dcaegen2.services.prh.configuration.Config; import org.onap.dcaegen2.services.prh.exceptions.DmaapNotFoundException; import org.onap.dcaegen2.services.prh.exceptions.PrhTaskException; -import org.onap.dcaegen2.services.prh.model.ConsumerDmaapModel; -import org.onap.dcaegen2.services.service.producer.DmaapPublisherRequestDetails; import org.onap.dcaegen2.services.service.producer.ExtendedDmaapProducerHttpClientImpl; -import org.onap.dcaegen2.services.service.producer.ImmutableDmaapPublisherRequestDetails; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -40,9 +38,9 @@ import org.springframework.stereotype.Component; */ @Component public class DmaapPublisherTaskImpl extends - DmaapPublisherTask<DmaapPublisherConfiguration, ConsumerDmaapModel> { + DmaapPublisherTask<DmaapPublisherConfiguration, ConsumerDmaapModel> { - private static final Logger logger = LoggerFactory.getLogger(ScheduledTasks.class); + private static final Logger logger = LoggerFactory.getLogger(DmaapPublisherTaskImpl.class); private static final Gson gson = new Gson(); private final Config prhAppConfig; @@ -55,13 +53,11 @@ public class DmaapPublisherTaskImpl extends protected String publish(ConsumerDmaapModel consumerDmaapModel) throws DmaapNotFoundException { logger.trace("Method %M called with arg {}", consumerDmaapModel); ExtendedDmaapProducerHttpClientImpl dmaapProducerHttpClient = new ExtendedDmaapProducerHttpClientImpl( - resolveConfiguration()); - DmaapPublisherRequestDetails dmaapPublisherRequestDetails = new ImmutableDmaapPublisherRequestDetails.Builder() - .dmaapAPIPath("events").jsonBody(gson.toJson(consumerDmaapModel)).build(); - return dmaapProducerHttpClient.getHttpProducerResponse(dmaapPublisherRequestDetails) - .filter(x -> !x.isEmpty() && x.equals(String.valueOf(HttpStatus.OK.value()))) - .orElseThrow(() -> new DmaapNotFoundException("Incorrect response from Dmmap")); + resolveConfiguration()); + return dmaapProducerHttpClient.getHttpProducerResponse(consumerDmaapModel) + .filter(x -> !x.isEmpty() && x.equals(String.valueOf(HttpStatus.OK.value()))) + .orElseThrow(() -> new DmaapNotFoundException("Incorrect response from Dmaap")); } @Override @@ -82,4 +78,4 @@ public class DmaapPublisherTaskImpl extends protected DmaapPublisherConfiguration resolveConfiguration() { return prhAppConfig.getDmaapPublisherConfiguration(); } -} +}
\ 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 84c75e08..07c0a58a 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 @@ -25,9 +25,6 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import java.time.LocalDateTime; -import java.time.format.DateTimeFormatter; - /** * @author <a href="mailto:przemyslaw.wasala@nokia.com">Przemysław Wąsala</a> on 3/23/18 */ @@ -39,15 +36,13 @@ public class ScheduledTasks { private final Task dmaapConsumerTask; private final Task dmaapProducerTask; private final Task aaiProducerTask; - private final Task aaiConsumerTask; @Autowired public ScheduledTasks(DmaapConsumerTask dmaapConsumerTask, DmaapPublisherTask dmaapPublisherTask, - AAIProducerTask aaiPublisherTask, AAIConsumerTask aaiConsumerTask) { + AAIProducerTask aaiPublisherTask) { this.dmaapConsumerTask = dmaapConsumerTask; this.dmaapProducerTask = dmaapPublisherTask; this.aaiProducerTask = aaiPublisherTask; - this.aaiConsumerTask = aaiConsumerTask; } public void scheduleMainPrhEventTask() { @@ -64,8 +59,6 @@ public class ScheduledTasks { private void setTaskExecutionFlow() { dmaapConsumerTask.setNext(aaiProducerTask); - aaiProducerTask.setNext(aaiConsumerTask); - aaiConsumerTask.setNext(dmaapProducerTask); + aaiProducerTask.setNext(dmaapProducerTask); } - } 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 a9b10d40..97202146 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 @@ -20,7 +20,6 @@ package org.onap.dcaegen2.services.prh.tasks; import org.onap.dcaegen2.services.prh.exceptions.PrhTaskException; -import org.springframework.http.ResponseEntity; /** * @author <a href="mailto:przemyslaw.wasala@nokia.com">Przemysław Wąsala</a> on 4/13/18 |