address PR feedback

Author: jonathan343

codegen/aws/core/src/main/java/software/amazon/smithy/python/aws/codegen/AwsLicenseAndNoticeIntegration.java

@@ -0,0 +1,55 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package software.amazon.smithy.python.aws.codegen;
+
+import java.io.BufferedReader;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
+import java.util.List;
+import java.util.stream.Collectors;
+import software.amazon.smithy.python.codegen.GenerationContext;
+import software.amazon.smithy.python.codegen.integrations.PythonIntegration;
+import software.amazon.smithy.python.codegen.integrations.RuntimeClientPlugin;
+
+/**
+ * Integration that generates LICENSE and NOTICE files for AWS Python clients.
+ */
+public class AwsLicenseAndNoticeIntegration implements PythonIntegration {
+
+    @Override
+    public List<RuntimeClientPlugin> getClientPlugins(GenerationContext context) {
+        return List.of(
+                RuntimeClientPlugin.builder()
+                        .writeAdditionalFiles((c) -> {
+                            writeLicense(c);
+                            writeNotice(c);
+                            return List.of();
+                        })
+                        .build());
+    }
+
+    private static void writeLicense(GenerationContext context) {
+        context.writerDelegator().useFileWriter("LICENSE", writer -> {
+            writer.write(loadResourceAsString("/software/amazon/smithy/python/codegen/apache-2.0-license.txt"));
+        });
+    }
+
+    private static void writeNotice(GenerationContext context) {
+        context.writerDelegator().useFileWriter("NOTICE", writer -> {
+            writer.write("Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.");
+        });
+    }
+
+    private static String loadResourceAsString(String resourcePath) {
+        try (InputStream inputStream = AwsLicenseAndNoticeIntegration.class.getResourceAsStream(resourcePath);
+                BufferedReader reader =
+                        new BufferedReader(new InputStreamReader(inputStream, StandardCharsets.UTF_8))) {
+            return reader.lines().collect(Collectors.joining("\n"));
+        } catch (Exception e) {
+            throw new RuntimeException("Failed to load resource: " + resourcePath, e);
+        }
+    }
+}

codegen/aws/core/src/main/resources/META-INF/services/software.amazon.smithy.python.codegen.integrations.PythonIntegration

@@ -9,3 +9,4 @@ software.amazon.smithy.python.aws.codegen.AwsServiceIdIntegration
 software.amazon.smithy.python.aws.codegen.AwsUserAgentIntegration
 software.amazon.smithy.python.aws.codegen.AwsStandardRegionalEndpointsIntegration
 software.amazon.smithy.python.aws.codegen.AwsRstDocFileGenerator
+software.amazon.smithy.python.aws.codegen.AwsLicenseAndNoticeIntegration

codegen/core/src/main/java/software/amazon/smithy/python/codegen/generators/SetupGenerator.java

@@ -4,12 +4,6 @@
  */
 package software.amazon.smithy.python.codegen.generators;
 
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.nio.charset.StandardCharsets;
-import java.time.LocalDate;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
@@ -28,8 +22,6 @@
 import software.amazon.smithy.model.traits.StringTrait;
 import software.amazon.smithy.model.traits.TitleTrait;
 import software.amazon.smithy.python.codegen.*;
-import software.amazon.smithy.python.codegen.sections.LicenseSection;
-import software.amazon.smithy.python.codegen.sections.NoticeSection;
 import software.amazon.smithy.python.codegen.sections.PyprojectSection;
 import software.amazon.smithy.python.codegen.sections.ReadmeSection;
 import software.amazon.smithy.python.codegen.writer.PythonWriter;
@@ -52,8 +44,6 @@ public static void generateSetup(
         var dependencies = gatherDependencies(context.writerDelegator().getDependencies().stream());
         writePyproject(settings, context.writerDelegator(), dependencies);
         writeReadme(settings, context);
-        writeLicense(context);
-        writeNotice(context);
     }
 
     /**
@@ -285,38 +275,6 @@ private static void writeReadme(
         });
     }
 
-    private static void writeLicense(
-            GenerationContext context
-    ) {
-        context.writerDelegator().useFileWriter("LICENSE", writer -> {
-            writer.pushState(new LicenseSection());
-            writer.write(loadResourceAsString("/software/amazon/smithy/python/codegen/apache-2.0-license.txt"));
-            writer.popState();
-        });
-    }
-
-    private static void writeNotice(
-            GenerationContext context
-    ) {
-        context.writerDelegator().useFileWriter("NOTICE", writer -> {
-            writer.pushState(new NoticeSection());
-            var currentYear = LocalDate.now().getYear();
-            writer.write("Copyright " + currentYear + " Amazon.com, Inc. or its affiliates. All Rights Reserved.");
-            writer.popState();
-        });
-
-    }
-
-    private static String loadResourceAsString(String resourcePath) {
-        try (InputStream inputStream = SetupGenerator.class.getResourceAsStream(resourcePath);
-                BufferedReader reader =
-                        new BufferedReader(new InputStreamReader(inputStream, StandardCharsets.UTF_8))) {
-            return reader.lines().collect(Collectors.joining("\n"));
-        } catch (IOException e) {
-            throw new CodegenException("Failed to load resource: " + resourcePath, e);
-        }
-    }
-
     /**
      * Write the files required for sphinx doc generation
      */