test: Use enums with fields in test (springwolf#1064)

timonback · Nov 9, 2024 · 7b959f3 · 7b959f3
1 parent b27151a
commit 7b959f3
Show file tree

Hide file tree

Showing 13 changed files with 82 additions and 34 deletions.
diff --git a/...thub/springwolf/core/asyncapi/components/DefaultJsonComponentsServiceIntegrationTest.java b/...thub/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/...ithub/springwolf/core/asyncapi/components/DefaultXmlComponentsServiceIntegrationTest.java b/...ithub/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/...thub/springwolf/core/asyncapi/components/DefaultYamlComponentsServiceIntegrationTest.java b/...thub/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/...amqp-example/src/main/java/io/github/springwolf/examples/amqp/dtos/ExamplePayloadDto.java b/...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/...ample/src/main/java/io/github/springwolf/examples/cloudstream/dtos/ExamplePayloadDto.java b/...ample/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/...f-jms-example/src/main/java/io/github/springwolf/examples/jms/dtos/ExamplePayloadDto.java b/...f-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/...fka-example/src/main/java/io/github/springwolf/examples/kafka/dtos/ExamplePayloadDto.java b/...fka-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/...f-kafka-example/src/main/java/io/github/springwolf/examples/kafka/dtos/XmlPayloadDto.java b/...f-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/...-kafka-example/src/main/java/io/github/springwolf/examples/kafka/dtos/YamlPayloadDto.java b/...-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/...f-sns-example/src/main/java/io/github/springwolf/examples/sns/dtos/ExamplePayloadDto.java b/...f-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/...f-sqs-example/src/main/java/io/github/springwolf/examples/sqs/dtos/ExamplePayloadDto.java b/...f-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/...omp-example/src/main/java/io/github/springwolf/examples/stomp/dtos/ExamplePayloadDto.java b/...omp-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
@@ -298,4 +298,4 @@
       }
     }
   }
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -298,4 +298,4 @@ @@
           }
         }
       }
-    }
+    }