Fix template (#355)

jemacineiras · web-flow · commit b9e883c8f47d · 2025-02-02T18:53:03.000+01:00
diff --git a/multiapi-engine/pom.xml b/multiapi-engine/pom.xml
@@ -4,7 +4,7 @@
 
   <groupId>com.sngular</groupId>
   <artifactId>multiapi-engine</artifactId>
-  <version>6.0.4</version>
+  <version>6.0.5</version>
   <packaging>jar</packaging>
 
   <properties>
diff --git a/multiapi-engine/src/main/resources/templates/customannotations/templateMaxBigDecimalValidator.ftlh b/multiapi-engine/src/main/resources/templates/customannotations/templateMaxBigDecimalValidator.ftlh
@@ -20,6 +20,6 @@ public class MaxBigDecimalValidator implements ConstraintValidator<MaxBigDecimal
 
     @Override
     public boolean isValid(BigDecimal value, ConstraintValidatorContext context) {
-        return Objects.isNull(value) || (value.compareTo(this.maximum) < 0 || (!exclusive && value.compareTo(this.maximum) == 0);
+        return Objects.isNull(value) || (value.compareTo(this.maximum) < 0 || (!exclusive && value.compareTo(this.maximum) == 0));
     }
 }
diff --git a/multiapi-engine/src/main/resources/templates/customannotations/templateMinBigDecimalValidator.ftlh b/multiapi-engine/src/main/resources/templates/customannotations/templateMinBigDecimalValidator.ftlh
@@ -20,6 +20,6 @@ public class MinBigDecimalValidator implements ConstraintValidator<MinBigDecimal
 
     @Override
     public boolean isValid(BigDecimal value, ConstraintValidatorContext context) {
-        return Objects.isNull(value) || (value.compareTo(this.minimum) > 0 || (!exclusive && value.compareTo(this.minimum) == 0);
+        return Objects.isNull(value) || (value.compareTo(this.minimum) > 0 || (!exclusive && value.compareTo(this.minimum) == 0));
     }
 }
diff --git a/multiapi-engine/src/test/resources/asyncapigenerator/testCustomValidators/customvalidator/jakarta/MaxBigDecimalValidator.java b/multiapi-engine/src/test/resources/asyncapigenerator/testCustomValidators/customvalidator/jakarta/MaxBigDecimalValidator.java
@@ -20,6 +20,6 @@ public void initialize(MaxBigDecimal constraintAnnotation) {
 
     @Override
     public boolean isValid(BigDecimal value, ConstraintValidatorContext context) {
-        return Objects.isNull(value) || (value.compareTo(this.maximum) < 0 || (!exclusive && value.compareTo(this.maximum) == 0);
+        return Objects.isNull(value) || (value.compareTo(this.maximum) < 0 || (!exclusive && value.compareTo(this.maximum) == 0));
     }
 }
diff --git a/multiapi-engine/src/test/resources/asyncapigenerator/testCustomValidators/customvalidator/jakarta/MinBigDecimalValidator.java b/multiapi-engine/src/test/resources/asyncapigenerator/testCustomValidators/customvalidator/jakarta/MinBigDecimalValidator.java
@@ -20,6 +20,6 @@ public void initialize(MinBigDecimal constraintAnnotation) {
 
     @Override
     public boolean isValid(BigDecimal value, ConstraintValidatorContext context) {
-        return Objects.isNull(value) || (value.compareTo(this.minimum) > 0 || (!exclusive && value.compareTo(this.minimum) == 0);
+        return Objects.isNull(value) || (value.compareTo(this.minimum) > 0 || (!exclusive && value.compareTo(this.minimum) == 0));
     }
 }
diff --git a/multiapi-engine/src/test/resources/asyncapigenerator/testCustomValidators/customvalidator/javax/MaxBigDecimalValidator.java b/multiapi-engine/src/test/resources/asyncapigenerator/testCustomValidators/customvalidator/javax/MaxBigDecimalValidator.java
@@ -20,6 +20,6 @@ public void initialize(MaxBigDecimal constraintAnnotation) {
 
     @Override
     public boolean isValid(BigDecimal value, ConstraintValidatorContext context) {
-        return Objects.isNull(value) || (value.compareTo(this.maximum) < 0 || (!exclusive && value.compareTo(this.maximum) == 0);
+        return Objects.isNull(value) || (value.compareTo(this.maximum) < 0 || (!exclusive && value.compareTo(this.maximum) == 0));
     }
 }
diff --git a/multiapi-engine/src/test/resources/asyncapigenerator/testCustomValidators/customvalidator/javax/MinBigDecimalValidator.java b/multiapi-engine/src/test/resources/asyncapigenerator/testCustomValidators/customvalidator/javax/MinBigDecimalValidator.java
@@ -20,6 +20,6 @@ public void initialize(MinBigDecimal constraintAnnotation) {
 
     @Override
     public boolean isValid(BigDecimal value, ConstraintValidatorContext context) {
-        return Objects.isNull(value) || (value.compareTo(this.minimum) > 0 || (!exclusive && value.compareTo(this.minimum) == 0);
+        return Objects.isNull(value) || (value.compareTo(this.minimum) > 0 || (!exclusive && value.compareTo(this.minimum) == 0));
     }
 }
diff --git a/multiapi-engine/src/test/resources/openapigenerator/testApiClientGeneration/pom.xml b/multiapi-engine/src/test/resources/openapigenerator/testApiClientGeneration/pom.xml
diff --git a/multiapi-engine/src/test/resources/openapigenerator/testValidationAnnotations/customvalidator/jakarta/MaxBigDecimalValidator.java b/multiapi-engine/src/test/resources/openapigenerator/testValidationAnnotations/customvalidator/jakarta/MaxBigDecimalValidator.java
@@ -20,6 +20,6 @@ public void initialize(MaxBigDecimal constraintAnnotation) {
 
     @Override
     public boolean isValid(BigDecimal value, ConstraintValidatorContext context) {
-        return Objects.isNull(value) || (value.compareTo(this.maximum) < 0 || (!exclusive && value.compareTo(this.maximum) == 0);
+        return Objects.isNull(value) || (value.compareTo(this.maximum) < 0 || (!exclusive && value.compareTo(this.maximum) == 0));
     }
 }
diff --git a/multiapi-engine/src/test/resources/openapigenerator/testValidationAnnotations/customvalidator/jakarta/MinBigDecimalValidator.java b/multiapi-engine/src/test/resources/openapigenerator/testValidationAnnotations/customvalidator/jakarta/MinBigDecimalValidator.java
@@ -20,6 +20,6 @@ public void initialize(MinBigDecimal constraintAnnotation) {
 
     @Override
     public boolean isValid(BigDecimal value, ConstraintValidatorContext context) {
-        return Objects.isNull(value) || (value.compareTo(this.minimum) > 0 || (!exclusive && value.compareTo(this.minimum) == 0);
+        return Objects.isNull(value) || (value.compareTo(this.minimum) > 0 || (!exclusive && value.compareTo(this.minimum) == 0));
     }
 }
diff --git a/multiapi-engine/src/test/resources/openapigenerator/testValidationAnnotations/customvalidator/javax/MaxBigDecimalValidator.java b/multiapi-engine/src/test/resources/openapigenerator/testValidationAnnotations/customvalidator/javax/MaxBigDecimalValidator.java
@@ -20,6 +20,6 @@ public void initialize(MaxBigDecimal constraintAnnotation) {
 
     @Override
     public boolean isValid(BigDecimal value, ConstraintValidatorContext context) {
-        return Objects.isNull(value) || (value.compareTo(this.maximum) < 0 || (!exclusive && value.compareTo(this.maximum) == 0);
+        return Objects.isNull(value) || (value.compareTo(this.maximum) < 0 || (!exclusive && value.compareTo(this.maximum) == 0));
     }
 }
diff --git a/multiapi-engine/src/test/resources/openapigenerator/testValidationAnnotations/customvalidator/javax/MinBigDecimalValidator.java b/multiapi-engine/src/test/resources/openapigenerator/testValidationAnnotations/customvalidator/javax/MinBigDecimalValidator.java
@@ -20,6 +20,6 @@ public void initialize(MinBigDecimal constraintAnnotation) {
 
     @Override
     public boolean isValid(BigDecimal value, ConstraintValidatorContext context) {
-        return Objects.isNull(value) || (value.compareTo(this.minimum) > 0 || (!exclusive && value.compareTo(this.minimum) == 0);
+        return Objects.isNull(value) || (value.compareTo(this.minimum) > 0 || (!exclusive && value.compareTo(this.minimum) == 0));
     }
 }
diff --git a/scs-multiapi-gradle-plugin/build.gradle b/scs-multiapi-gradle-plugin/build.gradle
@@ -20,7 +20,7 @@ repositories {
 }
 
 group = 'com.sngular'
-version = '6.0.4'
+version = '6.0.5'
 
 def SCSMultiApiPluginGroupId = group
 def SCSMultiApiPluginVersion = version
@@ -30,7 +30,7 @@ dependencies {
   shadow localGroovy()
   shadow gradleApi()
 
-  implementation 'com.sngular:multiapi-engine:6.0.4'
+  implementation 'com.sngular:multiapi-engine:6.0.5'
   testImplementation 'org.assertj:assertj-core:3.24.2'
   testImplementation 'com.puppycrawl.tools:checkstyle:10.12.3'
 }
@@ -98,7 +98,7 @@ testing {
 
     integrationTest(JvmTestSuite) {
       dependencies {
-        implementation 'com.sngular:scs-multiapi-gradle-plugin:6.0.4'
+        implementation 'com.sngular:scs-multiapi-gradle-plugin:6.0.5'
         implementation 'org.assertj:assertj-core:3.24.2'
       }
 
diff --git a/scs-multiapi-maven-plugin/pom.xml b/scs-multiapi-maven-plugin/pom.xml
@@ -4,7 +4,7 @@
 
   <groupId>com.sngular</groupId>
   <artifactId>scs-multiapi-maven-plugin</artifactId>
-    <version>6.0.4</version>
+    <version>6.0.5</version>
   <packaging>maven-plugin</packaging>
 
   <name>AsyncApi - OpenApi Code Generator Maven Plugin</name>
@@ -271,7 +271,7 @@
     <dependency>
       <groupId>com.sngular</groupId>
       <artifactId>multiapi-engine</artifactId>
-      <version>6.0.4</version>
+      <version>6.0.5</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,6 @@ public class MaxBigDecimalValidator implements ConstraintValidator<MaxBigDecimal`
`20`	`20`
`21`	`21`	`@Override`
`22`	`22`	`public boolean isValid(BigDecimal value, ConstraintValidatorContext context) {`
`23`		`- return Objects.isNull(value) \|\| (value.compareTo(this.maximum) < 0 \|\| (!exclusive && value.compareTo(this.maximum) == 0);`
	`23`	`+ return Objects.isNull(value) \|\| (value.compareTo(this.maximum) < 0 \|\| (!exclusive && value.compareTo(this.maximum) == 0));`
`24`	`24`	`}`
`25`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,6 @@ public class MinBigDecimalValidator implements ConstraintValidator<MinBigDecimal`
`20`	`20`
`21`	`21`	`@Override`
`22`	`22`	`public boolean isValid(BigDecimal value, ConstraintValidatorContext context) {`
`23`		`- return Objects.isNull(value) \|\| (value.compareTo(this.minimum) > 0 \|\| (!exclusive && value.compareTo(this.minimum) == 0);`
	`23`	`+ return Objects.isNull(value) \|\| (value.compareTo(this.minimum) > 0 \|\| (!exclusive && value.compareTo(this.minimum) == 0));`
`24`	`24`	`}`
`25`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,6 @@ public void initialize(MaxBigDecimal constraintAnnotation) {`
`20`	`20`
`21`	`21`	`@Override`
`22`	`22`	`public boolean isValid(BigDecimal value, ConstraintValidatorContext context) {`
`23`		`- return Objects.isNull(value) \|\| (value.compareTo(this.maximum) < 0 \|\| (!exclusive && value.compareTo(this.maximum) == 0);`
	`23`	`+ return Objects.isNull(value) \|\| (value.compareTo(this.maximum) < 0 \|\| (!exclusive && value.compareTo(this.maximum) == 0));`
`24`	`24`	`}`
`25`	`25`	`}`