From 2dac434c92dfd20791eda9364783846a5da8c605 Mon Sep 17 00:00:00 2001 From: leventecsanyi <levente.csanyi@est.tech> Date: Tue, 26 Nov 2024 15:29:45 +0100 Subject: Moved common classes under the api package under api - moved common classes under the api package - moved Spec files Issue-ID: CPS-2512 Change-Id: I88046280ce359ce8cc488ad37d4e6f85406b0dbf Signed-off-by: leventecsanyi <levente.csanyi@est.tech> --- .../test/java/org/onap/cps/architecture/CpsArchitectureTest.java | 4 +--- .../test/java/org/onap/cps/architecture/NcmpArchitectureTest.java | 8 ++++---- 2 files changed, 5 insertions(+), 7 deletions(-) (limited to 'cps-application/src/test/java') diff --git a/cps-application/src/test/java/org/onap/cps/architecture/CpsArchitectureTest.java b/cps-application/src/test/java/org/onap/cps/architecture/CpsArchitectureTest.java index 7e96447252..e68343b364 100644 --- a/cps-application/src/test/java/org/onap/cps/architecture/CpsArchitectureTest.java +++ b/cps-application/src/test/java/org/onap/cps/architecture/CpsArchitectureTest.java @@ -34,9 +34,7 @@ public class CpsArchitectureTest extends ArchitectureTestBase { classes().that().resideInAPackage("org.onap.cps.rest..").should().onlyDependOnClassesThat() .resideInAnyPackage(commonAndListedPackages("org.onap.cps.rest..", "org.onap.cps.api..", - "org.onap.cps.utils..", - // Breaks arch rules - "org.onap.cps.spi..")); + "org.onap.cps.utils..")); @ArchTest static final ArchRule cpsServiceApiShouldNotDependOnAnything = diff --git a/cps-application/src/test/java/org/onap/cps/architecture/NcmpArchitectureTest.java b/cps-application/src/test/java/org/onap/cps/architecture/NcmpArchitectureTest.java index 5d8c534e35..ecd98525f4 100644 --- a/cps-application/src/test/java/org/onap/cps/architecture/NcmpArchitectureTest.java +++ b/cps-application/src/test/java/org/onap/cps/architecture/NcmpArchitectureTest.java @@ -41,23 +41,23 @@ public class NcmpArchitectureTest extends ArchitectureTestBase { .onlyDependOnClassesThat() .resideInAnyPackage(commonAndListedPackages("org.onap.cps.ncmp.api..", "org.onap.cps.ncmp.rest..", + "org.onap.cps.api..", // Below packages are breaking the agreed dependencies // and need to be removed from this rule. // This will be handled in a separate user story - "org.onap.cps.spi..", "org.onap.cps.utils..", "org.onap.cps.ncmp.impl..")); @ArchTest static final ArchRule ncmpServiceApiShouldOnlyDependOnThirdPartyPackages = classes().that().resideInAPackage("org.onap.cps.ncmp.api..").should().onlyDependOnClassesThat() - .resideInAnyPackage(commonAndListedPackages(// Below packages are breaking the agreed dependencies + .resideInAnyPackage(commonAndListedPackages("org.onap.cps.api..", + // Below packages are breaking the agreed dependencies // and need to be removed from this rule. // This will be handled in a separate user story "org.onap.cps.ncmp.api..", "org.onap.cps.ncmp.impl..", "org.onap.cps.ncmp.config", - "org.onap.cps.spi..", "org.onap.cps.utils..")); @ArchTest @@ -71,13 +71,13 @@ public class NcmpArchitectureTest extends ArchitectureTestBase { "org.onap.cps.ncmp.utils..", "org.onap.cps.ncmp.config..", "org.onap.cps.ncmp.exceptions..", + "org.onap.cps.spi.api..", // Below packages are breaking the agreed dependencies // and need to be removed from this rule. // This will be handled in a separate user story "org.onap.cps.cpspath..", "org.onap.cps.events..", "org.onap.cps.impl..", - "org.onap.cps.spi..", "org.onap.cps.utils..")); } -- cgit 1.2.3-korg