From 961af3e21239edd4714e7e586ed5db902bd85d53 Mon Sep 17 00:00:00 2001
From: wasala <przemyslaw.wasala@nokia.com>
Date: Tue, 27 Mar 2018 13:02:10 +0200
Subject: Added U&IT tests in prh module

We have already added tests in our Module.
In addition some dependencies were added too.
Clean up in pom.xml files

Change-Id: I4217d585293f48f2f00870d147807bb1d5b2b33f
Issue-ID: DCAEGEN2-407
Signed-off-by: wasala <przemyslaw.wasala@nokia.com>
---
 .../java/org/onap/dcaegen2/services/prh/MainApp.java     |  1 -
 .../dcaegen2/services/prh/tasks/DmaapConsumerTask.java   | 15 ++++++++++++++-
 .../onap/dcaegen2/services/prh/tasks/ScheduledTask.java  |  9 +++++----
 prh-app-server/src/main/resources/scheduled-context.xml  | 16 ++++++++++++++++
 4 files changed, 35 insertions(+), 6 deletions(-)
 create mode 100644 prh-app-server/src/main/resources/scheduled-context.xml

(limited to 'prh-app-server/src/main')

diff --git a/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/MainApp.java b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/MainApp.java
index ebdf1bb4..b66af993 100644
--- a/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/MainApp.java
+++ b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/MainApp.java
@@ -33,7 +33,6 @@ import org.springframework.scheduling.annotation.EnableScheduling;
 @ComponentScan
 @EnableScheduling
 public class MainApp {
-
     public static void main(String[] args) {
         SpringApplication.run(MainApp.class, args);
     }
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 0d7ec225..91ed6024 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
@@ -39,7 +39,20 @@ public class DmaapConsumerTask implements DmaapTask {
         logger.info("Start task DmaapConsumerTask::execute() :: Execution Time - {}", dateTimeFormatter.format(
             LocalDateTime.now()));
         //TODO: ADD implementation for executing request to consume topic from dmaap
-
+        //DmappConsumerRunner dmappConsumerRunner = consumer.play()
+        //if(dmappConsumerRunner != null){
+          //AAIProcess aaiProcess = new AAiPRocess(dmappConsumerRunner)
+        /*
+        try{
+        aaiProcess.Execute()
+        }
+        catch(Exception e(){
+            Log
+            return
+        }
+        DmaapConsumerPost post;
+        */
+        //}
         logger.info("End task DmaapConsumerTask::execute() :: Execution Time - {}",
             dateTimeFormatter.format(LocalDateTime.now()));
     }
diff --git a/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/ScheduledTask.java b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/ScheduledTask.java
index 006d44ea..5ed3c8c0 100644
--- a/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/ScheduledTask.java
+++ b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/ScheduledTask.java
@@ -34,25 +34,26 @@ import org.springframework.stereotype.Component;
 @Component
 public class ScheduledTask {
 
-    private static final int FIXED_DELAY = 1000;
+    private static final int SCHEDULING_DELAY = 1000;
     private static final Logger logger = LoggerFactory.getLogger(ScheduledTask.class);
     private static final DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("HH:mm:ss");
 
     private final DmaapTask dmaapConsumerTask;
 
     @Autowired
-    public ScheduledTask(DmaapConsumerTask dmaapConsumerTask) {
+    public ScheduledTask(DmaapTask dmaapConsumerTask) {
         this.dmaapConsumerTask = dmaapConsumerTask;
     }
 
 
-    @Scheduled(fixedDelay = FIXED_DELAY)
+    @Scheduled(fixedDelay = SCHEDULING_DELAY)
     public void scheduledTaskAskingDMaaPOfConsumeEvent() {
         logger.info("Task scheduledTaskAskingDMaaPOfConsumeEvent() :: Execution Time - {}", dateTimeFormatter.format(
             LocalDateTime.now()));
         try {
             dmaapConsumerTask.execute();
-        } catch (AAINotFoundException e) {
+
+        } catch (AAINotFoundException | RuntimeException e) {
             logger.warn("Task scheduledTaskAskingDMaaPOfConsumeEvent()::AAINotFoundException :: Execution Time - {}:{}",
                 dateTimeFormatter.format(
                     LocalDateTime.now()), e.getMessage());
diff --git a/prh-app-server/src/main/resources/scheduled-context.xml b/prh-app-server/src/main/resources/scheduled-context.xml
new file mode 100644
index 00000000..1c60df8b
--- /dev/null
+++ b/prh-app-server/src/main/resources/scheduled-context.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xmlns:task="http://www.springframework.org/schema/task"
+  xmlns:context="http://www.springframework.org/schema/context"
+  xsi:schemaLocation="http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task-4.0.xsd
+		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.0.xsd">
+
+  <context:component-scan
+    base-package="org.onap.dcaegen2.services.prh"/>
+  <task:scheduled-tasks>
+    <task:scheduled ref="scheduledTask" method="scheduledTaskAskingDMaaPOfConsumeEvent"
+      fixed-rate="1000"/>
+  </task:scheduled-tasks>
+</beans>
-- 
cgit 1.2.3-korg