merge with Vicky

api/constellation.java → src/main/java/ch/heig/dai/Constellation.java

@@ -1,4 +1,4 @@
-package app;
+package ch.heig.dai;
 
 public class Constellation {
 
@@ -13,6 +13,6 @@ public Constellation(String name, String latinName, String abr, String origin) {
         this.name = name;
         this.latinName = name;
         this.abr = abr;
-        this.origin = origin
+        this.origin = origin;
     }
 }

api/constellationController.java → src/main/java/ch/heig/dai/ConstellationController.java

@@ -1,18 +1,18 @@
-package app;
+package ch.heig.dai;
 
 import io.javalin.http.Context;
 import java.util.concurrent.ConcurrentHashMap;
 
-class ConstellationController {
+public class ConstellationController {
 
     // "Database" of constellations
     // Since the server is multi-threaded, we need to use a thread-safe data structure
     private ConcurrentHashMap<Integer, Constellation> constellations = new ConcurrentHashMap<Integer, Constellation>();
     private int lastId = 0;
 
-    public UserController() {
+    public ConstellationController() {
         // Add some constellation to the "database"
-        String name, String latinName, String abr, String origin)
+
         constellations.put(++lastId, new Constellation("L'Aigle", "Aquila/Aquilae",  "Aql", "Ptolémée"));
         constellations.put(++lastId, new Constellation("Le Burin", "Caelum/Caeli",  "Cae", "Lacaille"));
         constellations.put(++lastId, new Constellation("Le Caméléon", "Chamaeleon/Chamaeleontis",  "Cha", "Bayer"));

src/main/java/ch/heig/dai/Main.java

@@ -1,17 +1,17 @@
 package ch.heig.dai;
 
+import ch.heig.dai.ConstellationController;
 import io.javalin.*;
 
 public class Main {
     public static void main(String[] args) {
+        Javalin app = Javalin.create().start(7000);
 
-        Javalin app = Javalin.create().start(8000);
-
-        UserController userController = new UserController();
-        app.get("/api/users", userController::getAll);
-        app.get("/api/users/{id}", userController::getOne);
-        app.post("/api/users/", userController::create);
-        app.put("/api/users/{id}", userController::update);
-        app.delete("/api/users/{id}", userController::delete);
+        ConstellationController controller = new ConstellationController();
+        app.get("/api/constellations", controller::getAll);
+        app.get("/api/constellations/{id}", controller::getOne);
+        app.post("/api/constellations/", controller::create);
+        app.put("/api/constellations/{id}", controller::update);
+        app.delete("/api/constellations/{id}", controller::delete);
     }
 }