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

Java, typeres: make java type definition lower bound into a subclass

Browse Source
This commit is contained in:
Bendegúz Nagy
2017-08-28 13:59:30 +02:00
parent 186d0edd91
commit e1892944ff
3 changed files with 32 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pmd-java/src/main/java/net/sourceforge/pmd/lang/java/typeresolution/typedefinition/JavaTypeDefinition.java
View File

@ -37,8 +37,9 @@ public abstract class JavaTypeDefinition implements TypeDefinition {
}
case UPPER_BOUND:
case UPPER_WILDCARD:
case LOWER_WILDCARD:
return new JavaTypeDefinitionSpecial(type, intersectionTypes);
case LOWER_WILDCARD:
return new JavaTypeDefinitionLower(intersectionTypes);
default:
throw new IllegalStateException("Unknow type");
}

20
pmd-java/src/main/java/net/sourceforge/pmd/lang/java/typeresolution/typedefinition/JavaTypeDefinitionLower.java Normal file
View File

@ -0,0 +1,20 @@
/**
* BSD-style license; for more info see http://pmd.sourceforge.net/license.html
*/
package net.sourceforge.pmd.lang.java.typeresolution.typedefinition;
import static net.sourceforge.pmd.lang.java.typeresolution.typedefinition.TypeDefinitionType.LOWER_WILDCARD;
/* default */ class JavaTypeDefinitionLower extends JavaTypeDefinitionSpecial {
private static final JavaTypeDefinition OBJECT_DEFINITION = forClass(Object.class);
protected JavaTypeDefinitionLower(JavaTypeDefinition... typeList) {
super(LOWER_WILDCARD, typeList);
}
@Override
protected JavaTypeDefinition firstJavaType() {
return OBJECT_DEFINITION;
}
}

36
pmd-java/src/main/java/net/sourceforge/pmd/lang/java/typeresolution/typedefinition/JavaTypeDefinitionSpecial.java
View File

@ -20,14 +20,7 @@ import java.util.Set;
throw new IllegalArgumentException("Intersection type list can't be empty");
}
// this is to preserve compatibility, lower bounds are really just Objects
if (defType == TypeDefinitionType.LOWER_WILDCARD) {
this.typeList = new JavaTypeDefinition[typeList.length + 1];
this.typeList[0] = forClass(Object.class);
System.arraycopy(typeList, 0, this.typeList, 1, typeList.length);
} else {
this.typeList = typeList;
}
this.typeList = typeList;
}
@ -35,7 +28,7 @@ import java.util.Set;
* All the calls to this method are to delegate JavaTypeDefinition method calls to the first
* JavaTypeDefinition in the 'typeList' list.
*/
private JavaTypeDefinition firstJavaType() {
protected JavaTypeDefinition firstJavaType() {
return typeList[0];
}
@ -130,14 +123,14 @@ import java.util.Set;
@Override
public boolean equals(Object obj) {
if (obj == null || !(obj instanceof JavaTypeDefinitionSpecial)) {
return false;
}
if (this == obj) {
return true;
}
if (obj == null || !this.getClass().isInstance(obj)) {
return false;
}
JavaTypeDefinitionSpecial otherTypeDef = (JavaTypeDefinitionSpecial) obj;
if (otherTypeDef.getJavaTypeCount() != getJavaTypeCount()
@ -203,22 +196,13 @@ import java.util.Set;
@Override
public boolean isRawType() {
if (isLowerBound()) {
// The reason for this is that with lower bounds, there is always a dummy Object.class at typeList[0]
// This is to be able to delegate to it.
return typeList.length == 2 && typeList[1].isRawType();
} else {
return typeList.length == 1 && firstJavaType().isRawType();
}
// with lower bounds the second part would always eval true,
// because with lower bounds firstJavaType is Object.class
return typeList.length == 1 && firstJavaType().isRawType();
}
@Override
public boolean isIntersectionType() {
if (isLowerBound()) {
// with lower bound types, there is always a dummy Object.class at typeList[0]
return typeList.length > 2;
} else {
return typeList.length > 1;
}
return typeList.length > 1;
}
}