fix(Java): Improve Collection of Errors string

texastony · texastony · commit 56b1c534f122 · 2024-11-25T16:45:30.000-08:00
Update was created by:
for FILE in $(find */runtimes/java/** -name "CollectionOfErrors.java"); do emacs $FILE; done
for FILE in $(find */runtimes/java/** -name "CollectionOfErrors.java"); do git add $FILE; done
cd TestVectorsAwsCryptographicMaterialProviders
gmake polymorph_java DAFNY_VERSION=4.9.0 POLYMORPH_OPTIONS=--update-patch-files |&amp; tee poly.log |&amp; less -r +F
diff --git a/AwsCryptographicMaterialProviders/codegen-patches/AwsCryptographicMaterialProviders/java/dafny-4.9.0.patch b/AwsCryptographicMaterialProviders/codegen-patches/AwsCryptographicMaterialProviders/java/dafny-4.9.0.patch
@@ -0,0 +1,29 @@
+diff --git b/AwsCryptographicMaterialProviders/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/materialproviders/model/CollectionOfErrors.java a/AwsCryptographicMaterialProviders/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/materialproviders/model/CollectionOfErrors.java
+index 796adaa3e..d1eea14c4 100644
+--- b/AwsCryptographicMaterialProviders/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/materialproviders/model/CollectionOfErrors.java
++++ a/AwsCryptographicMaterialProviders/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/materialproviders/model/CollectionOfErrors.java
+@@ -4,6 +4,9 @@
+ package software.amazon.cryptography.materialproviders.model;
+ 
+ import java.util.List;
++import java.util.stream.Collectors;
++import software.amazon.awssdk.utils.CollectionUtils;
++import software.amazon.awssdk.utils.StringUtils;
+ 
+ public class CollectionOfErrors extends RuntimeException {
+ 
+@@ -134,6 +137,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/AwsCryptographicMaterialProviders/codegen-patches/AwsCryptographyKeyStore/java/dafny-4.9.0.patch b/AwsCryptographicMaterialProviders/codegen-patches/AwsCryptographyKeyStore/java/dafny-4.9.0.patch
@@ -0,0 +1,28 @@
+diff --git b/AwsCryptographicMaterialProviders/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/keystore/model/CollectionOfErrors.java a/AwsCryptographicMaterialProviders/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/keystore/model/CollectionOfErrors.java
+index 9247dd55f..e74f3e03a 100644
+--- b/AwsCryptographicMaterialProviders/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/keystore/model/CollectionOfErrors.java
++++ a/AwsCryptographicMaterialProviders/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/keystore/model/CollectionOfErrors.java
+@@ -4,6 +4,8 @@
+ package software.amazon.cryptography.keystore.model;
+ 
+ import java.util.List;
++import java.util.stream.Collectors;
++import software.amazon.awssdk.utils.CollectionUtils;
+ 
+ public class CollectionOfErrors extends RuntimeException {
+ 
+@@ -134,6 +136,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/AwsCryptographicMaterialProviders/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/keystore/model/CollectionOfErrors.java b/AwsCryptographicMaterialProviders/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/keystore/model/CollectionOfErrors.java
@@ -4,6 +4,8 @@
 package software.amazon.cryptography.keystore.model;
 
 import java.util.List;
+import java.util.stream.Collectors;
+import software.amazon.awssdk.utils.CollectionUtils;
 
 public class CollectionOfErrors extends RuntimeException {
 
@@ -134,6 +136,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/AwsCryptographicMaterialProviders/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/materialproviders/model/CollectionOfErrors.java b/AwsCryptographicMaterialProviders/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/materialproviders/model/CollectionOfErrors.java
@@ -4,6 +4,9 @@
 package software.amazon.cryptography.materialproviders.model;
 
 import java.util.List;
+import java.util.stream.Collectors;
+import software.amazon.awssdk.utils.CollectionUtils;
+import software.amazon.awssdk.utils.StringUtils;
 
 public class CollectionOfErrors extends RuntimeException {
 
@@ -134,6 +137,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/AwsCryptographyPrimitives/codegen-patches/java/dafny-4.9.0.patch b/AwsCryptographyPrimitives/codegen-patches/java/dafny-4.9.0.patch
@@ -0,0 +1,27 @@
+diff --git b/AwsCryptographyPrimitives/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/primitives/model/CollectionOfErrors.java a/AwsCryptographyPrimitives/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/primitives/model/CollectionOfErrors.java
+index 7ba6ce4a4..06df95868 100644
+--- b/AwsCryptographyPrimitives/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/primitives/model/CollectionOfErrors.java
++++ a/AwsCryptographyPrimitives/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/primitives/model/CollectionOfErrors.java
+@@ -4,6 +4,7 @@
+ package software.amazon.cryptography.primitives.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/AwsCryptographyPrimitives/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/primitives/model/CollectionOfErrors.java b/AwsCryptographyPrimitives/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/primitives/model/CollectionOfErrors.java
@@ -4,6 +4,7 @@
 package software.amazon.cryptography.primitives.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/TestVectorsAwsCryptographicMaterialProviders/codegen-patches/KeyVectors/java/dafny-4.9.0.patch b/TestVectorsAwsCryptographicMaterialProviders/codegen-patches/KeyVectors/java/dafny-4.9.0.patch
@@ -0,0 +1,27 @@
+diff --git b/TestVectorsAwsCryptographicMaterialProviders/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/materialproviderstestvectorkeys/model/CollectionOfErrors.java a/TestVectorsAwsCryptographicMaterialProviders/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/materialproviderstestvectorkeys/model/CollectionOfErrors.java
+index c8bb5b93a..97013b1f5 100644
+--- b/TestVectorsAwsCryptographicMaterialProviders/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/materialproviderstestvectorkeys/model/CollectionOfErrors.java
++++ a/TestVectorsAwsCryptographicMaterialProviders/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/materialproviderstestvectorkeys/model/CollectionOfErrors.java
+@@ -4,6 +4,7 @@
+ package software.amazon.cryptography.materialproviderstestvectorkeys.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/TestVectorsAwsCryptographicMaterialProviders/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/materialproviderstestvectorkeys/model/CollectionOfErrors.java b/TestVectorsAwsCryptographicMaterialProviders/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/materialproviderstestvectorkeys/model/CollectionOfErrors.java
@@ -4,6 +4,7 @@
 package software.amazon.cryptography.materialproviderstestvectorkeys.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);
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,8 @@`
`4`	`4`	`package software.amazon.cryptography.keystore.model;`
`5`	`5`
`6`	`6`	`import java.util.List;`
	`7`	`+import java.util.stream.Collectors;`
	`8`	`+import software.amazon.awssdk.utils.CollectionUtils;`
`7`	`9`
`8`	`10`	`public class CollectionOfErrors extends RuntimeException {`
`9`	`11`
`@@ -134,6 +136,14 @@ public List<RuntimeException> list() {`
`134`	`136`	`}`
`135`	`137`
`136`	`138`	`public CollectionOfErrors build() {`
	`139`	`+ if (!(this.list == null \|\| this.list.isEmpty())) {`
	`140`	`+ this.message =`
	`141`	`+ this.message +`
	`142`	`+ " String representation of Exceptions in list.\n" +`
	`143`	`+ this.list.stream()`
	`144`	`+ .map(ex -> ex.getClass().getSimpleName() + ": " + ex.getMessage())`
	`145`	`+ .collect(Collectors.joining("\n"));`
	`146`	`+ }`
`137`	`147`	`return new CollectionOfErrors(this);`
`138`	`148`	`}`
`139`	`149`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`	`package software.amazon.cryptography.primitives.model;`
`5`	`5`
`6`	`6`	`import java.util.List;`
	`7`	`+import java.util.stream.Collectors;`
`7`	`8`
`8`	`9`	`public class CollectionOfErrors extends RuntimeException {`
`9`	`10`
`@@ -134,6 +135,14 @@ public List<RuntimeException> list() {`
`134`	`135`	`}`
`135`	`136`
`136`	`137`	`public CollectionOfErrors build() {`
	`138`	`+ if (!(this.list == null \|\| this.list.isEmpty())) {`
	`139`	`+ this.message =`
	`140`	`+ this.message +`
	`141`	`+ " String representation of Exceptions in list.\n" +`
	`142`	`+ this.list.stream()`
	`143`	`+ .map(ex -> ex.getClass().getSimpleName() + ": " + ex.getMessage())`
	`144`	`+ .collect(Collectors.joining("\n"));`
	`145`	`+ }`
`137`	`146`	`return new CollectionOfErrors(this);`
`138`	`147`	`}`
`139`	`148`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`	`package software.amazon.cryptography.materialproviderstestvectorkeys.model;`
`5`	`5`
`6`	`6`	`import java.util.List;`
	`7`	`+import java.util.stream.Collectors;`
`7`	`8`
`8`	`9`	`public class CollectionOfErrors extends RuntimeException {`
`9`	`10`
`@@ -134,6 +135,14 @@ public List<RuntimeException> list() {`
`134`	`135`	`}`
`135`	`136`
`136`	`137`	`public CollectionOfErrors build() {`
	`138`	`+ if (!(this.list == null \|\| this.list.isEmpty())) {`
	`139`	`+ this.message =`
	`140`	`+ this.message +`
	`141`	`+ " String representation of Exceptions in list.\n" +`
	`142`	`+ this.list.stream()`
	`143`	`+ .map(ex -> ex.getClass().getSimpleName() + ": " + ex.getMessage())`
	`144`	`+ .collect(Collectors.joining("\n"));`
	`145`	`+ }`
`137`	`146`	`return new CollectionOfErrors(this);`
`138`	`147`	`}`
`139`	`148`	`}`