Browse Source

Polishing

pull/26558/head
Juergen Hoeller 5 years ago
parent
commit
f011e58f90
  1. 6
      spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/AbstractJdbcCall.java
  2. 12
      spring-webflux/src/test/java/org/springframework/web/reactive/config/ResourceHandlerRegistryTests.java

6
spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/AbstractJdbcCall.java

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
/*
* Copyright 2002-2019 the original author or authors.
* Copyright 2002-2020 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.
@ -70,7 +70,7 @@ public abstract class AbstractJdbcCall { @@ -70,7 +70,7 @@ public abstract class AbstractJdbcCall {
* Has this operation been compiled? Compilation means at least checking
* that a DataSource or JdbcTemplate has been provided.
*/
private volatile boolean compiled = false;
private volatile boolean compiled;
/** The generated string used for call statement. */
@Nullable
@ -433,7 +433,7 @@ public abstract class AbstractJdbcCall { @@ -433,7 +433,7 @@ public abstract class AbstractJdbcCall {
/**
* Match the provided in parameter values with registered parameters and
* parameters defined via meta-data processing.
* @param parameterSource the parameter vakues provided as a {@link SqlParameterSource}
* @param parameterSource the parameter values provided as a {@link SqlParameterSource}
* @return a Map with parameter names and values
*/
protected Map<String, Object> matchInParameterValuesWithCallParameters(SqlParameterSource parameterSource) {

12
spring-webflux/src/test/java/org/springframework/web/reactive/config/ResourceHandlerRegistryTests.java

@ -70,13 +70,13 @@ public class ResourceHandlerRegistryTests { @@ -70,13 +70,13 @@ public class ResourceHandlerRegistryTests {
@Test
public void noResourceHandlers() throws Exception {
public void noResourceHandlers() {
this.registry = new ResourceHandlerRegistry(new GenericApplicationContext());
assertThat((Object) this.registry.getHandlerMapping()).isNull();
}
@Test
public void mapPathToLocation() throws Exception {
public void mapPathToLocation() {
MockServerWebExchange exchange = MockServerWebExchange.from(MockServerHttpRequest.get(""));
exchange.getAttributes().put(HandlerMapping.PATH_WITHIN_HANDLER_MAPPING_ATTRIBUTE,
PathContainer.parsePath("/testStylesheet.css"));
@ -114,7 +114,7 @@ public class ResourceHandlerRegistryTests { @@ -114,7 +114,7 @@ public class ResourceHandlerRegistryTests {
}
@Test
public void resourceChain() throws Exception {
public void resourceChain() {
ResourceUrlProvider resourceUrlProvider = Mockito.mock(ResourceUrlProvider.class);
this.registry.setResourceUrlProvider(resourceUrlProvider);
ResourceResolver mockResolver = Mockito.mock(ResourceResolver.class);
@ -140,7 +140,7 @@ public class ResourceHandlerRegistryTests { @@ -140,7 +140,7 @@ public class ResourceHandlerRegistryTests {
}
@Test
public void resourceChainWithoutCaching() throws Exception {
public void resourceChainWithoutCaching() {
this.registration.resourceChain(false);
ResourceWebHandler handler = getHandler("/resources/**");
@ -154,7 +154,7 @@ public class ResourceHandlerRegistryTests { @@ -154,7 +154,7 @@ public class ResourceHandlerRegistryTests {
}
@Test
public void resourceChainWithVersionResolver() throws Exception {
public void resourceChainWithVersionResolver() {
VersionResourceResolver versionResolver = new VersionResourceResolver()
.addFixedVersionStrategy("fixed", "/**/*.js")
.addContentVersionStrategy("/**");
@ -178,7 +178,7 @@ public class ResourceHandlerRegistryTests { @@ -178,7 +178,7 @@ public class ResourceHandlerRegistryTests {
}
@Test
public void resourceChainWithOverrides() throws Exception {
public void resourceChainWithOverrides() {
CachingResourceResolver cachingResolver = Mockito.mock(CachingResourceResolver.class);
VersionResourceResolver versionResolver = Mockito.mock(VersionResourceResolver.class);
WebJarsResourceResolver webjarsResolver = Mockito.mock(WebJarsResourceResolver.class);

Loading…
Cancel
Save