diff --git a/extensions/hibernate-validator/deployment/src/main/java/io/quarkus/hibernate/validator/deployment/HibernateValidatorProcessor.java b/extensions/hibernate-validator/deployment/src/main/java/io/quarkus/hibernate/validator/deployment/HibernateValidatorProcessor.java index b460dde5ec99e..5e6efce6602f8 100644 --- a/extensions/hibernate-validator/deployment/src/main/java/io/quarkus/hibernate/validator/deployment/HibernateValidatorProcessor.java +++ b/extensions/hibernate-validator/deployment/src/main/java/io/quarkus/hibernate/validator/deployment/HibernateValidatorProcessor.java @@ -13,7 +13,6 @@ import java.util.Set; import java.util.function.Predicate; import java.util.regex.Pattern; -import java.util.stream.Collectors; import javax.validation.ClockProvider; import javax.validation.Constraint; @@ -203,9 +202,9 @@ public void build(HibernateValidatorRecorder recorder, RecorderContext recorderC allConsideredAnnotations.add(VALIDATE_ON_EXECUTION); beanValidationAnnotations.produce(new BeanValidationAnnotationsBuildItem( - VALID.toString(), - constraints.stream().map(a -> a.toString()).collect(Collectors.toSet()), - allConsideredAnnotations.stream().map(a -> a.toString()).collect(Collectors.toSet()))); + VALID, + constraints, + allConsideredAnnotations)); Set classNamesToBeValidated = new HashSet<>(); Map> inheritedAnnotationsToBeValidated = new HashMap<>(); diff --git a/extensions/hibernate-validator/spi/src/main/java/io/quarkus/hibernate/validator/spi/BeanValidationAnnotationsBuildItem.java b/extensions/hibernate-validator/spi/src/main/java/io/quarkus/hibernate/validator/spi/BeanValidationAnnotationsBuildItem.java index 9a4631daf7d05..288122a89307d 100644 --- a/extensions/hibernate-validator/spi/src/main/java/io/quarkus/hibernate/validator/spi/BeanValidationAnnotationsBuildItem.java +++ b/extensions/hibernate-validator/spi/src/main/java/io/quarkus/hibernate/validator/spi/BeanValidationAnnotationsBuildItem.java @@ -3,6 +3,8 @@ import java.util.Collections; import java.util.Set; +import org.jboss.jandex.DotName; + import io.quarkus.builder.item.SimpleBuildItem; /** @@ -11,25 +13,25 @@ */ public final class BeanValidationAnnotationsBuildItem extends SimpleBuildItem { - private final String valid; - private final Set constraints; - private final Set all; + private final DotName valid; + private final Set constraints; + private final Set all; - public BeanValidationAnnotationsBuildItem(String valid, Set constraints, Set all) { + public BeanValidationAnnotationsBuildItem(DotName valid, Set constraints, Set all) { this.valid = valid; this.constraints = Collections.unmodifiableSet(constraints); this.all = Collections.unmodifiableSet(all); } - public String getValidAnnotation() { + public DotName getValidAnnotation() { return valid; } - public Set getConstraintAnnotations() { + public Set getConstraintAnnotations() { return constraints; } - public Set getAllAnnotations() { + public Set getAllAnnotations() { return all; } } diff --git a/extensions/vertx-web/deployment/src/main/java/io/quarkus/vertx/web/deployment/DotNames.java b/extensions/vertx-web/deployment/src/main/java/io/quarkus/vertx/web/deployment/DotNames.java index 7d2cc1435bbbb..90df07b0f933a 100644 --- a/extensions/vertx-web/deployment/src/main/java/io/quarkus/vertx/web/deployment/DotNames.java +++ b/extensions/vertx-web/deployment/src/main/java/io/quarkus/vertx/web/deployment/DotNames.java @@ -25,6 +25,8 @@ final class DotNames { static final DotName UNI = DotName.createSimple(Uni.class.getName()); static final DotName MULTI = DotName.createSimple(Multi.class.getName()); static final DotName BUFFER = DotName.createSimple(Buffer.class.getName()); + static final DotName RX_BUFFER = DotName.createSimple(io.vertx.reactivex.core.buffer.Buffer.class.getName()); + static final DotName MUTINY_BUFFER = DotName.createSimple(io.vertx.mutiny.core.buffer.Buffer.class.getName()); static final DotName RX_HTTP_SERVER_RESPONSE = DotName .createSimple(io.vertx.reactivex.core.http.HttpServerResponse.class.getName()); static final DotName RX_HTTP_SERVER_REQUEST = DotName diff --git a/extensions/vertx-web/deployment/src/main/java/io/quarkus/vertx/web/deployment/HandlerDescriptor.java b/extensions/vertx-web/deployment/src/main/java/io/quarkus/vertx/web/deployment/HandlerDescriptor.java index 035854b6ed3e3..8e0f23bf06d10 100644 --- a/extensions/vertx-web/deployment/src/main/java/io/quarkus/vertx/web/deployment/HandlerDescriptor.java +++ b/extensions/vertx-web/deployment/src/main/java/io/quarkus/vertx/web/deployment/HandlerDescriptor.java @@ -1,7 +1,6 @@ package io.quarkus.vertx.web.deployment; import org.jboss.jandex.AnnotationInstance; -import org.jboss.jandex.DotName; import org.jboss.jandex.MethodInfo; import org.jboss.jandex.Type; @@ -45,8 +44,7 @@ boolean requireValidation() { return false; } for (AnnotationInstance annotation : method.annotations()) { - String name = annotation.name().toString(); - if (validationAnnotations.getAllAnnotations().contains(name)) { + if (validationAnnotations.getAllAnnotations().contains(annotation.name())) { return true; } } @@ -61,8 +59,7 @@ boolean isProducedResponseValidated() { return false; } for (AnnotationInstance annotation : method.annotations()) { - String name = annotation.name().toString(); - if (validationAnnotations.getValidAnnotation().equals(name)) { + if (validationAnnotations.getValidAnnotation().equals(annotation.name())) { return true; } } @@ -103,8 +100,7 @@ boolean isContentTypeRxBuffer() { if (type == null) { return false; } - return type.name() - .equals(DotName.createSimple(io.vertx.reactivex.core.buffer.Buffer.class.getName())); + return type.name().equals(DotNames.RX_BUFFER); } boolean isContentTypeMutinyBuffer() { @@ -112,7 +108,7 @@ boolean isContentTypeMutinyBuffer() { if (type == null) { return false; } - return type.name().equals(DotName.createSimple(io.vertx.mutiny.core.buffer.Buffer.class.getName())); + return type.name().equals(DotNames.MUTINY_BUFFER); } }