remove ITypeInfo::wrapTypeName

Author: ZZZank

src/main/java/com/probejs/info/type/ITypeInfo.java

@@ -11,8 +11,6 @@ public interface ITypeInfo {
 
     String getTypeName();
 
-    String wrapTypeName(String rawName);
-
     ITypeInfo copy();
 
     boolean assignableFrom(ITypeInfo info);

src/main/java/com/probejs/info/type/TypeInfoArray.java

@@ -61,12 +61,7 @@ public Class<?> getResolvedClass() {
 
     @Override
     public String getTypeName() {
-        return wrapTypeName(this.base.getTypeName());
-    }
-
-    @Override
-    public String wrapTypeName(String rawName) {
-        return rawName + "[]";
+        return this.base.getTypeName()+"[]";
     }
 
     public void setBase(ITypeInfo type) {

src/main/java/com/probejs/info/type/TypeInfoClass.java

@@ -36,11 +36,6 @@ public String getTypeName() {
         return this.raw.getTypeName();
     }
 
-    @Override
-    public String wrapTypeName(String rawName) {
-        return rawName;
-    }
-
     @Override
     public ITypeInfo copy() {
         return new TypeInfoClass(raw);

src/main/java/com/probejs/info/type/TypeInfoParameterized.java

@@ -9,13 +9,8 @@
 
 public class TypeInfoParameterized implements ITypeInfo {
 
-    public static boolean test(Type type) {
-        return type instanceof ParameterizedType;
-    }
-
     private ITypeInfo rawType;
     private List<ITypeInfo> paramTypes;
-
     public TypeInfoParameterized(Type type) {
         if (!test(type)) {
             throw new IllegalArgumentException("provided `type` is not an instance of ParameterizedType");
@@ -34,6 +29,10 @@ public TypeInfoParameterized(ITypeInfo rawType, List<? extends ITypeInfo> paramT
         this.paramTypes = new ArrayList<>(paramTypes);
     }
 
+    public static boolean test(Type type) {
+        return type instanceof ParameterizedType;
+    }
+
     @Override
     public ITypeInfo getBaseType() {
         return rawType;
@@ -48,16 +47,14 @@ public List<ITypeInfo> getParamTypes() {
         return paramTypes;
     }
 
-    @Override
-    public String getTypeName() {
-        return wrapTypeName(this.rawType.getTypeName());
+    public void setParamTypes(List<ITypeInfo> paramTypes) {
+        this.paramTypes = paramTypes;
     }
 
     @Override
-    public String wrapTypeName(String rawName) {
-        return String.format(
-            "%s<%s>",
-            rawName,
+    public String getTypeName() {
+        return String.format("%s<%s>",
+            this.rawType.getTypeName(),
             paramTypes.stream().map(ITypeInfo::getTypeName).collect(Collectors.joining(", "))
         );
     }
@@ -86,10 +83,6 @@ public boolean assignableFrom(ITypeInfo info) {
         return false;
     }
 
-    public void setParamTypes(List<ITypeInfo> paramTypes) {
-        this.paramTypes = paramTypes;
-    }
-
     public void setRawType(ITypeInfo rawType) {
         this.rawType = rawType;
     }

src/main/java/com/probejs/info/type/TypeInfoVariable.java

@@ -39,15 +39,7 @@ public ITypeInfo getBaseType() {
 
     @Override
     public String getTypeName() {
-        return wrapTypeName(this.raw.getTypeName());
-    }
-
-    @Override
-    public String wrapTypeName(String rawName) {
-        if (underscored) {
-            return rawName + '_';
-        }
-        return rawName;
+        return this.raw.getTypeName();
     }
 
     @Override

src/main/java/com/probejs/info/type/TypeInfoWildcard.java

@@ -56,11 +56,6 @@ public String getTypeName() {
         return this.base.getTypeName();
     }
 
-    @Override
-    public String wrapTypeName(String rawName) {
-        return rawName;
-    }
-
     @Override
     public ITypeInfo copy() {
         return new TypeInfoWildcard(this.raw);

src/main/java/com/probejs/info/type/TypeLiteral.java

@@ -30,11 +30,6 @@ public String getTypeName() {
         return this.value;
     }
 
-    @Override
-    public String wrapTypeName(String rawName) {
-        return rawName;
-    }
-
     @Override
     public ITypeInfo copy() {
         return this;