Tune cypher query for interface segregation

Author: JohT

cypher/Candidates_for_Interface_Segregation.cypher

@@ -1,25 +1,25 @@
-// Candidates for Interface Segregation 
+// Candidates for Interface Segregation
 
-MATCH (type:Type)-[:DECLARES]->(method:Method)-[:INVOKES]->(dependentMethod:Method)<-[:DECLARES]-(dependentType:Type)
-MATCH (dependentType)-[:DECLARES]->(declaredMethod:Method)
+MATCH (type:Type)-[:DECLARES]->(method:Method)-[:INVOKES]->(dependentMethod:Method)
+MATCH (dependentMethod)<-[:DECLARES]-(dependentType:Type)
 MATCH (dependentType)-[:IMPLEMENTS*]->(superType:Type)-[:DECLARES]->(inheritedMethod:Method)
-WHERE type.fqn <> dependentType
+WHERE type.fqn <> dependentType.fqn
   AND dependentMethod.name IS NOT NULL
   AND inheritedMethod.name IS NOT NULL
   AND dependentMethod.name <> '<init>' // ignore constructors
   AND inheritedMethod.name <> '<init>' // ignore constructors
- WITH type
-     ,dependentType
+ WITH type.fqn                               AS fullTypeName
+     ,dependentType.fqn                      AS fullDependentTypeName
      ,collect(DISTINCT dependentMethod.name) AS calledMethodNames
-     ,count(DISTINCT dependentMethod) AS calledMethods
+     ,count(DISTINCT dependentMethod)        AS calledMethods
      // Count the different signatures without the return type
      // of all declared methods including the inherited ones
      ,count(DISTINCT split(method.signature, ' ')[1]) + count(DISTINCT split(inheritedMethod.signature, ' ')[1]) AS declaredMethods
 WHERE declaredMethods > calledMethods + 2
- WITH dependentType
+ WITH fullDependentTypeName
      ,declaredMethods
      ,calledMethodNames
      ,calledMethods
-     ,count(DISTINCT type.fqn) AS callerTypes
- RETURN dependentType.fqn, declaredMethods, calledMethodNames, calledMethods, callerTypes
- ORDER BY callerTypes DESC, declaredMethods DESC, dependentType.fqn
+     ,count(DISTINCT fullTypeName) AS callerTypes
+ RETURN fullDependentTypeName, declaredMethods, calledMethodNames, calledMethods, callerTypes
+ ORDER BY callerTypes DESC, declaredMethods DESC, fullDependentTypeName