Fixed several broken tests

Author: EricWittmann

app/src/main/java/io/apicurio/registry/ccompat/rest/v7/impl/AbstractResource.java

@@ -31,7 +31,6 @@
 import io.apicurio.registry.types.VersionState;
 import io.apicurio.registry.types.provider.ArtifactTypeUtilProvider;
 import io.apicurio.registry.types.provider.ArtifactTypeUtilProviderFactory;
-import io.apicurio.registry.content.util.ContentTypeUtil;
 import jakarta.inject.Inject;
 import org.apache.avro.AvroTypeException;
 import org.apache.avro.SchemaParseException;
@@ -76,8 +75,6 @@ protected ArtifactVersionMetaDataDto createOrUpdateArtifact(String subject, Stri
             String contentType = ContentTypes.APPLICATION_JSON;
             if (artifactType.equals(ArtifactType.PROTOBUF)) {
                 contentType = ContentTypes.APPLICATION_PROTOBUF;
-            } else if (ContentTypeUtil.isParsableYaml(schemaContent)) {
-                contentType = ContentTypes.APPLICATION_YAML;
             }
 
             if (!doesArtifactExist(subject, groupId)) {

app/src/main/java/io/apicurio/registry/storage/impl/gitops/GitManager.java

@@ -377,13 +377,13 @@ private Content processContent(ProcessingState state, GitFile base, String conte
                             try {
                                 // FIXME need to better determine the content type?
                                 String contentType = ContentTypes.APPLICATION_JSON;
-                                if (contentFile.getPath().toLowerCase().endsWith(".yaml") || contentFile.getPath().toLowerCase().endsWith(".yml")) {
+                                if (dataFile.getPath().toLowerCase().endsWith(".yaml") || dataFile.getPath().toLowerCase().endsWith(".yml")) {
                                     contentType = ContentTypes.APPLICATION_YAML;
-                                } else if (contentFile.getPath().toLowerCase().endsWith(".xml") || contentFile.getPath().toLowerCase().endsWith(".wsdl") || contentFile.getPath().toLowerCase().endsWith(".xsd")) {
+                                } else if (dataFile.getPath().toLowerCase().endsWith(".xml") || dataFile.getPath().toLowerCase().endsWith(".wsdl") || dataFile.getPath().toLowerCase().endsWith(".xsd")) {
                                     contentType = ContentTypes.APPLICATION_XML;
-                                } else if (contentFile.getPath().toLowerCase().endsWith(".proto")) {
+                                } else if (dataFile.getPath().toLowerCase().endsWith(".proto")) {
                                     contentType = ContentTypes.APPLICATION_PROTOBUF;
-                                } else if (contentFile.getPath().toLowerCase().endsWith(".graphql")) {
+                                } else if (dataFile.getPath().toLowerCase().endsWith(".graphql")) {
                                     contentType = ContentTypes.APPLICATION_GRAPHQL;
                                 }
                                 var typedContent = TypedContent.create(data, contentType);

app/src/test/java/io/apicurio/registry/noprofile/ccompat/rest/v7/ConfluentClientTest.java

@@ -822,13 +822,53 @@ public void testSchemaReferences() throws Exception {
 
     @Test
     public void testSchemaReferencesMultipleLevels() throws Exception {
-        String root = "[\"myavro.BudgetDecreased\",\"myavro.BudgetUpdated\"]";
-
-        String ref1 = "{\n" + "  \"type\" : \"record\",\n" + "  \"name\" : \"BudgetDecreased\",\n" + "  \"namespace\" : \"myavro\",\n" + "  \"fields\" : [ {\n" + "    \"name\" : \"buyerId\",\n" + "    \"type\" : \"long\"\n" + "  }, {\n" + "    \"name\" : \"currency\",\n" + "    \"type\" : {\n" + "      \"type\" : \"myavro.currencies.Currency\"" + "    }\n" + "  }, {\n" + "    \"name\" : \"amount\",\n" + "    \"type\" : \"double\"\n" + "  } ]\n" + "}";
-
-        String ref2 = "{\n" + "  \"type\" : \"record\",\n" + "  \"name\" : \"BudgetUpdated\",\n" + "  \"namespace\" : \"myavro\",\n" + "  \"fields\" : [ {\n" + "    \"name\" : \"buyerId\",\n" + "    \"type\" : \"long\"\n" + "  }, {\n" + "    \"name\" : \"currency\",\n" + "    \"type\" : {\n" + "      \"type\" : \"myavro.currencies.Currency\"" + "    }\n" + "  }, {\n" + "    \"name\" : \"updatedValue\",\n" + "    \"type\" : \"double\"\n" + "  } ]\n" + "}";
-
-        String sharedRef = "{\n" + "      \"type\" : \"enum\",\n" + "      \"name\" : \"Currency\",\n" + "      \"namespace\" : \"myavro.currencies\",\n" + "      \"symbols\" : [ \"EUR\", \"USD\" ]\n" + "    }\n";
+        String root = """
+                ["myavro.BudgetDecreased","myavro.BudgetUpdated"]""";
+
+        String ref1 = """
+                {
+                  "type" : "record",
+                  "name" : "BudgetDecreased",
+                  "namespace" : "myavro",
+                  "fields" : [ {
+                    "name" : "buyerId",
+                    "type" : "long"
+                  }, {
+                    "name" : "currency",
+                    "type" : {
+                      "type" : "myavro.currencies.Currency"    }
+                  }, {
+                    "name" : "amount",
+                    "type" : "double"
+                  } ]
+                }""";
+
+        String ref2 = """
+                {
+                  "type" : "record",
+                  "name" : "BudgetUpdated",
+                  "namespace" : "myavro",
+                  "fields" : [ {
+                    "name" : "buyerId",
+                    "type" : "long"
+                  }, {
+                    "name" : "currency",
+                    "type" : {
+                      "type" : "myavro.currencies.Currency"    }
+                  }, {
+                    "name" : "updatedValue",
+                    "type" : "double"
+                  } ]
+                }""";
+
+        String sharedRef = """
+                {
+                      "type" : "enum",
+                      "name" : "Currency",
+                      "namespace" : "myavro.currencies",
+                      "symbols" : [ "EUR", "USD" ]
+                    }
+                """;
 
         ConfluentTestUtils.registerAndVerifySchema(confluentClient, new AvroSchema(sharedRef).canonicalString(), "shared");
 

schema-util/common/src/main/java/io/apicurio/registry/content/util/ContentTypeUtil.java

@@ -96,7 +96,7 @@ public static boolean isParsableYaml(ContentHandle yaml) {
     public static boolean isParsableJson(ContentHandle content) {
         try {
             JsonNode root = jsonMapper.readTree(content.stream());
-            return root != null && (root.isObject() || root.isArray());
+            return root != null && !root.isNull() && !root.isMissingNode();
         } catch (Throwable t) {
             return false;
         }

schema-util/util-provider/src/main/java/io/apicurio/registry/types/provider/JsonArtifactTypeUtilProvider.java

@@ -25,7 +25,7 @@ public class JsonArtifactTypeUtilProvider extends AbstractArtifactTypeUtilProvid
     public boolean acceptsContent(TypedContent content, Map<String, TypedContent> resolvedReferences) {
         try {
             String contentType = content.getContentType();
-            if (contentType.toLowerCase().contains("json") && ContentTypeUtil.isParsableXml(content.getContent())) {
+            if (contentType.toLowerCase().contains("json") && ContentTypeUtil.isParsableJson(content.getContent())) {
                 JsonNode tree = ContentTypeUtil.parseJson(content.getContent());
                 if (tree.has("$schema") && tree.get("$schema").asText().contains("json-schema.org") || tree.has("properties")) {
                     return true;