Skip to content

Commit a0cbfa3

Browse files
wugangcaKevinGilmore
authored andcommitted
BAEL-2988 Move the code from spring-rest-simple to spring-mvc-simple-… (eugenp#7914)
* BAEL-2988 Move the code from spring-rest-simple to spring-mvc-simple-2, based on the review feedback. * BAEL-2988 revert previous changes in the spring-rest-simple
1 parent 5e6304f commit a0cbfa3

File tree

6 files changed

+28
-15
lines changed

6 files changed

+28
-15
lines changed
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
package com.baeldung.spring.config;
2+
3+
import org.springframework.context.annotation.Configuration;
4+
import org.springframework.format.FormatterRegistry;
5+
import org.springframework.web.servlet.config.annotation.EnableWebMvc;
6+
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
7+
8+
import com.baeldung.spring.config.converter.StringToEnumConverter;
9+
10+
@Configuration
11+
@EnableWebMvc
12+
public class MvcConfig implements WebMvcConfigurer {
13+
14+
public MvcConfig() {
15+
super();
16+
}
17+
18+
@Override
19+
public void addFormatters(FormatterRegistry registry) {
20+
registry.addConverter(new StringToEnumConverter());
21+
}
22+
}

spring-rest-simple/src/main/java/com/baeldung/config/converter/StringToEnumConverter.java renamed to spring-mvc-simple-2/src/main/java/com/baeldung/spring/config/converter/StringToEnumConverter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
package com.baeldung.config.converter;
1+
package com.baeldung.spring.config.converter;
22

33
import org.springframework.core.convert.converter.Converter;
44
import org.springframework.stereotype.Component;
55

6-
import com.baeldung.model.Modes;
6+
import com.baeldung.spring.model.Modes;
77

88
@Component
99
public class StringToEnumConverter implements Converter<String, Modes> {

spring-rest-simple/src/main/java/com/baeldung/cors/EnumController.java renamed to spring-mvc-simple-2/src/main/java/com/baeldung/spring/enums/EnumController.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
1-
package com.baeldung.cors;
1+
package com.baeldung.spring.enums;
22

3-
import org.springframework.web.bind.annotation.CrossOrigin;
43
import org.springframework.web.bind.annotation.GetMapping;
54
import org.springframework.web.bind.annotation.PathVariable;
65
import org.springframework.web.bind.annotation.RequestMapping;
76
import org.springframework.web.bind.annotation.RequestParam;
87
import org.springframework.web.bind.annotation.RestController;
98

10-
import com.baeldung.model.Modes;
9+
import com.baeldung.spring.model.Modes;
1110

12-
@CrossOrigin(maxAge = 3600)
1311
@RestController
1412
@RequestMapping("/enums")
1513
public class EnumController {

spring-rest-simple/src/main/java/com/baeldung/exceptions/GlobalControllerExceptionHandler.java renamed to spring-mvc-simple-2/src/main/java/com/baeldung/spring/exceptions/GlobalControllerExceptionHandler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.baeldung.exceptions;
1+
package com.baeldung.spring.exceptions;
22

33
import org.springframework.core.convert.ConversionFailedException;
44
import org.springframework.http.HttpStatus;

spring-rest-simple/src/main/java/com/baeldung/model/Modes.java renamed to spring-mvc-simple-2/src/main/java/com/baeldung/spring/model/Modes.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.baeldung.model;
1+
package com.baeldung.spring.model;
22

33
public enum Modes {
44
ALPHA, BETA;

spring-rest-simple/src/main/java/com/baeldung/config/MvcConfig.java

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import org.springframework.context.annotation.ComponentScan;
44
import org.springframework.context.annotation.Configuration;
5-
import org.springframework.format.FormatterRegistry;
65
import org.springframework.http.MediaType;
76
import org.springframework.http.converter.HttpMessageConverter;
87
import org.springframework.http.converter.StringHttpMessageConverter;
@@ -18,7 +17,6 @@
1817
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
1918

2019
import com.baeldung.config.converter.KryoHttpMessageConverter;
21-
import com.baeldung.config.converter.StringToEnumConverter;
2220

2321
import java.text.SimpleDateFormat;
2422
import java.util.List;
@@ -73,9 +71,4 @@ public void configureContentNegotiation(ContentNegotiationConfigurer configurer)
7371
public void addCorsMappings(CorsRegistry registry) {
7472
registry.addMapping("/**");
7573
}
76-
77-
@Override
78-
public void addFormatters(FormatterRegistry registry) {
79-
registry.addConverter(new StringToEnumConverter());
80-
}
8174
}

0 commit comments

Comments
 (0)