From 9292dd2aa89214957fc72980f58026324ca75a4f Mon Sep 17 00:00:00 2001 From: wasala Date: Wed, 28 Mar 2018 19:04:20 +0200 Subject: Already fixed Sonar issues We have fixed Sonar issue with critical and minor tag Change-Id: Iccc343654686ba87f71d57382b68ddf9c54caeea Issue-ID: DCAEGEN2-407 Signed-off-by: wasala --- pom.xml | 2 +- prh-aai-client/pom.xml | 2 +- .../src/main/java/services/config/AAIConfig.java | 2 +- .../config/AAIDmaapProducerConfiguration.java | 2 +- prh-app-server/pom.xml | 19 +++++++ .../org/onap/dcaegen2/services/prh/MainApp.java | 2 +- .../prh/exceptions/AAINotFoundException.java | 2 +- .../services/prh/tasks/DmaapConsumerTask.java | 2 +- .../dcaegen2/services/prh/tasks/DmaapTask.java | 3 +- .../dcaegen2/services/prh/tasks/ScheduledTask.java | 12 ++--- .../prh/tasks/ScheduledXmlContextITest.java | 15 +++++- prh-dmaap-client/pom.xml | 2 +- .../onap/dcaegen2/services/config/DmaapConfig.java | 2 +- .../config/DmaapConsumerConfiguration.java | 44 +++++++--------- .../services/config/DmaapCustomConfig.java | 60 ++++++++++++++++++++++ .../config/DmaapProducerConfiguration.java | 31 ++++------- 16 files changed, 137 insertions(+), 65 deletions(-) create mode 100644 prh-dmaap-client/src/main/java/org/onap/dcaegen2/services/config/DmaapCustomConfig.java diff --git a/pom.xml b/pom.xml index 8abf8425..8f9e7cb4 100644 --- a/pom.xml +++ b/pom.xml @@ -1,7 +1,7 @@ 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 b66af993..18db4082 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 @@ -1,6 +1,6 @@ /*- * ============LICENSE_START======================================================= - * PROJECT + * PNF-REGISTRATION-HANDLER * ================================================================================ * Copyright (C) 2018 NOKIA Intellectual Property. All rights reserved. * ================================================================================ diff --git a/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/exceptions/AAINotFoundException.java b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/exceptions/AAINotFoundException.java index 22dd24bd..e54d158e 100644 --- a/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/exceptions/AAINotFoundException.java +++ b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/exceptions/AAINotFoundException.java @@ -1,6 +1,6 @@ /*- * ============LICENSE_START======================================================= - * PROJECT + * PNF-REGISTRATION-HANDLER * ================================================================================ * Copyright (C) 2018 NOKIA Intellectual Property. All rights reserved. * ================================================================================ 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 cb2d1331..0762fc81 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 @@ -1,6 +1,6 @@ /*- * ============LICENSE_START======================================================= - * PROJECT + * PNF-REGISTRATION-HANDLER * ================================================================================ * Copyright (C) 2018 NOKIA Intellectual Property. All rights reserved. * ================================================================================ diff --git a/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/DmaapTask.java b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/DmaapTask.java index f5f8c284..0032a3e1 100644 --- a/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/DmaapTask.java +++ b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/DmaapTask.java @@ -1,6 +1,6 @@ /*- * ============LICENSE_START======================================================= - * PROJECT + * PNF-REGISTRATION-HANDLER * ================================================================================ * Copyright (C) 2018 NOKIA Intellectual Property. All rights reserved. * ================================================================================ @@ -24,6 +24,7 @@ import org.onap.dcaegen2.services.prh.exceptions.AAINotFoundException; /** * @author Przemysław Wąsala on 3/23/18 */ +@FunctionalInterface public interface DmaapTask { void execute() throws AAINotFoundException; 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 a3a48b79..277bc707 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 @@ -1,6 +1,6 @@ /*- * ============LICENSE_START======================================================= - * PROJECT + * PNF-REGISTRATION-HANDLER * ================================================================================ * Copyright (C) 2018 NOKIA Intellectual Property. All rights reserved. * ================================================================================ @@ -52,11 +52,11 @@ public class ScheduledTask { LocalDateTime.now())); try { dmaapConsumerTask.execute(); - - } catch (AAINotFoundException | RuntimeException e) { - logger.warn("Task scheduledTaskAskingDMaaPOfConsumeEvent()::AAINotFoundException :: Execution Time - {}:{}", - dateTimeFormatter.format( - LocalDateTime.now()), e.getMessage()); + } catch (AAINotFoundException e) { + logger + .error("Task scheduledTaskAskingDMaaPOfConsumeEvent()::AAINotFoundException :: Execution Time - {}:{}", + dateTimeFormatter.format( + LocalDateTime.now()), e.getMessage()); } } diff --git a/prh-app-server/src/test/java/org/onap/dcaegen2/services/prh/tasks/ScheduledXmlContextITest.java b/prh-app-server/src/test/java/org/onap/dcaegen2/services/prh/tasks/ScheduledXmlContextITest.java index 14e83c62..7a3fac63 100644 --- a/prh-app-server/src/test/java/org/onap/dcaegen2/services/prh/tasks/ScheduledXmlContextITest.java +++ b/prh-app-server/src/test/java/org/onap/dcaegen2/services/prh/tasks/ScheduledXmlContextITest.java @@ -22,6 +22,11 @@ package org.onap.dcaegen2.services.prh.tasks; import static org.mockito.Mockito.atLeast; import static org.mockito.Mockito.verify; +import java.time.Duration; +import java.util.concurrent.Callable; +import java.util.concurrent.Executors; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.TimeUnit; import org.junit.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.junit.runner.RunWith; @@ -44,7 +49,7 @@ import org.springframework.test.context.testng.AbstractTestNGSpringContextTests; @ContextConfiguration(locations = {"classpath:scheduled-context.xml"}) public class ScheduledXmlContextITest extends AbstractTestNGSpringContextTests { - private static final int WAIT_FOR_SCHEDULING = 1000; + private static final int WAIT_FOR_SCHEDULING = 1; @Autowired private DmaapConsumerTask dmaapConsumerTaskSpy; @@ -52,9 +57,15 @@ public class ScheduledXmlContextITest extends AbstractTestNGSpringContextTests { @Test public void testScheduling() throws InterruptedException { - Thread.sleep(WAIT_FOR_SCHEDULING); + final ScheduledExecutorService executorService = Executors.newSingleThreadScheduledExecutor(); + executorService.scheduleWithFixedDelay(this::verifyDmaapConsumerTask, 0, WAIT_FOR_SCHEDULING, TimeUnit.SECONDS); + } + + private void verifyDmaapConsumerTask() { verify(dmaapConsumerTaskSpy, atLeast(2)).execute(); } + + } diff --git a/prh-dmaap-client/pom.xml b/prh-dmaap-client/pom.xml index 080a6f1b..8754b0af 100644 --- a/prh-dmaap-client/pom.xml +++ b/prh-dmaap-client/pom.xml @@ -1,7 +1,7 @@