Merge branch '7.1.x' into pr_merge_from_7_0_x_to_7_1_x

README.md

@@ -192,6 +192,6 @@ Thanks for helping us to make Schema Registry even better!
 License
 -------
 
-The project is licensed under the [Confluent Community License](LICENSE-ConfluentCommunity), except for client libs,
-which is under the [Apache 2.0 license](LICENSE-Apache).
+The project is licensed under the [Confluent Community License](LICENSE-ConfluentCommunity), except for the `client` and `avro-*` libs,
+which are under the [Apache 2.0 license](LICENSE-Apache).
 See LICENSE file in each subfolder for detailed license agreement.

avro-converter/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>io.confluent</groupId>
         <artifactId>kafka-schema-registry-parent</artifactId>
-        <version>7.0.4-0</version>
+        <version>7.1.2-0</version>
     </parent>
 
     <licenses>

avro-data/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>io.confluent</groupId>
         <artifactId>kafka-schema-registry-parent</artifactId>
-        <version>7.0.4-0</version>
+        <version>7.1.2-0</version>
     </parent>
 
     <licenses>

avro-data/src/test/java/io/confluent/connect/avro/AdditionalAvroDataTest.java

@@ -169,30 +169,6 @@ public void testNestedUnion() {
         avroData.fromConnectSchema(connectSchema);
     }
 
-    @Test
-    public void testArrayOfRecordsWithDefaultValue() throws IOException
-    {
-        Schema avroSchema =
-            new Parser().parse(new File("src/test/avro/ArrayOfRecordsWithDefault.avsc"));
-
-        org.apache.kafka.connect.data.Schema connectSchema = avroData.toConnectSchema(avroSchema);
-
-        Object object = connectSchema.field("records").schema().defaultValue();
-
-        Assert.assertTrue(object instanceof List);
-
-        List arrayList = (List) object;
-        Assert.assertEquals(arrayList.size(), 2);
-
-        Struct item1 = (Struct) arrayList.get(0);
-        Assert.assertEquals(item1.get("itemName"), "item1");
-        Assert.assertEquals(item1.get("itemValue"), "value1");
-
-        Struct item2 = (Struct) arrayList.get(1);
-        Assert.assertEquals(item2.get("itemName"), "item2");
-        Assert.assertEquals(item2.get("itemValue"), "value2");
-    }
-
     @Union({MyImpl1.class, MyImpl2.class})
     interface MyInterface {}
     static class MyImpl1 implements MyInterface
@@ -383,6 +359,30 @@ public void testRepeatedTypeWithDefaultWithoutConnectMetaData() throws IOExcepti
         Assert.assertNull(outputAvroSchema.getField("enumFieldWithDiffDefault").schema().getEnumDefault());
     }
 
+    @Test
+    public void testArrayOfRecordsWithDefaultValue() throws IOException
+    {
+        Schema avroSchema =
+            new Parser().parse(new File("src/test/avro/ArrayOfRecordsWithDefault.avsc"));
+
+        org.apache.kafka.connect.data.Schema connectSchema = avroData.toConnectSchema(avroSchema);
+
+        Object object = connectSchema.field("records").schema().defaultValue();
+
+        Assert.assertTrue(object instanceof List);
+
+        List arrayList = (List) object;
+        Assert.assertEquals(arrayList.size(), 2);
+
+        Struct item1 = (Struct) arrayList.get(0);
+        Assert.assertEquals(item1.get("itemName"), "item1");
+        Assert.assertEquals(item1.get("itemValue"), "value1");
+
+        Struct item2 = (Struct) arrayList.get(1);
+        Assert.assertEquals(item2.get("itemName"), "item2");
+        Assert.assertEquals(item2.get("itemValue"), "value2");
+    }
+
     /**
      *  Test the discard.type.doc.default flag restores old behavior. Avro field doc maps to connect schema
      *  doc in both way conversion and type doc will be dropped.
@@ -475,4 +475,4 @@ public void testDiscardTypeDefault() throws IOException {
         Assert.assertNull(outputAvroSchema.getField("enumFieldWithoutDefault").defaultVal());
     }
 
-}
+}

avro-serde/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>io.confluent</groupId>
         <artifactId>kafka-schema-registry-parent</artifactId>
-        <version>7.0.4-0</version>
+        <version>7.1.2-0</version>
     </parent>
 
     <licenses>

avro-serializer/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>io.confluent</groupId>
         <artifactId>kafka-schema-registry-parent</artifactId>
-        <version>7.0.4-0</version>
+        <version>7.1.2-0</version>
     </parent>
 
     <licenses>

benchmark/pom.xml

@@ -7,7 +7,7 @@
   <parent>
     <groupId>io.confluent</groupId>
     <artifactId>kafka-schema-registry-parent</artifactId>
-    <version>7.0.4-0</version>
+    <version>7.1.2-0</version>
   </parent>
 
   <artifactId>kafka-schema-registry-benchmark</artifactId>

benchmark/src/main/java/io/confluent/schemaregistry/benchmark/SerdeBenchmark.java

@@ -129,7 +129,9 @@ public static Object makeRecord(ParsedSchema schema) throws IOException {
   }
 
   static class Record {
-    Record() {}
+    Record() {
+
+    }
 
     Record(String f1) {
       this.f1 = f1;

client-console-scripts/pom.xml

@@ -7,7 +7,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
     <parent>
         <groupId>io.confluent</groupId>
         <artifactId>kafka-schema-registry-parent</artifactId>
-        <version>7.0.4-0</version>
+        <version>7.1.2-0</version>
     </parent>
 
     <licenses>

client/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>io.confluent</groupId>
         <artifactId>kafka-schema-registry-parent</artifactId>
-        <version>7.0.4-0</version>
+        <version>7.1.2-0</version>
     </parent>
 
     <licenses>
@@ -60,28 +60,12 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>io.swagger</groupId>
+            <groupId>io.swagger.core.v3</groupId>
             <artifactId>swagger-annotations</artifactId>
         </dependency>
-        <dependency>
-            <groupId>io.swagger</groupId>
-            <artifactId>swagger-core</artifactId>
-            <version>1.6.2</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>javax.validation</groupId>
-                    <artifactId>validation-api</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>com.google.guava</groupId>
-                    <artifactId>guava</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>${guava.version}</version>
         </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>

client/src/main/java/io/confluent/kafka/schemaregistry/annotations/Schema.java

@@ -1,16 +1,17 @@
 /*
- * Copyright 2020 Confluent Inc.
+ * Copyright 2021 Confluent Inc.
  *
- * Licensed under the Confluent Community License (the "License"); you may not use
- * this file except in compliance with the License.  You may obtain a copy of the
- * License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * http://www.confluent.io/confluent-community-license
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OF ANY KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations under the License.
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 package io.confluent.kafka.schemaregistry.annotations;

client/src/main/java/io/confluent/kafka/schemaregistry/annotations/SchemaReference.java

@@ -1,16 +1,17 @@
 /*
- * Copyright 2020 Confluent Inc.
+ * Copyright 2021 Confluent Inc.
  *
- * Licensed under the Confluent Community License (the "License"); you may not use
- * this file except in compliance with the License.  You may obtain a copy of the
- * License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * http://www.confluent.io/confluent-community-license
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OF ANY KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations under the License.
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 package io.confluent.kafka.schemaregistry.annotations;

client/src/main/java/io/confluent/kafka/schemaregistry/avro/AvroSchemaProvider.java

@@ -1,16 +1,17 @@
 /*
- * Copyright 2018 Confluent Inc.
+ * Copyright 2021 Confluent Inc.
  *
- * Licensed under the Confluent Community License (the "License"); you may not use
- * this file except in compliance with the License.  You may obtain a copy of the
- * License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * http://www.confluent.io/confluent-community-license
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OF ANY KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations under the License.
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 package io.confluent.kafka.schemaregistry.avro;

client/src/main/java/io/confluent/kafka/schemaregistry/client/rest/entities/Config.java

@@ -19,10 +19,11 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 
 @JsonInclude(JsonInclude.Include.NON_EMPTY)
 @JsonIgnoreProperties(ignoreUnknown = true)
+@Schema(description = "Config")
 public class Config {
 
   private String compatibilityLevel;
@@ -35,7 +36,7 @@ public Config() {
     compatibilityLevel = null;
   }
 
-  @ApiModelProperty(value = "Compatability Level",
+  @Schema(description = "Compatibility Level",
       allowableValues = "BACKWARD, BACKWARD_TRANSITIVE, FORWARD, FORWARD_TRANSITIVE, FULL, "
           + "FULL_TRANSITIVE, NONE")
   @JsonProperty("compatibilityLevel")
@@ -59,22 +60,16 @@ public boolean equals(Object o) {
 
     Config that = (Config) o;
 
-    if (!this.compatibilityLevel.equals(that.compatibilityLevel)) {
-      return false;
-    }
-    return true;
+    return this.compatibilityLevel.equals(that.compatibilityLevel);
   }
 
   @Override
   public int hashCode() {
-    int result = 31 * compatibilityLevel.hashCode();
-    return result;
+    return 31 * compatibilityLevel.hashCode();
   }
 
   @Override
   public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("{compatibilityLevel=" + this.compatibilityLevel + "}");
-    return sb.toString();
+    return "{compatibilityLevel=" + this.compatibilityLevel + "}";
   }
 }

client/src/main/java/io/confluent/kafka/schemaregistry/client/rest/entities/Mode.java

@@ -23,12 +23,19 @@
 import java.io.IOException;
 
 import io.confluent.kafka.schemaregistry.utils.JacksonMapper;
+import io.swagger.v3.oas.annotations.media.Schema;
+
 import java.util.Objects;
 
 @JsonInclude(JsonInclude.Include.NON_EMPTY)
 @JsonIgnoreProperties(ignoreUnknown = true)
+@Schema(description = Mode.MODE_DESC)
 public class Mode {
 
+  public static final String MODE_DESC = "Schema Registry operating mode";
+
+  @Schema(description = MODE_DESC,
+          allowableValues = "READWRITE, READONLY, READONLY_OVERRIDE, IMPORT")
   private String mode;
 
   public static Mode fromJson(String json) throws IOException {

client/src/main/java/io/confluent/kafka/schemaregistry/client/rest/entities/Schema.java

@@ -29,8 +29,16 @@
 
 @JsonInclude(JsonInclude.Include.NON_EMPTY)
 @JsonIgnoreProperties(ignoreUnknown = true)
+@io.swagger.v3.oas.annotations.media.Schema(description = "Schema")
 public class Schema implements Comparable<Schema> {
 
+  public static final String SUBJECT_DESC = "Name of the subject";
+  public static final String VERSION_DESC = "Version number";
+  public static final String ID_DESC = "Globally unique identifier of the schema";
+  public static final String TYPE_DESC = "Schema type";
+  public static final String REFERENCES_DESC = "References to other schemas";
+  public static final String SCHEMA_DESC = "Schema definition string";
+
   private String subject;
   private Integer version;
   private Integer id;
@@ -53,6 +61,7 @@ public Schema(@JsonProperty("subject") String subject,
     this.schema = schema;
   }
 
+  @io.swagger.v3.oas.annotations.media.Schema(description = SUBJECT_DESC)
   @JsonProperty("subject")
   public String getSubject() {
     return subject;
@@ -63,6 +72,7 @@ public void setSubject(String subject) {
     this.subject = subject;
   }
 
+  @io.swagger.v3.oas.annotations.media.Schema(description = VERSION_DESC)
   @JsonProperty("version")
   public Integer getVersion() {
     return this.version;
@@ -73,6 +83,7 @@ public void setVersion(Integer version) {
     this.version = version;
   }
 
+  @io.swagger.v3.oas.annotations.media.Schema(description = ID_DESC)
   @JsonProperty("id")
   public Integer getId() {
     return this.id;
@@ -83,6 +94,7 @@ public void setId(Integer id) {
     this.id = id;
   }
 
+  @io.swagger.v3.oas.annotations.media.Schema(description = TYPE_DESC)
   @JsonProperty("schemaType")
   @JsonSerialize(converter = SchemaTypeConverter.class)
   public String getSchemaType() {
@@ -94,6 +106,7 @@ public void setSchemaType(String schemaType) {
     this.schemaType = schemaType;
   }
 
+  @io.swagger.v3.oas.annotations.media.Schema(description = REFERENCES_DESC)
   @JsonProperty("references")
   public List<SchemaReference> getReferences() {
     return this.references;
@@ -104,6 +117,7 @@ public void setReferences(List<SchemaReference> references) {
     this.references = references;
   }
 
+  @io.swagger.v3.oas.annotations.media.Schema(description = SCHEMA_DESC)
   @JsonProperty("schema")
   public String getSchema() {
     return this.schema;