From b08458a9e00394be91c7fc805d324154e5b66635 Mon Sep 17 00:00:00 2001 From: Artem Konovalov Date: Tue, 18 Sep 2018 10:10:19 +0300 Subject: [PATCH] #1857 corrections after review --- .../resolution/types/ResolvedPrimitiveType.java | 8 -------- .../symbolsolver/javassistmodel/JavassistUtils.java | 8 +------- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/javaparser-core/src/main/java/com/github/javaparser/resolution/types/ResolvedPrimitiveType.java b/javaparser-core/src/main/java/com/github/javaparser/resolution/types/ResolvedPrimitiveType.java index 161fe5ccac..c5720310a5 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/resolution/types/ResolvedPrimitiveType.java +++ b/javaparser-core/src/main/java/com/github/javaparser/resolution/types/ResolvedPrimitiveType.java @@ -64,14 +64,6 @@ public static ResolvedType byName(String name) { throw new IllegalArgumentException("Name " + name); } - public static boolean isPrimitive(String name){ - for (ResolvedPrimitiveType type : values()) { - if(type.name.equals(name)) - return true; - } - return false; - } - @Override public String toString() { return "PrimitiveTypeUsage{" + diff --git a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistUtils.java b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistUtils.java index 9a522f6858..7ce1f44fa3 100644 --- a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistUtils.java +++ b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistUtils.java @@ -93,7 +93,6 @@ static Optional getMethodUsage(CtClass ctClass, String name, List parseTypeParameters(String signature, TypeSolver typeSolver, Context invokationContext) { - String originalSignature = signature; if (signature.contains("<")) { signature = signature.substring(signature.indexOf('<') + 1); if (!signature.endsWith(">")) { @@ -178,9 +177,7 @@ static String internalNameToCanonicalName(String typeName) { private static ResolvedType objectTypeArgumentToType(SignatureAttribute.ObjectType typeArgument, TypeSolver typeSolver, ResolvedTypeParametrizable typeParametrizable) { if(typeArgument instanceof SignatureAttribute.ArrayType){ - String baseTypeName = ((SignatureAttribute.ArrayType) typeArgument).getComponentType().jvmTypeName(); - ResolvedType baseType = getGenericParameterByName(baseTypeName, typeParametrizable, typeSolver); - return new ResolvedArrayType(baseType); + return signatureTypeToType(((SignatureAttribute.ArrayType) typeArgument).getComponentType(), typeSolver, typeParametrizable); } else { String typeName = typeArgument.jvmTypeName(); return getGenericParameterByName(typeName, typeParametrizable, typeSolver); @@ -188,9 +185,6 @@ private static ResolvedType objectTypeArgumentToType(SignatureAttribute.ObjectTy } private static ResolvedType getGenericParameterByName(String typeName, ResolvedTypeParametrizable typeParametrizable, TypeSolver typeSolver) { - if(ResolvedPrimitiveType.isPrimitive(typeName)) - return ResolvedPrimitiveType.byName(typeName); - Optional type = typeParametrizable.findTypeParameter(typeName).map(ResolvedTypeVariable::new); return type.orElseGet(() -> new ReferenceTypeImpl( typeSolver.solveType(removeTypeArguments(internalNameToCanonicalName(typeName))),