Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,6 @@ test/**/Output/*
specification_compliance_report.html
/compliance
/.smithy.lsp.log

# logs
*.log
Original file line number Diff line number Diff line change
@@ -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);
}
}
Original file line number Diff line number Diff line change
@@ -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);
}
}
Original file line number Diff line number Diff line change
@@ -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);
}
}
Original file line number Diff line number Diff line change
@@ -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);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down Expand Up @@ -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);
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down Expand Up @@ -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);
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down Expand Up @@ -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);
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down Expand Up @@ -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);
}
}
Expand Down
Loading