Skip to content

Commit cde1d1c

Browse files
committed
Fixed usage of deprecated GzipResourceResolver in spring-static-resources
added back spring-version modification in module that hasnt been worked yet cleaned unused classes
1 parent c7ba38f commit cde1d1c

File tree

3 files changed

+4
-4
lines changed
  • persistence-modules/spring-data-mongodb
  • spring-security-mvc-login/src/main/java/com/baeldung/spring
  • spring-static-resources/src/main/java/org/baeldung/spring

3 files changed

+4
-4
lines changed

persistence-modules/spring-data-mongodb/pom.xml

+1
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@
9696
</build>
9797

9898
<properties>
99+
<spring.version>5.1.0.RELEASE</spring.version>
99100
<org.springframework.data.version>2.1.2.RELEASE</org.springframework.data.version>
100101
<querydsl.version>4.1.4</querydsl.version>
101102
<mysema.maven.version>1.1.3</mysema.maven.version>

spring-security-mvc-login/src/main/java/com/baeldung/spring/MvcConfig.java

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package com.baeldung.spring;
22

33
import org.springframework.context.annotation.Bean;
4-
import org.springframework.context.annotation.Configuration;
54
import org.springframework.web.servlet.ViewResolver;
65
import org.springframework.web.servlet.config.annotation.EnableWebMvc;
76
import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;

spring-static-resources/src/main/java/org/baeldung/spring/MvcConfig.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
1919
import org.springframework.web.servlet.i18n.CookieLocaleResolver;
2020
import org.springframework.web.servlet.i18n.LocaleChangeInterceptor;
21-
import org.springframework.web.servlet.resource.GzipResourceResolver;
21+
import org.springframework.web.servlet.resource.EncodedResourceResolver;
2222
import org.springframework.web.servlet.resource.PathResourceResolver;
2323
import org.springframework.web.servlet.resource.ResourceUrlEncodingFilter;
2424
import org.springframework.web.servlet.view.InternalResourceViewResolver;
@@ -57,10 +57,10 @@ public ViewResolver viewResolver() {
5757
public void addResourceHandlers(ResourceHandlerRegistry registry) {
5858
// For examples using Spring 4.1.0
5959
if ((env.getProperty("resource.handler.conf")).equals("4.1.0")) {
60-
registry.addResourceHandler("/js/**").addResourceLocations("/js/").setCachePeriod(3600).resourceChain(true).addResolver(new GzipResourceResolver()).addResolver(new PathResourceResolver());
60+
registry.addResourceHandler("/js/**").addResourceLocations("/js/").setCachePeriod(3600).resourceChain(true).addResolver(new EncodedResourceResolver()).addResolver(new PathResourceResolver());
6161
registry.addResourceHandler("/resources/**").addResourceLocations("/resources/", "classpath:/other-resources/").setCachePeriod(3600).resourceChain(true).addResolver(new PathResourceResolver());
6262
registry.addResourceHandler("/files/**").addResourceLocations("file:/Users/Elena/").setCachePeriod(3600).resourceChain(true).addResolver(new PathResourceResolver());
63-
registry.addResourceHandler("/other-files/**").addResourceLocations("file:/Users/Elena/").setCachePeriod(3600).resourceChain(true).addResolver(new GzipResourceResolver());
63+
registry.addResourceHandler("/other-files/**").addResourceLocations("file:/Users/Elena/").setCachePeriod(3600).resourceChain(true).addResolver(new EncodedResourceResolver());
6464
}
6565
// For examples using Spring 4.0.7
6666
else if ((env.getProperty("resource.handler.conf")).equals("4.0.7")) {

0 commit comments

Comments
 (0)