Add cache

Author: utas-raymondng

server/src/main/java/au/org/aodn/ogcapi/server/core/configuration/CacheConfig.java

@@ -7,6 +7,7 @@
 import au.org.aodn.ogcapi.server.core.util.GeometryUtils;
 import org.ehcache.config.builders.*;
 import org.ehcache.config.units.MemoryUnit;
+import org.ehcache.impl.config.persistence.DefaultPersistenceConfiguration;
 import org.ehcache.jsr107.EhcacheCachingProvider;
 import org.locationtech.jts.geom.Geometry;
 import org.locationtech.jts.geom.prep.PreparedGeometry;
@@ -19,6 +20,7 @@
 import javax.cache.Caching;
 import java.io.File;
 import java.io.IOException;
+import java.math.BigInteger;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.time.Duration;
@@ -31,7 +33,10 @@ public class CacheConfig {
     public static final String CACHE_WMS_MAP_TILE = "cache-wms-map_tile";
     public static final String GET_CAPABILITIES_WMS_LAYERS = "get-capabilities-wms-layers";
     public static final String GET_CAPABILITIES_WFS_FEATURE_TYPES = "get-capabilities-wfs-feature-types";
+
     public static final String DOWNLOADABLE_FIELDS = "downloadable-fields";
+    public static final String DOWNLOADABLE_SIZE = "downloadable-size";
+
     public static final String ALL_NO_LAND_GEOMETRY = "all-noland-geometry";
     public static final String ALL_PARAM_VOCABS = "parameter-vocabs";
     public static final String ELASTIC_SEARCH_UUID_ONLY = "elastic-search-uuid-only";
@@ -53,7 +58,7 @@ public JCacheCacheManager cacheManager() throws IOException {
 
         org.ehcache.config.Configuration config = ConfigurationBuilder
                 .newConfigurationBuilder()
-                .withService(new org.ehcache.impl.config.persistence.DefaultPersistenceConfiguration(storagePath))
+                .withService(new DefaultPersistenceConfiguration(storagePath))
                 .withCache(CACHE_WMS_MAP_TILE,
                         CacheConfigurationBuilder.newCacheConfigurationBuilder(
                                         Object.class, byte[].class,
@@ -81,6 +86,12 @@ public JCacheCacheManager cacheManager() throws IOException {
                                 ResourcePoolsBuilder.heap(200)
                         ).withExpiry(ExpiryPolicyBuilder.timeToLiveExpiration(Duration.ofHours(24)))
                 )
+                .withCache(DOWNLOADABLE_SIZE,
+                        CacheConfigurationBuilder.newCacheConfigurationBuilder(
+                                Object.class, BigInteger.class,
+                                ResourcePoolsBuilder.heap(100)
+                        ).withExpiry(ExpiryPolicyBuilder.timeToLiveExpiration(Duration.ofHours(24)))
+                )
                 .withCache(ELASTIC_SEARCH_UUID_ONLY,
                         CacheConfigurationBuilder.newCacheConfigurationBuilder(
                                 Object.class, Object.class,

server/src/main/java/au/org/aodn/ogcapi/server/core/service/geoserver/wfs/DownloadWfsDataService.java

@@ -1,12 +1,14 @@
 package au.org.aodn.ogcapi.server.core.service.geoserver.wfs;
 
+import au.org.aodn.ogcapi.server.core.configuration.CacheConfig;
 import au.org.aodn.ogcapi.server.core.model.ogc.FeatureRequest;
 import au.org.aodn.ogcapi.server.core.util.DatetimeUtils;
 import lombok.extern.slf4j.Slf4j;
 import net.opengis.ows10.ExceptionReportType;
 import net.opengis.wfs.FeatureCollectionType;
 import org.geotools.wfs.v1_1.WFSConfiguration;
 import org.geotools.xsd.Parser;
+import org.springframework.cache.annotation.Cacheable;
 import org.springframework.http.*;
 import org.springframework.web.client.RestTemplate;
 import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
@@ -92,6 +94,7 @@ public String prepareWfsRequestUrl(
      * b. Issue a query with data download but then limit the records size, and do a liner interpolation
      * @return The estimated file size
      */
+    @Cacheable(CacheConfig.DOWNLOADABLE_SIZE)
     public BigInteger estimateDownloadSize(
             String uuid,
             String layerName,