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 57E4D200B6B for ; Thu, 25 Aug 2016 20:55:25 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 567E1160ABD; Thu, 25 Aug 2016 18:55:25 +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 566F2160AC6 for ; Thu, 25 Aug 2016 20:55:24 +0200 (CEST) Received: (qmail 46570 invoked by uid 500); 25 Aug 2016 18:55:23 -0000 Mailing-List: contact commits-help@beam.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@beam.incubator.apache.org Delivered-To: mailing list commits@beam.incubator.apache.org Received: (qmail 46557 invoked by uid 99); 25 Aug 2016 18:55:23 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 25 Aug 2016 18:55:23 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id 25178C18C0 for ; Thu, 25 Aug 2016 18:55:23 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -4.646 X-Spam-Level: X-Spam-Status: No, score=-4.646 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-1.426] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id HSDvueZe2D66 for ; Thu, 25 Aug 2016 18:55:21 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with SMTP id A38C960E3F for ; Thu, 25 Aug 2016 18:55:17 +0000 (UTC) Received: (qmail 42995 invoked by uid 99); 25 Aug 2016 18:55:16 -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; Thu, 25 Aug 2016 18:55:16 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 78401DFF8E; Thu, 25 Aug 2016 18:55:16 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: kenn@apache.org To: commits@beam.incubator.apache.org Date: Thu, 25 Aug 2016 18:55:44 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [30/50] incubator-beam git commit: [BEAM-401] Use StringBuilder in StandardCoder.toString() archived-at: Thu, 25 Aug 2016 18:55:25 -0000 [BEAM-401] Use StringBuilder in StandardCoder.toString() Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/743923b1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/743923b1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/743923b1 Branch: refs/heads/gearpump-runner Commit: 743923b1788eea0672db750362daf38a71ed7657 Parents: 388816a Author: Chandni Singh Authored: Thu Aug 4 12:00:41 2016 -0700 Committer: Kenneth Knowles Committed: Wed Aug 10 09:43:40 2016 -0700 ---------------------------------------------------------------------- .../src/main/resources/beam/findbugs-filter.xml | 6 ----- .../apache/beam/sdk/coders/StandardCoder.java | 14 ++++++----- .../beam/sdk/coders/StandardCoderTest.java | 25 ++++++++++++++++++++ 3 files changed, 33 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/743923b1/sdks/java/build-tools/src/main/resources/beam/findbugs-filter.xml ---------------------------------------------------------------------- diff --git a/sdks/java/build-tools/src/main/resources/beam/findbugs-filter.xml b/sdks/java/build-tools/src/main/resources/beam/findbugs-filter.xml index 28fd0df..7d8f110 100644 --- a/sdks/java/build-tools/src/main/resources/beam/findbugs-filter.xml +++ b/sdks/java/build-tools/src/main/resources/beam/findbugs-filter.xml @@ -42,12 +42,6 @@ - - - - - - http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/743923b1/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/StandardCoder.java ---------------------------------------------------------------------- diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/StandardCoder.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/StandardCoder.java index 423d482..8b7b788 100644 --- a/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/StandardCoder.java +++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/StandardCoder.java @@ -102,23 +102,25 @@ public abstract class StandardCoder implements Coder { @Override public String toString() { + StringBuilder builder = new StringBuilder(); String s = getClass().getName(); - s = s.substring(s.lastIndexOf('.') + 1); + builder.append(s.substring(s.lastIndexOf('.') + 1)); + List> componentCoders = getComponents(); if (!componentCoders.isEmpty()) { - s += "("; + builder.append('('); boolean first = true; for (Coder componentCoder : componentCoders) { if (first) { first = false; } else { - s += ", "; + builder.append(','); } - s += componentCoder.toString(); + builder.append(componentCoder.toString()); } - s += ")"; + builder.append(')'); } - return s; + return builder.toString(); } @Override http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/743923b1/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/StandardCoderTest.java ---------------------------------------------------------------------- diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/StandardCoderTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/StandardCoderTest.java index a3a0f45..1dc2210 100644 --- a/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/StandardCoderTest.java +++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/StandardCoderTest.java @@ -19,6 +19,10 @@ package org.apache.beam.sdk.coders; import org.apache.beam.sdk.testing.CoderProperties; +import com.google.common.collect.ImmutableList; + +import org.hamcrest.CoreMatchers; +import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; @@ -174,4 +178,25 @@ public class StandardCoderTest { } } } + + /** + * Test for verifying {@link StandardCoder#toString()}. + */ + @Test + public void testToString() { + Assert.assertThat(new ObjectIdentityBooleanCoder().toString(), + CoreMatchers.equalTo("StandardCoderTest$ObjectIdentityBooleanCoder")); + + ObjectIdentityBooleanCoder coderWithArgs = new ObjectIdentityBooleanCoder() { + @Override + public List> getCoderArguments() { + return ImmutableList.>builder() + .add(BigDecimalCoder.of(), BigIntegerCoder.of()) + .build(); + } + }; + + Assert.assertThat(coderWithArgs.toString(), + CoreMatchers.equalTo("StandardCoderTest$1(BigDecimalCoder,BigIntegerCoder)")); + } }