Merge branch '8.1.x' into master by Nitss10

Author: semaphore-agent-production[bot]

core/src/main/java/io/confluent/kafka/schemaregistry/rest/resources/SubjectsResource.java

@@ -124,6 +124,7 @@ public void lookUpSchemaUnderSubject(
              subject, lookupDeletedSchema, request.getSchemaType());
 
     subject = QualifiedSubject.normalize(schemaRegistry.tenant(), subject);
+
     // returns version if the schema exists. Otherwise returns 404
     Schema schema = new Schema(subject, request);
     io.confluent.kafka.schemaregistry.client.rest.entities.Schema matchingSchema;
@@ -133,15 +134,6 @@ public void lookUpSchemaUnderSubject(
       }
       matchingSchema = schemaRegistry.lookUpSchemaUnderSubjectUsingContexts(
           subject, schema, normalize, lookupDeletedSchema);
-
-      // If first attempt failed with normalize=false, try again with normalize=true
-      if (matchingSchema == null && !normalize) {
-        log.debug("No matching schema found with normalize = false,"
-                + " retrying with normalize = true");
-        matchingSchema = schemaRegistry.lookUpSchemaUnderSubjectUsingContexts(
-              subject, schema, true, lookupDeletedSchema);
-      }
-
       if (matchingSchema == null) {
         if (!schemaRegistry.hasSubjects(subject, lookupDeletedSchema)) {
           throw Errors.subjectNotFoundException(subject);

core/src/main/java/io/confluent/kafka/schemaregistry/storage/SchemaRegistry.java

@@ -257,6 +257,8 @@ Set<String> subjects(String subject, boolean lookupDeletedSubjects) throws
   void deleteSubjectMode(String subject) throws SchemaRegistryStoreException,
           OperationNotPermittedException;
 
+  RuleSetHandler getRuleSetHandler();
+
   void setRuleSetHandler(RuleSetHandler ruleSetHandler);
 
   HostnameVerifier getHostnameVerifier() throws SchemaRegistryStoreException;

core/src/test/java/io/confluent/kafka/schemaregistry/rest/RestApiTest.java

@@ -1422,39 +1422,6 @@ public void testSchemaNormalization() throws Exception {
     assertTrue(!messages.isEmpty() && messages.get(0).contains("Invalid schema"));
   }
 
-  @Test
-  public void testLookUpSchemaWithNormalizationRetry() throws Exception {
-      String subject = "testSubject";
-
-      String schemaString1 = "{\"type\":\"record\",\"name\":\"User\",\"fields\":[{\"name\":\"id\",\"type\":\"int\"},{\"name\":\"email4\",\"type\":\"string\"}]}";
-  
-      // Register the original schema
-      TestUtils.registerAndVerifySchema(restApp.restClient, schemaString1, 1, subject);
-  
-      // Same schema with different field ordering (semantically equivalent)
-      String schemaString2 = "{\"type\":\"record\",\"name\":\"User\",\"fields\":[{\"type\":\"int\",\"name\":\"id\"},{\"type\":\"string\",\"name\":\"email4\"}]}";
-  
-      RegisterSchemaRequest request = new RegisterSchemaRequest();
-      request.setSchema(schemaString2);
-
-      io.confluent.kafka.schemaregistry.client.rest.entities.Schema schema = 
-          restApp.restClient.lookUpSubjectVersion(request, subject, false, false);
-      assertNotNull(schema);
-      assertEquals(1, schema.getVersion().intValue());
-
-      // Different schema with different field name (not semantically equivalent)
-      String invalidSchema = "{\"type\":\"record\",\"name\":\"User\",\"fields\":[{\"type\":\"int\",\"name\":\"id\"},{\"type\":\"string\",\"name\":\"email6\"}]}";
-      request.setSchema(invalidSchema);
-  
-      // Should fail since schemas are actually different
-      try {
-          restApp.restClient.lookUpSubjectVersion(request, subject, true, false);
-          fail("Should fail as schemas are not semantically equivalent");
-      } catch (RestClientException e) {
-          assertEquals(Errors.SCHEMA_NOT_FOUND_ERROR_CODE, e.getErrorCode());
-      }
-  }
-
   @Test
   public void testBad() throws Exception {
     String subject1 = "testTopic1";