From 22d0568fe0619c3957ef55e86647fc76e2c905f9 Mon Sep 17 00:00:00 2001 From: gjoranv Date: Fri, 15 Sep 2023 15:30:13 +0200 Subject: Only warn about non-public api usage for the project's own code, .. not for embedded jars. --- .../com/yahoo/container/plugin/NonPublicApiDetectionTest.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'bundle-plugin-test') diff --git a/bundle-plugin-test/integration-test/src/test/java/com/yahoo/container/plugin/NonPublicApiDetectionTest.java b/bundle-plugin-test/integration-test/src/test/java/com/yahoo/container/plugin/NonPublicApiDetectionTest.java index ad6a2798376..79b48ec5a03 100644 --- a/bundle-plugin-test/integration-test/src/test/java/com/yahoo/container/plugin/NonPublicApiDetectionTest.java +++ b/bundle-plugin-test/integration-test/src/test/java/com/yahoo/container/plugin/NonPublicApiDetectionTest.java @@ -12,6 +12,7 @@ import java.util.stream.Collectors; import static com.yahoo.container.plugin.BundleTest.findBundleJar; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -36,13 +37,15 @@ public class NonPublicApiDetectionTest { } @Test - void usage_of_non_publicApi_packages_is_detected() { + void direct_usage_of_non_publicApi_packages_is_detected() { var nonPublicApiAttribute = mainAttributes.getValue("X-JDisc-Non-PublicApi-Import-Package"); assertNotNull(nonPublicApiAttribute); var usedNonPublicApi = Arrays.stream(nonPublicApiAttribute.split(",")).collect(Collectors.toSet()); - assertEquals(3, usedNonPublicApi.size()); - assertTrue(usedNonPublicApi.contains("ai.vespa.internal")); + // Package 'ai.vespa.internal' is only used indirectly by the compile scoped dependency, and must not be included. + assertFalse(usedNonPublicApi.contains("ai.vespa.internal")); + + assertEquals(2, usedNonPublicApi.size()); assertTrue(usedNonPublicApi.contains("ai.vespa.lib.non_public")); assertTrue(usedNonPublicApi.contains("com.yahoo.lib.non_public")); } -- cgit v1.2.3