154 lines
8.1 KiB
Diff
154 lines
8.1 KiB
Diff
diff -Nru hibernate-validator-5.2.4.Final/engine/src/main/java/org/hibernate/validator/internal/xml/ConstrainedExecutableBuilder.java hibernate-validator-5.2.4.Final.jaxb/engine/src/main/java/org/hibernate/validator/internal/xml/ConstrainedExecutableBuilder.java
|
|
--- hibernate-validator-5.2.4.Final/engine/src/main/java/org/hibernate/validator/internal/xml/ConstrainedExecutableBuilder.java 2016-02-17 16:11:40.000000000 +0100
|
|
+++ hibernate-validator-5.2.4.Final.jaxb/engine/src/main/java/org/hibernate/validator/internal/xml/ConstrainedExecutableBuilder.java 2016-06-07 11:53:45.568875613 +0200
|
|
@@ -107,10 +107,10 @@
|
|
ExecutableElement methodExecutableElement = ExecutableElement.forMethod( method );
|
|
|
|
// ignore annotations
|
|
- if ( methodType.getIgnoreAnnotations() != null ) {
|
|
+ if ( methodType.isIgnoreAnnotations() != null ) {
|
|
annotationProcessingOptions.ignoreConstraintAnnotationsOnMember(
|
|
method,
|
|
- methodType.getIgnoreAnnotations()
|
|
+ methodType.isIgnoreAnnotations()
|
|
);
|
|
}
|
|
|
|
@@ -166,10 +166,10 @@
|
|
ExecutableElement constructorExecutableElement = ExecutableElement.forConstructor( constructor );
|
|
|
|
// ignore annotations
|
|
- if ( constructorType.getIgnoreAnnotations() != null ) {
|
|
+ if ( constructorType.isIgnoreAnnotations() != null ) {
|
|
annotationProcessingOptions.ignoreConstraintAnnotationsOnMember(
|
|
constructor,
|
|
- constructorType.getIgnoreAnnotations()
|
|
+ constructorType.isIgnoreAnnotations()
|
|
);
|
|
}
|
|
|
|
@@ -251,10 +251,10 @@
|
|
}
|
|
|
|
// ignore annotations
|
|
- if ( crossParameterType.getIgnoreAnnotations() != null ) {
|
|
+ if ( crossParameterType.isIgnoreAnnotations() != null ) {
|
|
annotationProcessingOptions.ignoreConstraintAnnotationsForCrossParameterConstraint(
|
|
executableElement.getMember(),
|
|
- crossParameterType.getIgnoreAnnotations()
|
|
+ crossParameterType.isIgnoreAnnotations()
|
|
);
|
|
}
|
|
|
|
@@ -289,10 +289,10 @@
|
|
);
|
|
|
|
// ignore annotations
|
|
- if ( returnValueType.getIgnoreAnnotations() != null ) {
|
|
+ if ( returnValueType.isIgnoreAnnotations() != null ) {
|
|
annotationProcessingOptions.ignoreConstraintAnnotationsForReturnValue(
|
|
executableElement.getMember(),
|
|
- returnValueType.getIgnoreAnnotations()
|
|
+ returnValueType.isIgnoreAnnotations()
|
|
);
|
|
}
|
|
|
|
diff -Nru hibernate-validator-5.2.4.Final/engine/src/main/java/org/hibernate/validator/internal/xml/ConstrainedFieldBuilder.java hibernate-validator-5.2.4.Final.jaxb/engine/src/main/java/org/hibernate/validator/internal/xml/ConstrainedFieldBuilder.java
|
|
--- hibernate-validator-5.2.4.Final/engine/src/main/java/org/hibernate/validator/internal/xml/ConstrainedFieldBuilder.java 2016-02-17 16:11:40.000000000 +0100
|
|
+++ hibernate-validator-5.2.4.Final.jaxb/engine/src/main/java/org/hibernate/validator/internal/xml/ConstrainedFieldBuilder.java 2016-06-07 11:53:45.580874986 +0200
|
|
@@ -84,10 +84,10 @@
|
|
|
|
|
|
// ignore annotations
|
|
- if ( fieldType.getIgnoreAnnotations() != null ) {
|
|
+ if ( fieldType.isIgnoreAnnotations() != null ) {
|
|
annotationProcessingOptions.ignoreConstraintAnnotationsOnMember(
|
|
field,
|
|
- fieldType.getIgnoreAnnotations()
|
|
+ fieldType.isIgnoreAnnotations()
|
|
);
|
|
}
|
|
}
|
|
diff -Nru hibernate-validator-5.2.4.Final/engine/src/main/java/org/hibernate/validator/internal/xml/ConstrainedGetterBuilder.java hibernate-validator-5.2.4.Final.jaxb/engine/src/main/java/org/hibernate/validator/internal/xml/ConstrainedGetterBuilder.java
|
|
--- hibernate-validator-5.2.4.Final/engine/src/main/java/org/hibernate/validator/internal/xml/ConstrainedGetterBuilder.java 2016-02-17 16:11:40.000000000 +0100
|
|
+++ hibernate-validator-5.2.4.Final.jaxb/engine/src/main/java/org/hibernate/validator/internal/xml/ConstrainedGetterBuilder.java 2016-06-07 11:53:45.581874934 +0200
|
|
@@ -88,10 +88,10 @@
|
|
constrainedExecutables.add( constrainedGetter );
|
|
|
|
// ignore annotations
|
|
- if ( getterType.getIgnoreAnnotations() != null ) {
|
|
+ if ( getterType.isIgnoreAnnotations() != null ) {
|
|
annotationProcessingOptions.ignoreConstraintAnnotationsOnMember(
|
|
getter,
|
|
- getterType.getIgnoreAnnotations()
|
|
+ getterType.isIgnoreAnnotations()
|
|
);
|
|
}
|
|
}
|
|
diff -Nru hibernate-validator-5.2.4.Final/engine/src/main/java/org/hibernate/validator/internal/xml/ConstrainedParameterBuilder.java hibernate-validator-5.2.4.Final.jaxb/engine/src/main/java/org/hibernate/validator/internal/xml/ConstrainedParameterBuilder.java
|
|
--- hibernate-validator-5.2.4.Final/engine/src/main/java/org/hibernate/validator/internal/xml/ConstrainedParameterBuilder.java 2016-02-17 16:11:40.000000000 +0100
|
|
+++ hibernate-validator-5.2.4.Final.jaxb/engine/src/main/java/org/hibernate/validator/internal/xml/ConstrainedParameterBuilder.java 2016-06-07 11:53:45.582874882 +0200
|
|
@@ -71,11 +71,11 @@
|
|
);
|
|
|
|
// ignore annotations
|
|
- if ( parameterType.getIgnoreAnnotations() != null ) {
|
|
+ if ( parameterType.isIgnoreAnnotations() != null ) {
|
|
annotationProcessingOptions.ignoreConstraintAnnotationsOnParameter(
|
|
executableElement.getMember(),
|
|
i,
|
|
- parameterType.getIgnoreAnnotations()
|
|
+ parameterType.isIgnoreAnnotations()
|
|
);
|
|
}
|
|
|
|
diff -Nru hibernate-validator-5.2.4.Final/engine/src/main/java/org/hibernate/validator/internal/xml/ConstrainedTypeBuilder.java hibernate-validator-5.2.4.Final.jaxb/engine/src/main/java/org/hibernate/validator/internal/xml/ConstrainedTypeBuilder.java
|
|
--- hibernate-validator-5.2.4.Final/engine/src/main/java/org/hibernate/validator/internal/xml/ConstrainedTypeBuilder.java 2016-02-17 16:11:40.000000000 +0100
|
|
+++ hibernate-validator-5.2.4.Final.jaxb/engine/src/main/java/org/hibernate/validator/internal/xml/ConstrainedTypeBuilder.java 2016-06-07 11:53:45.582874882 +0200
|
|
@@ -67,10 +67,10 @@
|
|
}
|
|
|
|
// ignore annotation
|
|
- if ( classType.getIgnoreAnnotations() != null ) {
|
|
+ if ( classType.isIgnoreAnnotations() != null ) {
|
|
annotationProcessingOptions.ignoreClassLevelConstraintAnnotations(
|
|
beanClass,
|
|
- classType.getIgnoreAnnotations()
|
|
+ classType.isIgnoreAnnotations()
|
|
);
|
|
}
|
|
|
|
diff -Nru hibernate-validator-5.2.4.Final/engine/src/main/java/org/hibernate/validator/internal/xml/ValidationXmlParser.java hibernate-validator-5.2.4.Final.jaxb/engine/src/main/java/org/hibernate/validator/internal/xml/ValidationXmlParser.java
|
|
--- hibernate-validator-5.2.4.Final/engine/src/main/java/org/hibernate/validator/internal/xml/ValidationXmlParser.java 2016-02-17 16:11:40.000000000 +0100
|
|
+++ hibernate-validator-5.2.4.Final.jaxb/engine/src/main/java/org/hibernate/validator/internal/xml/ValidationXmlParser.java 2016-06-07 11:53:45.583874830 +0200
|
|
@@ -156,7 +156,7 @@
|
|
EnumSet<ExecutableType> defaultValidatedExecutableTypes = executableValidationType == null
|
|
? getValidatedExecutableTypes( null )
|
|
: getValidatedExecutableTypes( executableValidationType.getDefaultValidatedExecutableTypes() );
|
|
- boolean executableValidationEnabled = executableValidationType == null || executableValidationType.getEnabled();
|
|
+ boolean executableValidationEnabled = executableValidationType == null || executableValidationType.isEnabled();
|
|
|
|
return new BootstrapConfigurationImpl(
|
|
config.getDefaultProvider(),
|
|
diff -Nru hibernate-validator-5.2.4.Final/engine/src/main/java/org/hibernate/validator/internal/xml/XmlMappingParser.java hibernate-validator-5.2.4.Final.jaxb/engine/src/main/java/org/hibernate/validator/internal/xml/XmlMappingParser.java
|
|
--- hibernate-validator-5.2.4.Final/engine/src/main/java/org/hibernate/validator/internal/xml/XmlMappingParser.java 2016-02-17 16:11:40.000000000 +0100
|
|
+++ hibernate-validator-5.2.4.Final.jaxb/engine/src/main/java/org/hibernate/validator/internal/xml/XmlMappingParser.java 2016-06-07 11:53:45.584874777 +0200
|
|
@@ -208,7 +208,7 @@
|
|
// update annotation ignores
|
|
annotationProcessingOptions.ignoreAnnotationConstraintForClass(
|
|
beanClass,
|
|
- bean.getIgnoreAnnotations()
|
|
+ bean.isIgnoreAnnotations()
|
|
);
|
|
|
|
ConstrainedType constrainedType = constrainedTypeBuilder.buildConstrainedType(
|
|
@@ -293,7 +293,7 @@
|
|
constraintHelper.putValidatorClasses(
|
|
annotationClass,
|
|
constraintValidatorClasses,
|
|
- Boolean.TRUE.equals( validatedByType.getIncludeExistingValidators() )
|
|
+ Boolean.TRUE.equals( validatedByType.isIncludeExistingValidators() )
|
|
);
|
|
}
|
|
|