Content handling updates to properly support YAML

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

@@ -5,6 +5,7 @@
 import io.apicurio.registry.ccompat.rest.error.ConflictException;
 import io.apicurio.registry.ccompat.rest.error.UnprocessableEntityException;
 import io.apicurio.registry.content.ContentHandle;
+import io.apicurio.registry.content.TypedContent;
 import io.apicurio.registry.model.BranchId;
 import io.apicurio.registry.model.GA;
 import io.apicurio.registry.model.GAV;
@@ -30,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.util.ContentTypeUtil;
 import jakarta.inject.Inject;
 import org.apache.avro.AvroTypeException;
 import org.apache.avro.SchemaParseException;
@@ -68,19 +68,18 @@ protected ArtifactVersionMetaDataDto createOrUpdateArtifact(String subject, Stri
         ArtifactVersionMetaDataDto res;
         final List<ArtifactReferenceDto> parsedReferences = parseReferences(references, groupId);
         final List<ArtifactReference> artifactReferences = parsedReferences.stream().map(dto -> ArtifactReference.builder().name(dto.getName()).groupId(dto.getGroupId()).artifactId(dto.getArtifactId()).version(dto.getVersion()).build()).collect(Collectors.toList());
-        final Map<String, ContentHandle> resolvedReferences = storage.resolveReferences(parsedReferences);
+        final Map<String, TypedContent> resolvedReferences = storage.resolveReferences(parsedReferences);
         try {
             ContentHandle schemaContent;
             schemaContent = ContentHandle.create(schema);
             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)) {
-                rulesService.applyRules(groupId, subject, artifactType, schemaContent, RuleApplicationType.CREATE, artifactReferences, resolvedReferences);
+                TypedContent typedSchemaContent = TypedContent.create(schemaContent, contentType);
+                rulesService.applyRules(groupId, subject, artifactType, typedSchemaContent, RuleApplicationType.CREATE, artifactReferences, resolvedReferences);
 
                 EditableArtifactMetaDataDto artifactMetaData = EditableArtifactMetaDataDto.builder().build();
                 EditableVersionMetaDataDto firstVersionMetaData = EditableVersionMetaDataDto.builder().build();
@@ -93,7 +92,8 @@ protected ArtifactVersionMetaDataDto createOrUpdateArtifact(String subject, Stri
                 res = storage.createArtifact(groupId, subject, artifactType, artifactMetaData, null,
                         firstVersionContent, firstVersionMetaData, null).getValue();
             } else {
-                rulesService.applyRules(groupId, subject, artifactType, schemaContent, RuleApplicationType.UPDATE, artifactReferences, resolvedReferences);
+                TypedContent typedSchemaContent = TypedContent.create(schemaContent, contentType);
+                rulesService.applyRules(groupId, subject, artifactType, typedSchemaContent, RuleApplicationType.UPDATE, artifactReferences, resolvedReferences);
                 ContentWrapperDto versionContent = ContentWrapperDto.builder()
                         .content(schemaContent)
                         .contentType(contentType)
@@ -116,13 +116,15 @@ protected ArtifactVersionMetaDataDto lookupSchema(String groupId, String subject
         //FIXME simplify logic
         try {
             final String type = schemaType == null ? ArtifactType.AVRO : schemaType;
+            final String contentType = type.equals(ArtifactType.PROTOBUF) ? ContentTypes.APPLICATION_PROTOBUF : ContentTypes.APPLICATION_JSON;
+            TypedContent typedSchemaContent = TypedContent.create(ContentHandle.create(schema), contentType);
             final List<ArtifactReferenceDto> artifactReferences = parseReferences(schemaReferences, groupId);
             ArtifactTypeUtilProvider artifactTypeProvider = factory.getArtifactTypeProvider(type);
             ArtifactVersionMetaDataDto amd;
 
             if (cconfig.canonicalHashModeEnabled.get() || normalize) {
                 try {
-                    amd = storage.getArtifactVersionMetaDataByContent(groupId, subject, true, ContentHandle.create(schema), artifactReferences);
+                    amd = storage.getArtifactVersionMetaDataByContent(groupId, subject, true, typedSchemaContent, artifactReferences);
                 } catch (ArtifactNotFoundException ex) {
                     if (type.equals(ArtifactType.AVRO)) {
                         //When comparing using content, sometimes the references might be inlined into the content, try to dereference the existing content and compare as a fallback. See https://github.com/Apicurio/apicurio-registry/issues/3588 for more information.
@@ -131,8 +133,13 @@ protected ArtifactVersionMetaDataDto lookupSchema(String groupId, String subject
                         amd = storage.getArtifactVersions(groupId, subject)
                                 .stream().filter(version -> {
                                     StoredArtifactVersionDto artifactVersion = storage.getArtifactVersionContent(groupId, subject, version);
-                                    Map<String, ContentHandle> artifactVersionReferences = storage.resolveReferences(artifactVersion.getReferences());
-                                    String dereferencedExistingContentSha = DigestUtils.sha256Hex(artifactTypeProvider.getContentDereferencer().dereference(artifactVersion.getContent(), artifactVersionReferences).content());
+                                    TypedContent typedArtifactVersion = TypedContent.create(artifactVersion.getContent(), artifactVersion.getContentType());
+                                    Map<String, TypedContent> artifactVersionReferences = storage.resolveReferences(artifactVersion.getReferences());
+                                    String dereferencedExistingContentSha = DigestUtils.sha256Hex(
+                                            artifactTypeProvider.getContentDereferencer().dereference(
+                                                    typedArtifactVersion, artifactVersionReferences
+                                            ).getContent().content()
+                                    );
                                     return dereferencedExistingContentSha.equals(DigestUtils.sha256Hex(schema));
                                 })
                                 .findAny()
@@ -144,7 +151,7 @@ protected ArtifactVersionMetaDataDto lookupSchema(String groupId, String subject
                 }
 
             } else {
-                amd = storage.getArtifactVersionMetaDataByContent(groupId, subject, false, ContentHandle.create(schema), artifactReferences);
+                amd = storage.getArtifactVersionMetaDataByContent(groupId, subject, false, typedSchemaContent, artifactReferences);
             }
 
             return amd;
@@ -153,8 +160,8 @@ protected ArtifactVersionMetaDataDto lookupSchema(String groupId, String subject
         }
     }
 
-    protected Map<String, ContentHandle> resolveReferences(List<SchemaReference> references) {
-        Map<String, ContentHandle> resolvedReferences = Collections.emptyMap();
+    protected Map<String, TypedContent> resolveReferences(List<SchemaReference> references) {
+        Map<String, TypedContent> resolvedReferences = Collections.emptyMap();
         if (references != null && !references.isEmpty()) {
             //Transform the given references into dtos and set the contentId, this will also detect if any of the passed references does not exist.
             final List<ArtifactReferenceDto> referencesAsDtos = references.stream().map(schemaReference -> {

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

@@ -9,11 +9,14 @@
 import io.apicurio.registry.ccompat.rest.error.UnprocessableEntityException;
 import io.apicurio.registry.ccompat.rest.v7.CompatibilityResource;
 import io.apicurio.registry.content.ContentHandle;
+import io.apicurio.registry.content.TypedContent;
 import io.apicurio.registry.metrics.health.liveness.ResponseErrorLivenessCheck;
 import io.apicurio.registry.metrics.health.readiness.ResponseTimeoutReadinessCheck;
 import io.apicurio.registry.rules.RuleViolationException;
 import io.apicurio.registry.rules.UnprocessableSchemaException;
 import io.apicurio.registry.storage.dto.ArtifactVersionMetaDataDto;
+import io.apicurio.registry.types.ArtifactType;
+import io.apicurio.registry.types.ContentTypes;
 import jakarta.interceptor.Interceptors;
 
 import java.util.Collections;
@@ -31,7 +34,14 @@ public CompatibilityCheckResponse testCompatibilityBySubjectName(String subject,
             final List<String> versions = storage.getArtifactVersions(groupId, subject);
             for (String version : versions) {
                 final ArtifactVersionMetaDataDto artifactVersionMetaData = storage.getArtifactVersionMetaData(groupId, subject, version);
-                rulesService.applyRules(groupId, subject, version, artifactVersionMetaData.getArtifactType(), ContentHandle.create(request.getSchema()), Collections.emptyList(), Collections.emptyMap());
+                // Assume the content type of the SchemaContent is the same as the previous version.
+                String contentType = ContentTypes.APPLICATION_JSON;
+                if (artifactVersionMetaData.getArtifactType().equals(ArtifactType.PROTOBUF)) {
+                    contentType = ContentTypes.APPLICATION_PROTOBUF;
+                }
+                TypedContent typedContent = TypedContent.create(ContentHandle.create(request.getSchema()), contentType);
+                rulesService.applyRules(groupId, subject, version, artifactVersionMetaData.getArtifactType(),
+                        typedContent, Collections.emptyList(), Collections.emptyMap());
             }
             return CompatibilityCheckResponse.IS_COMPATIBLE;
         } catch (RuleViolationException ex) {
@@ -53,7 +63,14 @@ public CompatibilityCheckResponse testCompatibilityByVersion(String subject, Str
         return parseVersionString(subject, versionString, groupId, v -> {
             try {
                 final ArtifactVersionMetaDataDto artifact = storage.getArtifactVersionMetaData(groupId, subject, v);
-                rulesService.applyRules(groupId, subject, v, artifact.getArtifactType(), ContentHandle.create(request.getSchema()), Collections.emptyList(), Collections.emptyMap());
+                // Assume the content type of the SchemaContent is correct based on the artifact type.
+                String contentType = ContentTypes.APPLICATION_JSON;
+                if (artifact.getArtifactType().equals(ArtifactType.PROTOBUF)) {
+                    contentType = ContentTypes.APPLICATION_PROTOBUF;
+                }
+                TypedContent typedContent = TypedContent.create(ContentHandle.create(request.getSchema()), contentType);
+                rulesService.applyRules(groupId, subject, v, artifact.getArtifactType(),
+                        typedContent, Collections.emptyList(), Collections.emptyMap());
                 return CompatibilityCheckResponse.IS_COMPATIBLE;
             } catch (RuleViolationException ex) {
                 if (fverbose) {

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

@@ -8,6 +8,7 @@
 import io.apicurio.registry.ccompat.dto.SubjectVersion;
 import io.apicurio.registry.ccompat.rest.v7.SchemasResource;
 import io.apicurio.registry.content.ContentHandle;
+import io.apicurio.registry.content.TypedContent;
 import io.apicurio.registry.metrics.health.liveness.ResponseErrorLivenessCheck;
 import io.apicurio.registry.metrics.health.readiness.ResponseTimeoutReadinessCheck;
 import io.apicurio.registry.storage.dto.ArtifactReferenceDto;
@@ -45,8 +46,9 @@ public SchemaInfo getSchema(int id, String subject, String groupId) {
             contentType = contentWrapper.getContentType();
             references = contentWrapper.getReferences();
         }
-        return converter.convert(contentHandle, ArtifactTypeUtil.determineArtifactType(contentHandle, null, contentType,
-                storage.resolveReferences(references), factory.getAllArtifactTypes()), references);
+        TypedContent typedContent = TypedContent.create(contentHandle, contentType);
+        return converter.convert(contentHandle, ArtifactTypeUtil.determineArtifactType(typedContent, null,
+                storage.resolveReferences(references), factory), references);
     }
 
     @Override

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

@@ -14,6 +14,7 @@
 import io.apicurio.registry.ccompat.rest.error.UnprocessableEntityException;
 import io.apicurio.registry.ccompat.rest.v7.SubjectVersionsResource;
 import io.apicurio.registry.content.ContentHandle;
+import io.apicurio.registry.content.TypedContent;
 import io.apicurio.registry.metrics.health.liveness.ResponseErrorLivenessCheck;
 import io.apicurio.registry.metrics.health.readiness.ResponseTimeoutReadinessCheck;
 import io.apicurio.registry.storage.dto.ArtifactVersionMetaDataDto;
@@ -24,8 +25,8 @@
 import io.apicurio.registry.storage.error.VersionNotFoundException;
 import io.apicurio.registry.types.VersionState;
 import io.apicurio.registry.util.ArtifactTypeUtil;
-import io.apicurio.registry.util.ContentTypeUtil;
-import io.apicurio.registry.util.VersionUtil;
+import io.apicurio.registry.content.util.ContentTypeUtil;
+import io.apicurio.registry.utils.VersionUtil;
 import jakarta.inject.Inject;
 import jakarta.interceptor.Interceptors;
 import jakarta.ws.rs.BadRequestException;
@@ -71,7 +72,7 @@ public SchemaId register(String subject, SchemaInfo request, Boolean normalize,
             throw new UnprocessableEntityException("The schema provided is null.");
         }
 
-        final Map<String, ContentHandle> resolvedReferences = resolveReferences(request.getReferences());
+        final Map<String, TypedContent> resolvedReferences = resolveReferences(request.getReferences());
 
         try {
             ArtifactVersionMetaDataDto dto = lookupSchema(groupId, subject, request.getSchema(), request.getReferences(), request.getSchemaType(), fnormalize);
@@ -88,10 +89,11 @@ public SchemaId register(String subject, SchemaInfo request, Boolean normalize,
             try {
                 ContentHandle schemaContent = ContentHandle.create(request.getSchema());
                 String contentType = ContentTypeUtil.determineContentType(schemaContent);
+                TypedContent typedSchemaContent = TypedContent.create(schemaContent, contentType);
 
                 // We validate the schema at creation time by inferring the type from the content
-                final String artifactType = ArtifactTypeUtil.determineArtifactType(ContentHandle.create(request.getSchema()),
-                        null, contentType, resolvedReferences, factory.getAllArtifactTypes());
+                final String artifactType = ArtifactTypeUtil.determineArtifactType(typedSchemaContent,
+                        null, resolvedReferences, factory);
                 if (request.getSchemaType() != null && !artifactType.equals(request.getSchemaType())) {
                     throw new UnprocessableEntityException(String.format("Given schema is not from type: %s", request.getSchemaType()));
                 }

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

@@ -32,7 +32,7 @@
 import io.apicurio.registry.storage.error.InvalidArtifactStateException;
 import io.apicurio.registry.storage.error.InvalidVersionStateException;
 import io.apicurio.registry.types.VersionState;
-import io.apicurio.registry.util.VersionUtil;
+import io.apicurio.registry.utils.VersionUtil;
 import jakarta.interceptor.Interceptors;
 
 @Interceptors({ResponseErrorLivenessCheck.class, ResponseTimeoutReadinessCheck.class})

app/src/main/java/io/apicurio/registry/rest/v2/AbstractResourceImpl.java

@@ -1,22 +1,7 @@
 package io.apicurio.registry.rest.v2;
 
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.URLEncoder;
-import java.nio.charset.StandardCharsets;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import jakarta.inject.Inject;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.ws.rs.core.Context;
-
-import org.eclipse.microprofile.config.inject.ConfigProperty;
-import org.slf4j.Logger;
-
 import io.apicurio.common.apps.config.Info;
-import io.apicurio.registry.content.ContentHandle;
+import io.apicurio.registry.content.TypedContent;
 import io.apicurio.registry.content.dereference.ContentDereferencer;
 import io.apicurio.registry.content.refs.JsonPointerExternalReference;
 import io.apicurio.registry.storage.RegistryStorage;
@@ -25,6 +10,19 @@
 import io.apicurio.registry.types.provider.ArtifactTypeUtilProvider;
 import io.apicurio.registry.types.provider.ArtifactTypeUtilProviderFactory;
 import io.apicurio.registry.utils.StringUtil;
+import jakarta.inject.Inject;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.ws.rs.core.Context;
+import org.eclipse.microprofile.config.inject.ConfigProperty;
+import org.slf4j.Logger;
+
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 public abstract class AbstractResourceImpl {
 
@@ -51,13 +49,13 @@ public abstract class AbstractResourceImpl {
      * @param dereference
      * @param content
      */
-    protected ContentHandle handleContentReferences(boolean dereference, String artifactType,
-            ContentHandle content, List<ArtifactReferenceDto> references) {
+    protected TypedContent handleContentReferences(boolean dereference, String artifactType,
+            TypedContent content, List<ArtifactReferenceDto> references) {
         // Dereference or rewrite references
         if (!references.isEmpty() && dereference) {
                 ArtifactTypeUtilProvider artifactTypeProvider = factory.getArtifactTypeProvider(artifactType);
                 ContentDereferencer contentDereferencer = artifactTypeProvider.getContentDereferencer();
-                Map<String, ContentHandle> resolvedReferences = storage.resolveReferences(references);
+                Map<String, TypedContent> resolvedReferences = storage.resolveReferences(references);
                 content = contentDereferencer.dereference(content, resolvedReferences);
         }
         return content;
@@ -119,7 +117,6 @@ protected String resolveReferenceUrl(ArtifactReferenceDto reference) {
 
     /**
      * Resolves a host name from the information found in X-Forwarded-Host and X-Forwarded-Proto.
-     * @param path
      */
     private static URI getApiBaseHrefFromXForwarded(HttpServletRequest request) throws URISyntaxException {
         String fproto = request.getHeader("X-Forwarded-Proto");
@@ -133,7 +130,6 @@ private static URI getApiBaseHrefFromXForwarded(HttpServletRequest request) thro
 
     /**
      * Resolves a host name from the request information.
-     * @param path
      */
     private static URI getApiBaseHrefFromRequest(HttpServletRequest request) throws URISyntaxException {
         String requestUrl = request.getRequestURL().toString();

app/src/main/java/io/apicurio/registry/rest/v2/AdminResourceImpl.java

@@ -52,8 +52,8 @@
 import java.util.zip.ZipInputStream;
 
 import static io.apicurio.common.apps.logging.audit.AuditingConstants.*;
-import static io.apicurio.registry.util.DtoUtil.appAuthPropertyToRegistry;
-import static io.apicurio.registry.util.DtoUtil.registryAuthPropertyToApp;
+import static io.apicurio.registry.utils.DtoUtil.appAuthPropertyToRegistry;
+import static io.apicurio.registry.utils.DtoUtil.registryAuthPropertyToApp;
 
 @ApplicationScoped
 @Interceptors({ResponseErrorLivenessCheck.class, ResponseTimeoutReadinessCheck.class})