fix(Java): Improve Collection of Errors string (#1478)

aws · Nov 26, 2024 · 562b3ef · 562b3ef
1 parent cc937b4
commit 562b3ef
Show file tree

Hide file tree

Showing 9 changed files with 147 additions and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -16,3 +16,6 @@ test/**/Output/*
 specification_compliance_report.html
 /compliance
 /.smithy.lsp.log
+
+# logs 
+*.log
diff --git a/DynamoDbEncryption/codegen-patches/DynamoDbEncryption/java/dafny-4.8.0.patch b/DynamoDbEncryption/codegen-patches/DynamoDbEncryption/java/dafny-4.8.0.patch
@@ -0,0 +1,27 @@
+diff --git b/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/model/CollectionOfErrors.java a/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/model/CollectionOfErrors.java
+index c6f44188..c2af7d32 100644
+--- b/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/model/CollectionOfErrors.java
++++ a/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/model/CollectionOfErrors.java
+@@ -4,6 +4,7 @@
+ package software.amazon.cryptography.dbencryptionsdk.dynamodb.model;
+
+ import java.util.List;
++import java.util.stream.Collectors;
+
+ public class CollectionOfErrors extends RuntimeException {
+
+@@ -134,6 +135,14 @@ public class CollectionOfErrors extends RuntimeException {
+     }
+
+     public CollectionOfErrors build() {
++      if (!(this.list == null || this.list.isEmpty())) {
++        this.message =
++          this.message +
++          " String representation of Exceptions in list.\n" +
++          this.list.stream()
++            .map(ex -> ex.getClass().getSimpleName() + ": " + ex.getMessage())
++            .collect(Collectors.joining("\n"));
++      }
+       return new CollectionOfErrors(this);
+     }
+   }
diff --git a/DynamoDbEncryption/codegen-patches/DynamoDbEncryptionTransforms/java/dafny-4.8.0.patch b/DynamoDbEncryption/codegen-patches/DynamoDbEncryptionTransforms/java/dafny-4.8.0.patch
@@ -0,0 +1,27 @@
+diff --git b/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/transforms/model/CollectionOfErrors.java a/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/transforms/model/CollectionOfErrors.java
+index 7a2ca9b0..db01d961 100644
+--- b/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/transforms/model/CollectionOfErrors.java
++++ a/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/transforms/model/CollectionOfErrors.java
+@@ -4,6 +4,7 @@
+ package software.amazon.cryptography.dbencryptionsdk.dynamodb.transforms.model;
+
+ import java.util.List;
++import java.util.stream.Collectors;
+
+ public class CollectionOfErrors extends RuntimeException {
+
+@@ -134,6 +135,14 @@ public class CollectionOfErrors extends RuntimeException {
+     }
+
+     public CollectionOfErrors build() {
++      if (!(this.list == null || this.list.isEmpty())) {
++        this.message =
++          this.message +
++          " String representation of Exceptions in list.\n" +
++          this.list.stream()
++            .map(ex -> ex.getClass().getSimpleName() + ": " + ex.getMessage())
++            .collect(Collectors.joining("\n"));
++      }
+       return new CollectionOfErrors(this);
+     }
+   }
diff --git a/DynamoDbEncryption/codegen-patches/DynamoDbItemEncryptor/java/dafny-4.8.0.patch b/DynamoDbEncryption/codegen-patches/DynamoDbItemEncryptor/java/dafny-4.8.0.patch
@@ -0,0 +1,27 @@
+diff --git b/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/itemencryptor/model/CollectionOfErrors.java a/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/itemencryptor/model/CollectionOfErrors.java
+index 1bb59f8f..19928c23 100644
+--- b/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/itemencryptor/model/CollectionOfErrors.java
++++ a/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/itemencryptor/model/CollectionOfErrors.java
+@@ -4,6 +4,7 @@
+ package software.amazon.cryptography.dbencryptionsdk.dynamodb.itemencryptor.model;
+
+ import java.util.List;
++import java.util.stream.Collectors;
+
+ public class CollectionOfErrors extends RuntimeException {
+
+@@ -134,6 +135,14 @@ public class CollectionOfErrors extends RuntimeException {
+     }
+
+     public CollectionOfErrors build() {
++      if (!(this.list == null || this.list.isEmpty())) {
++        this.message =
++          this.message +
++          " String representation of Exceptions in list.\n" +
++          this.list.stream()
++            .map(ex -> ex.getClass().getSimpleName() + ": " + ex.getMessage())
++            .collect(Collectors.joining("\n"));
++      }
+       return new CollectionOfErrors(this);
+     }
+   }
diff --git a/DynamoDbEncryption/codegen-patches/StructuredEncryption/java/dafny-4.8.0.patch b/DynamoDbEncryption/codegen-patches/StructuredEncryption/java/dafny-4.8.0.patch
@@ -0,0 +1,27 @@
+diff --git b/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/structuredencryption/model/CollectionOfErrors.java a/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/structuredencryption/model/CollectionOfErrors.java
+index a4d45a55..a6c2fc43 100644
+--- b/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/structuredencryption/model/CollectionOfErrors.java
++++ a/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/structuredencryption/model/CollectionOfErrors.java
+@@ -4,6 +4,7 @@
+ package software.amazon.cryptography.dbencryptionsdk.structuredencryption.model;
+
+ import java.util.List;
++import java.util.stream.Collectors;
+
+ public class CollectionOfErrors extends RuntimeException {
+
+@@ -134,6 +135,14 @@ public class CollectionOfErrors extends RuntimeException {
+     }
+
+     public CollectionOfErrors build() {
++      if (!(this.list == null || this.list.isEmpty())) {
++        this.message =
++          this.message +
++          " String representation of Exceptions in list.\n" +
++          this.list.stream()
++            .map(ex -> ex.getClass().getSimpleName() + ": " + ex.getMessage())
++            .collect(Collectors.joining("\n"));
++      }
+       return new CollectionOfErrors(this);
+     }
+   }
diff --git a/.../amazon/cryptography/dbencryptionsdk/dynamodb/itemencryptor/model/CollectionOfErrors.java b/.../amazon/cryptography/dbencryptionsdk/dynamodb/itemencryptor/model/CollectionOfErrors.java
@@ -4,6 +4,7 @@
 package software.amazon.cryptography.dbencryptionsdk.dynamodb.itemencryptor.model;
 
 import java.util.List;
+import java.util.stream.Collectors;
 
 public class CollectionOfErrors extends RuntimeException {
 
@@ -134,6 +135,14 @@ public List<RuntimeException> list() {
     }
 
     public CollectionOfErrors build() {
+      if (!(this.list == null || this.list.isEmpty())) {
+        this.message =
+          this.message +
+          " String representation of Exceptions in list.\n" +
+          this.list.stream()
+            .map(ex -> ex.getClass().getSimpleName() + ": " + ex.getMessage())
+            .collect(Collectors.joining("\n"));
+      }
       return new CollectionOfErrors(this);
     }
   }

diff --git a/...rated/software/amazon/cryptography/dbencryptionsdk/dynamodb/model/CollectionOfErrors.java b/...rated/software/amazon/cryptography/dbencryptionsdk/dynamodb/model/CollectionOfErrors.java
@@ -4,6 +4,7 @@
 package software.amazon.cryptography.dbencryptionsdk.dynamodb.model;
 
 import java.util.List;
+import java.util.stream.Collectors;
 
 public class CollectionOfErrors extends RuntimeException {
 
@@ -134,6 +135,14 @@ public List<RuntimeException> list() {
     }
 
     public CollectionOfErrors build() {
+      if (!(this.list == null || this.list.isEmpty())) {
+        this.message =
+          this.message +
+          " String representation of Exceptions in list.\n" +
+          this.list.stream()
+            .map(ex -> ex.getClass().getSimpleName() + ": " + ex.getMessage())
+            .collect(Collectors.joining("\n"));
+      }
       return new CollectionOfErrors(this);
     }
   }

diff --git a/...are/amazon/cryptography/dbencryptionsdk/dynamodb/transforms/model/CollectionOfErrors.java b/...are/amazon/cryptography/dbencryptionsdk/dynamodb/transforms/model/CollectionOfErrors.java
@@ -4,6 +4,7 @@
 package software.amazon.cryptography.dbencryptionsdk.dynamodb.transforms.model;
 
 import java.util.List;
+import java.util.stream.Collectors;
 
 public class CollectionOfErrors extends RuntimeException {
 
@@ -134,6 +135,14 @@ public List<RuntimeException> list() {
     }
 
     public CollectionOfErrors build() {
+      if (!(this.list == null || this.list.isEmpty())) {
+        this.message =
+          this.message +
+          " String representation of Exceptions in list.\n" +
+          this.list.stream()
+            .map(ex -> ex.getClass().getSimpleName() + ": " + ex.getMessage())
+            .collect(Collectors.joining("\n"));
+      }
       return new CollectionOfErrors(this);
     }
   }

diff --git a/...re/amazon/cryptography/dbencryptionsdk/structuredencryption/model/CollectionOfErrors.java b/...re/amazon/cryptography/dbencryptionsdk/structuredencryption/model/CollectionOfErrors.java
@@ -4,6 +4,7 @@
 package software.amazon.cryptography.dbencryptionsdk.structuredencryption.model;
 
 import java.util.List;
+import java.util.stream.Collectors;
 
 public class CollectionOfErrors extends RuntimeException {
 
@@ -134,6 +135,14 @@ public List<RuntimeException> list() {
     }
 
     public CollectionOfErrors build() {
+      if (!(this.list == null || this.list.isEmpty())) {
+        this.message =
+          this.message +
+          " String representation of Exceptions in list.\n" +
+          this.list.stream()
+            .map(ex -> ex.getClass().getSimpleName() + ": " + ex.getMessage())
+            .collect(Collectors.joining("\n"));
+      }
       return new CollectionOfErrors(this);
     }
   }