Browse Source

implement cors for devlopment

tripeur 4 years ago
parent
commit
4a50b95691

+ 5 - 0
pom.xml

@@ -34,6 +34,11 @@
       <artifactId>spring-boot-starter-tomcat</artifactId>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>org.apache.httpcomponents</groupId>
+      <artifactId>httpclient</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-test</artifactId>

+ 5 - 0
src/main/java/fr/jaquin/bdlg/planner/AppController.java

@@ -0,0 +1,5 @@
+package fr.jaquin.bdlg.planner;
+
+public class AppController {
+  
+}

+ 4 - 1
src/main/java/fr/jaquin/bdlg/planner/PlanningController.java → src/main/java/fr/jaquin/bdlg/planner/SolverController.java

@@ -12,6 +12,7 @@ import org.optaplanner.core.api.solver.SolverJob;
 import org.optaplanner.core.api.solver.SolverManager;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -19,13 +20,15 @@ import org.springframework.web.bind.annotation.RestController;
 
 @RestController
 @RequestMapping("/planning")
-public class PlanningController {
+public class SolverController {
 
   @Autowired
   private SolverManager<Planning, UUID> solverManager;
   @Autowired
     private ScoreManager<Planning, HardMediumSoftScore> scoreManager;
 
+  
+	@CrossOrigin(origins = "http://localhost:8081")
   @PostMapping("/solve")
   public PlanningSolution solve(@RequestBody PlanningInput inputs) {
     Planning problem = inputs.generatePlanningProblem();

+ 1 - 1
src/main/java/fr/jaquin/bdlg/planner/domain/Assignement.java

@@ -117,6 +117,6 @@ public class Assignement {
   
   @Override
   public String toString() {
-    return "<Assignement for" + this.slot.getId() + ">";
+    return "Assignement[slotId:" + this.slot.getId() + "]";
   }
 }

+ 4 - 1
src/main/java/fr/jaquin/bdlg/planner/domain/MealAssignement.java

@@ -60,5 +60,8 @@ public class MealAssignement {
     return this.mealSlot.getEndTime();
   }
 
-
+  @Override
+  public String toString() {
+    return "MealAssignement[volunteer=" + this.volonteer.getId().toString() + "]";
+  }
 }

+ 13 - 9
src/main/java/fr/jaquin/bdlg/planner/domain/MealSlot.java

@@ -55,19 +55,23 @@ public class MealSlot {
   }
 
   @Override
-    public boolean equals(Object o) {
-        if (o == this)
-            return true;
-        if (!(o instanceof MealSlot)) {
-            return false;
-        }
-        MealSlot mealSlot = (MealSlot) o;
-        return id.equals( mealSlot.id) ;
-      }
+  public boolean equals(Object o) {
+    if (o == this)
+      return true;
+    if (!(o instanceof MealSlot)) {
+      return false;
+    }
+    MealSlot mealSlot = (MealSlot) o;
+    return id.equals(mealSlot.id);
+  }
 
   @Override
   public int hashCode() {
     return Objects.hash(id);
   }
 
+  @Override
+  public String toString() {
+    return "MealSlot[start=" + this.startTime.toString() + "]";
+  }
 }