Make sure old cached are cleaned up on daily maintenance

bassages · Mar 30, 2024 · 1f11b55 · 1f11b55
1 parent 016f983
commit 1f11b55
Show file tree

Hide file tree

Showing 34 changed files with 285 additions and 163 deletions.
diff --git a/build.gradle b/build.gradle
@@ -56,7 +56,6 @@ compileJava {
 
 compileTestJava {
     options.encoding = 'UTF-8'
-    options.compilerArgs << "-Xlint:unchecked" << "-Xlint:deprecation" << "-Werror"
 }
 
 if (System.getenv("GITHUB_TAG") != null) {

diff --git a/etc/properties/application.properties b/etc/properties/application.properties
@@ -10,11 +10,11 @@ logging.level.nl.homeserver.energy=WARN
 logging.level.nl.homeserver.energy.MeterstandHousekeeping=INFO
 logging.level.nl.homeserver.energy.OpgenomenVermogenHousekeeping=INFO
 
-logging.level.nl.homeserver.climate.KlimaatCacheWarmer=INFO
-logging.level.nl.homeserver.energy.meterreading.MeterstandCacheWarmer=INFO
-logging.level.nl.homeserver.energy.opgenomenvermogen.OpgenomenVermogenCacheWarmer=INFO
-logging.level.nl.homeserver.energy.standbypower.StandbyPowerCacheWarmer=INFO
-logging.level.nl.homeserver.energy.verbruikkosten.VerbruikKostenCacheWarmer=INFO
+logging.level.nl.homeserver.climate.KlimaatCacheMaintainer=INFO
+logging.level.nl.homeserver.energy.meterreading.MeterstandCacheMaintainer=INFO
+logging.level.nl.homeserver.energy.opgenomenvermogen.OpgenomenVermogenCacheMaintainer=INFO
+logging.level.nl.homeserver.energy.standbypower.StandbyPowerCacheMaintainer=INFO
+logging.level.nl.homeserver.energy.verbruikkosten.VerbruikKostenCacheMaintainer=INFO
 
 logging.level.org.springframework.web.socket.config=WARN
 

diff --git a/src/main/java/nl/homeserver/CachingConfiguration.java b/src/main/java/nl/homeserver/CachingConfiguration.java
@@ -22,16 +22,23 @@
 @EnableCaching
 public class CachingConfiguration {
 
+    public static final String CACHE_NAME_AVERAGE_CLIMATE_IN_MONTH = "averageClimateInMonth";
+    public static final String CACHE_NAME_CLIMATE_IN_PERIOD = "climateInPeriod";
+    public static final String CACHE_NAME_MEEST_RECENTE_METERSTAND_OP_DAG = "meestRecenteMeterstandOpDag";
+    public static final String CACHE_NAME_STANDBY_POWER = "standbyPower";
+    public static final String CACHE_NAME_GAS_VERBRUIK_IN_PERIODE = "gasVerbruikInPeriode";
+    public static final String CACHE_NAME_STROOM_VERBRUIK_IN_PERIODE = "stroomVerbruikInPeriode";
+    public static final String CACHE_NAME_OPGENOMEN_VERMOGEN_HISTORY = "opgenomenVermogenHistory";
+
     private static final Map<String, Integer> CACHES = Map.of(
             "energyContractsInPeriod", 20,
-            "gasVerbruikInPeriode", 100,
-            "stroomVerbruikInPeriode", 100,
-            "energieVerbruikInPeriode",100,
-            "opgenomenVermogenHistory", 100,
-            "meestRecenteMeterstandOpDag",100,
-            "klimaatInPeriod", 100,
-            "averageKlimaatInMonth", 48,
-            "standbyPower", 48
+            CACHE_NAME_GAS_VERBRUIK_IN_PERIODE, 100,
+            CACHE_NAME_STROOM_VERBRUIK_IN_PERIODE, 100,
+            CACHE_NAME_OPGENOMEN_VERMOGEN_HISTORY, 100,
+            CACHE_NAME_MEEST_RECENTE_METERSTAND_OP_DAG,100,
+            CACHE_NAME_CLIMATE_IN_PERIOD, 100,
+            CACHE_NAME_AVERAGE_CLIMATE_IN_MONTH, 48,
+            CACHE_NAME_STANDBY_POWER, 48
     );
 
     // IntelliJ: "Method '...' is never used"

diff --git a/src/main/java/nl/homeserver/cache/DailyCacheMaintainer.java b/src/main/java/nl/homeserver/cache/DailyCacheMaintainer.java
@@ -0,0 +1,6 @@
+package nl.homeserver.cache;
+
+public interface DailyCacheMaintainer {
+
+    void maintainCacheDaily();
+}
diff --git a/src/main/java/nl/homeserver/cache/DailyCacheMaintenance.java b/src/main/java/nl/homeserver/cache/DailyCacheMaintenance.java
@@ -0,0 +1,32 @@
+package nl.homeserver.cache;
+
+import lombok.extern.slf4j.Slf4j;
+import nl.homeserver.housekeeping.HousekeepingSchedule;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+@Slf4j
+@Component
+class DailyCacheMaintenance {
+
+    private final List<DailyCacheMaintainer> dailyCacheMaintainers;
+
+    @Value("${home-server.cache.maintenance.daily}")
+    private boolean isDailyCacheMaintenanceEnabled;
+
+    DailyCacheMaintenance(final List<DailyCacheMaintainer> dailyCacheMaintainers) {
+        this.dailyCacheMaintainers = dailyCacheMaintainers;
+    }
+
+    @Scheduled(cron = HousekeepingSchedule.WARMUP_CACHE)
+    public void considerDailyWarmup() {
+        if (isDailyCacheMaintenanceEnabled) {
+            log.info("Maintaining cache start");
+            dailyCacheMaintainers.forEach(DailyCacheMaintainer::maintainCacheDaily);
+            log.info("Maintaining cache completed");
+        }
+    }
+}
diff --git a/src/main/java/nl/homeserver/cache/DailyCacheWarmer.java b/src/main/java/nl/homeserver/cache/DailyCacheWarmer.java
diff --git a/src/main/java/nl/homeserver/cache/WarmupCacheDaily.java b/src/main/java/nl/homeserver/cache/WarmupCacheDaily.java
diff --git a/...omeserver/climate/KlimaatCacheWarmer.java → ...erver/climate/KlimaatCacheMaintainer.java b/...omeserver/climate/KlimaatCacheWarmer.java → ...erver/climate/KlimaatCacheMaintainer.java
@@ -2,24 +2,28 @@
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import nl.homeserver.cache.DailyCacheWarmer;
+import nl.homeserver.cache.DailyCacheMaintainer;
 import nl.homeserver.cache.StartupCacheWarmer;
 import org.springframework.stereotype.Component;
 
+import javax.cache.CacheManager;
 import java.time.Clock;
 import java.time.LocalDate;
 import java.util.List;
 import java.util.stream.Stream;
 
 import static java.time.LocalDate.now;
+import static nl.homeserver.CachingConfiguration.CACHE_NAME_AVERAGE_CLIMATE_IN_MONTH;
+import static nl.homeserver.CachingConfiguration.CACHE_NAME_CLIMATE_IN_PERIOD;
 import static nl.homeserver.DatePeriod.aPeriodWithToDate;
 
 @Slf4j
 @Component
 @RequiredArgsConstructor
-class KlimaatCacheWarmer implements StartupCacheWarmer, DailyCacheWarmer {
+class KlimaatCacheMaintainer implements StartupCacheWarmer, DailyCacheMaintainer {
 
     private final KlimaatController klimaatController;
+    private final CacheManager cacheManager;
     private final Clock clock;
 
     @Override
@@ -44,7 +48,10 @@ public void warmupCacheOnStartup() {
     }
 
     @Override
-    public void warmupCacheDaily() {
+    public void maintainCacheDaily() {
+        cacheManager.getCache(CACHE_NAME_AVERAGE_CLIMATE_IN_MONTH).clear();
+        cacheManager.getCache(CACHE_NAME_CLIMATE_IN_PERIOD).clear();
+
         final LocalDate today = now(clock);
         final LocalDate yesterday = today.minusDays(1);
 

diff --git a/src/main/java/nl/homeserver/climate/KlimaatController.java b/src/main/java/nl/homeserver/climate/KlimaatController.java
@@ -53,7 +53,7 @@ public KlimaatSensor update(@PathVariable("sensorCode") final String sensorCode,
     @DeleteMapping("sensors/{sensorCode}")
     public void delete(@PathVariable("sensorCode") final String sensorCode) {
         final KlimaatSensor existingKlimaatSensor = getKlimaatSensorExpectingOne(sensorCode);
-        klimaatService.deleteByKlimaatSensor(existingKlimaatSensor);
+        klimaatService.deleteByClimateSensor(existingKlimaatSensor);
         klimaatSensorService.delete(existingKlimaatSensor);
     }
 

diff --git a/src/main/java/nl/homeserver/climate/KlimaatRepos.java b/src/main/java/nl/homeserver/climate/KlimaatRepos.java
@@ -188,5 +188,5 @@ BigDecimal getAverageLuchtvochtigheid(@Param("sensorCode") String sensorCode,
                                           @Param("van") LocalDateTime van,
                                           @Param("tot") LocalDateTime tot);
 
-    void deleteByKlimaatSensorCode(String klimaatSensorCode);
+    void deleteByKlimaatSensorCode(String climateSensorCode);
 }
diff --git a/src/main/java/nl/homeserver/climate/KlimaatService.java b/src/main/java/nl/homeserver/climate/KlimaatService.java
@@ -112,7 +112,7 @@ private List<Klimaat> getHighestHumidity(final String sensorCode, final DatePeri
                                 .toList();
     }
 
-    void deleteByKlimaatSensor(final KlimaatSensor klimaatSensor) {
+    void deleteByClimateSensor(final KlimaatSensor klimaatSensor) {
         this.klimaatRepository.deleteByKlimaatSensorCode(klimaatSensor.getCode());
     }
 }
diff --git a/src/main/java/nl/homeserver/climate/KlimaatServiceHelper.java b/src/main/java/nl/homeserver/climate/KlimaatServiceHelper.java
@@ -11,16 +11,16 @@
 import java.time.YearMonth;
 import java.util.List;
 
+import static nl.homeserver.CachingConfiguration.CACHE_NAME_AVERAGE_CLIMATE_IN_MONTH;
+import static nl.homeserver.CachingConfiguration.CACHE_NAME_CLIMATE_IN_PERIOD;
 import static nl.homeserver.DatePeriod.aPeriodWithToDate;
 
 @Service
 @RequiredArgsConstructor
 public class KlimaatServiceHelper {
-    private static final String CACHE_NAME_AVERAGE_KLIMAAT_IN_MONTH = "averageKlimaatInMonth";
-
     private final KlimaatRepos klimaatRepository;
 
-    @Cacheable(cacheNames = CACHE_NAME_AVERAGE_KLIMAAT_IN_MONTH)
+    @Cacheable(cacheNames = CACHE_NAME_AVERAGE_CLIMATE_IN_MONTH)
     public GemiddeldeKlimaatPerMaand getPotentiallyCachedAverageInMonthOfYear(final String sensorCode,
                                                                               final SensorType sensorType,
                                                                               final YearMonth yearMonth) {
@@ -46,7 +46,7 @@ private BigDecimal getAverage(final String sensorCode, final SensorType sensorTy
         };
     }
 
-    @Cacheable(cacheNames = "klimaatInPeriod")
+    @Cacheable(cacheNames = CACHE_NAME_CLIMATE_IN_PERIOD)
     public List<Klimaat> getPotentiallyCachedAllInPeriod(final String klimaatSensorCode, final DatePeriod period) {
         return getNotCachedAllInPeriod(klimaatSensorCode, period);
     }

diff --git a/...y/meterreading/MeterstandCacheWarmer.java → ...terreading/MeterstandCacheMaintainer.java b/...y/meterreading/MeterstandCacheWarmer.java → ...terreading/MeterstandCacheMaintainer.java
@@ -2,10 +2,11 @@
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import nl.homeserver.cache.DailyCacheWarmer;
+import nl.homeserver.cache.DailyCacheMaintainer;
 import nl.homeserver.cache.StartupCacheWarmer;
 import org.springframework.stereotype.Component;
 
+import javax.cache.CacheManager;
 import java.time.Clock;
 import java.time.LocalDate;
 import java.time.Month;
@@ -15,14 +16,16 @@
 import static java.time.temporal.TemporalAdjusters.lastDayOfMonth;
 import static java.util.Comparator.reverseOrder;
 import static java.util.stream.LongStream.rangeClosed;
+import static nl.homeserver.CachingConfiguration.CACHE_NAME_MEEST_RECENTE_METERSTAND_OP_DAG;
 
 @Slf4j
 @Component
 @RequiredArgsConstructor
-class MeterstandCacheWarmer implements StartupCacheWarmer, DailyCacheWarmer {
+class MeterstandCacheMaintainer implements StartupCacheWarmer, DailyCacheMaintainer {
     private static final Month[] MONTHS = Month.values();
 
     private final MeterstandController meterstandController;
+    private final CacheManager cacheManager;
     private final Clock clock;
 
     @Override
@@ -39,7 +42,9 @@ public void warmupCacheOnStartup() {
     }
 
     @Override
-    public void warmupCacheDaily() {
+    public void maintainCacheDaily() {
+        cacheManager.getCache(CACHE_NAME_MEEST_RECENTE_METERSTAND_OP_DAG).clear();
+
         final LocalDate today = now(clock);
         final LocalDate yesterday = today.minusDays(1);
 

diff --git a/src/main/java/nl/homeserver/energy/meterreading/MeterstandHousekeeping.java b/src/main/java/nl/homeserver/energy/meterreading/MeterstandHousekeeping.java
@@ -3,7 +3,6 @@
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import nl.homeserver.cache.CacheService;
-import nl.homeserver.energy.verbruikkosten.VerbruikKostenOverzichtService;
 import nl.homeserver.housekeeping.HousekeepingSchedule;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
@@ -17,6 +16,8 @@
 
 import static java.util.Comparator.comparing;
 import static java.util.stream.Collectors.groupingBy;
+import static nl.homeserver.CachingConfiguration.CACHE_NAME_GAS_VERBRUIK_IN_PERIODE;
+import static nl.homeserver.CachingConfiguration.CACHE_NAME_STROOM_VERBRUIK_IN_PERIODE;
 
 @Slf4j
 @Service
@@ -63,8 +64,8 @@ private void cleanup(final LocalDate day) {
     }
 
     private void clearCachesThatUsesPossibleDeletedMeterstanden() {
-        cacheService.clear(VerbruikKostenOverzichtService.CACHE_NAME_GAS_VERBRUIK_IN_PERIODE);
-        cacheService.clear(VerbruikKostenOverzichtService.CACHE_NAME_STROOM_VERBRUIK_IN_PERIODE);
+        cacheService.clear(CACHE_NAME_GAS_VERBRUIK_IN_PERIODE);
+        cacheService.clear(CACHE_NAME_STROOM_VERBRUIK_IN_PERIODE);
     }
 
     private void cleanupMeterStandenInOneHour(final int hour, final List<Meterstand> meterstandenInOneHour) {

diff --git a/src/main/java/nl/homeserver/energy/meterreading/MostResentMeterstandOpDagService.java b/src/main/java/nl/homeserver/energy/meterreading/MostResentMeterstandOpDagService.java
@@ -8,12 +8,11 @@
 import java.time.LocalDateTime;
 import java.util.Optional;
 
+import static nl.homeserver.CachingConfiguration.CACHE_NAME_MEEST_RECENTE_METERSTAND_OP_DAG;
+
 @RequiredArgsConstructor
 @Service
 public class MostResentMeterstandOpDagService {
-
-    private static final String CACHE_NAME_MEEST_RECENTE_METERSTAND_OP_DAG = "meestRecenteMeterstandOpDag";
-
     private final MeterstandRepository meterstandRepository;
 
     @Cacheable(cacheNames = CACHE_NAME_MEEST_RECENTE_METERSTAND_OP_DAG)

diff --git a/...ermogen/OpgenomenVermogenCacheWarmer.java → ...gen/OpgenomenVermogenCacheMaintainer.java b/...ermogen/OpgenomenVermogenCacheWarmer.java → ...gen/OpgenomenVermogenCacheMaintainer.java
@@ -2,24 +2,27 @@
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import nl.homeserver.cache.DailyCacheWarmer;
+import nl.homeserver.cache.DailyCacheMaintainer;
 import nl.homeserver.cache.StartupCacheWarmer;
 import org.springframework.stereotype.Component;
 
+import javax.cache.CacheManager;
 import java.time.Clock;
 import java.time.LocalDate;
 
 import static java.time.LocalDate.now;
 import static java.util.concurrent.TimeUnit.MINUTES;
+import static nl.homeserver.CachingConfiguration.CACHE_NAME_OPGENOMEN_VERMOGEN_HISTORY;
 import static nl.homeserver.DatePeriod.aPeriodWithToDate;
 
 @Slf4j
 @Component
 @RequiredArgsConstructor
-class OpgenomenVermogenCacheWarmer implements StartupCacheWarmer, DailyCacheWarmer {
+class OpgenomenVermogenCacheMaintainer implements StartupCacheWarmer, DailyCacheMaintainer {
     private static final long DEFAULT_SUB_PERIOD_LENGTH_IN_SECONDS = MINUTES.toMillis(3);
 
     private final OpgenomenVermogenController opgenomenVermogenController;
+    private final CacheManager cacheManager;
     private final Clock clock;
 
     @Override
@@ -31,8 +34,10 @@ public void warmupCacheOnStartup() {
     }
 
     @Override
-    public void warmupCacheDaily() {
-        log.info("Warmup of cache opgenomenVermogenHistory");
+    public void maintainCacheDaily() {
+        log.info("Maintenance of cache %s".formatted(CACHE_NAME_OPGENOMEN_VERMOGEN_HISTORY));
+        cacheManager.getCache(CACHE_NAME_OPGENOMEN_VERMOGEN_HISTORY).clear();
+
         final LocalDate yesterday = now(clock).minusDays(1);
         warmupCacheForDay(yesterday);
     }

diff --git a/src/main/java/nl/homeserver/energy/opgenomenvermogen/OpgenomenVermogenHousekeeping.java b/src/main/java/nl/homeserver/energy/opgenomenvermogen/OpgenomenVermogenHousekeeping.java
@@ -16,6 +16,7 @@
 
 import static java.util.Comparator.comparingInt;
 import static java.util.stream.Collectors.groupingBy;
+import static nl.homeserver.CachingConfiguration.CACHE_NAME_OPGENOMEN_VERMOGEN_HISTORY;
 
 @Slf4j
 @Service
@@ -36,7 +37,7 @@ public class OpgenomenVermogenHousekeeping {
     public void start() {
         log.info("Start housekeeping of OpgenomenVermogen");
         findDaysToCleanup().forEach(this::cleanup);
-        cacheService.clear(OpgenomenVermogenService.CACHE_NAME_OPGENOMEN_VERMOGEN_HISTORY);
+        cacheService.clear(CACHE_NAME_OPGENOMEN_VERMOGEN_HISTORY);
         log.info("Finished housekeeping of OpgenomenVermogen");
     }
 

diff --git a/src/main/java/nl/homeserver/energy/opgenomenvermogen/OpgenomenVermogenService.java b/src/main/java/nl/homeserver/energy/opgenomenvermogen/OpgenomenVermogenService.java
@@ -15,15 +15,14 @@
 
 import static java.time.LocalDateTime.from;
 import static java.util.Comparator.comparingInt;
+import static nl.homeserver.CachingConfiguration.CACHE_NAME_OPGENOMEN_VERMOGEN_HISTORY;
 import static nl.homeserver.DateTimePeriod.aPeriodWithToDateTime;
 import static nl.homeserver.DateTimeUtil.toMillisSinceEpoch;
 
 @Service
 @RequiredArgsConstructor
 public class OpgenomenVermogenService {
 
-    static final String CACHE_NAME_OPGENOMEN_VERMOGEN_HISTORY = "opgenomenVermogenHistory";
-
     static final String TOPIC = "/topic/opgenomen-vermogen";
 
     private final OpgenomenVermogenRepository opgenomenVermogenRepository;