Dockerfile

@@ -5,6 +5,7 @@ COPY ./server/target/ogcapi-java-server-*-exec.jar app.jar
 ENTRYPOINT [\
     "java",\
     "-Delasticsearch.index.name=${INDEX_NAME}",\
+    "-Delasticsearch.cloud_optimized_index.name=${CO_INDEX_NAME}",\
     "-Delasticsearch.vocabs_index.name=${VOCABS_INDEX_NAME}",\
     "-Dapi.host=${HOST}:${PORT}",\
     "-Dserver.port=${PORT}",\

pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>3.3.3</version>
+		<version>3.4.2</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>au.org.aodn.ogcapi</groupId>
@@ -26,6 +26,7 @@
 		<org.geotools.version>29.2</org.geotools.version>
 		<maven.deploy.skip>true</maven.deploy.skip>
 		<versioning.updatePom>true</versioning.updatePom>
+		<aws.sdk.version>2.29.52</aws.sdk.version>
 	</properties>
 	<repositories>
 		<repository>
@@ -137,6 +138,21 @@
 				<artifactId>spatial4j</artifactId>
 				<version>0.8</version>
 			</dependency>
+			<dependency>
+				<groupId>software.amazon.awssdk</groupId>
+				<artifactId>batch</artifactId>
+				<version>${aws.sdk.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>software.amazon.awssdk</groupId>
+				<artifactId>auth</artifactId>
+				<version>${aws.sdk.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>software.amazon.awssdk</groupId>
+				<artifactId>ses</artifactId>
+				<version>${aws.sdk.version}</version>
+			</dependency>
 		</dependencies>
 	</dependencyManagement>
 	<distributionManagement>

server/pom.xml

@@ -20,6 +20,18 @@
     </properties>
 
     <dependencies>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>batch</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>auth</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>ses</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter</artifactId>
@@ -71,6 +83,11 @@
             <artifactId>ogcapi-features-java</artifactId>
             <version>${project.parent.version}</version>
         </dependency>
+        <dependency>
+            <groupId>au.org.aodn.ogcapi</groupId>
+            <artifactId>ogcapi-processes-java</artifactId>
+            <version>${project.parent.version}</version>
+        </dependency>
         <dependency>
             <groupId>co.elastic.clients</groupId>
             <artifactId>elasticsearch-java</artifactId>

server/src/main/java/au/org/aodn/ogcapi/server/common/RestApi.java

@@ -9,6 +9,7 @@
 import au.org.aodn.ogcapi.features.model.Exception;
 import au.org.aodn.ogcapi.server.core.mapper.StacToCollections;
 import au.org.aodn.ogcapi.server.core.model.enumeration.CQLCrsType;
+import au.org.aodn.ogcapi.server.core.model.enumeration.CQLFields;
 import au.org.aodn.ogcapi.server.core.model.enumeration.CQLFilterType;
 import au.org.aodn.ogcapi.server.core.model.enumeration.OGCMediaTypeMapper;
 import au.org.aodn.ogcapi.server.core.service.OGCApiService;
@@ -154,7 +155,10 @@ public ResponseEntity<?> getCollections(
         // TODO: Support other CRS.
         if (CQLFilterType.convert(filterLang) == CQLFilterType.CQL && CQLCrsType.convertFromUrl(crs) == CQLCrsType.EPSG4326) {
             if (datetime != null) {
-                filter = OGCApiService.processDatetimeParameter(datetime, filter);
+                filter = OGCApiService.processDatetimeParameter(CQLFields.temporal.name(), datetime, filter);
+            }
+            if (bbox != null) {
+                filter = OGCApiService.processBBoxParameter(CQLFields.geometry.name(), bbox, filter);
             }
             return commonService.getCollectionList(
                     q,

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

@@ -0,0 +1,31 @@
+package au.org.aodn.ogcapi.server.core.configuration;
+
+import au.org.aodn.ogcapi.server.processes.RestServices;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import software.amazon.awssdk.auth.credentials.DefaultCredentialsProvider;
+import software.amazon.awssdk.regions.Region;
+import software.amazon.awssdk.services.batch.BatchClient;
+
+@Configuration
+public class AwsConfig {
+
+    @Value("${aws.region}")
+    private String awsRegion;
+
+    @Bean
+    public BatchClient batchClient() {
+        return BatchClient
+                .builder()
+                .region(Region.of(awsRegion))
+                .credentialsProvider(DefaultCredentialsProvider.create())
+                .build();
+    }
+
+    @Bean
+    public RestServices awsBatchService(BatchClient batchClient, ObjectMapper objectMapper) {
+        return new RestServices(batchClient, objectMapper);
+    }
+}

server/src/main/java/au/org/aodn/ogcapi/server/core/mapper/Converter.java

@@ -18,8 +18,8 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.http.MediaType;
 
+import java.util.ArrayList;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 import static au.org.aodn.ogcapi.server.core.util.GeometryUtils.createCentroid;
 
@@ -101,18 +101,32 @@ default <D extends StacCollectionModel> Collection getCollection(D m, Filter fil
             collection.setExtent(extent);
         }
 
-        if(m.getLinks() != null) {
+        if(m.getLinks() != null || m.getUuid() != null || m.getAssets() != null) {
+            collection.setLinks(new ArrayList<>());
+
             // Convert object type.
-            collection.setLinks(
-                    m.getLinks()
-                            .stream()
-                            .map(l -> new Link()
-                                .href(l.getHref())
-                                .type(l.getType())
-                                .rel(l.getRel())
-                                .title(l.getTitle())
-                            )
-                    .collect(Collectors.toList()));
+            if(m.getLinks() != null) {
+                collection.getLinks().addAll(
+                        m.getLinks()
+                                .stream()
+                                .map(l -> new Link()
+                                        .href(l.getHref())
+                                        .type(l.getType())
+                                        .rel(l.getRel())
+                                        .title(l.getTitle())
+                                )
+                                .toList()
+                );
+            }
+
+            if(m.getAssets() != null) {
+                m.getAssets().values().forEach(i -> collection.getLinks().add(new Link()
+                        .title(i.getTitle())
+                        .href(host + "/api/v1/ogc" + i.getHref())
+                        .type(i.getType())
+                        .rel(i.getRole().toString().toLowerCase())
+                ));
+            }
         }
 
         if (m.getContacts() != null) {
@@ -155,6 +169,10 @@ default <D extends StacCollectionModel> Collection getCollection(D m, Filter fil
                 collection.getProperties().put(CollectionProperty.credits, m.getSummaries().getCredits());
             }
 
+            if (m.getSummaries().getUpdateFrequency() != null) {
+                collection.getProperties().put(CollectionProperty.pace, m.getSummaries().getUpdateFrequency());
+            }
+
             if (m.getSummaries().getGeometry() != null) {
                 collection.getProperties().put(CollectionProperty.geometry, m.getSummaries().getGeometry());
             }

server/src/main/java/au/org/aodn/ogcapi/server/core/mapper/StacToCollections.java

@@ -3,6 +3,7 @@
 import au.org.aodn.ogcapi.features.model.Collection;
 import au.org.aodn.ogcapi.features.model.Collections;
 import au.org.aodn.ogcapi.server.core.model.ExtendedCollections;
+import au.org.aodn.ogcapi.server.core.model.StacCollectionModel;
 import au.org.aodn.ogcapi.server.core.service.ElasticSearch;
 import org.mapstruct.Mapper;
 import org.opengis.filter.Filter;
@@ -14,17 +15,17 @@
 
 @Service
 @Mapper(componentModel = "spring")
-public abstract class StacToCollections implements Converter<ElasticSearch.SearchResult, Collections> {
+public abstract class StacToCollections implements Converter<ElasticSearch.SearchResult<StacCollectionModel>, Collections> {
 
     @Value("${api.host}")
     protected String hostname;
 
     @Override
-    public Collections convert(ElasticSearch.SearchResult model, Filter filter) {
+    public Collections convert(ElasticSearch.SearchResult<StacCollectionModel> model, Filter filter) {
 
         List<Collection> collections = model.getCollections().parallelStream()
                 .map(m -> getCollection(m, filter, hostname))
-                .collect(Collectors.toList());
+                .toList();
 
         ExtendedCollections result = new ExtendedCollections();
         result.setTotal(model.getTotal());

server/src/main/java/au/org/aodn/ogcapi/server/core/mapper/StacToFeatureCollection.java

@@ -0,0 +1,50 @@
+package au.org.aodn.ogcapi.server.core.mapper;
+
+import au.org.aodn.ogcapi.features.model.FeatureCollectionGeoJSON;
+import au.org.aodn.ogcapi.features.model.FeatureGeoJSON;
+import au.org.aodn.ogcapi.features.model.PointGeoJSON;
+import au.org.aodn.ogcapi.server.core.model.StacItemModel;
+import au.org.aodn.ogcapi.server.core.service.ElasticSearch;
+import org.mapstruct.Mapper;
+import org.opengis.filter.Filter;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+
+@Service
+@Mapper(componentModel = "spring")
+public abstract class StacToFeatureCollection implements Converter<ElasticSearch.SearchResult<StacItemModel>, FeatureCollectionGeoJSON> {
+
+    @Override
+    public FeatureCollectionGeoJSON convert(ElasticSearch.SearchResult<StacItemModel> model, Filter filter) {
+        FeatureCollectionGeoJSON f = new FeatureCollectionGeoJSON();
+        f.setType(FeatureCollectionGeoJSON.TypeEnum.FEATURECOLLECTION);
+
+        List<FeatureGeoJSON> features = model.getCollections().parallelStream()
+                .map(i -> {
+                    FeatureGeoJSON feature = new FeatureGeoJSON();
+                    feature.setType(FeatureGeoJSON.TypeEnum.FEATURE);
+
+                    if(i.getGeometry().get("geometry") instanceof Map<?, ?> map) {
+                        if(map.get("coordinates") instanceof List<?> coords) {
+                            List<BigDecimal> c = coords.stream()
+                                    .filter(item -> item instanceof BigDecimal)
+                                    .map(item -> (BigDecimal)item)
+                                    .toList();
+
+                            feature.setGeometry(new PointGeoJSON().type(PointGeoJSON.TypeEnum.POINT).coordinates(c));
+                        }
+                    }
+                    feature.setProperties(i.getProperties());
+
+                    return feature;
+                })
+                .filter(i -> i.getGeometry() != null)
+                .toList();
+
+        f.setFeatures(features);
+        return f;
+    }
+}

server/src/main/java/au/org/aodn/ogcapi/server/core/mapper/StacToInlineResponse2002.java

@@ -1,5 +1,6 @@
 package au.org.aodn.ogcapi.server.core.mapper;
 
+import au.org.aodn.ogcapi.server.core.model.StacCollectionModel;
 import au.org.aodn.ogcapi.server.core.model.enumeration.CQLCrsType;
 import au.org.aodn.ogcapi.server.core.service.ElasticSearch;
 import au.org.aodn.ogcapi.tile.model.InlineResponse2002;
@@ -14,13 +15,13 @@
 
 @Service
 @Mapper(componentModel = "spring")
-public abstract class StacToInlineResponse2002 implements Converter<ElasticSearch.SearchResult, InlineResponse2002> {
+public abstract class StacToInlineResponse2002 implements Converter<ElasticSearch.SearchResult<StacCollectionModel>, InlineResponse2002> {
 
     @Value("${api.host}")
     protected String hostname;
 
     @Override
-    public InlineResponse2002 convert(ElasticSearch.SearchResult model, Filter noUse) {
+    public InlineResponse2002 convert(ElasticSearch.SearchResult<StacCollectionModel> model, Filter noUse) {
         List<TileSetItem> items = model.getCollections().stream()
                 .map(m -> {
                     TileSetItem item = new TileSetItem();

server/src/main/java/au/org/aodn/ogcapi/server/core/mapper/StacToTileSetWmWGS84Q.java

@@ -12,7 +12,7 @@
 
 @Service
 @Mapper(componentModel = "spring")
-public abstract class StacToTileSetWmWGS84Q implements Converter<ElasticSearch.SearchResult, TileSet> {
+public abstract class StacToTileSetWmWGS84Q implements Converter<ElasticSearch.SearchResult<StacCollectionModel>, TileSet> {
 
     @Value("${api.host}")
     protected String hostname;
@@ -27,7 +27,7 @@ protected static class TileSetWorldMercatorWGS84Quad extends TileSet {
     }
 
     @Override
-    public TileSet convert(ElasticSearch.SearchResult from, Filter noUse) {
+    public TileSet convert(ElasticSearch.SearchResult<StacCollectionModel> from, Filter noUse) {
         TileSetWorldMercatorWGS84Quad tileSet = new TileSetWorldMercatorWGS84Quad();
 
         tileSet.setTileMatrixSetURI("http://www.opengis.net/def/tilematrixset/OGC/1.0/WorldMercatorWGS84Quad");

server/src/main/java/au/org/aodn/ogcapi/server/core/model/AssetModel.java

@@ -0,0 +1,53 @@
+package au.org.aodn.ogcapi.server.core.model;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class AssetModel {
+    // https://github.com/radiantearth/stac-spec/blob/master/best-practices.md#list-of-asset-roles
+    public enum Role {
+        DATA("data"),
+        METADATA("metadata"),
+        THUMBNAIL("thumbnail"),
+        SUMMARY("summary"),
+        OVERVIEW("overview"),
+        VISUAL("visual"),
+        DATE("date"),
+        GRAPHIC("graphic"),
+        DATA_MASK("data-mask"),
+        SNOW_ICE("snow-ice"),
+        LAND_WATER("land-water"),
+        WATER_MASK("water-mask"),
+        ISO_19115("iso-19115");
+
+        private final String role;
+
+        Role(String role) {
+            this.role = role;
+        }
+
+        @Override
+        public String toString() {
+            return role;
+        }
+    }
+    /**
+     * REQUIRED. URI to the asset object. Relative and absolute URI are both allowed. Trailing slashes are significant.
+     */
+    protected String href;
+    protected String title;
+    protected String description;
+    protected String type;
+    /**
+     * The semantic roles of the asset, similar to the use of rel in links.
+     */
+    protected Role role;
+}