From 961af3e21239edd4714e7e586ed5db902bd85d53 Mon Sep 17 00:00:00 2001 From: wasala 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 --- pom.xml | 181 +++++++++++++++------ prh-aai-client/pom.xml | 77 ++++++++- .../src/main/java/services/config/AAIConfig.java | 29 ++++ .../config/AAIDmaapProducerConfiguration.java | 30 +++- .../src/main/java/services/config/Config.java | 29 ---- .../src/main/java/services/config/DmaapConfig.java | 34 ---- prh-app-server/pom.xml | 65 +++++++- .../org/onap/dcaegen2/services/prh/MainApp.java | 1 - .../services/prh/tasks/DmaapConsumerTask.java | 15 +- .../dcaegen2/services/prh/tasks/ScheduledTask.java | 9 +- .../src/main/resources/scheduled-context.xml | 16 ++ .../prh/IT/junit5/mockito/MockitoExtension.java | 82 ++++++++++ .../dcaegen2/services/prh/ServerPrhAppTest.java | 31 ---- .../services/prh/tasks/DmaapConsumerTaskSpy.java | 39 +++++ .../prh/tasks/ScheduledXmlContextITest.java | 60 +++++++ prh-dmaap-client/pom.xml | 73 +++++++++ .../org/onap/dcaegen2/services/config/Config.java | 29 ---- .../onap/dcaegen2/services/config/DmaapConfig.java | 11 +- .../config/DmaapConsumerConfiguration.java | 38 ++++- .../config/DmaapProducerConfiguration.java | 26 ++- 20 files changed, 666 insertions(+), 209 deletions(-) create mode 100644 prh-aai-client/src/main/java/services/config/AAIConfig.java delete mode 100644 prh-aai-client/src/main/java/services/config/Config.java delete mode 100644 prh-aai-client/src/main/java/services/config/DmaapConfig.java create mode 100644 prh-app-server/src/main/resources/scheduled-context.xml create mode 100644 prh-app-server/src/test/java/org/onap/dcaegen2/services/prh/IT/junit5/mockito/MockitoExtension.java delete mode 100644 prh-app-server/src/test/java/org/onap/dcaegen2/services/prh/ServerPrhAppTest.java create mode 100644 prh-app-server/src/test/java/org/onap/dcaegen2/services/prh/tasks/DmaapConsumerTaskSpy.java create mode 100644 prh-app-server/src/test/java/org/onap/dcaegen2/services/prh/tasks/ScheduledXmlContextITest.java delete mode 100644 prh-dmaap-client/src/main/java/org/onap/dcaegen2/services/config/Config.java diff --git a/pom.xml b/pom.xml index 3b17ffa0..e334c004 100644 --- a/pom.xml +++ b/pom.xml @@ -1,6 +1,27 @@ + + + 4.0.0 org.onap.oparent @@ -27,15 +48,25 @@ UTF-8 UTF-8 - + 8 3.7.0 + + + + 2.5.6 + + + 1.7.25 + 1.2.3 + + + true 4.12 5.1.0 5.1.0 1.1.0 - - true + false https://nexus.onap.org @@ -67,50 +98,6 @@ - - - org.immutables - value - 2.5.6 - - - - - - - - org.junit.jupiter - junit-jupiter-api - ${junit.jupiter.version} - test - - - junit - junit - ${junit.version} - test - - - org.junit.jupiter - junit-jupiter-engine - ${junit.jupiter.version} - test - - - org.junit.vintage - junit-vintage-engine - ${junit.vintage.version} - test - - - - org.junit.platform - junit-platform-launcher - ${junit.platform.version} - test - - - @@ -208,13 +195,6 @@ - - - org.apache.maven.plugins - maven-antrun-plugin - 1.8 - - org.apache.maven.plugins @@ -406,6 +386,99 @@ + + + + + + org.immutables + value + ${immutable.version} + provided + + + + + org.slf4j + slf4j-api + ${slf4j.version} + provided + + + ch.qos.logback + logback-core + ${logback.version} + provided + + + ch.qos.logback + logback-classic + ${logback.version} + provided + + + + + org.junit.jupiter + junit-jupiter-api + ${junit.jupiter.version} + test + + + junit + junit + ${junit.version} + test + + + org.junit.jupiter + junit-jupiter-engine + ${junit.jupiter.version} + test + + + org.junit.vintage + junit-vintage-engine + ${junit.vintage.version} + test + + + org.springframework + spring-test + 5.0.4.RELEASE + test + + + org.mockito + mockito-core + 2.16.0 + test + + + org.testng + testng + 6.14.2 + test + + + org.springframework.boot + spring-boot-starter-test + 2.0.0.RELEASE + test + + + + + + org.junit.platform + junit-platform-launcher + ${junit.platform.version} + test + + + + + prh-app-server prh-aai-client diff --git a/prh-aai-client/pom.xml b/prh-aai-client/pom.xml index 5ac67ce8..8efa0a35 100644 --- a/prh-aai-client/pom.xml +++ b/prh-aai-client/pom.xml @@ -1,14 +1,89 @@ + + 4.0.0 + prh org.onap.dcaegen2.services 1.0.0-SNAPSHOT - 4.0.0 prh-aai-client + org.onap.dcaegen2.services.prh + jar + + + + ${project.parent.basedir} + + + + + + + org.immutables + value + + + + + org.slf4j + slf4j-api + + + + ch.qos.logback + logback-core + + + + ch.qos.logback + logback-classic + + + + + org.junit.jupiter + junit-jupiter-api + test + + + junit + junit + test + + + org.junit.jupiter + junit-jupiter-engine + test + + + org.junit.vintage + junit-vintage-engine + test + + + \ No newline at end of file diff --git a/prh-aai-client/src/main/java/services/config/AAIConfig.java b/prh-aai-client/src/main/java/services/config/AAIConfig.java new file mode 100644 index 00000000..5d98b6ce --- /dev/null +++ b/prh-aai-client/src/main/java/services/config/AAIConfig.java @@ -0,0 +1,29 @@ +/*- + * ============LICENSE_START======================================================= + * PROJECT + * ================================================================================ + * Copyright (C) 2018 NOKIA Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ +package services.config; + +import java.io.Serializable; + +/** + * @author Przemysław Wąsala on 3/23/18 + */ +interface AAIConfig extends Serializable { + +} diff --git a/prh-aai-client/src/main/java/services/config/AAIDmaapProducerConfiguration.java b/prh-aai-client/src/main/java/services/config/AAIDmaapProducerConfiguration.java index 396a78be..a7b0aac6 100644 --- a/prh-aai-client/src/main/java/services/config/AAIDmaapProducerConfiguration.java +++ b/prh-aai-client/src/main/java/services/config/AAIDmaapProducerConfiguration.java @@ -27,15 +27,29 @@ import org.immutables.value.Value; */ @Value.Immutable(prehash = true) @Value.Style(stagedBuilder = true) -public abstract class AAIDmaapProducerConfiguration extends DmaapConfig { +public abstract class AAIDmaapProducerConfiguration implements AAIConfig { private static final long serialVersionUID = 1L; - private String aaiHost; - private Integer aaiHostPortNumber; - private String aaiProtocol; - private String aaiUserName; - private String aaiUserPassword; - private URL aaiProxyURL; - private boolean aaiIgnoreSSLCertificateErrors; + @Value.Parameter + public abstract String aaiHost(); + + @Value.Parameter + public abstract Integer aaiHostPortNumber(); + + @Value.Parameter + public abstract String aaiProtocol(); + + @Value.Parameter + public abstract String aaiUserName(); + + @Value.Parameter + public abstract String aaiUserPassword(); + + @Value.Parameter + public abstract URL aaiProxyURL(); + + @Value.Parameter + public abstract boolean aaiIgnoreSSLCertificateErrors(); + } diff --git a/prh-aai-client/src/main/java/services/config/Config.java b/prh-aai-client/src/main/java/services/config/Config.java deleted file mode 100644 index a2a012c5..00000000 --- a/prh-aai-client/src/main/java/services/config/Config.java +++ /dev/null @@ -1,29 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * PROJECT - * ================================================================================ - * Copyright (C) 2018 NOKIA Intellectual Property. All rights reserved. - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END========================================================= - */ -package services.config; - -import java.io.Serializable; - -/** - * @author Przemysław Wąsala on 3/23/18 - */ -interface Config extends Serializable { - -} diff --git a/prh-aai-client/src/main/java/services/config/DmaapConfig.java b/prh-aai-client/src/main/java/services/config/DmaapConfig.java deleted file mode 100644 index 0ddaea28..00000000 --- a/prh-aai-client/src/main/java/services/config/DmaapConfig.java +++ /dev/null @@ -1,34 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * PROJECT - * ================================================================================ - * Copyright (C) 2018 NOKIA Intellectual Property. All rights reserved. - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END========================================================= - */ -package services.config; - -/** - * @author Przemysław Wąsala on 3/23/18 - */ -public abstract class DmaapConfig implements Config { - - private String dmmaphostName; - private Integer dmmapportNumber; - private String dmmaptopicName; - private String dmmapprotocol; - private String dmmapuserName; - private String dmmapuserPassword; - private String dmmapcontentType; -} diff --git a/prh-app-server/pom.xml b/prh-app-server/pom.xml index 513b5118..a03e27f3 100644 --- a/prh-app-server/pom.xml +++ b/prh-app-server/pom.xml @@ -10,6 +10,7 @@ 4.0.0 prh-app-server + org.onap.dcaegen2.services.prh jar @@ -25,7 +26,8 @@ - + + org.springframework.boot spring-boot-starter-web @@ -34,17 +36,74 @@ org.springframework.boot spring-boot-starter-webflux + + + + org.slf4j + slf4j-api + + + + ch.qos.logback + logback-core + + + + ch.qos.logback + logback-classic + + + org.junit.platform junit-platform-commons RELEASE - + + org.junit.jupiter + junit-jupiter-api + test + + + junit + junit + test + + + org.junit.jupiter + junit-jupiter-engine + test + + + org.junit.vintage + junit-vintage-engine + test + + + org.springframework + spring-test + test + + + org.springframework.boot + spring-boot-starter-test + test + + + org.mockito + mockito-core + test + + + org.testng + testng + + - + org.springframework.boot spring-boot-dependencies 2.0.0.RELEASE 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 @@ + + + + + + + + diff --git a/prh-app-server/src/test/java/org/onap/dcaegen2/services/prh/IT/junit5/mockito/MockitoExtension.java b/prh-app-server/src/test/java/org/onap/dcaegen2/services/prh/IT/junit5/mockito/MockitoExtension.java new file mode 100644 index 00000000..c1e2d752 --- /dev/null +++ b/prh-app-server/src/test/java/org/onap/dcaegen2/services/prh/IT/junit5/mockito/MockitoExtension.java @@ -0,0 +1,82 @@ +/*- + * ============LICENSE_START======================================================= + * PROJECT + * ================================================================================ + * Copyright (C) 2018 NOKIA Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ +package org.onap.dcaegen2.services.prh.IT.junit5.mockito; + +import static org.mockito.Mockito.mock; + +import java.lang.reflect.Parameter; + +import org.junit.jupiter.api.extension.ExtensionContext; +import org.junit.jupiter.api.extension.ExtensionContext.Namespace; +import org.junit.jupiter.api.extension.ExtensionContext.Store; +import org.junit.jupiter.api.extension.ParameterContext; +import org.junit.jupiter.api.extension.ParameterResolver; +import org.junit.jupiter.api.extension.TestInstancePostProcessor; +import org.mockito.MockitoAnnotations; +import org.mockito.Mock; + +/** + * @author Przemysław Wąsala on 3/27/18 + * + * {@code MockitoExtension} showcases the {@link TestInstancePostProcessor} and {@link ParameterResolver} extension APIs + * of JUnit 5 by providing dependency injection support at the field level and at the method parameter level via Mockito + * 2.x's {@link Mock @Mock} annotation. + */ +public class MockitoExtension implements TestInstancePostProcessor, ParameterResolver { + + @Override + public void postProcessTestInstance(Object testInstance, ExtensionContext context) { + MockitoAnnotations.initMocks(testInstance); + } + + @Override + public boolean supportsParameter(ParameterContext parameterContext, ExtensionContext extensionContext) { + return parameterContext.getParameter().isAnnotationPresent(Mock.class); + } + + @Override + public Object resolveParameter(ParameterContext parameterContext, ExtensionContext extensionContext) { + return getMock(parameterContext.getParameter(), extensionContext); + } + + private Object getMock(Parameter parameter, ExtensionContext extensionContext) { + Class mockType = parameter.getType(); + Store mocks = extensionContext.getStore(Namespace.create(MockitoExtension.class, mockType)); + String mockName = getMockName(parameter); + + if (mockName != null) { + return mocks.getOrComputeIfAbsent(mockName, key -> mock(mockType, mockName)); + } else { + return mocks.getOrComputeIfAbsent(mockType.getCanonicalName(), key -> mock(mockType)); + } + } + + private String getMockName(Parameter parameter) { + String explicitMockName = parameter.getAnnotation(Mock.class).name().trim(); + if (!explicitMockName.isEmpty()) { + return explicitMockName; + } else if (parameter.isNamePresent()) { + return parameter.getName(); + } + return null; + } + + +} diff --git a/prh-app-server/src/test/java/org/onap/dcaegen2/services/prh/ServerPrhAppTest.java b/prh-app-server/src/test/java/org/onap/dcaegen2/services/prh/ServerPrhAppTest.java deleted file mode 100644 index 4373a50d..00000000 --- a/prh-app-server/src/test/java/org/onap/dcaegen2/services/prh/ServerPrhAppTest.java +++ /dev/null @@ -1,31 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * PROJECT - * ================================================================================ - * Copyright (C) 2018 NOKIA Intellectual Property. All rights reserved. - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END========================================================= - */ - -package org.onap.dcaegen2.services.prh; - -import org.junit.jupiter.api.Test; - -class MainAppTest { - - @Test - void justAnExample() { - System.out.println("This test method should be run"); - } -} \ No newline at end of file diff --git a/prh-app-server/src/test/java/org/onap/dcaegen2/services/prh/tasks/DmaapConsumerTaskSpy.java b/prh-app-server/src/test/java/org/onap/dcaegen2/services/prh/tasks/DmaapConsumerTaskSpy.java new file mode 100644 index 00000000..aa5e052e --- /dev/null +++ b/prh-app-server/src/test/java/org/onap/dcaegen2/services/prh/tasks/DmaapConsumerTaskSpy.java @@ -0,0 +1,39 @@ +/*- + * ============LICENSE_START======================================================= + * PROJECT + * ================================================================================ + * Copyright (C) 2018 NOKIA Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ +package org.onap.dcaegen2.services.prh.tasks; + +import static org.mockito.Mockito.spy; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Primary; + +/** + * @author Przemysław Wąsala on 3/27/18 + */ +@Configuration +public class DmaapConsumerTaskSpy { + + @Bean + @Primary + public DmaapConsumerTask registerSimpleDmaapConsumerTask() { + return spy(new DmaapConsumerTask()); + } +} 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 new file mode 100644 index 00000000..14e83c62 --- /dev/null +++ b/prh-app-server/src/test/java/org/onap/dcaegen2/services/prh/tasks/ScheduledXmlContextITest.java @@ -0,0 +1,60 @@ +/*- + * ============LICENSE_START======================================================= + * PROJECT + * ================================================================================ + * Copyright (C) 2018 NOKIA Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ +package org.onap.dcaegen2.services.prh.tasks; + +import static org.mockito.Mockito.atLeast; +import static org.mockito.Mockito.verify; + +import org.junit.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.junit.runner.RunWith; +import org.onap.dcaegen2.services.prh.IT.junit5.mockito.MockitoExtension; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.ComponentScan; +import org.springframework.context.annotation.Configuration; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit4.SpringRunner; +import org.springframework.test.context.testng.AbstractTestNGSpringContextTests; + +/** + * @author Przemysław Wąsala on 3/27/18 + */ + +@Configuration +@ComponentScan +@RunWith(SpringRunner.class) +@ExtendWith(MockitoExtension.class) +@ContextConfiguration(locations = {"classpath:scheduled-context.xml"}) +public class ScheduledXmlContextITest extends AbstractTestNGSpringContextTests { + + private static final int WAIT_FOR_SCHEDULING = 1000; + + @Autowired + private DmaapConsumerTask dmaapConsumerTaskSpy; + + + @Test + public void testScheduling() throws InterruptedException { + Thread.sleep(WAIT_FOR_SCHEDULING); + verify(dmaapConsumerTaskSpy, atLeast(2)).execute(); + } +} + + diff --git a/prh-dmaap-client/pom.xml b/prh-dmaap-client/pom.xml index 68170645..e3efc20c 100644 --- a/prh-dmaap-client/pom.xml +++ b/prh-dmaap-client/pom.xml @@ -1,4 +1,23 @@ + @@ -10,5 +29,59 @@ 4.0.0 prh-dmaap-client + org.onap.dcaegen2.services.prh + jar + + + ${project.parent.basedir} + + + + + + + org.immutables + value + + + + + org.slf4j + slf4j-api + + + + ch.qos.logback + logback-core + + + + ch.qos.logback + logback-classic + + + + + + org.junit.jupiter + junit-jupiter-api + test + + + junit + junit + test + + + org.junit.jupiter + junit-jupiter-engine + test + + + org.junit.vintage + junit-vintage-engine + test + + \ No newline at end of file diff --git a/prh-dmaap-client/src/main/java/org/onap/dcaegen2/services/config/Config.java b/prh-dmaap-client/src/main/java/org/onap/dcaegen2/services/config/Config.java deleted file mode 100644 index 422f3daf..00000000 --- a/prh-dmaap-client/src/main/java/org/onap/dcaegen2/services/config/Config.java +++ /dev/null @@ -1,29 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * PROJECT - * ================================================================================ - * Copyright (C) 2018 NOKIA Intellectual Property. All rights reserved. - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END========================================================= - */ -package org.onap.dcaegen2.services.config; - -import java.io.Serializable; - -/** - * @author Przemysław Wąsala on 3/23/18 - */ -interface Config extends Serializable { - -} diff --git a/prh-dmaap-client/src/main/java/org/onap/dcaegen2/services/config/DmaapConfig.java b/prh-dmaap-client/src/main/java/org/onap/dcaegen2/services/config/DmaapConfig.java index 3b485cdb..0d77c057 100644 --- a/prh-dmaap-client/src/main/java/org/onap/dcaegen2/services/config/DmaapConfig.java +++ b/prh-dmaap-client/src/main/java/org/onap/dcaegen2/services/config/DmaapConfig.java @@ -19,16 +19,11 @@ */ package org.onap.dcaegen2.services.config; +import java.io.Serializable; + /** * @author Przemysław Wąsala on 3/23/18 */ -public abstract class DmaapConfig implements Config { +interface DmaapConfig extends Serializable { - private String dmmaphostName; - private Integer dmmapportNumber; - private String dmmaptopicName; - private String dmmapprotocol; - private String dmmapuserName; - private String dmmapuserPassword; - private String dmmapcontentType; } diff --git a/prh-dmaap-client/src/main/java/org/onap/dcaegen2/services/config/DmaapConsumerConfiguration.java b/prh-dmaap-client/src/main/java/org/onap/dcaegen2/services/config/DmaapConsumerConfiguration.java index d36104bd..f2a2f061 100644 --- a/prh-dmaap-client/src/main/java/org/onap/dcaegen2/services/config/DmaapConsumerConfiguration.java +++ b/prh-dmaap-client/src/main/java/org/onap/dcaegen2/services/config/DmaapConsumerConfiguration.java @@ -26,12 +26,40 @@ import org.immutables.value.Value; */ @Value.Immutable(prehash = true) @Value.Style(stagedBuilder = true) -public abstract class DmaapConsumerConfiguration extends DmaapConfig { +public abstract class DmaapConsumerConfiguration implements DmaapConfig { private static final long serialVersionUID = 1L; - private String consumerId; - private String consumerGroup; - private Integer timeoutMS; - private Integer messageLimit; + @Value.Parameter + public abstract String consumerId(); + + @Value.Parameter + public abstract String consumerGroup(); + + @Value.Parameter + public abstract Integer timeoutMS(); + + @Value.Parameter + public abstract Integer messageLimit(); + + @Value.Parameter + public abstract String dmmaphostName(); + + @Value.Parameter + public abstract Integer dmmapportNumber(); + + @Value.Parameter + public abstract String dmmaptopicName(); + + @Value.Parameter + public abstract String dmmapprotocol(); + + @Value.Parameter + public abstract String dmmapuserName(); + + @Value.Parameter + public abstract String dmmapuserPassword(); + + @Value.Parameter + public abstract String dmmapcontentType(); } \ No newline at end of file diff --git a/prh-dmaap-client/src/main/java/org/onap/dcaegen2/services/config/DmaapProducerConfiguration.java b/prh-dmaap-client/src/main/java/org/onap/dcaegen2/services/config/DmaapProducerConfiguration.java index f5749a3f..a0f29e44 100644 --- a/prh-dmaap-client/src/main/java/org/onap/dcaegen2/services/config/DmaapProducerConfiguration.java +++ b/prh-dmaap-client/src/main/java/org/onap/dcaegen2/services/config/DmaapProducerConfiguration.java @@ -19,11 +19,35 @@ */ package org.onap.dcaegen2.services.config; +import org.immutables.value.Value; + /** * @author Przemysław Wąsala on 3/23/18 */ -public class DmaapProducerConfiguration extends DmaapConfig { +@Value.Immutable(prehash = true) +@Value.Style(stagedBuilder = true) +public abstract class DmaapProducerConfiguration implements DmaapConfig { private static final long serialVersionUID = 1L; + @Value.Parameter + public abstract String dmmaphostName(); + + @Value.Parameter + public abstract Integer dmmapportNumber(); + + @Value.Parameter + public abstract String dmmaptopicName(); + + @Value.Parameter + public abstract String dmmapprotocol(); + + @Value.Parameter + public abstract String dmmapuserName(); + + @Value.Parameter + public abstract String dmmapuserPassword(); + + @Value.Parameter + public abstract String dmmapcontentType(); } -- cgit 1.2.3-korg