Simplify ASTNode rendering to String

Author: arouel

lib-extra/build.gradle

@@ -87,7 +87,6 @@ p2deps {
 	into 'jdtCompileOnly', {
 		p2repo 'https://download.eclipse.org/eclipse/updates/4.26/'
 		install 'org.eclipse.jdt.core'
-		install 'org.eclipse.jdt.core.manipulation'
 	}
 }
 

lib-extra/src/jdt/java/com/diffplug/spotless/extra/glue/jdt/DefaultJavaElementComparator.java

@@ -32,7 +32,7 @@
 import org.eclipse.jdt.core.dom.Type;
 import org.eclipse.jdt.core.dom.VariableDeclarationFragment;
 import org.eclipse.jdt.core.util.CompilationUnitSorter;
-import org.eclipse.jdt.internal.corext.dom.ASTNodes;
+import org.eclipse.jdt.internal.core.dom.NaiveASTFlattener;
 
 /**
  * This class is derived and adapted code from the Eclipse JDT project (Derivative Works according to EPL 2.0 license).
@@ -382,6 +382,8 @@ private int compareNames(BodyDeclaration bodyDeclaration1, BodyDeclaration bodyD
 	}
 
 	private String buildSignature(Type type) {
-		return ASTNodes.asString(type);
+		NaiveASTFlattener flattener = new NaiveASTFlattener();
+		type.accept(flattener);
+		return flattener.getResult();
 	}
 }