Browse Source

Polishing

pull/1753/merge
Juergen Hoeller 8 years ago
parent
commit
b2d87abcbb
  1. 3
      spring-core/src/test/java/org/springframework/util/ConcurrentReferenceHashMapTests.java
  2. 2
      spring-expression/src/test/java/org/springframework/expression/spel/SpelReproTests.java
  3. 2
      spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/CallMetaDataContext.java
  4. 4
      spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/CallMetaDataProviderFactory.java
  5. 18
      spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/GenericCallMetaDataProvider.java
  6. 2
      spring-web/src/main/java/org/springframework/http/converter/BufferedImageHttpMessageConverter.java

3
spring-core/src/test/java/org/springframework/util/ConcurrentReferenceHashMapTests.java

@ -599,8 +599,7 @@ public class ConcurrentReferenceHashMapTests {
protected ReferenceManager createReferenceManager() { protected ReferenceManager createReferenceManager() {
return new ReferenceManager() { return new ReferenceManager() {
@Override @Override
public Reference<K, V> createReference(Entry<K, V> entry, int hash, public Reference<K, V> createReference(Entry<K, V> entry, int hash, @Nullable Reference<K, V> next) {
@Nullable Reference<K, V> next) {
if (TestWeakConcurrentCache.this.disableTestHooks) { if (TestWeakConcurrentCache.this.disableTestHooks) {
return super.createReference(entry, hash, next); return super.createReference(entry, hash, next);
} }

2
spring-expression/src/test/java/org/springframework/expression/spel/SpelReproTests.java

@ -236,7 +236,7 @@ public class SpelReproTests extends AbstractExpressionTests {
} }
@Test @Test
public void accessingNullPropertyViaReflection_SPR5663() throws AccessException { public void propertyAccessOnNullTarget_SPR5663() throws AccessException {
PropertyAccessor accessor = new ReflectivePropertyAccessor(); PropertyAccessor accessor = new ReflectivePropertyAccessor();
EvaluationContext context = TestScenarioCreator.getTestEvaluationContext(); EvaluationContext context = TestScenarioCreator.getTestEvaluationContext();
assertFalse(accessor.canRead(context, null, "abc")); assertFalse(accessor.canRead(context, null, "abc"));

2
spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/CallMetaDataContext.java

@ -276,7 +276,7 @@ public class CallMetaDataContext {
} }
else { else {
throw new InvalidDataAccessApiUsageException( 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");
} }
} }
} }

4
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 * Create a {@link CallMetaDataProvider} based on the database meta-data.
* @param dataSource used to retrieve meta-data * @param dataSource the JDBC DataSource to use for retrieving meta-data
* @param context the class that holds configuration and meta-data * @param context the class that holds configuration and meta-data
* @return instance of the CallMetaDataProvider implementation to be used * @return instance of the CallMetaDataProvider implementation to be used
*/ */

18
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) { protected void setSupportsCatalogsInProcedureCalls(boolean supportsCatalogsInProcedureCalls) {
this.supportsCatalogsInProcedureCalls = 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 @Override
public boolean isSupportsCatalogsInProcedureCalls() { 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) { protected void setSupportsSchemasInProcedureCalls(boolean supportsSchemasInProcedureCalls) {
this.supportsSchemasInProcedureCalls = 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 @Override
public boolean isSupportsSchemasInProcedureCalls() { 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) { protected void setStoresUpperCaseIdentifiers(boolean storesUpperCaseIdentifiers) {
this.storesUpperCaseIdentifiers = storesUpperCaseIdentifiers; this.storesUpperCaseIdentifiers = storesUpperCaseIdentifiers;
} }
/** /**
* Does the database use upper case for identifiers * Does the database use upper case for identifiers?
*/ */
protected boolean isStoresUpperCaseIdentifiers() { protected boolean isStoresUpperCaseIdentifiers() {
return this.storesUpperCaseIdentifiers; 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) { protected void setStoresLowerCaseIdentifiers(boolean storesLowerCaseIdentifiers) {
this.storesLowerCaseIdentifiers = storesLowerCaseIdentifiers; this.storesLowerCaseIdentifiers = storesLowerCaseIdentifiers;
} }
/** /**
* Does the database use lower case for identifiers * Does the database use lower case for identifiers?
*/ */
protected boolean isStoresLowerCaseIdentifiers() { protected boolean isStoresLowerCaseIdentifiers() {
return this.storesLowerCaseIdentifiers; 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, private void processProcedureColumns(DatabaseMetaData databaseMetaData,
@Nullable String catalogName, @Nullable String schemaName, @Nullable String procedureName) { @Nullable String catalogName, @Nullable String schemaName, @Nullable String procedureName) {

2
spring-web/src/main/java/org/springframework/http/converter/BufferedImageHttpMessageConverter.java

@ -100,7 +100,7 @@ public class BufferedImageHttpMessageConverter implements HttpMessageConverter<B
* @throws IllegalArgumentException if the given content type is not supported by the Java Image I/O API * @throws IllegalArgumentException if the given content type is not supported by the Java Image I/O API
*/ */
public void setDefaultContentType(@Nullable MediaType defaultContentType) { public void setDefaultContentType(@Nullable MediaType defaultContentType) {
if (defaultContentType!= null) { if (defaultContentType != null) {
Iterator<ImageWriter> imageWriters = ImageIO.getImageWritersByMIMEType(defaultContentType.toString()); Iterator<ImageWriter> imageWriters = ImageIO.getImageWritersByMIMEType(defaultContentType.toString());
if (!imageWriters.hasNext()) { if (!imageWriters.hasNext()) {
throw new IllegalArgumentException( throw new IllegalArgumentException(

Loading…
Cancel
Save