Yesoda Sanka 5 år sedan
förälder
incheckning
dbda63f31c

+ 196
- 81
.idea/workspace.xml Visa fil

2
 <project version="4">
2
 <project version="4">
3
   <component name="ChangeListManager">
3
   <component name="ChangeListManager">
4
     <list default="true" id="a8cb0210-1bcb-4a60-9a0c-e7415562c69e" name="Default Changelist" comment="">
4
     <list default="true" id="a8cb0210-1bcb-4a60-9a0c-e7415562c69e" name="Default Changelist" comment="">
5
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/mesolabs/beans/learnerlab/Classroomconfig.java" afterDir="false" />
6
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/mesolabs/beans/learnerlab/InstructorConfig.java" afterDir="false" />
7
+      <change afterPath="$PROJECT_DIR$/src/test/java/com/mesolabs/beans/learnerlab/testStudentConfig.java" afterDir="false" />
5
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
8
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
9
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/mesolabs/beans/learnerlab/Classroom.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/mesolabs/beans/learnerlab/Classroom.java" afterDir="false" />
10
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/mesolabs/beans/learnerlab/Instructor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/mesolabs/beans/learnerlab/Instructor.java" afterDir="false" />
11
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/mesolabs/beans/learnerlab/Instructors.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/mesolabs/beans/learnerlab/Instructors.java" afterDir="false" />
12
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/mesolabs/beans/learnerlab/People.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/mesolabs/beans/learnerlab/People.java" afterDir="false" />
13
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/mesolabs/beans/learnerlab/Person.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/mesolabs/beans/learnerlab/Person.java" afterDir="false" />
14
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/mesolabs/beans/learnerlab/Student.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/mesolabs/beans/learnerlab/Student.java" afterDir="false" />
15
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/mesolabs/beans/learnerlab/StudentConfig.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/mesolabs/beans/learnerlab/StudentConfig.java" afterDir="false" />
16
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/mesolabs/beans/learnerlab/Students.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/mesolabs/beans/learnerlab/Students.java" afterDir="false" />
6
     </list>
17
     </list>
7
     <ignored path="$PROJECT_DIR$/target/" />
18
     <ignored path="$PROJECT_DIR$/target/" />
8
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
19
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
17
         <counts>
28
         <counts>
18
           <entry key="project.closed" value="17" />
29
           <entry key="project.closed" value="17" />
19
           <entry key="project.open.time.0" value="1" />
30
           <entry key="project.open.time.0" value="1" />
20
-          <entry key="project.open.time.1" value="3" />
31
+          <entry key="project.open.time.1" value="4" />
21
           <entry key="project.open.time.10" value="1" />
32
           <entry key="project.open.time.10" value="1" />
22
           <entry key="project.open.time.11" value="2" />
33
           <entry key="project.open.time.11" value="2" />
23
           <entry key="project.open.time.12" value="3" />
34
           <entry key="project.open.time.12" value="3" />
28
           <entry key="project.open.time.4" value="1" />
39
           <entry key="project.open.time.4" value="1" />
29
           <entry key="project.open.time.6" value="1" />
40
           <entry key="project.open.time.6" value="1" />
30
           <entry key="project.open.time.9" value="1" />
41
           <entry key="project.open.time.9" value="1" />
31
-          <entry key="project.opened" value="17" />
42
+          <entry key="project.opened" value="18" />
32
         </counts>
43
         </counts>
33
       </usages-collector>
44
       </usages-collector>
34
       <usages-collector id="statistics.file.extensions.open">
45
       <usages-collector id="statistics.file.extensions.open">
41
       </usages-collector>
52
       </usages-collector>
42
       <usages-collector id="statistics.file.types.open">
53
       <usages-collector id="statistics.file.types.open">
43
         <counts>
54
         <counts>
44
-          <entry key="JAVA" value="40" />
45
-          <entry key="Markdown" value="4" />
55
+          <entry key="JAVA" value="59" />
56
+          <entry key="Markdown" value="5" />
46
           <entry key="Properties" value="1" />
57
           <entry key="Properties" value="1" />
47
           <entry key="XML" value="2" />
58
           <entry key="XML" value="2" />
48
         </counts>
59
         </counts>
56
       </usages-collector>
67
       </usages-collector>
57
       <usages-collector id="statistics.file.types.edit">
68
       <usages-collector id="statistics.file.types.edit">
58
         <counts>
69
         <counts>
59
-          <entry key="JAVA" value="1668" />
70
+          <entry key="JAVA" value="2931" />
60
           <entry key="Properties" value="12" />
71
           <entry key="Properties" value="12" />
61
           <entry key="XML" value="1" />
72
           <entry key="XML" value="1" />
62
         </counts>
73
         </counts>
68
       <file pinned="false" current-in-tab="false">
79
       <file pinned="false" current-in-tab="false">
69
         <entry file="file://$PROJECT_DIR$/src/main/java/com/mesolabs/beans/learnerlab/StudentConfig.java">
80
         <entry file="file://$PROJECT_DIR$/src/main/java/com/mesolabs/beans/learnerlab/StudentConfig.java">
70
           <provider selected="true" editor-type-id="text-editor">
81
           <provider selected="true" editor-type-id="text-editor">
71
-            <state relative-caret-position="399">
72
-              <caret line="27" column="20" selection-start-line="27" selection-start-column="20" selection-end-line="27" selection-end-column="20" />
82
+            <state relative-caret-position="272">
83
+              <caret line="29" column="5" lean-forward="true" selection-start-line="29" selection-start-column="5" selection-end-line="29" selection-end-column="5" />
73
               <folding>
84
               <folding>
74
                 <element signature="imports" expanded="true" />
85
                 <element signature="imports" expanded="true" />
75
               </folding>
86
               </folding>
78
         </entry>
89
         </entry>
79
       </file>
90
       </file>
80
       <file pinned="false" current-in-tab="false">
91
       <file pinned="false" current-in-tab="false">
81
-        <entry file="file://$PROJECT_DIR$/README.md">
82
-          <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
83
-            <state split_layout="FIRST">
84
-              <first_editor relative-caret-position="15">
85
-                <caret line="156" selection-start-line="151" selection-start-column="3" selection-end-line="156" />
86
-              </first_editor>
87
-              <second_editor />
92
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/mesolabs/beans/learnerlab/Classroomconfig.java">
93
+          <provider selected="true" editor-type-id="text-editor">
94
+            <state relative-caret-position="285">
95
+              <caret line="19" column="40" selection-start-line="19" selection-start-column="32" selection-end-line="19" selection-end-column="40" />
96
+              <folding>
97
+                <element signature="imports" expanded="true" />
98
+              </folding>
88
             </state>
99
             </state>
89
           </provider>
100
           </provider>
90
         </entry>
101
         </entry>
91
       </file>
102
       </file>
92
       <file pinned="false" current-in-tab="false">
103
       <file pinned="false" current-in-tab="false">
93
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/mesolabs/beans/learnerlab/Instructors.java">
104
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/mesolabs/beans/learnerlab/Student.java">
94
           <provider selected="true" editor-type-id="text-editor">
105
           <provider selected="true" editor-type-id="text-editor">
95
-            <state relative-caret-position="150">
96
-              <caret line="11" column="3" selection-start-line="11" selection-start-column="3" selection-end-line="11" selection-end-column="3" />
106
+            <state relative-caret-position="204">
107
+              <caret line="22" lean-forward="true" selection-start-line="22" selection-end-line="22" />
97
             </state>
108
             </state>
98
           </provider>
109
           </provider>
99
         </entry>
110
         </entry>
100
       </file>
111
       </file>
101
       <file pinned="false" current-in-tab="false">
112
       <file pinned="false" current-in-tab="false">
102
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/mesolabs/beans/learnerlab/Student.java">
113
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/mesolabs/beans/learnerlab/Instructors.java">
103
           <provider selected="true" editor-type-id="text-editor">
114
           <provider selected="true" editor-type-id="text-editor">
104
-            <state relative-caret-position="465">
105
-              <caret line="34" column="8" selection-start-line="34" selection-start-column="8" selection-end-line="34" selection-end-column="8" />
115
+            <state relative-caret-position="165">
116
+              <caret line="12" column="13" selection-start-line="12" selection-start-column="13" selection-end-line="12" selection-end-column="13" />
117
+              <folding>
118
+                <element signature="e#552#553#0" expanded="true" />
119
+                <element signature="e#579#580#0" expanded="true" />
120
+              </folding>
106
             </state>
121
             </state>
107
           </provider>
122
           </provider>
108
         </entry>
123
         </entry>
109
       </file>
124
       </file>
110
       <file pinned="false" current-in-tab="false">
125
       <file pinned="false" current-in-tab="false">
111
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/mesolabs/beans/learnerlab/Students.java">
126
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/mesolabs/beans/learnerlab/InstructorConfig.java">
112
           <provider selected="true" editor-type-id="text-editor">
127
           <provider selected="true" editor-type-id="text-editor">
113
-            <state relative-caret-position="255">
114
-              <caret line="17" column="1" selection-start-line="17" selection-start-column="1" selection-end-line="17" selection-end-column="1" />
128
+            <state relative-caret-position="168">
129
+              <caret line="18" column="35" lean-forward="true" selection-start-line="18" selection-start-column="35" selection-end-line="18" selection-end-column="35" />
130
+              <folding>
131
+                <element signature="imports" expanded="true" />
132
+                <element signature="e#810#811#0" expanded="true" />
133
+                <element signature="e#850#851#0" expanded="true" />
134
+              </folding>
115
             </state>
135
             </state>
116
           </provider>
136
           </provider>
117
         </entry>
137
         </entry>
118
       </file>
138
       </file>
119
       <file pinned="false" current-in-tab="true">
139
       <file pinned="false" current-in-tab="true">
120
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/mesolabs/beans/learnerlab/Teacher.java">
140
+        <entry file="file://$PROJECT_DIR$/src/test/java/com/mesolabs/beans/learnerlab/testStudentConfig.java">
121
           <provider selected="true" editor-type-id="text-editor">
141
           <provider selected="true" editor-type-id="text-editor">
122
-            <state relative-caret-position="255">
123
-              <caret line="17" column="17" selection-start-line="17" selection-start-column="17" selection-end-line="17" selection-end-column="17" />
142
+            <state relative-caret-position="362">
143
+              <caret line="39" lean-forward="true" selection-start-line="39" selection-end-line="39" />
144
+              <folding>
145
+                <element signature="imports" expanded="true" />
146
+              </folding>
124
             </state>
147
             </state>
125
           </provider>
148
           </provider>
126
         </entry>
149
         </entry>
137
       <file pinned="false" current-in-tab="false">
160
       <file pinned="false" current-in-tab="false">
138
         <entry file="file://$PROJECT_DIR$/src/main/java/com/mesolabs/beans/learnerlab/Person.java">
161
         <entry file="file://$PROJECT_DIR$/src/main/java/com/mesolabs/beans/learnerlab/Person.java">
139
           <provider selected="true" editor-type-id="text-editor">
162
           <provider selected="true" editor-type-id="text-editor">
140
-            <state relative-caret-position="195">
141
-              <caret line="13" column="15" selection-start-line="13" selection-start-column="15" selection-end-line="13" selection-end-column="15" />
163
+            <state relative-caret-position="163">
164
+              <caret line="15" column="20" lean-forward="true" selection-start-line="15" selection-start-column="20" selection-end-line="15" selection-end-column="20" />
142
             </state>
165
             </state>
143
           </provider>
166
           </provider>
144
         </entry>
167
         </entry>
145
       </file>
168
       </file>
146
       <file pinned="false" current-in-tab="false">
169
       <file pinned="false" current-in-tab="false">
147
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/mesolabs/beans/learnerlab/Instructor.java">
170
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/mesolabs/beans/learnerlab/Students.java">
148
           <provider selected="true" editor-type-id="text-editor">
171
           <provider selected="true" editor-type-id="text-editor">
149
-            <state relative-caret-position="420">
150
-              <caret line="30" column="24" selection-start-line="30" selection-start-column="24" selection-end-line="30" selection-end-column="60" />
172
+            <state relative-caret-position="255">
173
+              <caret line="17" column="1" lean-forward="true" selection-start-line="17" selection-start-column="1" selection-end-line="17" selection-end-column="1" />
151
             </state>
174
             </state>
152
           </provider>
175
           </provider>
153
         </entry>
176
         </entry>
155
       <file pinned="false" current-in-tab="false">
178
       <file pinned="false" current-in-tab="false">
156
         <entry file="file://$PROJECT_DIR$/src/main/java/com/mesolabs/beans/learnerlab/People.java">
179
         <entry file="file://$PROJECT_DIR$/src/main/java/com/mesolabs/beans/learnerlab/People.java">
157
           <provider selected="true" editor-type-id="text-editor">
180
           <provider selected="true" editor-type-id="text-editor">
158
-            <state relative-caret-position="242">
159
-              <caret line="54" selection-start-line="54" selection-end-line="54" />
181
+            <state relative-caret-position="-93">
182
+              <caret line="29" column="38" lean-forward="true" selection-start-line="29" selection-start-column="38" selection-end-line="29" selection-end-column="38" />
160
               <folding>
183
               <folding>
161
-                <element signature="e#1924#1925#0" expanded="true" />
162
-                <element signature="e#1986#1987#0" expanded="true" />
184
+                <element signature="imports" expanded="true" />
185
+                <element signature="e#1755#1756#0" expanded="true" />
186
+                <element signature="e#1738#1739#0" expanded="true" />
187
+                <element signature="e#1778#1779#0" expanded="true" />
188
+                <element signature="e#1856#1857#0" expanded="true" />
189
+                <element signature="e#1892#1893#0" expanded="true" />
190
+                <element signature="e#1919#1920#0" expanded="true" />
191
+                <element signature="e#1953#1954#0" expanded="true" />
192
+                <element signature="e#2003#2004#0" expanded="true" />
193
+                <element signature="e#2063#2064#0" expanded="true" />
194
+                <element signature="e#2293#2294#0" expanded="true" />
195
+                <element signature="e#2320#2321#0" expanded="true" />
196
+                <element signature="e#2519#2520#0" expanded="true" />
197
+                <element signature="e#2563#2564#0" expanded="true" />
163
               </folding>
198
               </folding>
164
             </state>
199
             </state>
165
           </provider>
200
           </provider>
171
     <option name="RECENT_TEMPLATES">
206
     <option name="RECENT_TEMPLATES">
172
       <list>
207
       <list>
173
         <option value="Interface" />
208
         <option value="Interface" />
209
+        <option value="Singleton" />
174
         <option value="Class" />
210
         <option value="Class" />
175
       </list>
211
       </list>
176
     </option>
212
     </option>
177
   </component>
213
   </component>
214
+  <component name="FindInProjectRecents">
215
+    <replaceStrings>
216
+      <replace />
217
+    </replaceStrings>
218
+    <dirStrings>
219
+      <dir>$PROJECT_DIR$/src/main/java/com/mesolabs/beans/learnerlab</dir>
220
+    </dirStrings>
221
+  </component>
178
   <component name="Git.Settings">
222
   <component name="Git.Settings">
179
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
223
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
180
   </component>
224
   </component>
192
         <option value="$PROJECT_DIR$/src/main/java/com/example/demo/Person.java" />
236
         <option value="$PROJECT_DIR$/src/main/java/com/example/demo/Person.java" />
193
         <option value="$PROJECT_DIR$/src/main/java/com/example/demo/Learner.java" />
237
         <option value="$PROJECT_DIR$/src/main/java/com/example/demo/Learner.java" />
194
         <option value="$PROJECT_DIR$/src/main/java/com/mesolabs/beans/learnerlab/Teacher.java" />
238
         <option value="$PROJECT_DIR$/src/main/java/com/mesolabs/beans/learnerlab/Teacher.java" />
195
-        <option value="$PROJECT_DIR$/src/main/java/com/mesolabs/beans/learnerlab/Instructor.java" />
196
-        <option value="$PROJECT_DIR$/src/main/java/com/mesolabs/beans/learnerlab/Person.java" />
197
-        <option value="$PROJECT_DIR$/src/main/java/com/mesolabs/beans/learnerlab/People.java" />
198
-        <option value="$PROJECT_DIR$/src/main/java/com/mesolabs/beans/learnerlab/Instructors.java" />
199
-        <option value="$PROJECT_DIR$/src/main/java/com/mesolabs/beans/learnerlab/Classroom.java" />
200
         <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
239
         <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
201
         <option value="$PROJECT_DIR$/pom.xml" />
240
         <option value="$PROJECT_DIR$/pom.xml" />
202
         <option value="$PROJECT_DIR$/src/main/java/com/mesolabs/beans/learnerlab/Configuration.java" />
241
         <option value="$PROJECT_DIR$/src/main/java/com/mesolabs/beans/learnerlab/Configuration.java" />
203
-        <option value="$PROJECT_DIR$/src/main/java/com/mesolabs/beans/learnerlab/Students.java" />
242
+        <option value="$PROJECT_DIR$/src/main/java/com/mesolabs/beans/learnerlab/Person.java" />
204
         <option value="$PROJECT_DIR$/src/main/java/com/mesolabs/beans/learnerlab/Student.java" />
243
         <option value="$PROJECT_DIR$/src/main/java/com/mesolabs/beans/learnerlab/Student.java" />
244
+        <option value="$PROJECT_DIR$/src/main/java/com/mesolabs/beans/learnerlab/Classroom.java" />
205
         <option value="$PROJECT_DIR$/src/main/java/com/mesolabs/beans/learnerlab/StudentConfig.java" />
245
         <option value="$PROJECT_DIR$/src/main/java/com/mesolabs/beans/learnerlab/StudentConfig.java" />
246
+        <option value="$PROJECT_DIR$/src/main/java/com/mesolabs/beans/learnerlab/Instructors.java" />
247
+        <option value="$PROJECT_DIR$/src/main/java/com/mesolabs/beans/learnerlab/Instructor.java" />
248
+        <option value="$PROJECT_DIR$/src/main/java/com/mesolabs/beans/learnerlab/InstructorConfig.java" />
249
+        <option value="$PROJECT_DIR$/src/main/java/com/mesolabs/beans/learnerlab/People.java" />
250
+        <option value="$PROJECT_DIR$/src/main/java/com/mesolabs/beans/learnerlab/Students.java" />
251
+        <option value="$PROJECT_DIR$/src/main/java/com/mesolabs/beans/learnerlab/Classroomconfig.java" />
252
+        <option value="$PROJECT_DIR$/src/test/java/com/mesolabs/beans/learnerlab/testStudentConfig.java" />
206
       </list>
253
       </list>
207
     </option>
254
     </option>
208
   </component>
255
   </component>
285
               <item name="test" type="462c0819:PsiDirectoryNode" />
332
               <item name="test" type="462c0819:PsiDirectoryNode" />
286
               <item name="java" type="462c0819:PsiDirectoryNode" />
333
               <item name="java" type="462c0819:PsiDirectoryNode" />
287
             </path>
334
             </path>
335
+            <path>
336
+              <item name="demo" type="b2602c69:ProjectViewProjectNode" />
337
+              <item name="CR-MesoLabs-Beans.LearnerLab" type="462c0819:PsiDirectoryNode" />
338
+              <item name="src" type="462c0819:PsiDirectoryNode" />
339
+              <item name="test" type="462c0819:PsiDirectoryNode" />
340
+              <item name="java" type="462c0819:PsiDirectoryNode" />
341
+              <item name="com" type="462c0819:PsiDirectoryNode" />
342
+            </path>
343
+            <path>
344
+              <item name="demo" type="b2602c69:ProjectViewProjectNode" />
345
+              <item name="CR-MesoLabs-Beans.LearnerLab" type="462c0819:PsiDirectoryNode" />
346
+              <item name="src" type="462c0819:PsiDirectoryNode" />
347
+              <item name="test" type="462c0819:PsiDirectoryNode" />
348
+              <item name="java" type="462c0819:PsiDirectoryNode" />
349
+              <item name="com" type="462c0819:PsiDirectoryNode" />
350
+              <item name="learnerlab" type="462c0819:PsiDirectoryNode" />
351
+            </path>
288
           </expand>
352
           </expand>
289
           <select />
353
           <select />
290
         </subPane>
354
         </subPane>
351
       <workItem from="1545010389346" duration="11000" />
415
       <workItem from="1545010389346" duration="11000" />
352
       <workItem from="1545337653413" duration="8000" />
416
       <workItem from="1545337653413" duration="8000" />
353
       <workItem from="1545536853921" duration="29000" />
417
       <workItem from="1545536853921" duration="29000" />
418
+      <workItem from="1546875912385" duration="5842000" />
354
     </task>
419
     </task>
355
     <servers />
420
     <servers />
356
   </component>
421
   </component>
357
   <component name="TimeTrackingManager">
422
   <component name="TimeTrackingManager">
358
-    <option name="totallyTimeSpent" value="19742000" />
423
+    <option name="totallyTimeSpent" value="25584000" />
359
   </component>
424
   </component>
360
   <component name="ToolWindowManager">
425
   <component name="ToolWindowManager">
361
     <frame x="10" y="43" width="1260" height="674" extended-state="0" />
426
     <frame x="10" y="43" width="1260" height="674" extended-state="0" />
362
     <editor active="true" />
427
     <editor active="true" />
363
     <layout>
428
     <layout>
364
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.31609195" />
429
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.32101807" />
365
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
430
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
366
       <window_info id="Designer" order="2" />
431
       <window_info id="Designer" order="2" />
367
       <window_info id="Learn" order="3" />
432
       <window_info id="Learn" order="3" />
368
       <window_info id="UI Designer" order="4" />
433
       <window_info id="UI Designer" order="4" />
369
       <window_info id="Favorites" order="5" side_tool="true" />
434
       <window_info id="Favorites" order="5" side_tool="true" />
435
+      <window_info anchor="bottom" id="Database Changes" show_stripe_button="false" />
370
       <window_info anchor="bottom" id="Message" order="0" />
436
       <window_info anchor="bottom" id="Message" order="0" />
371
       <window_info anchor="bottom" id="Find" order="1" />
437
       <window_info anchor="bottom" id="Find" order="1" />
372
       <window_info anchor="bottom" id="Run" order="2" />
438
       <window_info anchor="bottom" id="Run" order="2" />
378
       <window_info anchor="bottom" id="Terminal" order="8" weight="0.3291592" />
444
       <window_info anchor="bottom" id="Terminal" order="8" weight="0.3291592" />
379
       <window_info anchor="bottom" id="Event Log" order="9" side_tool="true" />
445
       <window_info anchor="bottom" id="Event Log" order="9" side_tool="true" />
380
       <window_info anchor="bottom" id="Version Control" order="10" show_stripe_button="false" />
446
       <window_info anchor="bottom" id="Version Control" order="10" show_stripe_button="false" />
447
+      <window_info anchor="right" id="Database" />
381
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
448
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
382
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
449
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
383
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
450
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
450
       <provider selected="true" editor-type-id="text-editor" />
517
       <provider selected="true" editor-type-id="text-editor" />
451
     </entry>
518
     </entry>
452
     <entry file="file://$PROJECT_DIR$/src/main/java/com/mesolabs/beans/learnerlab/Configuration.java" />
519
     <entry file="file://$PROJECT_DIR$/src/main/java/com/mesolabs/beans/learnerlab/Configuration.java" />
453
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/mesolabs/beans/learnerlab/DemoApplication.java">
454
-      <provider selected="true" editor-type-id="text-editor">
455
-        <state relative-caret-position="75">
456
-          <caret line="6" column="13" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="13" />
520
+    <entry file="file://$PROJECT_DIR$/README.md">
521
+      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
522
+        <state split_layout="FIRST">
523
+          <first_editor relative-caret-position="165">
524
+            <caret line="121" column="29" lean-forward="true" selection-start-line="121" selection-start-column="29" selection-end-line="121" selection-end-column="29" />
525
+          </first_editor>
526
+          <second_editor />
457
         </state>
527
         </state>
458
       </provider>
528
       </provider>
459
     </entry>
529
     </entry>
460
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/mesolabs/beans/learnerlab/Classroom.java">
530
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/mesolabs/beans/learnerlab/Teacher.java">
461
       <provider selected="true" editor-type-id="text-editor">
531
       <provider selected="true" editor-type-id="text-editor">
462
-        <state relative-caret-position="165">
463
-          <caret line="11" column="13" selection-start-line="11" selection-start-column="13" selection-end-line="11" selection-end-column="13" />
532
+        <state relative-caret-position="255">
533
+          <caret line="17" column="17" selection-start-line="17" selection-start-column="17" selection-end-line="17" selection-end-column="17" />
464
         </state>
534
         </state>
465
       </provider>
535
       </provider>
466
     </entry>
536
     </entry>
467
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/mesolabs/beans/learnerlab/Instructor.java">
537
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/mesolabs/beans/learnerlab/Classroom.java">
468
       <provider selected="true" editor-type-id="text-editor">
538
       <provider selected="true" editor-type-id="text-editor">
469
-        <state relative-caret-position="420">
470
-          <caret line="30" column="24" selection-start-line="30" selection-start-column="24" selection-end-line="30" selection-end-column="60" />
539
+        <state relative-caret-position="210">
540
+          <caret line="14" column="17" selection-start-line="14" selection-start-column="17" selection-end-line="14" selection-end-column="17" />
471
         </state>
541
         </state>
472
       </provider>
542
       </provider>
473
     </entry>
543
     </entry>
474
-    <entry file="file://$PROJECT_DIR$/README.md">
475
-      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
476
-        <state split_layout="FIRST">
477
-          <first_editor relative-caret-position="15">
478
-            <caret line="156" selection-start-line="151" selection-start-column="3" selection-end-line="156" />
479
-          </first_editor>
480
-          <second_editor />
544
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/mesolabs/beans/learnerlab/DemoApplication.java">
545
+      <provider selected="true" editor-type-id="text-editor">
546
+        <state relative-caret-position="75">
547
+          <caret line="6" column="13" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="13" />
481
         </state>
548
         </state>
482
       </provider>
549
       </provider>
483
     </entry>
550
     </entry>
484
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/mesolabs/beans/learnerlab/Instructors.java">
551
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/mesolabs/beans/learnerlab/Instructor.java">
485
       <provider selected="true" editor-type-id="text-editor">
552
       <provider selected="true" editor-type-id="text-editor">
486
-        <state relative-caret-position="150">
487
-          <caret line="11" column="3" selection-start-line="11" selection-start-column="3" selection-end-line="11" selection-end-column="3" />
553
+        <state relative-caret-position="155">
554
+          <caret line="21" column="8" selection-start-line="21" selection-start-column="8" selection-end-line="21" selection-end-column="8" />
488
         </state>
555
         </state>
489
       </provider>
556
       </provider>
490
     </entry>
557
     </entry>
495
         </state>
562
         </state>
496
       </provider>
563
       </provider>
497
     </entry>
564
     </entry>
498
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/mesolabs/beans/learnerlab/People.java">
565
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/mesolabs/beans/learnerlab/Student.java">
499
       <provider selected="true" editor-type-id="text-editor">
566
       <provider selected="true" editor-type-id="text-editor">
500
-        <state relative-caret-position="242">
501
-          <caret line="54" selection-start-line="54" selection-end-line="54" />
502
-          <folding>
503
-            <element signature="e#1924#1925#0" expanded="true" />
504
-            <element signature="e#1986#1987#0" expanded="true" />
505
-          </folding>
567
+        <state relative-caret-position="204">
568
+          <caret line="22" lean-forward="true" selection-start-line="22" selection-end-line="22" />
506
         </state>
569
         </state>
507
       </provider>
570
       </provider>
508
     </entry>
571
     </entry>
509
     <entry file="file://$PROJECT_DIR$/src/main/java/com/mesolabs/beans/learnerlab/Person.java">
572
     <entry file="file://$PROJECT_DIR$/src/main/java/com/mesolabs/beans/learnerlab/Person.java">
510
       <provider selected="true" editor-type-id="text-editor">
573
       <provider selected="true" editor-type-id="text-editor">
511
-        <state relative-caret-position="195">
512
-          <caret line="13" column="15" selection-start-line="13" selection-start-column="15" selection-end-line="13" selection-end-column="15" />
574
+        <state relative-caret-position="163">
575
+          <caret line="15" column="20" lean-forward="true" selection-start-line="15" selection-start-column="20" selection-end-line="15" selection-end-column="20" />
513
         </state>
576
         </state>
514
       </provider>
577
       </provider>
515
     </entry>
578
     </entry>
516
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/mesolabs/beans/learnerlab/Student.java">
579
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/mesolabs/beans/learnerlab/People.java">
517
       <provider selected="true" editor-type-id="text-editor">
580
       <provider selected="true" editor-type-id="text-editor">
518
-        <state relative-caret-position="465">
519
-          <caret line="34" column="8" selection-start-line="34" selection-start-column="8" selection-end-line="34" selection-end-column="8" />
581
+        <state relative-caret-position="-93">
582
+          <caret line="29" column="38" lean-forward="true" selection-start-line="29" selection-start-column="38" selection-end-line="29" selection-end-column="38" />
583
+          <folding>
584
+            <element signature="imports" expanded="true" />
585
+            <element signature="e#1755#1756#0" expanded="true" />
586
+            <element signature="e#1738#1739#0" expanded="true" />
587
+            <element signature="e#1778#1779#0" expanded="true" />
588
+            <element signature="e#1856#1857#0" expanded="true" />
589
+            <element signature="e#1892#1893#0" expanded="true" />
590
+            <element signature="e#1919#1920#0" expanded="true" />
591
+            <element signature="e#1953#1954#0" expanded="true" />
592
+            <element signature="e#2003#2004#0" expanded="true" />
593
+            <element signature="e#2063#2064#0" expanded="true" />
594
+            <element signature="e#2293#2294#0" expanded="true" />
595
+            <element signature="e#2320#2321#0" expanded="true" />
596
+            <element signature="e#2519#2520#0" expanded="true" />
597
+            <element signature="e#2563#2564#0" expanded="true" />
598
+          </folding>
520
         </state>
599
         </state>
521
       </provider>
600
       </provider>
522
     </entry>
601
     </entry>
523
     <entry file="file://$PROJECT_DIR$/src/main/java/com/mesolabs/beans/learnerlab/StudentConfig.java">
602
     <entry file="file://$PROJECT_DIR$/src/main/java/com/mesolabs/beans/learnerlab/StudentConfig.java">
524
       <provider selected="true" editor-type-id="text-editor">
603
       <provider selected="true" editor-type-id="text-editor">
525
-        <state relative-caret-position="399">
526
-          <caret line="27" column="20" selection-start-line="27" selection-start-column="20" selection-end-line="27" selection-end-column="20" />
604
+        <state relative-caret-position="272">
605
+          <caret line="29" column="5" lean-forward="true" selection-start-line="29" selection-start-column="5" selection-end-line="29" selection-end-column="5" />
527
           <folding>
606
           <folding>
528
             <element signature="imports" expanded="true" />
607
             <element signature="imports" expanded="true" />
529
           </folding>
608
           </folding>
530
         </state>
609
         </state>
531
       </provider>
610
       </provider>
532
     </entry>
611
     </entry>
612
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/mesolabs/beans/learnerlab/Instructors.java">
613
+      <provider selected="true" editor-type-id="text-editor">
614
+        <state relative-caret-position="165">
615
+          <caret line="12" column="13" selection-start-line="12" selection-start-column="13" selection-end-line="12" selection-end-column="13" />
616
+          <folding>
617
+            <element signature="e#552#553#0" expanded="true" />
618
+            <element signature="e#579#580#0" expanded="true" />
619
+          </folding>
620
+        </state>
621
+      </provider>
622
+    </entry>
533
     <entry file="file://$PROJECT_DIR$/src/main/java/com/mesolabs/beans/learnerlab/Students.java">
623
     <entry file="file://$PROJECT_DIR$/src/main/java/com/mesolabs/beans/learnerlab/Students.java">
534
       <provider selected="true" editor-type-id="text-editor">
624
       <provider selected="true" editor-type-id="text-editor">
535
         <state relative-caret-position="255">
625
         <state relative-caret-position="255">
536
-          <caret line="17" column="1" selection-start-line="17" selection-start-column="1" selection-end-line="17" selection-end-column="1" />
626
+          <caret line="17" column="1" lean-forward="true" selection-start-line="17" selection-start-column="1" selection-end-line="17" selection-end-column="1" />
537
         </state>
627
         </state>
538
       </provider>
628
       </provider>
539
     </entry>
629
     </entry>
540
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/mesolabs/beans/learnerlab/Teacher.java">
630
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/mesolabs/beans/learnerlab/InstructorConfig.java">
541
       <provider selected="true" editor-type-id="text-editor">
631
       <provider selected="true" editor-type-id="text-editor">
542
-        <state relative-caret-position="255">
543
-          <caret line="17" column="17" selection-start-line="17" selection-start-column="17" selection-end-line="17" selection-end-column="17" />
632
+        <state relative-caret-position="168">
633
+          <caret line="18" column="35" lean-forward="true" selection-start-line="18" selection-start-column="35" selection-end-line="18" selection-end-column="35" />
634
+          <folding>
635
+            <element signature="imports" expanded="true" />
636
+            <element signature="e#810#811#0" expanded="true" />
637
+            <element signature="e#850#851#0" expanded="true" />
638
+          </folding>
639
+        </state>
640
+      </provider>
641
+    </entry>
642
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/mesolabs/beans/learnerlab/Classroomconfig.java">
643
+      <provider selected="true" editor-type-id="text-editor">
644
+        <state relative-caret-position="285">
645
+          <caret line="19" column="40" selection-start-line="19" selection-start-column="32" selection-end-line="19" selection-end-column="40" />
646
+          <folding>
647
+            <element signature="imports" expanded="true" />
648
+          </folding>
649
+        </state>
650
+      </provider>
651
+    </entry>
652
+    <entry file="file://$PROJECT_DIR$/src/test/java/com/mesolabs/beans/learnerlab/testStudentConfig.java">
653
+      <provider selected="true" editor-type-id="text-editor">
654
+        <state relative-caret-position="362">
655
+          <caret line="39" lean-forward="true" selection-start-line="39" selection-end-line="39" />
656
+          <folding>
657
+            <element signature="imports" expanded="true" />
658
+          </folding>
544
         </state>
659
         </state>
545
       </provider>
660
       </provider>
546
     </entry>
661
     </entry>

+ 10
- 0
src/main/java/com/mesolabs/beans/learnerlab/Classroom.java Visa fil

11
 
11
 
12
 public class Classroom {
12
 public class Classroom {
13
 
13
 
14
+    private Instructor instructor ;
15
+    private  Students students ;
16
+
17
+    public Classroom(Instructor instructor, Students students) {
18
+        this.instructor = instructor;
19
+        this.students = students;
20
+    }
21
+
22
+
14
     public void hostLecture(Teacher  teacher ,double numberOfHours){
23
     public void hostLecture(Teacher  teacher ,double numberOfHours){
24
+        teacher .lecture(students,numberOfHours   );
15
 
25
 
16
     }
26
     }
17
 
27
 

+ 28
- 0
src/main/java/com/mesolabs/beans/learnerlab/Classroomconfig.java Visa fil

1
+package com.mesolabs.beans.learnerlab;
2
+
3
+import org.springframework.context.annotation.Bean;
4
+import org.springframework.context.annotation.Configuration;
5
+import org.springframework.context.annotation.DependsOn;
6
+
7
+@Configuration
8
+
9
+public class Classroomconfig {
10
+    @Bean(name="currentCohort")
11
+    @DependsOn({"instructors","students"})
12
+
13
+    public Classroom  currentCohort(Instructors instructors ,Students students ){
14
+         Classroom currentCohort = new Classroom(instructors,students);
15
+         return currentCohort ;
16
+
17
+
18
+    }
19
+    @Bean(name="previousCohort")
20
+    @DependsOn({"instructors","previous"})
21
+
22
+    public Classroom previousCohort(Instructors instructors, Students previous){
23
+
24
+        Classroom previousCohort = new Classroom(instructors,previous);
25
+
26
+        return previousCohort;
27
+    }
28
+}

+ 1
- 0
src/main/java/com/mesolabs/beans/learnerlab/Instructor.java Visa fil

18
 
18
 
19
 
19
 
20
     public Instructor(Long id, String name) {
20
     public Instructor(Long id, String name) {
21
+
21
         super(id, name);
22
         super(id, name);
22
     }
23
     }
23
 
24
 

+ 35
- 0
src/main/java/com/mesolabs/beans/learnerlab/InstructorConfig.java Visa fil

1
+package com.mesolabs.beans.learnerlab;
2
+
3
+import org.springframework.context.annotation.Bean;
4
+import org.springframework.context.annotation.Primary;
5
+
6
+public class InstructorConfig {
7
+
8
+
9
+    @Bean(name = "toUsaInstructors")
10
+    public Instructors tcUsaInstructors(){
11
+
12
+        return new Instructors(
13
+                new Instructor(0L, "Wilhelm"),
14
+                new Instructor(1L, "BobbyFLay"),
15
+                new Instructor(2L, "WakaFLocka")
16
+        );
17
+    }
18
+
19
+    @Bean(name = "tcUkInstructors")
20
+    public Instructors tcUkInstructors(){
21
+        return new Instructors(
22
+                new Instructor(0L, "Quavo"),
23
+                new Instructor(0L, "Offset"),
24
+                new Instructor(0L, "Takeoff")
25
+        );
26
+    }
27
+
28
+    @Primary
29
+    @Bean(name = "allInstructors")
30
+    public Instructors allInstructors(){
31
+        return new Instructors();
32
+    }
33
+}
34
+
35
+

+ 5
- 4
src/main/java/com/mesolabs/beans/learnerlab/Instructors.java Visa fil

10
 	* and pass them to the super constructor.
10
 	* and pass them to the super constructor.
11
 
11
 
12
  */
12
  */
13
-public class Instructors extends People{
13
+public class Instructors extends People<Instructor>{
14
 
14
 
15
-    public Instructors(ArrayList<Person > personList) {
15
+    public Instructors(Instructors ... instructors ) {
16
 
16
 
17
-        super(personList);
17
+        super(instructors);
18
     }
18
     }
19
 
19
 
20
+
20
     @Override
21
     @Override
21
-    public Iterator<Person> iterator() {
22
+    public Iterator<Instructor> iterator() {
22
         return null;
23
         return null;
23
     }
24
     }
24
 }
25
 }

+ 34
- 28
src/main/java/com/mesolabs/beans/learnerlab/People.java Visa fil

1
 package com.mesolabs.beans.learnerlab;
1
 package com.mesolabs.beans.learnerlab;
2
 
2
 
3
 import java.util.ArrayList;
3
 import java.util.ArrayList;
4
+import java.util.Arrays;
5
+import java.util.Iterator;
6
+import java.util.List;
4
 
7
 
5
 /*
8
 /*
6
 Create an abstract `People` class
9
 Create an abstract `People` class
18
 	* The class should define a method named `findAll` which returns the composite `personList`.
21
 	* The class should define a method named `findAll` which returns the composite `personList`.
19
  */
22
  */
20
 //Iterable<? extends Learner> learners
23
 //Iterable<? extends Learner> learners
21
-public abstract class People  implements Iterable <Person> {
24
+public abstract class People<Persontype extends Person>  implements Iterable <Persontype> {
22
 
25
 
26
+    List<Persontype> list;
23
 
27
 
24
-    ArrayList<Person > personList;
28
+    //ArrayList<Person> personList;
25
 
29
 
26
-    public People(ArrayList<Person> personList) {
27
-        this.personList = personList;
30
+    public People(Persontype  plist) {
31
+        this.list = new ArrayList<Persontype>(Arrays.asList(plist));
28
     }
32
     }
29
-    public void addPerson(Person e){
30
 
33
 
31
-        personList.add(e);
34
+    public void addPerson(Persontype e) {
35
+
36
+        list.add(e);
32
     }
37
     }
33
 
38
 
34
     public int size() {
39
     public int size() {
35
-        return personList.size();
36
-    }
37
-    public void removes(Person e){
38
-        personList.remove(e);
39
-    }
40
-    public void clear (){
41
-        personList.clear() ;
40
+        return list.size();
42
     }
41
     }
43
-    public void addAll(Iterable <Person> p){
44
-        for (Person person : p) personList.add(person);
45
-    }
46
-
47
-    public Person findById(long id) {
48
-      //  Person tempPerson = null;
49
 
42
 
50
-        return personList.stream().filter(personList->personList.getId().equals(id)).findFirst().get();
43
+    public void removes(Persontype e) {
44
+        list.remove(e);
45
+    }
51
 
46
 
52
-        /*for (Person p : personList) {
47
+    public void clear() {
48
+        list.clear();
49
+    }
53
 
50
 
54
-            if (p.getId() == id) {
51
+    public void addAll(Iterable<Persontype> p) {
52
+        for (Persontype person : p) list.add(person);
53
+    }
55
 
54
 
56
-                tempPerson =p;
57
-                break;
55
+    public Persontype findById(long id) {
56
+        for(Persontype p : list){
57
+            if(p.getId() == id){
58
+                return p;
58
             }
59
             }
59
-
60
         }
60
         }
61
+       return null;
62
+        //return list.stream().filter(personList -> personList.getId().equals(id)).findFirst().get();
61
 
63
 
62
-        return tempPerson; */
63
     }
64
     }
64
 
65
 
65
-    public ArrayList<Person> findAll(){
66
-        return personList ;
66
+    public List<Persontype> findAll() {
67
+        return list ;
68
+    }
69
+    @Override
70
+    public Iterator<Persontype> iterator() {
71
+        return list.iterator();
67
     }
72
     }
68
 }
73
 }
74
+

+ 5
- 2
src/main/java/com/mesolabs/beans/learnerlab/Person.java Visa fil

13
 
13
 
14
 public class Person {
14
 public class Person {
15
 
15
 
16
-    public final Long id;
16
+    public  Long id;
17
      public   String name;
17
      public   String name;
18
 
18
 
19
-    public Person(Long id,String name) {
19
+    public Person() {
20
+    }
21
+
22
+    public Person(Long id, String name) {
20
 
23
 
21
         this.id=id;
24
         this.id=id;
22
         this.name = name;
25
         this.name = name;

+ 2
- 1
src/main/java/com/mesolabs/beans/learnerlab/Student.java Visa fil

16
 
16
 
17
 public   class  Student  extends Person implements Learner {
17
 public   class  Student  extends Person implements Learner {
18
 
18
 
19
-    double totalStudyTime;
19
+    Double totalStudyTime;
20
 
20
 
21
     //@Autowired
21
     //@Autowired
22
     //private GitProperties gitProperties;
22
     //private GitProperties gitProperties;
27
     }
27
     }
28
 
28
 
29
     public void learn(double numberOfHours){
29
     public void learn(double numberOfHours){
30
+
30
         totalStudyTime += numberOfHours ;
31
         totalStudyTime += numberOfHours ;
31
     }
32
     }
32
 
33
 

+ 13
- 4
src/main/java/com/mesolabs/beans/learnerlab/StudentConfig.java Visa fil

4
 import org.springframework.context.annotation.Configuration;
4
 import org.springframework.context.annotation.Configuration;
5
 
5
 
6
 import java.util.ArrayList;
6
 import java.util.ArrayList;
7
+import java.util.Iterator;
7
 /*
8
 /*
8
 he class should define a method named `currentStudents()` which returns a `Students` representative of the current cohort of students.
9
 he class should define a method named `currentStudents()` which returns a `Students` representative of the current cohort of students.
9
 	* the method should be annotated with `@Bean(name = "students")`
10
 	* the method should be annotated with `@Bean(name = "students")`
14
  */
15
  */
15
 
16
 
16
 @Configuration
17
 @Configuration
18
+
17
 public class StudentConfig {
19
 public class StudentConfig {
18
-    ArrayList<Student>students =new ArrayList<>() ;
20
+
21
+   // ArrayList<Student>students =new ArrayList<>() ;
22
+
19
 
23
 
20
     @Bean(name="students")
24
     @Bean(name="students")
21
-    public Students currentStudents(){
25
+    public Students currentStudents() {
26
+
27
+        return new Students(new Student(0l, "the  Lauren"),
28
+                new Student(1L, "the  nate"));
22
 
29
 
23
-        return null;
24
     }
30
     }
25
 
31
 
32
+        @Bean
26
     public  Students previousStudents(){
33
     public  Students previousStudents(){
34
+        return new Students(new Student(0l,"the old Lauren"),
35
+                new Student(1L,,"the old nate"));
36
+
27
 
37
 
28
-        return null;
29
     }
38
     }
30
 }
39
 }

+ 3
- 3
src/main/java/com/mesolabs/beans/learnerlab/Students.java Visa fil

8
 
8
 
9
 import java.util.ArrayList;
9
 import java.util.ArrayList;
10
 
10
 
11
-public  abstract class Students extends People  {
11
+public   class Students extends People <Student> {
12
 
12
 
13
 
13
 
14
-    public Students(ArrayList<Person> personList) {
14
+    public Students(Students... students) {
15
 
15
 
16
-        super(personList);
16
+        super(students);
17
     }
17
     }
18
 }
18
 }

+ 43
- 0
src/test/java/com/mesolabs/beans/learnerlab/testStudentConfig.java Visa fil

1
+package com.mesolabs.beans.learnerlab;
2
+
3
+
4
+import org.assertj.core.internal.Arrays;
5
+import org.junit.Assert;
6
+import org.junit.Test;
7
+import org.junit.runner.RunWith;
8
+import org.springframework.beans.factory.annotation.Autowired;
9
+import org.springframework.beans.factory.annotation.Qualifier;
10
+import org.springframework.boot.test.context.SpringBootTest;
11
+import org.springframework.test.context.junit4.SpringRunner;
12
+
13
+import java.util.List;
14
+
15
+@RunWith(SpringRunner.class)
16
+
17
+@SpringBootTest
18
+public class testStudentConfig {
19
+    @Autowired
20
+    @Qualifier("previousStudents")
21
+
22
+    private Students perviousStudents;
23
+
24
+    @Autowired
25
+    @Qualifier ("students")
26
+    private Students currentstudents;
27
+
28
+    @Test
29
+    public void testPreviousStudents(){
30
+        List<String>names= Arrays.asList("Lauren Nate X" .split(","));
31
+        for (Student student: previousStudents){
32
+            String name=student.getName() ;
33
+            boolean outcome=((List) names).contains(name);
34
+            Assert.assertTrue(outcome );
35
+        }
36
+
37
+    }
38
+
39
+
40
+
41
+
42
+
43
+}