Reorganize toString/equals/hashCode methods in the Type hiera…

…rchy
smallrye · Sep 16, 2022 · c0268ae · c0268ae
1 parent a174a3f
commit c0268ae
Show file tree

Hide file tree

Showing 8 changed files with 172 additions and 170 deletions.
diff --git a/core/src/main/java/org/jboss/jandex/ArrayType.java b/core/src/main/java/org/jboss/jandex/ArrayType.java
@@ -92,6 +92,35 @@ public DotName name() {
         return DotName.createSimple(builder.toString());
     }
 
+    /**
+     * The number of dimensions this array type has. For example, <code>String[][]</code>, would return a value
+     * of 2.
+     *
+     * @return the number of dimensions of this array type
+     */
+    public int dimensions() {
+        return dimensions;
+    }
+
+    @Override
+    public Kind kind() {
+        return Kind.ARRAY;
+    }
+
+    @Override
+    public ArrayType asArrayType() {
+        return this;
+    }
+
+    @Override
+    Type copyType(AnnotationInstance[] newAnnotations) {
+        return new ArrayType(component, dimensions, newAnnotations);
+    }
+
+    Type copyType(Type component, int dimensions) {
+        return new ArrayType(component, dimensions, annotationArray());
+    }
+
     @Override
     String toString(boolean simple) {
         StringBuilder builder = new StringBuilder();
@@ -123,26 +152,6 @@ private void appendArraySyntax(StringBuilder builder) {
         }
     }
 
-    /**
-     * The number of dimensions this array type has. For example, <code>String[][]</code>, would return a value
-     * of 2.
-     *
-     * @return the number of dimensions of this array type
-     */
-    public int dimensions() {
-        return dimensions;
-    }
-
-    @Override
-    public Kind kind() {
-        return Kind.ARRAY;
-    }
-
-    @Override
-    public ArrayType asArrayType() {
-        return this;
-    }
-
     @Override
     public boolean equals(Object o) {
         if (this == o) {
@@ -169,13 +178,4 @@ public int hashCode() {
         hash = 31 * hash + dimensions;
         return this.hash = hash;
     }
-
-    @Override
-    Type copyType(AnnotationInstance[] newAnnotations) {
-        return new ArrayType(component, dimensions, newAnnotations);
-    }
-
-    Type copyType(Type component, int dimensions) {
-        return new ArrayType(component, dimensions, annotationArray());
-    }
 }
diff --git a/core/src/main/java/org/jboss/jandex/ParameterizedType.java b/core/src/main/java/org/jboss/jandex/ParameterizedType.java
@@ -123,6 +123,29 @@ public ParameterizedType asParameterizedType() {
         return this;
     }
 
+    @Override
+    ParameterizedType copyType(AnnotationInstance[] newAnnotations) {
+        return new ParameterizedType(name(), arguments, owner, newAnnotations);
+    }
+
+    ParameterizedType copyType(Type[] arguments) {
+        return new ParameterizedType(name(), arguments, owner, annotationArray());
+    }
+
+    ParameterizedType copyType(int argumentIndex, Type argument) {
+        if (argumentIndex > this.arguments.length) {
+            throw new IllegalArgumentException("Type argument index outside of bounds");
+        }
+
+        Type[] arguments = this.arguments.clone();
+        arguments[argumentIndex] = argument;
+        return new ParameterizedType(name(), arguments, owner, annotationArray());
+    }
+
+    ParameterizedType copyType(Type owner) {
+        return new ParameterizedType(name(), arguments, owner, annotationArray());
+    }
+
     @Override
     String toString(boolean simple) {
         StringBuilder builder = new StringBuilder();
@@ -153,29 +176,6 @@ String toString(boolean simple) {
         return builder.toString();
     }
 
-    @Override
-    ParameterizedType copyType(AnnotationInstance[] newAnnotations) {
-        return new ParameterizedType(name(), arguments, owner, newAnnotations);
-    }
-
-    ParameterizedType copyType(Type[] arguments) {
-        return new ParameterizedType(name(), arguments, owner, annotationArray());
-    }
-
-    ParameterizedType copyType(int argumentIndex, Type argument) {
-        if (argumentIndex > this.arguments.length) {
-            throw new IllegalArgumentException("Type argument index outside of bounds");
-        }
-
-        Type[] arguments = this.arguments.clone();
-        arguments[argumentIndex] = argument;
-        return new ParameterizedType(name(), arguments, owner, annotationArray());
-    }
-
-    ParameterizedType copyType(Type owner) {
-        return new ParameterizedType(name(), arguments, owner, annotationArray());
-    }
-
     public boolean equals(Object o) {
         if (this == o) {
             return true;

diff --git a/core/src/main/java/org/jboss/jandex/PrimitiveType.java b/core/src/main/java/org/jboss/jandex/PrimitiveType.java
@@ -108,32 +108,11 @@ public PrimitiveType asPrimitiveType() {
         return this;
     }
 
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-
-        if (!(o instanceof PrimitiveType)) {
-            return false;
-        }
-
-        PrimitiveType that = (PrimitiveType) o;
-        return super.equals(o) && primitive == that.primitive;
-    }
-
     @Override
     Type copyType(AnnotationInstance[] newAnnotations) {
         return new PrimitiveType(primitive, newAnnotations);
     }
 
-    @Override
-    public int hashCode() {
-        int result = super.hashCode();
-        result = 31 * result + primitive.hashCode();
-        return result;
-    }
-
     char toCode() {
         Primitive primitive = this.primitive;
         if (primitive == Primitive.BYTE) {
@@ -205,4 +184,25 @@ static PrimitiveType fromOridinal(int ordinal) {
                 throw new IllegalArgumentException();
         }
     }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+
+        if (!(o instanceof PrimitiveType)) {
+            return false;
+        }
+
+        PrimitiveType that = (PrimitiveType) o;
+        return super.equals(o) && primitive == that.primitive;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = super.hashCode();
+        result = 31 * result + primitive.hashCode();
+        return result;
+    }
 }
diff --git a/core/src/main/java/org/jboss/jandex/Type.java b/core/src/main/java/org/jboss/jandex/Type.java
@@ -332,61 +332,6 @@ public VoidType asVoidType() {
         throw new IllegalArgumentException("Not a void type!");
     }
 
-    /**
-     * Returns a string representation for this type. It is similar, yet not equivalent
-     * to a Java source code representation.
-     *
-     * @return the string representation.
-     */
-    public String toString() {
-        return toString(false);
-    }
-
-    String toString(boolean simple) {
-        StringBuilder builder = new StringBuilder();
-        String packagePrefix = name.packagePrefix();
-        if (packagePrefix != null) {
-            builder.append(packagePrefix).append('.');
-        }
-        appendAnnotations(builder);
-        builder.append(name.withoutPackagePrefix());
-
-        return builder.toString();
-    }
-
-    void appendAnnotations(StringBuilder builder) {
-        AnnotationInstance[] annotations = this.annotations;
-        if (annotations.length > 0) {
-            for (AnnotationInstance instance : annotations) {
-                builder.append(instance.toString(true)).append(' ');
-            }
-        }
-    }
-
-    /**
-     * Compares this Type with another type, and returns true if they are equivalent.
-     * A type is equivalent to another type if it is the same kind, and all of its
-     * fields are equal. This includes annotations, which must be equal as well.
-     *
-     * @param o the type to compare to
-     * @return true if equal
-     * @see Object#equals(Object)
-     */
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-
-        Type type = (Type) o;
-
-        return name.equals(type.name) && Arrays.equals(annotations, type.annotations);
-    }
-
     AnnotationInstance[] annotationArray() {
         return annotations;
     }
@@ -488,6 +433,61 @@ Type addAnnotation(AnnotationInstance annotation) {
 
     abstract Type copyType(AnnotationInstance[] newAnnotations);
 
+    /**
+     * Returns a string representation for this type. It is similar, yet not equivalent
+     * to a Java source code representation.
+     *
+     * @return the string representation.
+     */
+    public String toString() {
+        return toString(false);
+    }
+
+    String toString(boolean simple) {
+        StringBuilder builder = new StringBuilder();
+        String packagePrefix = name.packagePrefix();
+        if (packagePrefix != null) {
+            builder.append(packagePrefix).append('.');
+        }
+        appendAnnotations(builder);
+        builder.append(name.withoutPackagePrefix());
+
+        return builder.toString();
+    }
+
+    void appendAnnotations(StringBuilder builder) {
+        AnnotationInstance[] annotations = this.annotations;
+        if (annotations.length > 0) {
+            for (AnnotationInstance instance : annotations) {
+                builder.append(instance.toString(true)).append(' ');
+            }
+        }
+    }
+
+    /**
+     * Compares this Type with another type, and returns true if they are equivalent.
+     * A type is equivalent to another type if it is the same kind, and all of its
+     * fields are equal. This includes annotations, which must be equal as well.
+     *
+     * @param o the type to compare to
+     * @return true if equal
+     * @see Object#equals(Object)
+     */
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        Type type = (Type) o;
+
+        return name.equals(type.name) && Arrays.equals(annotations, type.annotations);
+    }
+
     /**
      * Computes a hash code representing this type.
      *

diff --git a/core/src/main/java/org/jboss/jandex/TypeVariable.java b/core/src/main/java/org/jboss/jandex/TypeVariable.java
@@ -116,6 +116,21 @@ public TypeVariable asTypeVariable() {
         return this;
     }
 
+    @Override
+    Type copyType(AnnotationInstance[] newAnnotations) {
+        return new TypeVariable(name, bounds, newAnnotations, hasImplicitObjectBound());
+    }
+
+    TypeVariable copyType(int boundIndex, Type bound) {
+        if (boundIndex > bounds.length) {
+            throw new IllegalArgumentException("Bound index outside of bounds");
+        }
+
+        Type[] bounds = this.bounds.clone();
+        bounds[boundIndex] = bound;
+        return new TypeVariable(name, bounds, annotationArray(), hasImplicitObjectBound());
+    }
+
     @Override
     String toString(boolean simple) {
         StringBuilder builder = new StringBuilder();
@@ -149,21 +164,6 @@ public boolean equals(Object o) {
                 && hasImplicitObjectBound() == that.hasImplicitObjectBound();
     }
 
-    @Override
-    Type copyType(AnnotationInstance[] newAnnotations) {
-        return new TypeVariable(name, bounds, newAnnotations, hasImplicitObjectBound());
-    }
-
-    TypeVariable copyType(int boundIndex, Type bound) {
-        if (boundIndex > bounds.length) {
-            throw new IllegalArgumentException("Bound index outside of bounds");
-        }
-
-        Type[] bounds = this.bounds.clone();
-        bounds[boundIndex] = bound;
-        return new TypeVariable(name, bounds, annotationArray(), hasImplicitObjectBound());
-    }
-
     @Override
     public int hashCode() {
         int hash = this.hash & HASH_MASK;