Update for schema promotion

Signed-off-by: Muralidhar Basani <[email protected]>

coral/types/api.d.ts

@@ -770,8 +770,6 @@ export type components = {
       sourceEnvironment: string;
       topicName: string;
       schemaVersion: string;
-      /** @enum {string} */
-      schemaType: "AVRO" | "JSON";
       forceRegister?: boolean;
       appName: string;
       remarks: string;

core/src/main/java/io/aiven/klaw/model/requests/SchemaPromotion.java

@@ -1,6 +1,5 @@
 package io.aiven.klaw.model.requests;
 
-import io.aiven.klaw.model.enums.SchemaType;
 import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Pattern;
 import lombok.Getter;
@@ -27,8 +26,6 @@ public class SchemaPromotion {
   @Pattern(message = "Invalid Schema Version. Pattern [0-9]", regexp = "^[0-9]*$")
   private String schemaVersion;
 
-  @NotNull private SchemaType schemaType;
-
   private boolean forceRegister;
 
   @NotNull

core/src/main/java/io/aiven/klaw/service/SchemaRegistryControllerService.java

@@ -64,6 +64,8 @@ public class SchemaRegistryControllerService {
 
   @Autowired private RolesPermissionsControllerService rolesPermissionsControllerService;
 
+  private static final String SCHEMA_TYPE = "schemaType";
+
   public SchemaRegistryControllerService(
       ClusterApiService clusterApiService, MailUtils mailService) {
     this.clusterApiService = clusterApiService;
@@ -478,6 +480,11 @@ public ApiResponse promoteSchema(SchemaPromotion schemaPromotion) throws Excepti
         schemaObjects.get(Integer.valueOf(schemaPromotion.getSchemaVersion()));
     // Pretty Print the Json String so that it can be seen clearly in the UI.
     schemaRequest.setSchemafull(prettyPrintUglyJsonString((String) schemaObject.get("schema")));
+    if (schemaObject.containsKey(SCHEMA_TYPE)) {
+      schemaRequest.setSchemaType(SchemaType.of(schemaObject.get(SCHEMA_TYPE).toString()));
+    } else {
+      schemaRequest.setSchemaType(SchemaType.AVRO);
+    }
     // sending request operation type along with function call
     return uploadSchema(schemaRequest, RequestOperationType.PROMOTE);
   }
@@ -525,11 +532,6 @@ private SchemaRequestModel buildSchemaRequestFromPromotionRequest(
     schemaRequest.setTopicname(schemaPromotion.getTopicName());
     schemaRequest.setForceRegister(schemaPromotion.isForceRegister());
     schemaRequest.setEnvironment(schemaPromotion.getTargetEnvironment());
-    if (schemaPromotion.getSchemaType() == null) {
-      schemaRequest.setSchemaType(SchemaType.AVRO);
-    } else {
-      schemaRequest.setSchemaType(schemaPromotion.getSchemaType());
-    }
     return schemaRequest;
   }
 

core/src/main/resources/static/js/browseAcls.js

@@ -514,7 +514,6 @@ app.controller("browseAclsCtrl", function($scope, $http, $location, $window) {
             promoteSchemaReq['forceRegister'] = $scope.schema.forceRegister;
             promoteSchemaReq['appName'] = "App";
             promoteSchemaReq['remarks'] = remarks;
-            promoteSchemaReq['schemaType'] = $scope.schemaDetails.schemaType;
 
             $http({
                                 method: "POST",

openapi.yaml

@@ -6528,10 +6528,6 @@
             "type" : "string",
             "pattern" : "^[0-9]*$"
           },
-          "schemaType" : {
-            "type" : "string",
-            "enum" : [ "AVRO", "JSON" ]
-          },
           "forceRegister" : {
             "type" : "boolean"
           },
@@ -6544,7 +6540,7 @@
             "pattern" : "^[a-zA-z 0-9]*$"
           }
         },
-        "required" : [ "appName", "remarks", "schemaType", "schemaVersion", "sourceEnvironment", "targetEnvironment", "topicName" ]
+        "required" : [ "appName", "remarks", "schemaVersion", "sourceEnvironment", "targetEnvironment", "topicName" ]
       },
       "ConsumerOffsetResetRequestModel" : {
         "properties" : {