From 8716c41ab75116c94a6d504548e84b7a5846ccdc Mon Sep 17 00:00:00 2001 From: Tim Fox Date: Fri, 27 Sep 2019 16:03:19 +0100 Subject: [PATCH] fix: Rename Delimiter:parse(char c) to Delimiter.of(char c) (#3433) --- .../src/main/java/io/confluent/ksql/serde/Delimiter.java | 8 ++++---- .../test/java/io/confluent/ksql/serde/FormatInfoTest.java | 8 ++++---- .../ksql/serde/delimited/KsqlDelimitedSerdeFactory.java | 2 +- .../serde/delimited/KsqlDelimitedSerdeFactoryTest.java | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/ksql-common/src/main/java/io/confluent/ksql/serde/Delimiter.java b/ksql-common/src/main/java/io/confluent/ksql/serde/Delimiter.java index 565624ba7b2..ce51f1e17b8 100644 --- a/ksql-common/src/main/java/io/confluent/ksql/serde/Delimiter.java +++ b/ksql-common/src/main/java/io/confluent/ksql/serde/Delimiter.java @@ -35,14 +35,14 @@ public final class Delimiter { private final char delimiter; - public static Delimiter parse(final char ch) { - return new Delimiter(ch); - } - private Delimiter(final char delimiter) { this.delimiter = delimiter; } + public static Delimiter of(final char ch) { + return new Delimiter(ch); + } + public static Delimiter parse(final String str) { if (str == null) { throw new NullPointerException(); diff --git a/ksql-common/src/test/java/io/confluent/ksql/serde/FormatInfoTest.java b/ksql-common/src/test/java/io/confluent/ksql/serde/FormatInfoTest.java index 15a8586e0f5..134d5f48258 100644 --- a/ksql-common/src/test/java/io/confluent/ksql/serde/FormatInfoTest.java +++ b/ksql-common/src/test/java/io/confluent/ksql/serde/FormatInfoTest.java @@ -45,8 +45,8 @@ public void shouldThrowNPEs() { public void shouldImplementEquals() { new EqualsTester() .addEqualityGroup( - FormatInfo.of(Format.DELIMITED, Optional.empty(), Optional.of(Delimiter.parse('x'))), - FormatInfo.of(Format.DELIMITED, Optional.empty(), Optional.of(Delimiter.parse('x'))) + FormatInfo.of(Format.DELIMITED, Optional.empty(), Optional.of(Delimiter.of('x'))), + FormatInfo.of(Format.DELIMITED, Optional.empty(), Optional.of(Delimiter.of('x'))) ) .addEqualityGroup( FormatInfo.of(Format.AVRO, Optional.of("something"), Optional.empty()), @@ -130,7 +130,7 @@ public void shouldThrowWhenAttemptingToUseValueDelimeterWithAvroFormat() { expectedException.expectMessage("Delimeter only supported with DELIMITED format"); // When: - FormatInfo.of(Format.AVRO, Optional.of("something"), Optional.of(Delimiter.parse('x'))); + FormatInfo.of(Format.AVRO, Optional.of("something"), Optional.of(Delimiter.of('x'))); } @Test @@ -140,6 +140,6 @@ public void shouldThrowWhenAttemptingToUseValueDelimeterWithJsonFormat() { expectedException.expectMessage("Delimeter only supported with DELIMITED format"); // When: - FormatInfo.of(Format.JSON, Optional.empty(), Optional.of(Delimiter.parse('x'))); + FormatInfo.of(Format.JSON, Optional.empty(), Optional.of(Delimiter.of('x'))); } } \ No newline at end of file diff --git a/ksql-serde/src/main/java/io/confluent/ksql/serde/delimited/KsqlDelimitedSerdeFactory.java b/ksql-serde/src/main/java/io/confluent/ksql/serde/delimited/KsqlDelimitedSerdeFactory.java index 45250d9ff71..5310081e129 100644 --- a/ksql-serde/src/main/java/io/confluent/ksql/serde/delimited/KsqlDelimitedSerdeFactory.java +++ b/ksql-serde/src/main/java/io/confluent/ksql/serde/delimited/KsqlDelimitedSerdeFactory.java @@ -38,7 +38,7 @@ @Immutable public class KsqlDelimitedSerdeFactory implements KsqlSerdeFactory { - private static final Delimiter DEFAULT_DELIMITER = Delimiter.parse(','); + private static final Delimiter DEFAULT_DELIMITER = Delimiter.of(','); private final CSVFormat csvFormat; diff --git a/ksql-serde/src/test/java/io/confluent/ksql/serde/delimited/KsqlDelimitedSerdeFactoryTest.java b/ksql-serde/src/test/java/io/confluent/ksql/serde/delimited/KsqlDelimitedSerdeFactoryTest.java index 30cd2b96fa6..2f7dd99c59b 100644 --- a/ksql-serde/src/test/java/io/confluent/ksql/serde/delimited/KsqlDelimitedSerdeFactoryTest.java +++ b/ksql-serde/src/test/java/io/confluent/ksql/serde/delimited/KsqlDelimitedSerdeFactoryTest.java @@ -39,7 +39,7 @@ public class KsqlDelimitedSerdeFactoryTest { @Before public void setUp() { - factory = new KsqlDelimitedSerdeFactory(Optional.of(Delimiter.parse(','))); + factory = new KsqlDelimitedSerdeFactory(Optional.of(Delimiter.of(','))); } @Test