Ajout ville

src/db/Database.java

@@ -25,13 +25,6 @@ public class Database {
 		ini();
 		unset();
 		setup();
-		execute("Insert into Espace(LIBELLE) Values('test')");
-		//execute("Insert into Espace(LIBELLE) Values('test')");
-		EspaceTable et = EspaceTable.getInstance();
-		Espace e = new Espace();
-		e.id = 8;
-		e.libelle = "bjr";
-		et.save(e);
 	}
 	
 	public static void ini() {

src/db/ManageTable.java

@@ -42,10 +42,10 @@ public class ManageTable {
 				+ "VILLE BIGINT REFERENCES Ville(ID),"
 				+ "ECOLE BIGINT REFERENCES Ecole(ID))");
 		create.put("Frequentation", "CREATE TABLE Frequentation ("
+				+ "ID BIGINT NOT NULL PRIMARY KEY GENERATED ALWAYS AS IDENTITY,"
 				+ "ESPACE BIGINT REFERENCES Espace(ID),"
 				+ "USAGER BIGINT REFERENCES Usager(ID),"
-				+ "DATE DATE NOT NULL,"
-				+ "PRIMARY KEY(ESPACE, USAGER))");
+				+ "DATE DATE NOT NULL)");
 	}
 	
 	private static void iniDrop() {

src/db/table/VilleTable.java

@@ -0,0 +1,23 @@
+package db.table;
+
+import db.Table;
+import db.annotation.DbTable;
+import entity.Ville;
+
+@DbTable(name = "Ville", entity = Ville.class)
+public class VilleTable extends Table<Ville> {
+	
+private static VilleTable instance;
+	
+	private VilleTable() {
+		// Private constructor for singleton
+	}
+	
+	public static VilleTable getInstance() {
+		if(instance == null) {
+			instance = new VilleTable();
+		}
+		return instance;
+	}
+
+}

src/entity/Ville.java

@@ -0,0 +1,24 @@
+package entity;
+
+import db.Persistable;
+import db.annotation.DbField;
+import db.annotation.DbId;
+
+public class Ville implements Persistable {
+	
+	@DbId
+	@DbField(name = "ID")
+	public long id;
+	
+	@DbField(name = "LIBELLE")
+	public String libelle;
+	
+	@DbField(name = "CODEPOSTAL")
+	public String cp;
+
+	@Override
+	public long getId() {
+		return id;
+	}
+
+}

src/servlets/TestDb.java

@@ -14,7 +14,9 @@ import javax.servlet.http.HttpServletResponse;
 import db.Database;
 import db.ManageTable;
 import db.table.EspaceTable;
+import db.table.VilleTable;
 import entity.Espace;
+import entity.Ville;
 
 /**
  * Servlet implementation class TestDb
@@ -35,14 +37,15 @@ public class TestDb extends HttpServlet {
 	 * @see HttpServlet#doGet(HttpServletRequest request, HttpServletResponse response)
 	 */
 	protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
-		EspaceTable et = EspaceTable.getInstance();
-		List<Espace> e = et.getAll();
-		System.out.println(e.size());
-		e.forEach(elt -> System.out.println(elt.id + " " + elt.libelle));
-		et.delete(2);
-		e = et.getAll();
-		System.out.println(e.size());
-		e.forEach(elt -> System.out.println(elt.id + " " + elt.libelle));
+		VilleTable vt = VilleTable.getInstance();
+		Ville v = new Ville();
+		v.id = 8l;
+		v.libelle = "Troyes";
+		v.cp = "10410";
+		vt.save(v);
+		List<Ville> lv = vt.getAll();
+		System.out.println("Size: " + lv.size());
+		lv.forEach(elt -> System.out.println(elt.id + " " + elt.libelle + " " + elt.cp));
 		response.getWriter().append("Served at: ").append(request.getContextPath());
 	}