Fixes #38.

Author: highsource

basic/src/main/java/org/jvnet/jaxb2_commons/plugin/mergeable/MergeablePlugin.java

@@ -217,8 +217,8 @@ protected void processClassOutline(ClassOutline classOutline) {
 					final JVar shouldBeSet = block.decl(
 							codeModel.ref(Boolean.class),
 							fieldOutline.getPropertyInfo().getName(false)
-									+ "ShouldBeSet",
-							mergeStrategy.invoke("shouldBeSet")
+									+ "ShouldBeMergedAndSet",
+							mergeStrategy.invoke("shouldBeMergedAndSet")
 									.arg(leftLocator).arg(rightLocator)
 									.arg(leftFieldHasSetValue)
 									.arg(rightFieldHasSetValue));

runtime/src/main/java/org/jvnet/jaxb2_commons/lang/DefaultMergeStrategy.java

@@ -4,10 +4,10 @@
 
 public class DefaultMergeStrategy implements MergeStrategy2, MergeStrategy {
 
-	public static final MergeStrategy2 INSTANCE = new DefaultMergeStrategy();
+	public static final DefaultMergeStrategy INSTANCE = new DefaultMergeStrategy();
 
 	@Override
-	public Boolean shouldBeSet(ObjectLocator leftLocator,
+	public Boolean shouldBeMergedAndSet(ObjectLocator leftLocator,
 			ObjectLocator rightLocator, boolean leftSet, boolean rightSet) {
 		return leftSet || rightSet;
 	}
@@ -473,73 +473,16 @@ public short[] merge(ObjectLocator leftLocator, ObjectLocator rightLocator,
 		}
 	}
 
+	@Override
 	public Object merge(ObjectLocator leftLocator, ObjectLocator rightLocator,
 			Object left, Object right, boolean leftSet, boolean rightSet) {
-
 		if (leftSet && !rightSet) {
 			return left;
 		} else if (!leftSet && rightSet) {
 			return right;
 		} else {
-			if (left == null) {
-				return right;
-			}
-			if (right == null) {
-				return left;
-			}
-			Class<?> lhsClass = left.getClass();
-			if (!lhsClass.isArray()) {
-				return mergeInternal(leftLocator, rightLocator, left, right,
-						leftSet, rightSet);
-			} else if (left.getClass() != right.getClass()) {
-				// Here when we compare different dimensions, for example: a
-				// boolean[][] to a boolean[]
-				return false;
-			}
-			// 'Switch' on type of array, to dispatch to the correct handler
-			// This handles multi dimensional arrays of the same depth
-			else if (left instanceof long[]) {
-				return merge(leftLocator, rightLocator, (long[]) left, (long[]) right,
-						leftSet, rightSet);
-			} else if (left instanceof int[]) {
-				return merge(leftLocator, rightLocator, (int[]) left, (int[]) right,
-						leftSet, rightSet);
-			} else if (left instanceof short[]) {
-				return merge(leftLocator, rightLocator, (short[]) left,
-						(short[]) right, leftSet, rightSet);
-			} else if (left instanceof char[]) {
-				return merge(leftLocator, rightLocator, (char[]) left, (char[]) right,
-						leftSet, rightSet);
-			} else if (left instanceof byte[]) {
-				return merge(leftLocator, rightLocator, (byte[]) left, (byte[]) right,
-						leftSet, rightSet);
-			} else if (left instanceof double[]) {
-				return merge(leftLocator, rightLocator, (double[]) left,
-						(double[]) right, leftSet, rightSet);
-			} else if (left instanceof float[]) {
-				return merge(leftLocator, rightLocator, (float[]) left,
-						(float[]) right, leftSet, rightSet);
-			} else if (left instanceof boolean[]) {
-				return merge(leftLocator, rightLocator, (boolean[]) left,
-						(boolean[]) right, leftSet, rightSet);
-			} else {
-				// Not an array of primitives
-				return merge(leftLocator, rightLocator, (Object[]) left,
-						(Object[]) right, leftSet, rightSet);
-			}
+			return merge(leftLocator, rightLocator, left, right);
 		}
 	}
 
-	protected Object mergeInternal(ObjectLocator leftLocator,
-			ObjectLocator rightLocator, Object leftValue, Object rightValue,
-			boolean leftValueSet, boolean rightValueSet) {
-		if (leftValueSet && !rightValueSet) {
-			return leftValue;
-		} else if (!leftValueSet && rightValueSet) {
-			return rightValue;
-		} else {
-			return mergeInternal(leftLocator, rightLocator, leftValue,
-					rightValue);
-		}
-	}
 }

runtime/src/main/java/org/jvnet/jaxb2_commons/lang/JAXBMergeStrategy.java

@@ -27,6 +27,6 @@ protected Object mergeInternal(ObjectLocator leftLocator,
 		return !leftCollection.isEmpty() ? leftCollection : rightCollection;
 	}
 
-	public static final MergeStrategy2 INSTANCE = new JAXBMergeStrategy();
+	public static final JAXBMergeStrategy INSTANCE = new JAXBMergeStrategy();
 
 }

runtime/src/main/java/org/jvnet/jaxb2_commons/lang/MergeStrategy2.java

@@ -4,7 +4,7 @@
 
 public interface MergeStrategy2 {
 
-	public Boolean shouldBeSet(ObjectLocator leftLocator,
+	public Boolean shouldBeMergedAndSet(ObjectLocator leftLocator,
 			ObjectLocator rightLocator, boolean leftSet, boolean rightSet);
 
 	public boolean merge(ObjectLocator leftLocator, ObjectLocator rightLocator,