Geofence module Compilable

geoserver · Jan 19, 2016 · 63fafc4 · 63fafc4
1 parent 51b6272
commit 63fafc4
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 16 deletions.
diff --git a/src/community/geofence/src/main/java/org/geoserver/geofence/web/GeofencePage.java b/src/community/geofence/src/main/java/org/geoserver/geofence/web/GeofencePage.java
@@ -19,7 +19,6 @@
  */
 package org.geoserver.geofence.web;
 
-import java.util.List;
 import java.util.logging.Level;
 
 import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -42,7 +41,6 @@
 import org.geoserver.geofence.config.GeoFenceConfigurationManager;
 import org.geoserver.geofence.services.RuleReaderService;
 import org.geoserver.geofence.services.dto.RuleFilter;
-import org.geoserver.geofence.services.dto.ShortRule;
 import org.geoserver.platform.GeoServerExtensions;
 import org.geoserver.web.GeoServerSecuredPage;
 import org.geoserver.web.wicket.model.ExtPropertyModel;
@@ -62,7 +60,9 @@
  */
 public class GeofencePage extends GeoServerSecuredPage {
 
-    /**
+	private static final long serialVersionUID = 5845823599005718408L;
+
+	/**
      * Configuration object.
      */
     private GeoFenceConfiguration config;
@@ -97,16 +97,18 @@ public GeofencePage() {
                     .setEnabled(!config.isInternal()));
 
         form.add(new AjaxSubmitLink("test") {
-            @Override
+			private static final long serialVersionUID = -91239899377941223L;
+
+			@Override
             protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
-                ((FormComponent)form.get("servicesUrl")).processInput();
-                String servicesUrl = (String)((FormComponent)form.get("servicesUrl")).getConvertedInput();
+                ((FormComponent<?>)form.get("servicesUrl")).processInput();
+                String servicesUrl = (String)((FormComponent<?>)form.get("servicesUrl")).getConvertedInput();
                 RuleReaderService ruleReader = getRuleReaderService(servicesUrl);
                 try {
-                    List<ShortRule> rules = ruleReader.getMatchingRules(new RuleFilter());
+                    ruleReader.getMatchingRules(new RuleFilter());
 
                     info(new StringResourceModel(GeofencePage.class.getSimpleName() +
-                            ".connectionSuccessful", null).getObject());
+                            ".connectionSuccessful").getObject());
                 } catch(Exception e) {
                     error(e);
                     LOGGER.log(Level.WARNING, e.getMessage(), e);
@@ -200,13 +202,18 @@ public void onSubmit() {
 
         form.add(new AjaxSubmitLink("invalidate") {
 
-            @Override
+            /**
+			 * 
+			 */
+			private static final long serialVersionUID = 3847903240475052867L;
+
+			@Override
             protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
                 CachedRuleReader cacheRuleReader = GeoServerExtensions
                     .bean(CachedRuleReader.class);
                 cacheRuleReader.invalidateAll();
                 info(new StringResourceModel(GeofencePage.class.getSimpleName() +
-                        ".cacheInvalidated", null).getObject());
+                        ".cacheInvalidated").getObject());
                 updateStatsValues(cacheRuleReader);
                 for (Label label : statsLabels) {
                     target.add(label);

diff --git a/...ce/src/main/java/org/geoserver/geofence/web/authentication/GeoFenceAuthProviderPanel.java b/...ce/src/main/java/org/geoserver/geofence/web/authentication/GeoFenceAuthProviderPanel.java
@@ -25,8 +25,10 @@
 import org.geoserver.security.web.auth.AuthenticationProviderPanel;
 
 public class GeoFenceAuthProviderPanel extends AuthenticationProviderPanel<GeoFenceAuthenticationProviderConfig> {
+
+	private static final long serialVersionUID = 4454241105050831394L;
 
-    public GeoFenceAuthProviderPanel(String id, IModel<GeoFenceAuthenticationProviderConfig> model) {
+	public GeoFenceAuthProviderPanel(String id, IModel<GeoFenceAuthenticationProviderConfig> model) {
         super(id, model);
     }
 }
diff --git a/...rc/main/java/org/geoserver/geofence/web/authentication/GeoFenceAuthProviderPanelInfo.java b/...rc/main/java/org/geoserver/geofence/web/authentication/GeoFenceAuthProviderPanelInfo.java
@@ -31,7 +31,9 @@
 public class GeoFenceAuthProviderPanelInfo
     extends AuthenticationProviderPanelInfo<GeoFenceAuthenticationProviderConfig, GeoFenceAuthProviderPanel> {
 
-    public GeoFenceAuthProviderPanelInfo() {
+	private static final long serialVersionUID = 8491501364970390005L;
+
+	public GeoFenceAuthProviderPanelInfo() {
         setComponentClass(GeoFenceAuthProviderPanel.class);
         setServiceClass(GeoFenceAuthenticationProvider.class);
         setServiceConfigClass(GeoFenceAuthenticationProviderConfig.class);

diff --git a/src/community/geofence/src/test/java/org/geoserver/geofence/GeofencePageTest.java b/src/community/geofence/src/test/java/org/geoserver/geofence/GeofencePageTest.java
@@ -22,6 +22,7 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.io.Serializable;
 import java.net.URISyntaxException;
 
 import static junit.framework.TestCase.assertTrue;
@@ -116,8 +117,9 @@ public void testErrorEmptyURL()  {
 
     @Test
     public void testErrorWrongURL()  {
-        TextField servicesUrl = ((TextField)tester.getComponentFromLastRenderedPage("form:servicesUrl"));
-        servicesUrl.setDefaultModel(new Model("fakeurl"));
+        @SuppressWarnings("unchecked")
+		TextField<String> servicesUrl = ((TextField<String>)tester.getComponentFromLastRenderedPage("form:servicesUrl"));
+        servicesUrl.setDefaultModel(new Model<String>("fakeurl"));
 
         tester.clickLink("form:test", true);
 
@@ -148,8 +150,8 @@ public void testErrorWrongCacheSize()  {
     public void testInvalidateCache()  {
         tester.clickLink("form:invalidate", true);
         String success = new StringResourceModel(GeofencePage.class.getSimpleName() +
-                ".cacheInvalidated", null).getObject();
-        tester.assertInfoMessages(new String[] { success });
+                ".cacheInvalidated").getObject();
+        tester.assertInfoMessages((Serializable[]) new String[] { success });
     }
 
 }