#102 disable cache during server startup when noconferences is active

dukecon · Feb 29, 2020 · 3c8fb28 · 3c8fb28
1 parent 536f60c
commit 3c8fb28
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 20 deletions.
diff --git a/impl/src/main/java/org/dukecon/server/conference/ConferencesConfigurationServiceImpl.groovy b/impl/src/main/java/org/dukecon/server/conference/ConferencesConfigurationServiceImpl.groovy
@@ -22,9 +22,12 @@ class ConferencesConfigurationServiceImpl implements ConferencesConfigurationSer
     private String conferencesConfigurationFile
     Map<String, Object> configurationProperties = [:]
 
+    private boolean readConferences = true
+
     @Inject
     ConferencesConfigurationServiceImpl(ConfigurableEnvironment env) {
         this.env = env
+        this.readConferences = !env.getActiveProfiles().contains("noconferences")
     }
 
     // TODO Clean up - it is called twice!
@@ -38,10 +41,15 @@ class ConferencesConfigurationServiceImpl implements ConferencesConfigurationSer
     void init() {
         this.configurationProperties = getAllKnownConfigurationProperties(env)
         conferencesConfigurationFile = configurationProperties["conferences.file"] ?: "conferences-dev.yml"
-        log.debug ("Loading conferences file '{}'", conferencesConfigurationFile)
-        configuration.conferences.addAll(
-                ConferencesConfiguration.fromFile(conferencesConfigurationFile,
-                        configurationProperties)?.conferences)
+        if (readConferences) {
+            log.info("Loading conferences enabled, run application with profile 'noconferences' to disable!");
+            log.debug("Loading conferences file '{}'", conferencesConfigurationFile)
+            configuration.conferences.addAll(
+                    ConferencesConfiguration.fromFile(conferencesConfigurationFile,
+                            configurationProperties)?.conferences)
+        } else {
+            log.info("Loading conferences disabled, run application without profile 'noconferences' to enable!");
+        }
     }
 
     private static Map<String, Object> getAllKnownConfigurationProperties(ConfigurableEnvironment env) {

diff --git a/impl/src/main/java/org/dukecon/server/services/ConferenceServiceImpl.java b/impl/src/main/java/org/dukecon/server/services/ConferenceServiceImpl.java
@@ -15,17 +15,13 @@
 import org.dukecon.services.ConferenceService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Value;
+import org.springframework.core.env.ConfigurableEnvironment;
 import org.springframework.stereotype.Service;
 import org.springframework.web.context.ServletContextAware;
 
 import javax.inject.Inject;
 import javax.servlet.ServletContext;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -44,15 +40,12 @@ public class ConferenceServiceImpl implements ConferenceService, ServletContextA
 
     private Map<String, Conference> conferences;
 
-    @Value("${conferences.read:true}")
-    // TODO check for the explicit default value!
-    // This should be covered by the default in the annotation.
-    // For some reason this does not work when running the test isolated in the IDE, e.g., IntelliJ
-    private boolean readConferences = true;
+    private boolean readConferences;
 
     @Inject
-    public ConferenceServiceImpl(ConferencesConfigurationService conferenceConfigurationService, List<ConferenceDataProvider> talkProviders) {
-        this.conferenceConfigurationService = conferenceConfigurationService;
+    public ConferenceServiceImpl(ConferencesConfigurationService conferenceConfigurationService, List<ConferenceDataProvider> talkProviders, ConfigurableEnvironment env) {
+    	this.conferenceConfigurationService = conferenceConfigurationService;
+	    this.readConferences = !(Arrays.asList(env.getActiveProfiles()).contains("noconferences"));
         Map<String, Conference> conferences = initializeConferences(talkProviders);
         talkProviders.forEach(tp -> {
             this.talkProviders.put(tp.getConferenceId(), tp);
@@ -108,7 +101,7 @@ public boolean refreshConference(String conferenceId) {
     private Map<String, Conference> initializeConferences(List<ConferenceDataProvider> talkProviders) {
         Map<String, Conference> conferences = new HashMap<>();
         if (readConferences) {
-            log.info("Reading conferences enabled, run application with '--conferences.read=false' to disable!");
+            log.info("Reading conferences enabled, run application with profile 'noconferences' to disable!");
             for (ConferenceDataProvider provider : talkProviders) {
                 Conference conference = provider.getConference();
                 if (conference == null) {
@@ -119,7 +112,7 @@ private Map<String, Conference> initializeConferences(List<ConferenceDataProvide
                 conferences.put(conference.getId(), conference);
             }
         } else {
-            log.info("Reading conferences disabled, run application with '--conferences.read=true' to enable!");
+            log.info("Reading conferences disabled, run application without profile 'noconferences' to enable!");
         }
         this.conferences = conferences;
         return conferences;

diff --git a/impl/src/main/resources/application-noconferences.properties b/impl/src/main/resources/application-noconferences.properties
@@ -1 +1 @@
-conferences.read=true
+conferences.read=false