Replace iterators with enhanced for loops (#10018)

This change also includes some other minor cleanup.

1 files changed, 3 insertions, 3 deletions

diff --git a/compatibility-server/src/test/java/com/vaadin/v7/tests/VaadinClasses.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/VaadinClasses.java
index fd2ae40cb5..f8667dda6f 100644
--- a/compatibility-server/src/test/java/com/vaadin/v7/tests/VaadinClasses.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/VaadinClasses.java
@@ -19,7 +19,7 @@ public class VaadinClasses {
 
     private static final Set<String> WHITE_LIST_FQNS = new HashSet<String>();
 
-    public static List<Class<? extends Field>> getFields() {
+    public static List<Class<? extends Field<?>>> getFields() {
         return getServerClasses(Field.class::isAssignableFrom)
                 .map(VaadinClasses::castFieldClass)
                 .collect(Collectors.toList());
@@ -50,8 +50,8 @@ public class VaadinClasses {
                 .collect(Collectors.toList());
     }
 
-    private static Class<? extends Field> castFieldClass(Class<?> clazz) {
-        return (Class<? extends Field>) clazz;
+    private static Class<? extends Field<?>> castFieldClass(Class<?> clazz) {
+        return (Class<? extends Field<?>>) clazz;
     }
 
     private static Class<? extends Component> castComponentClass(