Changed all int to Long

changed all ints to Long

src/main/java/NTNU/IDATT1002/models/GeoLocation.java

@@ -17,7 +17,7 @@ public class GeoLocation {
      */
 
     @Id @NotBlank(message = "Geolocation-Id may not be blank")
-    private int geoLocationId;
+    private Long geoLocationId;
 
     /**
      * One to one relation between geolocationId in table Geolocation
@@ -41,7 +41,7 @@ public class GeoLocation {
      * @param longditude
      */
 
-    public GeoLocation(int geoLocationId, String altitude, String longditude){
+    public GeoLocation(Long geoLocationId, String altitude, String longditude){
         this.geoLocationId = geoLocationId;
         this.altitude = altitude;
         this.longditude = longditude;
@@ -58,7 +58,7 @@ public class GeoLocation {
                 geoLocation.getLongditude());
     }
 
-    public int getGeoLocationId() {
+    public Long getGeoLocationId() {
         return geoLocationId;
     }
 
@@ -70,7 +70,7 @@ public class GeoLocation {
         return longditude;
     }
 
-    public void setGeoLocationId(int geoLocationId) {
+    public void setGeoLocationId(Long geoLocationId) {
         this.geoLocationId = geoLocationId;
     }
 

src/main/java/NTNU/IDATT1002/models/Histogram.java

@@ -24,11 +24,11 @@ public class Histogram {
      */
 
     @Id @NotBlank(message = "HistogramId may not be blank")
-    private int histogramId;
+    private Long histogramId;
 
     /**
      * One to one relations, joins histogramId
-     * On columns histogram_id in metadata
+     * On columns histogramId in metadata
      */
 
     @OneToOne
@@ -45,7 +45,7 @@ public class Histogram {
      */
 
 
-    public Histogram(int histogramId , String data){
+    public Histogram(Long histogramId , String data){
         this.histogramId = histogramId;
         this.data = data;
     }
@@ -60,7 +60,7 @@ public class Histogram {
                histogram.getData());
     }
 
-    public int getHistogramId() {
+    public Long getHistogramId() {
         return histogramId;
     }
 
@@ -68,7 +68,7 @@ public class Histogram {
         return data;
     }
 
-    public void setHistogramId(int histogramId) {
+    public void setHistogramId(Long histogramId) {
         this.histogramId = histogramId;
     }
 

src/main/java/NTNU/IDATT1002/models/Metadata.java

@@ -17,7 +17,7 @@ public class Metadata {
      */
 
     @Id @NotBlank(message = "Metadata-Id may not be blank")
-    private int metadataId;
+    private Long metadataId;
 
     /**
      * One to one relation joining imageId
@@ -28,13 +28,19 @@ public class Metadata {
     @JoinColumn(name = "image_id")
     private Image image;
 
+    @OneToOne
+    private GeoLocation geoLocation;
+
     @NotBlank (message = "GeolocationId may not be blank")
-    private int geoLocationId;
+    private Long geoLocationId;
+
+    @OneToOne
+    private Histogram histogram;
 
     @NotBlank (message = "HistogramId may not be blank")
-    private int histogramId;
+    private Long histogramId;
 
-    public Metadata(int metadataId, int geoLocationId, int histogramId){
+    public Metadata(Long metadataId, Long geoLocationId, Long histogramId){
         this.metadataId = metadataId;
         this.geoLocationId = geoLocationId;
         this.histogramId = histogramId;
@@ -46,27 +52,27 @@ public class Metadata {
                 metadata.getHistogramId());
     }
 
-    public int getMetadataId() {
+    public Long getMetadataId() {
         return metadataId;
     }
 
-    public int getGeoLocationId() {
+    public Long getGeoLocationId() {
         return geoLocationId;
     }
 
-    public int getHistogramId() {
+    public Long getHistogramId() {
         return histogramId;
     }
 
-    public void setGeoLocationId(int geoLocationId) {
+    public void setGeoLocationId(Long geoLocationId) {
         this.geoLocationId = geoLocationId;
     }
 
-    public void setMetadataId(int metadataId) {
+    public void setMetadataId(Long metadataId) {
         this.metadataId = metadataId;
     }
 
-    public void setHistogramId(int histogramId) {
+    public void setHistogramId(Long histogramId) {
         this.histogramId = histogramId;
     }
 }

src/main/java/NTNU/IDATT1002/models/Tag.java

@@ -23,7 +23,7 @@ public class Tag {
 
     @Id @NotBlank(message = "Tag-Id may not be blank")
     @GeneratedValue(strategy = GenerationType.AUTO)
-    private int tagId;
+    private Long tagId;
 
 
     /**
@@ -48,7 +48,7 @@ public class Tag {
      * @param title
      */
 
-    public Tag(int tagId, String title){
+    public Tag(Long tagId, String title){
         this.tagId = tagId;
         this.title = title;
     }
@@ -63,7 +63,7 @@ public class Tag {
                 tag.getTitle());
     }
 
-    public int getTagId() {
+    public Long getTagId() {
         return tagId;
     }
 
@@ -71,7 +71,7 @@ public class Tag {
         return title;
     }
 
-    public void setTagId(int tagId) {
+    public void setTagId(Long tagId) {
         this.tagId = tagId;
     }