Fix compiler errors/warnings in o.g.w.d.l.CascadedWFSStoredQueryNewPage

geoserver · Jan 18, 2016 · 60f4d5a · 60f4d5a
1 parent db5dabf
commit 60f4d5a
Showing 1 changed file with 22 additions and 9 deletions.
diff --git a/src/web/core/src/main/java/org/geoserver/web/data/layer/CascadedWFSStoredQueryNewPage.java b/src/web/core/src/main/java/org/geoserver/web/data/layer/CascadedWFSStoredQueryNewPage.java
@@ -46,9 +46,12 @@
 
 public class CascadedWFSStoredQueryNewPage extends CascadedWFSStoredQueryAbstractPage {
 
+    /** serialVersionUID */
+    private static final long serialVersionUID = 5430480206314316146L;
+
     static final Logger LOGGER = Logging.getLogger(CascadedWFSStoredQueryNewPage.class);
 
-    DropDownChoice storedQueriesDropDown;
+    DropDownChoice<StoredQuery> storedQueriesDropDown;
 
     private String nativeName;
 
@@ -62,7 +65,7 @@ protected Component getStoredQueryNameComponent() {
         storedQueriesDropDown = storedQueriesDropDown();
         f.add(storedQueriesDropDown);
 
-        TextField textField = new TextField("nativeName", new PropertyModel(this, "nativeName"));
+        TextField<String> textField = new TextField<>("nativeName", new PropertyModel<>(this, "nativeName"));
         textField.setRequired(true);
         textField.add(new ViewNameValidator());
 
@@ -94,12 +97,10 @@ protected void onSave() {
                 createStoredQueryConfiguration(parameterProvider.getItems(),
                 selection.storedQueryId);
 
-        String storedQueryId = selection.storedQueryId;
-
         try {
             DataStoreInfo dsInfo = getCatalog().getStore(storeId, DataStoreInfo.class);
             WFSDataStore directDs = getContentDataStore();
-            DataAccess da = dsInfo.getDataStore(null);
+            DataAccess<?,?> da = dsInfo.getDataStore(null);
 
             Name typeName = directDs.addStoredQuery(getNativeName(), config.getStoredQueryId());
 
@@ -123,13 +124,16 @@ protected void onCancel() {
         doReturn(LayerPage.class);
     }
 
-    private DropDownChoice storedQueriesDropDown() {
-        final DropDownChoice dropdown = new DropDownChoice("storedQueriesDropDown", new Model(),
+    private DropDownChoice<StoredQuery> storedQueriesDropDown() {
+        final DropDownChoice<StoredQuery> dropdown = new DropDownChoice<>("storedQueriesDropDown", new Model<>(),
                 new StoredQueryListModel(), new StoredQueryListRenderer());
 
         dropdown.setRequired(true);
         dropdown.add(new AjaxFormComponentUpdatingBehavior("onchange") {
 
+            /** serialVersionUID */
+            private static final long serialVersionUID = -7195159596309736905L;
+
             @Override
             protected void onUpdate(AjaxRequestTarget target) {
                 StoredQuery selection = (StoredQuery)dropdown.getDefaultModelObject();
@@ -142,6 +146,9 @@ protected void onUpdate(AjaxRequestTarget target) {
     }
 
     private class StoredQueryListModel extends LoadableDetachableModel<List<StoredQuery>> {
+        /** serialVersionUID */
+        private static final long serialVersionUID = 2434460260811775002L;
+
         @Override
         protected List<StoredQuery> load() {
             List<StoredQuery> ret = new ArrayList<StoredQuery>();
@@ -158,6 +165,9 @@ protected List<StoredQuery> load() {
     }
 
     private class StoredQueryListRenderer extends ChoiceRenderer<StoredQuery> {
+        /** serialVersionUID */
+        private static final long serialVersionUID = 7539702994237874704L;
+
         @Override
         public Object getDisplayValue(StoredQuery object) {
             return object.getTitle();
@@ -192,9 +202,12 @@ public String getTitle() {
         }
     }
 
-    class ViewNameValidator implements IValidator {
+    class ViewNameValidator implements IValidator<String> {
+        /** serialVersionUID */
+        private static final long serialVersionUID = 8023559657640603820L;
+
         @Override
-        public void validate(IValidatable validatable) {
+        public void validate(IValidatable<String> validatable) {
             String csqName = (String) validatable.getValue();
 
             final DataStoreInfo store = getCatalog().getStore(storeId, DataStoreInfo.class);