chore: align urls

Some URLs were not consistent, for example "score-analysis".
TimefoldAI · Feb 21, 2025 · b63900d · b63900d
1 parent 42878b9
commit b63900d
Show file tree

Hide file tree

Showing 64 changed files with 114 additions and 129 deletions.
diff --git a/java/bed-allocation/src/main/java/org/acme/bedallocation/rest/BedSchedulingResource.java b/java/bed-allocation/src/main/java/org/acme/bedallocation/rest/BedSchedulingResource.java
@@ -108,10 +108,10 @@ public String solve(BedPlan problem) {
                     description = "Resulting score analysis, optionally without constraint matches.",
                     content = @Content(mediaType = MediaType.APPLICATION_JSON,
                             schema = @Schema(implementation = ScoreAnalysis.class))) })
-    @PUT
+    @POST
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces(MediaType.APPLICATION_JSON)
-    @Path("analyze")
+    @Path("score-analysis")
     public ScoreAnalysis<HardSoftScore> analyze(BedPlan problem,
                                                 @QueryParam("fetchPolicy") ScoreAnalysisFetchPolicy fetchPolicy) {
         return fetchPolicy == null ? solutionManager.analyze(problem) : solutionManager.analyze(problem, fetchPolicy);

diff --git a/java/bed-allocation/src/main/resources/META-INF/resources/app.js b/java/bed-allocation/src/main/resources/META-INF/resources/app.js
@@ -250,7 +250,7 @@ function analyze() {
         scoreAnalysisModalContent.text("No score to analyze yet, please first press the 'solve' button.");
     } else {
         $('#scoreAnalysisScoreLabel').text(`(${loadedSchedule.score})`);
-        $.put("/schedules/analyze", JSON.stringify(loadedSchedule), function (scoreAnalysis) {
+        $.post("/schedules/score-analysis", JSON.stringify(loadedSchedule), function (scoreAnalysis) {
             let constraints = scoreAnalysis.constraints;
             constraints.sort((a, b) => {
                 let aComponents = getScoreComponents(a.score), bComponents = getScoreComponents(b.score);
@@ -316,19 +316,6 @@ function analyze() {
     }
 }
 
-function publish() {
-    $("#publishButton").hide();
-    $("#publishLoadingButton").show();
-    $.put(`/schedules/${scheduleId}/publish`, function (schedule) {
-        loadedSchedule = schedule;
-        renderSchedule(schedule);
-    })
-        .fail(function (xhr, ajaxOptions, thrownError) {
-            showError("Publish failed.", xhr);
-            refreshSolvingButtons(false);
-        });
-}
-
 function getScoreComponents(score) {
     let components = {hard: 0, medium: 0, soft: 0};
 

diff --git a/java/bed-allocation/src/test/java/org/acme/bedallocation/rest/BedSchedulingResourceTest.java b/java/bed-allocation/src/test/java/org/acme/bedallocation/rest/BedSchedulingResourceTest.java
@@ -83,7 +83,7 @@ void analyze() {
                 .body(solution)
                 .expect().contentType(ContentType.JSON)
                 .when()
-                .put("/schedules/analyze")
+                .post("/schedules/score-analysis")
                 .then()
                 .extract()
                 .asString();
@@ -96,7 +96,7 @@ void analyze() {
                 .body(solution)
                 .expect().contentType(ContentType.JSON)
                 .when()
-                .put("/schedules/analyze")
+                .post("/schedules/score-analysis")
                 .then()
                 .extract()
                 .asString();

diff --git a/...duling/src/main/java/org/acme/conferencescheduling/rest/ConferenceSchedulingResource.java b/...duling/src/main/java/org/acme/conferencescheduling/rest/ConferenceSchedulingResource.java
@@ -108,10 +108,10 @@ public String solve(ConferenceSchedule problem) {
                     description = "Resulting score analysis, optionally without constraint matches.",
                     content = @Content(mediaType = MediaType.APPLICATION_JSON,
                             schema = @Schema(implementation = ScoreAnalysis.class))) })
-    @PUT
+    @POST
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces(MediaType.APPLICATION_JSON)
-    @Path("analyze")
+    @Path("score-analysis")
     public ScoreAnalysis<HardSoftScore> analyze(ConferenceSchedule problem,
             @QueryParam("fetchPolicy") ScoreAnalysisFetchPolicy fetchPolicy) {
         return fetchPolicy == null ? solutionManager.analyze(problem) : solutionManager.analyze(problem, fetchPolicy);

diff --git a/java/conference-scheduling/src/main/resources/META-INF/resources/app.js b/java/conference-scheduling/src/main/resources/META-INF/resources/app.js
@@ -332,7 +332,7 @@ function analyze() {
         scoreAnalysisModalContent.text("No score to analyze yet, please first press the 'solve' button.");
     } else {
         $('#scoreAnalysisScoreLabel').text(`(${loadedSchedule.score})`);
-        $.put("/schedules/analyze", JSON.stringify(loadedSchedule), function (scoreAnalysis) {
+        $.post("/schedules/score-analysis", JSON.stringify(loadedSchedule), function (scoreAnalysis) {
             let constraints = scoreAnalysis.constraints;
             constraints.sort((a, b) => {
                 let aComponents = getScoreComponents(a.score), bComponents = getScoreComponents(b.score);

diff --git a/...ling/src/test/java/org/acme/conferencescheduling/rest/ConferenceScheduleResourceTest.java b/...ling/src/test/java/org/acme/conferencescheduling/rest/ConferenceScheduleResourceTest.java
@@ -83,7 +83,7 @@ void analyze() {
                 .body(solution)
                 .expect().contentType(ContentType.JSON)
                 .when()
-                .put("/schedules/analyze")
+                .put("/schedules/score-analysis")
                 .then()
                 .extract()
                 .asString();
@@ -96,7 +96,7 @@ void analyze() {
                 .body(solution)
                 .expect().contentType(ContentType.JSON)
                 .when()
-                .put("/schedules/analyze")
+                .put("/schedules/score-analysis")
                 .then()
                 .extract()
                 .asString();

diff --git a/...e-scheduling/src/main/java/org/acme/employeescheduling/rest/EmployeeScheduleResource.java b/...e-scheduling/src/main/java/org/acme/employeescheduling/rest/EmployeeScheduleResource.java
@@ -98,10 +98,10 @@ public String solve(EmployeeSchedule problem) {
                     description = "Resulting score analysis, optionally without constraint matches.",
                     content = @Content(mediaType = MediaType.APPLICATION_JSON,
                             schema = @Schema(implementation = ScoreAnalysis.class))) })
-    @PUT
+    @POST
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces(MediaType.APPLICATION_JSON)
-    @Path("analyze")
+    @Path("score-analysis")
     public ScoreAnalysis<HardSoftBigDecimalScore> analyze(EmployeeSchedule problem,
             @QueryParam("fetchPolicy") ScoreAnalysisFetchPolicy fetchPolicy) {
         return fetchPolicy == null ? solutionManager.analyze(problem) : solutionManager.analyze(problem, fetchPolicy);

diff --git a/java/employee-scheduling/src/main/resources/META-INF/resources/app.js b/java/employee-scheduling/src/main/resources/META-INF/resources/app.js
@@ -319,7 +319,7 @@ function analyze() {
         scoreAnalysisModalContent.text("No score to analyze yet, please first press the 'solve' button.");
     } else {
         $('#scoreAnalysisScoreLabel').text(`(${loadedSchedule.score})`);
-        $.put("/schedules/analyze", JSON.stringify(loadedSchedule), function (scoreAnalysis) {
+        $.post("/schedules/score-analysis", JSON.stringify(loadedSchedule), function (scoreAnalysis) {
             let constraints = scoreAnalysis.constraints;
             constraints.sort((a, b) => {
                 let aComponents = getScoreComponents(a.score), bComponents = getScoreComponents(b.score);
@@ -412,23 +412,6 @@ function refreshSolvingButtons(solving) {
     }
 }
 
-function refreshSolvingButtons(solving) {
-    if (solving) {
-        $("#solveButton").hide();
-        $("#stopSolvingButton").show();
-        if (autoRefreshIntervalId == null) {
-            autoRefreshIntervalId = setInterval(refreshSchedule, 2000);
-        }
-    } else {
-        $("#solveButton").show();
-        $("#stopSolvingButton").hide();
-        if (autoRefreshIntervalId != null) {
-            clearInterval(autoRefreshIntervalId);
-            autoRefreshIntervalId = null;
-        }
-    }
-}
-
 function stopSolving() {
     $.delete(`/schedules/${scheduleId}`, function () {
         refreshSolvingButtons(false);

diff --git a/java/facility-location/src/main/java/org/acme/facilitylocation/rest/SolverResource.java b/java/facility-location/src/main/java/org/acme/facilitylocation/rest/SolverResource.java
@@ -67,10 +67,10 @@ public void solve() {
                 .run());
     }
 
-    @PUT
+    @POST
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces(MediaType.APPLICATION_JSON)
-    @Path("analyze")
+    @Path("score-analysis")
     public ScoreAnalysis<HardSoftLongScore> analyze(@QueryParam("fetchPolicy") ScoreAnalysisFetchPolicy fetchPolicy) {
         FacilityLocationProblem problem = repository.solution().get();
         return fetchPolicy == null ? solutionManager.analyze(problem) : solutionManager.analyze(problem, fetchPolicy);

diff --git a/java/facility-location/src/main/resources/META-INF/resources/app.js b/java/facility-location/src/main/resources/META-INF/resources/app.js
@@ -178,7 +178,7 @@ function analyze() {
     scoreAnalysisModalContent.text("No score to analyze yet, please first press the 'solve' button.");
   } else {
     $('#scoreAnalysisScoreLabel').text(`(${loadedSchedule.score})`);
-    $.put("/flp/analyze", function (scoreAnalysis) {
+    $.post("/flp/score-analysis", function (scoreAnalysis) {
       let constraints = scoreAnalysis.constraints;
       constraints.sort((a, b) => {
         let aComponents = getScoreComponents(a.score), bComponents = getScoreComponents(b.score);

diff --git a/...eduling/src/main/java/org/acme/flighcrewscheduling/rest/FlightCrewSchedulingResource.java b/...eduling/src/main/java/org/acme/flighcrewscheduling/rest/FlightCrewSchedulingResource.java
@@ -108,10 +108,10 @@ public String solve(FlightCrewSchedule problem) {
                     description = "Resulting score analysis, optionally without constraint matches.",
                     content = @Content(mediaType = MediaType.APPLICATION_JSON,
                             schema = @Schema(implementation = ScoreAnalysis.class))) })
-    @PUT
+    @POST
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces(MediaType.APPLICATION_JSON)
-    @Path("analyze")
+    @Path("score-analysis")
     public ScoreAnalysis<HardSoftScore> analyze(FlightCrewSchedule problem,
             @QueryParam("fetchPolicy") ScoreAnalysisFetchPolicy fetchPolicy) {
         return fetchPolicy == null ? solutionManager.analyze(problem) : solutionManager.analyze(problem, fetchPolicy);

diff --git a/java/flight-crew-scheduling/src/main/resources/META-INF/resources/app.js b/java/flight-crew-scheduling/src/main/resources/META-INF/resources/app.js
@@ -269,7 +269,7 @@ function analyze() {
         scoreAnalysisModalContent.text("No score to analyze yet, please first press the 'solve' button.");
     } else {
         $('#scoreAnalysisScoreLabel').text(`(${loadedSchedule.score})`);
-        $.put("/schedules/analyze", JSON.stringify(loadedSchedule), function (scoreAnalysis) {
+        $.post("/schedules/score-analysis", JSON.stringify(loadedSchedule), function (scoreAnalysis) {
             let constraints = scoreAnalysis.constraints;
             constraints.sort((a, b) => {
                 let aComponents = getScoreComponents(a.score), bComponents = getScoreComponents(b.score);

diff --git a/...ing/src/test/java/org/acme/flighcrewscheduling/rest/FlightCrewSchedulingResourceTest.java b/...ing/src/test/java/org/acme/flighcrewscheduling/rest/FlightCrewSchedulingResourceTest.java
@@ -84,7 +84,7 @@ void analyze() {
                 .body(solution)
                 .expect().contentType(ContentType.JSON)
                 .when()
-                .put("/schedules/analyze")
+                .post("/schedules/score-analysis")
                 .then()
                 .extract()
                 .asString();
@@ -97,7 +97,7 @@ void analyze() {
                 .body(solution)
                 .expect().contentType(ContentType.JSON)
                 .when()
-                .put("/schedules/analyze")
+                .post("/schedules/score-analysis")
                 .then()
                 .extract()
                 .asString();

diff --git a/java/food-packaging/src/main/java/org/acme/foodpackaging/rest/PackagingScheduleResource.java b/java/food-packaging/src/main/java/org/acme/foodpackaging/rest/PackagingScheduleResource.java
@@ -2,6 +2,7 @@
 
 import jakarta.inject.Inject;
 import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.DELETE;
 import jakarta.ws.rs.GET;
 import jakarta.ws.rs.POST;
 import jakarta.ws.rs.PUT;
@@ -60,17 +61,16 @@ public void solve() {
                 .run();
     }
 
-    @PUT
+    @POST
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces(MediaType.APPLICATION_JSON)
-    @Path("analyze")
+    @Path("score-analysis")
     public ScoreAnalysis<HardMediumSoftLongScore> analyze(@QueryParam("fetchPolicy") ScoreAnalysisFetchPolicy fetchPolicy) {
         PackagingSchedule problem = repository.read();
         return fetchPolicy == null ? solutionManager.analyze(problem) : solutionManager.analyze(problem, fetchPolicy);
     }
 
-    @POST
-    @Path("stopSolving")
+    @DELETE
     public void stopSolving() {
         solverManager.terminateEarly(SINGLETON_SOLUTION_ID);
     }

diff --git a/java/food-packaging/src/main/resources/META-INF/resources/app.js b/java/food-packaging/src/main/resources/META-INF/resources/app.js
@@ -199,7 +199,7 @@ function analyze() {
     scoreAnalysisModalContent.text("No score to analyze yet, please first press the 'solve' button.");
   } else {
     $('#scoreAnalysisScoreLabel').text(`(${loadedSchedule.score})`);
-    $.put("/schedule/analyze", function (scoreAnalysis) {
+    $.post("/schedule/score-analysis", function (scoreAnalysis) {
       let constraints = scoreAnalysis.constraints;
       constraints.sort((a, b) => {
         let aComponents = getScoreComponents(a.score), bComponents = getScoreComponents(b.score);
@@ -293,7 +293,7 @@ function refreshSolvingButtons(solving) {
 }
 
 function stopSolving() {
-  $.post("/schedule/stopSolving", function () {
+  $.delete("/schedule", function () {
     refreshSolvingButtons(false);
     refreshSchedule();
   }).fail(function (xhr, ajaxOptions, thrownError) {

diff --git a/...duling/src/main/java/org/acme/maintenancescheduling/rest/MaintenanceScheduleResource.java b/...duling/src/main/java/org/acme/maintenancescheduling/rest/MaintenanceScheduleResource.java
@@ -98,10 +98,10 @@ public String solve(MaintenanceSchedule problem) {
                     description = "Resulting score analysis, optionally without constraint matches.",
                     content = @Content(mediaType = MediaType.APPLICATION_JSON,
                             schema = @Schema(implementation = ScoreAnalysis.class))) })
-    @PUT
+    @POST
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces(MediaType.APPLICATION_JSON)
-    @Path("analyze")
+    @Path("score-analysis")
     public ScoreAnalysis<HardSoftScore> analyze(MaintenanceSchedule problem,
                                                 @QueryParam("fetchPolicy") ScoreAnalysisFetchPolicy fetchPolicy) {
         return fetchPolicy == null ? solutionManager.analyze(problem) : solutionManager.analyze(problem, fetchPolicy);

diff --git a/java/maintenance-scheduling/src/main/resources/META-INF/resources/app.js b/java/maintenance-scheduling/src/main/resources/META-INF/resources/app.js
@@ -251,7 +251,7 @@ function analyze() {
         scoreAnalysisModalContent.text("No score to analyze yet, please first press the 'solve' button.");
     } else {
         $('#scoreAnalysisScoreLabel').text(`(${loadedSchedule.score})`);
-        $.put("/schedules/analyze", JSON.stringify(loadedSchedule), function (scoreAnalysis) {
+        $.post("/schedules/score-analysis", JSON.stringify(loadedSchedule), function (scoreAnalysis) {
             let constraints = scoreAnalysis.constraints;
             constraints.sort((a, b) => {
                 let aComponents = getScoreComponents(a.score), bComponents = getScoreComponents(b.score);

diff --git a/...ing-scheduling/src/main/java/org/acme/meetingschedule/rest/MeetingSchedulingResource.java b/...ing-scheduling/src/main/java/org/acme/meetingschedule/rest/MeetingSchedulingResource.java
@@ -108,10 +108,10 @@ public String solve(MeetingSchedule problem) {
                     description = "Resulting score analysis, optionally without constraint matches.",
                     content = @Content(mediaType = MediaType.APPLICATION_JSON,
                             schema = @Schema(implementation = ScoreAnalysis.class))) })
-    @PUT
+    @POST
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces(MediaType.APPLICATION_JSON)
-    @Path("analyze")
+    @Path("score-analysis")
     public ScoreAnalysis<HardSoftScore> analyze(MeetingSchedule problem,
                                                 @QueryParam("fetchPolicy") ScoreAnalysisFetchPolicy fetchPolicy) {
         return fetchPolicy == null ? solutionManager.analyze(problem) : solutionManager.analyze(problem, fetchPolicy);

diff --git a/java/meeting-scheduling/src/main/resources/META-INF/resources/app.js b/java/meeting-scheduling/src/main/resources/META-INF/resources/app.js
@@ -248,7 +248,7 @@ function analyze() {
         scoreAnalysisModalContent.text("No score to analyze yet, please first press the 'solve' button.");
     } else {
         $('#scoreAnalysisScoreLabel').text(`(${loadedSchedule.score})`);
-        $.put("/schedules/analyze", JSON.stringify(loadedSchedule), function (scoreAnalysis) {
+        $.post("/schedules/score-analysis", JSON.stringify(loadedSchedule), function (scoreAnalysis) {
             let constraints = scoreAnalysis.constraints;
             constraints.sort((a, b) => {
                 let aComponents = getScoreComponents(a.score), bComponents = getScoreComponents(b.score);

diff --git a/...-scheduling/src/test/java/org/acme/meetscheduling/rest/MeetingSchedulingResourceTest.java b/...-scheduling/src/test/java/org/acme/meetscheduling/rest/MeetingSchedulingResourceTest.java
@@ -84,7 +84,7 @@ void analyze() {
                 .body(solution)
                 .expect().contentType(ContentType.JSON)
                 .when()
-                .put("/schedules/analyze")
+                .post("/schedules/score-analysis")
                 .then()
                 .extract()
                 .asString();
@@ -97,7 +97,7 @@ void analyze() {
                 .body(solution)
                 .expect().contentType(ContentType.JSON)
                 .when()
-                .put("/schedules/analyze")
+                .post("/schedules/score-analysis")
                 .then()
                 .extract()
                 .asString();

diff --git a/java/order-picking/src/main/java/org/acme/orderpicking/rest/OrderPickingSolverResource.java b/java/order-picking/src/main/java/org/acme/orderpicking/rest/OrderPickingSolverResource.java
@@ -5,6 +5,7 @@
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.inject.Inject;
 import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.DELETE;
 import jakarta.ws.rs.GET;
 import jakarta.ws.rs.POST;
 import jakarta.ws.rs.PUT;
@@ -52,7 +53,6 @@ public OrderPickingPlanning getBestSolution() {
     }
 
     @POST
-    @Path("solve")
     public void solve() {
         solverWasNeverStarted.set(false);
         solverManager.solveBuilder()
@@ -62,17 +62,16 @@ public void solve() {
                 .run();
     }
 
-    @PUT
+    @POST
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces(MediaType.APPLICATION_JSON)
-    @Path("analyze")
+    @Path("score-analysis")
     public ScoreAnalysis<HardSoftLongScore> analyze(@QueryParam("fetchPolicy") ScoreAnalysisFetchPolicy fetchPolicy) {
         OrderPickingSolution problem = orderPickingRepository.find();
         return fetchPolicy == null ? solutionManager.analyze(problem) : solutionManager.analyze(problem, fetchPolicy);
     }
 
-    @POST
-    @Path("stopSolving")
+    @DELETE
     public void stopSolving() {
         solverManager.terminateEarly(PROBLEM_ID);
     }

diff --git a/java/order-picking/src/main/resources/META-INF/resources/app.js b/java/order-picking/src/main/resources/META-INF/resources/app.js
@@ -519,7 +519,7 @@ function refreshSolvingButtons(solving) {
 }
 
 function solve() {
-    $.post("/orderPicking/solve", function () {
+    $.post("/orderPicking", function () {
         refreshSolvingButtons(true);
     }).fail(function (xhr, ajaxOptions, thrownError) {
         showError("Start solving failed.", xhr);
@@ -534,7 +534,7 @@ function analyze() {
         scoreAnalysisModalContent.text("No score to analyze yet, please first press the 'solve' button.");
     } else {
         $('#scoreAnalysisScoreLabel').text(`(${loadedSchedule.score})`);
-        $.put("/orderPicking/analyze", function (scoreAnalysis) {
+        $.post("/orderPicking/score-analysis", function (scoreAnalysis) {
             let constraints = Object.values(scoreAnalysis.constraintMap);
             constraints.sort((a, b) => {
                 let aComponents = getScoreComponents(a.score), bComponents = getScoreComponents(b.score);
@@ -607,7 +607,7 @@ function getScoreComponents(score) {
 }
 
 function stopSolving() {
-    $.post("/orderPicking/stopSolving", function () {
+    $.delete("/orderPicking", function () {
         refreshSolvingButtons(false);
         refreshSolution();
     }).fail(function (xhr, ajaxOptions, thrownError) {

diff --git a/java/order-picking/src/test/java/org/acme/orderpicking/rest/OrderPickingResourceIT.java b/java/order-picking/src/test/java/org/acme/orderpicking/rest/OrderPickingResourceIT.java
@@ -18,7 +18,7 @@ class OrderPickingResourceIT {
 
     @Test
     void solveNative() {
-        post("/orderPicking/solve")
+        post("/orderPicking")
                 .then()
                 .statusCode(204)
                 .extract();