Clean up warnings in Gradle build
This commit is contained in:
parent
a11d1c8510
commit
ef6a582c78
|
@ -33,7 +33,6 @@ import org.springframework.http.MediaType;
|
|||
import org.springframework.http.server.PathContainer;
|
||||
import org.springframework.web.reactive.HandlerMapping;
|
||||
import org.springframework.web.reactive.handler.SimpleUrlHandlerMapping;
|
||||
import org.springframework.web.reactive.resource.AppCacheManifestTransformer;
|
||||
import org.springframework.web.reactive.resource.CachingResourceResolver;
|
||||
import org.springframework.web.reactive.resource.CachingResourceTransformer;
|
||||
import org.springframework.web.reactive.resource.CssLinkResourceTransformer;
|
||||
|
@ -56,7 +55,7 @@ import static org.assertj.core.api.Assertions.assertThat;
|
|||
*
|
||||
* @author Rossen Stoyanchev
|
||||
*/
|
||||
public class ResourceHandlerRegistryTests {
|
||||
class ResourceHandlerRegistryTests {
|
||||
|
||||
private ResourceHandlerRegistry registry;
|
||||
|
||||
|
@ -64,7 +63,7 @@ public class ResourceHandlerRegistryTests {
|
|||
|
||||
|
||||
@BeforeEach
|
||||
public void setup() {
|
||||
void setup() {
|
||||
this.registry = new ResourceHandlerRegistry(new GenericApplicationContext());
|
||||
this.registration = this.registry.addResourceHandler("/resources/**");
|
||||
this.registration.addResourceLocations("classpath:org/springframework/web/reactive/config/");
|
||||
|
@ -72,13 +71,13 @@ public class ResourceHandlerRegistryTests {
|
|||
|
||||
|
||||
@Test
|
||||
public void noResourceHandlers() throws Exception {
|
||||
void noResourceHandlers() {
|
||||
this.registry = new ResourceHandlerRegistry(new GenericApplicationContext());
|
||||
assertThat((Object) this.registry.getHandlerMapping()).isNull();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void mapPathToLocation() throws Exception {
|
||||
void mapPathToLocation() {
|
||||
MockServerWebExchange exchange = MockServerWebExchange.from(MockServerHttpRequest.get(""));
|
||||
exchange.getAttributes().put(HandlerMapping.PATH_WITHIN_HANDLER_MAPPING_ATTRIBUTE,
|
||||
PathContainer.parsePath("/testStylesheet.css"));
|
||||
|
@ -93,7 +92,7 @@ public class ResourceHandlerRegistryTests {
|
|||
}
|
||||
|
||||
@Test
|
||||
public void cacheControl() {
|
||||
void cacheControl() {
|
||||
assertThat(getHandler("/resources/**").getCacheControl()).isNull();
|
||||
|
||||
this.registration.setCacheControl(CacheControl.noCache().cachePrivate());
|
||||
|
@ -102,7 +101,7 @@ public class ResourceHandlerRegistryTests {
|
|||
}
|
||||
|
||||
@Test
|
||||
public void mediaTypes() {
|
||||
void mediaTypes() {
|
||||
MediaType mediaType = MediaType.parseMediaType("foo/bar");
|
||||
this.registration.setMediaTypes(Collections.singletonMap("bar", mediaType));
|
||||
ResourceWebHandler requestHandler = this.registration.getRequestHandler();
|
||||
|
@ -112,7 +111,7 @@ public class ResourceHandlerRegistryTests {
|
|||
}
|
||||
|
||||
@Test
|
||||
public void order() {
|
||||
void order() {
|
||||
assertThat(this.registry.getHandlerMapping().getOrder()).isEqualTo(Integer.MAX_VALUE -1);
|
||||
|
||||
this.registry.setOrder(0);
|
||||
|
@ -120,13 +119,13 @@ public class ResourceHandlerRegistryTests {
|
|||
}
|
||||
|
||||
@Test
|
||||
public void hasMappingForPattern() {
|
||||
void hasMappingForPattern() {
|
||||
assertThat(this.registry.hasMappingForPattern("/resources/**")).isTrue();
|
||||
assertThat(this.registry.hasMappingForPattern("/whatever")).isFalse();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void resourceChain() throws Exception {
|
||||
void resourceChain() {
|
||||
ResourceUrlProvider resourceUrlProvider = Mockito.mock(ResourceUrlProvider.class);
|
||||
this.registry.setResourceUrlProvider(resourceUrlProvider);
|
||||
ResourceResolver mockResolver = Mockito.mock(ResourceResolver.class);
|
||||
|
@ -152,7 +151,7 @@ public class ResourceHandlerRegistryTests {
|
|||
}
|
||||
|
||||
@Test
|
||||
public void resourceChainWithoutCaching() throws Exception {
|
||||
void resourceChainWithoutCaching() {
|
||||
this.registration.resourceChain(false);
|
||||
|
||||
ResourceWebHandler handler = getHandler("/resources/**");
|
||||
|
@ -166,13 +165,14 @@ public class ResourceHandlerRegistryTests {
|
|||
}
|
||||
|
||||
@Test
|
||||
public void resourceChainWithVersionResolver() throws Exception {
|
||||
@SuppressWarnings("deprecation")
|
||||
void resourceChainWithVersionResolver() {
|
||||
VersionResourceResolver versionResolver = new VersionResourceResolver()
|
||||
.addFixedVersionStrategy("fixed", "/**/*.js")
|
||||
.addContentVersionStrategy("/**");
|
||||
|
||||
this.registration.resourceChain(true).addResolver(versionResolver)
|
||||
.addTransformer(new AppCacheManifestTransformer());
|
||||
.addTransformer(new org.springframework.web.reactive.resource.AppCacheManifestTransformer());
|
||||
|
||||
ResourceWebHandler handler = getHandler("/resources/**");
|
||||
List<ResourceResolver> resolvers = handler.getResourceResolvers();
|
||||
|
@ -186,17 +186,19 @@ public class ResourceHandlerRegistryTests {
|
|||
assertThat(transformers).hasSize(3);
|
||||
assertThat(transformers.get(0)).isInstanceOf(CachingResourceTransformer.class);
|
||||
assertThat(transformers.get(1)).isInstanceOf(CssLinkResourceTransformer.class);
|
||||
assertThat(transformers.get(2)).isInstanceOf(AppCacheManifestTransformer.class);
|
||||
assertThat(transformers.get(2)).isInstanceOf(org.springframework.web.reactive.resource.AppCacheManifestTransformer.class);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void resourceChainWithOverrides() throws Exception {
|
||||
@SuppressWarnings("deprecation")
|
||||
void resourceChainWithOverrides() {
|
||||
CachingResourceResolver cachingResolver = Mockito.mock(CachingResourceResolver.class);
|
||||
VersionResourceResolver versionResolver = Mockito.mock(VersionResourceResolver.class);
|
||||
WebJarsResourceResolver webjarsResolver = Mockito.mock(WebJarsResourceResolver.class);
|
||||
PathResourceResolver pathResourceResolver = new PathResourceResolver();
|
||||
CachingResourceTransformer cachingTransformer = Mockito.mock(CachingResourceTransformer.class);
|
||||
AppCacheManifestTransformer appCacheTransformer = Mockito.mock(AppCacheManifestTransformer.class);
|
||||
org.springframework.web.reactive.resource.AppCacheManifestTransformer appCacheTransformer =
|
||||
Mockito.mock(org.springframework.web.reactive.resource.AppCacheManifestTransformer.class);
|
||||
CssLinkResourceTransformer cssLinkTransformer = new CssLinkResourceTransformer();
|
||||
|
||||
this.registration.setCacheControl(CacheControl.maxAge(3600, TimeUnit.MILLISECONDS))
|
||||
|
|
Loading…
Reference in New Issue