From 197a31add78ec12dba9fe250cf64e410b14e0b57 Mon Sep 17 00:00:00 2001 From: kimscott Date: Thu, 6 Feb 2020 15:03:26 +0900 Subject: [PATCH] add request response --- src/main/java/com/example/template/AbstractEvent.java | 5 ++++- src/main/java/com/example/template/Order.java | 4 ++-- src/main/java/com/example/template/OrderCancelled.java | 4 +--- src/main/java/com/example/template/OrderController.java | 8 ++++---- src/main/java/com/example/template/OrderPlaced.java | 4 +--- src/main/resources/application.yml | 3 +++ .../java/com/example/template/ProductContractTest.java | 3 ++- 7 files changed, 17 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/example/template/AbstractEvent.java b/src/main/java/com/example/template/AbstractEvent.java index 6e30f69..eb5e952 100644 --- a/src/main/java/com/example/template/AbstractEvent.java +++ b/src/main/java/com/example/template/AbstractEvent.java @@ -56,7 +56,10 @@ public class AbstractEvent { return json; } - public void sendMessage(String json){ + public void publish(){ + this.publish(this.toJson()); + } + public void publish(String json){ if( json != null ){ /** diff --git a/src/main/java/com/example/template/Order.java b/src/main/java/com/example/template/Order.java index d5aa4d4..2039d06 100644 --- a/src/main/java/com/example/template/Order.java +++ b/src/main/java/com/example/template/Order.java @@ -75,7 +75,7 @@ public class Order { @ExceptionHandler(OrderException.class) private void publishOrderPlaced(){ OrderPlaced orderPlaced = new OrderPlaced(this); - orderPlaced.sendMessage(orderPlaced.toJson()); + orderPlaced.publish(); } /** @@ -91,7 +91,7 @@ public class Order { Order order = orderOptional.get(); OrderCancelled orderCancelled = new OrderCancelled(order); - orderCancelled.sendMessage(orderCancelled.toJson()); + orderCancelled.publish(); } } diff --git a/src/main/java/com/example/template/OrderCancelled.java b/src/main/java/com/example/template/OrderCancelled.java index 7a3394b..4f3c3a7 100644 --- a/src/main/java/com/example/template/OrderCancelled.java +++ b/src/main/java/com/example/template/OrderCancelled.java @@ -16,9 +16,7 @@ public class OrderCancelled extends AbstractEvent{ private String customerName; public OrderCancelled(){ - this.setEventType(this.getClass().getSimpleName()); - SimpleDateFormat defaultSimpleDateFormat = new SimpleDateFormat("YYYYMMddHHmmss"); - this.timestamp = defaultSimpleDateFormat.format(new Date()); + super(); } public OrderCancelled(Order order){ diff --git a/src/main/java/com/example/template/OrderController.java b/src/main/java/com/example/template/OrderController.java index 724fe9a..6334555 100644 --- a/src/main/java/com/example/template/OrderController.java +++ b/src/main/java/com/example/template/OrderController.java @@ -20,13 +20,13 @@ public class OrderController { @Autowired RestTemplate restTemplate; - @Value("${delivery.api.url:http://delivery:8080/startDelivery}") + @Value("${delivery.api.url:http://delivery:8080}") private String remoteURL; - @GetMapping("/order") - ResponseEntity fakeOrder() { + @PostMapping("/order") + ResponseEntity fakeOrder(@RequestBody String data) { try { - ResponseEntity responseEntity = restTemplate.getForEntity(remoteURL, String.class); + ResponseEntity responseEntity = restTemplate.postForEntity(remoteURL + "/startDelivery", data, String.class); String response = responseEntity.getBody(); return ResponseEntity.ok(String.format(RESPONSE_STRING_FORMAT, response.trim())); } catch (Exception ex) { diff --git a/src/main/java/com/example/template/OrderPlaced.java b/src/main/java/com/example/template/OrderPlaced.java index f38c001..6174b84 100644 --- a/src/main/java/com/example/template/OrderPlaced.java +++ b/src/main/java/com/example/template/OrderPlaced.java @@ -18,9 +18,7 @@ public class OrderPlaced extends AbstractEvent{ private String customerAddr; public OrderPlaced(){ - this.setEventType(this.getClass().getSimpleName()); - SimpleDateFormat defaultSimpleDateFormat = new SimpleDateFormat("YYYYMMddHHmmss"); - this.timestamp = defaultSimpleDateFormat.format(new Date()); + super(); } public OrderPlaced(Order order){ diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 08745b3..61f139d 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -39,6 +39,9 @@ spring: # org.springframework.cloud: debug productUrl: http://localhost:8085 +delivery: + api: + url: http://localhost:8082 server: port: 8081 diff --git a/src/test/java/com/example/template/ProductContractTest.java b/src/test/java/com/example/template/ProductContractTest.java index 71045b0..71e2afb 100644 --- a/src/test/java/com/example/template/ProductContractTest.java +++ b/src/test/java/com/example/template/ProductContractTest.java @@ -31,7 +31,8 @@ import java.util.Collections; // provide the [group-id]:[artifact-id] @AutoConfigureStubRunner(stubsMode = StubRunnerProperties.StubsMode.LOCAL, ids = "com.example:boot-camp-products") //@AutoConfigureStubRunner( -// repositoryRoot="http://34.85.54.161:8081/repository/maven-snapshots/", +// repositoryRoot="https://pkgs.dev.azure.com/eventstorming/_packaging/eventstorming/maven/v1/", +//// repositoryRoot="http://34.85.54.161:8081/repository/maven-snapshots/", // ids = "com.example:boot-camp-products:+:stubs:8090", // stubsMode = StubRunnerProperties.StubsMode.REMOTE //)