user class annotations

README.md

@@ -1,5 +1,6 @@
 # ZipTeam
 
+
 a zip code slack clone
 
 ### Project planning:

ZipTeamOrange/.idea/misc.xml

@@ -8,7 +8,7 @@
       </list>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="10" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>

ZipTeamOrange/.idea/workspace.xml

@@ -12,6 +12,7 @@
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
   <component name="FileEditorManager">
+<<<<<<< HEAD
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file leaf-file-name="User.java" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/zipteam/User.java">
@@ -94,10 +95,36 @@
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="30">
               <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+=======
+    <leaf>
+      <file leaf-file-name="JAVA/Chat" pinned="false" current-in-tab="false">
+        <entry file="uml://JAVA/Chat">
+          <provider selected="true" editor-type-id="UmlEditorProvider">
+            <state>
+              <ID>JAVA</ID>
+              <OriginalElement>Chat</OriginalElement>
+              <nodes>
+                <node x="-167.0" y="-196.0">Chat</node>
+              </nodes>
+              <notes />
+              <edges />
+              <settings layout="Hierarchic Group" zoom="1.0" x="-201.5" y="-37.0" />
+              <SelectedNodes>
+                <node>Chat</node>
+              </SelectedNodes>
+              <Categories>
+                <Category>Fields</Category>
+                <Category>Constructors</Category>
+                <Category>Methods</Category>
+              </Categories>
+              <SCOPE>Project Files</SCOPE>
+              <VISIBILITY>private</VISIBILITY>
+>>>>>>> 6a0f92fbf58b2aaee9c06fdf6f5e75c39a426217
             </state>
           </provider>
         </entry>
       </file>
+<<<<<<< HEAD
       <file leaf-file-name="ChatController.java" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/zipteam/ChatController.java">
           <provider selected="true" editor-type-id="text-editor">
@@ -112,6 +139,58 @@
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="30">
               <caret line="2" column="22" selection-start-line="2" selection-start-column="22" selection-end-line="2" selection-end-column="22" />
+=======
+      <file leaf-file-name="JAVA/" pinned="false" current-in-tab="true">
+        <entry file="uml://JAVA/">
+          <provider selected="true" editor-type-id="UmlEditorProvider">
+            <state>
+              <ID>JAVA</ID>
+              <OriginalElement />
+              <nodes>
+                <node x="335.0" y="308.0">User</node>
+                <node x="687.0" y="308.0">Message</node>
+                <node x="0.0" y="603.0">MessageRespository</node>
+                <node x="0.0" y="699.0">UserRespository</node>
+                <node x="0.0" y="308.0">Chat</node>
+                <node x="0.0" y="101.0">UserController</node>
+                <node x="410.0" y="101.0">MessageController</node>
+                <node x="0.0" y="795.0">ChatRespository</node>
+                <node x="235.0" y="0.0">Controller</node>
+                <node x="205.0" y="101.0">ChatController</node>
+                <node x="541.0" y="795.0">Main</node>
+              </nodes>
+              <notes />
+              <edges>
+                <edge source="UserController" target="Controller">
+                  <point x="0.0" y="-81.0" />
+                  <point x="92.5" y="76.0" />
+                  <point x="255.83333333333334" y="76.0" />
+                  <point x="-41.66666666666666" y="25.5" />
+                </edge>
+                <edge source="MessageController" target="Controller">
+                  <point x="0.0" y="-81.0" />
+                  <point x="502.5" y="76.0" />
+                  <point x="339.16666666666663" y="76.0" />
+                  <point x="41.66666666666663" y="25.5" />
+                </edge>
+                <edge source="ChatController" target="Controller">
+                  <point x="0.0" y="-81.0" />
+                  <point x="0.0" y="25.5" />
+                </edge>
+              </edges>
+              <settings layout="Hierarchic Group" zoom="1.0" x="423.5" y="433.5" />
+              <SelectedNodes>
+                <node>MessageRespository</node>
+              </SelectedNodes>
+              <Categories>
+                <Category>Fields</Category>
+                <Category>Constructors</Category>
+                <Category>Methods</Category>
+                <Category>Properties</Category>
+              </Categories>
+              <SCOPE>Project Files</SCOPE>
+              <VISIBILITY>private</VISIBILITY>
+>>>>>>> 6a0f92fbf58b2aaee9c06fdf6f5e75c39a426217
             </state>
           </provider>
         </entry>
@@ -129,19 +208,32 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/User.java" />
         <option value="$PROJECT_DIR$/src/main/java/Message.java" />
-        <option value="$PROJECT_DIR$/src/main/java/Chat.java" />
         <option value="$PROJECT_DIR$/src/main/java/Controller.java" />
         <option value="$PROJECT_DIR$/src/main/java/ChatController.java" />
         <option value="$PROJECT_DIR$/src/main/java/MessageController.java" />
         <option value="$PROJECT_DIR$/src/main/java/UserController.java" />
+<<<<<<< HEAD
         <option value="$PROJECT_DIR$/pom.xml" />
         <option value="$PROJECT_DIR$/src/main/java/MessageRepository.java" />
         <option value="$PROJECT_DIR$/src/main/java/ChatRepository.java" />
         <option value="$PROJECT_DIR$/src/main/java/UserRepository.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/zipteam/UserRepository.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/zipteam/User.java" />
+=======
+        <option value="$PROJECT_DIR$/src/main/java/UserRepository.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/zipteamorange/user/UserRepository.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/zipteamorange/message/MessageRepository.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/zipteamorange/chat/Chat.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/zipteamorange/chat/ChatRepository.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/zipteamorange/User.java" />
+        <option value="$PROJECT_DIR$/src/main/java/User.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/zipteamorange/Chat.java" />
+        <option value="$PROJECT_DIR$/src/main/java/Chat.java" />
+        <option value="$PROJECT_DIR$/src/main/java/ChatRepository.java" />
+        <option value="$PROJECT_DIR$/src/main/java/MessageRepository.java" />
+        <option value="$PROJECT_DIR$/src/main/java/ChatRepository1.java" />
+>>>>>>> 6a0f92fbf58b2aaee9c06fdf6f5e75c39a426217
       </list>
     </option>
   </component>
@@ -161,18 +253,29 @@
   <component name="NodePackageJsonFileManager">
     <packageJsonPaths />
   </component>
+<<<<<<< HEAD
   <component name="ProjectFrameBounds" extendedState="6">
     <option name="y" value="23" />
     <option name="width" value="1280" />
     <option name="height" value="717" />
+=======
+  <component name="ProjectFrameBounds">
+    <option name="x" value="-170" />
+    <option name="y" value="-1049" />
+    <option name="width" value="1859" />
+    <option name="height" value="1043" />
+>>>>>>> 6a0f92fbf58b2aaee9c06fdf6f5e75c39a426217
   </component>
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+<<<<<<< HEAD
       <pane id="PackagesPane" />
       <pane id="Scope" />
+=======
+>>>>>>> 6a0f92fbf58b2aaee9c06fdf6f5e75c39a426217
       <pane id="AndroidView" />
       <pane id="ProjectPane">
         <subPane>
@@ -199,6 +302,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
             </path>
+<<<<<<< HEAD
             <path>
               <item name="ZipTeamOrange" type="b2602c69:ProjectViewProjectNode" />
               <item name="ZipTeamOrange" type="462c0819:PsiDirectoryNode" />
@@ -207,10 +311,14 @@
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="zipteam" type="462c0819:PsiDirectoryNode" />
             </path>
+=======
+>>>>>>> 6a0f92fbf58b2aaee9c06fdf6f5e75c39a426217
           </expand>
           <select />
         </subPane>
       </pane>
+      <pane id="PackagesPane" />
+      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -225,6 +333,11 @@
     <property name="project.structure.side.proportion" value="0.2" />
     <property name="settings.editor.selected.configurable" value="reference.projectsettings.compiler.javacompiler" />
   </component>
+  <component name="RecentsManager">
+    <key name="MoveClassesOrPackagesDialog.RECENTS_KEY">
+      <recent name="" />
+    </key>
+  </component>
   <component name="RunDashboard">
     <option name="ruleStates">
       <list>
@@ -295,29 +408,68 @@
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="5313000" />
+    <option name="totallyTimeSpent" value="9446000" />
   </component>
   <component name="ToolWindowManager">
+<<<<<<< HEAD
     <frame x="0" y="23" width="1280" height="717" extended-state="0" />
+=======
+    <frame x="-170" y="-1049" width="1859" height="1043" extended-state="0" />
+    <editor active="true" />
+>>>>>>> 6a0f92fbf58b2aaee9c06fdf6f5e75c39a426217
     <layout>
-      <window_info anchor="right" id="Palette" order="3" />
+      <window_info anchor="right" id="Palette" />
+      <window_info anchor="bottom" id="Event Log" side_tool="true" />
+      <window_info anchor="right" id="Maven Projects" />
+      <window_info anchor="bottom" id="Database Changes" show_stripe_button="false" />
+      <window_info id="Capture Tool" />
+      <window_info id="Designer" />
+      <window_info anchor="right" id="Database" />
+      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
+      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
+      <window_info id="UI Designer" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" />
-      <window_info anchor="right" id="Palette&#9;" order="3" />
-      <window_info id="Image Layers" order="2" />
-      <window_info anchor="right" id="Capture Analysis" order="3" />
-      <window_info anchor="bottom" id="Event Log" order="7" side_tool="true" />
-      <window_info anchor="right" id="Maven Projects" order="3" />
+      <window_info anchor="right" id="Palette&#9;" />
+      <window_info id="Image Layers" />
+      <window_info anchor="bottom" id="Java Enterprise" />
+      <window_info anchor="right" id="Capture Analysis" />
       <window_info anchor="bottom" id="Run" order="2" />
+<<<<<<< HEAD
       <window_info anchor="bottom" id="Version Control" order="7" show_stripe_button="false" />
       <window_info active="true" anchor="bottom" id="Terminal" order="7" visible="true" weight="0.27096775" />
       <window_info id="Capture Tool" order="2" />
       <window_info id="Designer" order="2" />
       <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.26171243" />
       <window_info id="Learn" order="3" />
-      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
+=======
+      <window_info anchor="bottom" id="Version Control" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Spring" />
+      <window_info anchor="bottom" id="Terminal" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.17213556" />
+      <window_info anchor="right" id="Bean Validation" />
+      <window_info id="Web" side_tool="true" />
+      <window_info anchor="right" id="Theme Preview" />
+      <window_info id="Favorites" side_tool="true" />
+      <window_info anchor="right" id="Palette" order="3" />
+      <window_info id="Designer" order="2" />
+      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
+      <window_info anchor="right" id="Capture Analysis" order="3" />
+      <window_info anchor="bottom" id="Run" order="2" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2536349" />
+>>>>>>> 6a0f92fbf58b2aaee9c06fdf6f5e75c39a426217
+      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
+      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
+      <window_info anchor="bottom" id="TODO" order="6" />
+      <window_info anchor="bottom" id="Database Changes" order="7" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Version Control" order="7" show_stripe_button="false" />
+      <window_info id="Image Layers" order="2" />
+      <window_info id="Capture Tool" order="2" />
       <window_info id="UI Designer" order="2" />
+      <window_info anchor="bottom" id="Find" order="1" />
       <window_info anchor="right" id="Theme Preview" order="3" />
+<<<<<<< HEAD
       <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
       <window_info id="Favorites" order="2" side_tool="true" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
@@ -326,8 +478,19 @@
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Database Changes" order="7" show_stripe_button="false" />
+=======
+      <window_info id="Learn" order="3" />
+      <window_info anchor="right" id="Palette&#9;" order="3" />
+      <window_info anchor="bottom" id="Terminal" order="7" />
+      <window_info anchor="bottom" id="Event Log" order="7" side_tool="true" />
+      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
+>>>>>>> 6a0f92fbf58b2aaee9c06fdf6f5e75c39a426217
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
-      <window_info anchor="bottom" id="Find" order="1" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
+      <window_info anchor="bottom" id="Message" order="0" />
+      <window_info anchor="right" id="Database" order="3" />
+      <window_info anchor="right" id="Maven Projects" order="3" />
+      <window_info id="Favorites" order="2" side_tool="true" />
     </layout>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -342,7 +505,91 @@
     </ignored-roots>
   </component>
   <component name="editorHistoryManager">
+<<<<<<< HEAD
     <entry file="file://$PROJECT_DIR$/src/main/java/com/zipteam/User.java">
+=======
+    <entry file="file://$PROJECT_DIR$/pom.xml">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/MessageController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
+          <caret column="30" selection-start-column="30" selection-end-column="30" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/ChatController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
+          <caret column="29" lean-forward="true" selection-start-column="29" selection-end-column="29" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/Main.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
+          <caret column="17" selection-start-column="17" selection-end-column="17" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/UserController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
+          <caret column="27" selection-start-column="27" selection-end-column="27" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/User.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="450">
+          <caret line="30" column="5" selection-start-line="30" selection-start-column="5" selection-end-line="30" selection-end-column="5" />
+          <folding>
+            <element signature="e#140#141#0" expanded="true" />
+            <element signature="e#169#170#0" expanded="true" />
+            <element signature="e#200#201#0" expanded="true" />
+            <element signature="e#227#228#0" expanded="true" />
+            <element signature="e#259#260#0" expanded="true" />
+            <element signature="e#287#288#0" expanded="true" />
+            <element signature="e#322#323#0" expanded="true" />
+            <element signature="e#353#354#0" expanded="true" />
+            <element signature="e#387#388#0" expanded="true" />
+            <element signature="e#417#418#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/Message.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="90">
+          <caret line="6" column="23" lean-forward="true" selection-start-line="6" selection-start-column="23" selection-end-line="6" selection-end-column="23" />
+          <folding>
+            <element signature="e#134#135#0" expanded="true" />
+            <element signature="e#166#167#0" expanded="true" />
+            <element signature="e#197#198#0" expanded="true" />
+            <element signature="e#224#225#0" expanded="true" />
+            <element signature="e#258#259#0" expanded="true" />
+            <element signature="e#290#291#0" expanded="true" />
+            <element signature="e#580#581#0" expanded="true" />
+            <element signature="e#609#610#0" expanded="true" />
+            <element signature="e#639#640#0" expanded="true" />
+            <element signature="e#668#669#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/Chat.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="180">
+          <caret line="12" column="19" lean-forward="true" selection-start-line="12" selection-start-column="19" selection-end-line="12" selection-end-column="19" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="e#255#261#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/User.java">
+>>>>>>> 6a0f92fbf58b2aaee9c06fdf6f5e75c39a426217
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="225">
           <caret line="18" column="19" selection-start-line="18" selection-start-column="19" selection-end-line="18" selection-end-column="19" />
@@ -361,17 +608,23 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/zipteam/UserController.java">
       <provider selected="true" editor-type-id="text-editor">
+<<<<<<< HEAD
         <state relative-caret-position="210">
           <caret line="20" selection-start-line="20" selection-end-line="20" />
           <folding>
             <element signature="e#226#227#0" expanded="true" />
             <element signature="e#261#262#0" expanded="true" />
           </folding>
+=======
+        <state>
+          <caret column="27" selection-start-column="27" selection-end-column="27" />
+>>>>>>> 6a0f92fbf58b2aaee9c06fdf6f5e75c39a426217
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/zipteam/MessageController.java">
       <provider selected="true" editor-type-id="text-editor">
+<<<<<<< HEAD
         <state relative-caret-position="30">
           <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
         </state>
@@ -384,16 +637,25 @@
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
+=======
+        <state>
+          <caret column="30" selection-start-column="30" selection-end-column="30" />
+>>>>>>> 6a0f92fbf58b2aaee9c06fdf6f5e75c39a426217
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/zipteam/ChatRepository.java">
       <provider selected="true" editor-type-id="text-editor">
+<<<<<<< HEAD
         <state relative-caret-position="60">
           <caret line="6" column="10" selection-start-line="6" selection-start-column="10" selection-end-line="6" selection-end-column="10" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
+=======
+        <state>
+          <caret column="29" lean-forward="true" selection-start-column="29" selection-end-column="29" />
+>>>>>>> 6a0f92fbf58b2aaee9c06fdf6f5e75c39a426217
         </state>
       </provider>
     </entry>
@@ -431,10 +693,15 @@
           <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
           <folding>
             <element signature="imports" expanded="true" />
+<<<<<<< HEAD
+=======
+            <element signature="e#255#261#0" expanded="true" />
+>>>>>>> 6a0f92fbf58b2aaee9c06fdf6f5e75c39a426217
           </folding>
         </state>
       </provider>
     </entry>
+<<<<<<< HEAD
     <entry file="file://$PROJECT_DIR$/src/main/java/com/zipteam/Chat.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="75">
@@ -473,12 +740,82 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="90">
           <caret line="6" column="10" selection-start-line="6" selection-start-column="10" selection-end-line="6" selection-end-column="10" />
+=======
+    <entry file="file://$PROJECT_DIR$/pom.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="120">
+          <caret line="8" column="35" lean-forward="true" selection-start-line="8" selection-start-column="35" selection-end-line="8" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="uml://JAVA/User">
+      <provider selected="true" editor-type-id="UmlEditorProvider">
+        <state>
+          <ID>JAVA</ID>
+          <OriginalElement>User</OriginalElement>
+          <nodes>
+            <node x="" y="">User</node>
+          </nodes>
+          <notes />
+          <edges />
+          <settings layout="Hierarchic Group" zoom="1.0" x="38.5" y="14.5" />
+          <SelectedNodes />
+          <Categories />
+          <SCOPE>All</SCOPE>
+          <VISIBILITY>private</VISIBILITY>
+        </state>
+      </provider>
+    </entry>
+    <entry file="uml://JAVA/UserController">
+      <provider selected="true" editor-type-id="UmlEditorProvider">
+        <state>
+          <ID>JAVA</ID>
+          <OriginalElement>UserController</OriginalElement>
+          <nodes>
+            <node x="" y="">UserController</node>
+            <node x="" y="">Controller</node>
+          </nodes>
+          <notes />
+          <edges />
+          <settings layout="Hierarchic Group" zoom="1.0" x="69.0" y="54.0" />
+          <SelectedNodes />
+          <Categories />
+          <SCOPE>All</SCOPE>
+          <VISIBILITY>private</VISIBILITY>
+        </state>
+      </provider>
+    </entry>
+    <entry file="uml://JAVA/ChatController">
+      <provider selected="true" editor-type-id="UmlEditorProvider">
+        <state>
+          <ID>JAVA</ID>
+          <OriginalElement>ChatController</OriginalElement>
+          <nodes>
+            <node x="" y="">ChatController</node>
+            <node x="" y="">Controller</node>
+          </nodes>
+          <notes />
+          <edges />
+          <settings layout="Hierarchic Group" zoom="1.0" x="69.0" y="54.0" />
+          <SelectedNodes />
+          <Categories />
+          <SCOPE>All</SCOPE>
+          <VISIBILITY>private</VISIBILITY>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/MessageRepository.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="105">
+          <caret line="7" lean-forward="true" selection-start-line="7" selection-end-line="7" />
+>>>>>>> 6a0f92fbf58b2aaee9c06fdf6f5e75c39a426217
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
+<<<<<<< HEAD
     <entry file="file://$PROJECT_DIR$/src/main/java/com/zipteam/Main.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="30">
@@ -507,10 +844,29 @@
           <folding>
             <element signature="e#226#227#0" expanded="true" />
             <element signature="e#261#262#0" expanded="true" />
+=======
+    <entry file="file://$PROJECT_DIR$/src/main/java/UserRepository.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="15">
+          <caret line="1" lean-forward="true" selection-start-line="1" selection-end-line="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/ChatRepository1.java">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/ChatRepository.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="120">
+          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+          <folding>
+            <element signature="imports" expanded="true" />
+>>>>>>> 6a0f92fbf58b2aaee9c06fdf6f5e75c39a426217
           </folding>
         </state>
       </provider>
     </entry>
+<<<<<<< HEAD
     <entry file="file://$PROJECT_DIR$/src/main/java/com/zipteam/User.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="450">
@@ -533,12 +889,26 @@
             <element signature="e#226#227#0" expanded="true" />
             <element signature="e#261#262#0" expanded="true" />
           </folding>
+=======
+    <entry file="file://$PROJECT_DIR$/src/main/java/UserController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
+          <caret column="13" selection-start-column="13" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/User.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
+          <caret column="13" selection-start-column="13" selection-end-column="13" />
+>>>>>>> 6a0f92fbf58b2aaee9c06fdf6f5e75c39a426217
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/zipteam/MessageController.java">
       <provider selected="true" editor-type-id="text-editor">
         <state>
+<<<<<<< HEAD
           <caret column="30" selection-start-column="30" selection-end-column="30" />
         </state>
       </provider>
@@ -643,11 +1013,36 @@
             <element signature="e#226#227#0" expanded="true" />
             <element signature="e#261#262#0" expanded="true" />
           </folding>
+=======
+          <caret column="13" selection-start-column="13" selection-end-column="13" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
+    <entry file="file://$PROJECT_DIR$/src/main/java/Message.java">
       <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="30">
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/Main.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
+          <caret column="13" selection-start-column="13" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/Controller.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="30">
+          <caret line="2" column="22" selection-start-line="2" selection-start-column="22" selection-end-line="2" selection-end-column="22" />
+>>>>>>> 6a0f92fbf58b2aaee9c06fdf6f5e75c39a426217
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/ChatController.java">
+      <provider selected="true" editor-type-id="text-editor">
+<<<<<<< HEAD
         <state relative-caret-position="720">
           <caret line="48" selection-start-line="48" selection-end-line="48" />
         </state>
@@ -667,6 +1062,97 @@
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
+=======
+        <state>
+          <caret column="13" selection-start-column="13" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/Chat.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="135">
+          <caret line="9" column="23" selection-start-line="9" selection-start-column="23" selection-end-line="9" selection-end-column="23" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="e#255#261#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="uml://JAVA/Chat">
+      <provider selected="true" editor-type-id="UmlEditorProvider">
+        <state>
+          <ID>JAVA</ID>
+          <OriginalElement>Chat</OriginalElement>
+          <nodes>
+            <node x="-167.0" y="-196.0">Chat</node>
+          </nodes>
+          <notes />
+          <edges />
+          <settings layout="Hierarchic Group" zoom="1.0" x="-201.5" y="-37.0" />
+          <SelectedNodes>
+            <node>Chat</node>
+          </SelectedNodes>
+          <Categories>
+            <Category>Fields</Category>
+            <Category>Constructors</Category>
+            <Category>Methods</Category>
+          </Categories>
+          <SCOPE>Project Files</SCOPE>
+          <VISIBILITY>private</VISIBILITY>
+        </state>
+      </provider>
+    </entry>
+    <entry file="uml://JAVA/">
+      <provider selected="true" editor-type-id="UmlEditorProvider">
+        <state>
+          <ID>JAVA</ID>
+          <OriginalElement />
+          <nodes>
+            <node x="335.0" y="308.0">User</node>
+            <node x="687.0" y="308.0">Message</node>
+            <node x="0.0" y="603.0">MessageRespository</node>
+            <node x="0.0" y="699.0">UserRespository</node>
+            <node x="0.0" y="308.0">Chat</node>
+            <node x="0.0" y="101.0">UserController</node>
+            <node x="410.0" y="101.0">MessageController</node>
+            <node x="0.0" y="795.0">ChatRespository</node>
+            <node x="235.0" y="0.0">Controller</node>
+            <node x="205.0" y="101.0">ChatController</node>
+            <node x="541.0" y="795.0">Main</node>
+          </nodes>
+          <notes />
+          <edges>
+            <edge source="UserController" target="Controller">
+              <point x="0.0" y="-81.0" />
+              <point x="92.5" y="76.0" />
+              <point x="255.83333333333334" y="76.0" />
+              <point x="-41.66666666666666" y="25.5" />
+            </edge>
+            <edge source="MessageController" target="Controller">
+              <point x="0.0" y="-81.0" />
+              <point x="502.5" y="76.0" />
+              <point x="339.16666666666663" y="76.0" />
+              <point x="41.66666666666663" y="25.5" />
+            </edge>
+            <edge source="ChatController" target="Controller">
+              <point x="0.0" y="-81.0" />
+              <point x="0.0" y="25.5" />
+            </edge>
+          </edges>
+          <settings layout="Hierarchic Group" zoom="1.0" x="423.5" y="433.5" />
+          <SelectedNodes>
+            <node>MessageRespository</node>
+          </SelectedNodes>
+          <Categories>
+            <Category>Fields</Category>
+            <Category>Constructors</Category>
+            <Category>Methods</Category>
+            <Category>Properties</Category>
+          </Categories>
+          <SCOPE>Project Files</SCOPE>
+          <VISIBILITY>private</VISIBILITY>
+>>>>>>> 6a0f92fbf58b2aaee9c06fdf6f5e75c39a426217
         </state>
       </provider>
     </entry>

ZipTeamOrange/Middleteir.uml

@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Diagram>
+  <ID>JAVA</ID>
+  <OriginalElement />
+  <nodes>
+    <node x="335.0" y="308.0">User</node>
+    <node x="687.0" y="308.0">Message</node>
+    <node x="0.0" y="603.0">MessageRespository</node>
+    <node x="0.0" y="699.0">UserRespository</node>
+    <node x="0.0" y="308.0">Chat</node>
+    <node x="410.0" y="101.0">UserController</node>
+    <node x="205.0" y="101.0">MessageController</node>
+    <node x="0.0" y="795.0">ChatRespository</node>
+    <node x="235.0" y="0.0">Controller</node>
+    <node x="0.0" y="101.0">ChatController</node>
+    <node x="541.0" y="795.0">Main</node>
+  </nodes>
+  <notes />
+  <edges>
+    <edge source="UserController" target="Controller">
+      <point x="0.0" y="-81.0" />
+      <point x="502.5" y="76.0" />
+      <point x="339.16666666666663" y="76.0" />
+      <point x="41.66666666666663" y="25.5" />
+    </edge>
+    <edge source="MessageController" target="Controller">
+      <point x="0.0" y="-81.0" />
+      <point x="0.0" y="25.5" />
+    </edge>
+    <edge source="ChatController" target="Controller">
+      <point x="0.0" y="-81.0" />
+      <point x="92.5" y="76.0" />
+      <point x="255.83333333333334" y="76.0" />
+      <point x="-41.66666666666666" y="25.5" />
+    </edge>
+  </edges>
+  <settings layout="Hierarchic Group" zoom="1.0" x="454.0" y="423.0" />
+  <SelectedNodes>
+    <node>MessageRespository</node>
+  </SelectedNodes>
+  <Categories>
+    <Category>Fields</Category>
+    <Category>Constructors</Category>
+    <Category>Methods</Category>
+    <Category>Properties</Category>
+  </Categories>
+  <SCOPE>Project Files</SCOPE>
+  <VISIBILITY>private</VISIBILITY>
+</Diagram>
+

ZipTeamOrange/src/main/java/com/zipteam/Chat.java

@@ -1,5 +1,8 @@
+<<<<<<< HEAD:ZipTeamOrange/src/main/java/com/zipteam/Chat.java
 package com.zipteam;
 
+=======
+>>>>>>> 6a0f92fbf58b2aaee9c06fdf6f5e75c39a426217:ZipTeamOrange/src/main/java/Chat.java
 import java.util.HashMap;
 import java.util.HashSet;
 

ZipTeamOrange/src/main/java/com/zipteam/ChatController.java

@@ -1,6 +1,10 @@
+<<<<<<< HEAD:ZipTeamOrange/src/main/java/com/zipteam/ChatController.java
 package com.zipteam;
 
 public class ChatController extends Controller{
+=======
+public class ChatController extends Controller {
+>>>>>>> 6a0f92fbf58b2aaee9c06fdf6f5e75c39a426217:ZipTeamOrange/src/main/java/ChatController.java
 
     private Chat chat;
     private String uri;

ZipTeamOrange/src/main/java/com/zipteam/MessageController.java

@@ -1,6 +1,10 @@
+<<<<<<< HEAD:ZipTeamOrange/src/main/java/com/zipteam/MessageController.java
 package com.zipteam;
 
 public class MessageController extends Controller{
+=======
+public class MessageController extends Controller {
+>>>>>>> 6a0f92fbf58b2aaee9c06fdf6f5e75c39a426217:ZipTeamOrange/src/main/java/MessageController.java
 
     private Message message;
     private String uri;

ZipTeamOrange/src/main/java/com/zipteam/MessageRepository.java

@@ -1,7 +1,6 @@
 package com.zipteam;
 
 import org.springframework.data.jpa.repository.JpaRepository;
-
 import java.util.List;
 
 interface MessageRespository extends JpaRepository<User, Integer> {