From a5a508bd909294444a7c1a526760c4801243eccd Mon Sep 17 00:00:00 2001 From: Jonathan Cobb Date: Sat, 25 Jan 2020 22:27:15 -0500 Subject: [PATCH] use simpler RegexReplacementFilter constructor --- .../cobbzilla/util/io/regex/RegexReplacementFilter.java | 2 ++ .../cobbzilla/util/io/regex/RegexFilterReaderTest.java | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/cobbzilla/util/io/regex/RegexReplacementFilter.java b/src/main/java/org/cobbzilla/util/io/regex/RegexReplacementFilter.java index 7f62d7d..377eeca 100644 --- a/src/main/java/org/cobbzilla/util/io/regex/RegexReplacementFilter.java +++ b/src/main/java/org/cobbzilla/util/io/regex/RegexReplacementFilter.java @@ -21,6 +21,8 @@ public class RegexReplacementFilter implements RegexStreamFilter { this.replacement = replacement; } + public RegexReplacementFilter(String regex, String replacement) { this(regex, 0, replacement); } + @Override public void configure(JsonNode config) { this.pattern = Pattern.compile(config.get("pattern").textValue()); diff --git a/src/test/java/org/cobbzilla/util/io/regex/RegexFilterReaderTest.java b/src/test/java/org/cobbzilla/util/io/regex/RegexFilterReaderTest.java index 41338ac..590d67b 100644 --- a/src/test/java/org/cobbzilla/util/io/regex/RegexFilterReaderTest.java +++ b/src/test/java/org/cobbzilla/util/io/regex/RegexFilterReaderTest.java @@ -22,7 +22,7 @@ public class RegexFilterReaderTest { @Test public void testSimpleRegexReader() throws Exception { final Reader reader = new StringReader(TEST_STRING_1); - final RegexStreamFilter regexStreamFilter = new RegexReplacementFilter(" a ", 0, " X "); + final RegexStreamFilter regexStreamFilter = new RegexReplacementFilter(" a ", " X "); final RegexFilterReader regexFilterReader = new RegexFilterReader(reader, 1024, regexStreamFilter); final StringWriter result = new StringWriter(); IOUtils.copyLarge(regexFilterReader, result); @@ -31,7 +31,7 @@ public class RegexFilterReaderTest { @Test public void testSmallBufferRegexReader() throws Exception { final Reader reader = new StringReader(TEST_STRING_1); - final RegexStreamFilter regexStreamFilter = new RegexReplacementFilter(" a ", 0, " X "); + final RegexStreamFilter regexStreamFilter = new RegexReplacementFilter(" a ", " X "); final RegexFilterReader regexFilterReader = new RegexFilterReader(reader, 8, regexStreamFilter); final StringWriter result = new StringWriter(); IOUtils.copyLarge(regexFilterReader, result); @@ -53,7 +53,7 @@ public class RegexFilterReaderTest { final Reader reader3 = new StringReader(MULTI_TEST_STRING_3); final MultiReader multiReader = new MultiReader(reader1); - final RegexStreamFilter regexStreamFilter = new RegexReplacementFilter(" a ", 0, " X "); + final RegexStreamFilter regexStreamFilter = new RegexReplacementFilter(" a ", " X "); final RegexFilterReader regexFilterReader = new RegexFilterReader(multiReader, 8, regexStreamFilter); final StringWriter result = new StringWriter(); @@ -93,7 +93,7 @@ public class RegexFilterReaderTest { final Reader reader4 = new StringReader(MULTI2_TEST_STRING_4); final MultiReader multiReader = new MultiReader(reader1); - final RegexStreamFilter regexStreamFilter = new RegexReplacementFilter(" barbecue", 0, " BBQ"); + final RegexStreamFilter regexStreamFilter = new RegexReplacementFilter(" barbecue", " BBQ"); final RegexFilterReader regexFilterReader = new RegexFilterReader(multiReader, 8, regexStreamFilter); final StringWriter result = new StringWriter();