feat: Support more services on Java

SmithyDafnyMakefile.mk

@@ -450,7 +450,7 @@ _polymorph_rust: $(if $(RUST_BENERATED), , _polymorph)
 
 ########################## .NET targets
 
-net: polymorph_dafny transpile_net polymorph_net test_net
+net: polymorph_dafny transpile_net polymorph_dotnet test_net
 
 transpile_net: $(if $(ENABLE_EXTERN_PROCESSING), _with_extern_pre_transpile, )
 transpile_net: | transpile_implementation_net transpile_test_net transpile_dependencies_net
@@ -525,6 +525,7 @@ transpile_test_java: _transpile_test_all _mv_test_java
 # To avoid `java/implementation-java` the code is generated and then moved.
 _mv_implementation_java:
 	rm -rf runtimes/java/src/main/dafny-generated
+	mkdir -p runtimes/java/src/main
 	mv runtimes/java/ImplementationFromDafny-java runtimes/java/src/main/dafny-generated
 _mv_test_java:
 	rm -rf runtimes/java/src/test/dafny-generated

TestModels/aws-sdks/glue/Makefile

@@ -21,6 +21,8 @@ AWS_SDK_CMD=--aws-sdk
 # This project has no dependencies
 # DEPENDENT-MODELS:=
 
+POLYMORPH_OPTIONS=--generate project-files --generate client-constructors
+
 # There is no wrapped target for aws-sdk types
 _polymorph_wrapped: ;
 _polymorph_wrapped_dafny: ;

TestModels/aws-sdks/lakeformation/Makefile

@@ -18,12 +18,25 @@ SMITHY_DEPS=dafny-dependencies/Model/traits.smithy
 
 AWS_SDK_CMD=--aws-sdk
 
+SMITHY_MODEL_ROOT := $(LIBRARY_ROOT)/model
+
 # This project has no dependencies
 # DEPENDENT-MODELS:=
 
 POLYMORPH_OPTIONS=--generate project-files --generate client-constructors
 
+# Override calling the polymorph CLI to invoke the Smithy build instead
+_polymorph_dafny:
+	$(GRADLEW) polymorphDafny
+
+_polymorph_dotnet:
+	$(GRADLEW) polymorphDotnet
+
+_polymorph_java:
+	$(GRADLEW) polymorphJava
+
 # There is no wrapped target for aws-sdk types
+_polymorph: ;
 _polymorph_wrapped: ;
 _polymorph_wrapped_dafny: ;
 _polymorph_wrapped_net: ;

TestModels/aws-sdks/lakeformation/build.gradle.kts

@@ -0,0 +1,89 @@
+// Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+plugins {
+    id("software.amazon.smithy").version("0.6.0")
+}
+
+repositories {
+    mavenLocal()
+    mavenCentral()
+}
+
+dependencies {
+    implementation("software.amazon.smithy:smithy-model:1.28.0")
+    implementation("software.amazon.smithy:smithy-aws-traits:1.28.0")
+    implementation("software.amazon.smithy:smithy-rules-engine:1.28.0")
+
+    // Must be built and published to the local Maven repo
+    implementation("software.amazon.smithy.dafny:smithy-dafny-codegen:0.1.0")
+}
+
+tasks.register("polymorphDafny") {
+    dependsOn("build")
+    doLast {
+        // if needed, specify a projection to use instead
+        // default (no projection) is "source"
+        val projectionName = "operation-subset"
+        copy {
+            from(layout.buildDirectory.dir("smithyprojections/" + project.name + "/" + projectionName + "/dafny-client-codegen/project.properties"))
+            into(".")
+        }
+        copy {
+            from(layout.buildDirectory.dir("smithyprojections/" + project.name + "/" + projectionName + "/dafny-client-codegen/Model/"))
+            into("model")
+        }
+        exec {
+            // need to adjust the relative import, since we're copying it away
+            // the commandLine method does not play nice with sed,
+            // so we have to execute it through bash :(
+            commandLine("bash", "-c", "sed '4s|../../../../../../../../dafny-dependencies/StandardLibrary/src/Index.dfy|../../../dafny-dependencies/StandardLibrary/src/Index.dfy|' model/ComAmazonawsLakeformationTypes.dfy > model/tmp && mv model/tmp model/ComAmazonawsLakeformationTypes.dfy")
+        }
+    }
+}
+
+tasks.register("polymorphDotnet") {
+    dependsOn("build")
+    doLast {
+        // if needed, specify a projection to use instead
+        // default (no projection) is "source"
+        val projectionName = "operation-subset"
+        copy {
+            from(layout.buildDirectory.dir("smithyprojections/" + project.name + "/" + projectionName + "/dafny-client-codegen/runtimes/net"))
+            into("runtimes/net")
+        }
+        exec {
+            // need to adjust the relative import, since we're copying it away
+            // the commandLine method does not play nice with sed,
+            // so we have to execute it through bash :(
+            commandLine("bash", "-c", "sed 's|../../../../../../../../../dafny-dependencies/StandardLibrary/runtimes/net/STD.csproj|../../../../dafny-dependencies/StandardLibrary/runtimes/net/STD.csproj|' runtimes/net/LakeFormation.csproj > runtimes/net/tmp && mv runtimes/net/tmp runtimes/net/LakeFormation.csproj")
+        }
+    }
+}
+
+tasks.register("polymorphJava") {
+    dependsOn("build")
+    doLast {
+        // if needed, specify a projection to use instead
+        // default (no projection) is "source"
+        val projectionName = "operation-subset"
+        // We can't just copy runtimes/java over unfortunately,
+        // because we need a fresher software.amazon.awssdk:kms version
+        // than what's in the template.
+        copy {
+            from(layout.buildDirectory.dir("smithyprojections/" + project.name + "/" + projectionName + "/dafny-client-codegen/runtimes/java"))
+            into("runtimes/java")
+        }
+    }
+}
+
+buildscript {
+    val smithyVersion: String by project
+
+    repositories {
+        mavenCentral()
+    }
+    dependencies {
+        "classpath"("software.amazon.smithy:smithy-cli:$smithyVersion")
+    }
+}

TestModels/aws-sdks/lakeformation/gradle.properties

@@ -0,0 +1,3 @@
+smithyVersion=1.27.2
+smithyGradleVersion=0.6.0
+

TestModels/aws-sdks/lakeformation/smithy-build.json

@@ -0,0 +1,28 @@
+{
+  "version": "1.0",
+  "projections": {
+    "operation-subset": {
+      "transforms": [
+        {
+          "name": "excludeShapesBySelector",
+          "args": {
+            "selector": "operation [id|name = GetWorkUnitResults]"
+          }
+        },
+        {
+          "name": "removeUnusedShapes",
+          "args": {}
+        }
+      ],
+      "plugins": {
+        "dafny-client-codegen": {
+          "edition": "2023",
+          "service": "com.amazonaws.lakeformation#AWSLakeFormation",
+          "dafnyVersion": "${DAFNY_VERSION}",
+          "targetLanguages": ["dotnet", "java"],
+          "includeDafnyFile": "../../dafny-dependencies/StandardLibrary/src/Index.dfy"
+        }
+      }
+    }
+  }
+}

TestModels/aws-sdks/lakeformation/src/Index.dfy

@@ -1,6 +1,6 @@
 // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-include "../Model/ComAmazonawsLakeformationTypes.dfy"
+include "../model/ComAmazonawsLakeformationTypes.dfy"
 
 module {:options "--function-syntax:4"}{:extern "software.amazon.cryptography.services.lakeformation.internaldafny"} Com.Amazonaws.LakeFormation refines AbstractComAmazonawsLakeformationService {
 

codegen/smithy-dafny-codegen-test/src/test/java/software/amazon/polymorph/smithyjava/JavaTestModels.java

@@ -38,8 +38,6 @@ class JavaTestModels extends TestModelTest {
     DISABLED_TESTS.add("SimpleTypes/SimpleString");
     DISABLED_TESTS.add("SimpleTypes/SimpleTimestamp");
     DISABLED_TESTS.add("Union");
-    DISABLED_TESTS.add("aws-sdks/glue");
-    DISABLED_TESTS.add("aws-sdks/lakeformation");
     DISABLED_TESTS.add("aws-sdks/kms-lite");
     DISABLED_TESTS.add("aws-sdks/sqs");
     DISABLED_TESTS.add("aws-sdks/sqs-via-cli");

codegen/smithy-dafny-codegen/src/main/java/software/amazon/polymorph/smithyjava/nameresolver/AwsSdkDafnyV2.java

@@ -9,6 +9,8 @@
 import com.squareup.javapoet.ClassName;
 import com.squareup.javapoet.CodeBlock;
 import com.squareup.javapoet.TypeName;
+import software.amazon.awssdk.codegen.internal.Utils;
+import software.amazon.awssdk.utils.internal.CodegenNamingUtils;
 import software.amazon.polymorph.smithydafny.DafnyNameResolver;
 import software.amazon.polymorph.smithydafny.DafnyVersion;
 import software.amazon.polymorph.smithyjava.generator.CodegenSubject;
@@ -118,7 +120,7 @@ public CodeBlock methodForGetMember(
     return CodeBlock.of(
       "$L.$L()",
       variableName,
-      uncapitalize(memberShape.getMemberName())
+      Utils.unCapitalize(memberShape.getMemberName())
     );
   }
 

codegen/smithy-dafny-codegen/src/main/java/software/amazon/polymorph/smithyjava/nameresolver/AwsSdkNativeV1.java

@@ -164,7 +164,7 @@ public ParameterizedTypeName typeForListSetOrMapNoEnum(
     };
   }
 
-  public static ClassName classNameForAwsSdkShape(final Shape shape) {
+  public ClassName classNameForAwsSdkShape(final Shape shape) {
     return ClassName.get(
       defaultModelPackageName(packageNameForAwsSdkV1Shape(shape)),
       StringUtils.capitalize(shape.getId().getName())
@@ -187,7 +187,7 @@ public ClassName classNameForStructure(final Shape shape) {
     }
     // check if this Shape is in AWS SDK for Java V1 package
     if (AwsSdkNameResolverHelpers.isInAwsSdkNamespace(shape.getId())) {
-      AwsSdkNativeV1.classNameForAwsSdkShape(shape);
+      return classNameForAwsSdkShape(shape);
     }
     return super.classNameForStructure(shape);
   }