Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 58bbc0b

Browse files
committed
Polishing Optional usage
1 parent 729cd01 commit 58bbc0b

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();

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /