File tree
7 files changed
+86
-41
lines changed- spring-beans/src/main/java/org/springframework/beans/factory/support
- spring-context/src/main/java/org/springframework/context
- annotation
- support
- spring-core/src/main/java/org/springframework/core/env
7 files changed
+86
-41
lines changedspring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionReaderUtils.java
Lines changed: 18 additions & 17 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
1 | 1 |
| |
2 |
| - | |
| 2 | + | |
3 | 3 |
| |
4 | 4 |
| |
5 | 5 |
| |
| |||
69 | 69 |
| |
70 | 70 |
| |
71 | 71 |
| |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
72 | 89 |
| |
73 | 90 |
| |
74 | 91 |
| |
| |||
117 | 134 |
| |
118 | 135 |
| |
119 | 136 |
| |
120 |
| - | |
121 |
| - | |
122 |
| - | |
123 |
| - | |
124 |
| - | |
125 |
| - | |
126 |
| - | |
127 |
| - | |
128 |
| - | |
129 |
| - | |
130 |
| - | |
131 |
| - | |
132 |
| - | |
133 |
| - | |
134 |
| - | |
135 |
| - | |
136 | 137 |
| |
137 | 138 |
| |
138 | 139 |
| |
|
Lines changed: 6 additions & 0 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
53 | 53 |
| |
54 | 54 |
| |
55 | 55 |
| |
| 56 | + | |
56 | 57 |
| |
57 | 58 |
| |
58 | 59 |
| |
59 | 60 |
| |
60 | 61 |
| |
61 | 62 |
| |
62 | 63 |
| |
| 64 | + | |
63 | 65 |
| |
64 | 66 |
| |
65 | 67 |
| |
66 | 68 |
| |
67 | 69 |
| |
68 | 70 |
| |
| 71 | + | |
69 | 72 |
| |
70 | 73 |
| |
71 | 74 |
| |
| |||
84 | 87 |
| |
85 | 88 |
| |
86 | 89 |
| |
| 90 | + | |
87 | 91 |
| |
88 | 92 |
| |
89 | 93 |
| |
| |||
99 | 103 |
| |
100 | 104 |
| |
101 | 105 |
| |
| 106 | + | |
102 | 107 |
| |
103 | 108 |
| |
104 | 109 |
| |
105 | 110 |
| |
106 | 111 |
| |
107 | 112 |
| |
108 | 113 |
| |
| 114 | + | |
109 | 115 |
| |
110 | 116 |
| |
111 | 117 |
| |
|
Lines changed: 30 additions & 0 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
83 | 83 |
| |
84 | 84 |
| |
85 | 85 |
| |
| 86 | + | |
86 | 87 |
| |
87 | 88 |
| |
88 | 89 |
| |
| |||
117 | 118 |
| |
118 | 119 |
| |
119 | 120 |
| |
| 121 | + | |
| 122 | + | |
| 123 | + | |
| 124 | + | |
| 125 | + | |
| 126 | + | |
| 127 | + | |
| 128 | + | |
120 | 129 |
| |
121 | 130 |
| |
122 | 131 |
| |
123 | 132 |
| |
124 | 133 |
| |
125 | 134 |
| |
| 135 | + | |
| 136 | + | |
| 137 | + | |
| 138 | + | |
| 139 | + | |
| 140 | + | |
126 | 141 |
| |
127 | 142 |
| |
128 | 143 |
| |
129 | 144 |
| |
| 145 | + | |
| 146 | + | |
| 147 | + | |
| 148 | + | |
| 149 | + | |
| 150 | + | |
| 151 | + | |
130 | 152 |
| |
131 | 153 |
| |
132 | 154 |
| |
133 | 155 |
| |
134 | 156 |
| |
| 157 | + | |
| 158 | + | |
| 159 | + | |
| 160 | + | |
| 161 | + | |
| 162 | + | |
| 163 | + | |
| 164 | + | |
135 | 165 |
| |
136 | 166 |
| |
137 | 167 |
| |
|
Lines changed: 11 additions & 8 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
1 | 1 |
| |
2 |
| - | |
| 2 | + | |
3 | 3 |
| |
4 | 4 |
| |
5 | 5 |
| |
| |||
135 | 135 |
| |
136 | 136 |
| |
137 | 137 |
| |
| 138 | + | |
| 139 | + | |
| 140 | + | |
| 141 | + | |
| 142 | + | |
| 143 | + | |
| 144 | + | |
| 145 | + | |
| 146 | + | |
| 147 | + | |
138 | 148 |
| |
139 | 149 |
| |
140 | 150 |
| |
| |||
163 | 173 |
| |
164 | 174 |
| |
165 | 175 |
| |
166 |
| - | |
167 |
| - | |
168 |
| - | |
169 |
| - | |
170 |
| - | |
171 |
| - | |
172 |
| - | |
173 | 176 |
|
Lines changed: 7 additions & 1 deletion
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
1 | 1 |
| |
2 |
| - | |
| 2 | + | |
3 | 3 |
| |
4 | 4 |
| |
5 | 5 |
| |
| |||
158 | 158 |
| |
159 | 159 |
| |
160 | 160 |
| |
| 161 | + | |
161 | 162 |
| |
162 | 163 |
| |
163 | 164 |
| |
| |||
169 | 170 |
| |
170 | 171 |
| |
171 | 172 |
| |
| 173 | + | |
172 | 174 |
| |
173 | 175 |
| |
174 | 176 |
| |
| |||
198 | 200 |
| |
199 | 201 |
| |
200 | 202 |
| |
| 203 | + | |
| 204 | + | |
| 205 | + | |
| 206 | + | |
201 | 207 |
| |
202 | 208 |
| |
203 | 209 |
| |
|
Lines changed: 11 additions & 12 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
1 | 1 |
| |
2 |
| - | |
| 2 | + | |
3 | 3 |
| |
4 | 4 |
| |
5 | 5 |
| |
| |||
35 | 35 |
| |
36 | 36 |
| |
37 | 37 |
| |
38 |
| - | |
39 |
| - | |
40 |
| - | |
41 |
| - | |
42 |
| - | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
43 | 43 |
| |
44 | 44 |
| |
45 | 45 |
| |
46 | 46 |
| |
47 |
| - | |
48 |
| - | |
| 47 | + | |
| 48 | + | |
49 | 49 |
| |
50 | 50 |
| |
51 | 51 |
| |
52 | 52 |
| |
53 |
| - | |
54 |
| - | |
55 |
| - | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
56 | 56 |
| |
57 | 57 |
| |
58 | 58 |
| |
| |||
64 | 64 |
| |
65 | 65 |
| |
66 | 66 |
| |
67 |
| - | |
68 | 67 |
| |
69 | 68 |
| |
70 | 69 |
| |
|
Lines changed: 3 additions & 3 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
1 | 1 |
| |
2 |
| - | |
| 2 | + | |
3 | 3 |
| |
4 | 4 |
| |
5 | 5 |
| |
| |||
77 | 77 |
| |
78 | 78 |
| |
79 | 79 |
| |
80 |
| - | |
81 |
| - | |
| 80 | + | |
| 81 | + | |
82 | 82 |
| |
83 | 83 |
| |
84 | 84 |
| |
|
0 commit comments