Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id C735A200AE4 for ; Fri, 24 Jun 2016 23:16:57 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id C5B5C160A58; Fri, 24 Jun 2016 21:16:57 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 1B7B6160A2E for ; Fri, 24 Jun 2016 23:16:56 +0200 (CEST) Received: (qmail 48436 invoked by uid 500); 24 Jun 2016 21:16:56 -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 48426 invoked by uid 99); 24 Jun 2016 21:16:56 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 24 Jun 2016 21:16:56 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id CBA6EE049D; Fri, 24 Jun 2016 21:16:55 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ewencp@apache.org To: commits@kafka.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: kafka git commit: MINOR: fix grammatical errors in DataException message Date: Fri, 24 Jun 2016 21:16:55 +0000 (UTC) archived-at: Fri, 24 Jun 2016 21:16:58 -0000 Repository: kafka Updated Branches: refs/heads/trunk 88924b03d -> 54f9a7012 MINOR: fix grammatical errors in DataException message Was just reading kafka source code, my favourite Friday afternoon activity, when I found these small grammatical errors in some `DataException` messages. Could someone please review? ewencp dguy Author: Laurier Mantel Reviewers: Ismael Juma , Ewen Cheslack-Postava Closes #1551 from LaurierMantel/maps-typos Project: http://git-wip-us.apache.org/repos/asf/kafka/repo Commit: http://git-wip-us.apache.org/repos/asf/kafka/commit/54f9a701 Tree: http://git-wip-us.apache.org/repos/asf/kafka/tree/54f9a701 Diff: http://git-wip-us.apache.org/repos/asf/kafka/diff/54f9a701 Branch: refs/heads/trunk Commit: 54f9a7012c05f3e2993463727d7e199e8589e68e Parents: 88924b0 Author: Laurier Mantel Authored: Fri Jun 24 14:16:50 2016 -0700 Committer: Ewen Cheslack-Postava Committed: Fri Jun 24 14:16:50 2016 -0700 ---------------------------------------------------------------------- .../main/java/org/apache/kafka/connect/json/JsonConverter.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kafka/blob/54f9a701/connect/json/src/main/java/org/apache/kafka/connect/json/JsonConverter.java ---------------------------------------------------------------------- diff --git a/connect/json/src/main/java/org/apache/kafka/connect/json/JsonConverter.java b/connect/json/src/main/java/org/apache/kafka/connect/json/JsonConverter.java index 59e653e..f6c778b 100644 --- a/connect/json/src/main/java/org/apache/kafka/connect/json/JsonConverter.java +++ b/connect/json/src/main/java/org/apache/kafka/connect/json/JsonConverter.java @@ -161,7 +161,7 @@ public class JsonConverter implements Converter { Map result = new HashMap<>(); if (schema == null || keySchema.type() == Schema.Type.STRING) { if (!value.isObject()) - throw new DataException("Map's with string fields should be encoded as JSON objects, but found " + value.getNodeType()); + throw new DataException("Maps with string fields should be encoded as JSON objects, but found " + value.getNodeType()); Iterator> fieldIt = value.fields(); while (fieldIt.hasNext()) { Map.Entry entry = fieldIt.next(); @@ -169,7 +169,7 @@ public class JsonConverter implements Converter { } } else { if (!value.isArray()) - throw new DataException("Map's with non-string fields should be encoded as JSON array of tuples, but found " + value.getNodeType()); + throw new DataException("Maps with non-string fields should be encoded as JSON array of tuples, but found " + value.getNodeType()); for (JsonNode entry : value) { if (!entry.isArray()) throw new DataException("Found invalid map entry instead of array tuple: " + entry.getNodeType());