Merge pull request #1014 from Backbase/fix-size-validation

Add missing @SiZe validation + do not replace \r\n pattern in fileds

Author: AnastasiaUrupa

boat-scaffold/src/main/java/com/backbase/oss/codegen/java/BoatSpringCodeGen.java

@@ -124,7 +124,6 @@ public void execute(Fragment frag, Writer out) throws IOException {
                 return;
             }
             String formatted = text
-                .replace("\\n", SINGLE_SPACE)
                 .replaceAll(WHITESPACE_REGEX, SINGLE_SPACE)
                 .replaceAll("\\< ", "<")
                 .replaceAll(" >", ">")

boat-scaffold/src/main/templates/boat-spring/beanValidationBodyParams.mustache

@@ -0,0 +1 @@
+{{^useOptional}}{{>beanValidationCore}}{{/useOptional}}{{#useOptional}}{{#required}}{{>beanValidationCore}}{{/required}}{{/useOptional}}

boat-scaffold/src/main/templates/boat-spring/bodyParams.mustache

@@ -1 +1 @@
-{{#isBodyParam}}{{>paramDoc}}{{#useBeanValidation}} @Valid{{/useBeanValidation}} @RequestBody{{^required}}(required = false){{/required}} {{^reactive}}{{{dataType}}}{{/reactive}}{{#reactive}}{{^isArray}}Mono<{{{dataType}}}>{{/isArray}}{{#isArray}}Flux<{{{baseType}}}>{{/isArray}}{{/reactive}} {{paramName}}{{#useBeanValidation}}{{#addBindingResult}}, BindingResult bindingResult{{/addBindingResult}}{{/useBeanValidation}}{{/isBodyParam}}
+{{#isBodyParam}}{{>paramDoc}}{{#useBeanValidation}} @Valid{{>beanValidationBodyParams}}{{/useBeanValidation}} @RequestBody{{^required}}(required = false){{/required}} {{^reactive}}{{{dataType}}}{{/reactive}}{{#reactive}}{{^isArray}}Mono<{{{dataType}}}>{{/isArray}}{{#isArray}}Flux<{{{baseType}}}>{{/isArray}}{{/reactive}} {{paramName}}{{#useBeanValidation}}{{#addBindingResult}}, BindingResult bindingResult{{/addBindingResult}}{{/useBeanValidation}}{{/isBodyParam}}

boat-scaffold/src/test/java/com/backbase/oss/codegen/java/BoatSpringCodeGenTests.java

@@ -22,6 +22,7 @@
 import com.github.javaparser.ast.body.MethodDeclaration;
 import com.github.javaparser.ast.body.Parameter;
 import com.github.javaparser.ast.body.VariableDeclarator;
+import com.github.javaparser.ast.expr.AnnotationExpr;
 import com.github.javaparser.ast.expr.Expression;
 import com.github.javaparser.ast.type.ClassOrInterfaceType;
 import com.github.javaparser.ast.type.Type;
@@ -216,6 +217,15 @@ void shouldGenerateValidations(boolean useLombok, boolean bigDecimalsAsStrings)
         assertHasCollectionParamWithType(getPaymentsMethod, "status", "List", "String");
         assertHasCollectionParamWithType(getPaymentsMethod, "headerParams", "List", "String");
 
+        MethodDeclaration createPaymentsMethod = StaticJavaParser.parse(paymentsApiFile)
+            .findAll(MethodDeclaration.class)
+            .stream()
+            .filter(it -> "createPayments".equals(it.getName().toString()))
+            .findFirst().orElseThrow();
+        AnnotationExpr sizeAnnotation = createPaymentsMethod.getParameterByName("multiLinePaymentRequest").orElseThrow()
+            .getAnnotationByName("Size").orElseThrow();
+        assertEquals("@Size(min = 1, max = 55)", sizeAnnotation.toString());
+
         File paymentRequestLine = files.stream().filter(file -> file.getName().equals("PaymentRequestLine.java"))
             .findFirst()
             .get();
@@ -249,6 +259,7 @@ void shouldGenerateValidations(boolean useLombok, boolean bigDecimalsAsStrings)
         assertFieldValueAssignment(
                 multiLinePaymentRequestUnit, "arrangementIds", "new ArrayList<>()");
         assertFieldAnnotation(multiLinePaymentRequestUnit, "uniqueLines", "NotNull");
+        assertFieldAnnotation(multiLinePaymentRequestUnit, "name", "Pattern", "@Pattern(regexp = \"^[^\\\\r\\\\n]{1,64}$\")");
         assertFieldValueAssignment(
                 multiLinePaymentRequestUnit, "uniqueArrangementIds", null);
 
@@ -440,6 +451,15 @@ private static void assertFieldAnnotation(
                 fieldDeclaration.getAnnotationByName(annotationName).isPresent(), is(true));
     }
 
+    private static void assertFieldAnnotation(
+        CompilationUnit unit, String fieldName, String annotationName, String value) throws FileNotFoundException {
+        FieldDeclaration fieldDeclaration = findFieldDeclaration(unit, fieldName);
+        AnnotationExpr annotation = fieldDeclaration.getAnnotationByName(annotationName)
+            .orElseThrow(() -> new AssertionError(
+                "Expect annotation to be present on field: " + annotationName + " " + fieldName));
+        assertThat(annotation.toString(), equalTo(value));
+    }
+
     private static void assertFieldValueAssignment(
             CompilationUnit unit, String fieldName, String valueAssignment) throws FileNotFoundException {
         FieldDeclaration fieldDeclaration = findFieldDeclaration(unit, fieldName);

boat-scaffold/src/test/resources/boat-spring/openapi.yaml

@@ -100,6 +100,8 @@ paths:
           application/json:
             schema:
               type: array
+              maxItems: 55
+              minItems: 1
               items:
                 $ref: '#/components/schemas/MultiLinePaymentRequest'
       responses:
@@ -313,6 +315,7 @@ components:
           description: Request name
           minLength: 3
           maxLength: 251
+          pattern: "^[^\\r\\n]{1,64}$"
         amountNumberAsString:
           description: The amount string in number format
           type: string