#75: Merge branch 'dev_javaplugin'

Author: maybeec

cobigen/cobigen-javaplugin/pom.xml

@@ -5,7 +5,7 @@
   <groupId>com.capgemini</groupId>
   <artifactId>cobigen-javaplugin</artifactId>
   <name>CobiGen - Java Plug-in</name>
-  <version>1.2.0</version>
+  <version>1.2.1-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <parent>

cobigen/cobigen-javaplugin/src/main/java/com/capgemini/cobigen/javaplugin/inputreader/JavaInputReader.java

@@ -351,16 +351,13 @@ else if (!((List<?>) parsedModel).isEmpty()
                 // so take model1 as documented
                 return parsedModel;
             }
-        } else
+        } else if (parsedModel instanceof String[]) {
+            return Lists.newLinkedList(Arrays.asList(parsedModel));
+        }
         // we will prefer parsed model if parsed value of type String. This is the case for annotation values.
         // QDox will always return the expression, which is a assigned to the annotation's value, as a string.
-        if (parsedModel instanceof String) {
+        else {
             return parsedModel;
-        } else if (parsedModel instanceof String[]) {
-            return Lists.newLinkedList(Arrays.asList(parsedModel));
-        } else {
-            throw new IllegalStateException(
-                "Anything unintended happened. Please state an issue at GitHub or mail one of the developers");
         }
     }
 }

cobigen/cobigen-javaplugin/src/test/java/com/capgemini/cobigen/javaplugin/unittest/inputreader/testdata/TestClassWithRecursiveAnnotations.java

@@ -24,6 +24,7 @@ public boolean isBoolvalue() {
      *            new value of boolvalue
      * @author mbrunnli (05.12.2014)
      */
+    @Action(fault = @FaultAction(className = NullPointerException.class))
     public void setBoolvalue(boolean boolvalue) {
         this.boolvalue = boolvalue;
     }

cobigen/cobigen-javaplugin/src/test/resources/testdata/unittest/inputreader/TestClassWithRecursiveAnnotations.java

@@ -24,6 +24,7 @@ public boolean isBoolvalue() {
      *            new value of boolvalue
      * @author mbrunnli (05.12.2014)
      */
+    @Action(fault =  @FaultAction(className = NullPointerException.class))
     public void setBoolvalue(boolean boolvalue) {
         this.boolvalue = boolvalue;
     }