ThuyKhong vor 5 Jahren
Ursprung
Commit
c243255285

+ 160
- 230
.idea/workspace.xml Datei anzeigen

@@ -2,91 +2,10 @@
2 2
 <project version="4">
3 3
   <component name="ChangeListManager">
4 4
     <list default="true" id="bd189b16-1515-49c6-891b-ecbe7e3bcfe0" name="Default Changelist" comment="">
5
-      <change afterPath="$PROJECT_DIR$/.idea/compiler.xml" afterDir="false" />
6
-      <change afterPath="$PROJECT_DIR$/.idea/encodings.xml" afterDir="false" />
7
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_2_3.xml" afterDir="false" />
8
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__ch_qos_logback_logback_core_1_2_3.xml" afterDir="false" />
9
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_classmate_1_4_0.xml" afterDir="false" />
10
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_9_0.xml" afterDir="false" />
11
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_9_7.xml" afterDir="false" />
12
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_9_7.xml" afterDir="false" />
13
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_9_7.xml" afterDir="false" />
14
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_9_7.xml" afterDir="false" />
15
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_9_7.xml" afterDir="false" />
16
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_jayway_jsonpath_json_path_2_4_0.xml" afterDir="false" />
17
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_vaadin_external_google_android_json_0_0_20131108_vaadin1.xml" afterDir="false" />
18
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__javax_annotation_javax_annotation_api_1_3_2.xml" afterDir="false" />
19
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__javax_validation_validation_api_2_0_1_Final.xml" afterDir="false" />
20
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__junit_junit_4_12.xml" afterDir="false" />
21
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_9_5.xml" afterDir="false" />
22
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_9_5.xml" afterDir="false" />
23
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__net_minidev_accessors_smart_1_2.xml" afterDir="false" />
24
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__net_minidev_json_smart_2_3.xml" afterDir="false" />
25
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_11_1.xml" afterDir="false" />
26
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_11_1.xml" afterDir="false" />
27
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_9_0_13.xml" afterDir="false" />
28
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_9_0_13.xml" afterDir="false" />
29
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_9_0_13.xml" afterDir="false" />
30
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_assertj_assertj_core_3_11_1.xml" afterDir="false" />
31
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml" afterDir="false" />
32
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_hamcrest_hamcrest_library_1_3.xml" afterDir="false" />
33
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_hibernate_validator_hibernate_validator_6_0_13_Final.xml" afterDir="false" />
34
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_3_2_Final.xml" afterDir="false" />
35
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_mockito_mockito_core_2_23_4.xml" afterDir="false" />
36
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_objenesis_objenesis_2_6.xml" afterDir="false" />
37
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_ow2_asm_asm_5_0_4.xml" afterDir="false" />
38
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_skyscreamer_jsonassert_1_5_0.xml" afterDir="false" />
39
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_25.xml" afterDir="false" />
40
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_25.xml" afterDir="false" />
41
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_2_1_1_RELEASE.xml" afterDir="false" />
42
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_1_1_RELEASE.xml" afterDir="false" />
43
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_devtools_2_1_1_RELEASE.xml" afterDir="false" />
44
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_1_1_RELEASE.xml" afterDir="false" />
45
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_1_1_RELEASE.xml" afterDir="false" />
46
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_1_1_RELEASE.xml" afterDir="false" />
47
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_1_1_RELEASE.xml" afterDir="false" />
48
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_1_1_RELEASE.xml" afterDir="false" />
49
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_1_1_RELEASE.xml" afterDir="false" />
50
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_1_1_RELEASE.xml" afterDir="false" />
51
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_1_1_RELEASE.xml" afterDir="false" />
52
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_aop_5_1_3_RELEASE.xml" afterDir="false" />
53
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_beans_5_1_3_RELEASE.xml" afterDir="false" />
54
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_context_5_1_3_RELEASE.xml" afterDir="false" />
55
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_core_5_1_3_RELEASE.xml" afterDir="false" />
56
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_expression_5_1_3_RELEASE.xml" afterDir="false" />
57
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_jcl_5_1_3_RELEASE.xml" afterDir="false" />
58
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_test_5_1_3_RELEASE.xml" afterDir="false" />
59
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_web_5_1_3_RELEASE.xml" afterDir="false" />
60
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_webmvc_5_1_3_RELEASE.xml" afterDir="false" />
61
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_xmlunit_xmlunit_core_2_6_2.xml" afterDir="false" />
62
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_yaml_snakeyaml_1_23.xml" afterDir="false" />
63
-      <change afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
64
-      <change afterPath="$PROJECT_DIR$/.idea/modules.xml" afterDir="false" />
65
-      <change afterPath="$PROJECT_DIR$/.idea/uiDesigner.xml" afterDir="false" />
66
-      <change afterPath="$PROJECT_DIR$/.idea/vcs.xml" afterDir="false" />
67
-      <change afterPath="$PROJECT_DIR$/BeanFlavored.iml" afterDir="false" />
68
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/example/BeanFlavored/Alumni.java" afterDir="false" />
69
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/example/BeanFlavored/Classroom.java" afterDir="false" />
70
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/example/BeanFlavored/ClassroomConfig.java" afterDir="false" />
71
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/example/BeanFlavored/Instructor.java" afterDir="false" />
72
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/example/BeanFlavored/Instructors.java" afterDir="false" />
73
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/example/BeanFlavored/InstructorsConfig.java" afterDir="false" />
74
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/example/BeanFlavored/Learner.java" afterDir="false" />
75
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/example/BeanFlavored/People.java" afterDir="false" />
76
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/example/BeanFlavored/Person.java" afterDir="false" />
77
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/example/BeanFlavored/Student.java" afterDir="false" />
78
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/example/BeanFlavored/StudentConfig.java" afterDir="false" />
79
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/example/BeanFlavored/Students.java" afterDir="false" />
80
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/example/BeanFlavored/Teacher.java" afterDir="false" />
81
-      <change afterPath="$PROJECT_DIR$/src/test/java/com/example/BeanFlavored/TestAlumni.java" afterDir="false" />
82
-      <change afterPath="$PROJECT_DIR$/src/test/java/com/example/BeanFlavored/TestClassroomConfig.java" afterDir="false" />
83
-      <change afterPath="$PROJECT_DIR$/src/test/java/com/example/BeanFlavored/TestInstructor.java" afterDir="false" />
84
-      <change afterPath="$PROJECT_DIR$/src/test/java/com/example/BeanFlavored/TestInstructorConfig.java" afterDir="false" />
85
-      <change afterPath="$PROJECT_DIR$/src/test/java/com/example/BeanFlavored/TestInstructors.java" afterDir="false" />
86
-      <change afterPath="$PROJECT_DIR$/src/test/java/com/example/BeanFlavored/TestPerson.java" afterDir="false" />
87
-      <change afterPath="$PROJECT_DIR$/src/test/java/com/example/BeanFlavored/TestStudent.java" afterDir="false" />
88
-      <change afterPath="$PROJECT_DIR$/src/test/java/com/example/BeanFlavored/TestStudentConfig.java" afterDir="false" />
89
-      <change afterPath="$PROJECT_DIR$/src/test/java/com/example/BeanFlavored/TestStudents.java" afterDir="false" />
5
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
6
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/example/BeanFlavored/ClassroomConfig.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/example/BeanFlavored/ClassroomConfig.java" afterDir="false" />
7
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/example/BeanFlavored/InstructorsConfig.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/example/BeanFlavored/InstructorsConfig.java" afterDir="false" />
8
+      <change beforePath="$PROJECT_DIR$/src/test/java/com/example/BeanFlavored/TestStudentConfig.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/com/example/BeanFlavored/TestStudentConfig.java" afterDir="false" />
90 9
     </list>
91 10
     <ignored path="$PROJECT_DIR$/target/" />
92 11
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -109,25 +28,25 @@
109 28
       <usages-collector id="statistics.file.extensions.open">
110 29
         <counts>
111 30
           <entry key="class" value="1" />
112
-          <entry key="java" value="84" />
31
+          <entry key="java" value="89" />
113 32
           <entry key="properties" value="2" />
114 33
         </counts>
115 34
       </usages-collector>
116 35
       <usages-collector id="statistics.file.types.open">
117 36
         <counts>
118 37
           <entry key="CLASS" value="1" />
119
-          <entry key="JAVA" value="84" />
38
+          <entry key="JAVA" value="89" />
120 39
           <entry key="Properties" value="2" />
121 40
         </counts>
122 41
       </usages-collector>
123 42
       <usages-collector id="statistics.file.extensions.edit">
124 43
         <counts>
125
-          <entry key="java" value="6139" />
44
+          <entry key="java" value="6193" />
126 45
         </counts>
127 46
       </usages-collector>
128 47
       <usages-collector id="statistics.file.types.edit">
129 48
         <counts>
130
-          <entry key="JAVA" value="6139" />
49
+          <entry key="JAVA" value="6193" />
131 50
         </counts>
132 51
       </usages-collector>
133 52
     </session>
@@ -137,8 +56,8 @@
137 56
       <file pinned="false" current-in-tab="false">
138 57
         <entry file="file://$PROJECT_DIR$/src/main/java/com/example/BeanFlavored/Students.java">
139 58
           <provider selected="true" editor-type-id="text-editor">
140
-            <state relative-caret-position="225">
141
-              <caret line="21" lean-forward="true" selection-start-line="21" selection-end-line="21" />
59
+            <state relative-caret-position="210">
60
+              <caret line="20" column="1" lean-forward="true" selection-start-line="20" selection-start-column="1" selection-end-line="20" selection-end-column="1" />
142 61
               <folding>
143 62
                 <element signature="imports" expanded="true" />
144 63
               </folding>
@@ -147,42 +66,43 @@
147 66
         </entry>
148 67
       </file>
149 68
       <file pinned="false" current-in-tab="false">
150
-        <entry file="file://$PROJECT_DIR$/src/test/java/com/example/BeanFlavored/TestInstructor.java">
69
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/example/BeanFlavored/Classroom.java">
151 70
           <provider selected="true" editor-type-id="text-editor">
152
-            <state relative-caret-position="302">
153
-              <caret line="47" lean-forward="true" selection-start-line="47" selection-end-line="47" />
71
+            <state relative-caret-position="30">
72
+              <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
154 73
             </state>
155 74
           </provider>
156 75
         </entry>
157 76
       </file>
158 77
       <file pinned="false" current-in-tab="false">
159
-        <entry file="file://$PROJECT_DIR$/src/test/java/com/example/BeanFlavored/TestStudents.java">
78
+        <entry file="file://$PROJECT_DIR$/src/test/java/com/example/BeanFlavored/TestClassroomConfig.java">
160 79
           <provider selected="true" editor-type-id="text-editor">
161
-            <state relative-caret-position="75">
162
-              <caret line="5" lean-forward="true" selection-start-line="5" selection-end-line="5" />
80
+            <state relative-caret-position="302">
81
+              <caret line="42" lean-forward="true" selection-start-line="42" selection-end-line="42" />
82
+              <folding>
83
+                <element signature="imports" expanded="true" />
84
+              </folding>
163 85
             </state>
164 86
           </provider>
165 87
         </entry>
166 88
       </file>
167 89
       <file pinned="false" current-in-tab="false">
168
-        <entry file="file://$PROJECT_DIR$/src/test/java/com/example/BeanFlavored/TestInstructors.java">
90
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/example/BeanFlavored/StudentConfig.java">
169 91
           <provider selected="true" editor-type-id="text-editor">
170
-            <state relative-caret-position="270">
171
-              <caret line="18" column="5" lean-forward="true" selection-start-line="18" selection-start-column="5" selection-end-line="18" selection-end-column="5" />
92
+            <state relative-caret-position="210">
93
+              <caret line="14" column="34" selection-start-line="14" selection-start-column="18" selection-end-line="14" selection-end-column="34" />
172 94
               <folding>
173 95
                 <element signature="imports" expanded="true" />
174
-                <element signature="e#161#162#0" expanded="true" />
175
-                <element signature="e#193#194#0" expanded="true" />
176 96
               </folding>
177 97
             </state>
178 98
           </provider>
179 99
         </entry>
180 100
       </file>
181 101
       <file pinned="false" current-in-tab="false">
182
-        <entry file="file://$PROJECT_DIR$/src/test/java/com/example/BeanFlavored/TestClassroomConfig.java">
102
+        <entry file="file://$PROJECT_DIR$/src/test/java/com/example/BeanFlavored/TestAlumni.java">
183 103
           <provider selected="true" editor-type-id="text-editor">
184
-            <state relative-caret-position="302">
185
-              <caret line="42" lean-forward="true" selection-start-line="42" selection-end-line="42" />
104
+            <state relative-caret-position="252">
105
+              <caret line="21" column="9" lean-forward="true" selection-start-line="21" selection-start-column="9" selection-end-line="21" selection-end-column="9" />
186 106
               <folding>
187 107
                 <element signature="imports" expanded="true" />
188 108
               </folding>
@@ -190,13 +110,19 @@
190 110
           </provider>
191 111
         </entry>
192 112
       </file>
193
-      <file pinned="false" current-in-tab="false">
194
-        <entry file="file://$PROJECT_DIR$/src/test/java/com/example/BeanFlavored/TestAlumni.java">
113
+      <file pinned="false" current-in-tab="true">
114
+        <entry file="file://$PROJECT_DIR$/src/test/java/com/example/BeanFlavored/TestStudentConfig.java">
195 115
           <provider selected="true" editor-type-id="text-editor">
196
-            <state relative-caret-position="315">
197
-              <caret line="21" column="9" lean-forward="true" selection-start-line="21" selection-start-column="9" selection-end-line="21" selection-end-column="9" />
116
+            <state relative-caret-position="248">
117
+              <caret line="37" column="29" selection-start-line="37" selection-start-column="29" selection-end-line="37" selection-end-column="29" />
198 118
               <folding>
199 119
                 <element signature="imports" expanded="true" />
120
+                <element signature="e#713#714#0" expanded="true" />
121
+                <element signature="e#794#795#0" expanded="true" />
122
+                <element signature="e#845#846#0" expanded="true" />
123
+                <element signature="e#927#928#0" expanded="true" />
124
+                <element signature="e#971#972#0" expanded="true" />
125
+                <element signature="e#1033#1034#0" expanded="true" />
200 126
               </folding>
201 127
             </state>
202 128
           </provider>
@@ -205,8 +131,8 @@
205 131
       <file pinned="false" current-in-tab="false">
206 132
         <entry file="file://$PROJECT_DIR$/src/main/java/com/example/BeanFlavored/InstructorsConfig.java">
207 133
           <provider selected="true" editor-type-id="text-editor">
208
-            <state relative-caret-position="300">
209
-              <caret line="40" column="39" lean-forward="true" selection-start-line="40" selection-start-column="39" selection-end-line="40" selection-end-column="39" />
134
+            <state relative-caret-position="328">
135
+              <caret line="40" column="1" lean-forward="true" selection-start-line="40" selection-start-column="1" selection-end-line="40" selection-end-column="1" />
210 136
               <folding>
211 137
                 <element signature="imports" expanded="true" />
212 138
               </folding>
@@ -214,10 +140,10 @@
214 140
           </provider>
215 141
         </entry>
216 142
       </file>
217
-      <file pinned="false" current-in-tab="true">
143
+      <file pinned="false" current-in-tab="false">
218 144
         <entry file="file://$PROJECT_DIR$/src/main/java/com/example/BeanFlavored/Alumni.java">
219 145
           <provider selected="true" editor-type-id="text-editor">
220
-            <state relative-caret-position="180">
146
+            <state relative-caret-position="52">
221 147
               <caret line="15" column="49" lean-forward="true" selection-start-line="15" selection-start-column="49" selection-end-line="15" selection-end-column="49" />
222 148
             </state>
223 149
           </provider>
@@ -226,8 +152,8 @@
226 152
       <file pinned="false" current-in-tab="false">
227 153
         <entry file="file://$PROJECT_DIR$/src/main/java/com/example/BeanFlavored/Instructors.java">
228 154
           <provider selected="true" editor-type-id="text-editor">
229
-            <state relative-caret-position="45">
230
-              <caret line="3" column="26" selection-start-line="3" selection-start-column="26" selection-end-line="3" selection-end-column="26" />
155
+            <state relative-caret-position="210">
156
+              <caret line="20" lean-forward="true" selection-start-line="20" selection-end-line="20" />
231 157
               <folding>
232 158
                 <element signature="imports" expanded="true" />
233 159
               </folding>
@@ -236,10 +162,13 @@
236 162
         </entry>
237 163
       </file>
238 164
       <file pinned="false" current-in-tab="false">
239
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/example/BeanFlavored/People.java">
165
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/example/BeanFlavored/ClassroomConfig.java">
240 166
           <provider selected="true" editor-type-id="text-editor">
241
-            <state relative-caret-position="300">
242
-              <caret line="34" column="40" lean-forward="true" selection-start-line="34" selection-start-column="40" selection-end-line="34" selection-end-column="40" />
167
+            <state relative-caret-position="297">
168
+              <caret line="31" lean-forward="true" selection-start-line="31" selection-end-line="31" />
169
+              <folding>
170
+                <element signature="imports" expanded="true" />
171
+              </folding>
243 172
             </state>
244 173
           </provider>
245 174
         </entry>
@@ -268,22 +197,22 @@
268 197
         <option value="$PROJECT_DIR$/src/test/java/com/example/BeanFlavored/TestStudent.java" />
269 198
         <option value="$PROJECT_DIR$/src/test/java/com/example/BeanFlavored/TestInstructor.java" />
270 199
         <option value="$PROJECT_DIR$/src/test/java/com/example/BeanFlavored/TestStudents.java" />
271
-        <option value="$PROJECT_DIR$/src/main/java/com/example/BeanFlavored/ClassroomConfig.java" />
272 200
         <option value="$PROJECT_DIR$/src/test/java/com/example/BeanFlavored/TestPeople.java" />
273 201
         <option value="$PROJECT_DIR$/src/main/java/com/example/BeanFlavored/Alumni.java" />
274 202
         <option value="$PROJECT_DIR$/src/main/java/com/example/BeanFlavored/Classroom.java" />
275 203
         <option value="$PROJECT_DIR$/src/main/java/com/example/BeanFlavored/Instructor.java" />
276 204
         <option value="$PROJECT_DIR$/src/main/java/com/example/BeanFlavored/Student.java" />
277 205
         <option value="$PROJECT_DIR$/src/main/java/com/example/BeanFlavored/StudentConfig.java" />
278
-        <option value="$PROJECT_DIR$/src/main/java/com/example/BeanFlavored/InstructorsConfig.java" />
279 206
         <option value="$PROJECT_DIR$/src/main/java/com/example/BeanFlavored/People.java" />
280 207
         <option value="$PROJECT_DIR$/src/test/java/com/example/BeanFlavored/TestAlumni.java" />
281 208
         <option value="$PROJECT_DIR$/src/test/java/com/example/BeanFlavored/TestClassroomConfig.java" />
282
-        <option value="$PROJECT_DIR$/src/test/java/com/example/BeanFlavored/TestStudentConfig.java" />
283 209
         <option value="$PROJECT_DIR$/src/test/java/com/example/BeanFlavored/TestInstructorConfig.java" />
284 210
         <option value="$PROJECT_DIR$/src/test/java/com/example/BeanFlavored/TestInstructors.java" />
285 211
         <option value="$PROJECT_DIR$/src/main/java/com/example/BeanFlavored/Instructors.java" />
286 212
         <option value="$PROJECT_DIR$/src/main/java/com/example/BeanFlavored/Students.java" />
213
+        <option value="$PROJECT_DIR$/src/main/java/com/example/BeanFlavored/InstructorsConfig.java" />
214
+        <option value="$PROJECT_DIR$/src/main/java/com/example/BeanFlavored/ClassroomConfig.java" />
215
+        <option value="$PROJECT_DIR$/src/test/java/com/example/BeanFlavored/TestStudentConfig.java" />
287 216
       </list>
288 217
     </option>
289 218
   </component>
@@ -301,9 +230,9 @@
301 230
     </option>
302 231
   </component>
303 232
   <component name="ProjectFrameBounds">
304
-    <option name="x" value="586" />
305
-    <option name="y" value="33" />
306
-    <option name="width" value="1163" />
233
+    <option name="x" value="49" />
234
+    <option name="y" value="40" />
235
+    <option name="width" value="1459" />
307 236
     <option name="height" value="801" />
308 237
   </component>
309 238
   <component name="ProjectLevelVcsManager" settingsEditedManually="true">
@@ -390,7 +319,7 @@
390 319
     <property name="RequestMappingsPanelWidth1" value="75" />
391 320
     <property name="WebServerToolWindowFactoryState" value="false" />
392 321
     <property name="aspect.path.notification.shown" value="true" />
393
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1546701501209" />
322
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1546707992301" />
394 323
     <property name="last_opened_file_path" value="$PROJECT_DIR$/pom.xml" />
395 324
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
396 325
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
@@ -412,8 +341,8 @@
412 341
       </list>
413 342
     </option>
414 343
   </component>
415
-  <component name="RunManager" selected="JUnit.TestClassroomConfig">
416
-    <configuration name="TestAlumni" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
344
+  <component name="RunManager" selected="JUnit.com.example.BeanFlavored in BeanFlavored">
345
+    <configuration name="TestClassroomConfig" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
417 346
       <module name="BeanFlavored" />
418 347
       <extension name="coverage">
419 348
         <pattern>
@@ -422,12 +351,12 @@
422 351
         </pattern>
423 352
       </extension>
424 353
       <option name="PACKAGE_NAME" value="com.example.BeanFlavored" />
425
-      <option name="MAIN_CLASS_NAME" value="com.example.BeanFlavored.TestAlumni" />
354
+      <option name="MAIN_CLASS_NAME" value="com.example.BeanFlavored.TestClassroomConfig" />
426 355
       <method v="2">
427 356
         <option name="Make" enabled="true" />
428 357
       </method>
429 358
     </configuration>
430
-    <configuration name="TestClassroomConfig" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
359
+    <configuration name="TestInstructors.addTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
431 360
       <module name="BeanFlavored" />
432 361
       <extension name="coverage">
433 362
         <pattern>
@@ -436,12 +365,14 @@
436 365
         </pattern>
437 366
       </extension>
438 367
       <option name="PACKAGE_NAME" value="com.example.BeanFlavored" />
439
-      <option name="MAIN_CLASS_NAME" value="com.example.BeanFlavored.TestClassroomConfig" />
368
+      <option name="MAIN_CLASS_NAME" value="com.example.BeanFlavored.TestInstructors" />
369
+      <option name="METHOD_NAME" value="addTest" />
370
+      <option name="TEST_OBJECT" value="method" />
440 371
       <method v="2">
441 372
         <option name="Make" enabled="true" />
442 373
       </method>
443 374
     </configuration>
444
-    <configuration name="TestInstructors.addTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
375
+    <configuration name="TestStudentConfig" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
445 376
       <module name="BeanFlavored" />
446 377
       <extension name="coverage">
447 378
         <pattern>
@@ -450,14 +381,12 @@
450 381
         </pattern>
451 382
       </extension>
452 383
       <option name="PACKAGE_NAME" value="com.example.BeanFlavored" />
453
-      <option name="MAIN_CLASS_NAME" value="com.example.BeanFlavored.TestInstructors" />
454
-      <option name="METHOD_NAME" value="addTest" />
455
-      <option name="TEST_OBJECT" value="method" />
384
+      <option name="MAIN_CLASS_NAME" value="com.example.BeanFlavored.TestStudentConfig" />
456 385
       <method v="2">
457 386
         <option name="Make" enabled="true" />
458 387
       </method>
459 388
     </configuration>
460
-    <configuration name="TestStudentConfig" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
389
+    <configuration name="TestStudentConfig.testDifferent" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
461 390
       <module name="BeanFlavored" />
462 391
       <extension name="coverage">
463 392
         <pattern>
@@ -467,11 +396,13 @@
467 396
       </extension>
468 397
       <option name="PACKAGE_NAME" value="com.example.BeanFlavored" />
469 398
       <option name="MAIN_CLASS_NAME" value="com.example.BeanFlavored.TestStudentConfig" />
399
+      <option name="METHOD_NAME" value="testDifferent" />
400
+      <option name="TEST_OBJECT" value="method" />
470 401
       <method v="2">
471 402
         <option name="Make" enabled="true" />
472 403
       </method>
473 404
     </configuration>
474
-    <configuration name="TestStudentConfig.testPreviousStudents" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
405
+    <configuration name="com.example.BeanFlavored in BeanFlavored" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
475 406
       <module name="BeanFlavored" />
476 407
       <extension name="coverage">
477 408
         <pattern>
@@ -480,9 +411,7 @@
480 411
         </pattern>
481 412
       </extension>
482 413
       <option name="PACKAGE_NAME" value="com.example.BeanFlavored" />
483
-      <option name="MAIN_CLASS_NAME" value="com.example.BeanFlavored.TestStudentConfig" />
484
-      <option name="METHOD_NAME" value="testPreviousStudents" />
485
-      <option name="TEST_OBJECT" value="method" />
414
+      <option name="TEST_OBJECT" value="package" />
486 415
       <method v="2">
487 416
         <option name="Make" enabled="true" />
488 417
       </method>
@@ -496,19 +425,19 @@
496 425
     </configuration>
497 426
     <list>
498 427
       <item itemvalue="Spring Boot.BeanFlavoredApplication" />
499
-      <item itemvalue="JUnit.TestAlumni" />
500
-      <item itemvalue="JUnit.TestStudentConfig.testPreviousStudents" />
501 428
       <item itemvalue="JUnit.TestClassroomConfig" />
502 429
       <item itemvalue="JUnit.TestStudentConfig" />
503 430
       <item itemvalue="JUnit.TestInstructors.addTest" />
431
+      <item itemvalue="JUnit.TestStudentConfig.testDifferent" />
432
+      <item itemvalue="JUnit.com.example.BeanFlavored in BeanFlavored" />
504 433
     </list>
505 434
     <recent_temporary>
506 435
       <list>
436
+        <item itemvalue="JUnit.com.example.BeanFlavored in BeanFlavored" />
437
+        <item itemvalue="JUnit.TestStudentConfig.testDifferent" />
438
+        <item itemvalue="JUnit.TestStudentConfig" />
507 439
         <item itemvalue="JUnit.TestClassroomConfig" />
508 440
         <item itemvalue="JUnit.TestInstructors.addTest" />
509
-        <item itemvalue="JUnit.TestStudentConfig" />
510
-        <item itemvalue="JUnit.TestAlumni" />
511
-        <item itemvalue="JUnit.TestStudentConfig.testPreviousStudents" />
512 441
       </list>
513 442
     </recent_temporary>
514 443
   </component>
@@ -528,23 +457,11 @@
528 457
       <workItem from="1544404177499" duration="1863000" />
529 458
       <workItem from="1544844199912" duration="792000" />
530 459
       <workItem from="1546615918432" duration="1243000" />
531
-      <workItem from="1546632057824" duration="6916000" />
460
+      <workItem from="1546632057824" duration="8143000" />
532 461
     </task>
533 462
     <servers />
534 463
   </component>
535 464
   <component name="TestHistory">
536
-    <history-entry file="TestAlumni - 2019.01.04 at 23h 17m 55s.xml">
537
-      <configuration name="TestAlumni" configurationId="JUnit" />
538
-    </history-entry>
539
-    <history-entry file="TestAlumni - 2019.01.04 at 23h 18m 10s.xml">
540
-      <configuration name="TestAlumni" configurationId="JUnit" />
541
-    </history-entry>
542
-    <history-entry file="TestClassroomConfig - 2019.01.04 at 23h 19m 14s.xml">
543
-      <configuration name="TestClassroomConfig" configurationId="JUnit" />
544
-    </history-entry>
545
-    <history-entry file="TestClassroomConfig - 2019.01.04 at 23h 20m 14s.xml">
546
-      <configuration name="TestClassroomConfig" configurationId="JUnit" />
547
-    </history-entry>
548 465
     <history-entry file="TestStudentConfig - 2019.01.04 at 23h 21m 21s.xml">
549 466
       <configuration name="TestStudentConfig" configurationId="JUnit" />
550 467
     </history-entry>
@@ -563,15 +480,27 @@
563 480
     <history-entry file="TestClassroomConfig - 2019.01.04 at 23h 32m 08s.xml">
564 481
       <configuration name="TestClassroomConfig" configurationId="JUnit" />
565 482
     </history-entry>
483
+    <history-entry file="TestStudentConfig - 2019.01.05 at 11h 17m 39s.xml">
484
+      <configuration name="TestStudentConfig" configurationId="JUnit" />
485
+    </history-entry>
486
+    <history-entry file="TestStudentConfig - 2019.01.05 at 11h 20m 48s.xml">
487
+      <configuration name="TestStudentConfig" configurationId="JUnit" />
488
+    </history-entry>
489
+    <history-entry file="TestStudentConfig - 2019.01.05 at 11h 24m 11s.xml">
490
+      <configuration name="TestStudentConfig" configurationId="JUnit" />
491
+    </history-entry>
492
+    <history-entry file="TestStudentConfig_testDifferent - 2019.01.05 at 11h 25m 06s.xml">
493
+      <configuration name="TestStudentConfig.testDifferent" configurationId="JUnit" />
494
+    </history-entry>
566 495
   </component>
567 496
   <component name="TimeTrackingManager">
568
-    <option name="totallyTimeSpent" value="34099000" />
497
+    <option name="totallyTimeSpent" value="35326000" />
569 498
   </component>
570 499
   <component name="ToolWindowManager">
571
-    <frame x="586" y="33" width="1163" height="801" extended-state="0" />
500
+    <frame x="49" y="40" width="1459" height="801" extended-state="0" />
572 501
     <editor active="true" />
573 502
     <layout>
574
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.27386263" />
503
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.21665491" />
575 504
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
576 505
       <window_info id="Designer" order="2" />
577 506
       <window_info id="Image Layers" order="3" />
@@ -581,13 +510,13 @@
581 510
       <window_info id="Web" order="7" side_tool="true" />
582 511
       <window_info anchor="bottom" id="Message" order="0" />
583 512
       <window_info anchor="bottom" id="Find" order="1" />
584
-      <window_info anchor="bottom" id="Run" order="2" visible="true" weight="0.3600583" />
513
+      <window_info active="true" anchor="bottom" id="Run" order="2" visible="true" weight="0.37317786" />
585 514
       <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
586 515
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
587 516
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
588 517
       <window_info anchor="bottom" id="TODO" order="6" />
589 518
       <window_info anchor="bottom" id="Spring" order="7" />
590
-      <window_info anchor="bottom" id="Terminal" order="8" />
519
+      <window_info anchor="bottom" id="Terminal" order="8" weight="0.32944608" />
591 520
       <window_info anchor="bottom" id="Event Log" order="9" side_tool="true" />
592 521
       <window_info anchor="bottom" id="Java Enterprise" order="10" />
593 522
       <window_info anchor="bottom" id="Database Changes" order="11" show_stripe_button="false" />
@@ -660,16 +589,6 @@
660 589
         </state>
661 590
       </provider>
662 591
     </entry>
663
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/example/BeanFlavored/ClassroomConfig.java">
664
-      <provider selected="true" editor-type-id="text-editor">
665
-        <state relative-caret-position="435">
666
-          <caret line="29" column="5" lean-forward="true" selection-start-line="29" selection-start-column="5" selection-end-line="29" selection-end-column="5" />
667
-          <folding>
668
-            <element signature="imports" expanded="true" />
669
-          </folding>
670
-        </state>
671
-      </provider>
672
-    </entry>
673 592
     <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
674 593
       <provider selected="true" editor-type-id="text-editor" />
675 594
     </entry>
@@ -708,13 +627,6 @@
708 627
         </state>
709 628
       </provider>
710 629
     </entry>
711
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/example/BeanFlavored/Classroom.java">
712
-      <provider selected="true" editor-type-id="text-editor">
713
-        <state relative-caret-position="255">
714
-          <caret line="17" lean-forward="true" selection-start-line="17" selection-end-line="17" />
715
-        </state>
716
-      </provider>
717
-    </entry>
718 630
     <entry file="file://$PROJECT_DIR$/src/main/java/com/example/BeanFlavored/Person.java">
719 631
       <provider selected="true" editor-type-id="text-editor">
720 632
         <state relative-caret-position="255">
@@ -729,16 +641,6 @@
729 641
         </state>
730 642
       </provider>
731 643
     </entry>
732
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/example/BeanFlavored/StudentConfig.java">
733
-      <provider selected="true" editor-type-id="text-editor">
734
-        <state relative-caret-position="240">
735
-          <caret line="16" lean-forward="true" selection-start-line="16" selection-end-line="16" />
736
-          <folding>
737
-            <element signature="imports" expanded="true" />
738
-          </folding>
739
-        </state>
740
-      </provider>
741
-    </entry>
742 644
     <entry file="file://$PROJECT_DIR$/src/main/java/com/example/BeanFlavored/Instructor.java">
743 645
       <provider selected="true" editor-type-id="text-editor">
744 646
         <state relative-caret-position="75">
@@ -746,21 +648,6 @@
746 648
         </state>
747 649
       </provider>
748 650
     </entry>
749
-    <entry file="file://$PROJECT_DIR$/src/test/java/com/example/BeanFlavored/TestStudentConfig.java">
750
-      <provider selected="true" editor-type-id="text-editor">
751
-        <state relative-caret-position="304">
752
-          <caret line="36" column="32" lean-forward="true" selection-start-line="36" selection-start-column="32" selection-end-line="36" selection-end-column="32" />
753
-          <folding>
754
-            <element signature="imports" expanded="true" />
755
-            <element signature="e#713#714#0" expanded="true" />
756
-            <element signature="e#794#795#0" expanded="true" />
757
-            <element signature="e#845#846#0" expanded="true" />
758
-            <element signature="e#927#928#0" expanded="true" />
759
-            <element signature="e#1012#1013#0" expanded="true" />
760
-          </folding>
761
-        </state>
762
-      </provider>
763
-    </entry>
764 651
     <entry file="file://$PROJECT_DIR$/src/test/java/com/example/BeanFlavored/TestStudent.java">
765 652
       <provider selected="true" editor-type-id="text-editor">
766 653
         <state relative-caret-position="270">
@@ -794,79 +681,122 @@
794 681
         </state>
795 682
       </provider>
796 683
     </entry>
797
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/example/BeanFlavored/Instructors.java">
684
+    <entry file="file://$PROJECT_DIR$/src/test/java/com/example/BeanFlavored/TestInstructor.java">
685
+      <provider selected="true" editor-type-id="text-editor">
686
+        <state relative-caret-position="302">
687
+          <caret line="47" lean-forward="true" selection-start-line="47" selection-end-line="47" />
688
+        </state>
689
+      </provider>
690
+    </entry>
691
+    <entry file="file://$PROJECT_DIR$/src/test/java/com/example/BeanFlavored/TestInstructors.java">
798 692
       <provider selected="true" editor-type-id="text-editor">
799
-        <state relative-caret-position="45">
800
-          <caret line="3" column="26" selection-start-line="3" selection-start-column="26" selection-end-line="3" selection-end-column="26" />
693
+        <state relative-caret-position="270">
694
+          <caret line="18" column="5" lean-forward="true" selection-start-line="18" selection-start-column="5" selection-end-line="18" selection-end-column="5" />
801 695
           <folding>
802 696
             <element signature="imports" expanded="true" />
697
+            <element signature="e#161#162#0" expanded="true" />
698
+            <element signature="e#193#194#0" expanded="true" />
803 699
           </folding>
804 700
         </state>
805 701
       </provider>
806 702
     </entry>
807
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/example/BeanFlavored/Students.java">
703
+    <entry file="file://$PROJECT_DIR$/src/test/java/com/example/BeanFlavored/TestClassroomConfig.java">
808 704
       <provider selected="true" editor-type-id="text-editor">
809
-        <state relative-caret-position="225">
810
-          <caret line="21" lean-forward="true" selection-start-line="21" selection-end-line="21" />
705
+        <state relative-caret-position="302">
706
+          <caret line="42" lean-forward="true" selection-start-line="42" selection-end-line="42" />
811 707
           <folding>
812 708
             <element signature="imports" expanded="true" />
813 709
           </folding>
814 710
         </state>
815 711
       </provider>
816 712
     </entry>
817
-    <entry file="file://$PROJECT_DIR$/src/test/java/com/example/BeanFlavored/TestInstructor.java">
713
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/example/BeanFlavored/Alumni.java">
818 714
       <provider selected="true" editor-type-id="text-editor">
819
-        <state relative-caret-position="302">
820
-          <caret line="47" lean-forward="true" selection-start-line="47" selection-end-line="47" />
715
+        <state relative-caret-position="52">
716
+          <caret line="15" column="49" lean-forward="true" selection-start-line="15" selection-start-column="49" selection-end-line="15" selection-end-column="49" />
821 717
         </state>
822 718
       </provider>
823 719
     </entry>
824
-    <entry file="file://$PROJECT_DIR$/src/test/java/com/example/BeanFlavored/TestInstructors.java">
720
+    <entry file="file://$PROJECT_DIR$/src/test/java/com/example/BeanFlavored/TestAlumni.java">
825 721
       <provider selected="true" editor-type-id="text-editor">
826
-        <state relative-caret-position="270">
827
-          <caret line="18" column="5" lean-forward="true" selection-start-line="18" selection-start-column="5" selection-end-line="18" selection-end-column="5" />
722
+        <state relative-caret-position="252">
723
+          <caret line="21" column="9" lean-forward="true" selection-start-line="21" selection-start-column="9" selection-end-line="21" selection-end-column="9" />
828 724
           <folding>
829 725
             <element signature="imports" expanded="true" />
830
-            <element signature="e#161#162#0" expanded="true" />
831
-            <element signature="e#193#194#0" expanded="true" />
832 726
           </folding>
833 727
         </state>
834 728
       </provider>
835 729
     </entry>
836
-    <entry file="file://$PROJECT_DIR$/src/test/java/com/example/BeanFlavored/TestAlumni.java">
730
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/example/BeanFlavored/Instructors.java">
837 731
       <provider selected="true" editor-type-id="text-editor">
838
-        <state relative-caret-position="315">
839
-          <caret line="21" column="9" lean-forward="true" selection-start-line="21" selection-start-column="9" selection-end-line="21" selection-end-column="9" />
732
+        <state relative-caret-position="210">
733
+          <caret line="20" lean-forward="true" selection-start-line="20" selection-end-line="20" />
840 734
           <folding>
841 735
             <element signature="imports" expanded="true" />
842 736
           </folding>
843 737
         </state>
844 738
       </provider>
845 739
     </entry>
846
-    <entry file="file://$PROJECT_DIR$/src/test/java/com/example/BeanFlavored/TestClassroomConfig.java">
740
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/example/BeanFlavored/Classroom.java">
847 741
       <provider selected="true" editor-type-id="text-editor">
848
-        <state relative-caret-position="302">
849
-          <caret line="42" lean-forward="true" selection-start-line="42" selection-end-line="42" />
742
+        <state relative-caret-position="30">
743
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
744
+        </state>
745
+      </provider>
746
+    </entry>
747
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/example/BeanFlavored/InstructorsConfig.java">
748
+      <provider selected="true" editor-type-id="text-editor">
749
+        <state relative-caret-position="328">
750
+          <caret line="40" column="1" lean-forward="true" selection-start-line="40" selection-start-column="1" selection-end-line="40" selection-end-column="1" />
850 751
           <folding>
851 752
             <element signature="imports" expanded="true" />
852 753
           </folding>
853 754
         </state>
854 755
       </provider>
855 756
     </entry>
856
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/example/BeanFlavored/InstructorsConfig.java">
757
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/example/BeanFlavored/StudentConfig.java">
857 758
       <provider selected="true" editor-type-id="text-editor">
858
-        <state relative-caret-position="300">
859
-          <caret line="40" column="39" lean-forward="true" selection-start-line="40" selection-start-column="39" selection-end-line="40" selection-end-column="39" />
759
+        <state relative-caret-position="210">
760
+          <caret line="14" column="34" selection-start-line="14" selection-start-column="18" selection-end-line="14" selection-end-column="34" />
860 761
           <folding>
861 762
             <element signature="imports" expanded="true" />
862 763
           </folding>
863 764
         </state>
864 765
       </provider>
865 766
     </entry>
866
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/example/BeanFlavored/Alumni.java">
767
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/example/BeanFlavored/ClassroomConfig.java">
867 768
       <provider selected="true" editor-type-id="text-editor">
868
-        <state relative-caret-position="180">
869
-          <caret line="15" column="49" lean-forward="true" selection-start-line="15" selection-start-column="49" selection-end-line="15" selection-end-column="49" />
769
+        <state relative-caret-position="297">
770
+          <caret line="31" lean-forward="true" selection-start-line="31" selection-end-line="31" />
771
+          <folding>
772
+            <element signature="imports" expanded="true" />
773
+          </folding>
774
+        </state>
775
+      </provider>
776
+    </entry>
777
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/example/BeanFlavored/Students.java">
778
+      <provider selected="true" editor-type-id="text-editor">
779
+        <state relative-caret-position="210">
780
+          <caret line="20" column="1" lean-forward="true" selection-start-line="20" selection-start-column="1" selection-end-line="20" selection-end-column="1" />
781
+          <folding>
782
+            <element signature="imports" expanded="true" />
783
+          </folding>
784
+        </state>
785
+      </provider>
786
+    </entry>
787
+    <entry file="file://$PROJECT_DIR$/src/test/java/com/example/BeanFlavored/TestStudentConfig.java">
788
+      <provider selected="true" editor-type-id="text-editor">
789
+        <state relative-caret-position="248">
790
+          <caret line="37" column="29" selection-start-line="37" selection-start-column="29" selection-end-line="37" selection-end-column="29" />
791
+          <folding>
792
+            <element signature="imports" expanded="true" />
793
+            <element signature="e#713#714#0" expanded="true" />
794
+            <element signature="e#794#795#0" expanded="true" />
795
+            <element signature="e#845#846#0" expanded="true" />
796
+            <element signature="e#927#928#0" expanded="true" />
797
+            <element signature="e#971#972#0" expanded="true" />
798
+            <element signature="e#1033#1034#0" expanded="true" />
799
+          </folding>
870 800
         </state>
871 801
       </provider>
872 802
     </entry>

+ 1
- 1
src/main/java/com/example/BeanFlavored/ClassroomConfig.java Datei anzeigen

@@ -16,7 +16,7 @@ public class ClassroomConfig {
16 16
     InstructorsConfig instructorsConfig;
17 17
 
18 18
     @Bean(name = "currentCohort")
19
-    @DependsOn({"instructors", "students"})
19
+    @DependsOn({"instructors", "currentStudents"})
20 20
     public Classroom currentCohort(){
21 21
 
22 22
         return new Classroom(instructorsConfig.instructors(),studentConfig.currentStudents());

+ 2
- 6
src/main/java/com/example/BeanFlavored/InstructorsConfig.java Datei anzeigen

@@ -35,11 +35,7 @@ public class InstructorsConfig {
35 35
     @Primary
36 36
     @Bean(name = "instructors")
37 37
     public Instructors instructors(){
38
-        List<Instructor> instructorList = Stream.concat(
39
-                StreamSupport.stream(tcUsaInstructors().spliterator(),false),
40
-                StreamSupport.stream(tcUkInstructors().spliterator(),false)
41
-        ).collect(Collectors.toList());
42
-
43
-        return (Instructors)instructorList;
38
+        return new Instructors(
39
+                new Instructor(101L, "Kris"));
44 40
     }
45 41
 }

+ 0
- 20
src/test/java/com/example/BeanFlavored/TestInstructors.java Datei anzeigen

@@ -1,20 +0,0 @@
1
-package com.example.BeanFlavored;
2
-
3
-import org.junit.Assert;
4
-import org.junit.Before;
5
-import org.junit.Test;
6
-
7
-public class TestInstructors {
8
-    Instructors instructors;
9
-
10
-    @Before
11
-    public void setUp(){
12
-        instructors = new Instructors();
13
-    }
14
-
15
-    @Test
16
-    public void addTest(){
17
-        instructors.add(new Instructor(01L,"Teacher"));
18
-        Assert.assertNotNull(instructors);
19
-    }
20
-}

+ 1
- 1
src/test/java/com/example/BeanFlavored/TestStudentConfig.java Datei anzeigen

@@ -35,6 +35,6 @@ public class TestStudentConfig {
35 35
 
36 36
     @Test
37 37
     public void testDifferent(){
38
-        Assert.assertEquals(currStudents,prevStudents);
38
+        Assert.assertNotSame(currStudents,prevStudents);
39 39
     }
40 40
 }

BIN
target/classes/com/example/BeanFlavored/ClassroomConfig.class Datei anzeigen


BIN
target/classes/com/example/BeanFlavored/InstructorsConfig.class Datei anzeigen


BIN
target/test-classes/com/example/BeanFlavored/TestInstructors.class Datei anzeigen


BIN
target/test-classes/com/example/BeanFlavored/TestStudentConfig.class Datei anzeigen