Eric Foster 6 anni fa
parent
commit
a50d539805

+ 41
- 164
.idea/workspace.xml Vedi File

@@ -3,17 +3,8 @@
3 3
   <component name="ChangeListManager">
4 4
     <list default="true" id="ad381d05-32c5-4ad5-8041-a0cb51a71fd9" name="Default" comment="">
5 5
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
6
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/alidade/controller/UserController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/alidade/controller/UserController.java" afterDir="false" />
7
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/alidade/model/Destination.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/alidade/model/Destination.java" afterDir="false" />
8
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/alidade/model/Login.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/alidade/model/Login.java" afterDir="false" />
9
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/alidade/model/Profile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/alidade/model/Profile.java" afterDir="false" />
10
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/alidade/model/User.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/alidade/model/User.java" afterDir="false" />
11
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/alidade/repository/LoginRepository.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/alidade/repository/LoginRepository.java" afterDir="false" />
12
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/alidade/repository/UserRepository.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/alidade/repository/UserRepository.java" afterDir="false" />
13
-      <change beforePath="$PROJECT_DIR$/target/test-classes/DestinationControllerTest.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/test-classes/DestinationControllerTest.class" afterDir="false" />
14
-      <change beforePath="$PROJECT_DIR$/target/test-classes/LoginControllerTest.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/test-classes/LoginControllerTest.class" afterDir="false" />
15
-      <change beforePath="$PROJECT_DIR$/target/test-classes/ProfileControllerTest.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/test-classes/ProfileControllerTest.class" afterDir="false" />
16
-      <change beforePath="$PROJECT_DIR$/target/test-classes/UserControllerTest.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/test-classes/UserControllerTest.class" afterDir="false" />
6
+      <change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
7
+      <change beforePath="$PROJECT_DIR$/target/classes/com/alidade/SharedTravelApp.class" beforeDir="false" />
17 8
     </list>
18 9
     <ignored path="$PROJECT_DIR$/out/" />
19 10
     <ignored path="$PROJECT_DIR$/target/" />
@@ -26,86 +17,11 @@
26 17
   </component>
27 18
   <component name="FileEditorManager">
28 19
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
29
-      <file leaf-file-name="Login.java" pinned="false" current-in-tab="false">
30
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/model/Login.java">
31
-          <provider selected="true" editor-type-id="text-editor">
32
-            <state relative-caret-position="285">
33
-              <caret line="19" column="13" selection-start-line="19" selection-start-column="13" selection-end-line="19" selection-end-column="13" />
34
-            </state>
35
-          </provider>
36
-        </entry>
37
-      </file>
38
-      <file leaf-file-name="UserController.java" pinned="false" current-in-tab="false">
39
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/controller/UserController.java">
40
-          <provider selected="true" editor-type-id="text-editor">
41
-            <state relative-caret-position="345">
42
-              <caret line="23" column="10" selection-start-line="23" selection-start-column="10" selection-end-line="23" selection-end-column="10" />
43
-              <folding>
44
-                <element signature="imports" expanded="true" />
45
-              </folding>
46
-            </state>
47
-          </provider>
48
-        </entry>
49
-      </file>
50
-      <file leaf-file-name="Profile.java" pinned="false" current-in-tab="false">
51
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/model/Profile.java">
52
-          <provider selected="true" editor-type-id="text-editor">
53
-            <state relative-caret-position="495">
54
-              <caret line="35" column="13" selection-start-line="35" selection-start-column="13" selection-end-line="35" selection-end-column="13" />
55
-              <folding>
56
-                <element signature="imports" expanded="true" />
57
-              </folding>
58
-            </state>
59
-          </provider>
60
-        </entry>
61
-      </file>
62
-      <file leaf-file-name="ProfileRepository.java" pinned="false" current-in-tab="false">
63
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/repository/ProfileRepository.java">
64
-          <provider selected="true" editor-type-id="text-editor">
65
-            <state relative-caret-position="75">
66
-              <caret line="7" column="17" selection-start-line="7" selection-start-column="17" selection-end-line="7" selection-end-column="17" />
67
-            </state>
68
-          </provider>
69
-        </entry>
70
-      </file>
71
-      <file leaf-file-name="DestinationRepository.java" pinned="false" current-in-tab="false">
72
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/repository/DestinationRepository.java">
73
-          <provider selected="true" editor-type-id="text-editor">
74
-            <state relative-caret-position="75">
75
-              <caret line="7" column="17" selection-start-line="7" selection-start-column="17" selection-end-line="7" selection-end-column="17" />
76
-            </state>
77
-          </provider>
78
-        </entry>
79
-      </file>
80
-      <file leaf-file-name="UserRepository.java" pinned="false" current-in-tab="false">
81
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/repository/UserRepository.java">
82
-          <provider selected="true" editor-type-id="text-editor">
83
-            <state relative-caret-position="90">
84
-              <caret line="6" column="11" selection-start-line="6" selection-start-column="11" selection-end-line="6" selection-end-column="11" />
85
-              <folding>
86
-                <element signature="imports" expanded="true" />
87
-              </folding>
88
-            </state>
89
-          </provider>
90
-        </entry>
91
-      </file>
92
-      <file leaf-file-name="User.java" pinned="false" current-in-tab="false">
93
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/model/User.java">
94
-          <provider selected="true" editor-type-id="text-editor">
95
-            <state relative-caret-position="330">
96
-              <caret line="22" lean-forward="true" selection-start-line="22" selection-end-line="22" />
97
-              <folding>
98
-                <marker date="1533129044369" expanded="true" signature="346:636" ph="..." />
99
-              </folding>
100
-            </state>
101
-          </provider>
102
-        </entry>
103
-      </file>
104 20
       <file leaf-file-name="DestinationController.java" pinned="false" current-in-tab="false">
105 21
         <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/controller/DestinationController.java">
106 22
           <provider selected="true" editor-type-id="text-editor">
107
-            <state relative-caret-position="300">
108
-              <caret line="20" column="68" selection-start-line="20" selection-start-column="68" selection-end-line="20" selection-end-column="68" />
23
+            <state relative-caret-position="180">
24
+              <caret line="18" column="4" selection-start-line="18" selection-start-column="4" selection-end-line="18" selection-end-column="4" />
109 25
               <folding>
110 26
                 <element signature="imports" expanded="true" />
111 27
               </folding>
@@ -113,22 +29,19 @@
113 29
           </provider>
114 30
         </entry>
115 31
       </file>
116
-      <file leaf-file-name="HomeController.java" pinned="false" current-in-tab="false">
117
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/controller/HomeController.java">
32
+      <file leaf-file-name="pom.xml" pinned="false" current-in-tab="true">
33
+        <entry file="file://$PROJECT_DIR$/pom.xml">
118 34
           <provider selected="true" editor-type-id="text-editor">
119
-            <state relative-caret-position="150">
120
-              <caret line="10" column="45" selection-start-line="10" selection-start-column="45" selection-end-line="10" selection-end-column="45" />
121
-              <folding>
122
-                <element signature="imports" expanded="true" />
123
-              </folding>
35
+            <state relative-caret-position="504">
36
+              <caret line="44" column="20" selection-start-line="44" selection-start-column="20" selection-end-line="44" selection-end-column="20" />
124 37
             </state>
125 38
           </provider>
126 39
         </entry>
127 40
       </file>
128
-      <file leaf-file-name="Destination.java" pinned="false" current-in-tab="true">
41
+      <file leaf-file-name="Destination.java" pinned="false" current-in-tab="false">
129 42
         <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/model/Destination.java">
130 43
           <provider selected="true" editor-type-id="text-editor">
131
-            <state relative-caret-position="122">
44
+            <state relative-caret-position="585">
132 45
               <caret line="43" column="46" selection-start-line="43" selection-start-column="46" selection-end-line="43" selection-end-column="46" />
133 46
               <folding>
134 47
                 <element signature="imports" expanded="true" />
@@ -201,7 +114,6 @@
201 114
         <option value="$PROJECT_DIR$/src/test/java/LoginControllerTest.java" />
202 115
         <option value="$PROJECT_DIR$/src/test/java/ProfileControllerTest.java" />
203 116
         <option value="$PROJECT_DIR$/src/test/java/UserControllerTest.java" />
204
-        <option value="$PROJECT_DIR$/pom.xml" />
205 117
         <option value="$PROJECT_DIR$/src/main/java/com/alidade/repository/LoginRepository.java" />
206 118
         <option value="$PROJECT_DIR$/src/main/java/com/alidade/repository/UserRepository.java" />
207 119
         <option value="$PROJECT_DIR$/src/main/java/com/alidade/controller/UserController.java" />
@@ -209,6 +121,7 @@
209 121
         <option value="$PROJECT_DIR$/src/main/java/com/alidade/model/Profile.java" />
210 122
         <option value="$PROJECT_DIR$/src/main/java/com/alidade/model/User.java" />
211 123
         <option value="$PROJECT_DIR$/src/main/java/com/alidade/model/Destination.java" />
124
+        <option value="$PROJECT_DIR$/pom.xml" />
212 125
       </list>
213 126
     </option>
214 127
   </component>
@@ -228,11 +141,10 @@
228 141
   <component name="NodePackageJsonFileManager">
229 142
     <packageJsonPaths />
230 143
   </component>
231
-  <component name="ProjectFrameBounds" fullScreen="true">
232
-    <option name="x" value="-320" />
233
-    <option name="y" value="-983" />
144
+  <component name="ProjectFrameBounds" extendedState="6">
145
+    <option name="y" value="23" />
234 146
     <option name="width" value="1280" />
235
-    <option name="height" value="713" />
147
+    <option name="height" value="720" />
236 148
   </component>
237 149
   <component name="ProjectLevelVcsManager">
238 150
     <ConfirmationsSetting value="2" id="Add" />
@@ -242,6 +154,8 @@
242 154
       <foldersAlwaysOnTop value="true" />
243 155
     </navigator>
244 156
     <panes>
157
+      <pane id="PackagesPane" />
158
+      <pane id="Scope" />
245 159
       <pane id="AndroidView" />
246 160
       <pane id="ProjectPane">
247 161
         <subPane>
@@ -299,15 +213,6 @@
299 213
               <item name="Shared-Travel-Map" type="462c0819:PsiDirectoryNode" />
300 214
               <item name="src" type="462c0819:PsiDirectoryNode" />
301 215
               <item name="main" type="462c0819:PsiDirectoryNode" />
302
-              <item name="java" type="462c0819:PsiDirectoryNode" />
303
-              <item name="alidade" type="462c0819:PsiDirectoryNode" />
304
-              <item name="repository" type="462c0819:PsiDirectoryNode" />
305
-            </path>
306
-            <path>
307
-              <item name="SharedTravelMap" type="b2602c69:ProjectViewProjectNode" />
308
-              <item name="Shared-Travel-Map" type="462c0819:PsiDirectoryNode" />
309
-              <item name="src" type="462c0819:PsiDirectoryNode" />
310
-              <item name="main" type="462c0819:PsiDirectoryNode" />
311 216
               <item name="resources" type="462c0819:PsiDirectoryNode" />
312 217
             </path>
313 218
             <path>
@@ -327,8 +232,6 @@
327 232
           <select />
328 233
         </subPane>
329 234
       </pane>
330
-      <pane id="Scope" />
331
-      <pane id="PackagesPane" />
332 235
     </panes>
333 236
   </component>
334 237
   <component name="PropertiesComponent">
@@ -518,6 +421,8 @@
518 421
       <workItem from="1532635085154" duration="2289000" />
519 422
       <workItem from="1532786194419" duration="318000" />
520 423
       <workItem from="1532903810519" duration="7096000" />
424
+      <workItem from="1533243150908" duration="1107000" />
425
+      <workItem from="1533244431891" duration="596000" />
521 426
     </task>
522 427
     <servers />
523 428
   </component>
@@ -548,7 +453,7 @@
548 453
     </history-entry>
549 454
   </component>
550 455
   <component name="TimeTrackingManager">
551
-    <option name="totallyTimeSpent" value="86416000" />
456
+    <option name="totallyTimeSpent" value="88468000" />
552 457
   </component>
553 458
   <component name="TodoView">
554 459
     <todo-panel id="selected-file">
@@ -560,8 +465,7 @@
560 465
     </todo-panel>
561 466
   </component>
562 467
   <component name="ToolWindowManager">
563
-    <frame x="-320" y="-1080" width="1920" height="1080" extended-state="0" />
564
-    <editor active="true" />
468
+    <frame x="0" y="23" width="1280" height="713" extended-state="6" />
565 469
     <layout>
566 470
       <window_info anchor="right" id="Palette" order="3" />
567 471
       <window_info anchor="bottom" id="Event Log" order="7" side_tool="true" />
@@ -575,16 +479,15 @@
575 479
       <window_info id="UI Designer" order="2" />
576 480
       <window_info anchor="bottom" id="Debug" order="3" weight="0.3409091" />
577 481
       <window_info anchor="bottom" id="TODO" order="6" weight="0.32954547" />
578
-      <window_info anchor="bottom" id="Messages" order="8" weight="0.3283582" />
579 482
       <window_info anchor="right" id="Palette&#9;" order="3" />
580 483
       <window_info id="Image Layers" order="2" />
581 484
       <window_info anchor="bottom" id="Java Enterprise" order="8" />
582 485
       <window_info anchor="right" id="Capture Analysis" order="3" />
583
-      <window_info anchor="bottom" id="Version Control" order="7" weight="0.32954547" />
584 486
       <window_info anchor="bottom" id="Run" order="2" weight="0.30945274" />
487
+      <window_info anchor="bottom" id="Version Control" order="7" weight="0.32954547" />
585 488
       <window_info anchor="bottom" id="Spring" order="8" weight="0.32935324" />
586 489
       <window_info anchor="bottom" id="Terminal" order="7" weight="0.36307693" />
587
-      <window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.4985591" visible="true" weight="0.17252396" />
490
+      <window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.4985591" visible="true" weight="0.17770597" />
588 491
       <window_info anchor="right" id="Bean Validation" order="4" />
589 492
       <window_info id="Web" order="3" side_tool="true" />
590 493
       <window_info anchor="right" id="Theme Preview" order="3" />
@@ -592,6 +495,7 @@
592 495
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
593 496
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
594 497
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
498
+      <window_info anchor="bottom" id="Messages" order="8" weight="0.3283582" />
595 499
       <window_info anchor="bottom" id="Message" order="0" />
596 500
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
597 501
       <window_info anchor="bottom" id="Find" order="1" weight="0.32935324" />
@@ -710,9 +614,6 @@
710 614
       <provider selected="true" editor-type-id="text-editor">
711 615
         <state relative-caret-position="210">
712 616
           <caret line="26" selection-start-line="26" selection-end-line="26" />
713
-          <folding>
714
-            <element signature="imports" expanded="true" />
715
-          </folding>
716 617
         </state>
717 618
       </provider>
718 619
     </entry>
@@ -740,20 +641,10 @@
740 641
         </state>
741 642
       </provider>
742 643
     </entry>
743
-    <entry file="file://$PROJECT_DIR$/pom.xml">
744
-      <provider selected="true" editor-type-id="text-editor">
745
-        <state relative-caret-position="300">
746
-          <caret line="20" selection-start-line="20" selection-end-line="20" />
747
-        </state>
748
-      </provider>
749
-    </entry>
750 644
     <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/repository/LoginRepository.java">
751 645
       <provider selected="true" editor-type-id="text-editor">
752 646
         <state relative-caret-position="105">
753 647
           <caret line="7" column="17" selection-start-line="7" selection-start-column="17" selection-end-line="7" selection-end-column="17" />
754
-          <folding>
755
-            <element signature="imports" expanded="true" />
756
-          </folding>
757 648
         </state>
758 649
       </provider>
759 650
     </entry>
@@ -761,9 +652,6 @@
761 652
       <provider selected="true" editor-type-id="text-editor">
762 653
         <state relative-caret-position="279">
763 654
           <caret line="23" selection-start-line="23" selection-end-line="23" />
764
-          <folding>
765
-            <element signature="imports" expanded="true" />
766
-          </folding>
767 655
         </state>
768 656
       </provider>
769 657
     </entry>
@@ -771,9 +659,6 @@
771 659
       <provider selected="true" editor-type-id="text-editor">
772 660
         <state relative-caret-position="225">
773 661
           <caret line="15" column="35" selection-start-line="15" selection-start-column="35" selection-end-line="15" selection-end-column="35" />
774
-          <folding>
775
-            <element signature="imports" expanded="true" />
776
-          </folding>
777 662
         </state>
778 663
       </provider>
779 664
     </entry>
@@ -781,9 +666,6 @@
781 666
       <provider selected="true" editor-type-id="text-editor">
782 667
         <state relative-caret-position="345">
783 668
           <caret line="23" column="10" selection-start-line="23" selection-start-column="10" selection-end-line="23" selection-end-column="10" />
784
-          <folding>
785
-            <element signature="imports" expanded="true" />
786
-          </folding>
787 669
         </state>
788 670
       </provider>
789 671
     </entry>
@@ -791,19 +673,6 @@
791 673
       <provider selected="true" editor-type-id="text-editor">
792 674
         <state relative-caret-position="150">
793 675
           <caret line="10" column="45" selection-start-line="10" selection-start-column="45" selection-end-line="10" selection-end-column="45" />
794
-          <folding>
795
-            <element signature="imports" expanded="true" />
796
-          </folding>
797
-        </state>
798
-      </provider>
799
-    </entry>
800
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/controller/DestinationController.java">
801
-      <provider selected="true" editor-type-id="text-editor">
802
-        <state relative-caret-position="300">
803
-          <caret line="20" column="68" selection-start-line="20" selection-start-column="68" selection-end-line="20" selection-end-column="68" />
804
-          <folding>
805
-            <element signature="imports" expanded="true" />
806
-          </folding>
807 676
         </state>
808 677
       </provider>
809 678
     </entry>
@@ -811,9 +680,6 @@
811 680
       <provider selected="true" editor-type-id="text-editor">
812 681
         <state relative-caret-position="90">
813 682
           <caret line="6" column="11" selection-start-line="6" selection-start-column="11" selection-end-line="6" selection-end-column="11" />
814
-          <folding>
815
-            <element signature="imports" expanded="true" />
816
-          </folding>
817 683
         </state>
818 684
       </provider>
819 685
     </entry>
@@ -842,9 +708,6 @@
842 708
       <provider selected="true" editor-type-id="text-editor">
843 709
         <state relative-caret-position="495">
844 710
           <caret line="35" column="13" selection-start-line="35" selection-start-column="13" selection-end-line="35" selection-end-column="13" />
845
-          <folding>
846
-            <element signature="imports" expanded="true" />
847
-          </folding>
848 711
         </state>
849 712
       </provider>
850 713
     </entry>
@@ -852,15 +715,12 @@
852 715
       <provider selected="true" editor-type-id="text-editor">
853 716
         <state relative-caret-position="330">
854 717
           <caret line="22" lean-forward="true" selection-start-line="22" selection-end-line="22" />
855
-          <folding>
856
-            <marker date="1533129044369" expanded="true" signature="346:636" ph="..." />
857
-          </folding>
858 718
         </state>
859 719
       </provider>
860 720
     </entry>
861 721
     <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/model/Destination.java">
862 722
       <provider selected="true" editor-type-id="text-editor">
863
-        <state relative-caret-position="122">
723
+        <state relative-caret-position="585">
864 724
           <caret line="43" column="46" selection-start-line="43" selection-start-column="46" selection-end-line="43" selection-end-column="46" />
865 725
           <folding>
866 726
             <element signature="imports" expanded="true" />
@@ -868,6 +728,23 @@
868 728
         </state>
869 729
       </provider>
870 730
     </entry>
731
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/controller/DestinationController.java">
732
+      <provider selected="true" editor-type-id="text-editor">
733
+        <state relative-caret-position="180">
734
+          <caret line="18" column="4" selection-start-line="18" selection-start-column="4" selection-end-line="18" selection-end-column="4" />
735
+          <folding>
736
+            <element signature="imports" expanded="true" />
737
+          </folding>
738
+        </state>
739
+      </provider>
740
+    </entry>
741
+    <entry file="file://$PROJECT_DIR$/pom.xml">
742
+      <provider selected="true" editor-type-id="text-editor">
743
+        <state relative-caret-position="504">
744
+          <caret line="44" column="20" selection-start-line="44" selection-start-column="20" selection-end-line="44" selection-end-column="20" />
745
+        </state>
746
+      </provider>
747
+    </entry>
871 748
   </component>
872 749
   <component name="masterDetails">
873 750
     <states>

+ 6
- 0
pom.xml Vedi File

@@ -42,6 +42,12 @@
42 42
             <artifactId>mysql-connector-java</artifactId>
43 43
             <version>5.1.6</version>
44 44
         </dependency>
45
+        <dependency>
46
+            <groupId>org.projectlombok</groupId>
47
+            <artifactId>lombok</artifactId>
48
+            <version>1.16.18</version>
49
+            <scope>provided</scope>
50
+        </dependency>
45 51
     </dependencies>
46 52
 
47 53
     <build>

+ 3
- 79
src/main/java/com/alidade/model/Destination.java Vedi File

@@ -1,5 +1,7 @@
1 1
 package com.alidade.model;
2 2
 
3
+import lombok.Getter;
4
+import lombok.Setter;
3 5
 import org.hibernate.annotations.OnDelete;
4 6
 import org.hibernate.annotations.OnDeleteAction;
5 7
 
@@ -8,6 +10,7 @@ import java.util.Date;
8 10
 
9 11
 @Entity
10 12
 @Table(name = "DESTINATION")
13
+@Getter @Setter
11 14
 public class Destination {
12 15
 
13 16
     @Id
@@ -44,83 +47,4 @@ public class Destination {
44 47
     @OnDelete(action = OnDeleteAction.CASCADE)
45 48
     private Profile profile;
46 49
 
47
-    public void setId(Long id) {
48
-        this.id = id;
49
-    }
50
-
51
-    public Long getId() {
52
-        return this.id;
53
-    }
54
-
55
-    public String getDestinationState() {
56
-        return destinationState;
57
-    }
58
-
59
-    public void setDestinationState(String destinationState) {
60
-        this.destinationState = destinationState;
61
-    }
62
-
63
-    public String getCity() {
64
-        return city;
65
-    }
66
-
67
-    public void setCity(String city) {
68
-        this.city = city;
69
-    }
70
-
71
-    public String getCountry() {
72
-        return country;
73
-    }
74
-
75
-    public void setCountry(String country) {
76
-        this.country = country;
77
-    }
78
-
79
-    public Date getStartDate() {
80
-        return startDate;
81
-    }
82
-
83
-    public void setStartDate(Date startDate) {
84
-        this.startDate = startDate;
85
-    }
86
-
87
-    public Date getEndDate() {
88
-        return endDate;
89
-    }
90
-
91
-    public void setEndDate(Date endDate) {
92
-        this.endDate = endDate;
93
-    }
94
-
95
-    public String getTravelType() {
96
-        return travelType;
97
-    }
98
-
99
-    public void setTravelType(String travelType) {
100
-        this.travelType = travelType;
101
-    }
102
-
103
-    public String getFavoriteThing() {
104
-        return favoriteThing;
105
-    }
106
-
107
-    public void setFavoriteThing(String favoriteThing) {
108
-        this.favoriteThing = favoriteThing;
109
-    }
110
-
111
-    public String getNotes() {
112
-        return notes;
113
-    }
114
-
115
-    public void setNotes(String notes) {
116
-        this.notes = notes;
117
-    }
118
-
119
-    public Long getProfileId() {
120
-        return profile.getId();
121
-    }
122
-
123
-    public void setProfile(Profile profile) {
124
-        this.profile = profile;
125
-    }
126 50
 }

+ 4
- 31
src/main/java/com/alidade/model/Login.java Vedi File

@@ -1,9 +1,13 @@
1 1
 package com.alidade.model;
2 2
 
3
+import lombok.Getter;
4
+import lombok.Setter;
5
+
3 6
 import javax.persistence.*;
4 7
 
5 8
 @Entity
6 9
 @Table(name = "LOGIN")
10
+@Getter @Setter
7 11
 public class Login {
8 12
 
9 13
     @Id
@@ -21,35 +25,4 @@ public class Login {
21 25
     @JoinColumn(name = "USER_ID")
22 26
     private User user;
23 27
 
24
-    public Long getId() {
25
-        return id;
26
-    }
27
-
28
-    public void setId(Long id) {
29
-        this.id = id;
30
-    }
31
-
32
-    public String getEmail() {
33
-        return email;
34
-    }
35
-
36
-    public void setEmail(String email) {
37
-        this.email = email;
38
-    }
39
-
40
-    public String getPassword() {
41
-        return password;
42
-    }
43
-
44
-    public void setPassword(String password) {
45
-        this.password = password;
46
-    }
47
-
48
-    public User getUser() {
49
-        return user;
50
-    }
51
-
52
-    public void setUser(User user) {
53
-        this.user = user;
54
-    }
55 28
 }

+ 4
- 63
src/main/java/com/alidade/model/Profile.java Vedi File

@@ -1,11 +1,15 @@
1 1
 package com.alidade.model;
2 2
 
3
+import lombok.Getter;
4
+import lombok.Setter;
5
+
3 6
 import javax.persistence.*;
4 7
 import java.util.ArrayList;
5 8
 import java.util.List;
6 9
 
7 10
 @Entity
8 11
 @Table(name = "PROFILE")
12
+@Getter @Setter
9 13
 public class Profile {
10 14
 
11 15
     @Id
@@ -37,67 +41,4 @@ public class Profile {
37 41
     @JoinColumn(name = "USER_ID")
38 42
     private User user;
39 43
 
40
-    public Long getId() {
41
-        return id;
42
-    }
43
-
44
-    public void setId(Long id) {
45
-        this.id = id;
46
-    }
47
-
48
-    public String getUserName() {
49
-        return userName;
50
-    }
51
-
52
-    public void setUserName(String userName) {
53
-        this.userName = userName;
54
-    }
55
-
56
-    public String getHomeCity() {
57
-        return homeCity;
58
-    }
59
-
60
-    public void setHomeCity(String homeCity) {
61
-        this.homeCity = homeCity;
62
-    }
63
-
64
-    public String getHomeCountry() {
65
-        return homeCountry;
66
-    }
67
-
68
-    public void setHomeCountry(String homeCountry) {
69
-        this.homeCountry = homeCountry;
70
-    }
71
-
72
-    public String getDescription() {
73
-        return description;
74
-    }
75
-
76
-    public void setDescription(String description) {
77
-        this.description = description;
78
-    }
79
-
80
-    public String getImagePath() {
81
-        return imagePath;
82
-    }
83
-
84
-    public void setImagePath(String imagePath) {
85
-        this.imagePath = imagePath;
86
-    }
87
-
88
-    public List<Profile> getFriend() {
89
-        return friendList;
90
-    }
91
-
92
-    public void setFriend(List<Profile> friend) {
93
-        this.friendList = friend;
94
-    }
95
-
96
-    public User getUser() {
97
-        return user;
98
-    }
99
-
100
-    public void setUser(User user) {
101
-        this.user = user;
102
-    }
103 44
 }

+ 4
- 40
src/main/java/com/alidade/model/User.java Vedi File

@@ -1,9 +1,13 @@
1 1
 package com.alidade.model;
2 2
 
3
+import lombok.Getter;
4
+import lombok.Setter;
5
+
3 6
 import javax.persistence.*;
4 7
 
5 8
 @Entity
6 9
 @Table(name = "USER")
10
+@Getter @Setter
7 11
 public class User {
8 12
 
9 13
     @Id
@@ -25,44 +29,4 @@ public class User {
25 29
     @JoinColumn(name = "USER_ID")
26 30
     private Profile profile;
27 31
 
28
-    public Long getId() {
29
-        return id;
30
-    }
31
-
32
-    public void setId(Long id) {
33
-        this.id = id;
34
-    }
35
-
36
-    public String getFirstName() {
37
-        return firstName;
38
-    }
39
-
40
-    public void setFirstName(String firstName) {
41
-        this.firstName = firstName;
42
-    }
43
-
44
-    public String getLastName() {
45
-        return lastName;
46
-    }
47
-
48
-    public void setLastName(String lastName) {
49
-        this.lastName = lastName;
50
-    }
51
-
52
-    public Login getLogin() {
53
-        return login;
54
-    }
55
-
56
-    public void setLogin(Login login) {
57
-        this.login = login;
58
-    }
59
-
60
-    public Profile getProfile() {
61
-        return profile;
62
-    }
63
-
64
-    public void setProfile(Profile profile) {
65
-        this.profile = profile;
66
-    }
67
-
68 32
 }

BIN
target/classes/com/alidade/SharedTravelApp.class Vedi File