Minor changes

Author: S-Saranya1

codegen/src/main/java/software/amazon/awssdk/codegen/docs/OperationDocProvider.java

@@ -55,7 +55,7 @@ abstract class OperationDocProvider {
             "an exception will be thrown. ";
 
     private static final ExampleMetadataProvider EXAMPLE_PROVIDER =
-        ExampleMetadataProvider.getInstance(EXAMPLE_META_PATH);
+        new ExampleMetadataProvider(EXAMPLE_META_PATH);
 
     protected final IntermediateModel model;
     protected final OperationModel opModel;

codegen/src/main/java/software/amazon/awssdk/codegen/emitters/tasks/PackageInfoGeneratorTasks.java

@@ -109,7 +109,7 @@ private String buildJavadocContent(String baseDocumentation, String codeExamples
      * Gets code examples using a custom example metadata path.
      */
     private String getCodeExamplesWithPath(Metadata metadata, String exampleMetaPath) {
-        ExampleMetadataProvider exampleProvider = ExampleMetadataProvider.getInstance(exampleMetaPath);
+        ExampleMetadataProvider exampleProvider = new ExampleMetadataProvider(exampleMetaPath);
         List<ExampleMetadataProvider.ExampleData> examples = exampleProvider.getServiceCodeExamples(metadata);
 
         if (examples.isEmpty()) {

codegen/src/main/java/software/amazon/awssdk/codegen/internal/ExampleMetadataProvider.java

@@ -23,8 +23,6 @@
 import java.util.Locale;
 import java.util.Map;
 import java.util.Optional;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
 import software.amazon.awssdk.codegen.model.intermediate.Metadata;
 import software.amazon.awssdk.protocols.jsoncore.JsonNode;
 import software.amazon.awssdk.protocols.jsoncore.JsonNodeParser;
@@ -38,38 +36,24 @@ public final class ExampleMetadataProvider {
 
     private static final Logger log = Logger.loggerFor(ExampleMetadataProvider.class);
 
-    private static final ConcurrentMap<String, ExampleMetadataProvider> INSTANCE_CACHE = new ConcurrentHashMap<>();
-
     private final String exampleMetaPath;
     private final JsonNodeParser jsonParser;
     private final Lazy<Map<String, JsonNode>> serviceNodeCache;
     private final Lazy<Map<String, String>> normalizedServiceKeyMap;
 
-    private ExampleMetadataProvider(String exampleMetaPath) {
-        this.exampleMetaPath = exampleMetaPath;
-        this.jsonParser = JsonNodeParser.create();
-        this.serviceNodeCache = new Lazy<>(this::buildServiceNodeCache);
-        this.normalizedServiceKeyMap = new Lazy<>(this::buildNormalizedServiceKeyMap);
-    }
-
     /**
      * Creates an ExampleMetadataProvider instance for the given JSON file path.
      *
      * @param exampleMetaPath path to the example metadata JSON file
-     * @return ExampleMetadataProvider instance for this path
      */
-    public static ExampleMetadataProvider getInstance(String exampleMetaPath) {
+    public ExampleMetadataProvider(String exampleMetaPath) {
         if (exampleMetaPath == null) {
             throw new IllegalArgumentException("exampleMetaPath cannot be null");
         }
-        return INSTANCE_CACHE.computeIfAbsent(exampleMetaPath, ExampleMetadataProvider::new);
-    }
-    
-    /**
-     * Clears the instance cache.
-     */
-    public static void clearCache() {
-        INSTANCE_CACHE.clear();
+        this.exampleMetaPath = exampleMetaPath;
+        this.jsonParser = JsonNodeParser.create();
+        this.serviceNodeCache = new Lazy<>(this::buildServiceNodeCache);
+        this.normalizedServiceKeyMap = new Lazy<>(this::buildNormalizedServiceKeyMap);
     }
 
     /**

codegen/src/test/java/software/amazon/awssdk/codegen/docs/OperationDocProviderTest.java

@@ -20,7 +20,6 @@
 
 import java.util.Optional;
 import java.util.stream.Stream;
-import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
@@ -32,16 +31,11 @@ public class OperationDocProviderTest {
 
     private static final String TEST_EXAMPLE_META_PATH = "software/amazon/awssdk/codegen/test-example-meta.json";
 
-    @AfterAll
-    static void cleanupCache() {
-        ExampleMetadataProvider.clearCache();
-    }
-
     @ParameterizedTest
     @MethodSource("createLinkToCodeExampleTestCases")
     public void exampleMetadataService_createLinkToCodeExample_returnsExpectedResult(
             String serviceName, String operationName, String expectedUrl) {
-        ExampleMetadataProvider provider = ExampleMetadataProvider.getInstance(TEST_EXAMPLE_META_PATH);
+        ExampleMetadataProvider provider = new ExampleMetadataProvider(TEST_EXAMPLE_META_PATH);
 
         Optional<String> result = provider.createLinkToCodeExample(createTestMetadata(serviceName), operationName);
 
@@ -65,20 +59,8 @@ private static Stream<Arguments> createLinkToCodeExampleTestCases() {
     }
 
     @Test
-    public void registryPattern_withMultiplePaths_maintainsSeparateInstances() {
-        ExampleMetadataProvider provider1 = ExampleMetadataProvider.getInstance(TEST_EXAMPLE_META_PATH);
-        ExampleMetadataProvider provider2 = ExampleMetadataProvider.getInstance("nonexistent/path.json");
-
-        assertThat(provider1).isNotSameAs(provider2);
-
-        ExampleMetadataProvider provider1Again = ExampleMetadataProvider.getInstance(TEST_EXAMPLE_META_PATH);
-        assertThat(provider1).isSameAs(provider1Again);
-    }
-
-    @Test
-    public void registryPattern_threadSafety_handlesNullPath() {
-        assertThatThrownBy(() -> ExampleMetadataProvider.getInstance(null))
-            .as("getInstance should reject null paths")
+    public void constructor_withNullPath_throwsIllegalArgumentException() {
+        assertThatThrownBy(() -> new ExampleMetadataProvider(null))
             .isInstanceOf(IllegalArgumentException.class)
             .hasMessageContaining("exampleMetaPath cannot be null");
     }

codegen/src/test/java/software/amazon/awssdk/codegen/emitters/tasks/PackageInfoGeneratorTasksTest.java

@@ -22,7 +22,6 @@
 import java.util.List;
 import java.util.Scanner;
 import java.util.stream.Stream;
-import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
@@ -35,17 +34,12 @@ public class PackageInfoGeneratorTasksTest {
 
     private static final String TEST_EXAMPLE_META_PATH = "software/amazon/awssdk/codegen/test-example-meta.json";
 
-    @AfterAll
-    static void cleanupCache() {
-        ExampleMetadataProvider.clearCache();
-    }
-
     @ParameterizedTest
     @MethodSource("getServiceCodeExamplesTestCases")
     public void exampleMetadataService_getServiceCodeExamples_returnsExpectedResult(
             String metadataPath, String serviceName,
             Integer expectedSize, String expectedFirstTitle, String expectedFirstCategory, String expectedFirstUrl) {
-        ExampleMetadataProvider provider = ExampleMetadataProvider.getInstance(metadataPath);
+        ExampleMetadataProvider provider = new ExampleMetadataProvider(metadataPath);
 
         List<ExampleMetadataProvider.ExampleData> result = provider.getServiceCodeExamples(createTestMetadata(serviceName));