add hazelcast with client-server topology

akuksin · akuksin · commit 2273d59166b9 · 2020-06-18T23:11:44.000+02:00
diff --git a/spring-boot/cache/build.gradle b/spring-boot/cache/build.gradle
@@ -23,6 +23,11 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-web'
     implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
     implementation 'org.flywaydb:flyway-core'
+
+    compile("com.hazelcast:hazelcast:4.0.1")
+    compile("com.hazelcast:hazelcast-spring:4.0.1")
+    testCompile "org.testcontainers:testcontainers:1.12.5"
+
     runtimeOnly 'com.h2database:h2'
     compileOnly 'org.projectlombok:lombok'
     annotationProcessor 'org.projectlombok:lombok'
diff --git a/spring-boot/cache/src/main/java/io/reflectoring/cache/configiration/ClientCacheConfig.java b/spring-boot/cache/src/main/java/io/reflectoring/cache/configiration/ClientCacheConfig.java
@@ -0,0 +1,40 @@
+package io.reflectoring.cache.configiration;
+
+
+import com.hazelcast.client.HazelcastClient;
+import com.hazelcast.client.config.ClientConfig;
+import com.hazelcast.config.MapConfig;
+import com.hazelcast.core.HazelcastInstance;
+import com.hazelcast.spring.cache.HazelcastCacheManager;
+import org.springframework.cache.CacheManager;
+import org.springframework.cache.annotation.EnableCaching;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Profile;
+
+
+@Configuration
+@EnableCaching
+@Profile("client")
+public class ClientCacheConfig {
+
+    @Bean
+    ClientConfig config() {
+        ClientConfig clientConfig = new ClientConfig();
+
+        MapConfig mapConfig = new MapConfig();
+        mapConfig.setTimeToLiveSeconds(300);
+        return clientConfig;
+    }
+
+    @Bean
+    HazelcastInstance hazelcastInstance() {
+        return HazelcastClient.newHazelcastClient();
+    }
+
+    @Bean
+    CacheManager cacheManager() {
+        return new HazelcastCacheManager(hazelcastInstance());
+    }
+
+}
diff --git a/spring-boot/cache/src/main/java/io/reflectoring/cache/configiration/EmbeddedCacheConfig.java b/spring-boot/cache/src/main/java/io/reflectoring/cache/configiration/EmbeddedCacheConfig.java
@@ -0,0 +1,29 @@
+package io.reflectoring.cache.configiration;
+
+
+import com.hazelcast.config.Config;
+import com.hazelcast.config.MapConfig;
+import org.springframework.cache.annotation.EnableCaching;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Profile;
+
+
+@Configuration
+@EnableCaching
+@Profile("embedded")
+public class EmbeddedCacheConfig /*extends CachingConfigurerSupport*/ {
+
+    @Bean
+    Config config(){
+        Config config = new Config();
+
+        MapConfig mapConfig = new MapConfig();
+        mapConfig.setTimeToLiveSeconds(300);
+        //mapConfig.setMaxIdleSeconds(10);
+
+        config.getMapConfigs().put("cars", mapConfig);
+        return config;
+    }
+
+}
diff --git a/spring-boot/cache/src/main/java/io/reflectoring/cache/dao/Car.java b/spring-boot/cache/src/main/java/io/reflectoring/cache/dao/Car.java
@@ -9,14 +9,15 @@
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
+import java.io.Serializable;
 import java.util.UUID;
 
 @Entity
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
-public class Car {
+public class Car implements Serializable {
 
     @Id
     @GeneratedValue(strategy = GenerationType.AUTO)
diff --git a/spring-boot/cache/src/main/java/io/reflectoring/cache/rest/CarResource.java b/spring-boot/cache/src/main/java/io/reflectoring/cache/rest/CarResource.java
@@ -2,6 +2,7 @@
 
 import io.reflectoring.cache.dao.Car;
 import io.reflectoring.cache.service.CarService;
+import org.springframework.cache.CacheManager;
 import org.springframework.http.HttpStatus;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
@@ -15,10 +16,12 @@ public class CarResource {
 
     private final CarService carService;
     private final CarMapper carMapper;
+    private final CacheManager cacheManager;
 
-    public CarResource(CarService carService, CarMapper carMapper) {
+    public CarResource(CarService carService, CarMapper carMapper, CacheManager cacheManager) {
         this.carService = carService;
         this.carMapper = carMapper;
+        this.cacheManager = cacheManager;
     }
 
     @PostMapping
diff --git a/spring-boot/cache/src/main/java/io/reflectoring/cache/service/CarService.java b/spring-boot/cache/src/main/java/io/reflectoring/cache/service/CarService.java
@@ -2,6 +2,10 @@
 
 import io.reflectoring.cache.dao.Car;
 import io.reflectoring.cache.dao.CarRepository;
+import org.springframework.cache.CacheManager;
+import org.springframework.cache.annotation.CacheEvict;
+import org.springframework.cache.annotation.CachePut;
+import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 
 import java.util.UUID;
@@ -10,15 +14,18 @@
 public class CarService {
 
     private final CarRepository carRepository;
+    private final CacheManager cacheManager;
 
-    public CarService(CarRepository carRepository) {
+    public CarService(CarRepository carRepository, CacheManager cacheManager) {
         this.carRepository = carRepository;
+        this.cacheManager = cacheManager;
     }
 
     public Car saveCar(Car car) {
         return carRepository.save(car);
     }
 
+    @CachePut(value = "cars")
     public Car update(Car car) {
         if (carRepository.existsById(car.getId())) {
             return carRepository.save(car);
@@ -27,13 +34,22 @@ public Car update(Car car) {
         throw new IllegalArgumentException("A car mus have an id to be updated");
     }
 
+    @Cacheable(value = "cars")
     public Car get(UUID uuid) {
         return carRepository.findById(uuid)
                 .orElseThrow(() -> new IllegalStateException("car with id " + uuid + " was not found"));
     }
 
+    @CacheEvict(value = "cars")
     public void delete(UUID uuid) {
         carRepository.deleteById(uuid);
+        System.out.println(cacheManager.getClass().getCanonicalName());
+//        long cacheHits = ((HazelcastCacheManager) cacheManager).getHazelcastInstance().getMap("cars").getLocalMapStats().getHits();
+//        System.out.println(((HazelcastCacheManager) cacheManager).getHazelcastInstance().getMap("cars").getLocalMapStats());
+//        long cacheMisses = ((HazelcastCacheManager) cacheManager).getHazelcastInstance().getCacheManager().getCache("cars").getLocalCacheStatistics().getCacheMisses();
+//
+//        System.out.println("hits:" + cacheHits);
+//        System.out.println("misses:" + cacheMisses);
     }
 
 }
diff --git a/spring-boot/cache/src/main/resources/application.yaml b/spring-boot/cache/src/main/resources/application.yaml
@@ -1 +0,0 @@
-
diff --git a/spring-boot/cache/src/test/java/io/reflectoring/cache/AbstractIntegrationTest.java b/spring-boot/cache/src/test/java/io/reflectoring/cache/AbstractIntegrationTest.java
@@ -0,0 +1,22 @@
+package io.reflectoring.cache;
+
+import org.junit.jupiter.api.BeforeAll;
+import org.testcontainers.containers.FixedHostPortGenericContainer;
+import org.testcontainers.containers.GenericContainer;
+
+public class AbstractIntegrationTest {
+
+  static GenericContainer firstMember =
+      new FixedHostPortGenericContainer("hazelcast/hazelcast:4.0.1")
+          .withFixedExposedPort(5701, 5701);
+
+  static GenericContainer secondMember =
+      new FixedHostPortGenericContainer("hazelcast/hazelcast:4.0.1")
+          .withFixedExposedPort(5702, 5701);
+
+    @BeforeAll
+    public static void init() {
+        firstMember.start();
+        secondMember.start();
+    }
+}
diff --git a/spring-boot/cache/src/test/java/io/reflectoring/cache/CacheApplicationTests.java b/spring-boot/cache/src/test/java/io/reflectoring/cache/CacheApplicationTests.java
diff --git a/spring-boot/cache/src/test/java/io/reflectoring/cache/rest/CarResourceClientCacheIntegrationTest.java b/spring-boot/cache/src/test/java/io/reflectoring/cache/rest/CarResourceClientCacheIntegrationTest.java
@@ -0,0 +1,96 @@
+package io.reflectoring.cache.rest;
+
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import io.reflectoring.cache.AbstractIntegrationTest;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.http.MediaType;
+import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.web.servlet.MockMvc;
+
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+@SpringBootTest
+@AutoConfigureMockMvc
+@ActiveProfiles("client")
+class CarResourceClientCacheIntegrationTest extends AbstractIntegrationTest {
+
+    @Autowired
+    private MockMvc mockMvc;
+
+    @Autowired
+    private ObjectMapper objectMapper;
+
+    @Test
+    void manageCar() throws Exception {
+        // given
+        CarDto newCarDto = CarDto.builder()
+                .name("vw")
+                .color("white")
+                .build();
+
+        // when
+        String response = mockMvc.perform(
+                post("/cars")
+                        .content(objectMapper.writeValueAsString(newCarDto))
+                        .contentType(MediaType.APPLICATION_JSON)
+        )
+                // then
+                .andExpect(status().isCreated())
+                .andReturn()
+                .getResponse()
+                .getContentAsString();
+
+        mockMvc.perform(
+                post("/cars")
+                        .content(objectMapper.writeValueAsString(newCarDto))
+                        .contentType(MediaType.APPLICATION_JSON)
+        )
+                // then
+                .andExpect(status().isCreated());
+
+        CarDto carDto = objectMapper.readValue(response, CarDto.class);
+        carDto.setName("bmw");
+
+        mockMvc.perform(
+                put("/cars")
+                        .content(objectMapper.writeValueAsString(carDto))
+                        .contentType(MediaType.APPLICATION_JSON)
+        )
+                // then
+                .andExpect(status().isOk());
+
+        // when
+        mockMvc.perform(
+                get("/cars/" + carDto.getId())
+                        .contentType(MediaType.APPLICATION_JSON)
+        )
+                // then
+                .andExpect(status().isOk());
+
+        mockMvc.perform(
+                get("/cars/" + carDto.getId())
+                        .contentType(MediaType.APPLICATION_JSON)
+        )
+                // then
+                .andExpect(status().isOk());
+
+        mockMvc.perform(
+                get("/cars/" + carDto.getId())
+                        .contentType(MediaType.APPLICATION_JSON)
+        )
+                // then
+                .andExpect(status().isOk());
+
+        // when
+        mockMvc.perform(
+                delete("/cars/" + carDto.getId())
+        )
+                // then
+                .andExpect(status().isNoContent());
+    }
+}
diff --git a/spring-boot/cache/src/test/java/io/reflectoring/cache/rest/CarResourceEmbeddedCacheIntegrationTest.java b/spring-boot/cache/src/test/java/io/reflectoring/cache/rest/CarResourceEmbeddedCacheIntegrationTest.java
diff --git a/spring-boot/cache/src/test/java/io/reflectoring/cache/rest/CarResourceTest.java b/spring-boot/cache/src/test/java/io/reflectoring/cache/rest/CarResourceTest.java
