forked from JavaOPs/topjava
-
Notifications
You must be signed in to change notification settings - Fork 0
Expand file tree
/
Copy path2_6_annotation_processing.patch
More file actions
191 lines (167 loc) · 8.16 KB
/
2_6_annotation_processing.patch
File metadata and controls
191 lines (167 loc) · 8.16 KB
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
Index: src/main/java/ru/javawebinar/topjava/service/UserServiceImpl.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- src/main/java/ru/javawebinar/topjava/service/UserServiceImpl.java (date 1530741372000)
+++ src/main/java/ru/javawebinar/topjava/service/UserServiceImpl.java (date 1530741375310)
@@ -1,5 +1,7 @@
package ru.javawebinar.topjava.service;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
import ru.javawebinar.topjava.model.User;
import ru.javawebinar.topjava.repository.UserRepository;
import ru.javawebinar.topjava.util.exception.NotFoundException;
@@ -9,14 +11,12 @@
import static ru.javawebinar.topjava.util.ValidationUtil.checkNotFound;
import static ru.javawebinar.topjava.util.ValidationUtil.checkNotFoundWithId;
+@Service
public class UserServiceImpl implements UserService {
+ @Autowired
private UserRepository repository;
- public void setRepository(UserRepository repository) {
- this.repository = repository;
- }
-
@Override
public User create(User user) {
return repository.save(user);
Index: src/main/java/ru/javawebinar/topjava/web/user/AdminRestController.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- src/main/java/ru/javawebinar/topjava/web/user/AdminRestController.java (date 1530741372000)
+++ src/main/java/ru/javawebinar/topjava/web/user/AdminRestController.java (date 1530741375333)
@@ -1,9 +1,11 @@
package ru.javawebinar.topjava.web.user;
+import org.springframework.stereotype.Controller;
import ru.javawebinar.topjava.model.User;
import java.util.List;
+@Controller
public class AdminRestController extends AbstractUserController {
@Override
Index: src/main/java/ru/javawebinar/topjava/SpringMain.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- src/main/java/ru/javawebinar/topjava/SpringMain.java (date 1530741372000)
+++ src/main/java/ru/javawebinar/topjava/SpringMain.java (date 1530741391339)
@@ -4,23 +4,17 @@
import org.springframework.context.support.ClassPathXmlApplicationContext;
import ru.javawebinar.topjava.model.Role;
import ru.javawebinar.topjava.model.User;
-import ru.javawebinar.topjava.repository.UserRepository;
-import ru.javawebinar.topjava.service.UserService;
+import ru.javawebinar.topjava.web.user.AdminRestController;
import java.util.Arrays;
public class SpringMain {
public static void main(String[] args) {
- ConfigurableApplicationContext appCtx = new ClassPathXmlApplicationContext("spring/spring-app.xml");
- System.out.println("Bean definition names: " + Arrays.toString(appCtx.getBeanDefinitionNames()));
-
-// UserRepository userRepository = (UserRepository) appCtx.getBean("mockUserRepository");
- UserRepository userRepository = appCtx.getBean(UserRepository.class);
- userRepository.getAll();
-
- UserService userService = appCtx.getBean(UserService.class);
- userService.create(new User(null, "userName", "email@mail.ru", "password", Role.ROLE_ADMIN));
-
- appCtx.close();
+ // java 7 Automatic resource management
+ try (ConfigurableApplicationContext appCtx = new ClassPathXmlApplicationContext("spring/spring-app.xml")) {
+ System.out.println("Bean definition names: " + Arrays.toString(appCtx.getBeanDefinitionNames()));
+ AdminRestController adminUserController = appCtx.getBean(AdminRestController.class);
+ adminUserController.create(new User(null, "userName", "email@mail.ru", "password", Role.ROLE_ADMIN));
+ }
}
}
Index: src/main/java/ru/javawebinar/topjava/repository/mock/MockUserRepositoryImpl.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- src/main/java/ru/javawebinar/topjava/repository/mock/MockUserRepositoryImpl.java (date 1530741372000)
+++ src/main/java/ru/javawebinar/topjava/repository/mock/MockUserRepositoryImpl.java (date 1530741375289)
@@ -2,12 +2,14 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Repository;
import ru.javawebinar.topjava.model.User;
import ru.javawebinar.topjava.repository.UserRepository;
import java.util.Collections;
import java.util.List;
+@Repository
public class MockUserRepositoryImpl implements UserRepository {
private static final Logger log = LoggerFactory.getLogger(MockUserRepositoryImpl.class);
Index: src/main/java/ru/javawebinar/topjava/web/user/ProfileRestController.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- src/main/java/ru/javawebinar/topjava/web/user/ProfileRestController.java (date 1530741372000)
+++ src/main/java/ru/javawebinar/topjava/web/user/ProfileRestController.java (date 1530741391288)
@@ -1,9 +1,11 @@
package ru.javawebinar.topjava.web.user;
+import org.springframework.stereotype.Controller;
import ru.javawebinar.topjava.model.User;
import static ru.javawebinar.topjava.web.SecurityUtil.authUserId;
+@Controller
public class ProfileRestController extends AbstractUserController {
public User get() {
Index: src/main/resources/spring/spring-app.xml
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- src/main/resources/spring/spring-app.xml (date 1530741372000)
+++ src/main/resources/spring/spring-app.xml (date 1530741391353)
@@ -1,10 +1,24 @@
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+ xmlns:context="http://www.springframework.org/schema/context"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
- <bean class="ru.javawebinar.topjava.repository.mock.MockUserRepositoryImpl" id="mockUserRepository"/>
+ <!--
+ <bean class="ru.javawebinar.topjava.repository.mock.MockUserRepositoryImpl" id="mockUserRepository"/>
- <bean class="ru.javawebinar.topjava.service.UserServiceImpl">
- <property name="repository" ref="mockUserRepository"/>
- </bean>
+ <bean class="ru.javawebinar.topjava.service.UserServiceImpl">
+ <property name="repository" ref="mockUserRepository"/>
+ </bean>
+ -->
+
+ <!-- Not necessary, already included with component-scan -->
+ <!--<context:annotation-config/>-->
+
+ <context:component-scan base-package="ru.javawebinar.**.repository"/>
+
+ <context:component-scan base-package="ru.javawebinar.**.service"/>
+
+ <context:component-scan base-package="ru.javawebinar.**.web"/>
+
</beans>
\ No newline at end of file
Index: src/main/java/ru/javawebinar/topjava/web/user/AbstractUserController.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- src/main/java/ru/javawebinar/topjava/web/user/AbstractUserController.java (date 1530741372000)
+++ src/main/java/ru/javawebinar/topjava/web/user/AbstractUserController.java (date 1530741375322)
@@ -2,6 +2,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
import ru.javawebinar.topjava.model.User;
import ru.javawebinar.topjava.service.UserService;
@@ -13,6 +14,7 @@
public abstract class AbstractUserController {
protected final Logger log = LoggerFactory.getLogger(getClass());
+ @Autowired
private UserService service;
public List<User> getAll() {