From 7b959f36198fdcbdfb50c0b23d0be0507ebecf41 Mon Sep 17 00:00:00 2001 From: Timon Back Date: Sat, 9 Nov 2024 18:26:38 +0100 Subject: [PATCH] test: Use enums with fields in test (#1064) --- .../DefaultJsonComponentsServiceIntegrationTest.java | 8 ++++++-- .../DefaultXmlComponentsServiceIntegrationTest.java | 8 ++++++-- .../DefaultYamlComponentsServiceIntegrationTest.java | 8 ++++++-- .../examples/amqp/dtos/ExamplePayloadDto.java | 10 +++++++--- .../examples/cloudstream/dtos/ExamplePayloadDto.java | 10 +++++++--- .../examples/jms/dtos/ExamplePayloadDto.java | 10 +++++++--- .../examples/kafka/dtos/ExamplePayloadDto.java | 10 +++++++--- .../springwolf/examples/kafka/dtos/XmlPayloadDto.java | 10 +++++++--- .../springwolf/examples/kafka/dtos/YamlPayloadDto.java | 10 +++++++--- .../examples/sns/dtos/ExamplePayloadDto.java | 10 +++++++--- .../examples/sqs/dtos/ExamplePayloadDto.java | 10 +++++++--- .../examples/stomp/dtos/ExamplePayloadDto.java | 10 +++++++--- .../src/test/resources/asyncapi.json | 2 +- 13 files changed, 82 insertions(+), 34 deletions(-) diff --git a/springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/components/DefaultJsonComponentsServiceIntegrationTest.java b/springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/components/DefaultJsonComponentsServiceIntegrationTest.java index b90759225..3a30afacc 100644 --- a/springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/components/DefaultJsonComponentsServiceIntegrationTest.java +++ b/springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/components/DefaultJsonComponentsServiceIntegrationTest.java @@ -26,6 +26,7 @@ import lombok.Data; import lombok.Getter; import lombok.NoArgsConstructor; +import lombok.RequiredArgsConstructor; import lombok.Setter; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; @@ -179,9 +180,12 @@ private static class FooWithEnum { private String s; private Bar b; + @RequiredArgsConstructor private enum Bar { - BAR1, - BAR2 + BAR1(1), + BAR2(2); + + private final int code; } } diff --git a/springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/components/DefaultXmlComponentsServiceIntegrationTest.java b/springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/components/DefaultXmlComponentsServiceIntegrationTest.java index 9522f6262..6b9fe516b 100644 --- a/springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/components/DefaultXmlComponentsServiceIntegrationTest.java +++ b/springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/components/DefaultXmlComponentsServiceIntegrationTest.java @@ -24,6 +24,7 @@ import jakarta.xml.bind.annotation.XmlRootElement; import lombok.Data; import lombok.NoArgsConstructor; +import lombok.RequiredArgsConstructor; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; @@ -191,9 +192,12 @@ private static class FooWithEnum { private String s; private Bar b; + @RequiredArgsConstructor private enum Bar { - BAR1, - BAR2 + BAR1(1), + BAR2(2); + + private final int code; } } diff --git a/springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/components/DefaultYamlComponentsServiceIntegrationTest.java b/springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/components/DefaultYamlComponentsServiceIntegrationTest.java index d523fbfc2..01ff86486 100644 --- a/springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/components/DefaultYamlComponentsServiceIntegrationTest.java +++ b/springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/components/DefaultYamlComponentsServiceIntegrationTest.java @@ -28,6 +28,7 @@ import lombok.Data; import lombok.Getter; import lombok.NoArgsConstructor; +import lombok.RequiredArgsConstructor; import lombok.Setter; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; @@ -185,9 +186,12 @@ private static class FooWithEnum { private String s; private Bar b; + @RequiredArgsConstructor private enum Bar { - BAR1, - BAR2 + BAR1(1), + BAR2(2); + + private final int code; } } diff --git a/springwolf-examples/springwolf-amqp-example/src/main/java/io/github/springwolf/examples/amqp/dtos/ExamplePayloadDto.java b/springwolf-examples/springwolf-amqp-example/src/main/java/io/github/springwolf/examples/amqp/dtos/ExamplePayloadDto.java index 3767175e9..9b5e4f50a 100644 --- a/springwolf-examples/springwolf-amqp-example/src/main/java/io/github/springwolf/examples/amqp/dtos/ExamplePayloadDto.java +++ b/springwolf-examples/springwolf-amqp-example/src/main/java/io/github/springwolf/examples/amqp/dtos/ExamplePayloadDto.java @@ -5,6 +5,7 @@ import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +import lombok.RequiredArgsConstructor; import static io.swagger.v3.oas.annotations.media.Schema.RequiredMode.REQUIRED; @@ -22,9 +23,12 @@ public class ExamplePayloadDto { @Schema(description = "Some enum field", example = "FOO2", requiredMode = REQUIRED) private ExampleEnum someEnum; + @RequiredArgsConstructor public enum ExampleEnum { - FOO1, - FOO2, - FOO3 + FOO1(1), + FOO2(2), + FOO3(3); + + private final int code; } } diff --git a/springwolf-examples/springwolf-cloud-stream-example/src/main/java/io/github/springwolf/examples/cloudstream/dtos/ExamplePayloadDto.java b/springwolf-examples/springwolf-cloud-stream-example/src/main/java/io/github/springwolf/examples/cloudstream/dtos/ExamplePayloadDto.java index 11c9510be..f2ca205b0 100644 --- a/springwolf-examples/springwolf-cloud-stream-example/src/main/java/io/github/springwolf/examples/cloudstream/dtos/ExamplePayloadDto.java +++ b/springwolf-examples/springwolf-cloud-stream-example/src/main/java/io/github/springwolf/examples/cloudstream/dtos/ExamplePayloadDto.java @@ -5,6 +5,7 @@ import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +import lombok.RequiredArgsConstructor; import static io.swagger.v3.oas.annotations.media.Schema.RequiredMode.REQUIRED; @@ -22,9 +23,12 @@ public class ExamplePayloadDto { @Schema(description = "Some enum field", example = "FOO2", requiredMode = REQUIRED) private ExampleEnum someEnum; + @RequiredArgsConstructor public enum ExampleEnum { - FOO1, - FOO2, - FOO3 + FOO1(1), + FOO2(2), + FOO3(3); + + private final int code; } } diff --git a/springwolf-examples/springwolf-jms-example/src/main/java/io/github/springwolf/examples/jms/dtos/ExamplePayloadDto.java b/springwolf-examples/springwolf-jms-example/src/main/java/io/github/springwolf/examples/jms/dtos/ExamplePayloadDto.java index eef11d8c5..4138a2943 100644 --- a/springwolf-examples/springwolf-jms-example/src/main/java/io/github/springwolf/examples/jms/dtos/ExamplePayloadDto.java +++ b/springwolf-examples/springwolf-jms-example/src/main/java/io/github/springwolf/examples/jms/dtos/ExamplePayloadDto.java @@ -5,6 +5,7 @@ import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +import lombok.RequiredArgsConstructor; import static io.swagger.v3.oas.annotations.media.Schema.RequiredMode.REQUIRED; @@ -22,9 +23,12 @@ public class ExamplePayloadDto { @Schema(description = "Some enum field", example = "FOO2", requiredMode = REQUIRED) private ExampleEnum someEnum; + @RequiredArgsConstructor public enum ExampleEnum { - FOO1, - FOO2, - FOO3 + FOO1(1), + FOO2(2), + FOO3(3); + + private final int code; } } diff --git a/springwolf-examples/springwolf-kafka-example/src/main/java/io/github/springwolf/examples/kafka/dtos/ExamplePayloadDto.java b/springwolf-examples/springwolf-kafka-example/src/main/java/io/github/springwolf/examples/kafka/dtos/ExamplePayloadDto.java index be4dd2aa6..e72c6ccfc 100644 --- a/springwolf-examples/springwolf-kafka-example/src/main/java/io/github/springwolf/examples/kafka/dtos/ExamplePayloadDto.java +++ b/springwolf-examples/springwolf-kafka-example/src/main/java/io/github/springwolf/examples/kafka/dtos/ExamplePayloadDto.java @@ -5,6 +5,7 @@ import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +import lombok.RequiredArgsConstructor; import static io.swagger.v3.oas.annotations.media.Schema.RequiredMode.REQUIRED; @@ -44,9 +45,12 @@ public class ExamplePayloadDto { @Schema(description = "Some enum field", example = "FOO2", requiredMode = REQUIRED) private ExampleEnum someEnum; + @RequiredArgsConstructor public enum ExampleEnum { - FOO1, - FOO2, - FOO3 + FOO1(1), + FOO2(2), + FOO3(3); + + private final int code; } } diff --git a/springwolf-examples/springwolf-kafka-example/src/main/java/io/github/springwolf/examples/kafka/dtos/XmlPayloadDto.java b/springwolf-examples/springwolf-kafka-example/src/main/java/io/github/springwolf/examples/kafka/dtos/XmlPayloadDto.java index 9f9b10f4f..d5c299142 100644 --- a/springwolf-examples/springwolf-kafka-example/src/main/java/io/github/springwolf/examples/kafka/dtos/XmlPayloadDto.java +++ b/springwolf-examples/springwolf-kafka-example/src/main/java/io/github/springwolf/examples/kafka/dtos/XmlPayloadDto.java @@ -5,6 +5,7 @@ import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +import lombok.RequiredArgsConstructor; @Data @AllArgsConstructor @@ -20,9 +21,12 @@ public class XmlPayloadDto { private ExampleEnum someEnum; + @RequiredArgsConstructor public enum ExampleEnum { - FOO1, - FOO2, - FOO3 + FOO1(1), + FOO2(2), + FOO3(3); + + private final int code; } } diff --git a/springwolf-examples/springwolf-kafka-example/src/main/java/io/github/springwolf/examples/kafka/dtos/YamlPayloadDto.java b/springwolf-examples/springwolf-kafka-example/src/main/java/io/github/springwolf/examples/kafka/dtos/YamlPayloadDto.java index 8fc2843a2..13f9587ab 100644 --- a/springwolf-examples/springwolf-kafka-example/src/main/java/io/github/springwolf/examples/kafka/dtos/YamlPayloadDto.java +++ b/springwolf-examples/springwolf-kafka-example/src/main/java/io/github/springwolf/examples/kafka/dtos/YamlPayloadDto.java @@ -4,6 +4,7 @@ import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +import lombok.RequiredArgsConstructor; @Data @AllArgsConstructor @@ -16,9 +17,12 @@ public class YamlPayloadDto { private ExampleEnum someEnum; + @RequiredArgsConstructor public enum ExampleEnum { - FOO1, - FOO2, - FOO3 + FOO1(1), + FOO2(2), + FOO3(3); + + private final int code; } } diff --git a/springwolf-examples/springwolf-sns-example/src/main/java/io/github/springwolf/examples/sns/dtos/ExamplePayloadDto.java b/springwolf-examples/springwolf-sns-example/src/main/java/io/github/springwolf/examples/sns/dtos/ExamplePayloadDto.java index dc42a827e..e3e4a0ca2 100644 --- a/springwolf-examples/springwolf-sns-example/src/main/java/io/github/springwolf/examples/sns/dtos/ExamplePayloadDto.java +++ b/springwolf-examples/springwolf-sns-example/src/main/java/io/github/springwolf/examples/sns/dtos/ExamplePayloadDto.java @@ -5,6 +5,7 @@ import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +import lombok.RequiredArgsConstructor; import static io.swagger.v3.oas.annotations.media.Schema.RequiredMode.REQUIRED; @@ -22,9 +23,12 @@ public class ExamplePayloadDto { @Schema(description = "Some enum field", example = "FOO2", requiredMode = REQUIRED) private ExampleEnum someEnum; + @RequiredArgsConstructor public enum ExampleEnum { - FOO1, - FOO2, - FOO3 + FOO1(1), + FOO2(2), + FOO3(3); + + private final int code; } } diff --git a/springwolf-examples/springwolf-sqs-example/src/main/java/io/github/springwolf/examples/sqs/dtos/ExamplePayloadDto.java b/springwolf-examples/springwolf-sqs-example/src/main/java/io/github/springwolf/examples/sqs/dtos/ExamplePayloadDto.java index 0e2ed8781..f07044e00 100644 --- a/springwolf-examples/springwolf-sqs-example/src/main/java/io/github/springwolf/examples/sqs/dtos/ExamplePayloadDto.java +++ b/springwolf-examples/springwolf-sqs-example/src/main/java/io/github/springwolf/examples/sqs/dtos/ExamplePayloadDto.java @@ -5,6 +5,7 @@ import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +import lombok.RequiredArgsConstructor; import static io.swagger.v3.oas.annotations.media.Schema.RequiredMode.REQUIRED; @@ -22,9 +23,12 @@ public class ExamplePayloadDto { @Schema(description = "Some enum field", example = "FOO2", requiredMode = REQUIRED) private ExampleEnum someEnum; + @RequiredArgsConstructor public enum ExampleEnum { - FOO1, - FOO2, - FOO3 + FOO1(1), + FOO2(2), + FOO3(3); + + private final int code; } } diff --git a/springwolf-examples/springwolf-stomp-example/src/main/java/io/github/springwolf/examples/stomp/dtos/ExamplePayloadDto.java b/springwolf-examples/springwolf-stomp-example/src/main/java/io/github/springwolf/examples/stomp/dtos/ExamplePayloadDto.java index 97a171046..40a8ff40f 100644 --- a/springwolf-examples/springwolf-stomp-example/src/main/java/io/github/springwolf/examples/stomp/dtos/ExamplePayloadDto.java +++ b/springwolf-examples/springwolf-stomp-example/src/main/java/io/github/springwolf/examples/stomp/dtos/ExamplePayloadDto.java @@ -5,6 +5,7 @@ import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +import lombok.RequiredArgsConstructor; import static io.swagger.v3.oas.annotations.media.Schema.RequiredMode.REQUIRED; @@ -22,9 +23,12 @@ public class ExamplePayloadDto { @Schema(description = "Some enum field", example = "FOO2", requiredMode = REQUIRED) private ExampleEnum someEnum; + @RequiredArgsConstructor public enum ExampleEnum { - FOO1, - FOO2, - FOO3 + FOO1(1), + FOO2(2), + FOO3(3); + + private final int code; } } diff --git a/springwolf-examples/springwolf-stomp-example/src/test/resources/asyncapi.json b/springwolf-examples/springwolf-stomp-example/src/test/resources/asyncapi.json index c44b99cd0..282eff499 100644 --- a/springwolf-examples/springwolf-stomp-example/src/test/resources/asyncapi.json +++ b/springwolf-examples/springwolf-stomp-example/src/test/resources/asyncapi.json @@ -298,4 +298,4 @@ } } } -} +} \ No newline at end of file