[#529] fix UnaryExpr not taken when parsing negative numbers

Author: laurentschoelens

jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/parser/java/visitor/DoubleExpressionVisitor.java

@@ -1,5 +1,7 @@
 package org.jvnet.jaxb.annox.parser.java.visitor;
 
+import com.github.javaparser.ast.expr.DoubleLiteralExpr;
+import com.github.javaparser.ast.expr.UnaryExpr;
 import org.jvnet.jaxb.annox.model.annotation.value.XAnnotationValue;
 import org.jvnet.jaxb.annox.model.annotation.value.XDoubleAnnotationValue;
 
@@ -15,4 +17,12 @@ public DoubleExpressionVisitor(Class<?> targetClass) {
 	public XAnnotationValue<Double> visitDefault(StringLiteralExpr n, Void arg) {
 		return new XDoubleAnnotationValue(Double.valueOf(n.getValue()));
 	}
+
+    @Override
+    public XAnnotationValue<Double> visit(UnaryExpr n, Void arg) {
+        if (n.getExpr() instanceof StringLiteralExpr && n.getOperator() == UnaryExpr.Operator.negative) {
+            return visit(new DoubleLiteralExpr("-" + ((StringLiteralExpr) n.getExpr()).getValue()), arg);
+        }
+        return super.visit(n, arg);
+    }
 }

jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/parser/java/visitor/FloatExpressionVisitor.java

@@ -1,5 +1,6 @@
 package org.jvnet.jaxb.annox.parser.java.visitor;
 
+import com.github.javaparser.ast.expr.UnaryExpr;
 import org.jvnet.jaxb.annox.model.annotation.value.XAnnotationValue;
 import org.jvnet.jaxb.annox.model.annotation.value.XFloatAnnotationValue;
 
@@ -15,4 +16,12 @@ public FloatExpressionVisitor(Class<?> targetClass) {
 	public XAnnotationValue<Float> visitDefault(StringLiteralExpr n, Void arg) {
 		return new XFloatAnnotationValue(Float.valueOf(n.getValue()));
 	}
+
+    @Override
+    public XAnnotationValue<Float> visit(UnaryExpr n, Void arg) {
+        if (n.getExpr() instanceof StringLiteralExpr && n.getOperator() == UnaryExpr.Operator.negative) {
+            return visit(new StringLiteralExpr("-" + ((StringLiteralExpr) n.getExpr()).getValue()), arg);
+        }
+        return super.visit(n, arg);
+    }
 }

jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/parser/java/visitor/IntegerExpressionVisitor.java

@@ -1,5 +1,6 @@
 package org.jvnet.jaxb.annox.parser.java.visitor;
 
+import com.github.javaparser.ast.expr.UnaryExpr;
 import org.jvnet.jaxb.annox.model.annotation.value.XAnnotationValue;
 import org.jvnet.jaxb.annox.model.annotation.value.XIntAnnotationValue;
 
@@ -15,4 +16,12 @@ public IntegerExpressionVisitor(Class<?> targetClass) {
 	public XAnnotationValue<Integer> visitDefault(StringLiteralExpr n, Void arg) {
 		return new XIntAnnotationValue(Integer.valueOf(n.getValue()));
 	}
+
+    @Override
+    public XAnnotationValue<Integer> visit(UnaryExpr n, Void arg) {
+        if (n.getExpr() instanceof StringLiteralExpr && n.getOperator() == UnaryExpr.Operator.negative) {
+            return visit(new StringLiteralExpr("-" + ((StringLiteralExpr) n.getExpr()).getValue()), arg);
+        }
+        return super.visit(n, arg);
+    }
 }

jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/parser/java/visitor/LongExpressionVisitor.java

@@ -1,5 +1,6 @@
 package org.jvnet.jaxb.annox.parser.java.visitor;
 
+import com.github.javaparser.ast.expr.UnaryExpr;
 import org.jvnet.jaxb.annox.model.annotation.value.XAnnotationValue;
 import org.jvnet.jaxb.annox.model.annotation.value.XLongAnnotationValue;
 
@@ -18,6 +19,14 @@ public XAnnotationValue<Long> visitDefault(StringLiteralExpr n, Void arg) {
 		return new XLongAnnotationValue(Long.valueOf(n.getValue()));
 	}
 
+    @Override
+    public XAnnotationValue<Long> visit(UnaryExpr n, Void arg) {
+        if (n.getExpr() instanceof StringLiteralExpr && n.getOperator() == UnaryExpr.Operator.negative) {
+            return visit(new LongLiteralExpr("-" + ((StringLiteralExpr) n.getExpr()).getValue()), arg);
+        }
+        return super.visit(n, arg);
+    }
+
 	@Override
 	public XAnnotationValue<Long> visit(LongLiteralMinValueExpr n, Void arg) {
 		return new XLongAnnotationValue(Long.MIN_VALUE);

jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/parser/java/visitor/ShortExpressionVisitor.java

@@ -1,5 +1,6 @@
 package org.jvnet.jaxb.annox.parser.java.visitor;
 
+import com.github.javaparser.ast.expr.UnaryExpr;
 import org.jvnet.jaxb.annox.model.annotation.value.XAnnotationValue;
 import org.jvnet.jaxb.annox.model.annotation.value.XShortAnnotationValue;
 
@@ -15,4 +16,12 @@ public ShortExpressionVisitor(Class<?> targetClass) {
 	public XAnnotationValue<Short> visitDefault(StringLiteralExpr n, Void arg) {
 		return new XShortAnnotationValue(Short.valueOf(n.getValue()));
 	}
+
+    @Override
+    public XAnnotationValue<Short> visit(UnaryExpr n, Void arg) {
+        if (n.getExpr() instanceof StringLiteralExpr && n.getOperator() == UnaryExpr.Operator.negative) {
+            return visit(new StringLiteralExpr("-" + ((StringLiteralExpr) n.getExpr()).getValue()), arg);
+        }
+        return super.visit(n, arg);
+    }
 }

jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/parser/tests/One.java

@@ -16,12 +16,12 @@
 				byteArrayField = { 0, 1 },
 				charArrayField = { 'a', 'b' },
 				classArrayField = {	String.class, Boolean.class },
-				doubleArrayField = { 2, 3 },
+				doubleArrayField = { 2, 3, -3 },
 				enumArrayField = { E.ONE, E.TWO },
-				floatArrayField = { 4.5f, 6.7f },
-				intArrayField = { 8, 9 },
-				longArrayField = { 10, -9223372036854775808L },
-				shortArrayField = { 12, 13 },
+				floatArrayField = { 4.5f, -6.7f },
+				intArrayField = { 8, -9 },
+				longArrayField = { 10, -10, -9223372036854775808L },
+				shortArrayField = { 12, -13 },
 				stringArrayField = { "14", "15", "16", "17" },
 				annotationArrayField = { @B.C, @B.C }))
 public class One {

jaxb-annox-parent/jaxb-annox/src/test/java/org/jvnet/jaxb/annox/parser/tests/Two.java

@@ -18,12 +18,12 @@
 			byteArrayField = {0, 1 },
 			charArrayField = { 'a', 'b' },
 			classArrayField = {String.class, Boolean.class },
-			doubleArrayField = { 2, 3 },
+			doubleArrayField = { 2, 3, -3 },
 			enumArrayField = {	E.ONE, E.TWO },
-			floatArrayField = { 4.5f, 6.7f },
-			intArrayField = { 8, 9 },
-			longArrayField = { 10, -9223372036854775808L },
-			shortArrayField = { 12, 13 },
+			floatArrayField = { 4.5f, -6.7f },
+			intArrayField = { 8, -9 },
+			longArrayField = { 10, -10, -9223372036854775808L },
+			shortArrayField = { 12, -13 },
 			stringArrayField = { "14", "15", "16", "17" }))
 public class Two {
 

jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/jaxb/annox/parser/tests/one.txt

@@ -15,11 +15,11 @@
 				byteArrayField = { 0, 1 },
 				charArrayField = { 'a', 'b' },
 				classArrayField = {	java.lang.String.class, java.lang.Boolean.class },
-				doubleArrayField = { 2, 3d },
+				doubleArrayField = { 2, 3d, -3d },
 				enumArrayField = { org.jvnet.jaxb.annox.parser.tests.E.ONE, org.jvnet.jaxb.annox.parser.tests.E.TWO },
-				floatArrayField = { 4.5f, 6.7f },
-				intArrayField = { 8, 9 },
-				longArrayField = { 10L, -9223372036854775808L },
-				shortArrayField = { 12, 13 },
+				floatArrayField = { 4.5f, -6.7f },
+				intArrayField = { 8, -9 },
+				longArrayField = { 10L, -10L, -9223372036854775808L },
+				shortArrayField = { 12, -13 },
 				stringArrayField = { "14", "15", "16", "17" },
 				annotationArrayField = { @org.jvnet.jaxb.annox.parser.tests.B.C, @org.jvnet.jaxb.annox.parser.tests.B.C }))

jaxb-annox-parent/jaxb-annox/src/test/resources/org/jvnet/jaxb/annox/parser/tests/one.xml

@@ -17,12 +17,12 @@
 			byteArrayField="0 1"
 			charArrayField="a b"
 			classArrayField="java.lang.String java.lang.Boolean"
-			doubleArrayField="2 3"
+			doubleArrayField="2 3 -3"
 			enumArrayField="ONE TWO"
-			floatArrayField="4.5 6.7"
-			intArrayField="8 9"
-			longArrayField="10 -9223372036854775808"
-			shortArrayField="12 13"
+			floatArrayField="4.5 -6.7"
+			intArrayField="8 -9"
+			longArrayField="10 -10 -9223372036854775808"
+			shortArrayField="12 -13"
 			stringArrayField="14 15">
       <stringArrayField>16</stringArrayField>
       <stringArrayField>17</stringArrayField>