Fix loading of metadata when we have a split package (helidon-io#11170)

* Fix loading of metadata when we have a split package (such as main and test compilation using the same scope)

* remove unnecessary configuration from test pom

Author: tomas-langer

metadata/metadata/src/main/java/io/helidon/metadata/MetadataDiscoveryImpl.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025 Oracle and/or its affiliates.
+ * Copyright (c) 2025, 2026 Oracle and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -45,6 +45,7 @@
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 import java.util.jar.Manifest;
+import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
@@ -284,12 +285,12 @@ private static MetadataDiscovery createFromResources(MetadataDiscoveryContext co
         String manifestFile = config.manifestFile();
         Set<String> metadataFiles = config.metadataFiles();
 
-        var manfiestStream = cl.resources(location + "/" + manifestFile)
+        var manifestStream = cl.resources(location + "/" + manifestFile)
                 .distinct()
                 .flatMap(it -> parseHelidonManifest(cl, it));
         var nonManfiestStream = defaultMetadata(cl, location, metadataFiles);
 
-        Stream.concat(manfiestStream, nonManfiestStream)
+        Stream.concat(manifestStream, nonManfiestStream)
                 // remove duplicates, which may happen
                 .distinct()
                 .forEach(it -> metadataMap.computeIfAbsent(it.fileName(), k -> new ArrayList<>()).add(it));
@@ -343,21 +344,30 @@ private static Stream<MetadataFile> parseHelidonManifest(ClassLoader cl,
                 // the line now contains an exact location of a resource
                 String resourceLocation = line;
                 FoundFile fileName = fileName(line);
-                URL resourceUrl = cl.getResource(resourceLocation);
-                if (resourceUrl == null) {
+
+                List<URL> resources = cl.resources(resourceLocation)
+                        .collect(Collectors.toUnmodifiableList());
+
+
+                if (resources.isEmpty()) {
                     throw new IllegalArgumentException("Metadata file " + resourceLocation + " not found, it is defined in "
                                                                + "manifest " + url + " at line " + lineNumber);
                 }
 
-                if (LOGGER.isLoggable(Level.DEBUG)) {
-                    LOGGER.log(Level.DEBUG, "Adding file from manifest: " + resourceLocation + " at line " + lineNumber);
-                }
+                // we can safely add even resources that are duplicate, as there is a distinct on result of this method call
+                for (URL resourceUrl : resources) {
+                    if (LOGGER.isLoggable(Level.DEBUG)) {
+                        LOGGER.log(Level.DEBUG,
+                                   "Adding file from manifest: " + resourceLocation + " at line "
+                                           + lineNumber + ", location: " + resourceUrl);
+                    }
 
-                // only add files that are either in non-default directory, or that we do not know about
-                // if in default directory, and in metadataFiles, we will look it up later
-                foundFiles.add(MetadataFileImpl.create(resourceLocation,
-                                                       fileName.fileName(),
-                                                       resourceUrl));
+                    // only add files that are either in non-default directory, or that we do not know about
+                    // if in default directory, and in metadataFiles, we will look it up later
+                    foundFiles.add(MetadataFileImpl.create(resourceLocation,
+                                                           fileName.fileName(),
+                                                           resourceUrl));
+                }
             }
 
             return foundFiles.stream();

service/tests/pom.xml

@@ -57,6 +57,7 @@
         <module>events</module>
         <module>maven-plugin</module>
         <module>system-exit</module>
+        <module>splitpackage</module>
     </modules>
 
 </project>

service/tests/splitpackage/pom.xml

@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2026 Oracle and/or its affiliates.
+
+    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.
+
+-->
+
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xmlns="http://maven.apache.org/POM/4.0.0"
+        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <groupId>io.helidon.service.tests</groupId>
+        <artifactId>helidon-service-tests-project</artifactId>
+        <version>4.4.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>helidon-service-tests-packagesplit</artifactId>
+    <name>Helidon Service Tests Package Split</name>
+    <description>
+        Test that we can "survive" service descriptors in the same location referenced from manifest.
+        The package split will be caused by main and test locations using the same scope
+    </description>
+
+    <properties>
+        <helidon.services.skip>true</helidon.services.skip>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.helidon.service</groupId>
+            <artifactId>helidon-service-registry</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.helidon.config</groupId>
+            <artifactId>helidon-config</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.hamcrest</groupId>
+            <artifactId>hamcrest-all</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.helidon.testing</groupId>
+            <artifactId>helidon-testing-junit5</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>default-compile</id>
+                        <goals>
+                            <goal>compile</goal>
+                        </goals>
+                        <configuration>
+                            <compilerArgument>-Ahelidon.codegen.scope=production</compilerArgument>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>default-testCompile</id>
+                        <goals>
+                            <goal>testCompile</goal>
+                        </goals>
+                        <configuration>
+                            <compilerArgument>-Ahelidon.codegen.scope=production</compilerArgument>
+                        </configuration>
+                    </execution>
+                </executions>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>io.helidon.codegen</groupId>
+                            <artifactId>helidon-codegen-apt</artifactId>
+                            <version>${project.version}</version>
+                        </path>
+                        <path>
+                            <groupId>io.helidon.service</groupId>
+                            <artifactId>helidon-service-codegen</artifactId>
+                            <version>${project.version}</version>
+                        </path>
+                    </annotationProcessorPaths>
+                </configuration>
+                <dependencies>
+                    <dependency>
+                        <groupId>io.helidon.codegen</groupId>
+                        <artifactId>helidon-codegen-apt</artifactId>
+                        <version>${project.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>io.helidon.service</groupId>
+                        <artifactId>helidon-service-codegen</artifactId>
+                        <version>${project.version}</version>
+                    </dependency>
+                </dependencies>
+            </plugin>
+        </plugins>
+    </build>
+</project>

service/tests/splitpackage/src/main/java/io/helidon/service/tests/splitpackage/MyContract.java

@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2026 Oracle and/or its affiliates.
+ *
+ * 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.
+ */
+
+package io.helidon.service.tests.splitpackage;
+
+import io.helidon.service.registry.Service;
+
+@Service.Contract
+interface MyContract {
+    String name();
+}

service/tests/splitpackage/src/main/java/io/helidon/service/tests/splitpackage/Service1.java

@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2026 Oracle and/or its affiliates.
+ *
+ * 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.
+ */
+
+package io.helidon.service.tests.splitpackage;
+
+import io.helidon.service.registry.Service;
+
+@Service.Singleton
+class Service1 implements MyContract {
+    @Override
+    public String name() {
+        return "1";
+    }
+}

service/tests/splitpackage/src/test/java/io/helidon/service/tests/splitpackage/Service2.java

@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2026 Oracle and/or its affiliates.
+ *
+ * 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.
+ */
+
+package io.helidon.service.tests.splitpackage;
+
+import io.helidon.common.Weight;
+import io.helidon.common.Weighted;
+import io.helidon.service.registry.Service;
+
+@Service.Singleton
+@Weight(Weighted.DEFAULT_WEIGHT + 100)
+class Service2 implements MyContract {
+    @Override
+    public String name() {
+        return "2";
+    }
+}

service/tests/splitpackage/src/test/java/io/helidon/service/tests/splitpackage/SplitPackageTest.java

@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2026 Oracle and/or its affiliates.
+ *
+ * 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.
+ */
+
+package io.helidon.service.tests.splitpackage;
+
+import java.util.List;
+
+import io.helidon.service.registry.ServiceRegistry;
+import io.helidon.testing.junit5.Testing;
+
+import org.junit.jupiter.api.Test;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.collection.IsCollectionWithSize.hasSize;
+
+@Testing.Test
+public class SplitPackageTest {
+    private final ServiceRegistry registry;
+
+    public SplitPackageTest(ServiceRegistry registry) {
+        this.registry = registry;
+    }
+
+    @Test
+    public void testSplitPackage() {
+        List<MyContract> services = registry.all(MyContract.class);
+
+        assertThat(services, hasSize(2));
+        assertThat("Test service has higher weight, should be first", services.get(0).name(), is("2"));
+        assertThat(services.get(1).name(), is("1"));
+    }
+}