From cd9cbc8d353e24bfff76049e187bd5f2216bf71d Mon Sep 17 00:00:00 2001 From: "adheli.tavares" Date: Mon, 4 Nov 2024 10:17:03 +0000 Subject: Fix references and organize dependencies after splitting policy-endpoints and message-bus Issue-ID: POLICY-5131 Change-Id: I7542caaccc130bc6120cc105d31a1e1e951c8cff Signed-off-by: adheli.tavares --- models-base/pom.xml | 12 ++ models-dao/pom.xml | 36 +++++ models-decisions/pom.xml | 14 +- models-errors/pom.xml | 24 ++-- models-interactions/model-actors/actor.a1p/pom.xml | 4 +- .../controlloop/actor/a1p/BasicA1pOperation.java | 4 +- models-interactions/model-actors/actor.aai/pom.xml | 66 +++++++-- .../actor/aai/AaiCustomQueryOperation.java | 18 +-- .../controlloop/actor/aai/AaiGetPnfOperation.java | 6 +- .../actor/aai/AaiGetTenantOperation.java | 6 +- .../controlloop/actor/aai/BasicAaiOperation.java | 2 +- .../model-actors/actor.appc/pom.xml | 4 +- .../controlloop/actor/appc/BasicAppcOperation.java | 4 +- .../model-actors/actor.appclcm/pom.xml | 4 +- .../actor/appclcm/AppcLcmOperationTest.java | 4 +- models-interactions/model-actors/actor.cds/pom.xml | 65 ++++++--- .../model-actors/actor.sdnc/pom.xml | 8 +- .../controlloop/actor/sdnc/SdncOperation.java | 6 +- .../controlloop/actor/sdnc/BasicSdncOperation.java | 6 +- .../model-actors/actor.sdnr/pom.xml | 9 +- .../controlloop/actor/sdnr/BasicSdnrOperation.java | 14 +- models-interactions/model-actors/actor.so/pom.xml | 8 +- .../policy/controlloop/actor/so/ModifyCll.java | 6 +- .../policy/controlloop/actor/so/ModifyNssi.java | 6 +- .../controlloop/actor/so/VfModuleCreate.java | 6 +- .../controlloop/actor/so/VfModuleDelete.java | 19 ++- .../controlloop/actor/so/BasicSoOperation.java | 8 +- .../controlloop/actor/so/VfModuleDeleteTest.java | 4 +- .../model-actors/actor.test/pom.xml | 39 +++-- .../policy/controlloop/actor/test/BasicActor.java | 6 +- .../test/BasicBidirectionalTopicOperation.java | 10 +- .../test/BasicBidirectionalTopicOperationTest.java | 4 +- models-interactions/model-actors/actor.vfc/pom.xml | 6 + .../controlloop/actor/vfc/BasicVfcOperation.java | 2 +- .../model-actors/actor.xacml/pom.xml | 8 +- .../controlloop/actor/xacml/DecisionOperation.java | 6 +- .../actor/xacml/ConfigureOperationTest.java | 28 ++-- .../actor/xacml/DecisionOperationTest.java | 26 ++-- .../actor/xacml/GuardOperationTest.java | 32 ++--- .../model-actors/actorServiceProvider/pom.xml | 60 +++++++- .../impl/BidirectionalTopicActor.java | 3 +- .../impl/BidirectionalTopicOperation.java | 3 +- .../actorserviceprovider/impl/HttpOperation.java | 8 +- .../impl/OperationPartial.java | 7 +- .../topic/BidirectionalTopicHandler.java | 5 +- .../topic/TopicListenerImpl.java | 7 +- .../impl/BidirectionalTopicActorTest.java | 4 +- .../impl/BidirectionalTopicOperationTest.java | 25 ++-- .../impl/HttpOperationTest.java | 160 ++++++++++----------- .../impl/OperationPartialTest.java | 8 +- .../topic/BidirectionalTopicHandlerTest.java | 15 +- .../topic/TopicListenerImplTest.java | 7 +- models-interactions/model-impl/aai/pom.xml | 45 +++--- .../main/java/org/onap/policy/aai/AaiManager.java | 6 +- models-interactions/model-impl/appclcm/pom.xml | 5 + models-interactions/model-impl/cds/pom.xml | 34 +++-- .../policy/cds/client/CdsProcessorHandler.java | 13 +- models-interactions/model-impl/rest/pom.xml | 27 +++- models-interactions/model-impl/sdnc/pom.xml | 11 -- models-interactions/model-impl/so/pom.xml | 16 ++- models-interactions/model-impl/vfc/pom.xml | 13 +- models-interactions/model-simulators/pom.xml | 78 +++++++++- .../onap/policy/simulators/AppcLcmTopicServer.java | 4 +- .../policy/simulators/AppcLegacyTopicServer.java | 5 +- .../onap/policy/simulators/SdnrTopicServer.java | 5 +- .../org/onap/policy/simulators/TopicServer.java | 9 +- .../policy/simulators/AppcLcmTopicServerTest.java | 6 +- .../simulators/AppcLegacyTopicServerTest.java | 6 +- .../policy/simulators/SdnrTopicServerTest.java | 6 +- .../onap/policy/simulators/TopicServerTest.java | 6 +- models-interactions/pom.xml | 62 +++++++- models-pap/pom.xml | 31 +++- models-pdp/pom.xml | 36 +++++ models-provider/pom.xml | 19 +++ models-sim/policy-models-sim-pdp/pom.xml | 5 + .../models/sim/pdp/PdpSimulatorActivator.java | 8 +- .../sim/pdp/comm/PdpStateChangeListener.java | 4 +- .../models/sim/pdp/comm/PdpStatusPublisher.java | 6 +- .../models/sim/pdp/comm/PdpUpdateListener.java | 4 +- .../sim/pdp/handler/PdpUpdateMessageHandler.java | 4 +- .../pdp/parameters/PdpSimulatorParameterGroup.java | 4 +- .../sim/pdp/comm/TestPdpStateChangeListener.java | 6 +- .../models/sim/pdp/comm/TestPdpUpdateListener.java | 8 +- .../models/sim/pdp/parameters/CommonTestData.java | 2 +- .../parameters/TestPdpSimulatorParameterGroup.java | 5 +- .../simulators/ClassRestServerParameters.java | 3 +- .../onap/policy/models/simulators/MainTest.java | 9 +- models-tosca/pom.xml | 47 +++++- 88 files changed, 955 insertions(+), 455 deletions(-) diff --git a/models-base/pom.xml b/models-base/pom.xml index 286248fab..b94563e9a 100644 --- a/models-base/pom.xml +++ b/models-base/pom.xml @@ -48,10 +48,18 @@ policy-models-errors ${project.version} + + com.google.re2j + re2j + jakarta.persistence jakarta.persistence-api + + jakarta.ws.rs + jakarta.ws.rs-api + org.apache.commons commons-lang3 @@ -60,6 +68,10 @@ org.apache.commons commons-collections4 + + org.projectlombok + lombok + org.mockito mockito-core diff --git a/models-dao/pom.xml b/models-dao/pom.xml index da32f2509..2074b0ea2 100644 --- a/models-dao/pom.xml +++ b/models-dao/pom.xml @@ -35,11 +35,45 @@ + + org.onap.policy.common + common-parameters + ${policy.common.version} + + + org.onap.policy.common + utils + ${policy.common.version} + org.onap.policy.models policy-models-base ${project.version} + + com.google.re2j + re2j + + + jakarta.persistence + jakarta.persistence-api + + + jakarta.ws.rs + jakarta.ws.rs-api + + + jakarta.xml.bind + jakarta.xml.bind-api + + + org.apache.commons + commons-lang3 + + + org.projectlombok + lombok + com.h2database h2 @@ -53,6 +87,7 @@ org.hibernate.orm hibernate-core + test org.mockito @@ -62,6 +97,7 @@ org.mockito mockito-junit-jupiter + test diff --git a/models-decisions/pom.xml b/models-decisions/pom.xml index a69e0d4ea..ef6640b76 100644 --- a/models-decisions/pom.xml +++ b/models-decisions/pom.xml @@ -37,7 +37,6 @@ org.onap.policy.common gson ${policy.common.version} - provided org.onap.policy.models @@ -50,6 +49,19 @@ ${policy.common.version} test + + com.google.code.gson + gson + provided + + + jakarta.ws.rs + jakarta.ws.rs-api + + + org.projectlombok + lombok + com.openpojo openpojo diff --git a/models-errors/pom.xml b/models-errors/pom.xml index e61bad24d..b1c9090c8 100644 --- a/models-errors/pom.xml +++ b/models-errors/pom.xml @@ -33,6 +33,18 @@ ${project.artifactId} The models for Policy API's to return Error/warning message details. + + org.onap.policy.common + utils + ${policy.common.version} + test + + + org.onap.policy.common + utils-test + ${policy.common.version} + test + com.google.code.gson gson @@ -48,18 +60,6 @@ jakarta.ws.rs-api provided - - org.onap.policy.common - utils - ${policy.common.version} - test - - - org.onap.policy.common - utils-test - ${policy.common.version} - test - org.assertj assertj-core diff --git a/models-interactions/model-actors/actor.a1p/pom.xml b/models-interactions/model-actors/actor.a1p/pom.xml index 347366184..e7cee3afa 100644 --- a/models-interactions/model-actors/actor.a1p/pom.xml +++ b/models-interactions/model-actors/actor.a1p/pom.xml @@ -2,7 +2,7 @@ org.onap.ccsdk.cds.blueprintsprocessor.modules blueprint-proto + provided + + + io.grpc + grpc-core + + + io.grpc + grpc-stub + + + io.grpc + grpc-api + + + io.grpc + grpc-netty io.grpc grpc-testing - ${grpc.version} - test @@ -59,13 +70,16 @@ org.onap.policy.common - policy-endpoints + message-bus ${policy.common.version} - org.onap.policy.common - utils - ${policy.common.version} + org.projectlombok + lombok + + + com.google.guava + guava org.assertj diff --git a/models-interactions/model-impl/cds/src/main/java/org/onap/policy/cds/client/CdsProcessorHandler.java b/models-interactions/model-impl/cds/src/main/java/org/onap/policy/cds/client/CdsProcessorHandler.java index 6c4d6caab..018deda68 100644 --- a/models-interactions/model-impl/cds/src/main/java/org/onap/policy/cds/client/CdsProcessorHandler.java +++ b/models-interactions/model-impl/cds/src/main/java/org/onap/policy/cds/client/CdsProcessorHandler.java @@ -1,8 +1,9 @@ /*- - * ============LICENSE_START======================================================= + * ============LICENSE_START============================================================= * Copyright (C) 2019-2021 Bell Canada. * Modifications Copyright (C) 2020-2021 AT&T Intellectual Property. All rights reserved. - * ================================================================================ + * Modifications Copyright (C) 2024 Nordix Foundation. + * ====================================================================================== * 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 @@ -28,9 +29,9 @@ import org.onap.ccsdk.cds.controllerblueprints.processing.api.BluePrintProcessin import org.onap.ccsdk.cds.controllerblueprints.processing.api.ExecutionServiceInput; import org.onap.ccsdk.cds.controllerblueprints.processing.api.ExecutionServiceOutput; import org.onap.policy.cds.api.CdsProcessorListener; -import org.onap.policy.common.endpoints.event.comm.Topic.CommInfrastructure; -import org.onap.policy.common.endpoints.utils.NetLoggerUtil; -import org.onap.policy.common.endpoints.utils.NetLoggerUtil.EventType; +import org.onap.policy.common.message.bus.event.Topic.CommInfrastructure; +import org.onap.policy.common.message.bus.utils.NetLoggerUtil; +import org.onap.policy.common.message.bus.utils.NetLoggerUtil.EventType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -59,7 +60,7 @@ public class CdsProcessorHandler { @Override public void onError(Throwable throwable) { LOGGER.info(LOG_MSG, EventType.IN, CommInfrastructure.REST, url, NetLoggerUtil.SYSTEM_LS, - throwable); + throwable.getMessage()); listener.onError(throwable); finishLatch.countDown(); } diff --git a/models-interactions/model-impl/rest/pom.xml b/models-interactions/model-impl/rest/pom.xml index a249ebba7..f882fc4f2 100644 --- a/models-interactions/model-impl/rest/pom.xml +++ b/models-interactions/model-impl/rest/pom.xml @@ -38,15 +38,33 @@ utils ${policy.common.version} + + org.onap.policy.common + policy-endpoints + ${policy.common.version} + test + com.google.code.gson gson provided + + jakarta.xml.bind + jakarta.xml.bind-api + + + jakarta.ws.rs + jakarta.ws.rs-api + org.apache.httpcomponents httpclient + + org.apache.httpcomponents + httpcore + org.apache.commons commons-lang3 @@ -55,21 +73,16 @@ org.glassfish.jersey.inject jersey-hk2 ${version.jersey} + runtime org.glassfish.jaxb jaxb-runtime + runtime org.projectlombok lombok - provided - - - org.onap.policy.common - policy-endpoints - ${policy.common.version} - test diff --git a/models-interactions/model-impl/sdnc/pom.xml b/models-interactions/model-impl/sdnc/pom.xml index accda069e..f81ee8efe 100644 --- a/models-interactions/model-impl/sdnc/pom.xml +++ b/models-interactions/model-impl/sdnc/pom.xml @@ -36,21 +36,10 @@ gson provided - - org.onap.policy.models.policy-models-interactions.model-impl - rest - ${project.version} - org.projectlombok lombok provided - - org.onap.policy.common - policy-endpoints - ${policy.common.version} - provided - diff --git a/models-interactions/model-impl/so/pom.xml b/models-interactions/model-impl/so/pom.xml index 63e22b353..1c2cf0f43 100644 --- a/models-interactions/model-impl/so/pom.xml +++ b/models-interactions/model-impl/so/pom.xml @@ -33,21 +33,23 @@ so + + org.onap.policy.common + gson + ${policy.common.version} + com.google.code.gson gson provided - org.onap.policy.models.policy-models-interactions.model-impl - rest - ${project.version} + jakarta.ws.rs + jakarta.ws.rs-api - org.onap.policy.common - policy-endpoints - ${policy.common.version} - provided + org.projectlombok + lombok org.glassfish.jersey.containers diff --git a/models-interactions/model-impl/vfc/pom.xml b/models-interactions/model-impl/vfc/pom.xml index 20c2eb039..4f33b89ac 100644 --- a/models-interactions/model-impl/vfc/pom.xml +++ b/models-interactions/model-impl/vfc/pom.xml @@ -2,7 +2,7 @@ ============LICENSE_START======================================================= Copyright (C) 2017 Intel Corp. All rights reserved. Modifications Copyright (C) 2018-2021 AT&T Intellectual Property. All rights reserved. - Modifications Copyright (C) 2019, 2023 Nordix Foundation. + Modifications Copyright (C) 2019, 2023-2024 Nordix Foundation. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -37,15 +37,8 @@ provided - org.onap.policy.models.policy-models-interactions.model-impl - rest - ${project.version} - - - org.onap.policy.common - policy-endpoints - ${policy.common.version} - provided + org.projectlombok + lombok diff --git a/models-interactions/model-simulators/pom.xml b/models-interactions/model-simulators/pom.xml index 36db43fa8..3755ceea1 100644 --- a/models-interactions/model-simulators/pom.xml +++ b/models-interactions/model-simulators/pom.xml @@ -39,6 +39,16 @@ policy-endpoints ${policy.common.version} + + org.onap.policy.common + message-bus + ${policy.common.version} + + + org.onap.policy.common + utils + ${policy.common.version} + org.onap.policy.models.policy-models-interactions.model-impl aai @@ -81,9 +91,9 @@ test - com.google.code.gson - gson - provided + org.onap.policy.models.policy-models-interactions.model-impl + rest + ${project.version} org.onap.policy.models @@ -106,6 +116,68 @@ ${policy.common.version} test + + org.onap.aai.schema-service + aai-schema + + + org.onap.ccsdk.cds.blueprintsprocessor.modules + blueprint-proto + + + com.google.code.gson + gson + provided + + + com.google.protobuf + protobuf-java-util + + + com.google.protobuf + protobuf-java + + + commons-io + commons-io + + + io.grpc + grpc-api + + + io.grpc + grpc-core + + + io.grpc + grpc-netty + + + io.grpc + grpc-stub + + + jakarta.ws.rs + jakarta.ws.rs-api + + + org.apache.commons + commons-lang3 + + + org.eclipse.jetty.toolchain + jetty-jakarta-servlet-api + + + org.mockito + mockito-core + test + + + org.projectlombok + lombok + org.mockito mockito-junit-jupiter diff --git a/models-interactions/model-simulators/src/main/java/org/onap/policy/simulators/AppcLcmTopicServer.java b/models-interactions/model-simulators/src/main/java/org/onap/policy/simulators/AppcLcmTopicServer.java index 62e1acc9c..d103765ed 100644 --- a/models-interactions/model-simulators/src/main/java/org/onap/policy/simulators/AppcLcmTopicServer.java +++ b/models-interactions/model-simulators/src/main/java/org/onap/policy/simulators/AppcLcmTopicServer.java @@ -22,8 +22,8 @@ package org.onap.policy.simulators; import org.onap.policy.appclcm.AppcLcmMessageWrapper; -import org.onap.policy.common.endpoints.event.comm.TopicSink; -import org.onap.policy.common.endpoints.event.comm.TopicSource; +import org.onap.policy.common.message.bus.event.TopicSink; +import org.onap.policy.common.message.bus.event.TopicSource; import org.onap.policy.common.utils.coder.StandardCoder; import org.onap.policy.common.utils.resources.ResourceUtils; diff --git a/models-interactions/model-simulators/src/main/java/org/onap/policy/simulators/AppcLegacyTopicServer.java b/models-interactions/model-simulators/src/main/java/org/onap/policy/simulators/AppcLegacyTopicServer.java index 9447e01ac..1c7eaa512 100644 --- a/models-interactions/model-simulators/src/main/java/org/onap/policy/simulators/AppcLegacyTopicServer.java +++ b/models-interactions/model-simulators/src/main/java/org/onap/policy/simulators/AppcLegacyTopicServer.java @@ -3,6 +3,7 @@ * ONAP * ================================================================================ * Copyright (C) 2020-2021 AT&T Intellectual Property. All rights reserved. + * Modifications Copyright (C) 2024 Nordix Foundation. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,8 +22,8 @@ package org.onap.policy.simulators; import org.onap.policy.appc.Request; -import org.onap.policy.common.endpoints.event.comm.TopicSink; -import org.onap.policy.common.endpoints.event.comm.TopicSource; +import org.onap.policy.common.message.bus.event.TopicSink; +import org.onap.policy.common.message.bus.event.TopicSource; import org.onap.policy.common.utils.coder.StandardCoderInstantAsMillis; import org.onap.policy.common.utils.resources.ResourceUtils; diff --git a/models-interactions/model-simulators/src/main/java/org/onap/policy/simulators/SdnrTopicServer.java b/models-interactions/model-simulators/src/main/java/org/onap/policy/simulators/SdnrTopicServer.java index cf297e5d9..a0e0c73bb 100644 --- a/models-interactions/model-simulators/src/main/java/org/onap/policy/simulators/SdnrTopicServer.java +++ b/models-interactions/model-simulators/src/main/java/org/onap/policy/simulators/SdnrTopicServer.java @@ -3,6 +3,7 @@ * ONAP * ================================================================================ * Copyright (C) 2020-2021 AT&T Intellectual Property. All rights reserved. + * Modifications Copyright (C) 2024 Nordix Foundation. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,8 +21,8 @@ package org.onap.policy.simulators; -import org.onap.policy.common.endpoints.event.comm.TopicSink; -import org.onap.policy.common.endpoints.event.comm.TopicSource; +import org.onap.policy.common.message.bus.event.TopicSink; +import org.onap.policy.common.message.bus.event.TopicSource; import org.onap.policy.common.utils.coder.StandardCoder; import org.onap.policy.common.utils.resources.ResourceUtils; import org.onap.policy.sdnr.PciMessage; diff --git a/models-interactions/model-simulators/src/main/java/org/onap/policy/simulators/TopicServer.java b/models-interactions/model-simulators/src/main/java/org/onap/policy/simulators/TopicServer.java index 004a2e20c..454b6ce94 100644 --- a/models-interactions/model-simulators/src/main/java/org/onap/policy/simulators/TopicServer.java +++ b/models-interactions/model-simulators/src/main/java/org/onap/policy/simulators/TopicServer.java @@ -3,6 +3,7 @@ * ONAP * ================================================================================ * Copyright (C) 2020-2021 AT&T Intellectual Property. All rights reserved. + * Modifications Copyright (C) 2024 Nordix Foundation. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,10 +21,10 @@ package org.onap.policy.simulators; -import org.onap.policy.common.endpoints.event.comm.Topic.CommInfrastructure; -import org.onap.policy.common.endpoints.event.comm.TopicListener; -import org.onap.policy.common.endpoints.event.comm.TopicSink; -import org.onap.policy.common.endpoints.event.comm.TopicSource; +import org.onap.policy.common.message.bus.event.Topic.CommInfrastructure; +import org.onap.policy.common.message.bus.event.TopicListener; +import org.onap.policy.common.message.bus.event.TopicSink; +import org.onap.policy.common.message.bus.event.TopicSource; import org.onap.policy.common.utils.coder.Coder; import org.onap.policy.common.utils.coder.CoderException; diff --git a/models-interactions/model-simulators/src/test/java/org/onap/policy/simulators/AppcLcmTopicServerTest.java b/models-interactions/model-simulators/src/test/java/org/onap/policy/simulators/AppcLcmTopicServerTest.java index 48ae2da83..dc20355ad 100644 --- a/models-interactions/model-simulators/src/test/java/org/onap/policy/simulators/AppcLcmTopicServerTest.java +++ b/models-interactions/model-simulators/src/test/java/org/onap/policy/simulators/AppcLcmTopicServerTest.java @@ -33,9 +33,9 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import org.onap.policy.common.endpoints.event.comm.Topic.CommInfrastructure; -import org.onap.policy.common.endpoints.event.comm.TopicSink; -import org.onap.policy.common.endpoints.event.comm.TopicSource; +import org.onap.policy.common.message.bus.event.Topic.CommInfrastructure; +import org.onap.policy.common.message.bus.event.TopicSink; +import org.onap.policy.common.message.bus.event.TopicSource; import org.onap.policy.common.utils.resources.ResourceUtils; @ExtendWith(MockitoExtension.class) diff --git a/models-interactions/model-simulators/src/test/java/org/onap/policy/simulators/AppcLegacyTopicServerTest.java b/models-interactions/model-simulators/src/test/java/org/onap/policy/simulators/AppcLegacyTopicServerTest.java index d5428dbd6..9e836ac71 100644 --- a/models-interactions/model-simulators/src/test/java/org/onap/policy/simulators/AppcLegacyTopicServerTest.java +++ b/models-interactions/model-simulators/src/test/java/org/onap/policy/simulators/AppcLegacyTopicServerTest.java @@ -33,9 +33,9 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import org.onap.policy.common.endpoints.event.comm.Topic.CommInfrastructure; -import org.onap.policy.common.endpoints.event.comm.TopicSink; -import org.onap.policy.common.endpoints.event.comm.TopicSource; +import org.onap.policy.common.message.bus.event.Topic.CommInfrastructure; +import org.onap.policy.common.message.bus.event.TopicSink; +import org.onap.policy.common.message.bus.event.TopicSource; import org.onap.policy.common.utils.resources.ResourceUtils; @ExtendWith(MockitoExtension.class) diff --git a/models-interactions/model-simulators/src/test/java/org/onap/policy/simulators/SdnrTopicServerTest.java b/models-interactions/model-simulators/src/test/java/org/onap/policy/simulators/SdnrTopicServerTest.java index 02b9653ec..019a93af1 100644 --- a/models-interactions/model-simulators/src/test/java/org/onap/policy/simulators/SdnrTopicServerTest.java +++ b/models-interactions/model-simulators/src/test/java/org/onap/policy/simulators/SdnrTopicServerTest.java @@ -33,9 +33,9 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import org.onap.policy.common.endpoints.event.comm.Topic.CommInfrastructure; -import org.onap.policy.common.endpoints.event.comm.TopicSink; -import org.onap.policy.common.endpoints.event.comm.TopicSource; +import org.onap.policy.common.message.bus.event.Topic.CommInfrastructure; +import org.onap.policy.common.message.bus.event.TopicSink; +import org.onap.policy.common.message.bus.event.TopicSource; import org.onap.policy.common.utils.resources.ResourceUtils; @ExtendWith(MockitoExtension.class) diff --git a/models-interactions/model-simulators/src/test/java/org/onap/policy/simulators/TopicServerTest.java b/models-interactions/model-simulators/src/test/java/org/onap/policy/simulators/TopicServerTest.java index a91431e61..425e6aeef 100644 --- a/models-interactions/model-simulators/src/test/java/org/onap/policy/simulators/TopicServerTest.java +++ b/models-interactions/model-simulators/src/test/java/org/onap/policy/simulators/TopicServerTest.java @@ -32,9 +32,9 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import org.onap.policy.common.endpoints.event.comm.Topic.CommInfrastructure; -import org.onap.policy.common.endpoints.event.comm.TopicSink; -import org.onap.policy.common.endpoints.event.comm.TopicSource; +import org.onap.policy.common.message.bus.event.Topic.CommInfrastructure; +import org.onap.policy.common.message.bus.event.TopicSink; +import org.onap.policy.common.message.bus.event.TopicSource; import org.onap.policy.common.utils.coder.StandardCoder; @ExtendWith(MockitoExtension.class) diff --git a/models-interactions/pom.xml b/models-interactions/pom.xml index 27464e1a1..f4680b10f 100644 --- a/models-interactions/pom.xml +++ b/models-interactions/pom.xml @@ -1,6 +1,6 @@