diff --git a/server/src/main/java/au/org/aodn/ogcapi/server/core/configuration/CacheConfig.java b/server/src/main/java/au/org/aodn/ogcapi/server/core/configuration/CacheConfig.java index c2342289..4b90555d 100644 --- a/server/src/main/java/au/org/aodn/ogcapi/server/core/configuration/CacheConfig.java +++ b/server/src/main/java/au/org/aodn/ogcapi/server/core/configuration/CacheConfig.java @@ -2,8 +2,8 @@ import au.org.aodn.ogcapi.server.core.service.CacheNoLandGeometry; import au.org.aodn.ogcapi.server.core.service.CacheWarm; -import au.org.aodn.ogcapi.server.core.service.wfs.WfsServer; -import au.org.aodn.ogcapi.server.core.service.wms.WmsServer; +import au.org.aodn.ogcapi.server.core.service.geoserver.wfs.WfsServer; +import au.org.aodn.ogcapi.server.core.service.geoserver.wms.WmsServer; import au.org.aodn.ogcapi.server.core.util.GeometryUtils; import org.ehcache.config.builders.*; import org.ehcache.config.units.MemoryUnit; diff --git a/server/src/main/java/au/org/aodn/ogcapi/server/core/configuration/WfsWmsConfig.java b/server/src/main/java/au/org/aodn/ogcapi/server/core/configuration/WfsWmsConfig.java index 4d437027..66e80b8d 100644 --- a/server/src/main/java/au/org/aodn/ogcapi/server/core/configuration/WfsWmsConfig.java +++ b/server/src/main/java/au/org/aodn/ogcapi/server/core/configuration/WfsWmsConfig.java @@ -1,9 +1,9 @@ package au.org.aodn.ogcapi.server.core.configuration; import au.org.aodn.ogcapi.server.core.service.Search; -import au.org.aodn.ogcapi.server.core.service.wfs.WfsDefaultParam; -import au.org.aodn.ogcapi.server.core.service.wfs.WfsServer; -import au.org.aodn.ogcapi.server.core.service.wms.WmsServer; +import au.org.aodn.ogcapi.server.core.service.geoserver.wfs.WfsDefaultParam; +import au.org.aodn.ogcapi.server.core.service.geoserver.wfs.WfsServer; +import au.org.aodn.ogcapi.server.core.service.geoserver.wms.WmsServer; import au.org.aodn.ogcapi.server.core.util.RestTemplateUtils; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; diff --git a/server/src/main/java/au/org/aodn/ogcapi/server/core/service/CacheWarm.java b/server/src/main/java/au/org/aodn/ogcapi/server/core/service/CacheWarm.java index 3948d892..216dda46 100644 --- a/server/src/main/java/au/org/aodn/ogcapi/server/core/service/CacheWarm.java +++ b/server/src/main/java/au/org/aodn/ogcapi/server/core/service/CacheWarm.java @@ -1,8 +1,8 @@ package au.org.aodn.ogcapi.server.core.service; import au.org.aodn.ogcapi.server.core.model.StacCollectionModel; -import au.org.aodn.ogcapi.server.core.service.wfs.WfsServer; -import au.org.aodn.ogcapi.server.core.service.wms.WmsServer; +import au.org.aodn.ogcapi.server.core.service.geoserver.wfs.WfsServer; +import au.org.aodn.ogcapi.server.core.service.geoserver.wms.WmsServer; import au.org.aodn.ogcapi.server.core.util.GeometryUtils; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; diff --git a/server/src/main/java/au/org/aodn/ogcapi/server/core/service/wfs/DownloadWfsDataService.java b/server/src/main/java/au/org/aodn/ogcapi/server/core/service/geoserver/wfs/DownloadWfsDataService.java similarity index 99% rename from server/src/main/java/au/org/aodn/ogcapi/server/core/service/wfs/DownloadWfsDataService.java rename to server/src/main/java/au/org/aodn/ogcapi/server/core/service/geoserver/wfs/DownloadWfsDataService.java index f99e061b..81f84727 100644 --- a/server/src/main/java/au/org/aodn/ogcapi/server/core/service/wfs/DownloadWfsDataService.java +++ b/server/src/main/java/au/org/aodn/ogcapi/server/core/service/geoserver/wfs/DownloadWfsDataService.java @@ -1,4 +1,4 @@ -package au.org.aodn.ogcapi.server.core.service.wfs; +package au.org.aodn.ogcapi.server.core.service.geoserver.wfs; import au.org.aodn.ogcapi.server.core.model.ogc.FeatureRequest; import au.org.aodn.ogcapi.server.core.model.ogc.wfs.WfsField; diff --git a/server/src/main/java/au/org/aodn/ogcapi/server/core/service/wfs/WfsDefaultParam.java b/server/src/main/java/au/org/aodn/ogcapi/server/core/service/geoserver/wfs/WfsDefaultParam.java similarity index 89% rename from server/src/main/java/au/org/aodn/ogcapi/server/core/service/wfs/WfsDefaultParam.java rename to server/src/main/java/au/org/aodn/ogcapi/server/core/service/geoserver/wfs/WfsDefaultParam.java index 7f675d71..f9de1d1a 100644 --- a/server/src/main/java/au/org/aodn/ogcapi/server/core/service/wfs/WfsDefaultParam.java +++ b/server/src/main/java/au/org/aodn/ogcapi/server/core/service/geoserver/wfs/WfsDefaultParam.java @@ -1,4 +1,4 @@ -package au.org.aodn.ogcapi.server.core.service.wfs; +package au.org.aodn.ogcapi.server.core.service.geoserver.wfs; import lombok.Getter; import lombok.Setter; diff --git a/server/src/main/java/au/org/aodn/ogcapi/server/core/service/wfs/WfsServer.java b/server/src/main/java/au/org/aodn/ogcapi/server/core/service/geoserver/wfs/WfsServer.java similarity index 99% rename from server/src/main/java/au/org/aodn/ogcapi/server/core/service/wfs/WfsServer.java rename to server/src/main/java/au/org/aodn/ogcapi/server/core/service/geoserver/wfs/WfsServer.java index 4a3c29a8..81e87a7c 100644 --- a/server/src/main/java/au/org/aodn/ogcapi/server/core/service/wfs/WfsServer.java +++ b/server/src/main/java/au/org/aodn/ogcapi/server/core/service/geoserver/wfs/WfsServer.java @@ -1,4 +1,4 @@ -package au.org.aodn.ogcapi.server.core.service.wfs; +package au.org.aodn.ogcapi.server.core.service.geoserver.wfs; import au.org.aodn.ogcapi.server.core.exception.GeoserverFieldsNotFoundException; import au.org.aodn.ogcapi.server.core.exception.GeoserverLayersNotFoundException; @@ -36,7 +36,7 @@ import static au.org.aodn.ogcapi.server.core.configuration.CacheConfig.DOWNLOADABLE_FIELDS; import static au.org.aodn.ogcapi.server.core.configuration.CacheConfig.GET_CAPABILITIES_WFS_FEATURE_TYPES; -import static au.org.aodn.ogcapi.server.core.service.wfs.WfsDefaultParam.WFS_LINK_MARKER; +import static au.org.aodn.ogcapi.server.core.service.geoserver.wfs.WfsDefaultParam.WFS_LINK_MARKER; import static au.org.aodn.ogcapi.server.core.util.GeoserverUtils.*; @Slf4j diff --git a/server/src/main/java/au/org/aodn/ogcapi/server/core/service/wms/WmsDefaultParam.java b/server/src/main/java/au/org/aodn/ogcapi/server/core/service/geoserver/wms/WmsDefaultParam.java similarity index 92% rename from server/src/main/java/au/org/aodn/ogcapi/server/core/service/wms/WmsDefaultParam.java rename to server/src/main/java/au/org/aodn/ogcapi/server/core/service/geoserver/wms/WmsDefaultParam.java index 19447dd4..3d7ac5db 100644 --- a/server/src/main/java/au/org/aodn/ogcapi/server/core/service/wms/WmsDefaultParam.java +++ b/server/src/main/java/au/org/aodn/ogcapi/server/core/service/geoserver/wms/WmsDefaultParam.java @@ -1,4 +1,4 @@ -package au.org.aodn.ogcapi.server.core.service.wms; +package au.org.aodn.ogcapi.server.core.service.geoserver.wms; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Getter; diff --git a/server/src/main/java/au/org/aodn/ogcapi/server/core/service/wms/WmsServer.java b/server/src/main/java/au/org/aodn/ogcapi/server/core/service/geoserver/wms/WmsServer.java similarity index 99% rename from server/src/main/java/au/org/aodn/ogcapi/server/core/service/wms/WmsServer.java rename to server/src/main/java/au/org/aodn/ogcapi/server/core/service/geoserver/wms/WmsServer.java index 55436ec1..a5b4a838 100644 --- a/server/src/main/java/au/org/aodn/ogcapi/server/core/service/wms/WmsServer.java +++ b/server/src/main/java/au/org/aodn/ogcapi/server/core/service/geoserver/wms/WmsServer.java @@ -1,4 +1,4 @@ -package au.org.aodn.ogcapi.server.core.service.wms; +package au.org.aodn.ogcapi.server.core.service.geoserver.wms; import au.org.aodn.ogcapi.server.core.exception.GeoserverFieldsNotFoundException; import au.org.aodn.ogcapi.server.core.exception.GeoserverLayersNotFoundException; @@ -10,7 +10,7 @@ import au.org.aodn.ogcapi.server.core.model.ogc.wms.*; import au.org.aodn.ogcapi.server.core.service.ElasticSearchBase; import au.org.aodn.ogcapi.server.core.service.Search; -import au.org.aodn.ogcapi.server.core.service.wfs.WfsServer; +import au.org.aodn.ogcapi.server.core.service.geoserver.wfs.WfsServer; import au.org.aodn.ogcapi.server.core.util.RestTemplateUtils; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.DeserializationFeature; @@ -37,7 +37,7 @@ import static au.org.aodn.ogcapi.server.core.configuration.CacheConfig.CACHE_WMS_MAP_TILE; import static au.org.aodn.ogcapi.server.core.configuration.CacheConfig.GET_CAPABILITIES_WMS_LAYERS; -import static au.org.aodn.ogcapi.server.core.service.wms.WmsDefaultParam.WMS_LINK_MARKER; +import static au.org.aodn.ogcapi.server.core.service.geoserver.wms.WmsDefaultParam.WMS_LINK_MARKER; import static au.org.aodn.ogcapi.server.core.util.GeoserverUtils.*; @Slf4j diff --git a/server/src/main/java/au/org/aodn/ogcapi/server/features/RestServices.java b/server/src/main/java/au/org/aodn/ogcapi/server/features/RestServices.java index ed03b1a1..f1d1204e 100644 --- a/server/src/main/java/au/org/aodn/ogcapi/server/features/RestServices.java +++ b/server/src/main/java/au/org/aodn/ogcapi/server/features/RestServices.java @@ -12,9 +12,9 @@ import au.org.aodn.ogcapi.server.core.model.ogc.wfs.WfsFields; import au.org.aodn.ogcapi.server.core.service.ElasticSearch; import au.org.aodn.ogcapi.server.core.service.OGCApiService; -import au.org.aodn.ogcapi.server.core.service.wfs.WfsServer; -import au.org.aodn.ogcapi.server.core.service.wms.WmsDefaultParam; -import au.org.aodn.ogcapi.server.core.service.wms.WmsServer; +import au.org.aodn.ogcapi.server.core.service.geoserver.wfs.WfsServer; +import au.org.aodn.ogcapi.server.core.service.geoserver.wms.WmsDefaultParam; +import au.org.aodn.ogcapi.server.core.service.geoserver.wms.WmsServer; import au.org.aodn.ogcapi.server.core.util.CommonUtils; import com.fasterxml.jackson.core.JsonProcessingException; import lombok.extern.slf4j.Slf4j; diff --git a/server/src/main/java/au/org/aodn/ogcapi/server/processes/RestServices.java b/server/src/main/java/au/org/aodn/ogcapi/server/processes/RestServices.java index cbe1e3aa..cf1bfb4d 100644 --- a/server/src/main/java/au/org/aodn/ogcapi/server/processes/RestServices.java +++ b/server/src/main/java/au/org/aodn/ogcapi/server/processes/RestServices.java @@ -2,7 +2,7 @@ import au.org.aodn.ogcapi.server.core.exception.wfs.WfsErrorHandler; import au.org.aodn.ogcapi.server.core.model.enumeration.DatasetDownloadEnums; -import au.org.aodn.ogcapi.server.core.service.wfs.DownloadWfsDataService; +import au.org.aodn.ogcapi.server.core.service.geoserver.wfs.DownloadWfsDataService; import au.org.aodn.ogcapi.server.core.util.EmailUtils; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/server/src/test/java/au/org/aodn/ogcapi/server/core/service/wfs/DownloadWfsDataServiceTest.java b/server/src/test/java/au/org/aodn/ogcapi/server/core/service/geoserver/wfs/DownloadWfsDataServiceTest.java similarity index 98% rename from server/src/test/java/au/org/aodn/ogcapi/server/core/service/wfs/DownloadWfsDataServiceTest.java rename to server/src/test/java/au/org/aodn/ogcapi/server/core/service/geoserver/wfs/DownloadWfsDataServiceTest.java index b900003c..fa40191c 100644 --- a/server/src/test/java/au/org/aodn/ogcapi/server/core/service/wfs/DownloadWfsDataServiceTest.java +++ b/server/src/test/java/au/org/aodn/ogcapi/server/core/service/geoserver/wfs/DownloadWfsDataServiceTest.java @@ -1,9 +1,9 @@ -package au.org.aodn.ogcapi.server.core.service.wfs; +package au.org.aodn.ogcapi.server.core.service.geoserver.wfs; import au.org.aodn.ogcapi.server.core.model.ogc.wfs.WfsField; import au.org.aodn.ogcapi.server.core.model.ogc.wfs.WfsFields; import au.org.aodn.ogcapi.server.core.service.Search; -import au.org.aodn.ogcapi.server.core.service.wms.WmsServer; +import au.org.aodn.ogcapi.server.core.service.geoserver.wms.WmsServer; import au.org.aodn.ogcapi.server.core.util.RestTemplateUtils; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/server/src/test/java/au/org/aodn/ogcapi/server/core/service/wfs/WfsServerTest.java b/server/src/test/java/au/org/aodn/ogcapi/server/core/service/geoserver/wfs/WfsServerTest.java similarity index 99% rename from server/src/test/java/au/org/aodn/ogcapi/server/core/service/wfs/WfsServerTest.java rename to server/src/test/java/au/org/aodn/ogcapi/server/core/service/geoserver/wfs/WfsServerTest.java index 612ca5e8..a59a174c 100644 --- a/server/src/test/java/au/org/aodn/ogcapi/server/core/service/wfs/WfsServerTest.java +++ b/server/src/test/java/au/org/aodn/ogcapi/server/core/service/geoserver/wfs/WfsServerTest.java @@ -1,4 +1,4 @@ -package au.org.aodn.ogcapi.server.core.service.wfs; +package au.org.aodn.ogcapi.server.core.service.geoserver.wfs; import au.org.aodn.ogcapi.server.core.exception.GeoserverFieldsNotFoundException; import au.org.aodn.ogcapi.server.core.model.LinkModel; @@ -26,7 +26,7 @@ import java.util.Collections; import java.util.List; -import static au.org.aodn.ogcapi.server.core.service.wfs.WfsDefaultParam.WFS_LINK_MARKER; +import static au.org.aodn.ogcapi.server.core.service.geoserver.wfs.WfsDefaultParam.WFS_LINK_MARKER; import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.*; import static org.mockito.Mockito.mock; diff --git a/server/src/test/java/au/org/aodn/ogcapi/server/core/service/wms/WmsServerTest.java b/server/src/test/java/au/org/aodn/ogcapi/server/core/service/geoserver/wms/WmsServerTest.java similarity index 99% rename from server/src/test/java/au/org/aodn/ogcapi/server/core/service/wms/WmsServerTest.java rename to server/src/test/java/au/org/aodn/ogcapi/server/core/service/geoserver/wms/WmsServerTest.java index d0aa5df4..b7152a9e 100644 --- a/server/src/test/java/au/org/aodn/ogcapi/server/core/service/wms/WmsServerTest.java +++ b/server/src/test/java/au/org/aodn/ogcapi/server/core/service/geoserver/wms/WmsServerTest.java @@ -1,4 +1,4 @@ -package au.org.aodn.ogcapi.server.core.service.wms; +package au.org.aodn.ogcapi.server.core.service.geoserver.wms; import au.org.aodn.ogcapi.server.core.configuration.Config; import au.org.aodn.ogcapi.server.core.configuration.TestConfig; @@ -10,7 +10,7 @@ import au.org.aodn.ogcapi.server.core.model.ogc.wms.DescribeLayerResponse; import au.org.aodn.ogcapi.server.core.service.ElasticSearchBase; import au.org.aodn.ogcapi.server.core.service.Search; -import au.org.aodn.ogcapi.server.core.service.wfs.WfsDefaultParam; +import au.org.aodn.ogcapi.server.core.service.geoserver.wfs.WfsDefaultParam; import com.fasterxml.jackson.core.JsonProcessingException; import org.junit.jupiter.api.*; import org.mockito.Mockito; @@ -31,8 +31,8 @@ import java.util.ArrayList; import java.util.List; -import static au.org.aodn.ogcapi.server.core.service.wfs.WfsDefaultParam.WFS_LINK_MARKER; -import static au.org.aodn.ogcapi.server.core.service.wms.WmsDefaultParam.WMS_LINK_MARKER; +import static au.org.aodn.ogcapi.server.core.service.geoserver.wfs.WfsDefaultParam.WFS_LINK_MARKER; +import static au.org.aodn.ogcapi.server.core.service.geoserver.wms.WmsDefaultParam.WMS_LINK_MARKER; import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.*; import static org.mockito.Mockito.when; diff --git a/server/src/test/java/au/org/aodn/ogcapi/server/features/RestServicesTest.java b/server/src/test/java/au/org/aodn/ogcapi/server/features/RestServicesTest.java index 8dcc16e7..e07a4713 100644 --- a/server/src/test/java/au/org/aodn/ogcapi/server/features/RestServicesTest.java +++ b/server/src/test/java/au/org/aodn/ogcapi/server/features/RestServicesTest.java @@ -4,8 +4,8 @@ import au.org.aodn.ogcapi.server.core.model.ogc.wfs.WfsField; import au.org.aodn.ogcapi.server.core.model.ogc.wfs.WfsFields; import au.org.aodn.ogcapi.server.core.service.DasService; -import au.org.aodn.ogcapi.server.core.service.wfs.WfsServer; -import au.org.aodn.ogcapi.server.core.service.wms.WmsServer; +import au.org.aodn.ogcapi.server.core.service.geoserver.wfs.WfsServer; +import au.org.aodn.ogcapi.server.core.service.geoserver.wms.WmsServer; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/server/src/test/java/au/org/aodn/ogcapi/server/service/wfs/DownloadWfsDataServiceTest.java b/server/src/test/java/au/org/aodn/ogcapi/server/service/wfs/DownloadWfsDataServiceTest.java index 4fd79852..33f6d9ae 100644 --- a/server/src/test/java/au/org/aodn/ogcapi/server/service/wfs/DownloadWfsDataServiceTest.java +++ b/server/src/test/java/au/org/aodn/ogcapi/server/service/wfs/DownloadWfsDataServiceTest.java @@ -1,8 +1,8 @@ package au.org.aodn.ogcapi.server.service.wfs; import au.org.aodn.ogcapi.server.core.model.ogc.FeatureRequest; -import au.org.aodn.ogcapi.server.core.service.wfs.DownloadWfsDataService; -import au.org.aodn.ogcapi.server.core.service.wfs.WfsServer; +import au.org.aodn.ogcapi.server.core.service.geoserver.wfs.DownloadWfsDataService; +import au.org.aodn.ogcapi.server.core.service.geoserver.wfs.WfsServer; import org.junit.jupiter.api.Test; import org.mockito.Mock; import org.springframework.http.HttpEntity;