diff --git a/build.gradle b/build.gradle index 8db8001..a34e501 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,7 @@ plugins { id 'war' id 'org.gretty' version '2.2.0' + id 'io.franzbecker.gradle-lombok' version '1.14' } repositories { @@ -11,9 +12,17 @@ repositories { sourceCompatibility = 10 dependencies { + // https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-databind + compile group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.9.7' + compileOnly 'javax.servlet:javax.servlet-api:4.0.1' } gretty { contextPath = '/' } + +lombok { + version = '1.18.2' + sha256 = "" +} diff --git a/src/main/java/DTO/Order.java b/src/main/java/DTO/Order.java new file mode 100644 index 0000000..2961f02 --- /dev/null +++ b/src/main/java/DTO/Order.java @@ -0,0 +1,9 @@ +package DTO; +import lombok.Data; + +import java.util.List; + +public @Data class Order { + private String orderNumber; + private List orderRows; +} diff --git a/src/main/java/DTO/OrderItem.java b/src/main/java/DTO/OrderItem.java new file mode 100644 index 0000000..a30fe14 --- /dev/null +++ b/src/main/java/DTO/OrderItem.java @@ -0,0 +1,9 @@ +package DTO; + +import lombok.Data; + +public @Data class OrderItem { + private String itemName; + private Integer quantity; + private Integer price; +} diff --git a/src/main/java/api/Orders.java b/src/main/java/api/Orders.java index 4f21951..013a2fd 100644 --- a/src/main/java/api/Orders.java +++ b/src/main/java/api/Orders.java @@ -25,17 +25,7 @@ public class Orders extends HttpServlet { protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { resp.setContentType("application/json"); String order = req.getReader().lines().collect(Collectors.joining(" ")); - int orderId = lastOrderId++; - Matcher matcher = orderPattern.matcher(order); - boolean matches = matcher.matches(); - if (matches && matcher.groupCount() > 0) { - String orderNumber = matcher.group(1); - System.out.format("request data: %s, orderNumber: %s\n", order, orderNumber); - resp.getWriter().printf("{\"id\": %d, \"orderNumber\": \"%s\"}", orderId, orderNumber); - } else { - resp.getWriter().print("\"Invalid request\""); - } }