X-Git-Url: https://juplo.de/gitweb/?a=blobdiff_plain;f=provider%2Fsrc%2Fmain%2Fjava%2Fio%2Fpactflow%2Fexample%2Fsirenprovider%2Fcontrollers%2FOrderController.java;h=d08e4432f3239c01fb3fb714fb356d25c0ccdf35;hb=HEAD;hp=72cf97335a53412029a7731867d2d69df317d49d;hpb=9777f26defdb7706cf488160af693766954a1bb5;p=demos%2Fexample-siren

diff --git a/provider/src/main/java/io/pactflow/example/sirenprovider/controllers/OrderController.java b/provider/src/main/java/io/pactflow/example/sirenprovider/controllers/OrderController.java
index 72cf973..d08e443 100644
--- a/provider/src/main/java/io/pactflow/example/sirenprovider/controllers/OrderController.java
+++ b/provider/src/main/java/io/pactflow/example/sirenprovider/controllers/OrderController.java
@@ -11,50 +11,61 @@ import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.Random;
+
 import static org.springframework.hateoas.server.mvc.WebMvcLinkBuilder.afford;
 import static org.springframework.hateoas.server.mvc.WebMvcLinkBuilder.linkTo;
 import static org.springframework.hateoas.server.mvc.WebMvcLinkBuilder.methodOn;
 
 @RestController
 @ExposesResourceFor(Order.class)
+@RequestMapping(value = "/orders")
 public class OrderController {
 
-  @GetMapping("/orders")
-  public RepresentationModel<?> orders() {
-    Order order = new Order(1234L);
-    Link selfLink = linkTo(methodOn(OrderController.class).order(order.getId())).withSelfRel()
-      .andAffordance(afford(methodOn(OrderController.class).update(order.getId(), null)))
-      .andAffordance(afford(methodOn(OrderController.class).delete(order.getId())));
+  @GetMapping
+  public ResponseEntity<RepresentationModel<?>> orders() {
+    Long id = Math.abs(new Random().nextLong());
+    Order order = new Order(id);
+    Link selfLink = actions(order);
     EntityModel<Order> model = EntityModel.of(order, selfLink);
     RepresentationModel<?> orders = CollectionModel.of(model);
     orders.add(linkTo(methodOn(OrderController.class).orders()).withSelfRel());
-    return orders;
+    return ResponseEntity.ok(orders);
   }
 
-  @GetMapping("/orders/{id}")
-  public EntityModel<Order> order(@PathVariable(value = "id", required = true) Long id) {
+  @GetMapping(value = "/{id}")
+  public ResponseEntity<EntityModel<Order>> order(@PathVariable(value = "id", required = true) Long id) {
     Order order = new Order(id);
-    Link selfLink = linkTo(methodOn(OrderController.class).order(order.getId())).withSelfRel()
-      .andAffordance(afford(methodOn(OrderController.class).update(order.getId(), null)))
-      .andAffordance(afford(methodOn(OrderController.class).delete(order.getId())));
+    Link selfLink = actions(order);
     EntityModel<Order> model = EntityModel.of(order, selfLink);
-    return model;
+    return ResponseEntity.ok(model);
+  }
+
+  @PutMapping("/{id}")
+  public EntityModel<Order> update(@PathVariable(value = "id", required = true) Long id, Order order) {
+    Link selfLink = actions(order);
+    return EntityModel.of(order, selfLink);
   }
 
-  @PutMapping("/orders/{id}")
-  public EntityModel<Order> update(Long id, Order order) {
-    Link selfLink = linkTo(methodOn(OrderController.class).order(order.getId())).withSelfRel()
+  private Link actions(Order order) {
+    return linkTo(methodOn(OrderController.class).order(order.getId())).withSelfRel()
       .andAffordance(afford(methodOn(OrderController.class).update(order.getId(), null)))
-      .andAffordance(afford(methodOn(OrderController.class).delete(order.getId())));
-    EntityModel<Order> model = EntityModel.of(order, selfLink);
-    return model;
+      .andAffordance(afford(methodOn(OrderController.class).delete(order.getId())))
+      .andAffordance(afford(methodOn(OrderController.class).changeStatus(order.getId(), null)));
   }
 
-  @DeleteMapping("/order/{id}")
-  public ResponseEntity<Void> delete(Long id) {
-    return ResponseEntity.ok().build();
+  @PutMapping("/{id}/status")
+  public EntityModel<Order> changeStatus(@PathVariable(value = "id", required = true) Long id, String status) {
+    Order order = new Order(id);
+    Link selfLink = actions(order);
+    return EntityModel.of(order, selfLink);
   }
 
+  @DeleteMapping("/{id}")
+  public ResponseEntity<Void> delete(@PathVariable(value = "id", required = true) Long id) {
+    return ResponseEntity.ok().build();
+  }
 }