Skip to content

Commit a530442

Browse files
utas-amberbianutas-amberbian
authored
Merge pull request #247 from aodn/feature/7080-refactor-before-change
Refactor directory
2 parents 4242040 + fcfb09c commit a530442

15 files changed

Lines changed: 31 additions & 31 deletions

File tree

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
import au.org.aodn.ogcapi.server.core.service.CacheNoLandGeometry;
44
import au.org.aodn.ogcapi.server.core.service.CacheWarm;
5-
import au.org.aodn.ogcapi.server.core.service.wfs.WfsServer;
6-
import au.org.aodn.ogcapi.server.core.service.wms.WmsServer;
5+
import au.org.aodn.ogcapi.server.core.service.geoserver.wfs.WfsServer;
6+
import au.org.aodn.ogcapi.server.core.service.geoserver.wms.WmsServer;
77
import au.org.aodn.ogcapi.server.core.util.GeometryUtils;
88
import org.ehcache.config.builders.*;
99
import org.ehcache.config.units.MemoryUnit;

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package au.org.aodn.ogcapi.server.core.configuration;
22

33
import au.org.aodn.ogcapi.server.core.service.Search;
4-
import au.org.aodn.ogcapi.server.core.service.wfs.WfsDefaultParam;
5-
import au.org.aodn.ogcapi.server.core.service.wfs.WfsServer;
6-
import au.org.aodn.ogcapi.server.core.service.wms.WmsServer;
4+
import au.org.aodn.ogcapi.server.core.service.geoserver.wfs.WfsDefaultParam;
5+
import au.org.aodn.ogcapi.server.core.service.geoserver.wfs.WfsServer;
6+
import au.org.aodn.ogcapi.server.core.service.geoserver.wms.WmsServer;
77
import au.org.aodn.ogcapi.server.core.util.RestTemplateUtils;
88
import org.springframework.beans.factory.annotation.Qualifier;
99
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;

‎server/src/main/java/au/org/aodn/ogcapi/server/core/service/CacheWarm.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package au.org.aodn.ogcapi.server.core.service;
22

33
import au.org.aodn.ogcapi.server.core.model.StacCollectionModel;
4-
import au.org.aodn.ogcapi.server.core.service.wfs.WfsServer;
5-
import au.org.aodn.ogcapi.server.core.service.wms.WmsServer;
4+
import au.org.aodn.ogcapi.server.core.service.geoserver.wfs.WfsServer;
5+
import au.org.aodn.ogcapi.server.core.service.geoserver.wms.WmsServer;
66
import au.org.aodn.ogcapi.server.core.util.GeometryUtils;
77
import lombok.extern.slf4j.Slf4j;
88
import org.springframework.beans.factory.annotation.Autowired;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package au.org.aodn.ogcapi.server.core.service.wfs;
1+
package au.org.aodn.ogcapi.server.core.service.geoserver.wfs;
22

33
import au.org.aodn.ogcapi.server.core.model.ogc.FeatureRequest;
44
import au.org.aodn.ogcapi.server.core.model.ogc.wfs.WfsField;

server/src/main/java/au/org/aodn/ogcapi/server/core/service/wfs/WfsDefaultParam.java renamed to server/src/main/java/au/org/aodn/ogcapi/server/core/service/geoserver/wfs/WfsDefaultParam.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package au.org.aodn.ogcapi.server.core.service.wfs;
1+
package au.org.aodn.ogcapi.server.core.service.geoserver.wfs;
22

33
import lombok.Getter;
44
import lombok.Setter;

server/src/main/java/au/org/aodn/ogcapi/server/core/service/wfs/WfsServer.java renamed to server/src/main/java/au/org/aodn/ogcapi/server/core/service/geoserver/wfs/WfsServer.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package au.org.aodn.ogcapi.server.core.service.wfs;
1+
package au.org.aodn.ogcapi.server.core.service.geoserver.wfs;
22

33
import au.org.aodn.ogcapi.server.core.exception.GeoserverFieldsNotFoundException;
44
import au.org.aodn.ogcapi.server.core.exception.GeoserverLayersNotFoundException;
@@ -36,7 +36,7 @@
3636

3737
import static au.org.aodn.ogcapi.server.core.configuration.CacheConfig.DOWNLOADABLE_FIELDS;
3838
import static au.org.aodn.ogcapi.server.core.configuration.CacheConfig.GET_CAPABILITIES_WFS_FEATURE_TYPES;
39-
import static au.org.aodn.ogcapi.server.core.service.wfs.WfsDefaultParam.WFS_LINK_MARKER;
39+
import static au.org.aodn.ogcapi.server.core.service.geoserver.wfs.WfsDefaultParam.WFS_LINK_MARKER;
4040
import static au.org.aodn.ogcapi.server.core.util.GeoserverUtils.*;
4141

4242
@Slf4j

server/src/main/java/au/org/aodn/ogcapi/server/core/service/wms/WmsDefaultParam.java renamed to server/src/main/java/au/org/aodn/ogcapi/server/core/service/geoserver/wms/WmsDefaultParam.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package au.org.aodn.ogcapi.server.core.service.wms;
1+
package au.org.aodn.ogcapi.server.core.service.geoserver.wms;
22

33
import com.fasterxml.jackson.annotation.JsonProperty;
44
import lombok.Getter;

server/src/main/java/au/org/aodn/ogcapi/server/core/service/wms/WmsServer.java renamed to server/src/main/java/au/org/aodn/ogcapi/server/core/service/geoserver/wms/WmsServer.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package au.org.aodn.ogcapi.server.core.service.wms;
1+
package au.org.aodn.ogcapi.server.core.service.geoserver.wms;
22

33
import au.org.aodn.ogcapi.server.core.exception.GeoserverFieldsNotFoundException;
44
import au.org.aodn.ogcapi.server.core.exception.GeoserverLayersNotFoundException;
@@ -10,7 +10,7 @@
1010
import au.org.aodn.ogcapi.server.core.model.ogc.wms.*;
1111
import au.org.aodn.ogcapi.server.core.service.ElasticSearchBase;
1212
import au.org.aodn.ogcapi.server.core.service.Search;
13-
import au.org.aodn.ogcapi.server.core.service.wfs.WfsServer;
13+
import au.org.aodn.ogcapi.server.core.service.geoserver.wfs.WfsServer;
1414
import au.org.aodn.ogcapi.server.core.util.RestTemplateUtils;
1515
import com.fasterxml.jackson.core.JsonProcessingException;
1616
import com.fasterxml.jackson.databind.DeserializationFeature;
@@ -37,7 +37,7 @@
3737

3838
import static au.org.aodn.ogcapi.server.core.configuration.CacheConfig.CACHE_WMS_MAP_TILE;
3939
import static au.org.aodn.ogcapi.server.core.configuration.CacheConfig.GET_CAPABILITIES_WMS_LAYERS;
40-
import static au.org.aodn.ogcapi.server.core.service.wms.WmsDefaultParam.WMS_LINK_MARKER;
40+
import static au.org.aodn.ogcapi.server.core.service.geoserver.wms.WmsDefaultParam.WMS_LINK_MARKER;
4141
import static au.org.aodn.ogcapi.server.core.util.GeoserverUtils.*;
4242

4343
@Slf4j

‎server/src/main/java/au/org/aodn/ogcapi/server/features/RestServices.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
import au.org.aodn.ogcapi.server.core.model.ogc.wfs.WfsFields;
1313
import au.org.aodn.ogcapi.server.core.service.ElasticSearch;
1414
import au.org.aodn.ogcapi.server.core.service.OGCApiService;
15-
import au.org.aodn.ogcapi.server.core.service.wfs.WfsServer;
16-
import au.org.aodn.ogcapi.server.core.service.wms.WmsDefaultParam;
17-
import au.org.aodn.ogcapi.server.core.service.wms.WmsServer;
15+
import au.org.aodn.ogcapi.server.core.service.geoserver.wfs.WfsServer;
16+
import au.org.aodn.ogcapi.server.core.service.geoserver.wms.WmsDefaultParam;
17+
import au.org.aodn.ogcapi.server.core.service.geoserver.wms.WmsServer;
1818
import au.org.aodn.ogcapi.server.core.util.CommonUtils;
1919
import com.fasterxml.jackson.core.JsonProcessingException;
2020
import lombok.extern.slf4j.Slf4j;

‎server/src/main/java/au/org/aodn/ogcapi/server/processes/RestServices.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import au.org.aodn.ogcapi.server.core.exception.wfs.WfsErrorHandler;
44
import au.org.aodn.ogcapi.server.core.model.enumeration.DatasetDownloadEnums;
5-
import au.org.aodn.ogcapi.server.core.service.wfs.DownloadWfsDataService;
5+
import au.org.aodn.ogcapi.server.core.service.geoserver.wfs.DownloadWfsDataService;
66
import au.org.aodn.ogcapi.server.core.util.EmailUtils;
77
import com.fasterxml.jackson.core.JsonProcessingException;
88
import com.fasterxml.jackson.databind.ObjectMapper;

0 commit comments

Comments
 (0)