Optimize Bridges centrality output and run it for Java Types

Author: JohT

cypher/Centrality/Centrality_10d_Bridges_Stream.cypher

@@ -4,11 +4,16 @@ CALL gds.bridges.stream($dependencies_projection + '-cleaned')
  YIELD from, to
   WITH gds.util.asNode(from) AS fromMember
       ,gds.util.asNode(to)   AS toMember
-  WITH *
-      ,toMember.rootProjectName + '/' + toMember.name     AS toMemberNameWithRoot
-      ,fromMember.rootProjectName + '/' + fromMember.name AS fromMemberNameWithRoot
-RETURN coalesce(fromMember.fqn, fromMemberNameWithRoot, fromMember.name, fromMember.fileName) AS fromMemberName
-      ,coalesce(toMember.fqn,   toMemberNameWithRoot,   toMember.name,   toMember.fileName)   AS toMemberName
+OPTIONAL MATCH (fromType:Type)-[:DECLARES]->(fromMember)
+  WITH *, coalesce(fromType.fqn + ': ', '')              +
+          coalesce(fromMember.rootProjectName + '/', '') +
+          coalesce(fromMember.signature,  fromMember.name) AS fromMemberNameWithDetails
+OPTIONAL MATCH (toType:Type)-[:DECLARES]->(toMember)
+  WITH *, coalesce(toType.fqn + ': ', '')                +
+          coalesce(toMember.rootProjectName + '/', '')   +
+          coalesce(toMember.signature,  toMember.name)     AS toMemberNameWithDetails
+RETURN coalesce(fromMember.fqn, fromMemberNameWithDetails, fromMember.fileName, fromMember.name) AS fromMemberName
+      ,coalesce(toMember.fqn,   toMemberNameWithDetails,   toMember.fileName,   toMember.name)   AS toMemberName
       ,fromMember.incomingDependencies AS fromIncomingDependencies
       ,fromMember.outgoingDependencies AS fromOutgoingDependencies
       ,toMember.incomingDependencies   AS toIncomingDependencies

scripts/reports/CentralityCsv.sh

@@ -375,7 +375,7 @@ runUndirectedCentralityAlgorithms() {
 # -- Java Artifact Centrality ------------------------------------
 
 ARTIFACT_PROJECTION="dependencies_projection=artifact-centrality" 
-ARTIFACT_PROJECTION_UNDIRECTED="dependencies_projection=${ARTIFACT_PROJECTION}-undirected" 
+ARTIFACT_PROJECTION_UNDIRECTED="dependencies_projection=artifact-centrality-undirected" 
 ARTIFACT_NODE="dependencies_projection_node=Artifact" 
 ARTIFACT_WEIGHT="dependencies_projection_weight_property=weight" 
 
@@ -389,7 +389,7 @@ fi
 # -- Java Package Centrality -------------------------------------
 
 PACKAGE_PROJECTION="dependencies_projection=package-centrality" 
-PACKAGE_PROJECTION_UNDIRECTED="dependencies_projection=${PACKAGE_PROJECTION}-undirected" 
+PACKAGE_PROJECTION_UNDIRECTED="dependencies_projection=package-centrality-undirected" 
 PACKAGE_NODE="dependencies_projection_node=Package" 
 PACKAGE_WEIGHT="dependencies_projection_weight_property=weight25PercentInterfaces" 
 
@@ -402,17 +402,21 @@ fi
 
 # -- Java Type Centrality ----------------------------------------
 
-TYPE_PROJECTION="dependencies_projection=type-centrality" 
+TYPE_PROJECTION="dependencies_projection=type-centrality"
+TYPE_PROJECTION_UNDIRECTED="dependencies_projection=type-centrality-undirected" 
 TYPE_NODE="dependencies_projection_node=Type" 
 TYPE_WEIGHT="dependencies_projection_weight_property=weight" 
 
 if createDirectedJavaTypeDependencyProjection "${TYPE_PROJECTION}" "${TYPE_NODE}" "${TYPE_WEIGHT}"; then
     runCentralityAlgorithms "${TYPE_PROJECTION}" "${TYPE_NODE}" "${TYPE_WEIGHT}"
 fi
+if createUndirectedJavaTypeDependencyProjection "${TYPE_PROJECTION_UNDIRECTED}"; then
+    runUndirectedCentralityAlgorithms "${TYPE_PROJECTION_UNDIRECTED}" "${TYPE_NODE}"
+fi
 
 # -- Java Method Centrality --------------------------------------
 
-METHOD_PROJECTION="dependencies_projection=method-centrality" 
+METHOD_PROJECTION="dependencies_projection=method-centrality"
 METHOD_NODE="dependencies_projection_node=Method" 
 METHOD_WEIGHT="dependencies_projection_weight_property=" 
 
@@ -424,7 +428,7 @@ fi
 
 MODULE_LANGUAGE="dependencies_projection_language=Typescript" 
 MODULE_PROJECTION="dependencies_projection=typescript-module-centrality" 
-MODULE_PROJECTION_UNDIRECTED="dependencies_projection=${MODULE_PROJECTION}-undirected" 
+MODULE_PROJECTION_UNDIRECTED="dependencies_projection=typescript-module-centrality-undirected" 
 MODULE_NODE="dependencies_projection_node=Module" 
 MODULE_WEIGHT="dependencies_projection_weight_property=lowCouplingElement25PercentWeight"