diff --git a/Dockerfile b/Dockerfile index 80374059..02ac3df5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,6 @@ ENTRYPOINT ["/bin/sh", "-c", "java \ -XX:MaxRAMPercentage=${MAX_HEAP_PERCENTAGE} \ -Duser.timezone=UTC \ -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} \ diff --git a/server/src/main/resources/application.yaml b/server/src/main/resources/application.yaml index b80c5845..5abe373e 100644 --- a/server/src/main/resources/application.yaml +++ b/server/src/main/resources/application.yaml @@ -27,8 +27,6 @@ elasticsearch: lightweightPageSize: 7000 vocabs_index: name: vocabs_index - cloud_optimized_index: - name: es-coindexer-dev serverUrl: http://localhost:9200 apiKey: search_as_you_type: diff --git a/server/src/test/java/au/org/aodn/ogcapi/server/BaseTestClass.java b/server/src/test/java/au/org/aodn/ogcapi/server/BaseTestClass.java index b7b0ea60..16587461 100644 --- a/server/src/test/java/au/org/aodn/ogcapi/server/BaseTestClass.java +++ b/server/src/test/java/au/org/aodn/ogcapi/server/BaseTestClass.java @@ -56,15 +56,9 @@ public class BaseTestClass { @Value("${elasticsearch.index.name}") protected String record_index_name; - @Value("${elasticsearch.cloud_optimized_index.name}") - protected String co_data_index_name; - @Value("${elasticsearch.vocabs_index.name}") protected String vocabs_index_name; - @Value("${elasticsearch.cloud_optimized_index.name}") - protected String data_index_name; - protected String getBasePath() { return "http://localhost:" + port + "/api/v1/ogc"; } @@ -79,8 +73,7 @@ protected String getExternalBasePath() { public void initSchemas() { schemas = List.of( Map.of("name", record_index_name, "mapping", "portal_records_index_schema.json"), - Map.of("name", vocabs_index_name, "mapping", "vocabs_index_schema.json"), - Map.of("name", data_index_name, "mapping", "data_index_schema.json") + Map.of("name", vocabs_index_name, "mapping", "vocabs_index_schema.json") ); } @@ -252,10 +245,6 @@ protected void insertJsonToElasticRecordIndex(String... filenames) throws IOExce this.insertJsonToElasticIndex(record_index_name, filenames); } - protected void insertJsonToElasticCODataIndex(String... filenames) throws IOException { - this.insertJsonToElasticIndex(co_data_index_name, filenames); - } - protected Response getClusterHealth() throws IOException { return transport.restClient().performRequest(new Request("GET", "/_cluster/health")); }