Skip to content

Commit 05cf9b7

Browse files
author
eugenp
committed
furthe example work
1 parent 36d8433 commit 05cf9b7

File tree

5 files changed

+54
-50
lines changed

5 files changed

+54
-50
lines changed

spring-rest/src/main/java/org/baeldung/config/MvcConfig.java renamed to spring-rest/src/main/java/org/baeldung/config/WebConfig.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66

77
@EnableWebMvc
88
@Configuration
9-
@ComponentScan({ "org.baeldung.controller" })
10-
public class MvcConfig {
9+
@ComponentScan({ "org.baeldung.web" })
10+
public class WebConfig {
1111

12-
public MvcConfig() {
12+
public WebConfig() {
1313
super();
1414
}
1515

spring-rest/src/main/java/org/baeldung/controller/BarController.java renamed to spring-rest/src/main/java/org/baeldung/web/controller/BarMappingExamplesController.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.baeldung.controller;
1+
package org.baeldung.web.controller;
22

33
import org.springframework.stereotype.Controller;
44
import org.springframework.web.bind.annotation.PathVariable;
@@ -7,9 +7,9 @@
77
import org.springframework.web.bind.annotation.ResponseBody;
88

99
@Controller
10-
public class BarController {
10+
public class BarMappingExamplesController {
1111

12-
public BarController() {
12+
public BarMappingExamplesController() {
1313
super();
1414
}
1515

spring-rest/src/main/java/org/baeldung/controller/FooController.java renamed to spring-rest/src/main/java/org/baeldung/web/controller/FooMappingExamplesController.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.baeldung.controller;
1+
package org.baeldung.web.controller;
22

33
import org.springframework.stereotype.Controller;
44
import org.springframework.web.bind.annotation.PathVariable;
@@ -7,15 +7,15 @@
77
import org.springframework.web.bind.annotation.ResponseBody;
88

99
@Controller
10-
public class FooController {
10+
public class FooMappingExamplesController {
1111

12-
public FooController() {
12+
public FooMappingExamplesController() {
1313
super();
1414
}
1515

1616
// API
1717

18-
// by paths
18+
// mapping examples
1919

2020
@RequestMapping(value = "/foos")
2121
@ResponseBody

‎spring-security-rest/src/main/java/org/baeldung/web/controller/FooController.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,16 @@ public FooController() {
3131

3232
// API
3333

34-
// read
34+
// read - single
3535

3636
@RequestMapping(value = "/{id}", method = RequestMethod.GET)
3737
@ResponseBody
38-
public Foo findOne(@PathVariable("id") final Long id, final UriComponentsBuilder uriBuilder, final HttpServletResponse response) {
38+
public Foo findById(@PathVariable("id") final Long id, final UriComponentsBuilder uriBuilder, final HttpServletResponse response) {
3939
return new Foo(randomAlphabetic(6));
4040
}
4141

42+
// read - multiple
43+
4244
@RequestMapping(method = RequestMethod.GET)
4345
@ResponseBody
4446
public List<Foo> findAll() {

‎spring-security-rest/src/main/webapp/WEB-INF/web.xml‎

Lines changed: 40 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,52 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
3-
xsi:schemaLocation="
2+
<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
4+
xsi:schemaLocation="
45
http://java.sun.com/xml/ns/javaee
5-
http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" id="WebApp_ID" version="3.0">
6+
http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
7+
id="WebApp_ID" version="3.0">
68

7-
<display-name>Spring MVC Application</display-name>
9+
<display-name>Spring MVC Application</display-name>
810

9-
<!-- Spring root -->
10-
<context-param>
11-
<param-name>contextClass</param-name>
12-
<param-value>
11+
<!-- Spring root -->
12+
<context-param>
13+
<param-name>contextClass</param-name>
14+
<param-value>
1315
org.springframework.web.context.support.AnnotationConfigWebApplicationContext
1416
</param-value>
15-
</context-param>
16-
<context-param>
17-
<param-name>contextConfigLocation</param-name>
18-
<param-value>org.baeldung.spring</param-value>
19-
</context-param>
17+
</context-param>
18+
<context-param>
19+
<param-name>contextConfigLocation</param-name>
20+
<param-value>org.baeldung.spring</param-value>
21+
</context-param>
2022

21-
<listener>
22-
<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
23-
</listener>
23+
<listener>
24+
<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
25+
</listener>
2426

25-
<!-- Spring child -->
26-
<servlet>
27-
<servlet-name>api</servlet-name>
28-
<servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
29-
<load-on-startup>1</load-on-startup>
30-
</servlet>
31-
<servlet-mapping>
32-
<servlet-name>api</servlet-name>
33-
<url-pattern>/api/*</url-pattern>
34-
</servlet-mapping>
27+
<!-- Spring child -->
28+
<servlet>
29+
<servlet-name>api</servlet-name>
30+
<servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
31+
<load-on-startup>1</load-on-startup>
32+
</servlet>
33+
<servlet-mapping>
34+
<servlet-name>api</servlet-name>
35+
<url-pattern>/api/*</url-pattern>
36+
</servlet-mapping>
3537

36-
<!-- Spring Security -->
37-
<filter>
38-
<filter-name>springSecurityFilterChain</filter-name>
39-
<filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class>
40-
</filter>
41-
<filter-mapping>
42-
<filter-name>springSecurityFilterChain</filter-name>
43-
<url-pattern>/*</url-pattern>
44-
</filter-mapping>
38+
<!-- Spring Security -->
39+
<filter>
40+
<filter-name>springSecurityFilterChain</filter-name>
41+
<filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class>
42+
</filter>
43+
<filter-mapping>
44+
<filter-name>springSecurityFilterChain</filter-name>
45+
<url-pattern>/*</url-pattern>
46+
</filter-mapping>
4547

46-
<!-- <welcome-file-list> -->
47-
<!-- <welcome-file>index.html</welcome-file> -->
48-
<!-- </welcome-file-list> -->
48+
<!-- <welcome-file-list> -->
49+
<!-- <welcome-file>index.html</welcome-file> -->
50+
<!-- </welcome-file-list> -->
4951

5052
</web-app>

0 commit comments

Comments
 (0)