make Car serializable.

akuksin · akuksin · commit fe79d77b62d3 · 2020-05-26T22:44:34.000+02:00
diff --git a/spring-boot/hazelcast/hazelcast-embeded-cache/src/main/java/io/refectoring/cache/embedded/HazelcastNode.java b/spring-boot/hazelcast/hazelcast-embeded-cache/src/main/java/io/refectoring/cache/embedded/HazelcastNode.java
@@ -5,6 +5,7 @@
 import com.hazelcast.core.Hazelcast;
 import com.hazelcast.core.HazelcastInstance;
 import com.hazelcast.map.IMap;
+import io.refectoring.cache.embedded.rest.Car;
 import org.springframework.stereotype.Component;
 
 @Component
@@ -13,20 +14,21 @@ public class HazelcastNode {
     public static final String CARS = "cars";
     private final HazelcastInstance hzInstance = Hazelcast.newHazelcastInstance(createConfig());
 
-    public String put(String key, String value){
+    public String put(String number, Car car){
         IMap<Object, Object> map = hzInstance.getMap(CARS);
-        return (String) map.put(key, value);
+        return (String) map.put(number, car);
     }
 
-    public String get(String key){
+    public Car get(String key){
         IMap<Object, Object> map = hzInstance.getMap(CARS);
-        return (String) map.get(key);
+        return (Car) map.get(key);
     }
 
     public Config createConfig() {
         Config config = new Config();
         MapConfig mapConfig = new MapConfig(CARS);
         mapConfig.setTimeToLiveSeconds(20);
+        mapConfig.setMaxIdleSeconds(360);
         config.addMapConfig(mapConfig);
         return config;
     }
diff --git a/spring-boot/hazelcast/hazelcast-embeded-cache/src/main/java/io/refectoring/cache/embedded/rest/Car.java b/spring-boot/hazelcast/hazelcast-embeded-cache/src/main/java/io/refectoring/cache/embedded/rest/Car.java
@@ -5,11 +5,13 @@
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.io.Serializable;
+
 @Data
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-public class Car {
+public class Car implements Serializable {
     private String number;
     private String name;
 }
diff --git a/spring-boot/hazelcast/hazelcast-embeded-cache/src/main/java/io/refectoring/cache/embedded/rest/Controller.java b/spring-boot/hazelcast/hazelcast-embeded-cache/src/main/java/io/refectoring/cache/embedded/rest/Controller.java
@@ -16,18 +16,14 @@ public Controller(HazelcastNode hazelcastNode) {
         this.hazelcastNode = hazelcastNode;
     }
 
-    @PostMapping(produces = MediaType.APPLICATION_JSON_VALUE)
+    @PostMapping(path = "/{number}", produces= MediaType.APPLICATION_JSON_VALUE)
     @ResponseStatus(code = HttpStatus.CREATED)
-    public String put(@RequestBody Car car){
-        return hazelcastNode.put(car.getNumber(), car.getName());
+    public String put(@RequestBody Car car, @PathVariable String number) {
+        return hazelcastNode.put(number, car);
     }
 
     @GetMapping(value = "/{number}", produces = MediaType.APPLICATION_JSON_VALUE)
-    public Car get(@PathVariable String number){
-        String value = hazelcastNode.get(number);
-        return Car.builder()
-                .number(number)
-                .name(value)
-                .build();
+    public Car get(@PathVariable String number) {
+        return hazelcastNode.get(number);
     }
 }
diff --git a/spring-boot/hazelcast/hazelcast-embeded-cache/src/test/java/io/refectoring/cache/embedded/rest/ControllerTest.java b/spring-boot/hazelcast/hazelcast-embeded-cache/src/test/java/io/refectoring/cache/embedded/rest/ControllerTest.java
@@ -27,7 +27,7 @@ class ControllerTest {
     @Test
     void putGet() throws Exception {
         // given
-        String number = "BO 5489";
+        String number = "BO5489";
         Car car = Car.builder()
                 .number(number)
                 .name("VW")
@@ -36,7 +36,7 @@ void putGet() throws Exception {
         // put
         String content = objectMapper.writeValueAsString(car);
         mockMvc.perform(
-                post("/cars")
+                post("/cars/" + number)
                         .content(content)
                 .contentType(MediaType.APPLICATION_JSON_VALUE)
         ).andExpect(status().isCreated());

Original file line number	Diff line number	Diff line change
`@@ -16,18 +16,14 @@ public Controller(HazelcastNode hazelcastNode) {`
`16`	`16`	`this.hazelcastNode = hazelcastNode;`
`17`	`17`	`}`
`18`	`18`
`19`		`- @PostMapping(produces = MediaType.APPLICATION_JSON_VALUE)`
	`19`	`+ @PostMapping(path = "/{number}", produces= MediaType.APPLICATION_JSON_VALUE)`
`20`	`20`	`@ResponseStatus(code = HttpStatus.CREATED)`
`21`		`- public String put(@RequestBody Car car){`
`22`		`- return hazelcastNode.put(car.getNumber(), car.getName());`
	`21`	`+ public String put(@RequestBody Car car, @PathVariable String number) {`
	`22`	`+ return hazelcastNode.put(number, car);`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`@GetMapping(value = "/{number}", produces = MediaType.APPLICATION_JSON_VALUE)`
`26`		`- public Car get(@PathVariable String number){`
`27`		`- String value = hazelcastNode.get(number);`
`28`		`- return Car.builder()`
`29`		`- .number(number)`
`30`		`- .name(value)`
`31`		`- .build();`
	`26`	`+ public Car get(@PathVariable String number) {`
	`27`	`+ return hazelcastNode.get(number);`
`32`	`28`	`}`
`33`	`29`	`}`