forked from JavaOPs/topjava
-
Notifications
You must be signed in to change notification settings - Fork 0
Expand file tree
/
Copy path2_4_add_spring_context.patch
More file actions
167 lines (161 loc) · 6.19 KB
/
2_4_add_spring_context.patch
File metadata and controls
167 lines (161 loc) · 6.19 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
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 1530652518211)
+++ src/main/resources/spring/spring-app.xml (date 1530652518211)
@@ -0,0 +1,7 @@
+<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">
+
+ <bean class="ru.javawebinar.topjava.repository.mock.MockUserRepositoryImpl" id="mockUserRepository"/>
+
+</beans>
\ No newline at end of file
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 1530652518187)
+++ src/main/java/ru/javawebinar/topjava/repository/mock/MockUserRepositoryImpl.java (date 1530652518187)
@@ -0,0 +1,43 @@
+package ru.javawebinar.topjava.repository.mock;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import ru.javawebinar.topjava.model.User;
+import ru.javawebinar.topjava.repository.UserRepository;
+
+import java.util.Collections;
+import java.util.List;
+
+public class MockUserRepositoryImpl implements UserRepository {
+ private static final Logger log = LoggerFactory.getLogger(MockUserRepositoryImpl.class);
+
+ @Override
+ public boolean delete(int id) {
+ log.info("delete {}", id);
+ return true;
+ }
+
+ @Override
+ public User save(User user) {
+ log.info("save {}", user);
+ return user;
+ }
+
+ @Override
+ public User get(int id) {
+ log.info("get {}", id);
+ return null;
+ }
+
+ @Override
+ public List<User> getAll() {
+ log.info("getAll");
+ return Collections.emptyList();
+ }
+
+ @Override
+ public User getByEmail(String email) {
+ log.info("getByEmail {}", email);
+ return null;
+ }
+}
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 1530652518204)
+++ src/main/java/ru/javawebinar/topjava/SpringMain.java (date 1530652518204)
@@ -0,0 +1,19 @@
+package ru.javawebinar.topjava;
+
+import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
+import ru.javawebinar.topjava.repository.UserRepository;
+
+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();
+ appCtx.close();
+ }
+}
Index: src/main/java/ru/javawebinar/topjava/web/MealServlet.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- src/main/java/ru/javawebinar/topjava/web/MealServlet.java (date 1530652485000)
+++ src/main/java/ru/javawebinar/topjava/web/MealServlet.java (date 1530652518196)
@@ -3,8 +3,8 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import ru.javawebinar.topjava.model.Meal;
-import ru.javawebinar.topjava.repository.InMemoryMealRepositoryImpl;
import ru.javawebinar.topjava.repository.MealRepository;
+import ru.javawebinar.topjava.repository.mock.InMemoryMealRepositoryImpl;
import ru.javawebinar.topjava.util.MealsUtil;
import javax.servlet.ServletConfig;
Index: pom.xml
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- pom.xml (date 1530652485000)
+++ pom.xml (date 1530652892544)
@@ -16,6 +16,8 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+ <spring.version>5.0.7.RELEASE</spring.version>
+
<!-- Logging -->
<logback.version>1.2.3</logback.version>
<slf4j.version>1.7.25</slf4j.version>
@@ -46,19 +48,19 @@
<scope>compile</scope>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- <version>${slf4j.version}</version>
- <scope>runtime</scope>
- </dependency>
-
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>${logback.version}</version>
<scope>runtime</scope>
</dependency>
+
+ <!-- Spring -->
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
<!--Web-->
<dependency>
Index: src/main/java/ru/javawebinar/topjava/repository/InMemoryMealRepositoryImpl.java
===================================================================
--- src/main/java/ru/javawebinar/topjava/repository/InMemoryMealRepositoryImpl.java (date 1530652485000)
+++ src/main/java/ru/javawebinar/topjava/repository/mock/InMemoryMealRepositoryImpl.java (date 1530652518136)
@@ -1,6 +1,7 @@
-package ru.javawebinar.topjava.repository;
+package ru.javawebinar.topjava.repository.mock;
import ru.javawebinar.topjava.model.Meal;
+import ru.javawebinar.topjava.repository.MealRepository;
import ru.javawebinar.topjava.util.MealsUtil;
import java.util.Collection;