Merge branch 'WildcardType' into 'master'

WildcardType supported by TypeUtil

See merge request exedio/copebuilder!32

Author: rw7

src/com/exedio/cope/builder/generator/Writer.java

@@ -20,7 +20,6 @@
 import com.exedio.cope.pattern.PriceField;
 import com.exedio.cope.pattern.RangeField;
 import com.exedio.cope.pattern.SetField;
-import com.exedio.cope.reflect.TypeField;
 import java.io.IOException;
 import java.lang.reflect.Modifier;
 import java.util.Locale;
@@ -82,10 +81,6 @@ static void writeGeneratedBuilder(final MyType<?> type, final JavaClassWriter wr
 					feature instanceof MapField<?, ?>))
 				continue;
 
-			//TODO should be handled later, will need changes in isVisible and getCanonicalName for WildcardType
-			if (feature instanceof TypeField<?>)
-				continue;
-
 			if(feature instanceof Settable &&
 				!TypeUtil.isVisible(type.getPackageName(), ((Settable<?>) feature).getInitialType()))
 				continue;

src/com/exedio/cope/builder/generator/type/TypeUtil.java

@@ -10,6 +10,7 @@
 import java.lang.reflect.Modifier;
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
+import java.lang.reflect.WildcardType;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -38,6 +39,8 @@ public static String getCanonicalName(@Nonnull final Type type)
 			return getCanonicalName((Class<?>) type);
 		else if(type instanceof ParameterizedType)
 			return getCanonicalName((ParameterizedType) type);
+		else if(type instanceof WildcardType)
+			return getCanonicalName((WildcardType) type);
 		else
 			throw new RuntimeException("Unhandled type " + type + " -- " + type.getClass());
 	}
@@ -48,6 +51,32 @@ private static String getCanonicalName(@Nonnull final Class<?> clazz)
 		return clazz.getCanonicalName() + typeParameterWildCards(clazz);
 	}
 
+	@Nonnull
+	private static String getCanonicalName(@Nonnull final WildcardType type)
+	{
+		final Type[] upper = type.getUpperBounds();
+		if(upper.length==1)
+		{
+			if(type.getLowerBounds().length!=0)
+				throw new RuntimeException(Arrays.toString(type.getLowerBounds()));
+
+			if(Object.class.equals(upper[0]))
+				return "?";
+
+			return "? extends " + getCanonicalName(upper[0]);
+		}
+
+		final Type[] lower = type.getLowerBounds();
+		if(lower.length==1)
+		{
+			if(upper.length!=0)
+				throw new RuntimeException(Arrays.toString(upper));
+			return "? super " + getCanonicalName(lower[0]);
+		}
+
+		throw new RuntimeException(Arrays.asList(upper).toString() + Arrays.asList(lower));
+	}
+
 	@Nonnull
 	private static String getCanonicalName(@Nonnull final ParameterizedType type)
 	{
@@ -122,6 +151,8 @@ public static boolean isVisible(final String packageName, final Type type)
 			return isVisible(packageName, (Class<?>) type);
 		else if(type instanceof ParameterizedType)
 			return isVisible(packageName, (ParameterizedType) type);
+		else if(type instanceof WildcardType)
+			return isVisible(packageName, (WildcardType) type);
 		else
 			throw new RuntimeException(type.getTypeName() + ' ' + type.getClass());
 	}
@@ -149,6 +180,19 @@ private static boolean isVisible(final String packageName, final Class<?> clazz)
 		return packageName.equals(clazz.getPackage().getName());
 	}
 
+	private static boolean isVisible(final String packageName, final WildcardType type)
+	{
+		for(final Type argument : type.getUpperBounds())
+			if(!isVisible(packageName, argument))
+				return false;
+
+		for(final Type argument : type.getLowerBounds())
+			if(!isVisible(packageName, argument))
+				return false;
+
+		return true;
+	}
+
 	private TypeUtil()
 	{
 		// prevent instantiation

testmodelsrc/com/exedio/cope/builder/other/ConcreteItem.java

@@ -15,7 +15,9 @@ public final class ConcreteItem extends AbstractItem
 	@Wrapper(wrap="get", visibility=PUBLIC)
 	private static final IntegerField concreteField = new IntegerField().toFinal();
 
+	@Wrapper(wrap="get", visibility=PUBLIC)
 	private static final TypeField<AbstractItem> typeField = TypeField.create(AbstractItem.class).optional();
+
 	/**
 	 * Returns the value of {@link #concreteField}.
 	 */
@@ -31,7 +33,7 @@ public final int getConcreteField()
 	 */
 	@com.exedio.cope.instrument.Generated // customize with @Wrapper(wrap="get")
 	@java.lang.SuppressWarnings({"FinalMethodInFinalClass","RedundantSuppression","TypeParameterExtendsFinalClass","UnnecessarilyQualifiedStaticUsage"})
-	private com.exedio.cope.Type<? extends AbstractItem> getTypeField()
+	public final com.exedio.cope.Type<? extends AbstractItem> getTypeField()
 	{
 		return ConcreteItem.typeField.get(this);
 	}

testsrc/com/exedio/cope/builder/test/AbstractTest.java

@@ -37,4 +37,21 @@ public void commonAbstract() throws NoSuchMethodException
 		assertTrue(Modifier.isPublic(MixedLevel2ItemBuilder.class.getDeclaredConstructor().getModifiers()));
 		assertEquals(asList(), asList(GeneratedAbstractLevel1ItemBuilder.class.getDeclaredClasses()));
 	}
+
+	@Test
+	public void typeFieldExplicit()
+	{
+		final ConcreteItem i = new ConcreteItemBuilder().
+			typeField(AbstractItem.TYPE).
+			build();
+		assertEquals(AbstractItem.TYPE, i.getTypeField());
+	}
+
+	@Test
+	public void typeFieldFallback()
+	{
+		final ConcreteItem i = new ConcreteItemBuilder().
+			build();
+		assertEquals(null, i.getTypeField());
+	}
 }