diff --git a/src/web/core/src/main/java/org/geoserver/web/data/layer/CoverageViewAbstractPage.java b/src/web/core/src/main/java/org/geoserver/web/data/layer/CoverageViewAbstractPage.java
index 96d599e2b1e..d3393088e9b 100644
--- a/src/web/core/src/main/java/org/geoserver/web/data/layer/CoverageViewAbstractPage.java
+++ b/src/web/core/src/main/java/org/geoserver/web/data/layer/CoverageViewAbstractPage.java
@@ -17,7 +17,6 @@
 import javax.media.jai.ImageLayout;
 
 import org.apache.wicket.markup.html.form.Form;
-import org.apache.wicket.markup.html.form.ChoiceRenderer;
 import org.apache.wicket.markup.html.form.SubmitLink;
 import org.apache.wicket.markup.html.form.TextField;
 import org.apache.wicket.markup.html.link.Link;
@@ -75,7 +74,6 @@ public CoverageViewAbstractPage(PageParameters params) throws IOException {
         this(params.get(WORKSPACE).toOptionalString(), params.get(COVERAGESTORE).toString(), null, null);
     }
 
-    @SuppressWarnings("deprecation")
     public CoverageViewAbstractPage(String workspaceName, String storeName, String coverageName,
             CoverageInfo coverageInfo) throws IOException {
         storeId = getCatalog().getStoreByName(workspaceName, storeName, CoverageStoreInfo.class)
@@ -125,16 +123,18 @@ public CoverageViewAbstractPage(String workspaceName, String storeName, String c
         selectedCoverages = new ArrayList<String>(availableCoverages);
 
         // build the form and the text area
-        Form form = new Form("form", new CompoundPropertyModel(this));
+        Form<CoverageViewAbstractPage> form = new Form<>("form", new CompoundPropertyModel<>(this));
         add(form);
 
-        final TextField nameField = new TextField("name");
+        final TextField<String> nameField = new TextField<>("name");
         nameField.setRequired(true);
         nameField.add(new CoverageViewNameValidator());
         form.add(nameField);
 
-        coverageEditor = new CoverageViewEditor("coverages", new PropertyModel(this,
-                "selectedCoverages"), new PropertyModel(this, "outputBands"), availableCoverages);
+        coverageEditor = new CoverageViewEditor("coverages", 
+                new PropertyModel<>(this,"selectedCoverages"), 
+                new PropertyModel<>(this, "outputBands"), 
+                availableCoverages);
         form.add(coverageEditor);
 
         // save and cancel at the bottom of the page
@@ -144,7 +144,7 @@ public void onSubmit() {
                 onSave();
             }
         });
-        form.add(new Link("cancel") {
+        form.add(new Link<Void>("cancel") {
 
             @Override
             public void onClick() {
@@ -189,11 +189,11 @@ protected String getFirstErrorMessage(Throwable t) {
     /**
      * Checks the {@link CoverageView} name is unique
      */
-    class CoverageViewNameValidator implements IValidator {
+    class CoverageViewNameValidator implements IValidator<String> {
 
         @Override
-        public void validate(IValidatable validatable) {
-            String vcName = (String) validatable.getValue();
+        public void validate(IValidatable<String> validatable) {
+            String vcName = validatable.getValue();
 
             final CoverageStoreInfo store = getCatalog().getStore(storeId, CoverageStoreInfo.class);
             List<CoverageInfo> coverages = getCatalog().getCoveragesByCoverageStore(store);
@@ -228,18 +228,4 @@ public void setSelectedCoverages(List<String> selectedCoverages) {
         this.selectedCoverages = selectedCoverages;
     }
 
-    private class CompositionTypeRenderer extends ChoiceRenderer {
-
-        public CompositionTypeRenderer() {
-        }
-
-        public Object getDisplayValue(Object object) {
-            return object.toString();
-        }
-
-        public String getIdValue(Object object, int index) {
-            return object.toString();
-        }
-    }
-
 }
diff --git a/src/web/core/src/main/java/org/geoserver/web/data/layer/CoverageViewEditPage.java b/src/web/core/src/main/java/org/geoserver/web/data/layer/CoverageViewEditPage.java
index 4c5e68ff8b5..fe4f2d76249 100644
--- a/src/web/core/src/main/java/org/geoserver/web/data/layer/CoverageViewEditPage.java
+++ b/src/web/core/src/main/java/org/geoserver/web/data/layer/CoverageViewEditPage.java
@@ -20,6 +20,9 @@
 
 public class CoverageViewEditPage extends CoverageViewAbstractPage {
 
+    /** serialVersionUID */
+    private static final long serialVersionUID = -3932025430605245513L;
+
     public CoverageViewEditPage(String workspaceName, String storeName, String coverageName,
             CoverageInfo coverageInfo, ResourceConfigurationPage previusPage) throws IOException {
         super(workspaceName, storeName, coverageName, coverageInfo);
diff --git a/src/web/core/src/main/java/org/geoserver/web/data/layer/CoverageViewEditor.java b/src/web/core/src/main/java/org/geoserver/web/data/layer/CoverageViewEditor.java
index ea2c3771725..f321374808d 100644
--- a/src/web/core/src/main/java/org/geoserver/web/data/layer/CoverageViewEditor.java
+++ b/src/web/core/src/main/java/org/geoserver/web/data/layer/CoverageViewEditor.java
@@ -18,7 +18,6 @@
 import org.apache.wicket.markup.html.form.DropDownChoice;
 import org.apache.wicket.markup.html.form.Form;
 import org.apache.wicket.markup.html.form.FormComponentPanel;
-import org.apache.wicket.markup.html.form.ChoiceRenderer;
 import org.apache.wicket.markup.html.form.ListMultipleChoice;
 import org.apache.wicket.markup.html.form.TextField;
 import org.apache.wicket.model.IModel;
@@ -33,10 +32,10 @@
  *
  */
 @SuppressWarnings("serial")
-public class CoverageViewEditor extends FormComponentPanel {
+public class CoverageViewEditor extends FormComponentPanel<List<String>> {
 
-    IModel coverages;
-    IModel outputBands;
+    IModel<List<String>> coverages;
+    IModel<List<CoverageBand>> outputBands;
     List<String> availableCoverages; 
     List<CoverageBand> currentOutputBands;
     ListMultipleChoice<String> coveragesChoice;
@@ -44,7 +43,7 @@ public class CoverageViewEditor extends FormComponentPanel {
 
     ListMultipleChoice<CoverageBand> outputBandsChoice;
 
-    TextField definition;
+    TextField<String> definition;
     DropDownChoice<CompositionType> compositionChoice;
 
     /**
@@ -53,7 +52,7 @@ public class CoverageViewEditor extends FormComponentPanel {
      * @param id
      * @param The module should return a non null collection of strings.
      */
-    public CoverageViewEditor(String id, final IModel inputCoverages, final IModel bands,
+    public CoverageViewEditor(String id, final IModel<List<String>> inputCoverages, final IModel<List<CoverageBand>> bands,
             List<String> availableCoverages) {
         super(id, inputCoverages);
         this.coverages = inputCoverages;
@@ -61,7 +60,7 @@ public CoverageViewEditor(String id, final IModel inputCoverages, final IModel b
 
         this.availableCoverages = availableCoverages;
 
-        coveragesChoice = new ListMultipleChoice<String>("coveragesChoice", new Model(),
+        coveragesChoice = new ListMultipleChoice<String>("coveragesChoice", new Model<>(),
                 new ArrayList<String>((List<String>) coverages.getObject()),
                 new ChoiceRenderer<String>() {
                     @Override
@@ -73,8 +72,8 @@ public Object getDisplayValue(String coverage) {
         add(coveragesChoice);
 
         new ArrayList<CoverageBand>();
-        outputBandsChoice = new ListMultipleChoice<CoverageBand>("outputBandsChoice", new Model(),
-                new ArrayList<CoverageBand>((List<CoverageBand>) outputBands.getObject()),
+        outputBandsChoice = new ListMultipleChoice<CoverageBand>("outputBandsChoice", new Model<>(),
+                new ArrayList<CoverageBand>(outputBands.getObject()),
                 new ChoiceRenderer<CoverageBand>() {
                     @Override
                     public Object getDisplayValue(CoverageBand vcb) {
@@ -87,7 +86,7 @@ public Object getDisplayValue(CoverageBand vcb) {
         currentOutputBands = new ArrayList<CoverageBand>(outputBandsChoice.getChoices());
 
         add(addBandButton());
-        definition = new TextField("definition", new Model());
+        definition = new TextField<>("definition", new Model<>());
         definition.setOutputMarkupId(true);
 
         // TODO: make this parametric on the CompositionType choice
@@ -95,7 +94,7 @@ public Object getDisplayValue(CoverageBand vcb) {
         // TODO Uncomment this row when it can be used
         //add(definition);
         compositionType = CompositionType.getDefault();
-        compositionChoice = new DropDownChoice("compositionType", new PropertyModel(this,
+        compositionChoice = new DropDownChoice<>("compositionType", new PropertyModel<>(this,
                 "compositionType"), Arrays.asList(CompositionType.BAND_SELECT), new CompositionTypeRenderer());
 
         compositionChoice.setOutputMarkupId(true);
@@ -121,7 +120,7 @@ private AjaxButton addBandButton() {
         AjaxButton button = new AjaxButton("addBand") {
 
             @Override
-            public void onSubmit(AjaxRequestTarget target, Form form) {
+            public void onSubmit(AjaxRequestTarget target, Form<?> form) {
                 List<String> selection = (List<String>) coveragesChoice.getModelObject();
                 compositionType = compositionChoice.getModelObject();
                 List<CoverageBand> bandsList = new ArrayList<CoverageBand>();
@@ -160,7 +159,7 @@ private AjaxButton addRemoveAllButton() {
         AjaxButton button = new AjaxButton("removeAllBands") {
 
             @Override
-            public void onSubmit(AjaxRequestTarget target, Form form) {
+            public void onSubmit(AjaxRequestTarget target, Form<?> form) {
                 List<CoverageBand> outputBands = (List<CoverageBand>) outputBandsChoice
                         .getModelObject();
                 outputBands.clear();
@@ -179,7 +178,7 @@ private AjaxButton addRemoveButton() {
         AjaxButton button = new AjaxButton("removeBands") {
 
             @Override
-            public void onSubmit(AjaxRequestTarget target, Form form) {
+            public void onSubmit(AjaxRequestTarget target, Form<?> form) {
 
                 List<CoverageBand> removedBands = (List<CoverageBand>) outputBandsChoice
                         .getModel().getObject();
@@ -198,17 +197,14 @@ public void onSubmit(AjaxRequestTarget target, Form form) {
         return button;
     }
 
-    private class CompositionTypeRenderer extends ChoiceRenderer {
-
-        public CompositionTypeRenderer() {
-        }
-
-        public Object getDisplayValue(Object object) {
-            return ((CompositionType) object).displayValue();
+    private class CompositionTypeRenderer extends ChoiceRenderer<CompositionType> {
+    
+        public Object getDisplayValue(CompositionType object) {
+            return object.displayValue();
         }
 
-        public String getIdValue(Object object, int index) {
-            return ((CompositionType) object).toValue();
+        public String getIdValue(CompositionType object, int index) {
+            return object.toValue();
         }
     }