Use a proper classloader for loading services (#958)

Author: sugmanue

aws/sdkv2/aws-sdkv2-shapes/src/main/java/software/amazon/smithy/java/aws/sdkv2/shapes/SdkJsonDocumentParser.java

@@ -40,7 +40,7 @@ final class SdkJsonDocumentParser implements ShapeSerializer {
     static final Map<ShapeId, DocumentConverter> CONVERTERS = new HashMap<>();
 
     static {
-        for (var impl : ServiceLoader.load(DocumentConverter.class)) {
+        for (var impl : ServiceLoader.load(DocumentConverter.class, DocumentConverter.class.getClassLoader())) {
             CONVERTERS.put(impl.protocol(), impl);
         }
     }

client/client-core/src/main/java/software/amazon/smithy/java/client/core/plugins/AutoPlugin.java

@@ -24,7 +24,7 @@ public final class AutoPlugin implements ClientPlugin {
 
     static {
         List<ClientPlugin> children = new ArrayList<>();
-        for (var plugin : ServiceLoader.load(AutoClientPlugin.class)) {
+        for (var plugin : ServiceLoader.load(AutoClientPlugin.class, AutoClientPlugin.class.getClassLoader())) {
             children.add(plugin);
         }
         CHILDREN = Collections.unmodifiableList(children);

client/client-rulesengine/src/main/java/software/amazon/smithy/java/client/rulesengine/RulesEngineBuilder.java

@@ -33,7 +33,7 @@ public final class RulesEngineBuilder {
         // Always include the standard builtins.
         EXTENSIONS.add(new StdExtension());
 
-        for (var ext : ServiceLoader.load(RulesExtension.class)) {
+        for (var ext : ServiceLoader.load(RulesExtension.class, RulesExtension.class.getClassLoader())) {
             EXTENSIONS.add(ext);
         }
     }

client/dynamic-client/src/main/java/software/amazon/smithy/java/dynamicclient/plugins/DetectProtocolPlugin.java

@@ -33,7 +33,8 @@ public final class DetectProtocolPlugin implements ClientPlugin {
     private static final List<ClientProtocolFactory<Trait>> PROTOCOL_FACTORIES = new ArrayList<>();
 
     static {
-        for (var protocolImpl : ServiceLoader.load(ClientProtocolFactory.class)) {
+        for (var protocolImpl : ServiceLoader.load(ClientProtocolFactory.class,
+                ClientProtocolFactory.class.getClassLoader())) {
             PROTOCOL_FACTORIES.add(protocolImpl);
         }
     }

codecs/cbor-codec/src/main/java/software/amazon/smithy/java/cbor/CborSettings.java

@@ -14,7 +14,7 @@ public final class CborSettings {
     static {
         final String preferredName = System.getProperty("smithy-java.cbor-provider");
         CborSerdeProvider selected = null;
-        for (var provider : ServiceLoader.load(CborSerdeProvider.class)) {
+        for (var provider : ServiceLoader.load(CborSerdeProvider.class, CborSerdeProvider.class.getClassLoader())) {
             if (preferredName != null) {
                 if (provider.getName().equals(preferredName)) {
                     selected = provider;

codecs/json-codec/src/main/java/software/amazon/smithy/java/json/JsonSettings.java

@@ -19,7 +19,7 @@ public final class JsonSettings {
     static {
         final String preferredName = System.getProperty("smithy-java.json-provider");
         JsonSerdeProvider selected = null;
-        for (JsonSerdeProvider provider : ServiceLoader.load(JsonSerdeProvider.class)) {
+        for (var provider : ServiceLoader.load(JsonSerdeProvider.class, JsonSerdeProvider.class.getClassLoader())) {
             if (preferredName != null) {
                 if (provider.getName().equals(preferredName)) {
                     selected = provider;

core/src/main/java/software/amazon/smithy/java/core/schema/SchemaIndex.java

@@ -5,6 +5,7 @@
 
 package software.amazon.smithy.java.core.schema;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.ServiceLoader;
 import java.util.function.Consumer;
@@ -15,8 +16,11 @@ public abstract class SchemaIndex {
     private static final SchemaIndex COMBINED_SCHEMA_INDEX = createCombinedSchemaIndex();
 
     private static SchemaIndex createCombinedSchemaIndex() {
-        return new CombinedSchemaIndex(
-                ServiceLoader.load(SchemaIndex.class).stream().map(ServiceLoader.Provider::get).toList());
+        var schemaIndexes = new ArrayList<SchemaIndex>();
+        for (var schemaIndex : ServiceLoader.load(SchemaIndex.class, SchemaIndex.class.getClassLoader())) {
+            schemaIndexes.add(schemaIndex);
+        }
+        return new CombinedSchemaIndex(schemaIndexes);
     }
 
     public static SchemaIndex getCombinedSchemaIndex() {

server/server-api/src/main/java/software/amazon/smithy/java/server/Server.java

@@ -22,11 +22,11 @@ static ServerBuilder<?> builder(String serverName) {
     private static ServerBuilder<?> findBuilder(String name) {
         ServerProvider selected = null;
         InternalLogger logger = InternalLogger.getLogger(Server.class);
-        List<ServerProvider> providers = ServiceLoader.load(ServerProvider.class)
-                .stream()
-                .map(ServiceLoader.Provider::get)
-                .peek(p -> logger.debug("Discovered server provider {}:{}", p.name(), p.getClass()))
-                .toList();
+        List<ServerProvider> providers = new ArrayList<>();
+        for (var provider : ServiceLoader.load(ServerProvider.class, ServerProvider.class.getClassLoader())) {
+            logger.debug("Discovered server provider {}:{}", provider.name(), provider.getClass());
+            providers.add(provider);
+        }
         for (var provider : providers) {
             if (provider.name().equals(name)) {
                 selected = provider;