Do not use singleton ServiceLoader

apache · Feb 13, 2025 · 4979d65 · 4979d65
1 parent fc43c12
commit 4979d65
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/schemas/utils/ConvertHelpers.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/schemas/utils/ConvertHelpers.java
@@ -57,10 +57,6 @@
   "rawtypes"
 })
 public class ConvertHelpers {
-  private static class SchemaInformationProviders {
-    private static final ServiceLoader<SchemaInformationProvider> INSTANCE =
-        ServiceLoader.load(SchemaInformationProvider.class);
-  }
 
   private static final Logger LOG = LoggerFactory.getLogger(ConvertHelpers.class);
 
@@ -87,11 +83,15 @@ public static <T> ConvertedSchemaInformation<T> getConvertedSchemaInformation(
 
     ConvertedSchemaInformation<T> schemaInformation = null;
     // Try to load schema information from loaded providers
-    for (SchemaInformationProvider provider : SchemaInformationProviders.INSTANCE) {
-      schemaInformation = provider.getConvertedSchemaInformation(inputSchema, outputType);
-      if (schemaInformation != null) {
-        return schemaInformation;
+    try {
+      for (SchemaInformationProvider provider : ServiceLoader.load(SchemaInformationProvider.class)) {
+        schemaInformation = provider.getConvertedSchemaInformation(inputSchema, outputType);
+        if (schemaInformation != null) {
+          return schemaInformation;
+        }
       }
+    } catch (Exception e) {
+      LOG.debug("No Schema information found for type {}", outputType, e);
     }
 
     if (schemaInformation == null) {
@@ -107,7 +107,7 @@ public static <T> ConvertedSchemaInformation<T> getConvertedSchemaInformation(
                 schemaRegistry.getToRowFunction(outputType),
                 schemaRegistry.getFromRowFunction(outputType));
       } catch (NoSuchSchemaException e) {
-        LOG.debug("No schema found for type " + outputType, e);
+        LOG.debug("No schema found for type {}", outputType, e);
       }
       FieldType unboxedType = null;
       // TODO: Properly handle nullable.