From b2d87abcbbead29fe4538329a05636d2b6503cc7 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Wed, 28 Mar 2018 12:06:38 +0200 Subject: [PATCH] Polishing --- .../util/ConcurrentReferenceHashMapTests.java | 3 +-- .../expression/spel/SpelReproTests.java | 2 +- .../core/metadata/CallMetaDataContext.java | 2 +- .../metadata/CallMetaDataProviderFactory.java | 4 ++-- .../metadata/GenericCallMetaDataProvider.java | 18 +++++++++--------- .../BufferedImageHttpMessageConverter.java | 2 +- 6 files changed, 15 insertions(+), 16 deletions(-) diff --git a/spring-core/src/test/java/org/springframework/util/ConcurrentReferenceHashMapTests.java b/spring-core/src/test/java/org/springframework/util/ConcurrentReferenceHashMapTests.java index c4e81bb6918..ac4dd2dee97 100644 --- a/spring-core/src/test/java/org/springframework/util/ConcurrentReferenceHashMapTests.java +++ b/spring-core/src/test/java/org/springframework/util/ConcurrentReferenceHashMapTests.java @@ -599,8 +599,7 @@ public class ConcurrentReferenceHashMapTests { protected ReferenceManager createReferenceManager() { return new ReferenceManager() { @Override - public Reference createReference(Entry entry, int hash, - @Nullable Reference next) { + public Reference createReference(Entry entry, int hash, @Nullable Reference next) { if (TestWeakConcurrentCache.this.disableTestHooks) { return super.createReference(entry, hash, next); } diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/SpelReproTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/SpelReproTests.java index 534f8025ed4..780f0c42764 100644 --- a/spring-expression/src/test/java/org/springframework/expression/spel/SpelReproTests.java +++ b/spring-expression/src/test/java/org/springframework/expression/spel/SpelReproTests.java @@ -236,7 +236,7 @@ public class SpelReproTests extends AbstractExpressionTests { } @Test - public void accessingNullPropertyViaReflection_SPR5663() throws AccessException { + public void propertyAccessOnNullTarget_SPR5663() throws AccessException { PropertyAccessor accessor = new ReflectivePropertyAccessor(); EvaluationContext context = TestScenarioCreator.getTestEvaluationContext(); assertFalse(accessor.canRead(context, null, "abc")); diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/CallMetaDataContext.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/CallMetaDataContext.java index 1d6a5561f40..ba018aed9a2 100755 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/CallMetaDataContext.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/CallMetaDataContext.java @@ -276,7 +276,7 @@ public class CallMetaDataContext { } else { throw new InvalidDataAccessApiUsageException( - "Return of a ResultSet from a stored procedure is not supported."); + "Return of a ResultSet from a stored procedure is not supported"); } } } diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/CallMetaDataProviderFactory.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/CallMetaDataProviderFactory.java index 277d31dcbc4..3ae93d585f4 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/CallMetaDataProviderFactory.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/CallMetaDataProviderFactory.java @@ -60,8 +60,8 @@ public class CallMetaDataProviderFactory { /** - * Create a {@link CallMetaDataProvider} based on the database meta-data - * @param dataSource used to retrieve meta-data + * Create a {@link CallMetaDataProvider} based on the database meta-data. + * @param dataSource the JDBC DataSource to use for retrieving meta-data * @param context the class that holds configuration and meta-data * @return instance of the CallMetaDataProvider implementation to be used */ diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/GenericCallMetaDataProvider.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/GenericCallMetaDataProvider.java index d65f78dfc9c..766cf3f025e 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/GenericCallMetaDataProvider.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/GenericCallMetaDataProvider.java @@ -256,14 +256,14 @@ public class GenericCallMetaDataProvider implements CallMetaDataProvider { /** - * Specify whether the database supports the use of catalog name in procedure calls + * Specify whether the database supports the use of catalog name in procedure calls. */ protected void setSupportsCatalogsInProcedureCalls(boolean supportsCatalogsInProcedureCalls) { this.supportsCatalogsInProcedureCalls = supportsCatalogsInProcedureCalls; } /** - * Does the database support the use of catalog name in procedure calls + * Does the database support the use of catalog name in procedure calls? */ @Override public boolean isSupportsCatalogsInProcedureCalls() { @@ -271,14 +271,14 @@ public class GenericCallMetaDataProvider implements CallMetaDataProvider { } /** - * Specify whether the database supports the use of schema name in procedure calls + * Specify whether the database supports the use of schema name in procedure calls. */ protected void setSupportsSchemasInProcedureCalls(boolean supportsSchemasInProcedureCalls) { this.supportsSchemasInProcedureCalls = supportsSchemasInProcedureCalls; } /** - * Does the database support the use of schema name in procedure calls + * Does the database support the use of schema name in procedure calls? */ @Override public boolean isSupportsSchemasInProcedureCalls() { @@ -286,28 +286,28 @@ public class GenericCallMetaDataProvider implements CallMetaDataProvider { } /** - * Specify whether the database uses upper case for identifiers + * Specify whether the database uses upper case for identifiers. */ protected void setStoresUpperCaseIdentifiers(boolean storesUpperCaseIdentifiers) { this.storesUpperCaseIdentifiers = storesUpperCaseIdentifiers; } /** - * Does the database use upper case for identifiers + * Does the database use upper case for identifiers? */ protected boolean isStoresUpperCaseIdentifiers() { return this.storesUpperCaseIdentifiers; } /** - * Specify whether the database uses lower case for identifiers + * Specify whether the database uses lower case for identifiers. */ protected void setStoresLowerCaseIdentifiers(boolean storesLowerCaseIdentifiers) { this.storesLowerCaseIdentifiers = storesLowerCaseIdentifiers; } /** - * Does the database use lower case for identifiers + * Does the database use lower case for identifiers? */ protected boolean isStoresLowerCaseIdentifiers() { return this.storesLowerCaseIdentifiers; @@ -315,7 +315,7 @@ public class GenericCallMetaDataProvider implements CallMetaDataProvider { /** - * Process the procedure column meta-data + * Process the procedure column meta-data. */ private void processProcedureColumns(DatabaseMetaData databaseMetaData, @Nullable String catalogName, @Nullable String schemaName, @Nullable String procedureName) { diff --git a/spring-web/src/main/java/org/springframework/http/converter/BufferedImageHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/BufferedImageHttpMessageConverter.java index 7bbe9064dfa..6290448250e 100644 --- a/spring-web/src/main/java/org/springframework/http/converter/BufferedImageHttpMessageConverter.java +++ b/spring-web/src/main/java/org/springframework/http/converter/BufferedImageHttpMessageConverter.java @@ -100,7 +100,7 @@ public class BufferedImageHttpMessageConverter implements HttpMessageConverter imageWriters = ImageIO.getImageWritersByMIMEType(defaultContentType.toString()); if (!imageWriters.hasNext()) { throw new IllegalArgumentException(