|
107 | 107 | import org.springframework.web.servlet.mvc.method.annotation.MvcUriComponentsBuilder;
|
108 | 108 | import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter;
|
109 | 109 | import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping;
|
110 |
| -import org.springframework.web.servlet.resource.AppCacheManifestTransformer; |
111 | 110 | import org.springframework.web.servlet.resource.CachingResourceResolver;
|
112 | 111 | import org.springframework.web.servlet.resource.CachingResourceTransformer;
|
113 | 112 | import org.springframework.web.servlet.resource.ContentVersionStrategy;
|
@@ -414,6 +413,7 @@ public void testResourcesWithOptionalAttributes() throws Exception {
|
414 | 413 | }
|
415 | 414 |
|
416 | 415 | @Test
|
| 416 | + @SuppressWarnings("deprecation") |
417 | 417 | public void testResourcesWithResolversTransformers() throws Exception {
|
418 | 418 | loadBeanDefinitions("mvc-config-resources-chain.xml");
|
419 | 419 |
|
@@ -452,14 +452,15 @@ public void testResourcesWithResolversTransformers() throws Exception {
|
452 | 452 | assertThat(transformers).hasSize(3);
|
453 | 453 | assertThat(transformers.get(0)).isInstanceOf(CachingResourceTransformer.class);
|
454 | 454 | assertThat(transformers.get(1)).isInstanceOf(CssLinkResourceTransformer.class);
|
455 |
| - assertThat(transformers.get(2)).isInstanceOf(AppCacheManifestTransformer.class); |
| 455 | + assertThat(transformers.get(2)).isInstanceOf(org.springframework.web.servlet.resource.AppCacheManifestTransformer.class); |
456 | 456 |
|
457 | 457 | CachingResourceTransformer cachingTransformer = (CachingResourceTransformer) transformers.get(0);
|
458 | 458 | assertThat(cachingTransformer.getCache()).isInstanceOf(ConcurrentMapCache.class);
|
459 | 459 | assertThat(cachingTransformer.getCache().getName()).isEqualTo("test-resource-cache");
|
460 | 460 | }
|
461 | 461 |
|
462 | 462 | @Test
|
| 463 | + @SuppressWarnings("deprecation") |
463 | 464 | public void testResourcesWithResolversTransformersCustom() throws Exception {
|
464 | 465 | loadBeanDefinitions("mvc-config-resources-chain-no-auto.xml");
|
465 | 466 |
|
@@ -489,7 +490,7 @@ public void testResourcesWithResolversTransformersCustom() throws Exception {
|
489 | 490 | List<ResourceTransformer> transformers = handler.getResourceTransformers();
|
490 | 491 | assertThat(transformers).hasSize(2);
|
491 | 492 | assertThat(transformers.get(0)).isInstanceOf(CachingResourceTransformer.class);
|
492 |
| - assertThat(transformers.get(1)).isInstanceOf(AppCacheManifestTransformer.class); |
| 493 | + assertThat(transformers.get(1)).isInstanceOf(org.springframework.web.servlet.resource.AppCacheManifestTransformer.class); |
493 | 494 | }
|
494 | 495 |
|
495 | 496 | @Test
|
|
0 commit comments