Merge branch '8.1.x' into master by rayokota

Author: semaphore-agent-production[bot]

json-schema-provider/src/main/java/io/confluent/kafka/schemaregistry/json/JsonSchema.java

@@ -536,6 +536,16 @@ public String canonicalString() {
     return canonicalString;
   }
 
+  @Override
+  public String formattedString(String format) {
+    if (format == null || format.trim().isEmpty()) {
+      return canonicalString();
+    }
+    // Don't throw an exception for forward compatibility of formats
+    log.warn("Unsupported format {}", format);
+    return canonicalString();
+  }
+
   @Override
   public Integer version() {
     return version;

json-schema-provider/src/test/java/io/confluent/kafka/schemaregistry/json/JsonSchemaTest.java

@@ -1257,6 +1257,28 @@ public void testAddTagToCompositeField() {
     assertEquals(ImmutableSet.of("PII", "TEST2", "TEST3"), resultSchema.inlineTags());
   }
 
+  @Test
+  public void testBadFormat() throws Exception {
+    String schema = "{\n"
+        + "  \"$schema\": \"http://json-schema.org/draft-07/schema#\",\n"
+        + "  \"$id\": \"task.schema.json\",\n"
+        + "  \"title\": \"Task\",\n"
+        + "  \"description\": \"A task\",\n"
+        + "  \"type\": [\"null\", \"object\"],\n"
+        + "  \"properties\": {\n"
+        + "    \"parent\": {\n"
+        + "        \"$ref\": \"task.schema.json\"\n"
+        + "    },    \n"
+        + "    \"title\": {\n"
+        + "        \"description\": \"Task title\",\n"
+        + "        \"type\": \"string\"\n"
+        + "    }\n"
+        + "  }\n"
+        + "}";
+    JsonSchema jsonSchema = new JsonSchema(schema);
+    assertEquals(jsonSchema.canonicalString(), jsonSchema.formattedString("serialized"));
+  }
+
   @Test
   public void testRestrictedFields() {
     String schema = "{\n"