fixed ClassCastException that occurs if there is a field injection without being a component

Mario David · Mario David · commit 23a3c014f202 · 2017-09-21T09:37:09.000+02:00
diff --git a/build.gradle b/build.gradle
@@ -34,8 +34,8 @@ apply(plugin: 'cuba')
 cuba {
     artifact {
         group = 'de.balvi.cuba.declarativecontrollers'
-        version = '0.3'
-        isSnapshot = false
+        version = '0.3.1'
+        isSnapshot = true
     }
     tomcat {
         dir = "$project.rootDir/deploy/tomcat"
diff --git a/modules/web/src/de/balvi/cuba/declarativecontrollers/web/browse/BrowseAnnotationDispatcherBean.java b/modules/web/src/de/balvi/cuba/declarativecontrollers/web/browse/BrowseAnnotationDispatcherBean.java
@@ -4,7 +4,6 @@
 import de.balvi.cuba.declarativecontrollers.web.annotationexecutor.AbstractAnnotationDispatcherBean;
 import de.balvi.cuba.declarativecontrollers.web.annotationexecutor.browse.BrowseAnnotationExecutor;
 import de.balvi.cuba.declarativecontrollers.web.annotationexecutor.browse.BrowseFieldAnnotationExecutor;
-import groovy.transform.CompileStatic;
 import org.springframework.stereotype.Component;
 
 import java.lang.annotation.Annotation;
@@ -26,22 +25,25 @@ private void executeInitForFieldAnnotations(AnnotatableAbstractLookup browse, Ma
             Annotation[] fieldAnnotations = field.getAnnotations();
 
             for (Annotation annotation : fieldAnnotations) {
-                com.haulmont.cuba.gui.components.Component fieldValue = getFieldValue(browse, field);
 
-                Collection<BrowseFieldAnnotationExecutor> supportedAnnotations = getSupportedBrowseFieldAnnotationExecutors(annotation);
+                Collection<BrowseFieldAnnotationExecutor> supportedAnnotationExecutors = getSupportedBrowseFieldAnnotationExecutors(annotation);
 
-                for (BrowseFieldAnnotationExecutor annotationExecutor : supportedAnnotations) {
-                    annotationExecutor.init(annotation, browse, fieldValue, params);
+                if (supportedAnnotationExecutors != null && supportedAnnotationExecutors.size() > 0) {
+                    com.haulmont.cuba.gui.components.Component fieldValue = getFieldValue(browse, field);
+                    for (BrowseFieldAnnotationExecutor annotationExecutor : supportedAnnotationExecutors) {
+                        annotationExecutor.init(annotation, browse, fieldValue, params);
+                    }
                 }
+
             }
         }
     }
 
     private void executeInitForClassAnnotations(AnnotatableAbstractLookup browse, Map<String, Object> params) {
         for (Annotation annotation : getClassAnnotations(browse)) {
-            Collection<BrowseAnnotationExecutor> supportedAnnotations = getSupportedBrowseAnnotationExecutors(annotation);
+            Collection<BrowseAnnotationExecutor> supportedAnnotationExecutors = getSupportedBrowseAnnotationExecutors(annotation);
 
-            for (BrowseAnnotationExecutor annotationExecutor : supportedAnnotations) {
+            for (BrowseAnnotationExecutor annotationExecutor : supportedAnnotationExecutors) {
                 annotationExecutor.init(annotation, browse, params);
             }
         }
@@ -60,12 +62,14 @@ private void executeReadyForFieldAnnotations(AnnotatableAbstractLookup browse, M
 
             Annotation[] fieldAnnotations = field.getAnnotations();
             for (Annotation annotation : fieldAnnotations) {
-                com.haulmont.cuba.gui.components.Component fieldValue = getFieldValue(browse, field);
 
-                Collection<BrowseFieldAnnotationExecutor> supportedAnnotations = getSupportedBrowseFieldAnnotationExecutors(annotation);
+                Collection<BrowseFieldAnnotationExecutor> supportedAnnotationExecutors = getSupportedBrowseFieldAnnotationExecutors(annotation);
 
-                for (BrowseFieldAnnotationExecutor annotationExecutor : supportedAnnotations) {
-                    annotationExecutor.ready(annotation, browse, fieldValue, params);
+                if (supportedAnnotationExecutors != null && supportedAnnotationExecutors.size() > 0) {
+                    com.haulmont.cuba.gui.components.Component fieldValue = getFieldValue(browse, field);
+                    for (BrowseFieldAnnotationExecutor annotationExecutor : supportedAnnotationExecutors) {
+                        annotationExecutor.ready(annotation, browse, fieldValue, params);
+                    }
                 }
             }
         }
diff --git a/modules/web/src/de/balvi/cuba/declarativecontrollers/web/editor/EditorAnnotationDispatcherBean.java b/modules/web/src/de/balvi/cuba/declarativecontrollers/web/editor/EditorAnnotationDispatcherBean.java
@@ -25,9 +25,9 @@ public void executeInit(AnnotatableAbstractEditor editor, Map<String, Object> pa
     private void executeInitForClassAnnotations(AnnotatableAbstractEditor editor, Map<String, Object> params) {
         for (Annotation annotation : getClassAnnotations(editor)) {
 
-            Collection<EditorAnnotationExecutor> supportedAnnotations = getSupportedEditorAnnotationExecutors(annotation);
+            Collection<EditorAnnotationExecutor> supportedAnnotationExecutors = getSupportedEditorAnnotationExecutors(annotation);
 
-            for (EditorAnnotationExecutor annotationExecutor : supportedAnnotations) {
+            for (EditorAnnotationExecutor annotationExecutor : supportedAnnotationExecutors) {
                 annotationExecutor.init(annotation, editor, params);
             }
         }
@@ -37,13 +37,16 @@ private void executeInitForFieldAnnotations(AnnotatableAbstractEditor editor, Ma
         for (Field field : getDeclaredFields(editor)) {
             Annotation[] fieldAnnotations = field.getAnnotations();
             for (Annotation annotation : fieldAnnotations) {
-                com.haulmont.cuba.gui.components.Component fieldValue = getFieldValue(editor, field);
 
-                Collection<EditorFieldAnnotationExecutor> supportedAnnotations = getSupportedEditorFieldAnnotationExecutors(annotation);
+                Collection<EditorFieldAnnotationExecutor> supportedAnnotationExecutors = getSupportedEditorFieldAnnotationExecutors(annotation);
 
-                for (EditorFieldAnnotationExecutor annotationExecutor : supportedAnnotations) {
-                    annotationExecutor.init(annotation, editor, fieldValue, params);
+                if (supportedAnnotationExecutors != null && supportedAnnotationExecutors.size() > 0) {
+                    com.haulmont.cuba.gui.components.Component fieldValue = getFieldValue(editor, field);
+                    for (EditorFieldAnnotationExecutor annotationExecutor : supportedAnnotationExecutors) {
+                        annotationExecutor.init(annotation, editor, fieldValue, params);
+                    }
                 }
+
             }
         }
     }
@@ -59,12 +62,13 @@ private void executeInitForFieldAnnotations(AnnotatableAbstractEditor editor) {
         for (Field field : getDeclaredFields(editor)) {
             Annotation[] fieldAnnotations = field.getAnnotations();
             for (Annotation annotation : fieldAnnotations) {
-                com.haulmont.cuba.gui.components.Component fieldValue = getFieldValue(editor, field);
-
-                Collection<EditorFieldAnnotationExecutor> supportedAnnotations = getSupportedEditorFieldAnnotationExecutors(annotation);
+                Collection<EditorFieldAnnotationExecutor> supportedAnnotationExecutors = getSupportedEditorFieldAnnotationExecutors(annotation);
 
-                for (EditorFieldAnnotationExecutor annotationExecutor : supportedAnnotations) {
-                    annotationExecutor.postInit(annotation, editor, fieldValue);
+                if (supportedAnnotationExecutors != null && supportedAnnotationExecutors.size() > 0) {
+                    com.haulmont.cuba.gui.components.Component fieldValue = getFieldValue(editor, field);
+                    for (EditorFieldAnnotationExecutor annotationExecutor : supportedAnnotationExecutors) {
+                        annotationExecutor.postInit(annotation, editor, fieldValue);
+                    }
                 }
             }
         }
@@ -74,9 +78,9 @@ private void executePostInitForClassAnnotations(AnnotatableAbstractEditor editor
 
         for (Annotation annotation : getClassAnnotations(editor)) {
 
-            Collection<EditorAnnotationExecutor> supportedAnnotations = getSupportedEditorAnnotationExecutors(annotation);
+            Collection<EditorAnnotationExecutor> supportedAnnotationExecutors = getSupportedEditorAnnotationExecutors(annotation);
 
-            for (EditorAnnotationExecutor annotationExecutor : supportedAnnotations) {
+            for (EditorAnnotationExecutor annotationExecutor : supportedAnnotationExecutors) {
                 annotationExecutor.postInit(annotation, editor);
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,6 @@`
`4`	`4`	`import de.balvi.cuba.declarativecontrollers.web.annotationexecutor.AbstractAnnotationDispatcherBean;`
`5`	`5`	`import de.balvi.cuba.declarativecontrollers.web.annotationexecutor.browse.BrowseAnnotationExecutor;`
`6`	`6`	`import de.balvi.cuba.declarativecontrollers.web.annotationexecutor.browse.BrowseFieldAnnotationExecutor;`
`7`		`-import groovy.transform.CompileStatic;`
`8`	`7`	`import org.springframework.stereotype.Component;`
`9`	`8`
`10`	`9`	`import java.lang.annotation.Annotation;`
`@@ -26,22 +25,25 @@ private void executeInitForFieldAnnotations(AnnotatableAbstractLookup browse, Ma`
`26`	`25`	`Annotation[] fieldAnnotations = field.getAnnotations();`
`27`	`26`
`28`	`27`	`for (Annotation annotation : fieldAnnotations) {`
`29`		`- com.haulmont.cuba.gui.components.Component fieldValue = getFieldValue(browse, field);`
`30`	`28`
`31`		`- Collection<BrowseFieldAnnotationExecutor> supportedAnnotations = getSupportedBrowseFieldAnnotationExecutors(annotation);`
	`29`	`+ Collection<BrowseFieldAnnotationExecutor> supportedAnnotationExecutors = getSupportedBrowseFieldAnnotationExecutors(annotation);`
`32`	`30`
`33`		`- for (BrowseFieldAnnotationExecutor annotationExecutor : supportedAnnotations) {`
`34`		`- annotationExecutor.init(annotation, browse, fieldValue, params);`
	`31`	`+ if (supportedAnnotationExecutors != null && supportedAnnotationExecutors.size() > 0) {`
	`32`	`+ com.haulmont.cuba.gui.components.Component fieldValue = getFieldValue(browse, field);`
	`33`	`+ for (BrowseFieldAnnotationExecutor annotationExecutor : supportedAnnotationExecutors) {`
	`34`	`+ annotationExecutor.init(annotation, browse, fieldValue, params);`
	`35`	`+ }`
`35`	`36`	`}`
	`37`	`+`
`36`	`38`	`}`
`37`	`39`	`}`
`38`	`40`	`}`
`39`	`41`
`40`	`42`	`private void executeInitForClassAnnotations(AnnotatableAbstractLookup browse, Map<String, Object> params) {`
`41`	`43`	`for (Annotation annotation : getClassAnnotations(browse)) {`
`42`		`- Collection<BrowseAnnotationExecutor> supportedAnnotations = getSupportedBrowseAnnotationExecutors(annotation);`
	`44`	`+ Collection<BrowseAnnotationExecutor> supportedAnnotationExecutors = getSupportedBrowseAnnotationExecutors(annotation);`
`43`	`45`
`44`		`- for (BrowseAnnotationExecutor annotationExecutor : supportedAnnotations) {`
	`46`	`+ for (BrowseAnnotationExecutor annotationExecutor : supportedAnnotationExecutors) {`
`45`	`47`	`annotationExecutor.init(annotation, browse, params);`
`46`	`48`	`}`
`47`	`49`	`}`
`@@ -60,12 +62,14 @@ private void executeReadyForFieldAnnotations(AnnotatableAbstractLookup browse, M`
`60`	`62`
`61`	`63`	`Annotation[] fieldAnnotations = field.getAnnotations();`
`62`	`64`	`for (Annotation annotation : fieldAnnotations) {`
`63`		`- com.haulmont.cuba.gui.components.Component fieldValue = getFieldValue(browse, field);`
`64`	`65`
`65`		`- Collection<BrowseFieldAnnotationExecutor> supportedAnnotations = getSupportedBrowseFieldAnnotationExecutors(annotation);`
	`66`	`+ Collection<BrowseFieldAnnotationExecutor> supportedAnnotationExecutors = getSupportedBrowseFieldAnnotationExecutors(annotation);`
`66`	`67`
`67`		`- for (BrowseFieldAnnotationExecutor annotationExecutor : supportedAnnotations) {`
`68`		`- annotationExecutor.ready(annotation, browse, fieldValue, params);`
	`68`	`+ if (supportedAnnotationExecutors != null && supportedAnnotationExecutors.size() > 0) {`
	`69`	`+ com.haulmont.cuba.gui.components.Component fieldValue = getFieldValue(browse, field);`
	`70`	`+ for (BrowseFieldAnnotationExecutor annotationExecutor : supportedAnnotationExecutors) {`
	`71`	`+ annotationExecutor.ready(annotation, browse, fieldValue, params);`
	`72`	`+ }`
`69`	`73`	`}`
`70`	`74`	`}`
`71`	`75`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,9 +25,9 @@ public void executeInit(AnnotatableAbstractEditor editor, Map<String, Object> pa`
`25`	`25`	`private void executeInitForClassAnnotations(AnnotatableAbstractEditor editor, Map<String, Object> params) {`
`26`	`26`	`for (Annotation annotation : getClassAnnotations(editor)) {`
`27`	`27`
`28`		`- Collection<EditorAnnotationExecutor> supportedAnnotations = getSupportedEditorAnnotationExecutors(annotation);`
	`28`	`+ Collection<EditorAnnotationExecutor> supportedAnnotationExecutors = getSupportedEditorAnnotationExecutors(annotation);`
`29`	`29`
`30`		`- for (EditorAnnotationExecutor annotationExecutor : supportedAnnotations) {`
	`30`	`+ for (EditorAnnotationExecutor annotationExecutor : supportedAnnotationExecutors) {`
`31`	`31`	`annotationExecutor.init(annotation, editor, params);`
`32`	`32`	`}`
`33`	`33`	`}`
`@@ -37,13 +37,16 @@ private void executeInitForFieldAnnotations(AnnotatableAbstractEditor editor, Ma`
`37`	`37`	`for (Field field : getDeclaredFields(editor)) {`
`38`	`38`	`Annotation[] fieldAnnotations = field.getAnnotations();`
`39`	`39`	`for (Annotation annotation : fieldAnnotations) {`
`40`		`- com.haulmont.cuba.gui.components.Component fieldValue = getFieldValue(editor, field);`
`41`	`40`
`42`		`- Collection<EditorFieldAnnotationExecutor> supportedAnnotations = getSupportedEditorFieldAnnotationExecutors(annotation);`
	`41`	`+ Collection<EditorFieldAnnotationExecutor> supportedAnnotationExecutors = getSupportedEditorFieldAnnotationExecutors(annotation);`
`43`	`42`
`44`		`- for (EditorFieldAnnotationExecutor annotationExecutor : supportedAnnotations) {`
`45`		`- annotationExecutor.init(annotation, editor, fieldValue, params);`
	`43`	`+ if (supportedAnnotationExecutors != null && supportedAnnotationExecutors.size() > 0) {`
	`44`	`+ com.haulmont.cuba.gui.components.Component fieldValue = getFieldValue(editor, field);`
	`45`	`+ for (EditorFieldAnnotationExecutor annotationExecutor : supportedAnnotationExecutors) {`
	`46`	`+ annotationExecutor.init(annotation, editor, fieldValue, params);`
	`47`	`+ }`
`46`	`48`	`}`
	`49`	`+`
`47`	`50`	`}`
`48`	`51`	`}`
`49`	`52`	`}`
`@@ -59,12 +62,13 @@ private void executeInitForFieldAnnotations(AnnotatableAbstractEditor editor) {`
`59`	`62`	`for (Field field : getDeclaredFields(editor)) {`
`60`	`63`	`Annotation[] fieldAnnotations = field.getAnnotations();`
`61`	`64`	`for (Annotation annotation : fieldAnnotations) {`
`62`		`- com.haulmont.cuba.gui.components.Component fieldValue = getFieldValue(editor, field);`
`63`		`-`
`64`		`- Collection<EditorFieldAnnotationExecutor> supportedAnnotations = getSupportedEditorFieldAnnotationExecutors(annotation);`
	`65`	`+ Collection<EditorFieldAnnotationExecutor> supportedAnnotationExecutors = getSupportedEditorFieldAnnotationExecutors(annotation);`
`65`	`66`
`66`		`- for (EditorFieldAnnotationExecutor annotationExecutor : supportedAnnotations) {`
`67`		`- annotationExecutor.postInit(annotation, editor, fieldValue);`
	`67`	`+ if (supportedAnnotationExecutors != null && supportedAnnotationExecutors.size() > 0) {`
	`68`	`+ com.haulmont.cuba.gui.components.Component fieldValue = getFieldValue(editor, field);`
	`69`	`+ for (EditorFieldAnnotationExecutor annotationExecutor : supportedAnnotationExecutors) {`
	`70`	`+ annotationExecutor.postInit(annotation, editor, fieldValue);`
	`71`	`+ }`
`68`	`72`	`}`
`69`	`73`	`}`
`70`	`74`	`}`
`@@ -74,9 +78,9 @@ private void executePostInitForClassAnnotations(AnnotatableAbstractEditor editor`
`74`	`78`
`75`	`79`	`for (Annotation annotation : getClassAnnotations(editor)) {`
`76`	`80`
`77`		`- Collection<EditorAnnotationExecutor> supportedAnnotations = getSupportedEditorAnnotationExecutors(annotation);`
	`81`	`+ Collection<EditorAnnotationExecutor> supportedAnnotationExecutors = getSupportedEditorAnnotationExecutors(annotation);`
`78`	`82`
`79`		`- for (EditorAnnotationExecutor annotationExecutor : supportedAnnotations) {`
	`83`	`+ for (EditorAnnotationExecutor annotationExecutor : supportedAnnotationExecutors) {`
`80`	`84`	`annotationExecutor.postInit(annotation, editor);`
`81`	`85`	`}`
`82`	`86`	`}`