diff --git a/record-builder-processor/src/main/java/io/soabase/recordbuilder/processor/InternalRecordBuilderProcessor.java b/record-builder-processor/src/main/java/io/soabase/recordbuilder/processor/InternalRecordBuilderProcessor.java index 0098751..434e020 100644 --- a/record-builder-processor/src/main/java/io/soabase/recordbuilder/processor/InternalRecordBuilderProcessor.java +++ b/record-builder-processor/src/main/java/io/soabase/recordbuilder/processor/InternalRecordBuilderProcessor.java @@ -23,6 +23,7 @@ import javax.lang.model.element.*; import java.util.*; import java.util.function.BiFunction; import java.util.function.Consumer; +import java.util.function.Predicate; import java.util.regex.Pattern; import java.util.stream.Collectors; import java.util.stream.IntStream; @@ -47,6 +48,7 @@ class InternalRecordBuilderProcessor { private final CollectionBuilderUtils collectionBuilderUtils; private static final TypeName overrideType = TypeName.get(Override.class); + private static final TypeName validType = ClassName.get("javax.validation", "Valid"); private static final TypeName validatorTypeName = ClassName.get("io.soabase.recordbuilder.validator", "RecordBuilderValidator"); private static final TypeVariableName rType = TypeVariableName.get("R"); private final ProcessingEnvironment processingEnv; @@ -729,7 +731,7 @@ class InternalRecordBuilderProcessor { .addModifiers(Modifier.ABSTRACT, Modifier.PUBLIC) .addAnnotation(generatedRecordBuilderAnnotation) .returns(component.typeName()); - addAccessorAnnotations(component, methodSpecBuilder); + addAccessorAnnotations(component, methodSpecBuilder, this::filterOutValid); classBuilder.addMethod(methodSpecBuilder.build()); } @@ -737,6 +739,10 @@ class InternalRecordBuilderProcessor { return !annotationSpec.type.equals(overrideType); } + private boolean filterOutValid(AnnotationSpec annotationSpec) { + return !annotationSpec.type.equals(validType); + } + private void addConstructorAnnotations(RecordClassType component, ParameterSpec.Builder parameterSpecBuilder) { if (metaData.inheritComponentAnnotations()) { component.getCanonicalConstructorAnnotations() @@ -747,12 +753,13 @@ class InternalRecordBuilderProcessor { } } - private void addAccessorAnnotations(RecordClassType component, MethodSpec.Builder methodSpecBuilder) { + private void addAccessorAnnotations(RecordClassType component, MethodSpec.Builder methodSpecBuilder, Predicate additionalFilter) { if (metaData.inheritComponentAnnotations()) { component.getAccessorAnnotations() .stream() .map(AnnotationSpec::get) .filter(this::filterOutOverride) + .filter(additionalFilter) .forEach(methodSpecBuilder::addAnnotation); } } @@ -894,7 +901,7 @@ class InternalRecordBuilderProcessor { .addAnnotation(generatedRecordBuilderAnnotation) .returns(component.typeName()) .addStatement("return $L", component.name()); - addAccessorAnnotations(component, methodSpecBuilder); + addAccessorAnnotations(component, methodSpecBuilder, __ -> true); builder.addMethod(methodSpecBuilder.build()); } diff --git a/record-builder-test/src/main/java/io/soabase/recordbuilder/test/RequestWithValid.java b/record-builder-test/src/main/java/io/soabase/recordbuilder/test/RequestWithValid.java new file mode 100644 index 0000000..aad213d --- /dev/null +++ b/record-builder-test/src/main/java/io/soabase/recordbuilder/test/RequestWithValid.java @@ -0,0 +1,28 @@ +/** + * Copyright 2019 Jordan Zimmerman + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package io.soabase.recordbuilder.test; + +import io.soabase.recordbuilder.core.RecordBuilder; + +import javax.validation.Valid; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; + +@RecordBuilder +@RecordBuilder.Options(useValidationApi = true) +public record RequestWithValid(@NotNull @Valid Part part) implements RequestWithValidBuilder.With { + public record Part(@NotBlank String name) {} +} diff --git a/record-builder-test/src/test/java/io/soabase/recordbuilder/test/TestValidation.java b/record-builder-test/src/test/java/io/soabase/recordbuilder/test/TestValidation.java index 174d3d8..20eb5e1 100644 --- a/record-builder-test/src/test/java/io/soabase/recordbuilder/test/TestValidation.java +++ b/record-builder-test/src/test/java/io/soabase/recordbuilder/test/TestValidation.java @@ -43,4 +43,14 @@ class TestValidation { var valid = RequiredRecord2Builder.builder().hey("hey").i(1).build(); Assertions.assertThrows(ValidationException.class, () -> valid.withHey(null)); } + + @Test + void testRequestWithValid() { + Assertions.assertDoesNotThrow(() -> RequestWithValidBuilder.builder() + .part(new RequestWithValid.Part("jsfjsf")) + .build()); + Assertions.assertThrows(ValidationException.class, () -> RequestWithValidBuilder.builder() + .part(new RequestWithValid.Part("")) + .build()); + } }