commited

.idea/workspace.xml

@@ -2,7 +2,18 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="a8cb0210-1bcb-4a60-9a0c-e7415562c69e" name="Default Changelist" comment="">
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/mesolabs/beans/learnerlab/Classroomconfig.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/mesolabs/beans/learnerlab/InstructorConfig.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/test/java/com/mesolabs/beans/learnerlab/testStudentConfig.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <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" />
+      <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" />
+      <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" />
+      <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" />
+      <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" />
+      <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" />
+      <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" />
+      <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" />
     </list>
     <ignored path="$PROJECT_DIR$/target/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -17,7 +28,7 @@
         <counts>
           <entry key="project.closed" value="17" />
           <entry key="project.open.time.0" value="1" />
-          <entry key="project.open.time.1" value="3" />
+          <entry key="project.open.time.1" value="4" />
           <entry key="project.open.time.10" value="1" />
           <entry key="project.open.time.11" value="2" />
           <entry key="project.open.time.12" value="3" />
@@ -28,7 +39,7 @@
           <entry key="project.open.time.4" value="1" />
           <entry key="project.open.time.6" value="1" />
           <entry key="project.open.time.9" value="1" />
-          <entry key="project.opened" value="17" />
+          <entry key="project.opened" value="18" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.open">
@@ -41,8 +52,8 @@
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
-          <entry key="JAVA" value="40" />
-          <entry key="Markdown" value="4" />
+          <entry key="JAVA" value="59" />
+          <entry key="Markdown" value="5" />
           <entry key="Properties" value="1" />
           <entry key="XML" value="2" />
         </counts>
@@ -56,7 +67,7 @@
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="1668" />
+          <entry key="JAVA" value="2931" />
           <entry key="Properties" value="12" />
           <entry key="XML" value="1" />
         </counts>
@@ -68,8 +79,8 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/mesolabs/beans/learnerlab/StudentConfig.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="399">
-              <caret line="27" column="20" selection-start-line="27" selection-start-column="20" selection-end-line="27" selection-end-column="20" />
+            <state relative-caret-position="272">
+              <caret line="29" column="5" lean-forward="true" selection-start-line="29" selection-start-column="5" selection-end-line="29" selection-end-column="5" />
               <folding>
                 <element signature="imports" expanded="true" />
               </folding>
@@ -78,49 +89,61 @@
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/README.md">
-          <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-            <state split_layout="FIRST">
-              <first_editor relative-caret-position="15">
-                <caret line="156" selection-start-line="151" selection-start-column="3" selection-end-line="156" />
-              </first_editor>
-              <second_editor />
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/mesolabs/beans/learnerlab/Classroomconfig.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="285">
+              <caret line="19" column="40" selection-start-line="19" selection-start-column="32" selection-end-line="19" selection-end-column="40" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/mesolabs/beans/learnerlab/Instructors.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/mesolabs/beans/learnerlab/Student.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="150">
-              <caret line="11" column="3" selection-start-line="11" selection-start-column="3" selection-end-line="11" selection-end-column="3" />
+            <state relative-caret-position="204">
+              <caret line="22" lean-forward="true" selection-start-line="22" selection-end-line="22" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/mesolabs/beans/learnerlab/Student.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/mesolabs/beans/learnerlab/Instructors.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="465">
-              <caret line="34" column="8" selection-start-line="34" selection-start-column="8" selection-end-line="34" selection-end-column="8" />
+            <state relative-caret-position="165">
+              <caret line="12" column="13" selection-start-line="12" selection-start-column="13" selection-end-line="12" selection-end-column="13" />
+              <folding>
+                <element signature="e#552#553#0" expanded="true" />
+                <element signature="e#579#580#0" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/mesolabs/beans/learnerlab/Students.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/mesolabs/beans/learnerlab/InstructorConfig.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="255">
-              <caret line="17" column="1" selection-start-line="17" selection-start-column="1" selection-end-line="17" selection-end-column="1" />
+            <state relative-caret-position="168">
+              <caret line="18" column="35" lean-forward="true" selection-start-line="18" selection-start-column="35" selection-end-line="18" selection-end-column="35" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="e#810#811#0" expanded="true" />
+                <element signature="e#850#851#0" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/mesolabs/beans/learnerlab/Teacher.java">
+        <entry file="file://$PROJECT_DIR$/src/test/java/com/mesolabs/beans/learnerlab/testStudentConfig.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="255">
-              <caret line="17" column="17" selection-start-line="17" selection-start-column="17" selection-end-line="17" selection-end-column="17" />
+            <state relative-caret-position="362">
+              <caret line="39" lean-forward="true" selection-start-line="39" selection-end-line="39" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -137,17 +160,17 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/mesolabs/beans/learnerlab/Person.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="195">
-              <caret line="13" column="15" selection-start-line="13" selection-start-column="15" selection-end-line="13" selection-end-column="15" />
+            <state relative-caret-position="163">
+              <caret line="15" column="20" lean-forward="true" selection-start-line="15" selection-start-column="20" selection-end-line="15" selection-end-column="20" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/mesolabs/beans/learnerlab/Instructor.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/mesolabs/beans/learnerlab/Students.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="420">
-              <caret line="30" column="24" selection-start-line="30" selection-start-column="24" selection-end-line="30" selection-end-column="60" />
+            <state relative-caret-position="255">
+              <caret line="17" column="1" lean-forward="true" selection-start-line="17" selection-start-column="1" selection-end-line="17" selection-end-column="1" />
             </state>
           </provider>
         </entry>
@@ -155,11 +178,23 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/mesolabs/beans/learnerlab/People.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="242">
-              <caret line="54" selection-start-line="54" selection-end-line="54" />
+            <state relative-caret-position="-93">
+              <caret line="29" column="38" lean-forward="true" selection-start-line="29" selection-start-column="38" selection-end-line="29" selection-end-column="38" />
               <folding>
-                <element signature="e#1924#1925#0" expanded="true" />
-                <element signature="e#1986#1987#0" expanded="true" />
+                <element signature="imports" expanded="true" />
+                <element signature="e#1755#1756#0" expanded="true" />
+                <element signature="e#1738#1739#0" expanded="true" />
+                <element signature="e#1778#1779#0" expanded="true" />
+                <element signature="e#1856#1857#0" expanded="true" />
+                <element signature="e#1892#1893#0" expanded="true" />
+                <element signature="e#1919#1920#0" expanded="true" />
+                <element signature="e#1953#1954#0" expanded="true" />
+                <element signature="e#2003#2004#0" expanded="true" />
+                <element signature="e#2063#2064#0" expanded="true" />
+                <element signature="e#2293#2294#0" expanded="true" />
+                <element signature="e#2320#2321#0" expanded="true" />
+                <element signature="e#2519#2520#0" expanded="true" />
+                <element signature="e#2563#2564#0" expanded="true" />
               </folding>
             </state>
           </provider>
@@ -171,10 +206,19 @@
     <option name="RECENT_TEMPLATES">
       <list>
         <option value="Interface" />
+        <option value="Singleton" />
         <option value="Class" />
       </list>
     </option>
   </component>
+  <component name="FindInProjectRecents">
+    <replaceStrings>
+      <replace />
+    </replaceStrings>
+    <dirStrings>
+      <dir>$PROJECT_DIR$/src/main/java/com/mesolabs/beans/learnerlab</dir>
+    </dirStrings>
+  </component>
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
   </component>
@@ -192,17 +236,20 @@
         <option value="$PROJECT_DIR$/src/main/java/com/example/demo/Person.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/example/demo/Learner.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/mesolabs/beans/learnerlab/Teacher.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/mesolabs/beans/learnerlab/Instructor.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/mesolabs/beans/learnerlab/Person.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/mesolabs/beans/learnerlab/People.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/mesolabs/beans/learnerlab/Instructors.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/mesolabs/beans/learnerlab/Classroom.java" />
         <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
         <option value="$PROJECT_DIR$/pom.xml" />
         <option value="$PROJECT_DIR$/src/main/java/com/mesolabs/beans/learnerlab/Configuration.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/mesolabs/beans/learnerlab/Students.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/mesolabs/beans/learnerlab/Person.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/mesolabs/beans/learnerlab/Student.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/mesolabs/beans/learnerlab/Classroom.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/mesolabs/beans/learnerlab/StudentConfig.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/mesolabs/beans/learnerlab/Instructors.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/mesolabs/beans/learnerlab/Instructor.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/mesolabs/beans/learnerlab/InstructorConfig.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/mesolabs/beans/learnerlab/People.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/mesolabs/beans/learnerlab/Students.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/mesolabs/beans/learnerlab/Classroomconfig.java" />
+        <option value="$PROJECT_DIR$/src/test/java/com/mesolabs/beans/learnerlab/testStudentConfig.java" />
       </list>
     </option>
   </component>
@@ -285,6 +332,23 @@
               <item name="test" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
             </path>
+            <path>
+              <item name="demo" type="b2602c69:ProjectViewProjectNode" />
+              <item name="CR-MesoLabs-Beans.LearnerLab" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="test" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="com" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="demo" type="b2602c69:ProjectViewProjectNode" />
+              <item name="CR-MesoLabs-Beans.LearnerLab" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="test" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="com" type="462c0819:PsiDirectoryNode" />
+              <item name="learnerlab" type="462c0819:PsiDirectoryNode" />
+            </path>
           </expand>
           <select />
         </subPane>
@@ -351,22 +415,24 @@
       <workItem from="1545010389346" duration="11000" />
       <workItem from="1545337653413" duration="8000" />
       <workItem from="1545536853921" duration="29000" />
+      <workItem from="1546875912385" duration="5842000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="19742000" />
+    <option name="totallyTimeSpent" value="25584000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="10" y="43" width="1260" height="674" extended-state="0" />
     <editor active="true" />
     <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.31609195" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.32101807" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Learn" order="3" />
       <window_info id="UI Designer" order="4" />
       <window_info id="Favorites" order="5" side_tool="true" />
+      <window_info anchor="bottom" id="Database Changes" show_stripe_button="false" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
       <window_info anchor="bottom" id="Run" order="2" />
@@ -378,6 +444,7 @@
       <window_info anchor="bottom" id="Terminal" order="8" weight="0.3291592" />
       <window_info anchor="bottom" id="Event Log" order="9" side_tool="true" />
       <window_info anchor="bottom" id="Version Control" order="10" show_stripe_button="false" />
+      <window_info anchor="right" id="Database" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
@@ -450,41 +517,41 @@
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/mesolabs/beans/learnerlab/Configuration.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/mesolabs/beans/learnerlab/DemoApplication.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="75">
-          <caret line="6" column="13" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="13" />
+    <entry file="file://$PROJECT_DIR$/README.md">
+      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+        <state split_layout="FIRST">
+          <first_editor relative-caret-position="165">
+            <caret line="121" column="29" lean-forward="true" selection-start-line="121" selection-start-column="29" selection-end-line="121" selection-end-column="29" />
+          </first_editor>
+          <second_editor />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/mesolabs/beans/learnerlab/Classroom.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/mesolabs/beans/learnerlab/Teacher.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="165">
-          <caret line="11" column="13" selection-start-line="11" selection-start-column="13" selection-end-line="11" selection-end-column="13" />
+        <state relative-caret-position="255">
+          <caret line="17" column="17" selection-start-line="17" selection-start-column="17" selection-end-line="17" selection-end-column="17" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/mesolabs/beans/learnerlab/Instructor.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/mesolabs/beans/learnerlab/Classroom.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="420">
-          <caret line="30" column="24" selection-start-line="30" selection-start-column="24" selection-end-line="30" selection-end-column="60" />
+        <state relative-caret-position="210">
+          <caret line="14" column="17" selection-start-line="14" selection-start-column="17" selection-end-line="14" selection-end-column="17" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/README.md">
-      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-        <state split_layout="FIRST">
-          <first_editor relative-caret-position="15">
-            <caret line="156" selection-start-line="151" selection-start-column="3" selection-end-line="156" />
-          </first_editor>
-          <second_editor />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/mesolabs/beans/learnerlab/DemoApplication.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="75">
+          <caret line="6" column="13" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="13" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/mesolabs/beans/learnerlab/Instructors.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/mesolabs/beans/learnerlab/Instructor.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="150">
-          <caret line="11" column="3" selection-start-line="11" selection-start-column="3" selection-end-line="11" selection-end-column="3" />
+        <state relative-caret-position="155">
+          <caret line="21" column="8" selection-start-line="21" selection-start-column="8" selection-end-line="21" selection-end-column="8" />
         </state>
       </provider>
     </entry>
@@ -495,52 +562,100 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/mesolabs/beans/learnerlab/People.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/mesolabs/beans/learnerlab/Student.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="54" selection-start-line="54" selection-end-line="54" />
-          <folding>
-            <element signature="e#1924#1925#0" expanded="true" />
-            <element signature="e#1986#1987#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="204">
+          <caret line="22" lean-forward="true" selection-start-line="22" selection-end-line="22" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/mesolabs/beans/learnerlab/Person.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="195">
-          <caret line="13" column="15" selection-start-line="13" selection-start-column="15" selection-end-line="13" selection-end-column="15" />
+        <state relative-caret-position="163">
+          <caret line="15" column="20" lean-forward="true" selection-start-line="15" selection-start-column="20" selection-end-line="15" selection-end-column="20" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/mesolabs/beans/learnerlab/Student.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/mesolabs/beans/learnerlab/People.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="465">
-          <caret line="34" column="8" selection-start-line="34" selection-start-column="8" selection-end-line="34" selection-end-column="8" />
+        <state relative-caret-position="-93">
+          <caret line="29" column="38" lean-forward="true" selection-start-line="29" selection-start-column="38" selection-end-line="29" selection-end-column="38" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="e#1755#1756#0" expanded="true" />
+            <element signature="e#1738#1739#0" expanded="true" />
+            <element signature="e#1778#1779#0" expanded="true" />
+            <element signature="e#1856#1857#0" expanded="true" />
+            <element signature="e#1892#1893#0" expanded="true" />
+            <element signature="e#1919#1920#0" expanded="true" />
+            <element signature="e#1953#1954#0" expanded="true" />
+            <element signature="e#2003#2004#0" expanded="true" />
+            <element signature="e#2063#2064#0" expanded="true" />
+            <element signature="e#2293#2294#0" expanded="true" />
+            <element signature="e#2320#2321#0" expanded="true" />
+            <element signature="e#2519#2520#0" expanded="true" />
+            <element signature="e#2563#2564#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/mesolabs/beans/learnerlab/StudentConfig.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="399">
-          <caret line="27" column="20" selection-start-line="27" selection-start-column="20" selection-end-line="27" selection-end-column="20" />
+        <state relative-caret-position="272">
+          <caret line="29" column="5" lean-forward="true" selection-start-line="29" selection-start-column="5" selection-end-line="29" selection-end-column="5" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/mesolabs/beans/learnerlab/Instructors.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="165">
+          <caret line="12" column="13" selection-start-line="12" selection-start-column="13" selection-end-line="12" selection-end-column="13" />
+          <folding>
+            <element signature="e#552#553#0" expanded="true" />
+            <element signature="e#579#580#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/mesolabs/beans/learnerlab/Students.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="255">
-          <caret line="17" column="1" selection-start-line="17" selection-start-column="1" selection-end-line="17" selection-end-column="1" />
+          <caret line="17" column="1" lean-forward="true" selection-start-line="17" selection-start-column="1" selection-end-line="17" selection-end-column="1" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/mesolabs/beans/learnerlab/Teacher.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/mesolabs/beans/learnerlab/InstructorConfig.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="255">
-          <caret line="17" column="17" selection-start-line="17" selection-start-column="17" selection-end-line="17" selection-end-column="17" />
+        <state relative-caret-position="168">
+          <caret line="18" column="35" lean-forward="true" selection-start-line="18" selection-start-column="35" selection-end-line="18" selection-end-column="35" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="e#810#811#0" expanded="true" />
+            <element signature="e#850#851#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/mesolabs/beans/learnerlab/Classroomconfig.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="285">
+          <caret line="19" column="40" selection-start-line="19" selection-start-column="32" selection-end-line="19" selection-end-column="40" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/test/java/com/mesolabs/beans/learnerlab/testStudentConfig.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="362">
+          <caret line="39" lean-forward="true" selection-start-line="39" selection-end-line="39" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>

src/main/java/com/mesolabs/beans/learnerlab/Classroom.java

@@ -11,7 +11,17 @@ Create a `Classroom` class.
 
 public class Classroom {
 
+    private Instructor instructor ;
+    private  Students students ;
+
+    public Classroom(Instructor instructor, Students students) {
+        this.instructor = instructor;
+        this.students = students;
+    }
+
+
     public void hostLecture(Teacher  teacher ,double numberOfHours){
+        teacher .lecture(students,numberOfHours   );
 
     }
 

src/main/java/com/mesolabs/beans/learnerlab/Classroomconfig.java

@@ -0,0 +1,28 @@
+package com.mesolabs.beans.learnerlab;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.DependsOn;
+
+@Configuration
+
+public class Classroomconfig {
+    @Bean(name="currentCohort")
+    @DependsOn({"instructors","students"})
+
+    public Classroom  currentCohort(Instructors instructors ,Students students ){
+         Classroom currentCohort = new Classroom(instructors,students);
+         return currentCohort ;
+
+
+    }
+    @Bean(name="previousCohort")
+    @DependsOn({"instructors","previous"})
+
+    public Classroom previousCohort(Instructors instructors, Students previous){
+
+        Classroom previousCohort = new Classroom(instructors,previous);
+
+        return previousCohort;
+    }
+}

src/main/java/com/mesolabs/beans/learnerlab/Instructor.java

@@ -18,6 +18,7 @@ public class Instructor  extends Person implements Teacher {
 
 
     public Instructor(Long id, String name) {
+
         super(id, name);
     }
 

src/main/java/com/mesolabs/beans/learnerlab/InstructorConfig.java

@@ -0,0 +1,35 @@
+package com.mesolabs.beans.learnerlab;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Primary;
+
+public class InstructorConfig {
+
+
+    @Bean(name = "toUsaInstructors")
+    public Instructors tcUsaInstructors(){
+
+        return new Instructors(
+                new Instructor(0L, "Wilhelm"),
+                new Instructor(1L, "BobbyFLay"),
+                new Instructor(2L, "WakaFLocka")
+        );
+    }
+
+    @Bean(name = "tcUkInstructors")
+    public Instructors tcUkInstructors(){
+        return new Instructors(
+                new Instructor(0L, "Quavo"),
+                new Instructor(0L, "Offset"),
+                new Instructor(0L, "Takeoff")
+        );
+    }
+
+    @Primary
+    @Bean(name = "allInstructors")
+    public Instructors allInstructors(){
+        return new Instructors();
+    }
+}
+
+

src/main/java/com/mesolabs/beans/learnerlab/Instructors.java

@@ -10,15 +10,16 @@ import java.util.Iterator;
 	* and pass them to the super constructor.
 
  */
-public class Instructors extends People{
+public class Instructors extends People<Instructor>{
 
-    public Instructors(ArrayList<Person > personList) {
+    public Instructors(Instructors ... instructors ) {
 
-        super(personList);
+        super(instructors);
     }
 
+
     @Override
-    public Iterator<Person> iterator() {
+    public Iterator<Instructor> iterator() {
         return null;
     }
 }

src/main/java/com/mesolabs/beans/learnerlab/People.java

@@ -1,6 +1,9 @@
 package com.mesolabs.beans.learnerlab;
 
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.List;
 
 /*
 Create an abstract `People` class
@@ -18,51 +21,54 @@ Create an abstract `People` class
 	* The class should define a method named `findAll` which returns the composite `personList`.
  */
 //Iterable<? extends Learner> learners
-public abstract class People  implements Iterable <Person> {
+public abstract class People<Persontype extends Person>  implements Iterable <Persontype> {
 
+    List<Persontype> list;
 
-    ArrayList<Person > personList;
+    //ArrayList<Person> personList;
 
-    public People(ArrayList<Person> personList) {
-        this.personList = personList;
+    public People(Persontype  plist) {
+        this.list = new ArrayList<Persontype>(Arrays.asList(plist));
     }
-    public void addPerson(Person e){
 
-        personList.add(e);
+    public void addPerson(Persontype e) {
+
+        list.add(e);
     }
 
     public int size() {
-        return personList.size();
-    }
-    public void removes(Person e){
-        personList.remove(e);
-    }
-    public void clear (){
-        personList.clear() ;
+        return list.size();
     }
-    public void addAll(Iterable <Person> p){
-        for (Person person : p) personList.add(person);
-    }
-
-    public Person findById(long id) {
-      //  Person tempPerson = null;
 
-        return personList.stream().filter(personList->personList.getId().equals(id)).findFirst().get();
+    public void removes(Persontype e) {
+        list.remove(e);
+    }
 
-        /*for (Person p : personList) {
+    public void clear() {
+        list.clear();
+    }
 
-            if (p.getId() == id) {
+    public void addAll(Iterable<Persontype> p) {
+        for (Persontype person : p) list.add(person);
+    }
 
-                tempPerson =p;
-                break;
+    public Persontype findById(long id) {
+        for(Persontype p : list){
+            if(p.getId() == id){
+                return p;
             }
-
         }
+       return null;
+        //return list.stream().filter(personList -> personList.getId().equals(id)).findFirst().get();
 
-        return tempPerson; */
     }
 
-    public ArrayList<Person> findAll(){
-        return personList ;
+    public List<Persontype> findAll() {
+        return list ;
+    }
+    @Override
+    public Iterator<Persontype> iterator() {
+        return list.iterator();
     }
 }
+

src/main/java/com/mesolabs/beans/learnerlab/Person.java

@@ -13,10 +13,13 @@ Create a `Person` class.
 
 public class Person {
 
-    public final Long id;
+    public  Long id;
      public   String name;
 
-    public Person(Long id,String name) {
+    public Person() {
+    }
+
+    public Person(Long id, String name) {
 
         this.id=id;
         this.name = name;

src/main/java/com/mesolabs/beans/learnerlab/Student.java

@@ -16,7 +16,7 @@ import org.springframework.boot.info.GitProperties;
 
 public   class  Student  extends Person implements Learner {
 
-    double totalStudyTime;
+    Double totalStudyTime;
 
     //@Autowired
     //private GitProperties gitProperties;
@@ -27,6 +27,7 @@ public   class  Student  extends Person implements Learner {
     }
 
     public void learn(double numberOfHours){
+
         totalStudyTime += numberOfHours ;
     }
 

src/main/java/com/mesolabs/beans/learnerlab/StudentConfig.java

@@ -4,6 +4,7 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
 import java.util.ArrayList;
+import java.util.Iterator;
 /*
 he class should define a method named `currentStudents()` which returns a `Students` representative of the current cohort of students.
 	* the method should be annotated with `@Bean(name = "students")`
@@ -14,17 +15,25 @@ he class should define a method named `currentStudents()` which returns a `Stude
  */
 
 @Configuration
+
 public class StudentConfig {
-    ArrayList<Student>students =new ArrayList<>() ;
+
+   // ArrayList<Student>students =new ArrayList<>() ;
+
 
     @Bean(name="students")
-    public Students currentStudents(){
+    public Students currentStudents() {
+
+        return new Students(new Student(0l, "the  Lauren"),
+                new Student(1L, "the  nate"));
 
-        return null;
     }
 
+        @Bean
     public  Students previousStudents(){
+        return new Students(new Student(0l,"the old Lauren"),
+                new Student(1L,,"the old nate"));
+
 
-        return null;
     }
 }

src/main/java/com/mesolabs/beans/learnerlab/Students.java

@@ -8,11 +8,11 @@ package com.mesolabs.beans.learnerlab;
 
 import java.util.ArrayList;
 
-public  abstract class Students extends People  {
+public   class Students extends People <Student> {
 
 
-    public Students(ArrayList<Person> personList) {
+    public Students(Students... students) {
 
-        super(personList);
+        super(students);
     }
 }

src/test/java/com/mesolabs/beans/learnerlab/testStudentConfig.java

@@ -0,0 +1,43 @@
+package com.mesolabs.beans.learnerlab;
+
+
+import org.assertj.core.internal.Arrays;
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import java.util.List;
+
+@RunWith(SpringRunner.class)
+
+@SpringBootTest
+public class testStudentConfig {
+    @Autowired
+    @Qualifier("previousStudents")
+
+    private Students perviousStudents;
+
+    @Autowired
+    @Qualifier ("students")
+    private Students currentstudents;
+
+    @Test
+    public void testPreviousStudents(){
+        List<String>names= Arrays.asList("Lauren Nate X" .split(","));
+        for (Student student: previousStudents){
+            String name=student.getName() ;
+            boolean outcome=((List) names).contains(name);
+            Assert.assertTrue(outcome );
+        }
+
+    }
+
+
+
+
+
+}