fixed some issues

Author: ajakz

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

@@ -64,6 +64,7 @@ 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))
@@ -90,7 +91,7 @@ public static IdentificationAnalysis analyzeIdentifiers(Discovery metadata) {
         .setParentIdentifierExists(parentIdInfo.exists)
         .setParentIdentifierString(parentIdInfo.value)
         .setHierarchyLevelNameExists(hierarchyInfo.exists)
-        .setMatchesIdentifiers((hierarchyInfo.exists && hierarchyInfo.value.equals("granule") && parentIdInfo.exists) || (hierarchyInfo.exists && !hierarchyInfo.value.equals("granule")) || !hierarchyInfo.exists)
+        .setIsGranule(hierarchyInfo.exists && hierarchyInfo.value.equals("granule") && parentIdInfo.exists)
         .build();
   }
 

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

@@ -65,7 +65,7 @@ class AnalyzersSpec extends Specification {
             parentIdentifierExists  : true,
             parentIdentifierString  : 'gov.super.important:PARENT-ID',
             hierarchyLevelNameExists: true,
-            matchesIdentifiers      : true
+            isGranule               : true
         ],
         temporalBounding: [
             beginDescriptor         : ValidDescriptor.VALID,

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

@@ -84,15 +84,6 @@
               ],
               "default": null,
               "doc": "Resolves to true if metadata content indicates a record is a granule. That is, a parent identifier is present and the hierarchy level name is 'granule'."
-            },
-            {
-              "name": "matchesIdentifiers",
-              "type": [
-                "null",
-                "boolean"
-              ],
-              "default": null,
-              "doc": "Resolves to true if 'granule' specified as hierarchy level and parent id provided OR if hierarchy level not 'granule' (parent id value irrelevant here -- record is assumed a collection)."
             }
           ]
         }
@@ -119,7 +110,7 @@
             },
             {
               "name": "relationships",
-              "doc": "Summary of associated relationship RecordTypes and corresponding counts"
+              "doc": "Summary of associated relationship RecordTypes and corresponding counts",
               "type": {
                 "type": "array",
                 "items": {
@@ -129,7 +120,7 @@
                     {
                       "name": "type",
                       "type": [
-                        null,
+                        "null",
                         "RelationshipType"
                       ],
                       "default": null,