Record tags of configs received instead of requiring all be in a setting

cjmalloy · Apr 5, 2024 · e94af5b · e94af5b
1 parent 9990cd1
commit e94af5b
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/src/main/java/jasper/component/ConfigCache.java b/src/main/java/jasper/component/ConfigCache.java
@@ -27,6 +27,8 @@
 import javax.annotation.PostConstruct;
 import java.util.List;
 import java.util.Optional;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
 
 @Component
 public class ConfigCache {
@@ -56,6 +58,8 @@ public class ConfigCache {
 	@Autowired
 	ComponentDtoMapper dtoMapper;
 
+	Set<String> configCacheTags = ConcurrentHashMap.newKeySet();
+
 	@PostConstruct
 	public void init() {
 		if (templateRepository.findByTemplateAndOrigin("_config/server", "").isEmpty()) {
@@ -65,6 +69,7 @@ public void init() {
 
 	@CacheEvict(value = "config-cache", allEntries = true)
 	public void clearConfigCache() {
+		configCacheTags.clear();
 		logger.info("Cleared config cache.");
 	}
 
@@ -107,6 +112,7 @@ public UserDto getUser(String tag) {
 	@Cacheable(value = "config-cache", key = "#tag + #origin + '@' + #url")
 	@Transactional(readOnly = true)
 	public <T> T getConfig(String url, String origin, String tag, Class<T> toValueType) {
+		configCacheTags.add(tag);
 		return refRepository.findOneByUrlAndOrigin(url, origin)
 			.map(r -> r.getPlugin(tag, toValueType))
 			.orElse(objectMapper.convertValue(objectMapper.createObjectNode(), toValueType));
@@ -115,6 +121,7 @@ public <T> T getConfig(String url, String origin, String tag, Class<T> toValueTy
 	@Cacheable(value = "config-cache", key = "#tag + #origin")
 	@Transactional(readOnly = true)
 	public <T> List<T> getAllConfigs(String origin, String tag, Class<T> toValueType) {
+		configCacheTags.add(tag);
 		return refRepository.findAll(
 				RefFilter.builder()
 					.origin(origin)
@@ -123,6 +130,10 @@ public <T> List<T> getAllConfigs(String origin, String tag, Class<T> toValueType
 			.toList();
 	}
 
+	public boolean isConfigTag(String tag) {
+		return configCacheTags.contains(tag);
+	}
+
 	@Cacheable(value = "plugin-config-cache", key = "#tag + #origin")
 	@Transactional(readOnly = true)
 	public <T> T getPluginConfig(String tag, String origin, Class<T> toValueType) {

diff --git a/src/main/java/jasper/component/delta/ClearConfigCache.java b/src/main/java/jasper/component/delta/ClearConfigCache.java
@@ -37,7 +37,7 @@ public class ClearConfigCache {
 	@ServiceActivator(inputChannel = "tagRxChannel")
 	public void handleTagUpdate(Message<String> message) {
 		if (isBlank(configs.security(message.getHeaders().get("origin").toString()).getMode())) return;
-		if (!configs.root().getCacheTags().contains((String) message.getHeaders().get("tag"))) return;
+		if (!configs.isConfigTag((String) message.getHeaders().get("tag"))) return;
 		if (clearingConfig.compareAndSet(false, true)) {
 			clearConfig();
 		} else {

diff --git a/src/main/java/jasper/config/Config.java b/src/main/java/jasper/config/Config.java
@@ -29,10 +29,6 @@ class ServerConfig implements Serializable {
 		private int maxSources = 1000;
 		private List<String> modSeals = List.of("seal", "+seal", "_seal", "_moderated");
 		private List<String> editorSeals = List.of("plugin/qc");
-		/**
-		 * Tags for config Refs to be cached.
-		 */
-		private List<String> cacheTags = List.of("+plugin/scrape", "+plugin/oembed");
 		/**
 		 * Whitelist origins to be allowed web access.
 		 */