clean up

akuksin · akuksin · commit fa53509c361a · 2020-06-21T00:36:48.000+02:00
diff --git a/spring-boot/cache/gradlew b/spring-boot/cache/gradlew
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
@@ -3,7 +3,7 @@
 
 import com.hazelcast.client.HazelcastClient;
 import com.hazelcast.client.config.ClientConfig;
-import com.hazelcast.config.MapConfig;
+import com.hazelcast.config.NearCacheConfig;
 import com.hazelcast.core.HazelcastInstance;
 import com.hazelcast.spring.cache.HazelcastCacheManager;
 import org.springframework.cache.CacheManager;
@@ -21,12 +21,17 @@ public class ClientCacheConfig {
     @Bean
     ClientConfig config() {
         ClientConfig clientConfig = new ClientConfig();
-
-        MapConfig mapConfig = new MapConfig();
-        mapConfig.setTimeToLiveSeconds(300);
+        clientConfig.addNearCacheConfig(nearCacheConfig());
         return clientConfig;
     }
 
+    private NearCacheConfig nearCacheConfig() {
+        NearCacheConfig nearCacheConfig = new NearCacheConfig();
+        nearCacheConfig.setName("cars");
+        nearCacheConfig.setTimeToLiveSeconds(300);
+        return nearCacheConfig;
+    }
+
     @Bean
     HazelcastInstance hazelcastInstance() {
         return HazelcastClient.newHazelcastClient();
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
@@ -12,17 +12,16 @@
 @Configuration
 @EnableCaching
 @Profile("embedded")
-public class EmbeddedCacheConfig /*extends CachingConfigurerSupport*/ {
+public class EmbeddedCacheConfig {
 
     @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/rest/CarResource.java b/spring-boot/cache/src/main/java/io/reflectoring/cache/rest/CarResource.java
@@ -33,10 +33,6 @@ private CarDto createCar(@RequestBody CarDto carDto) {
 
     @PutMapping
     private CarDto updateCar(@RequestBody CarDto carDto) {
-        if (carDto.getId() == null){
-            // TODO add exception handler to return 400
-            throw new IllegalArgumentException("A car must have an id to be updated.");
-        }
         Car car = carMapper.toCar(carDto);
         return carMapper.toCarDto(carService.update(car));
     }
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,7 +2,6 @@
 
 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;
@@ -14,11 +13,9 @@
 public class CarService {
 
     private final CarRepository carRepository;
-    private final CacheManager cacheManager;
 
-    public CarService(CarRepository carRepository, CacheManager cacheManager) {
+    public CarService(CarRepository carRepository) {
         this.carRepository = carRepository;
-        this.cacheManager = cacheManager;
     }
 
     public Car saveCar(Car car) {
@@ -30,7 +27,6 @@ public Car update(Car car) {
         if (carRepository.existsById(car.getId())) {
             return carRepository.save(car);
         }
-        // TODO add an exception handle and a dedicated exception
         throw new IllegalArgumentException("A car mus have an id to be updated");
     }
 
@@ -43,13 +39,6 @@ public Car get(UUID uuid) {
     @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);
     }
 
 }
