backed out of relationships for now but fixed broken tests around isGranule

Author: ajakz

schemas-analyze/src/main/java/org/cedar/schemas/analyze/Analyzers.java

@@ -64,7 +64,6 @@ public static Analysis analyze(Discovery discovery) {
     }
     return Analysis.newBuilder()
         .setIdentification(analyzeIdentifiers(discovery))
-        //.setRelationships(analyzeRelationships()) // FIXME -- this would require access to the larger ParsedRecord + substantial code changes
         .setTemporalBounding(analyzeTemporalBounding(discovery))
         .setSpatialBounding(analyzeSpatialBounding(discovery))
         .setTitles(analyzeTitles(discovery))

schemas-analyze/src/test/groovy/org/cedar/schemas/analyze/AnalyzersSpec.groovy

@@ -253,7 +253,7 @@ class AnalyzersSpec extends Specification {
     !result.parentIdentifierExists
     result.parentIdentifierString == null
     !result.hierarchyLevelNameExists
-    result.matchesIdentifiers
+    !result.isGranule
   }
 
   def "detects mismatch between metadata type and corresponding identifiers"() {
@@ -275,7 +275,7 @@ class AnalyzersSpec extends Specification {
     !result.parentIdentifierExists
     result.parentIdentifierString == null
     result.hierarchyLevelNameExists
-    !result.matchesIdentifiers
+    !result.isGranule
   }
 
   def 'handles analysis of #testCase strings'() {

schemas-core/src/main/resources/avro/psi/analysis.avsc

@@ -90,61 +90,6 @@
       ],
       "default": null
     },
-    {
-      "name": "relationships",
-      "doc": "Assessment of the relationships identified in the metadata.",
-      "type": [
-        "null",
-        {
-          "type": "record",
-          "name": "RelationshipAnalysis",
-          "fields": [
-            {
-              "name": "hasRelationships",
-              "type": [
-                "null",
-                "boolean"
-              ],
-              "default": null,
-              "doc": "Indicates if a record has any identified relationships"
-            },
-            {
-              "name": "relationships",
-              "doc": "Summary of associated relationship RecordTypes and corresponding counts",
-              "type": {
-                "type": "array",
-                "items": {
-                  "name": "RelationshipAnalysisElement",
-                  "type": "record",
-                  "fields": [
-                    {
-                      "name": "type",
-                      "type": [
-                        "null",
-                        "RelationshipType"
-                      ],
-                      "default": null,
-                      "doc": "RecordType of associated relationship(s)."
-                    },
-                    {
-                      "name": "count",
-                      "type": [
-                        "null",
-                        "int"
-                      ],
-                      "default": null,
-                      "doc": "Count of associated relationships for the given RecordType."
-                    }
-                  ]
-                }
-              },
-              "default": []
-            }
-          ]
-        }
-      ],
-      "default": null
-    },
     {
       "name": "titles",
       "doc": "Assessment of the titles in the metadata.",

schemas-core/src/test/resources/example-record-avro.json

@@ -470,8 +470,8 @@
           "hierarchyLevelNameExists": {
             "boolean": false
           },
-          "matchesIdentifiers": {
-            "boolean": true
+          "isGranule": {
+            "boolean": false
           }
         }
       },