From 3baa44c5ef76da4f9f816497d09b8416365e66fa Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Sun, 14 Feb 2021 18:53:53 +0100 Subject: [PATCH] Polishing --- .../LocalValidatorFactoryBean.java | 31 ++++++++++--------- .../SpringValidatorAdapter.java | 6 ++-- 2 files changed, 19 insertions(+), 18 deletions(-) diff --git a/spring-context/src/main/java/org/springframework/validation/beanvalidation/LocalValidatorFactoryBean.java b/spring-context/src/main/java/org/springframework/validation/beanvalidation/LocalValidatorFactoryBean.java index 1acadfe253..73ec646bea 100644 --- a/spring-context/src/main/java/org/springframework/validation/beanvalidation/LocalValidatorFactoryBean.java +++ b/spring-context/src/main/java/org/springframework/validation/beanvalidation/LocalValidatorFactoryBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2018 the original author or authors. + * Copyright 2002-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -292,6 +292,7 @@ public class LocalValidatorFactoryBean extends SpringValidatorAdapter if (this.parameterNameDiscoverer != null) { configureParameterNameProvider(this.parameterNameDiscoverer, configuration); } + List mappingStreams = null; if (this.mappingLocations != null) { mappingStreams = new ArrayList<>(this.mappingLocations.length); @@ -322,18 +323,6 @@ public class LocalValidatorFactoryBean extends SpringValidatorAdapter } } - private void closeMappingStreams(@Nullable List mappingStreams){ - if (!CollectionUtils.isEmpty(mappingStreams)) { - for (InputStream stream : mappingStreams) { - try { - stream.close(); - } - catch (IOException ignored) { - } - } - } - } - private void configureParameterNameProvider(ParameterNameDiscoverer discoverer, Configuration configuration) { final ParameterNameProvider defaultProvider = configuration.getDefaultParameterNameProvider(); configuration.parameterNameProvider(new ParameterNameProvider() { @@ -352,6 +341,18 @@ public class LocalValidatorFactoryBean extends SpringValidatorAdapter }); } + private void closeMappingStreams(@Nullable List mappingStreams){ + if (!CollectionUtils.isEmpty(mappingStreams)) { + for (InputStream stream : mappingStreams) { + try { + stream.close(); + } + catch (IOException ignored) { + } + } + } + } + /** * Post-process the given Bean Validation configuration, * adding to or overriding any of its settings. @@ -420,7 +421,7 @@ public class LocalValidatorFactoryBean extends SpringValidatorAdapter return super.unwrap(type); } catch (ValidationException ex) { - // ignore - we'll try ValidatorFactory unwrapping next + // Ignore - we'll try ValidatorFactory unwrapping next } } if (this.validatorFactory != null) { @@ -428,7 +429,7 @@ public class LocalValidatorFactoryBean extends SpringValidatorAdapter return this.validatorFactory.unwrap(type); } catch (ValidationException ex) { - // ignore if just being asked for ValidatorFactory + // Ignore if just being asked for ValidatorFactory if (ValidatorFactory.class == type) { return (T) this.validatorFactory; } diff --git a/spring-context/src/main/java/org/springframework/validation/beanvalidation/SpringValidatorAdapter.java b/spring-context/src/main/java/org/springframework/validation/beanvalidation/SpringValidatorAdapter.java index 5439bfa558..cf41fed3b2 100644 --- a/spring-context/src/main/java/org/springframework/validation/beanvalidation/SpringValidatorAdapter.java +++ b/spring-context/src/main/java/org/springframework/validation/beanvalidation/SpringValidatorAdapter.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2020 the original author or authors. + * Copyright 2002-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -179,7 +179,7 @@ public class SpringValidatorAdapter implements SmartValidator, javax.validation. } } else { - // got no BindingResult - can only do standard rejectValue call + // Got no BindingResult - can only do standard rejectValue call // with automatic extraction of the current field value errors.rejectValue(field, errorCode, errorArgs, violation.getMessage()); } @@ -386,7 +386,7 @@ public class SpringValidatorAdapter implements SmartValidator, javax.validation. return (type != null ? this.targetValidator.unwrap(type) : (T) this.targetValidator); } catch (ValidationException ex) { - // ignore if just being asked for plain Validator + // Ignore if just being asked for plain JSR-303 Validator if (javax.validation.Validator.class == type) { return (T) this.targetValidator; }