From commits-return-9796-apmail-kafka-commits-archive=kafka.apache.org@kafka.apache.org Sun Jun 17 06:10:24 2018 Return-Path: X-Original-To: apmail-kafka-commits-archive@www.apache.org Delivered-To: apmail-kafka-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 4091A18B90 for ; Sun, 17 Jun 2018 06:10:24 +0000 (UTC) Received: (qmail 38174 invoked by uid 500); 17 Jun 2018 06:10:23 -0000 Delivered-To: apmail-kafka-commits-archive@kafka.apache.org Received: (qmail 38126 invoked by uid 500); 17 Jun 2018 06:10:23 -0000 Mailing-List: contact commits-help@kafka.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@kafka.apache.org Delivered-To: mailing list commits@kafka.apache.org Received: (qmail 38117 invoked by uid 99); 17 Jun 2018 06:10:23 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 17 Jun 2018 06:10:23 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id AFF95827D5; Sun, 17 Jun 2018 06:10:22 +0000 (UTC) Date: Sun, 17 Jun 2018 06:10:22 +0000 To: "commits@kafka.apache.org" Subject: [kafka] branch 1.0 updated: KAFKA-7058: Comparing schema default values using Objects#deepEquals() MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <152921582183.29138.10956052492954669861@gitbox.apache.org> From: ewencp@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: kafka X-Git-Refname: refs/heads/1.0 X-Git-Reftype: branch X-Git-Oldrev: 79e74944ed219536b05c0b770c16e8a8f39c44b7 X-Git-Newrev: 737bf43bb4e78d2d7a0ee53c27527b479972ebf8 X-Git-Rev: 737bf43bb4e78d2d7a0ee53c27527b479972ebf8 X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated This is an automated email from the ASF dual-hosted git repository. ewencp pushed a commit to branch 1.0 in repository https://gitbox.apache.org/repos/asf/kafka.git The following commit(s) were added to refs/heads/1.0 by this push: new 737bf43 KAFKA-7058: Comparing schema default values using Objects#deepEquals() 737bf43 is described below commit 737bf43bb4e78d2d7a0ee53c27527b479972ebf8 Author: Gunnar Morling AuthorDate: Sat Jun 16 23:04:31 2018 -0700 KAFKA-7058: Comparing schema default values using Objects#deepEquals() https://issues.apache.org/jira/browse/KAFKA-7058 * Summary of testing strategy: Added new unit test Author: Gunnar Morling Reviewers: Randall Hauch , Ewen Cheslack-Postava Closes #5225 from gunnarmorling/KAFKA-7058 (cherry picked from commit be846d833caade74f1d0536ecf9d540855cde758) Signed-off-by: Ewen Cheslack-Postava --- .../main/java/org/apache/kafka/connect/data/ConnectSchema.java | 2 +- .../java/org/apache/kafka/connect/data/ConnectSchemaTest.java | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/connect/api/src/main/java/org/apache/kafka/connect/data/ConnectSchema.java b/connect/api/src/main/java/org/apache/kafka/connect/data/ConnectSchema.java index 651b2ee..30917fc 100644 --- a/connect/api/src/main/java/org/apache/kafka/connect/data/ConnectSchema.java +++ b/connect/api/src/main/java/org/apache/kafka/connect/data/ConnectSchema.java @@ -284,7 +284,7 @@ public class ConnectSchema implements Schema { ConnectSchema schema = (ConnectSchema) o; return Objects.equals(optional, schema.optional) && Objects.equals(type, schema.type) && - Objects.equals(defaultValue, schema.defaultValue) && + Objects.deepEquals(defaultValue, schema.defaultValue) && Objects.equals(fields, schema.fields) && Objects.equals(keySchema, schema.keySchema) && Objects.equals(valueSchema, schema.valueSchema) && diff --git a/connect/api/src/test/java/org/apache/kafka/connect/data/ConnectSchemaTest.java b/connect/api/src/test/java/org/apache/kafka/connect/data/ConnectSchemaTest.java index 339ef23..048784e 100644 --- a/connect/api/src/test/java/org/apache/kafka/connect/data/ConnectSchemaTest.java +++ b/connect/api/src/test/java/org/apache/kafka/connect/data/ConnectSchemaTest.java @@ -269,6 +269,16 @@ public class ConnectSchemaTest { } @Test + public void testArrayDefaultValueEquality() { + ConnectSchema s1 = new ConnectSchema(Schema.Type.ARRAY, false, new String[] {"a", "b"}, null, null, null, null, null, null, SchemaBuilder.int8().build()); + ConnectSchema s2 = new ConnectSchema(Schema.Type.ARRAY, false, new String[] {"a", "b"}, null, null, null, null, null, null, SchemaBuilder.int8().build()); + ConnectSchema differentValueSchema = new ConnectSchema(Schema.Type.ARRAY, false, new String[] {"b", "c"}, null, null, null, null, null, null, SchemaBuilder.int8().build()); + + assertEquals(s1, s2); + assertNotEquals(s1, differentValueSchema); + } + + @Test public void testMapEquality() { // Same as testArrayEquality, but for both key and value schemas ConnectSchema s1 = new ConnectSchema(Schema.Type.MAP, false, null, null, null, null, null, null, SchemaBuilder.int8().build(), SchemaBuilder.int16().build()); -- To stop receiving notification emails like this one, please contact ewencp@apache.org.