Making community modules in communityRelease compile

geoserver · Jun 1, 2019 · af2e7ed · af2e7ed
1 parent 22ae91d
commit af2e7ed
Show file tree

Hide file tree

Showing 27 changed files with 44 additions and 303 deletions.
diff --git a/...mmunity/authkey/src/main/java/org/geoserver/security/PropertyAuthenticationKeyMapper.java b/...mmunity/authkey/src/main/java/org/geoserver/security/PropertyAuthenticationKeyMapper.java
@@ -14,6 +14,7 @@
 import java.util.Map.Entry;
 import java.util.Properties;
 import org.apache.commons.io.FileUtils;
+import org.geoserver.platform.resource.Files;
 import org.geoserver.security.impl.GeoServerUser;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.springframework.util.StringUtils;
@@ -146,7 +147,7 @@ public synchronized int synchronize() throws IOException {
 
         if (backupFile.exists()) backupFile.delete();
 
-        fileWatcher = new PropertyFileWatcher(propFile);
+        fileWatcher = new PropertyFileWatcher(Files.asResource(propFile));
         return counter;
     }
 }
diff --git a/...nity/backup-restore/core/src/main/java/org/geoserver/backuprestore/BackupRestoreItem.java b/...nity/backup-restore/core/src/main/java/org/geoserver/backuprestore/BackupRestoreItem.java
@@ -874,7 +874,6 @@ protected StyleInfo clone(StyleInfo source, WorkspaceInfo workspace) {
         target.setFormatVersion(source.getFormatVersion());
         target.setLegend(source.getLegend());
         target.setName(source.getName());
-        target.setSLDVersion(source.getSLDVersion());
 
         return target;
     }

diff --git a/.../gdal/gdal-wcs/src/main/java/org/geoserver/wcs/response/GdalCoverageResponseDelegate.java b/.../gdal/gdal-wcs/src/main/java/org/geoserver/wcs/response/GdalCoverageResponseDelegate.java
@@ -17,13 +17,13 @@
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 import java.util.zip.ZipOutputStream;
 import org.geoserver.config.GeoServer;
-import org.geoserver.data.util.IOUtils;
 import org.geoserver.ogr.core.Format;
 import org.geoserver.ogr.core.FormatAdapter;
 import org.geoserver.ogr.core.FormatConverter;
 import org.geoserver.ogr.core.ToolWrapper;
 import org.geoserver.ogr.core.ToolWrapperFactory;
 import org.geoserver.platform.ServiceException;
+import org.geoserver.util.IOUtils;
 import org.geoserver.wcs.WCSInfo;
 import org.geoserver.wcs.responses.CoverageResponseDelegate;
 import org.geotools.coverage.grid.GridCoverage2D;
@@ -304,8 +304,8 @@ public void encode(
 
         // create the first temp directory, used for dumping gs generated
         // content
-        File tempGS = org.geoserver.data.util.IOUtils.createTempDirectory("gdaltmpin");
-        File tempGDAL = org.geoserver.data.util.IOUtils.createTempDirectory("gdaltmpout");
+        File tempGS = IOUtils.createTempDirectory("gdaltmpin");
+        File tempGDAL = IOUtils.createTempDirectory("gdaltmpout");
 
         // build the gdal wrapper used to run the gdal_translate commands
         ToolWrapper wrapper =

diff --git a/src/community/geopkg/src/main/java/org/geoserver/geopkg/wps/GeoPackageProcess.java b/src/community/geopkg/src/main/java/org/geoserver/geopkg/wps/GeoPackageProcess.java
@@ -30,6 +30,7 @@
 import org.geoserver.wfs.request.GetFeatureRequest;
 import org.geoserver.wms.GetMapRequest;
 import org.geoserver.wms.MapLayerInfo;
+import org.geoserver.wps.gs.GeoServerProcess;
 import org.geoserver.wps.resource.WPSResourceManager;
 import org.geotools.data.simple.SimpleFeatureCollection;
 import org.geotools.feature.FeatureCollection;
@@ -47,7 +48,6 @@
 import org.geotools.process.factory.DescribeParameter;
 import org.geotools.process.factory.DescribeProcess;
 import org.geotools.process.factory.DescribeResult;
-import org.geoserver.wps.gs.GeoServerProcess;
 import org.geotools.referencing.CRS;
 import org.geotools.styling.Style;
 import org.geotools.util.URLs;

diff --git a/src/community/hz-cluster/src/main/java/org/geoserver/cluster/hazelcast/HzCluster.java b/src/community/hz-cluster/src/main/java/org/geoserver/cluster/hazelcast/HzCluster.java
@@ -19,13 +19,13 @@
 import org.geoserver.cluster.ClusterConfig;
 import org.geoserver.cluster.ClusterConfigWatcher;
 import org.geoserver.config.GeoServerPluginConfigurator;
-import org.geoserver.data.util.IOUtils;
 import org.geoserver.platform.GeoServerResourceLoader;
 import org.geoserver.platform.resource.Files;
 import org.geoserver.platform.resource.Paths;
 import org.geoserver.platform.resource.Resource;
 import org.geoserver.platform.resource.ResourceStore;
 import org.geoserver.platform.resource.Resources;
+import org.geoserver.util.IOUtils;
 import org.geotools.util.logging.Logging;
 import org.springframework.beans.factory.DisposableBean;
 import org.springframework.beans.factory.InitializingBean;

diff --git a/src/community/jdbcconfig/src/main/java/org/geoserver/jdbcconfig/internal/ConfigDatabase.java b/src/community/jdbcconfig/src/main/java/org/geoserver/jdbcconfig/internal/ConfigDatabase.java
@@ -9,7 +9,6 @@
 import static com.google.common.base.Preconditions.checkNotNull;
 import static com.google.common.base.Preconditions.checkState;
 import static com.google.common.base.Throwables.throwIfUnchecked;
-
 import static org.geoserver.catalog.CatalogFacade.ANY_WORKSPACE;
 import static org.geoserver.catalog.Predicates.and;
 import static org.geoserver.catalog.Predicates.equal;

diff --git a/src/community/jdbcconfig/src/main/java/org/geoserver/jdbcconfig/internal/InfoRowMapper.java b/src/community/jdbcconfig/src/main/java/org/geoserver/jdbcconfig/internal/InfoRowMapper.java
@@ -5,7 +5,6 @@
  */
 package org.geoserver.jdbcconfig.internal;
 
-import com.google.common.base.Throwables;
 import java.io.ByteArrayInputStream;
 import java.io.UnsupportedEncodingException;
 import java.sql.ResultSet;

diff --git a/...ty/jdbcconfig/src/main/java/org/geoserver/jdbcloader/JDBCLoaderPropertiesFactoryBean.java b/...ty/jdbcconfig/src/main/java/org/geoserver/jdbcloader/JDBCLoaderPropertiesFactoryBean.java
@@ -15,13 +15,13 @@
 import java.util.logging.Logger;
 import javax.servlet.ServletContext;
 import org.geoserver.config.GeoServerPluginConfigurator;
-import org.geoserver.util.IOUtils;
 import org.geoserver.jdbcconfig.JDBCGeoServerLoader;
 import org.geoserver.platform.GeoServerResourceLoader;
 import org.geoserver.platform.resource.Paths;
 import org.geoserver.platform.resource.Resource;
 import org.geoserver.platform.resource.ResourceStore;
 import org.geoserver.platform.resource.Resources;
+import org.geoserver.util.IOUtils;
 import org.geotools.util.URLs;
 import org.geotools.util.logging.Logging;
 import org.springframework.beans.factory.config.PropertiesFactoryBean;

diff --git a/...rver/src/main/java/org/geoserver/cluster/impl/utils/JMSPropertyPlaceholderConfigurer.java b/...rver/src/main/java/org/geoserver/cluster/impl/utils/JMSPropertyPlaceholderConfigurer.java
@@ -11,9 +11,9 @@
 import org.geoserver.cluster.configuration.EmbeddedBrokerConfiguration;
 import org.geoserver.cluster.configuration.JMSConfiguration;
 import org.geoserver.config.SpringResourceAdaptor;
-import org.geoserver.data.util.IOUtils;
 import org.geoserver.platform.resource.Resource.Type;
 import org.geoserver.platform.resource.Resources;
+import org.geoserver.util.IOUtils;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.config.PropertyPlaceholderConfigurer;
 import org.springframework.core.io.Resource;

diff --git a/src/community/mbtiles/src/main/java/org/geoserver/mbtiles/gs/wps/MBTilesProcess.java b/src/community/mbtiles/src/main/java/org/geoserver/mbtiles/gs/wps/MBTilesProcess.java
@@ -24,14 +24,14 @@
 import org.geoserver.platform.resource.Resource;
 import org.geoserver.wms.GetMapRequest;
 import org.geoserver.wms.MapLayerInfo;
+import org.geoserver.wps.gs.GeoServerProcess;
 import org.geoserver.wps.resource.WPSResourceManager;
 import org.geotools.geometry.jts.ReferencedEnvelope;
 import org.geotools.mbtiles.MBTilesFile;
 import org.geotools.process.ProcessException;
 import org.geotools.process.factory.DescribeParameter;
 import org.geotools.process.factory.DescribeProcess;
 import org.geotools.process.factory.DescribeResult;
-import org.geoserver.wps.gs.GeoServerProcess;
 import org.geotools.referencing.CRS;
 import org.geotools.styling.Style;
 import org.geotools.util.URLs;

diff --git a/...tification/src/main/java/org/geoserver/notification/INotificationTransactionListener.java b/...tification/src/main/java/org/geoserver/notification/INotificationTransactionListener.java
@@ -5,9 +5,9 @@
 
 package org.geoserver.notification;
 
-import org.geoserver.wfs.TransactionPlugin;
+import org.geoserver.wfs.TransactionCallback;
 
-public interface INotificationTransactionListener extends TransactionPlugin {
+public interface INotificationTransactionListener extends TransactionCallback {
 
     void setMessageMultiplexer(MessageMultiplexer messageMultiplexer);
 

diff --git a/...otification/src/main/java/org/geoserver/notification/NotificationTransactionListener.java b/...otification/src/main/java/org/geoserver/notification/NotificationTransactionListener.java
@@ -7,8 +7,6 @@
 
 import java.util.HashMap;
 import java.util.Map;
-import net.opengis.wfs.TransactionResponseType;
-import net.opengis.wfs.TransactionType;
 import org.geoserver.catalog.Catalog;
 import org.geoserver.catalog.CatalogInfo;
 import org.geoserver.catalog.FeatureTypeInfo;
@@ -18,6 +16,8 @@
 import org.geoserver.wfs.TransactionEvent;
 import org.geoserver.wfs.TransactionEventType;
 import org.geoserver.wfs.WFSException;
+import org.geoserver.wfs.request.TransactionRequest;
+import org.geoserver.wfs.request.TransactionResponse;
 import org.geotools.geometry.jts.ReferencedEnvelope;
 import org.opengis.feature.type.FeatureType;
 import org.springframework.security.core.Authentication;
@@ -47,7 +47,7 @@ public NotificationTransactionListener(Catalog catalog) {
     }
 
     @Override
-    public TransactionType beforeTransaction(TransactionType request) throws WFSException {
+    public TransactionRequest beforeTransaction(TransactionRequest request) throws WFSException {
         layersChangesResume =
                 new ThreadLocal<Map<String, Map<String, Object>>>() {
                     @Override
@@ -59,11 +59,11 @@ protected Map<String, Map<String, Object>> initialValue() {
     }
 
     @Override
-    public void beforeCommit(TransactionType request) throws WFSException {}
+    public void beforeCommit(TransactionRequest request) throws WFSException {}
 
     @Override
     public void afterTransaction(
-            TransactionType request, TransactionResponseType result, boolean committed) {
+            TransactionRequest request, TransactionResponse result, boolean committed) {
         if (committed) {
             String handle = request.getHandle();
             Authentication auth = SecurityContextHolder.getContext().getAuthentication();

diff --git a/src/community/notification/src/test/java/org/geoserver/notification/AnonymousSystemTest.java b/src/community/notification/src/test/java/org/geoserver/notification/AnonymousSystemTest.java
@@ -14,7 +14,7 @@
 import org.geoserver.notification.common.NotificationConfiguration;
 import org.geoserver.platform.GeoServerExtensions;
 import org.geoserver.test.GeoServerSystemTestSupport;
-import org.geoserver.wfs.TransactionPlugin;
+import org.geoserver.wfs.TransactionCallback;
 import org.junit.Test;
 
 public class AnonymousSystemTest extends GeoServerSystemTestSupport {
@@ -45,7 +45,8 @@ public void testCatalogNotifierIntialization() throws IOException {
     public void testTransactionNotifierIntialization() throws IOException {
         NotificationConfiguration cfg = null;
         int counter = 0;
-        for (TransactionPlugin listener : GeoServerExtensions.extensions(TransactionPlugin.class)) {
+        for (TransactionCallback listener :
+                GeoServerExtensions.extensions(TransactionCallback.class)) {
             if (listener instanceof INotificationTransactionListener) {
                 counter++;
             }

diff --git a/src/community/notification/src/test/java/org/geoserver/notification/DefaultConfigTest.java b/src/community/notification/src/test/java/org/geoserver/notification/DefaultConfigTest.java
@@ -13,7 +13,7 @@
 import org.geoserver.notification.common.NotificationConfiguration;
 import org.geoserver.platform.GeoServerExtensions;
 import org.geoserver.test.GeoServerSystemTestSupport;
-import org.geoserver.wfs.TransactionPlugin;
+import org.geoserver.wfs.TransactionCallback;
 import org.junit.Test;
 
 public class DefaultConfigTest extends GeoServerSystemTestSupport {
@@ -39,7 +39,8 @@ public void testCatalogNotifierIntialization() throws IOException {
     public void testTransactionNotifierIntialization() throws IOException {
         NotificationConfiguration cfg = null;
         int counter = 0;
-        for (TransactionPlugin listener : GeoServerExtensions.extensions(TransactionPlugin.class)) {
+        for (TransactionCallback listener :
+                GeoServerExtensions.extensions(TransactionCallback.class)) {
             if (listener instanceof INotificationTransactionListener) {
                 counter++;
             }

diff --git a/src/community/notification/src/test/java/org/geoserver/notification/SystemTest.java b/src/community/notification/src/test/java/org/geoserver/notification/SystemTest.java
@@ -14,7 +14,7 @@
 import org.geoserver.notification.common.NotificationConfiguration;
 import org.geoserver.platform.GeoServerExtensions;
 import org.geoserver.test.GeoServerSystemTestSupport;
-import org.geoserver.wfs.TransactionPlugin;
+import org.geoserver.wfs.TransactionCallback;
 import org.junit.Test;
 
 public class SystemTest extends GeoServerSystemTestSupport {
@@ -47,7 +47,8 @@ public void testCatalogNotifierIntialization() throws IOException {
     public void testTransactionNotifierIntialization() throws IOException {
         NotificationConfiguration cfg = null;
         int counter = 0;
-        for (TransactionPlugin listener : GeoServerExtensions.extensions(TransactionPlugin.class)) {
+        for (TransactionCallback listener :
+                GeoServerExtensions.extensions(TransactionCallback.class)) {
             if (listener instanceof INotificationTransactionListener) {
                 counter++;
             }

diff --git a/src/community/params-extractor/src/main/java/org/geoserver/params/extractor/Utils.java b/src/community/params-extractor/src/main/java/org/geoserver/params/extractor/Utils.java
@@ -5,6 +5,7 @@
 package org.geoserver.params.extractor;
 
 import java.io.Closeable;
+import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -69,7 +70,8 @@ public static <T extends Closeable> void closeQuietly(T closable) {
         }
     }
 
-    public static Map<String, String[]> parseParameters(Optional<String> queryString) {
+    public static Map<String, String[]> parseParameters(Optional<String> queryString)
+            throws UnsupportedEncodingException {
         Map<String, String[]> parameters = new HashMap<>();
         if (!queryString.isPresent()) {
             return parameters;

diff --git a/src/community/params-extractor/src/test/java/org/geoserver/params/extractor/TestSupport.java b/src/community/params-extractor/src/test/java/org/geoserver/params/extractor/TestSupport.java
@@ -15,9 +15,9 @@
 import java.util.List;
 import java.util.function.Consumer;
 import java.util.function.Function;
-import org.geoserver.util.IOUtils;
 import org.geoserver.platform.resource.FileSystemResourceStore;
 import org.geoserver.platform.resource.ResourceStore;
+import org.geoserver.util.IOUtils;
 import org.junit.After;
 import org.junit.Before;
 import org.springframework.context.ApplicationContext;