Merge pull request #464 from stuartwoodman/AUS-4065-Build-KnownLayers…

…-After-CSW-Caching

AUS-4065 Build KnownLayers after CSW caching

src/main/java/org/auscope/portal/core/services/CSWCacheService.java

@@ -31,6 +31,8 @@
 import org.auscope.portal.core.services.responses.csw.CSWRecordTransformerFactory;
 import org.auscope.portal.core.util.FileIOUtil;
 import org.objenesis.strategy.StdInstantiatorStrategy;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 
 import com.esotericsoftware.kryo.Kryo;
 
@@ -84,6 +86,11 @@ public class CSWCacheService {
     /** If true, this class will force the usage of HTTP GetMethods instead of POST methods (where possible). Useful workaround for some CSW services */
     protected boolean forceGetMethods = false;
     protected Date lastCacheUpdate;
+
+    // KnownLayerService needs to be informed when indexing is finished, must be @Lazy loaded to avoid circular dependencies   
+    @Autowired
+    @Lazy
+    private KnownLayerService knownLayerService;
 
     /**
      * Creates a new instance of a CSWKeywordCacheService. This constructor is normally autowired by the spring framework.
@@ -257,6 +264,10 @@ private synchronized void updateFinished(Map<String, Set<CSWRecord>> newKeywordC
             this.keywordsByRegistry = newKeywordByEndpointCache;
         }
         saveCacheToFile();
+
+        // Inform KnownLayerService that there are potentially new CSWRecords
+        knownLayerService.updateKnownLayersCache();
+
         this.updateRunning = false;
         this.lastCacheUpdate = new Date();