Merge pull request eugenp#5664 from amit2103/BAEL-10234

lor6 · web-flow · commit 340a502d7cf0 · 2018-11-11T23:21:52.000+02:00
[BAEL-10234] - Removed deprecated properties
diff --git a/spring-rest-full/src/main/resources/application.properties b/spring-rest-full/src/main/resources/application.properties
@@ -1,3 +1,3 @@
 server.port=8082
-server.context-path=/spring-rest-full
+server.servlet.context-path=/spring-rest-full
 endpoints.metrics.enabled=true
diff --git a/spring-rest-query-language/src/main/java/org/baeldung/spring/WebConfig.java b/spring-rest-query-language/src/main/java/org/baeldung/spring/WebConfig.java
@@ -6,13 +6,13 @@
 import org.springframework.web.servlet.ViewResolver;
 import org.springframework.web.servlet.config.annotation.EnableWebMvc;
 import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 import org.springframework.web.servlet.view.InternalResourceViewResolver;
 
 @Configuration
 @ComponentScan("org.baeldung.web")
 @EnableWebMvc
-public class WebConfig extends WebMvcConfigurerAdapter {
+public class WebConfig implements WebMvcConfigurer {
 
     public WebConfig() {
         super();
@@ -29,7 +29,6 @@ public ViewResolver viewResolver() {
     // API
     @Override
     public void addViewControllers(final ViewControllerRegistry registry) {
-        super.addViewControllers(registry);
         registry.addViewController("/homepage.html");
     }
 
diff --git a/spring-rest-query-language/src/main/resources/application.properties b/spring-rest-query-language/src/main/resources/application.properties
@@ -1,2 +1,2 @@
 server.port=8082
-server.context-path=/spring-rest-query-language
+server.servlet.context-path=/spring-rest-query-language
diff --git a/spring-rest-simple/pom.xml b/spring-rest-simple/pom.xml
@@ -34,6 +34,10 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
 
         <!-- Spring -->
         <dependency>
diff --git a/spring-rest-simple/src/main/resources/application.properties b/spring-rest-simple/src/main/resources/application.properties
@@ -1,2 +1,2 @@
 server.port= 8082
-server.context-path=/spring-rest
+server.servlet.context-path=/spring-rest

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`server.port=8082`
`2`		`-server.context-path=/spring-rest-query-language`
	`2`	`+server.servlet.context-path=/spring-rest-query-language`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`server.port= 8082`
`2`		`-server.context-path=/spring-rest`
	`2`	`+server.servlet.context-path=/spring-rest`