Fix missing classes in the kafkasql message index

Author: EricWittmann

app/src/main/java/io/apicurio/registry/storage/impl/kafkasql/serde/KafkaSqlMessageIndex.java

@@ -1,7 +1,56 @@
 package io.apicurio.registry.storage.impl.kafkasql.serde;
 
 import io.apicurio.registry.storage.impl.kafkasql.KafkaSqlMessage;
-import io.apicurio.registry.storage.impl.kafkasql.messages.*;
+import io.apicurio.registry.storage.impl.kafkasql.messages.AppendVersionToBranch3Message;
+import io.apicurio.registry.storage.impl.kafkasql.messages.ConsumeDownload1Message;
+import io.apicurio.registry.storage.impl.kafkasql.messages.CreateArtifact8Message;
+import io.apicurio.registry.storage.impl.kafkasql.messages.CreateArtifactVersion7Message;
+import io.apicurio.registry.storage.impl.kafkasql.messages.CreateArtifactVersionComment4Message;
+import io.apicurio.registry.storage.impl.kafkasql.messages.CreateBranch4Message;
+import io.apicurio.registry.storage.impl.kafkasql.messages.CreateDownload1Message;
+import io.apicurio.registry.storage.impl.kafkasql.messages.CreateGlobalRule2Message;
+import io.apicurio.registry.storage.impl.kafkasql.messages.CreateGroup1Message;
+import io.apicurio.registry.storage.impl.kafkasql.messages.CreateRoleMapping3Message;
+import io.apicurio.registry.storage.impl.kafkasql.messages.CreateSnapshot1Message;
+import io.apicurio.registry.storage.impl.kafkasql.messages.DeleteAllExpiredDownloads0Message;
+import io.apicurio.registry.storage.impl.kafkasql.messages.DeleteAllUserData0Message;
+import io.apicurio.registry.storage.impl.kafkasql.messages.DeleteArtifact2Message;
+import io.apicurio.registry.storage.impl.kafkasql.messages.DeleteArtifactRule3Message;
+import io.apicurio.registry.storage.impl.kafkasql.messages.DeleteArtifactRules2Message;
+import io.apicurio.registry.storage.impl.kafkasql.messages.DeleteArtifactVersion3Message;
+import io.apicurio.registry.storage.impl.kafkasql.messages.DeleteArtifactVersionComment4Message;
+import io.apicurio.registry.storage.impl.kafkasql.messages.DeleteArtifacts1Message;
+import io.apicurio.registry.storage.impl.kafkasql.messages.DeleteBranch2Message;
+import io.apicurio.registry.storage.impl.kafkasql.messages.DeleteConfigProperty1Message;
+import io.apicurio.registry.storage.impl.kafkasql.messages.DeleteGlobalRule1Message;
+import io.apicurio.registry.storage.impl.kafkasql.messages.DeleteGlobalRules0Message;
+import io.apicurio.registry.storage.impl.kafkasql.messages.DeleteGroup1Message;
+import io.apicurio.registry.storage.impl.kafkasql.messages.DeleteRoleMapping1Message;
+import io.apicurio.registry.storage.impl.kafkasql.messages.ImportArtifact1Message;
+import io.apicurio.registry.storage.impl.kafkasql.messages.ImportArtifactRule1Message;
+import io.apicurio.registry.storage.impl.kafkasql.messages.ImportArtifactVersion1Message;
+import io.apicurio.registry.storage.impl.kafkasql.messages.ImportBranch1Message;
+import io.apicurio.registry.storage.impl.kafkasql.messages.ImportComment1Message;
+import io.apicurio.registry.storage.impl.kafkasql.messages.ImportContent1Message;
+import io.apicurio.registry.storage.impl.kafkasql.messages.ImportGlobalRule1Message;
+import io.apicurio.registry.storage.impl.kafkasql.messages.ImportGroup1Message;
+import io.apicurio.registry.storage.impl.kafkasql.messages.NextCommentId0Message;
+import io.apicurio.registry.storage.impl.kafkasql.messages.NextContentId0Message;
+import io.apicurio.registry.storage.impl.kafkasql.messages.NextGlobalId0Message;
+import io.apicurio.registry.storage.impl.kafkasql.messages.ReplaceBranchVersions3Message;
+import io.apicurio.registry.storage.impl.kafkasql.messages.ResetCommentId0Message;
+import io.apicurio.registry.storage.impl.kafkasql.messages.ResetContentId0Message;
+import io.apicurio.registry.storage.impl.kafkasql.messages.ResetGlobalId0Message;
+import io.apicurio.registry.storage.impl.kafkasql.messages.SetConfigProperty1Message;
+import io.apicurio.registry.storage.impl.kafkasql.messages.UpdateArtifactMetaData3Message;
+import io.apicurio.registry.storage.impl.kafkasql.messages.UpdateArtifactRule4Message;
+import io.apicurio.registry.storage.impl.kafkasql.messages.UpdateArtifactVersionComment5Message;
+import io.apicurio.registry.storage.impl.kafkasql.messages.UpdateArtifactVersionMetaData4Message;
+import io.apicurio.registry.storage.impl.kafkasql.messages.UpdateBranchMetaData3Message;
+import io.apicurio.registry.storage.impl.kafkasql.messages.UpdateContentCanonicalHash3Message;
+import io.apicurio.registry.storage.impl.kafkasql.messages.UpdateGlobalRule2Message;
+import io.apicurio.registry.storage.impl.kafkasql.messages.UpdateGroupMetaData2Message;
+import io.apicurio.registry.storage.impl.kafkasql.messages.UpdateRoleMapping2Message;
 import jakarta.enterprise.context.ApplicationScoped;
 
 import java.util.HashMap;
@@ -22,40 +71,43 @@ private static void indexMessageClasses(Class<? extends KafkaSqlMessage> ... mcl
     }
     static {
         indexMessageClasses(
+                AppendVersionToBranch3Message.class,
                 ConsumeDownload1Message.class,
                 CreateArtifact8Message.class,
                 CreateArtifactVersion7Message.class,
                 CreateArtifactVersionComment4Message.class,
-                CreateArtifact8Message.class,
+                CreateBranch4Message.class,
                 CreateDownload1Message.class,
-                CreateSnapshot1Message.class,
                 CreateGlobalRule2Message.class,
                 CreateGroup1Message.class,
                 CreateRoleMapping3Message.class,
+                CreateSnapshot1Message.class,
                 DeleteAllExpiredDownloads0Message.class,
                 DeleteAllUserData0Message.class,
                 DeleteArtifact2Message.class,
-                DeleteBranch2Message.class,
                 DeleteArtifactRule3Message.class,
                 DeleteArtifactRules2Message.class,
                 DeleteArtifacts1Message.class,
                 DeleteArtifactVersion3Message.class,
                 DeleteArtifactVersionComment4Message.class,
+                DeleteBranch2Message.class,
                 DeleteConfigProperty1Message.class,
                 DeleteGlobalRule1Message.class,
                 DeleteGlobalRules0Message.class,
                 DeleteGroup1Message.class,
                 DeleteRoleMapping1Message.class,
-                ImportBranch1Message.class,
+                ImportArtifact1Message.class,
                 ImportArtifactRule1Message.class,
                 ImportArtifactVersion1Message.class,
+                ImportBranch1Message.class,
                 ImportComment1Message.class,
                 ImportContent1Message.class,
                 ImportGlobalRule1Message.class,
                 ImportGroup1Message.class,
                 NextCommentId0Message.class,
                 NextContentId0Message.class,
                 NextGlobalId0Message.class,
+                ReplaceBranchVersions3Message.class,
                 ResetCommentId0Message.class,
                 ResetContentId0Message.class,
                 ResetGlobalId0Message.class,
@@ -64,6 +116,7 @@ private static void indexMessageClasses(Class<? extends KafkaSqlMessage> ... mcl
                 UpdateArtifactRule4Message.class,
                 UpdateArtifactVersionComment5Message.class,
                 UpdateArtifactVersionMetaData4Message.class,
+                UpdateBranchMetaData3Message.class,
                 UpdateContentCanonicalHash3Message.class,
                 UpdateGlobalRule2Message.class,
                 UpdateGroupMetaData2Message.class,

integration-tests/src/test/java/io/apicurio/tests/migration/GenerateCanonicalHashImportIT.java

@@ -53,7 +53,7 @@ public void testGeneratingCanonicalHashOnImport() throws Exception {
         JsonSchemaMsgFactory jsonSchema = new JsonSchemaMsgFactory();
         for (int i = 0; i < 20; i++) {
             String artifactId = i + "-" + UUID.randomUUID();
-            String content = IoUtil.toString(jsonSchema.getSchemaStream());
+            String content = jsonSchema.getSchemaString();
             artifacts.put(artifactId, content);
         }
         var importReq = client.admin().importEscaped().toPostRequestInformation(generateExportedZip(artifacts));