From 872fcf456c8c7722e8cb2afcfb1dda312ed5c337 Mon Sep 17 00:00:00 2001 From: Notmoo-PC\Notmoo Date: Sun, 28 May 2017 10:57:21 +0200 Subject: [PATCH] Modif attr id : Integer -> int (pour clss AccessPoint, Location, RssiRecord et TempRssi) --- project/server_core/src/main/java/repository/AccessPoint.java | 2 +- project/server_core/src/main/java/repository/Location.java | 2 +- project/server_core/src/main/java/repository/RssiRecord.java | 3 +-- project/server_core/src/main/java/repository/TempRssi.java | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/project/server_core/src/main/java/repository/AccessPoint.java b/project/server_core/src/main/java/repository/AccessPoint.java index e7cdf76..f0d43bf 100644 --- a/project/server_core/src/main/java/repository/AccessPoint.java +++ b/project/server_core/src/main/java/repository/AccessPoint.java @@ -10,7 +10,7 @@ import javax.persistence.*; @Table(name ="ACCESS_POINT") public class AccessPoint implements Serializable{ @Id @GeneratedValue - private Integer id; + private int id; private String mac_addr; diff --git a/project/server_core/src/main/java/repository/Location.java b/project/server_core/src/main/java/repository/Location.java index 1a43c75..48f6451 100644 --- a/project/server_core/src/main/java/repository/Location.java +++ b/project/server_core/src/main/java/repository/Location.java @@ -10,7 +10,7 @@ import java.io.Serializable; @Table(name = "LOCATION") public class Location implements Serializable { @Id @GeneratedValue - private Integer id; + private int id; private Double x, y; @OneToOne(fetch = FetchType.LAZY) diff --git a/project/server_core/src/main/java/repository/RssiRecord.java b/project/server_core/src/main/java/repository/RssiRecord.java index 3840329..51e41d0 100644 --- a/project/server_core/src/main/java/repository/RssiRecord.java +++ b/project/server_core/src/main/java/repository/RssiRecord.java @@ -10,7 +10,7 @@ import java.io.Serializable; @Table (name = "RSSI_RECORD") public class RssiRecord implements Serializable { @Id @GeneratedValue - private Integer id; + private int id; @OneToOne(fetch = FetchType.LAZY) @@ -28,7 +28,6 @@ public class RssiRecord implements Serializable { } public RssiRecord(Location loc, AccessPoint ap, Double avg, Double stdDev){ - id = null; this.loc = loc; this.ap = ap; this.avg = avg; diff --git a/project/server_core/src/main/java/repository/TempRssi.java b/project/server_core/src/main/java/repository/TempRssi.java index 5dc60d0..c2df111 100644 --- a/project/server_core/src/main/java/repository/TempRssi.java +++ b/project/server_core/src/main/java/repository/TempRssi.java @@ -9,7 +9,7 @@ import javax.persistence.*; @Table (name = "TEMP_RSSI") public class TempRssi { @Id @GeneratedValue - private Integer id; + private int id; @OneToOne(fetch = FetchType.LAZY) @JoinColumn(name = "id", nullable = false) -- libgit2 0.21.4