Skip to content

Commit 75436c2

Browse files
filiphrfiliphr
committed
Remove not needed PutAwareStandardServletMultiPartResolver since the Spring Web StandardServletMultipartResolver supports put
1 parent e43ee58 commit 75436c2

File tree

8 files changed

+12
-100
lines changed

8 files changed

+12
-100
lines changed

‎modules/flowable-app-engine-rest/src/test/java/org/flowable/app/rest/DispatcherServletConfiguration.java

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,14 @@
1414

1515
import java.util.List;
1616

17-
import org.flowable.common.rest.multipart.PutAwareStandardServletMultiPartResolver;
18-
import org.slf4j.Logger;
19-
import org.slf4j.LoggerFactory;
2017
import org.springframework.beans.factory.annotation.Autowired;
2118
import org.springframework.context.annotation.Bean;
2219
import org.springframework.context.annotation.ComponentScan;
2320
import org.springframework.context.annotation.Configuration;
2421
import org.springframework.http.converter.HttpMessageConverter;
2522
import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
2623
import org.springframework.web.multipart.MultipartResolver;
24+
import org.springframework.web.multipart.support.StandardServletMultipartResolver;
2725
import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport;
2826

2927
import com.fasterxml.jackson.databind.ObjectMapper;
@@ -32,14 +30,12 @@
3230
@ComponentScan({ "org.flowable.app.rest.service.api" })
3331
public class DispatcherServletConfiguration extends WebMvcConfigurationSupport {
3432

35-
private static final Logger LOGGER = LoggerFactory.getLogger(DispatcherServletConfiguration.class);
36-
3733
@Autowired
3834
private ObjectMapper objectMapper;
3935

4036
@Bean
4137
public MultipartResolver multipartResolver() {
42-
return new PutAwareStandardServletMultiPartResolver();
38+
return new StandardServletMultipartResolver();
4339
}
4440

4541
@Override

‎modules/flowable-cmmn-rest/src/test/java/org/flowable/cmmn/rest/DispatcherServletConfiguration.java

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,14 @@
1414

1515
import java.util.List;
1616

17-
import org.flowable.common.rest.multipart.PutAwareStandardServletMultiPartResolver;
18-
import org.slf4j.Logger;
19-
import org.slf4j.LoggerFactory;
2017
import org.springframework.beans.factory.annotation.Autowired;
2118
import org.springframework.context.annotation.Bean;
2219
import org.springframework.context.annotation.ComponentScan;
2320
import org.springframework.context.annotation.Configuration;
2421
import org.springframework.http.converter.HttpMessageConverter;
2522
import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
2623
import org.springframework.web.multipart.MultipartResolver;
24+
import org.springframework.web.multipart.support.StandardServletMultipartResolver;
2725
import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport;
2826

2927
import com.fasterxml.jackson.databind.ObjectMapper;
@@ -32,14 +30,12 @@
3230
@ComponentScan({ "org.flowable.cmmn.rest.service.api" })
3331
public class DispatcherServletConfiguration extends WebMvcConfigurationSupport {
3432

35-
private static final Logger LOGGER = LoggerFactory.getLogger(DispatcherServletConfiguration.class);
36-
3733
@Autowired
3834
private ObjectMapper objectMapper;
3935

4036
@Bean
4137
public MultipartResolver multipartResolver() {
42-
return new PutAwareStandardServletMultiPartResolver();
38+
return new StandardServletMultipartResolver();
4339
}
4440

4541
@Override

‎modules/flowable-common-rest/src/main/java/org/flowable/common/rest/multipart/PutAwareStandardServletMultiPartResolver.java

Lines changed: 0 additions & 49 deletions
This file was deleted.

‎modules/flowable-dmn-rest/src/test/java/org/flowable/dmn/rest/DispatcherServletConfiguration.java

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,14 @@
1414

1515
import java.util.List;
1616

17-
import org.flowable.common.rest.multipart.PutAwareStandardServletMultiPartResolver;
18-
import org.slf4j.Logger;
19-
import org.slf4j.LoggerFactory;
2017
import org.springframework.beans.factory.annotation.Autowired;
2118
import org.springframework.context.annotation.Bean;
2219
import org.springframework.context.annotation.ComponentScan;
2320
import org.springframework.context.annotation.Configuration;
2421
import org.springframework.http.converter.HttpMessageConverter;
2522
import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
2623
import org.springframework.web.multipart.MultipartResolver;
24+
import org.springframework.web.multipart.support.StandardServletMultipartResolver;
2725
import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport;
2826

2927
import com.fasterxml.jackson.databind.ObjectMapper;
@@ -32,14 +30,12 @@
3230
@ComponentScan({ "org.flowable.dmn.rest.exception", "org.flowable.dmn.rest.service.api" })
3331
public class DispatcherServletConfiguration extends WebMvcConfigurationSupport {
3432

35-
private static final Logger LOGGER = LoggerFactory.getLogger(DispatcherServletConfiguration.class);
36-
3733
@Autowired
3834
private ObjectMapper objectMapper;
3935

4036
@Bean
4137
public MultipartResolver multipartResolver() {
42-
return new PutAwareStandardServletMultiPartResolver();
38+
return new StandardServletMultipartResolver();
4339
}
4440

4541
@Override

‎modules/flowable-event-registry-rest/src/test/java/org/flowable/eventregistry/rest/DispatcherServletConfiguration.java

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,14 @@
1414

1515
import java.util.List;
1616

17-
import org.flowable.common.rest.multipart.PutAwareStandardServletMultiPartResolver;
18-
import org.slf4j.Logger;
19-
import org.slf4j.LoggerFactory;
2017
import org.springframework.beans.factory.annotation.Autowired;
2118
import org.springframework.context.annotation.Bean;
2219
import org.springframework.context.annotation.ComponentScan;
2320
import org.springframework.context.annotation.Configuration;
2421
import org.springframework.http.converter.HttpMessageConverter;
2522
import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
2623
import org.springframework.web.multipart.MultipartResolver;
24+
import org.springframework.web.multipart.support.StandardServletMultipartResolver;
2725
import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport;
2826

2927
import com.fasterxml.jackson.databind.ObjectMapper;
@@ -32,14 +30,12 @@
3230
@ComponentScan({ "org.flowable.eventregistry.rest.service.api" })
3331
public class DispatcherServletConfiguration extends WebMvcConfigurationSupport {
3432

35-
private static final Logger LOGGER = LoggerFactory.getLogger(DispatcherServletConfiguration.class);
36-
3733
@Autowired
3834
private ObjectMapper objectMapper;
3935

4036
@Bean
4137
public MultipartResolver multipartResolver() {
42-
return new PutAwareStandardServletMultiPartResolver();
38+
return new StandardServletMultipartResolver();
4339
}
4440

4541
@Override

‎modules/flowable-external-job-rest/src/test/java/org/flowable/external/job/rest/service/DispatcherServletConfiguration.java

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,15 @@
1515
import java.util.Collections;
1616
import java.util.List;
1717

18-
import org.flowable.common.rest.multipart.PutAwareStandardServletMultiPartResolver;
1918
import org.flowable.external.job.rest.service.api.ExternalJobRestResponseFactory;
20-
import org.slf4j.Logger;
21-
import org.slf4j.LoggerFactory;
2219
import org.springframework.beans.factory.annotation.Autowired;
2320
import org.springframework.context.annotation.Bean;
2421
import org.springframework.context.annotation.ComponentScan;
2522
import org.springframework.context.annotation.Configuration;
2623
import org.springframework.http.converter.HttpMessageConverter;
2724
import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
2825
import org.springframework.web.multipart.MultipartResolver;
26+
import org.springframework.web.multipart.support.StandardServletMultipartResolver;
2927
import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport;
3028

3129
import com.fasterxml.jackson.databind.ObjectMapper;
@@ -37,8 +35,6 @@
3735
})
3836
public class DispatcherServletConfiguration extends WebMvcConfigurationSupport {
3937

40-
private static final Logger LOGGER = LoggerFactory.getLogger(DispatcherServletConfiguration.class);
41-
4238
@Autowired
4339
private ObjectMapper objectMapper;
4440

@@ -49,7 +45,7 @@ public ExternalJobRestResponseFactory externalJobRestResponseFactory(ObjectMappe
4945

5046
@Bean
5147
public MultipartResolver multipartResolver() {
52-
return new PutAwareStandardServletMultiPartResolver();
48+
return new StandardServletMultipartResolver();
5349
}
5450

5551
@Override

‎modules/flowable-rest/src/test/java/org/flowable/rest/DispatcherServletConfiguration.java

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,14 @@
1414

1515
import java.util.List;
1616

17-
import org.flowable.common.rest.multipart.PutAwareStandardServletMultiPartResolver;
18-
import org.slf4j.Logger;
19-
import org.slf4j.LoggerFactory;
2017
import org.springframework.beans.factory.annotation.Autowired;
2118
import org.springframework.context.annotation.Bean;
2219
import org.springframework.context.annotation.ComponentScan;
2320
import org.springframework.context.annotation.Configuration;
2421
import org.springframework.http.converter.HttpMessageConverter;
2522
import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
2623
import org.springframework.web.multipart.MultipartResolver;
24+
import org.springframework.web.multipart.support.StandardServletMultipartResolver;
2725
import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport;
2826

2927
import com.fasterxml.jackson.databind.ObjectMapper;
@@ -32,14 +30,12 @@
3230
@ComponentScan({ "org.flowable.rest.exception", "org.flowable.rest.service.api" })
3331
public class DispatcherServletConfiguration extends WebMvcConfigurationSupport {
3432

35-
private static final Logger LOGGER = LoggerFactory.getLogger(DispatcherServletConfiguration.class);
36-
3733
@Autowired
3834
private ObjectMapper objectMapper;
3935

4036
@Bean
4137
public MultipartResolver multipartResolver() {
42-
return new PutAwareStandardServletMultiPartResolver();
38+
return new StandardServletMultipartResolver();
4339
}
4440

4541
@Override

‎modules/flowable-spring-boot/flowable-spring-boot-starters/flowable-spring-boot-autoconfigure/src/main/java/org/flowable/spring/boot/DispatcherServletConfiguration.java

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,13 @@
1515
import java.util.List;
1616

1717
import org.flowable.common.rest.exception.BaseExceptionHandlerAdvice;
18-
import org.flowable.common.rest.multipart.PutAwareStandardServletMultiPartResolver;
19-
import org.slf4j.Logger;
20-
import org.slf4j.LoggerFactory;
2118
import org.springframework.beans.factory.annotation.Autowired;
2219
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
23-
import org.springframework.boot.autoconfigure.web.servlet.MultipartProperties;
24-
import org.springframework.context.annotation.Bean;
2520
import org.springframework.context.annotation.ComponentScan;
2621
import org.springframework.context.annotation.Configuration;
2722
import org.springframework.http.converter.HttpMessageConverter;
2823
import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
2924
import org.springframework.scheduling.annotation.EnableAsync;
30-
import org.springframework.web.multipart.MultipartResolver;
3125
import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport;
3226

3327
import com.fasterxml.jackson.databind.ObjectMapper;
@@ -41,18 +35,9 @@
4135
@EnableAsync
4236
public class DispatcherServletConfiguration extends WebMvcConfigurationSupport {
4337

44-
private static final Logger LOGGER = LoggerFactory.getLogger(DispatcherServletConfiguration.class);
45-
4638
@Autowired
4739
protected ObjectMapper objectMapper;
4840

49-
@Bean
50-
public MultipartResolver multipartResolver(MultipartProperties multipartProperties) {
51-
PutAwareStandardServletMultiPartResolver multipartResolver = new PutAwareStandardServletMultiPartResolver();
52-
multipartResolver.setResolveLazily(multipartProperties.isResolveLazily());
53-
return multipartResolver;
54-
}
55-
5641
@Override
5742
public void configureMessageConverters(List<HttpMessageConverter<?>> converters) {
5843
addDefaultHttpMessageConverters(converters);

0 commit comments

Comments
 (0)