Activate useBeanValidation flag

pe-st · Mar 26, 2024 · ec83cf0 · ec83cf0
1 parent dde3a5e
commit ec83cf0
Show file tree

Hide file tree

Showing 12 changed files with 55 additions and 3 deletions.
diff --git a/design-first-openapi-generator/pom.xml b/design-first-openapi-generator/pom.xml
@@ -143,7 +143,7 @@
                                 <dateLibrary>java8</dateLibrary>
                                 <library>native</library>
                                 <useJakartaEe>true</useJakartaEe>
-                                <useBeanValidation>false</useBeanValidation>
+                                <useBeanValidation>true</useBeanValidation>
                                 <sourceFolder>.</sourceFolder>
                                 <modelPackage>ch.schlau.pesche.apidocs.openapi.designfirst.generated.model</modelPackage>
                             </configOptions>

diff --git a/design-first-openapi-generator/src/test/resources/EmvTags.java.txt b/design-first-openapi-generator/src/test/resources/EmvTags.java.txt
@@ -23,6 +23,8 @@ import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
 import java.util.Arrays;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import jakarta.validation.constraints.*;
+import jakarta.validation.Valid;
 
 
 /**
@@ -53,6 +55,7 @@ public class EmvTags {
    * @return _84
   **/
   @jakarta.annotation.Nullable
+
   @JsonProperty(JSON_PROPERTY_84)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
@@ -78,6 +81,7 @@ public class EmvTags {
    * @return _9F1A
   **/
   @jakarta.annotation.Nullable
+
   @JsonProperty(JSON_PROPERTY_9_F1_A)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 

diff --git a/design-first-openapi-generator/src/test/resources/PinCheckRequest.java.txt b/design-first-openapi-generator/src/test/resources/PinCheckRequest.java.txt
@@ -24,6 +24,8 @@ import com.fasterxml.jackson.annotation.JsonValue;
 import java.util.Arrays;
 import java.util.UUID;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import jakarta.validation.constraints.*;
+import jakarta.validation.Valid;
 
 
 /**
@@ -58,6 +60,9 @@ public class PinCheckRequest {
    * @return pan
   **/
   @jakarta.annotation.Nonnull
+  @NotNull
+  @Valid
+
   @JsonProperty(JSON_PROPERTY_PAN)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
 
@@ -83,6 +88,8 @@ public class PinCheckRequest {
    * @return pinBlock
   **/
   @jakarta.annotation.Nonnull
+  @NotNull
+
   @JsonProperty(JSON_PROPERTY_PIN_BLOCK)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
 
@@ -108,6 +115,9 @@ public class PinCheckRequest {
    * @return uuid
   **/
   @jakarta.annotation.Nonnull
+  @NotNull
+  @Valid
+
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
 

diff --git a/design-first-openapi-generator/src/test/resources/PinCheckResponse.java.txt b/design-first-openapi-generator/src/test/resources/PinCheckResponse.java.txt
@@ -23,6 +23,8 @@ import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
 import java.util.Arrays;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import jakarta.validation.constraints.*;
+import jakarta.validation.Valid;
 
 
 /**
@@ -88,6 +90,7 @@ public class PinCheckResponse {
    * @return result
   **/
   @jakarta.annotation.Nullable
+
   @JsonProperty(JSON_PROPERTY_RESULT)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
@@ -113,6 +116,7 @@ public class PinCheckResponse {
    * @return tries
   **/
   @jakarta.annotation.Nullable
+
   @JsonProperty(JSON_PROPERTY_TRIES)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 

diff --git a/design-first-openapi-generator/src/test/resources/PurchaseAuthRequest.java.txt b/design-first-openapi-generator/src/test/resources/PurchaseAuthRequest.java.txt
@@ -25,6 +25,8 @@ import com.fasterxml.jackson.annotation.JsonValue;
 import java.util.Arrays;
 import java.util.UUID;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import jakarta.validation.constraints.*;
+import jakarta.validation.Valid;
 
 
 /**
@@ -59,6 +61,8 @@ public class PurchaseAuthRequest {
    * @return emvTags
   **/
   @jakarta.annotation.Nullable
+  @Valid
+
   @JsonProperty(JSON_PROPERTY_EMV_TAGS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
@@ -84,6 +88,9 @@ public class PurchaseAuthRequest {
    * @return pan
   **/
   @jakarta.annotation.Nonnull
+  @NotNull
+  @Valid
+
   @JsonProperty(JSON_PROPERTY_PAN)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
 
@@ -109,6 +116,9 @@ public class PurchaseAuthRequest {
    * @return uuid
   **/
   @jakarta.annotation.Nonnull
+  @NotNull
+  @Valid
+
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
 

diff --git a/design-first-openapi-generator/src/test/resources/PurchaseAuthResponse.java.txt b/design-first-openapi-generator/src/test/resources/PurchaseAuthResponse.java.txt
@@ -23,6 +23,8 @@ import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
 import java.util.Arrays;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import jakarta.validation.constraints.*;
+import jakarta.validation.Valid;
 
 
 /**
@@ -88,6 +90,7 @@ public class PurchaseAuthResponse {
    * @return approvalCode
   **/
   @jakarta.annotation.Nullable
+
   @JsonProperty(JSON_PROPERTY_APPROVAL_CODE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
@@ -113,6 +116,7 @@ public class PurchaseAuthResponse {
    * @return result
   **/
   @jakarta.annotation.Nullable
+
   @JsonProperty(JSON_PROPERTY_RESULT)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 

diff --git a/design-first-swagger-quarkus/pom.xml b/design-first-swagger-quarkus/pom.xml
@@ -138,14 +138,14 @@
                                 <java8>true</java8>
                                 <dateLibrary>java8</dateLibrary>
                                 <library>resteasy</library>
-                                <useBeanValidation>false</useBeanValidation>
+                                <jakarta>true</jakarta>
+                                <useBeanValidation>true</useBeanValidation>
                                 <sourceFolder>.</sourceFolder>
                                 <modelPackage>ch.schlau.pesche.apidocs.swagger.designfirst.generated.model</modelPackage>
                             </configOptions>
                             <additionalProperties>
                                 <!-- disable the @Generated annotation (with timestamp) in generated code, it makes it difficult to compare it -->
                                 <additionalProperty>hideGenerationTimestamp=true</additionalProperty>
-                                <additionalProperty>jakarta=true</additionalProperty>
                             </additionalProperties>
                             <importMappings>
                                 <importMapping>Pan=ch.schlau.pesche.apidocs.swagger.designfirst.txproc.model.Pan</importMapping>

diff --git a/design-first-swagger-quarkus/src/test/resources/EmvTags.java.txt b/design-first-swagger-quarkus/src/test/resources/EmvTags.java.txt
@@ -18,6 +18,8 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.*;
+import jakarta.validation.Valid;
 /**
  * Collection of EMV tags
  */

diff --git a/design-first-swagger-quarkus/src/test/resources/PinCheckRequest.java.txt b/design-first-swagger-quarkus/src/test/resources/PinCheckRequest.java.txt
@@ -19,6 +19,8 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.v3.oas.annotations.media.Schema;
 import java.util.UUID;
+import jakarta.validation.constraints.*;
+import jakarta.validation.Valid;
 /**
  * Request for checking a PIN
  */
@@ -44,6 +46,8 @@ public class PinCheckRequest {
    * Get pan
    * @return pan
   **/
+  @NotNull
+  @Valid
   @Schema(required = true, description = "")
   public ch.schlau.pesche.apidocs.swagger.designfirst.txproc.model.Pan getPan() {
     return pan;
@@ -62,6 +66,7 @@ public class PinCheckRequest {
    * Encrypted binary data containing a PIN  Fieldcode: C003
    * @return pinBlock
   **/
+  @NotNull
   @Schema(required = true, description = "Encrypted binary data containing a PIN  Fieldcode: C003")
   public String getPinBlock() {
     return pinBlock;
@@ -80,6 +85,8 @@ public class PinCheckRequest {
    * Unique ID of the request
    * @return uuid
   **/
+  @NotNull
+  @Valid
   @Schema(required = true, description = "Unique ID of the request")
   public UUID getUuid() {
     return uuid;

diff --git a/design-first-swagger-quarkus/src/test/resources/PinCheckResponse.java.txt b/design-first-swagger-quarkus/src/test/resources/PinCheckResponse.java.txt
@@ -18,6 +18,8 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.*;
+import jakarta.validation.Valid;
 /**
  * Tells if the PIN in the request was correct
  */

diff --git a/design-first-swagger-quarkus/src/test/resources/PurchaseAuthRequest.java.txt b/design-first-swagger-quarkus/src/test/resources/PurchaseAuthRequest.java.txt
@@ -20,6 +20,8 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.v3.oas.annotations.media.Schema;
 import java.util.UUID;
+import jakarta.validation.constraints.*;
+import jakarta.validation.Valid;
 /**
  * Request for authorizing a Purchase
  */
@@ -45,6 +47,7 @@ public class PurchaseAuthRequest {
    * Get emvTags
    * @return emvTags
   **/
+  @Valid
   @Schema(description = "")
   public EmvTags getEmvTags() {
     return emvTags;
@@ -63,6 +66,8 @@ public class PurchaseAuthRequest {
    * Get pan
    * @return pan
   **/
+  @NotNull
+  @Valid
   @Schema(required = true, description = "")
   public ch.schlau.pesche.apidocs.swagger.designfirst.txproc.model.Pan getPan() {
     return pan;
@@ -81,6 +86,8 @@ public class PurchaseAuthRequest {
    * Unique ID of the request
    * @return uuid
   **/
+  @NotNull
+  @Valid
   @Schema(required = true, description = "Unique ID of the request")
   public UUID getUuid() {
     return uuid;

diff --git a/design-first-swagger-quarkus/src/test/resources/PurchaseAuthResponse.java.txt b/design-first-swagger-quarkus/src/test/resources/PurchaseAuthResponse.java.txt
@@ -18,6 +18,8 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.*;
+import jakarta.validation.Valid;
 /**
  * Response to PurchaseAuthRequest
  */