diff --git a/src/main/java/org/davidbohl/dirigent/deployments/config/CachingConfig.java b/src/main/java/org/davidbohl/dirigent/deployments/config/CachingConfig.java deleted file mode 100644 index 5d6b486..0000000 --- a/src/main/java/org/davidbohl/dirigent/deployments/config/CachingConfig.java +++ /dev/null @@ -1,33 +0,0 @@ -package org.davidbohl.dirigent.deployments.config; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.cache.CacheManager; -import org.springframework.cache.annotation.CacheEvict; -import org.springframework.cache.annotation.EnableCaching; -import org.springframework.cache.concurrent.ConcurrentMapCacheManager; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.scheduling.annotation.EnableScheduling; -import org.springframework.scheduling.annotation.Scheduled; - - -@Configuration -@EnableCaching -@EnableScheduling -public class CachingConfig { - - private final Logger logger = LoggerFactory.getLogger(CachingConfig.class); - - @Bean - public CacheManager cacheManager() { - return new ConcurrentMapCacheManager("deployments"); - } - - @CacheEvict(value = "deployments", allEntries = true) - @Scheduled(fixedRateString = "${dirigent.deployments.cache.evict.interval}") - public void emptyDeploymentsCache() { - logger.info("emptying deployments cache"); - } - -} diff --git a/src/main/java/org/davidbohl/dirigent/deployments/config/DeploymentsConfigurationProvider.java b/src/main/java/org/davidbohl/dirigent/deployments/config/DeploymentsConfigurationProvider.java index 5eafaee..6d6b50a 100644 --- a/src/main/java/org/davidbohl/dirigent/deployments/config/DeploymentsConfigurationProvider.java +++ b/src/main/java/org/davidbohl/dirigent/deployments/config/DeploymentsConfigurationProvider.java @@ -5,8 +5,6 @@ import com.fasterxml.jackson.dataformat.yaml.YAMLFactory; import org.davidbohl.dirigent.deployments.service.GitService; import org.davidbohl.dirigent.deployments.models.DeploynentConfiguration; import org.springframework.beans.factory.annotation.Value; -import org.springframework.boot.autoconfigure.cache.CacheManagerCustomizer; -import org.springframework.cache.annotation.Cacheable; import org.springframework.cache.concurrent.ConcurrentMapCacheManager; import org.springframework.stereotype.Service; @@ -15,7 +13,7 @@ import java.io.IOException; import java.util.List; @Service -public class DeploymentsConfigurationProvider implements CacheManagerCustomizer { +public class DeploymentsConfigurationProvider { private final GitService gitService; @@ -26,7 +24,6 @@ public class DeploymentsConfigurationProvider implements CacheManagerCustomizer< this.gitService = gitService; } - @Cacheable("deployments") public DeploynentConfiguration getConfiguration() throws IOException, InterruptedException { ObjectMapper objectMapper = new ObjectMapper(new YAMLFactory()); @@ -42,10 +39,5 @@ public class DeploymentsConfigurationProvider implements CacheManagerCustomizer< throw e; } } - - @Override - public void customize(ConcurrentMapCacheManager cacheManager) { - cacheManager.setCacheNames(List.of("deployments")); - } }