Limit existing incoming & outgoing dependency queries to Java

JohT · JohT · commit f301bf02ead6 · 2024-03-21T08:24:08.000+01:00
diff --git a/cypher/Artifact_Dependencies/Incoming_Java_Artifact_Dependencies.cypher b/cypher/Artifact_Dependencies/Incoming_Java_Artifact_Dependencies.cypher
@@ -1,6 +1,6 @@
 // Incoming Artifact Dependencies
 
-   MATCH (a:Artifact:Archive)
+   MATCH (a:Java:Artifact:Archive)
 OPTIONAL MATCH (a)<-[r:DEPENDS_ON]-(ea:Artifact:Archive)
    WHERE a.fileName <> ea.fileName
     WITH a
diff --git a/cypher/Artifact_Dependencies/Outgoing_Java_Artifact_Dependencies.cypher b/cypher/Artifact_Dependencies/Outgoing_Java_Artifact_Dependencies.cypher
@@ -1,6 +1,6 @@
 // Outgoing Artifact Dependencies
 
-   MATCH (a:Artifact:Archive)
+   MATCH (a:Java:Artifact:Archive)
 OPTIONAL MATCH (a)-[r:DEPENDS_ON]->(ea:Artifact:Archive)
    WHERE a.fileName <> ea.fileName
     WITH a
diff --git a/cypher/Metrics/Set_Incoming_Java_Package_Dependencies.cypher b/cypher/Metrics/Set_Incoming_Java_Package_Dependencies.cypher
@@ -1,6 +1,6 @@
 // Set Incoming Package Dependencies
 
-   MATCH (p:Package)
+   MATCH (p:Java:Package)
    MATCH (artifact:Artifact)-[:CONTAINS]->(p)
 OPTIONAL MATCH (p)-[:CONTAINS]->(it:Java:Type)<-[r:DEPENDS_ON]-(et:Java:Type)<-[:CONTAINS]-(ep:Package)<-[:CONTAINS]-(ea:Artifact)
 OPTIONAL MATCH (it)<-[:DEPENDS_ON]-(eti:Java:Type:Interface)
diff --git a/cypher/Metrics/Set_Incoming_Java_Package_Dependencies_Including_Subpackages.cypher b/cypher/Metrics/Set_Incoming_Java_Package_Dependencies_Including_Subpackages.cypher
@@ -1,6 +1,6 @@
 // Set Incoming Package Dependencies including sub-packages
 
-   MATCH (p:Package)
+   MATCH (p:Java:Package)
     WITH *
         ,EXISTS{
             MATCH (p)<-[:CONTAINS]-(ancestor:Package)-[:CONTAINS]->(sibling:Package) 
@@ -9,7 +9,7 @@
         ,EXISTS{(p)-[:CONTAINS]->(:Type)} AS containsTypes
     WHERE hasSiblingPackages OR containsTypes
    MATCH (artifact:Artifact)-[:CONTAINS]->(p)
-OPTIONAL MATCH (p:Package)-[:CONTAINS*0..]->(sp:Package)-[:CONTAINS]->(st:Java:Type)<-[r:DEPENDS_ON]-(et:Java:Type)<-[:CONTAINS]-(ep:Package)<-[:CONTAINS]-(ea:Artifact)
+OPTIONAL MATCH (p)-[:CONTAINS*0..]->(sp:Package)-[:CONTAINS]->(st:Java:Type)<-[r:DEPENDS_ON]-(et:Java:Type)<-[:CONTAINS]-(ep:Package)<-[:CONTAINS]-(ea:Artifact)
    WHERE NOT ep.fqn starts with p.fqn + '.'
      AND ep.fqn <> p.fqn
      // AND p.incomingDependenciesIncludingSubpackages IS NULL // comment out to recalculate
diff --git a/cypher/Metrics/Set_Incoming_Java_Package_Method_Call_Dependencies.cypher b/cypher/Metrics/Set_Incoming_Java_Package_Method_Call_Dependencies.cypher
@@ -1,5 +1,5 @@
 //Set Incoming Package Method Call Dependencies
-MATCH (p:Package)
+MATCH (p:Java:Package)
 OPTIONAL MATCH (p)-[:CONTAINS]->(t:Java:Type)-[:DECLARES]->(m:Method)<-[:INVOKES]-(dm:Method)<-[:DECLARES]-(dt:Java:Type)<-[:CONTAINS]-(dp:Package)<-[:CONTAINS]-(da:Artifact)
 OPTIONAL MATCH (dm)<-[:DECLARES]-(dti:Interface)
 WHERE p <> dp
diff --git a/cypher/Metrics/Set_Incoming_Java_Type_Dependencies.cypher b/cypher/Metrics/Set_Incoming_Java_Type_Dependencies.cypher
@@ -1,6 +1,6 @@
 // Set Incoming Type Dependencies
 
-   MATCH (p:Package)
+   MATCH (p:Java:Package)
 OPTIONAL MATCH (p)-[:CONTAINS]->(it:Java:Type)<-[r:DEPENDS_ON]-(et:Java:Type)<-[:CONTAINS]-(ep:Package)<-[:CONTAINS]-(ea:Artifact)
 OPTIONAL MATCH (it)<-[:DEPENDS_ON]-(eti:Type:Interface)
    WHERE it <> et
diff --git a/cypher/Metrics/Set_Outgoing_Java_Package_Dependencies.cypher b/cypher/Metrics/Set_Outgoing_Java_Package_Dependencies.cypher
@@ -1,6 +1,6 @@
 //Set Outgoing Package Dependencies
 
-   MATCH (p:Package)
+   MATCH (p:Java:Package)
    MATCH (artifact:Artifact)-[:CONTAINS]->(p)
 OPTIONAL MATCH (p)-[:CONTAINS]->(it:Java:Type)-[r:DEPENDS_ON]->(et:Java:Type)<-[:CONTAINS]-(ep:Package)<-[:CONTAINS]-(ea:Artifact)
 OPTIONAL MATCH (it)-[:DEPENDS_ON]->(eti:Java:Type:Interface)
diff --git a/cypher/Metrics/Set_Outgoing_Java_Package_Dependencies_Including_Subpackages.cypher b/cypher/Metrics/Set_Outgoing_Java_Package_Dependencies_Including_Subpackages.cypher
@@ -1,6 +1,6 @@
 // Set Outgoing Package Dependencies including sub-packages
 
-   MATCH (p:Package)
+   MATCH (p:Java:Package)
     WITH *
         ,EXISTS{
             MATCH (p)<-[:CONTAINS]-(ancestor:Package)-[:CONTAINS]->(sibling:Package) 
@@ -9,7 +9,7 @@
         ,EXISTS{(p)-[:CONTAINS]->(:Type)} AS containsTypes
     WHERE hasSiblingPackages OR containsTypes
    MATCH (artifact:Artifact)-[:CONTAINS]->(p)
-OPTIONAL MATCH (p:Package)-[:CONTAINS*0..]->(sp:Package)-[:CONTAINS]->(st:Java:Type)-[r:DEPENDS_ON]->(et:Java:Type)<-[:CONTAINS]-(ep:Package)<-[:CONTAINS]-(ea:Artifact)
+OPTIONAL MATCH (p)-[:CONTAINS*0..]->(sp:Package)-[:CONTAINS]->(st:Java:Type)-[r:DEPENDS_ON]->(et:Java:Type)<-[:CONTAINS]-(ep:Package)<-[:CONTAINS]-(ea:Artifact)
    WHERE NOT ep.fqn starts with p.fqn + '.'
      AND ep.fqn <> p.fqn
      // AND p.outgoingDependenciesIncludingSubpackages IS NULL // comment out to recalculate
diff --git a/cypher/Metrics/Set_Outgoing_Java_Package_Method_Call_Dependencies.cypher b/cypher/Metrics/Set_Outgoing_Java_Package_Method_Call_Dependencies.cypher
@@ -1,5 +1,6 @@
 //Set Outgoing Package Method Call Dependencies
-MATCH (p:Package)
+
+MATCH (p:Java:Package)
 OPTIONAL MATCH (p)-[:CONTAINS]->(t:Java:Type)-[:DECLARES]->(m:Method)-[:INVOKES]->(dm:Method)<-[:DECLARES]-(dt:Java:Type)<-[:CONTAINS]-(dp:Package)<-[:CONTAINS]-(da:Artifact)
 OPTIONAL MATCH (dm)<-[:DECLARES]-(dti:Interface)
 WHERE p <> dp
diff --git a/cypher/Metrics/Set_Outgoing_Java_Type_Dependencies.cypher b/cypher/Metrics/Set_Outgoing_Java_Type_Dependencies.cypher
@@ -1,6 +1,6 @@
 //Set Outgoing Type Dependencies
 
-   MATCH (p:Package)
+   MATCH (p:Java:Package)
 OPTIONAL MATCH (p)-[:CONTAINS]->(it:Java:Type)-[r:DEPENDS_ON]->(et:Java:Type)<-[:CONTAINS]-(ep:Package)<-[:CONTAINS]-(ea:Artifact)
 OPTIONAL MATCH (it)-[:DEPENDS_ON]->(eti:Type:Interface)
    WHERE it <> et
diff --git a/jupyter/ObjectOrientedDesignMetrics.ipynb b/jupyter/ObjectOrientedDesignMetrics.ipynb
@@ -129,7 +129,7 @@
    },
    "outputs": [],
    "source": [
-    "query_cypher_to_data_frame(\"../cypher/Metrics/Set_Incoming_Package_Dependencies.cypher\").head(20)"
+    "query_cypher_to_data_frame(\"../cypher/Metrics/Set_Incoming_Java_Package_Dependencies.cypher\").head(20)"
    ]
   },
   {
@@ -149,7 +149,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "query_cypher_to_data_frame(\"../cypher/Metrics/Set_Incoming_Package_Dependencies_Including_Subpackages.cypher\").head(20)"
+    "query_cypher_to_data_frame(\"../cypher/Metrics/Set_Incoming_Java_Package_Dependencies_Including_Subpackages.cypher\").head(20)"
    ]
   },
   {
@@ -180,7 +180,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "query_cypher_to_data_frame(\"../cypher/Metrics/Set_Outgoing_Package_Dependencies.cypher\").head(20)"
+    "query_cypher_to_data_frame(\"../cypher/Metrics/Set_Outgoing_Java_Package_Dependencies.cypher\").head(20)"
    ]
   },
   {
@@ -201,7 +201,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "query_cypher_to_data_frame(\"../cypher/Metrics/Set_Outgoing_Package_Dependencies_Including_Subpackages.cypher\").head(20)"
+    "query_cypher_to_data_frame(\"../cypher/Metrics/Set_Outgoing_Java_Package_Dependencies_Including_Subpackages.cypher\").head(20)"
    ]
   },
   {
diff --git a/scripts/prepareAnalysis.sh b/scripts/prepareAnalysis.sh
@@ -61,11 +61,14 @@ execute_cypher "${PACKAGE_WEIGHTS_CYPHER_DIR}/Add_weight_property_to_Java_Packag
 execute_cypher "${PACKAGE_WEIGHTS_CYPHER_DIR}/Add_weight25PercentInterfaces_to_Java_Package_DEPENDS_ON_relationships.cypher" 
 execute_cypher "${PACKAGE_WEIGHTS_CYPHER_DIR}/Add_weight10PercentInterfaces_to_Java_Package_DEPENDS_ON_relationships.cypher"
 
-# Preparation - Add Package node properties "incomingDependencies" and "outgoingDependencies"
-execute_cypher_expect_results "${PACKAGE_METRICS_CYPHER_DIR}/Set_Incoming_Package_Dependencies.cypher"
-execute_cypher_expect_results "${PACKAGE_METRICS_CYPHER_DIR}/Set_Outgoing_Package_Dependencies.cypher"
+# Preparation - Add Typescript Module node properties "incomingDependencies" and "outgoingDependencies"
+# TODO
 
-# Preparation - Label external types and annotations
+# Preparation - Add Java Package node properties "incomingDependencies" and "outgoingDependencies"
+execute_cypher "${PACKAGE_METRICS_CYPHER_DIR}/Set_Incoming_Java_Package_Dependencies.cypher"
+execute_cypher "${PACKAGE_METRICS_CYPHER_DIR}/Set_Outgoing_Java_Package_Dependencies.cypher"
+
+# Preparation - Label external types and annotations for Java
 #               "external" means that there is no byte code available, not a primitive type and not a java type
 #               "annoatation" means that there is a ANNOTATED_BY to that external type
 execute_cypher "${TYPES_CYPHER_DIR}/Remove_extended_type_labels.cypher"
@@ -76,12 +79,15 @@ execute_cypher "${TYPES_CYPHER_DIR}/Label_resolved_duplicate_types.cypher"
 execute_cypher "${EXTERNAL_DEPENDENCIES_CYPHER_DIR}/Remove_external_type_and_annotation_labels.cypher"
 execute_cypher "${EXTERNAL_DEPENDENCIES_CYPHER_DIR}/Label_external_types_and_annotations.cypher"
 
-# Preparation - Add Artifact node properties "incomingDependencies" and "outgoingDependencies"
-execute_cypher_expect_results "${ARTIFACT_DEPENDENCIES_CYPHER_DIR}/Incoming_Artifact_Dependencies.cypher"
-execute_cypher_expect_results "${ARTIFACT_DEPENDENCIES_CYPHER_DIR}/Outgoing_Artifact_Dependencies.cypher"
+# Preparation - Add Typescript Package node properties "incomingDependencies" and "outgoingDependencies"
+# TODO
+
+# Preparation - Add Java Artifact node properties "incomingDependencies" and "outgoingDependencies"
+execute_cypher "${ARTIFACT_DEPENDENCIES_CYPHER_DIR}/Incoming_Java_Artifact_Dependencies.cypher"
+execute_cypher "${ARTIFACT_DEPENDENCIES_CYPHER_DIR}/Outgoing_Java_Artifact_Dependencies.cypher"
 
-# Preparation - Add Type node properties "incomingDependencies" and "outgoingDependencies"
-execute_cypher_expect_results "${PACKAGE_METRICS_CYPHER_DIR}/Set_Incoming_Type_Dependencies.cypher"
-execute_cypher_expect_results "${PACKAGE_METRICS_CYPHER_DIR}/Set_Outgoing_Type_Dependencies.cypher"
+# Preparation - Add Java Type node properties "incomingDependencies" and "outgoingDependencies"
+execute_cypher "${PACKAGE_METRICS_CYPHER_DIR}/Set_Incoming_Java_Type_Dependencies.cypher"
+execute_cypher "${PACKAGE_METRICS_CYPHER_DIR}/Set_Outgoing_Java_Type_Dependencies.cypher"
 
 echo "prepareAnalysis: Preparation successful"
diff --git a/scripts/reports/ObjectOrientedDesignMetricsCsv.sh b/scripts/reports/ObjectOrientedDesignMetricsCsv.sh
@@ -41,8 +41,8 @@ METRICS_CYPHER_DIR="${CYPHER_DIR}/Metrics"
 echo "ObjectOrientedDesignMetricsCsv: $(date +'%Y-%m-%dT%H:%M:%S%z') Processing packages without sub-packages..."
 
 # Packages only without sub-packages
-execute_cypher "${METRICS_CYPHER_DIR}/Set_Incoming_Package_Dependencies.cypher" > "${FULL_REPORT_DIRECTORY}/IncomingPackageDependencies.csv"
-execute_cypher "${METRICS_CYPHER_DIR}/Set_Outgoing_Package_Dependencies.cypher" > "${FULL_REPORT_DIRECTORY}/OutgoingPackageDependencies.csv"
+execute_cypher "${METRICS_CYPHER_DIR}/Set_Incoming_Java_Package_Dependencies.cypher" > "${FULL_REPORT_DIRECTORY}/IncomingPackageDependencies.csv"
+execute_cypher "${METRICS_CYPHER_DIR}/Set_Outgoing_Java_Package_Dependencies.cypher" > "${FULL_REPORT_DIRECTORY}/OutgoingPackageDependencies.csv"
 execute_cypher "${METRICS_CYPHER_DIR}/Calculate_and_set_Instability_outgoing_incoming_Dependencies.cypher" > "${FULL_REPORT_DIRECTORY}/Instability.csv"
 execute_cypher "${METRICS_CYPHER_DIR}/Calculate_and_set_Abstractness_including_Counts.cypher" > "${FULL_REPORT_DIRECTORY}/Abstractness.csv"
 execute_cypher "${METRICS_CYPHER_DIR}/Calculate_distance_between_abstractness_and_instability.cypher" > "${FULL_REPORT_DIRECTORY}/MainSequenceAbstractnessInstabilityDistance.csv"
@@ -55,8 +55,8 @@ execute_cypher "${METRICS_CYPHER_DIR}/Calculate_distance_between_abstractness_an
 #   by assuring that only those packages are considered, 
 #   that have other packages or types in the same hierarchy level ("siblings").
 echo "ObjectOrientedDesignMetricsCsv: $(date +'%Y-%m-%dT%H:%M:%S%z') Processing packages including sub-packages..."
-execute_cypher "${METRICS_CYPHER_DIR}/Set_Incoming_Package_Dependencies_Including_Subpackages.cypher" > "${FULL_REPORT_DIRECTORY}/IncomingPackageDependenciesIncludingSubpackages.csv"
-execute_cypher "${METRICS_CYPHER_DIR}/Set_Outgoing_Package_Dependencies_Including_Subpackages.cypher" > "${FULL_REPORT_DIRECTORY}/OutgoingPackageDependenciesIncludingSubpackages.csv"
+execute_cypher "${METRICS_CYPHER_DIR}/Set_Incoming_Java_Package_Dependencies_Including_Subpackages.cypher" > "${FULL_REPORT_DIRECTORY}/IncomingPackageDependenciesIncludingSubpackages.csv"
+execute_cypher "${METRICS_CYPHER_DIR}/Set_Outgoing_Java_Package_Dependencies_Including_Subpackages.cypher" > "${FULL_REPORT_DIRECTORY}/OutgoingPackageDependenciesIncludingSubpackages.csv"
 execute_cypher "${METRICS_CYPHER_DIR}/Calculate_and_set_Instability_Including_Subpackages.cypher" > "${FULL_REPORT_DIRECTORY}/InstabilityIncludingSubpackages.csv"
 execute_cypher "${METRICS_CYPHER_DIR}/Calculate_and_set_Abstractness_including_Subpackages.cypher" > "${FULL_REPORT_DIRECTORY}/AbstractnessIncludingSubpackages.csv"
 execute_cypher "${METRICS_CYPHER_DIR}/Calculate_distance_between_abstractness_and_instability_including_subpackages.cypher" > "${FULL_REPORT_DIRECTORY}/MainSequenceAbstractnessInstabilityDistanceIncludingSubpackages.csv"
