phoedos/pmd
1
1
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'pr-688'

Browse Source
This commit is contained in:
Andreas Dangel
2017-10-28 19:41:28 +02:00
parent c728db039e 92cc66a8cd
commit 591737b2d9
2 changed files with 48 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
pmd-java/src/main/java/net/sourceforge/pmd/lang/java/typeresolution/MethodTypeResolution.java
View File

@ -13,7 +13,9 @@ import java.lang.reflect.Type;
import java.lang.reflect.TypeVariable; import java.lang.reflect.TypeVariable;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
@ -38,9 +40,10 @@ public final class MethodTypeResolution {
private static final List<Class<?>> PRIMITIVE_SUBTYPE_ORDER; private static final List<Class<?>> PRIMITIVE_SUBTYPE_ORDER;
private static final List<Class<?>> BOXED_PRIMITIVE_SUBTYPE_ORDER; private static final List<Class<?>> BOXED_PRIMITIVE_SUBTYPE_ORDER;
private static final Map<Class<?>, Class<?>> PRIMITIVE_BOXING_RULES;
static { static {
List<Class<?>> primitiveList = new ArrayList<>(); final List<Class<?>> primitiveList = new ArrayList<>();
primitiveList.add(double.class); primitiveList.add(double.class);
primitiveList.add(float.class); primitiveList.add(float.class);
@ -52,7 +55,7 @@ public final class MethodTypeResolution {
PRIMITIVE_SUBTYPE_ORDER = Collections.unmodifiableList(primitiveList); PRIMITIVE_SUBTYPE_ORDER = Collections.unmodifiableList(primitiveList);
List<Class<?>> boxedList = new ArrayList<>(); final List<Class<?>> boxedList = new ArrayList<>();
boxedList.add(Double.class); boxedList.add(Double.class);
boxedList.add(Float.class); boxedList.add(Float.class);
@ -63,6 +66,20 @@ public final class MethodTypeResolution {
boxedList.add(Character.class); boxedList.add(Character.class);
BOXED_PRIMITIVE_SUBTYPE_ORDER = Collections.unmodifiableList(boxedList); BOXED_PRIMITIVE_SUBTYPE_ORDER = Collections.unmodifiableList(boxedList);
final Map<Class<?>, Class<?>> boxingRules = new HashMap<>();
boxingRules.put(double.class, Double.class);
boxingRules.put(float.class, Float.class);
boxingRules.put(long.class, Long.class);
boxingRules.put(int.class, Integer.class);
boxingRules.put(short.class, Short.class);
boxingRules.put(byte.class, Byte.class);
boxingRules.put(char.class, Character.class);
boxingRules.put(boolean.class, Boolean.class);
boxingRules.put(void.class, Void.class);
PRIMITIVE_BOXING_RULES = Collections.unmodifiableMap(boxingRules);
} }
public static boolean checkSubtypeability(MethodType method, MethodType subtypeableMethod) { public static boolean checkSubtypeability(MethodType method, MethodType subtypeableMethod) {
@ -696,11 +713,7 @@ public final class MethodTypeResolution {
} }
public static JavaTypeDefinition boxPrimitive(JavaTypeDefinition def) { public static JavaTypeDefinition boxPrimitive(JavaTypeDefinition def) {
if (!def.isPrimitive()) { return JavaTypeDefinition.forClass(PRIMITIVE_BOXING_RULES.get(def.getType()));
return null;
}
return JavaTypeDefinition.forClass(BOXED_PRIMITIVE_SUBTYPE_ORDER.get(PRIMITIVE_SUBTYPE_ORDER.indexOf(def.getType())));
} }
public static List<JavaTypeDefinition> getMethodExplicitTypeArugments(Node node) { public static List<JavaTypeDefinition> getMethodExplicitTypeArugments(Node node) {

28
pmd-java/src/test/java/net/sourceforge/pmd/typeresolution/MethodTypeResolutionTest.java Normal file
View File

@ -0,0 +1,28 @@
/**
* BSD-style license; for more info see http://pmd.sourceforge.net/license.html
*/
package net.sourceforge.pmd.typeresolution;
import static org.junit.Assert.assertSame;
import org.junit.Test;
import net.sourceforge.pmd.lang.java.typeresolution.MethodTypeResolution;
import net.sourceforge.pmd.lang.java.typeresolution.typedefinition.JavaTypeDefinition;
public class MethodTypeResolutionTest {
@Test
public void testBoxingRules() {
assertSame(Boolean.class, MethodTypeResolution.boxPrimitive(JavaTypeDefinition.forClass(boolean.class)).getType());
assertSame(Double.class, MethodTypeResolution.boxPrimitive(JavaTypeDefinition.forClass(double.class)).getType());
assertSame(Float.class, MethodTypeResolution.boxPrimitive(JavaTypeDefinition.forClass(float.class)).getType());
assertSame(Long.class, MethodTypeResolution.boxPrimitive(JavaTypeDefinition.forClass(long.class)).getType());
assertSame(Integer.class, MethodTypeResolution.boxPrimitive(JavaTypeDefinition.forClass(int.class)).getType());
assertSame(Character.class, MethodTypeResolution.boxPrimitive(JavaTypeDefinition.forClass(char.class)).getType());
assertSame(Short.class, MethodTypeResolution.boxPrimitive(JavaTypeDefinition.forClass(short.class)).getType());
assertSame(Byte.class, MethodTypeResolution.boxPrimitive(JavaTypeDefinition.forClass(byte.class)).getType());
assertSame(Void.class, MethodTypeResolution.boxPrimitive(JavaTypeDefinition.forClass(void.class)).getType());
}
}