add smithy dir as arg

aws · Sep 17, 2024 · 0b497bd · 0b497bd
1 parent 791b1ab
commit 0b497bd
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 10 deletions.
diff --git a/...ain/resources/smithy-models/dynamodb.json → ...thy_generator/smithy-models/dynamodb.json b/...ain/resources/smithy-models/dynamodb.json → ...thy_generator/smithy-models/dynamodb.json
diff --git a/...ator/src/main/java/com/amazonaws/util/awsclientsmithygenerator/CliOptions/CliOptions.java b/...ator/src/main/java/com/amazonaws/util/awsclientsmithygenerator/CliOptions/CliOptions.java
@@ -18,9 +18,18 @@ public class CliOptions {
             .desc("Service Name to be generated as String")
             .build();
 
+    private static final Option SmithyModelPathOption = Option.builder()
+            .option("sm")
+            .longOpt("smithyModels")
+            .hasArg(true)
+            .required(true)
+            .desc("Path to smithy models")
+            .build();
+
     public static CliOptions BuildFromInput(String[] args) throws ParseException {
         final Options options = new Options();
         options.addOption(SerivceNameOption);
+        options.addOption(SmithyModelPathOption);
         final CommandLineParser parser = new DefaultParser();
         final CommandLine parsed = parser.parse(options, args);
         return new CliOptions(parsed);
@@ -36,9 +45,7 @@ public String GetServiceName() throws ParseException {
         return this.commandLine.getOptionValue(SerivceNameOption);
     }
 
-    public void PrintHelp() {
-        System.out.println("Could Not Find required args:");
-        Arrays.stream(this.commandLine.getOptions())
-                .forEach(System.out::println);
+    public String GetSmithyModelPath() throws ParseException {
+        return this.commandLine.getOptionValue(SmithyModelPathOption);
     }
 }
diff --git a/...or/src/main/java/com/amazonaws/util/awsclientsmithygenerator/generators/SmithyParser.java b/...or/src/main/java/com/amazonaws/util/awsclientsmithygenerator/generators/SmithyParser.java
@@ -22,7 +22,6 @@
 import java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;
-import java.io.InputStream;
 import java.net.URISyntaxException;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
@@ -80,9 +79,8 @@ public static final class Failure {
     private final File smithyFile;
     private final String serviceName;
 
-    public static SmithyParser BuildFromServiceName(final String serviceName) throws URISyntaxException {
-        URL resource = Thread.currentThread().getContextClassLoader().getResource(RESOURCE_SMITHY_DIR);
-        final Path path = Paths.get(Objects.requireNonNull(resource).toURI());
+    public static SmithyParser BuildFromServiceName(final String serviceName, final String smithyModelPath) throws URISyntaxException {
+        final Path path = Path.of(smithyModelPath);
         try (final Stream<Path> paths = Files.walk(path)) {
             final File smithyFile = paths.filter(file -> file.toString().contains(serviceName))
                     .findFirst()

diff --git a/...tion/smithy_generator/src/main/java/com/amazonaws/util/awsclientsmithygenerator/main.java b/...tion/smithy_generator/src/main/java/com/amazonaws/util/awsclientsmithygenerator/main.java
@@ -13,8 +13,8 @@ public class main {
     public static void main(String[] args) {
         try {
             final CliOptions options = CliOptions.BuildFromInput(args);
-            String serviceName = options.GetServiceName();
-            final SmithyParser parser = SmithyParser.BuildFromServiceName(serviceName);
+            final SmithyParser parser = SmithyParser.BuildFromServiceName(options.GetServiceName(),
+                    options.GetSmithyModelPath());
             parser.GenerateTests();
         } catch (Exception e) {
             System.out.println("Failed to generate code: " + e.getMessage());