Skip to content

Commit c6b577a

Browse files
quaffquaff
committed
Polishing Optional usage
1 parent 729cd01 commit c6b577a

20 files changed

+26
-80
lines changed

‎cdi/src/main/java/org/hibernate/validator/cdi/ValidationExtension.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -280,12 +280,7 @@ private <T> void determineConstrainedMethods(AnnotatedType<T> type, BeanDescript
280280
}
281281

282282
boolean needsValidation;
283-
if ( correspondingProperty.isPresent() ) {
284-
needsValidation = isGetterConstrained( beanDescriptor, method, correspondingProperty.get() );
285-
}
286-
else {
287-
needsValidation = isNonGetterConstrained( beanDescriptor, method );
288-
}
283+
needsValidation = correspondingProperty.map( s -> isGetterConstrained( beanDescriptor, method, s ) ).orElseGet( () -> isNonGetterConstrained( beanDescriptor, method ) );
289284

290285
if ( needsValidation ) {
291286
callables.add( annotatedMethod );

‎engine/src/main/java/org/hibernate/validator/internal/cfg/context/TypeConstraintMappingContextImpl.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ public PropertyConstraintMappingContext field(String property) {
135135

136136
Optional<JavaBeanField> foundField = javaBeanHelper.findDeclaredField( beanClass, property );
137137

138-
if ( !foundField.isPresent() ) {
138+
if ( foundField.isEmpty() ) {
139139
throw LOG.getUnableToFindPropertyWithAccessException( beanClass, property, ElementType.FIELD );
140140
}
141141

@@ -157,7 +157,7 @@ public PropertyConstraintMappingContext getter(String property) {
157157

158158
Optional<JavaBeanGetter> foundGetter = javaBeanHelper.findDeclaredGetter( beanClass, property );
159159

160-
if ( !foundGetter.isPresent() ) {
160+
if ( foundGetter.isEmpty() ) {
161161
throw LOG.getUnableToFindPropertyWithAccessException( beanClass, property, ElementType.METHOD );
162162
}
163163

@@ -179,7 +179,7 @@ public MethodConstraintMappingContext method(String name, Class<?>... parameterT
179179

180180
Optional<JavaBeanMethod> foundMethod = javaBeanHelper.findDeclaredMethod( beanClass, name, parameterTypes );
181181

182-
if ( !foundMethod.isPresent() ) {
182+
if ( foundMethod.isEmpty() ) {
183183
throw LOG.getBeanDoesNotContainMethodException( beanClass, name, parameterTypes );
184184
}
185185

@@ -203,7 +203,7 @@ public MethodConstraintMappingContext method(String name, Class<?>... parameterT
203203
public ConstructorConstraintMappingContext constructor(Class<?>... parameterTypes) {
204204
Optional<JavaBeanConstructor> foundConstructor = javaBeanHelper.findDeclaredConstructor( beanClass, parameterTypes );
205205

206-
if ( !foundConstructor.isPresent() ) {
206+
if ( foundConstructor.isEmpty() ) {
207207
throw LOG.getBeanDoesNotContainConstructorException(
208208
beanClass,
209209
parameterTypes

‎engine/src/main/java/org/hibernate/validator/internal/engine/ValidatorImpl.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -831,7 +831,7 @@ private <T> void validateParametersInContext(ExecutableValidationContext<T> vali
831831

832832
Optional<ExecutableMetaData> executableMetaDataOptional = validationContext.getExecutableMetaData();
833833

834-
if ( !executableMetaDataOptional.isPresent() ) {
834+
if ( executableMetaDataOptional.isEmpty() ) {
835835
// the method is unconstrained
836836
return;
837837
}
@@ -1015,7 +1015,7 @@ private <V, T> void validateReturnValueInContext(ExecutableValidationContext<T>
10151015

10161016
Optional<ExecutableMetaData> executableMetaDataOptional = validationContext.getExecutableMetaData();
10171017

1018-
if ( !executableMetaDataOptional.isPresent() ) {
1018+
if ( executableMetaDataOptional.isEmpty() ) {
10191019
// the method is unconstrained
10201020
return;
10211021
}

‎engine/src/main/java/org/hibernate/validator/internal/engine/constraintvalidation/ComposingConstraintTree.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ protected void validateConstraints(ValidationContext<?> validationContext,
105105

106106
// We re-evaluate the boolean composition by taking into consideration also the violations
107107
// from the local constraintValidator
108-
if ( !violatedLocalConstraintValidatorContext.isPresent() ) {
108+
if ( violatedLocalConstraintValidatorContext.isEmpty() ) {
109109
compositionResult.setAtLeastOneTrue( true );
110110
}
111111
else {
@@ -168,7 +168,7 @@ private void prepareFinalConstraintViolations(ValidationContext<?> validationCon
168168
// violations or not (or if there is no local ConstraintValidator at all).
169169
// If not we create a violation
170170
// using the error message in the annotation declaration at top level.
171-
if ( !localConstraintValidatorContext.isPresent() ) {
171+
if ( localConstraintValidatorContext.isEmpty() ) {
172172
violatedConstraintValidatorContexts.add(
173173
validationContext.createConstraintValidatorContextFor(
174174
descriptor, valueContext.getPropertyPath()
@@ -185,9 +185,7 @@ private void prepareFinalConstraintViolations(ValidationContext<?> validationCon
185185
// as checked in test CustomErrorMessage.java
186186
// If no violations have been reported from the local ConstraintValidator, or no such validator exists,
187187
// then we just add an empty list.
188-
if ( localConstraintValidatorContext.isPresent() ) {
189-
violatedConstraintValidatorContexts.add( localConstraintValidatorContext.get() );
190-
}
188+
localConstraintValidatorContext.ifPresent( violatedConstraintValidatorContexts::add );
191189
}
192190

193191
/**

‎engine/src/main/java/org/hibernate/validator/internal/engine/validationcontext/ParameterExecutableValidationContext.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ public Optional<ExecutableMetaData> getExecutableMetaData() {
8686
}
8787

8888
private static boolean buildDisableAlreadyValidatedBeanTracking(Optional<ExecutableMetaData> executableMetaData) {
89-
if ( !executableMetaData.isPresent() ) {
89+
if ( executableMetaData.isEmpty() ) {
9090
// the method is unconstrained so there's no need to worry about the tracking
9191
return false;
9292
}

‎engine/src/main/java/org/hibernate/validator/internal/engine/validationcontext/ReturnValueExecutableValidationContext.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ public Optional<ExecutableMetaData> getExecutableMetaData() {
7979
}
8080

8181
private static boolean buildDisableAlreadyValidatedBeanTracking(Optional<ExecutableMetaData> executableMetaData) {
82-
if ( !executableMetaData.isPresent() ) {
82+
if ( executableMetaData.isEmpty() ) {
8383
// the method is unconstrained so there's no need to worry about the tracking
8484
return false;
8585
}

‎engine/src/main/java/org/hibernate/validator/internal/engine/valueextraction/OptionalValueExtractor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,6 @@ private OptionalValueExtractor() {
2424

2525
@Override
2626
public void extractValues(Optional<?> originalValue, ValueExtractor.ValueReceiver receiver) {
27-
receiver.value( null, originalValue.isPresent() ? originalValue.get() : null );
27+
receiver.value( null, originalValue.orElse(null));
2828
}
2929
}

‎engine/src/main/java/org/hibernate/validator/internal/xml/config/ValidationConfigStaxBuilder.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -274,9 +274,7 @@ protected String getAcceptableQName() {
274274
@Override
275275
protected void add(XMLEventReader xmlEventReader, XMLEvent xmlEvent) throws XMLStreamException {
276276
Optional<String> enabledAttribute = readAttribute( xmlEvent.asStartElement(), ENABLED_QNAME );
277-
if ( enabledAttribute.isPresent() ) {
278-
enabled = Boolean.parseBoolean( enabledAttribute.get() );
279-
}
277+
enabledAttribute.ifPresent( s -> enabled = Boolean.parseBoolean(s) );
280278

281279
while ( !( xmlEvent.isEndElement() && xmlEvent.asEndElement().getName().getLocalPart().equals( EXECUTABLE_VALIDATION_QNAME_LOCAL_PART ) ) ) {
282280
XMLEvent currentEvent = xmlEventReader.nextEvent();

‎engine/src/main/java/org/hibernate/validator/internal/xml/mapping/AbstractConstrainedElementStaxBuilder.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ abstract class AbstractConstrainedElementStaxBuilder extends AbstractStaxBuilder
6666
protected void add(XMLEventReader xmlEventReader, XMLEvent xmlEvent) throws XMLStreamException {
6767
Optional<QName> mainAttributeValueQname = getMainAttributeValueQname();
6868
if ( mainAttributeValueQname.isPresent() ) {
69-
mainAttributeValue = readAttribute( xmlEvent.asStartElement(), mainAttributeValueQname.get() ).get();
69+
mainAttributeValue = readAttribute( xmlEvent.asStartElement(), mainAttributeValueQname.get() ).orElseThrow();
7070
}
7171
ignoreAnnotations = readAttribute( xmlEvent.asStartElement(), IGNORE_ANNOTATIONS_QNAME ).map( Boolean::parseBoolean );
7272
ConstraintTypeStaxBuilder constraintTypeStaxBuilder = getNewConstraintTypeStaxBuilder();

‎engine/src/main/java/org/hibernate/validator/internal/xml/mapping/AbstractConstrainedExecutableElementStaxBuilder.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ abstract class AbstractConstrainedExecutableElementStaxBuilder extends AbstractS
5757
protected void add(XMLEventReader xmlEventReader, XMLEvent xmlEvent) throws XMLStreamException {
5858
Optional<QName> mainAttributeValueQname = getMainAttributeValueQname();
5959
if ( mainAttributeValueQname.isPresent() ) {
60-
mainAttributeValue = readAttribute( xmlEvent.asStartElement(), mainAttributeValueQname.get() ).get();
60+
mainAttributeValue = readAttribute( xmlEvent.asStartElement(), mainAttributeValueQname.get() ).orElseThrow();
6161
}
6262
ignoreAnnotations = readAttribute( xmlEvent.asStartElement(), IGNORE_ANNOTATIONS_QNAME ).map( Boolean::parseBoolean );
6363
ConstrainedParameterStaxBuilder constrainedParameterStaxBuilder = getNewConstrainedParameterStaxBuilder();

‎engine/src/main/java/org/hibernate/validator/internal/xml/mapping/ClassConstraintTypeStaxBuilder.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -102,12 +102,7 @@ ConstrainedType build(Class<?> beanClass) {
102102
.collect( Collectors.toSet() );
103103

104104
// ignore annotation
105-
if ( ignoreAnnotations.isPresent() ) {
106-
annotationProcessingOptions.ignoreClassLevelConstraintAnnotations(
107-
beanClass,
108-
ignoreAnnotations.get()
109-
);
110-
}
105+
ignoreAnnotations.ifPresent( b -> annotationProcessingOptions.ignoreClassLevelConstraintAnnotations( beanClass, b ) );
111106

112107
return new ConstrainedType(
113108
ConfigurationSource.XML,

‎engine/src/main/java/org/hibernate/validator/internal/xml/mapping/ConstrainedConstructorStaxBuilder.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -76,12 +76,7 @@ ConstrainedExecutable build(JavaBeanHelper javaBeanHelper, Class<?> beanClass, L
7676
}
7777

7878
// ignore annotations
79-
if ( ignoreAnnotations.isPresent() ) {
80-
annotationProcessingOptions.ignoreConstraintAnnotationsOnMember(
81-
javaBeanConstructor,
82-
ignoreAnnotations.get()
83-
);
84-
}
79+
ignoreAnnotations.ifPresent( b -> annotationProcessingOptions.ignoreConstraintAnnotationsOnMember( javaBeanConstructor, b ) );
8580

8681
List<ConstrainedParameter> constrainedParameters = CollectionHelper.newArrayList( constrainedParameterStaxBuilders.size() );
8782
for ( int index = 0; index < constrainedParameterStaxBuilders.size(); index++ ) {

‎engine/src/main/java/org/hibernate/validator/internal/xml/mapping/ConstrainedFieldStaxBuilder.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -82,12 +82,7 @@ ConstrainedField build(JavaBeanHelper javaBeanHelper, Class<?> beanClass, List<S
8282
);
8383

8484
// ignore annotations
85-
if ( ignoreAnnotations.isPresent() ) {
86-
annotationProcessingOptions.ignoreConstraintAnnotationsOnMember(
87-
javaBeanField,
88-
ignoreAnnotations.get()
89-
);
90-
}
85+
ignoreAnnotations.ifPresent( b -> annotationProcessingOptions.ignoreConstraintAnnotationsOnMember( javaBeanField, b ) );
9186

9287
return constrainedField;
9388
}

‎engine/src/main/java/org/hibernate/validator/internal/xml/mapping/ConstrainedGetterStaxBuilder.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -86,12 +86,7 @@ ConstrainedExecutable build(JavaBeanHelper javaBeanHelper, Class<?> beanClass, L
8686
);
8787

8888
// ignore annotations
89-
if ( ignoreAnnotations.isPresent() ) {
90-
annotationProcessingOptions.ignoreConstraintAnnotationsOnMember(
91-
javaBeanGetter,
92-
ignoreAnnotations.get()
93-
);
94-
}
89+
ignoreAnnotations.ifPresent( b -> annotationProcessingOptions.ignoreConstraintAnnotationsOnMember( javaBeanGetter, b ) );
9590

9691
return constrainedGetter;
9792
}

‎engine/src/main/java/org/hibernate/validator/internal/xml/mapping/ConstrainedMethodStaxBuilder.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -79,12 +79,7 @@ ConstrainedExecutable build(JavaBeanHelper javaBeanHelper, Class<?> beanClass, L
7979
}
8080

8181
// ignore annotations
82-
if ( ignoreAnnotations.isPresent() ) {
83-
annotationProcessingOptions.ignoreConstraintAnnotationsOnMember(
84-
javaBeanMethod,
85-
ignoreAnnotations.get()
86-
);
87-
}
82+
ignoreAnnotations.ifPresent( b -> annotationProcessingOptions.ignoreConstraintAnnotationsOnMember( javaBeanMethod, b ) );
8883

8984
List<ConstrainedParameter> constrainedParameters = CollectionHelper.newArrayList( constrainedParameterStaxBuilders.size() );
9085
for ( int index = 0; index < constrainedParameterStaxBuilders.size(); index++ ) {

‎engine/src/main/java/org/hibernate/validator/internal/xml/mapping/ConstrainedParameterStaxBuilder.java

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -77,13 +77,7 @@ ConstrainedParameter build(Callable callable, int index) {
7777
ContainerElementTypeConfiguration containerElementTypeConfiguration = getContainerElementTypeConfiguration( type, constraintLocation );
7878

7979
// ignore annotations
80-
if ( ignoreAnnotations.isPresent() ) {
81-
annotationProcessingOptions.ignoreConstraintAnnotationsOnParameter(
82-
callable,
83-
index,
84-
ignoreAnnotations.get()
85-
);
86-
}
80+
ignoreAnnotations.ifPresent( b -> annotationProcessingOptions.ignoreConstraintAnnotationsOnParameter( callable, index, b ) );
8781

8882
ConstrainedParameter constrainedParameter = new ConstrainedParameter(
8983
ConfigurationSource.XML,

‎engine/src/main/java/org/hibernate/validator/internal/xml/mapping/ConstraintTypeStaxBuilder.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -122,9 +122,7 @@ <A extends Annotation> MetaConstraint<A> build(ConstraintLocation constraintLoca
122122

123123
// set common things to all constraints:
124124
Optional<String> message = messageStaxBuilder.build();
125-
if ( message.isPresent() ) {
126-
annotationDescriptorBuilder.setMessage( message.get() );
127-
}
125+
message.ifPresent( annotationDescriptorBuilder::setMessage );
128126
annotationDescriptorBuilder.setGroups( groupsStaxBuilder.build() )
129127
.setPayload( payloadStaxBuilder.build() );
130128

‎engine/src/main/java/org/hibernate/validator/internal/xml/mapping/ContainerElementTypeStaxBuilder.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,7 @@ protected String getAcceptableQName() {
7979
@Override
8080
protected void add(XMLEventReader xmlEventReader, XMLEvent xmlEvent) throws XMLStreamException {
8181
Optional<String> typeArgumentIndex = readAttribute( xmlEvent.asStartElement(), TYPE_ARGUMENT_INDEX_QNAME );
82-
if ( typeArgumentIndex.isPresent() ) {
83-
this.typeArgumentIndex = Integer.parseInt( typeArgumentIndex.get() );
84-
}
82+
typeArgumentIndex.ifPresent( s -> this.typeArgumentIndex = Integer.parseInt(s) );
8583
ConstraintTypeStaxBuilder constraintTypeStaxBuilder = getNewConstraintTypeStaxBuilder();
8684
ContainerElementTypeStaxBuilder containerElementTypeConfigurationStaxBuilder = getNewContainerElementTypeConfigurationStaxBuilder();
8785
while ( !( xmlEvent.isEndElement() && xmlEvent.asEndElement().getName().getLocalPart().equals( getAcceptableQName() ) ) ) {

‎engine/src/main/java/org/hibernate/validator/internal/xml/mapping/CrossParameterStaxBuilder.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -87,12 +87,7 @@ Set<MetaConstraint<?>> build(Callable callable) {
8787
.collect( Collectors.toSet() );
8888

8989
// ignore annotations
90-
if ( ignoreAnnotations.isPresent() ) {
91-
annotationProcessingOptions.ignoreConstraintAnnotationsForCrossParameterConstraint(
92-
callable,
93-
ignoreAnnotations.get()
94-
);
95-
}
90+
ignoreAnnotations.ifPresent( b -> annotationProcessingOptions.ignoreConstraintAnnotationsForCrossParameterConstraint( callable, b ) );
9691

9792
return crossParameterConstraints;
9893
}

‎engine/src/main/java/org/hibernate/validator/internal/xml/mapping/ReturnValueStaxBuilder.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -62,12 +62,7 @@ CascadingMetaDataBuilder build(
6262
returnValueTypeArgumentConstraints.addAll( containerElementTypeConfiguration.getMetaConstraints() );
6363

6464
// ignore annotations
65-
if ( ignoreAnnotations.isPresent() ) {
66-
annotationProcessingOptions.ignoreConstraintAnnotationsForReturnValue(
67-
callable,
68-
ignoreAnnotations.get()
69-
);
70-
}
65+
ignoreAnnotations.ifPresent( b -> annotationProcessingOptions.ignoreConstraintAnnotationsForReturnValue( callable, b ) );
7166

7267
return getCascadingMetaData( containerElementTypeConfiguration.getTypeParametersCascadingMetaData(), callable.getType() );
7368
}

0 commit comments

Comments
 (0)