Make community modules compile

src/community/authkey/src/main/java/org/geoserver/security/PropertyAuthenticationKeyMapper.java

@@ -96,11 +96,11 @@ public synchronized int synchronize() throws IOException {
         checkProperties();
 
         File propFile =
-                new File(getSecurityManager().getUserGroupRoot(), getUserGroupServiceName());
+                new File(getSecurityManager().userGroup().dir(), getUserGroupServiceName());
         propFile = new File(propFile, AUTHKEYS_FILE);
 
         File backupFile =
-                new File(getSecurityManager().getUserGroupRoot(), getUserGroupServiceName());
+                new File(getSecurityManager().userGroup().dir(), getUserGroupServiceName());
         backupFile = new File(backupFile, AUTHKEYS_FILE + ".backup");
 
         // check if the previous synchronize failed

src/community/jms-cluster/jms-geoserver/src/main/java/org/geoserver/cluster/impl/web/ClusterPage.java

@@ -37,7 +37,7 @@ public class ClusterPage extends GeoServerSecuredPage {
 
     public ClusterPage() {
 
-        final FeedbackPanel fp = getFeedbackPanel();
+        final FeedbackPanel fp = bottomFeedbackPanel;
 
         // setup the JMSContainer exception handler
         getJMSContainerExceptionHandler().setFeedbackPanel(fp);

src/community/web-resource/src/main/java/org/geoserver/web/resources/PageResourceBrowser.java

@@ -320,7 +320,8 @@ protected boolean onSubmit(
                                     });
                         } catch (IOException | IllegalStateException e) {
                             error(e.getMessage());
-                            target.add(getFeedbackPanel());
+                            target.add(bottomFeedbackPanel);
+                            target.add(topFeedbackPanel);
                         }
                     }
                 };
@@ -625,7 +626,8 @@ protected boolean onSubmit(
                                                                         "deleteFailed", getPage())
                                                                 .getString()
                                                                 .replace("%", res.path()));
-                                                target.add(getFeedbackPanel());
+                                                target.add(bottomFeedbackPanel);
+                                                target.add(topFeedbackPanel);
                                             }
                                         }
                                         // if deleted node was on clipboard, remove it form the

src/extension/imagemap/src/main/java/org/vfny/geoserver/wms/responses/map/htmlimagemap/Decimator.java

@@ -82,15 +82,6 @@ public Decimator(MathTransform screenToWorld, Rectangle paintArea) {
         }
     }
 
-    /**
-     * @throws TransformException
-     * @deprecated use the other constructor (with rectange) see javadox. This works fine, but it
-     *     the results are often poor if you're also doing CRS xforms.
-     */
-    public Decimator(MathTransform screenToWorld) {
-        this(screenToWorld, new Rectangle()); // do at (0,0)
-    }
-
     public final void decimateTransformGeneralize(Geometry geometry, MathTransform transform)
             throws TransformException {
         if (geometry instanceof GeometryCollection) {

src/extension/monitor/core/src/main/java/org/geoserver/monitor/MonitorConfig.java

@@ -47,9 +47,6 @@ public class MonitorConfig implements GeoServerPluginConfigurator, ApplicationCo
     public static enum Mode {
         HISTORY,
         LIVE,
-
-        @Deprecated // use live
-        HYBRID;
     }
 
     public static enum BboxMode {
@@ -96,9 +93,6 @@ public Properties getProperties() {
 
     public Mode getMode() {
         Mode m = Mode.valueOf(props().getProperty("mode", "history").toUpperCase());
-        if (m == Mode.HYBRID) {
-            m = Mode.LIVE;
-        }
         return m;
     }
 
@@ -163,7 +157,7 @@ public MonitorDAO createDAO() {
         if (storage == null) {
             // storage key not found, for backward compatibility look up mode
             Mode mode = getMode();
-            if (mode == Mode.HISTORY || mode == Mode.HYBRID) {
+            if (mode == Mode.HISTORY) {
                 storage = "hibernate";
             }
         }

src/gwc/src/main/java/org/geoserver/gwc/GWC.java

@@ -97,7 +97,6 @@
 import org.geowebcache.config.ConfigurationException;
 import org.geowebcache.config.ConfigurationPersistenceException;
 import org.geowebcache.config.TileLayerConfiguration;
-import org.geowebcache.config.XMLConfiguration;
 import org.geowebcache.conveyor.ConveyorTile;
 import org.geowebcache.diskquota.DiskQuotaConfig;
 import org.geowebcache.diskquota.DiskQuotaMonitor;
@@ -1648,18 +1647,6 @@ public synchronized void modifyGridSet(final String oldGridSetName, final GridSe
         }
     }
 
-    /**
-     * Looks up the {@link XMLConfiguration} from the spring context.
-     *
-     * @deprecated Only to be used for testing
-     * @return The {@link XMLConfiguration}
-     */
-    @Deprecated
-    XMLConfiguration getXmlConfiguration() {
-        XMLConfiguration mainConfig = GeoWebCacheExtensions.bean(XMLConfiguration.class);
-        return mainConfig;
-    }
-
     private BlobStoreAggregator getBlobStoreAggregator() {
         return blobStoreAggregator;
     }

src/gwc/src/main/java/org/geoserver/gwc/layer/TileLayerInfoUtil.java

@@ -180,28 +180,6 @@ public static void checkAutomaticStyles(
         }
     }
 
-    /**
-     * Find a parameter filter by key from a set of filters.
-     *
-     * @param paramName
-     * @param parameterFilters
-     * @deprecated
-     */
-    public static ParameterFilter findParameterFilter(
-            final String paramName, Set<ParameterFilter> parameterFilters) {
-
-        if (parameterFilters == null || parameterFilters.size() == 0) {
-            return null;
-        }
-
-        for (ParameterFilter pf : parameterFilters) {
-            if (paramName.equalsIgnoreCase(pf.getKey())) {
-                return pf;
-            }
-        }
-        return null;
-    }
-
     /**
      * Set the styles which should be cached on a layer
      *
@@ -275,19 +253,6 @@ public static void updateStringParameterFilter(
         }
     }
 
-    /**
-     * Remove a parameter filter from a layer
-     *
-     * @param tileLayerInfo the layer
-     * @param paramKey the key of the parameter filter
-     * @return true if a parameter matched and was removed, false otherwise
-     * @deprecated
-     */
-    public static boolean removeParameterFilter(
-            final GeoServerTileLayerInfo tileLayerInfo, final String paramKey) {
-        return tileLayerInfo.removeParameterFilter(paramKey);
-    }
-
     /**
      * Add a {@link RegexParameterFilter} set accept anything, replacing any existing filter for the
      * same parameter.

src/gwc/src/test/java/org/geoserver/gwc/GWCTest.java

@@ -332,8 +332,6 @@ public void setUp() throws Exception {
         mediator.setApplicationContext(appContext);
 
         mediator = spy(mediator);
-        when(mediator.getXmlConfiguration()).thenReturn(xmlConfig);
-
         GWC.set(mediator);
     }
 

src/gwc/src/test/java/org/geoserver/gwc/layer/TileLayerInfoUtilTest.java

@@ -15,6 +15,7 @@
 import static org.junit.Assert.assertTrue;
 
 import com.google.common.collect.ImmutableSet;
+import java.util.Set;
 import org.geoserver.catalog.PublishedType;
 import org.geoserver.catalog.impl.LayerGroupInfoImpl;
 import org.geoserver.catalog.impl.LayerInfoImpl;
@@ -121,26 +122,23 @@ public void testUpdateAcceptAllRegExParameterFilter() {
 
         // If createParam is false and there isn't already a filter, don't create one
         TileLayerInfoUtil.updateAcceptAllRegExParameterFilter(info, "ENV", false);
-        assertNull(TileLayerInfoUtil.findParameterFilter("ENV", info.getParameterFilters()));
+        assertNull(findParameterFilter("ENV", info.getParameterFilters()));
 
         // If createParam is true and there isn't already a filter, create one
         TileLayerInfoUtil.updateAcceptAllRegExParameterFilter(info, "ENV", true);
-        ParameterFilter filter =
-                TileLayerInfoUtil.findParameterFilter("ENV", info.getParameterFilters());
+        ParameterFilter filter = findParameterFilter("ENV", info.getParameterFilters());
         assertTrue(filter instanceof RegexParameterFilter);
         assertEquals(".*", ((RegexParameterFilter) filter).getRegex());
 
         // If createParam is true and there is already a filter, replace it with a new one
         TileLayerInfoUtil.updateAcceptAllRegExParameterFilter(info, "ENV", true);
-        ParameterFilter filter2 =
-                TileLayerInfoUtil.findParameterFilter("ENV", info.getParameterFilters());
+        ParameterFilter filter2 = findParameterFilter("ENV", info.getParameterFilters());
         assertNotSame(filter, filter2);
         assertEquals(filter, filter2);
 
         // If createParam is false and there is already a filter, replace it with a new one
         TileLayerInfoUtil.updateAcceptAllRegExParameterFilter(info, "ENV", false);
-        ParameterFilter filter3 =
-                TileLayerInfoUtil.findParameterFilter("ENV", info.getParameterFilters());
+        ParameterFilter filter3 = findParameterFilter("ENV", info.getParameterFilters());
         assertNotSame(filter2, filter3);
         assertEquals(filter, filter3);
     }
@@ -152,27 +150,45 @@ public void testUpdateAcceptAllFloatParameterFilter() {
 
         // If createParam is false and there isn't already a filter, don't create one
         TileLayerInfoUtil.updateAcceptAllFloatParameterFilter(info, "ELEVATION", false);
-        assertNull(TileLayerInfoUtil.findParameterFilter("ELEVATION", info.getParameterFilters()));
+        assertNull(findParameterFilter("ELEVATION", info.getParameterFilters()));
 
         // If createParam is true and there isn't already a filter, create one
         TileLayerInfoUtil.updateAcceptAllFloatParameterFilter(info, "ELEVATION", true);
-        ParameterFilter filter =
-                TileLayerInfoUtil.findParameterFilter("ELEVATION", info.getParameterFilters());
+        ParameterFilter filter = findParameterFilter("ELEVATION", info.getParameterFilters());
         assertTrue(filter instanceof FloatParameterFilter);
         assertEquals(0, ((FloatParameterFilter) filter).getValues().size());
 
         // If createParam is true and there is already a filter, replace it with a new one
         TileLayerInfoUtil.updateAcceptAllFloatParameterFilter(info, "ELEVATION", true);
-        ParameterFilter filter2 =
-                TileLayerInfoUtil.findParameterFilter("ELEVATION", info.getParameterFilters());
+        ParameterFilter filter2 = findParameterFilter("ELEVATION", info.getParameterFilters());
         assertNotSame(filter, filter2);
         assertEquals(filter, filter2);
 
         // If createParam is false and there is already a filter, replace it with a new one
         TileLayerInfoUtil.updateAcceptAllFloatParameterFilter(info, "ELEVATION", false);
-        ParameterFilter filter3 =
-                TileLayerInfoUtil.findParameterFilter("ELEVATION", info.getParameterFilters());
+        ParameterFilter filter3 = findParameterFilter("ELEVATION", info.getParameterFilters());
         assertNotSame(filter2, filter3);
         assertEquals(filter, filter3);
     }
+
+    /**
+     * Find a parameter filter by key from a set of filters.
+     *
+     * @param paramName
+     * @param parameterFilters
+     */
+    private static ParameterFilter findParameterFilter(
+            final String paramName, Set<ParameterFilter> parameterFilters) {
+
+        if (parameterFilters == null || parameterFilters.size() == 0) {
+            return null;
+        }
+
+        for (ParameterFilter pf : parameterFilters) {
+            if (paramName.equalsIgnoreCase(pf.getKey())) {
+                return pf;
+            }
+        }
+        return null;
+    }
 }

src/ows/src/main/java/org/geoserver/ows/KvpRequestReader.java

@@ -124,7 +124,7 @@ public Set<String> getFilter() {
      * @return A new instance of the request.
      */
     public Object createRequest() throws Exception {
-        return getRequestBean().newInstance();
+        return getRequestBean().getDeclaredConstructor().newInstance();
     }
 
     /**

src/ows/src/main/java/org/geoserver/ows/XmlObjectEncodingResponse.java

@@ -41,7 +41,8 @@ public String getMimeType(Object value, Operation operation) throws ServiceExcep
     public void write(Object value, OutputStream output, Operation operation)
             throws IOException, ServiceException {
         try {
-            Configuration c = (Configuration) xmlConfiguration.newInstance();
+            Configuration c =
+                    (Configuration) xmlConfiguration.getDeclaredConstructor().newInstance();
             Encoder e = new Encoder(c);
             for (Map.Entry<String, String> entry : getSchemaLocations().entrySet()) {
                 e.setSchemaLocation(entry.getKey(), entry.getValue());

src/platform/src/main/java/org/geoserver/platform/GeoServerResourceLoader.java

@@ -12,7 +12,6 @@
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.net.URL;
-import java.util.Set;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import javax.servlet.ServletContext;
@@ -118,24 +117,6 @@ public void setServletContext(ServletContext servletContext) {
         }
     }
 
-    /**
-     * Adds a location to the path used for resource lookups.
-     *
-     * @param searchLocation directory containing resources.
-     * @deprecated No longer used
-     */
-    public void addSearchLocation(File searchLocation) {
-        // searchLocations.add(searchLocation);
-    }
-
-    /**
-     * Sets the search locations used for resource lookups.
-     *
-     * @param searchLocations A set of {@link File}.
-     * @deprecated No longer used
-     */
-    public void setSearchLocations(Set<File> searchLocations) {}
-
     /** @return The base directory. */
     public File getBaseDirectory() {
         return baseDirectory;

src/security/ldap/src/main/java/org/geoserver/security/ldap/BindingLdapAuthoritiesPopulator.java

@@ -341,28 +341,6 @@ protected String getGroupSearchBase() {
         return groupSearchBase;
     }
 
-    /**
-     * @deprecated Convert case in the {@code AuthenticationProvider} using a {@code
-     *     GrantedAuthoritiesMapper}.
-     */
-    @Deprecated
-    public void setConvertToUpperCase(boolean convertToUpperCase) {
-        this.convertToUpperCase = convertToUpperCase;
-    }
-
-    /**
-     * The default role which will be assigned to all users.
-     *
-     * @param defaultRole the role name, including any desired prefix.
-     * @deprecated Assign a default role in the {@code AuthenticationProvider} using a {@code
-     *     GrantedAuthoritiesMapper}.
-     */
-    @Deprecated
-    public void setDefaultRole(String defaultRole) {
-        Assert.notNull(defaultRole, "The defaultRole property cannot be set to null");
-        this.defaultRole = new SimpleGrantedAuthority(defaultRole);
-    }
-
     public void setGroupRoleAttribute(String groupRoleAttribute) {
         Assert.notNull(groupRoleAttribute, "groupRoleAttribute must not be null");
         this.groupRoleAttribute = groupRoleAttribute;
@@ -373,19 +351,6 @@ public void setGroupSearchFilter(String groupSearchFilter) {
         this.groupSearchFilter = groupSearchFilter;
     }
 
-    /**
-     * Sets the prefix which will be prepended to the values loaded from the directory. Defaults to
-     * "ROLE_" for compatibility with <tt>RoleVoter/tt>.
-     *
-     * @deprecated Map the authorities in the {@code AuthenticationProvider} using a {@code
-     *     GrantedAuthoritiesMapper}.
-     */
-    @Deprecated
-    public void setRolePrefix(String rolePrefix) {
-        Assert.notNull(rolePrefix, "rolePrefix must not be null");
-        this.rolePrefix = rolePrefix;
-    }
-
     /**
      * If set to true, a subtree scope search will be performed. If false a single-level search is
      * used.

src/web/core/src/main/java/org/geoserver/web/AdminRequestWicketCallback.java

@@ -26,12 +26,6 @@ public void onEndRequest() {
         AdminRequest.finish();
     }
 
-    @Override
-    @SuppressWarnings("deprecation")
-    public void onRequestTargetSet(Class<? extends IRequestablePage> requestTarget) {
-        // not using anymore as it's deprecated
-    }
-
     @Override
     public void onAfterTargetsDetached() {}