From f1e3ceaea75f6b5e6efcd2517523baa48b8ccfa8 Mon Sep 17 00:00:00 2001 From: mherbaghinyan Date: Wed, 9 Jan 2019 12:21:43 +0400 Subject: [PATCH 01/14] text searching Aho-Corasick algorithm --- java-strings/pom.xml | 6 +++ .../java/com/baeldung/string/MatchWords.java | 48 +++++++++++++++++++ 2 files changed, 54 insertions(+) create mode 100644 java-strings/src/main/java/com/baeldung/string/MatchWords.java diff --git a/java-strings/pom.xml b/java-strings/pom.xml index f4fb1c0865..9f89ed6d76 100755 --- a/java-strings/pom.xml +++ b/java-strings/pom.xml @@ -95,6 +95,12 @@ 1.4 + + org.ahocorasick + ahocorasick + 0.4.0 + + diff --git a/java-strings/src/main/java/com/baeldung/string/MatchWords.java b/java-strings/src/main/java/com/baeldung/string/MatchWords.java new file mode 100644 index 0000000000..ec926d99c4 --- /dev/null +++ b/java-strings/src/main/java/com/baeldung/string/MatchWords.java @@ -0,0 +1,48 @@ +package com.baeldung.string; + +import org.ahocorasick.trie.Emit; +import org.ahocorasick.trie.Trie; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.regex.Pattern; + +public class MatchWords { + + // *778*1# *778*00# + public static void main(String[] args) { + String[] items = {"hello", "Baeldung"}; + String inputString = "hello there, Baeldung"; + + boolean isMatch = java8(inputString, new ArrayList<>(Arrays.asList(items))); + + System.out.println(isMatch); + + System.out.println(patternMatch(inputString)); + + ahoCorasick(); + } + + private static void ahoCorasick() { + Trie trie = Trie.builder() + .onlyWholeWords() + .addKeyword("hello") + .addKeyword("Baeldung") + .build(); + Collection emits = trie.parseText("hello there, Baeldung"); + emits.forEach(System.out::println); + } + + private static boolean patternMatch(String inputString) { + Pattern pattern = Pattern.compile("(?=.*hello)(?=.*Baeldung)"); + if (pattern.matcher(inputString).find()) { + return true; + } + return false; + } + + private static boolean java8(String inputString, ArrayList items) { + return Arrays.stream(inputString.split(" ")).allMatch(items::contains); + } +} From 1861e9b94ccadeaed1dd796c5e55bddfbe28607f Mon Sep 17 00:00:00 2001 From: mherbaghinyan Date: Wed, 9 Jan 2019 16:16:48 +0400 Subject: [PATCH 02/14] match words --- .../java/com/baeldung/string/MatchWords.java | 29 ++++++++++++++----- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/java-strings/src/main/java/com/baeldung/string/MatchWords.java b/java-strings/src/main/java/com/baeldung/string/MatchWords.java index ec926d99c4..0cdb4cde6a 100644 --- a/java-strings/src/main/java/com/baeldung/string/MatchWords.java +++ b/java-strings/src/main/java/com/baeldung/string/MatchWords.java @@ -10,18 +10,28 @@ import java.util.regex.Pattern; public class MatchWords { - // *778*1# *778*00# public static void main(String[] args) { String[] items = {"hello", "Baeldung"}; String inputString = "hello there, Baeldung"; - boolean isMatch = java8(inputString, new ArrayList<>(Arrays.asList(items))); + //System.out.println(containsWords(inputString, items)); - System.out.println(isMatch); + System.out.println(java8(new ArrayList<>(Arrays.asList(inputString.split(" "))), new ArrayList<>(Arrays.asList(items)))); - System.out.println(patternMatch(inputString)); + //System.out.println(patternMatch(inputString)); - ahoCorasick(); + //ahoCorasick(); + } + + private static boolean containsWords(String inputString, String[] items) { + boolean found = true; + for (String item : items) { + if (!inputString.contains(item)) { + found = false; + break; + } + } + return found; } private static void ahoCorasick() { @@ -42,7 +52,12 @@ public class MatchWords { return false; } - private static boolean java8(String inputString, ArrayList items) { - return Arrays.stream(inputString.split(" ")).allMatch(items::contains); + private static boolean java8(ArrayList inputString, ArrayList items) { + return items.stream().allMatch(inputString::contains); } + + private static boolean array(ArrayList inputString, ArrayList items) { + return inputString.containsAll(items); + } + } From d413ec768f99a2967075f2dff2d6e456dd7b629c Mon Sep 17 00:00:00 2001 From: mherbaghinyan Date: Wed, 9 Jan 2019 16:18:32 +0400 Subject: [PATCH 03/14] match words final --- .../src/main/java/com/baeldung/string/MatchWords.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/java-strings/src/main/java/com/baeldung/string/MatchWords.java b/java-strings/src/main/java/com/baeldung/string/MatchWords.java index 0cdb4cde6a..6e6acb24cf 100644 --- a/java-strings/src/main/java/com/baeldung/string/MatchWords.java +++ b/java-strings/src/main/java/com/baeldung/string/MatchWords.java @@ -14,13 +14,13 @@ public class MatchWords { String[] items = {"hello", "Baeldung"}; String inputString = "hello there, Baeldung"; - //System.out.println(containsWords(inputString, items)); + System.out.println(containsWords(inputString, items)); System.out.println(java8(new ArrayList<>(Arrays.asList(inputString.split(" "))), new ArrayList<>(Arrays.asList(items)))); - //System.out.println(patternMatch(inputString)); + System.out.println(patternMatch(inputString)); - //ahoCorasick(); + ahoCorasick(); } private static boolean containsWords(String inputString, String[] items) { From 9e9458ea5f000131a76c9105666b77f0c3454fc7 Mon Sep 17 00:00:00 2001 From: mherbaghinyan Date: Wed, 9 Jan 2019 17:17:35 +0400 Subject: [PATCH 04/14] indexOf example --- .../java/com/baeldung/string/MatchWords.java | 23 ++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/java-strings/src/main/java/com/baeldung/string/MatchWords.java b/java-strings/src/main/java/com/baeldung/string/MatchWords.java index 6e6acb24cf..c0f89b635d 100644 --- a/java-strings/src/main/java/com/baeldung/string/MatchWords.java +++ b/java-strings/src/main/java/com/baeldung/string/MatchWords.java @@ -3,9 +3,7 @@ package com.baeldung.string; import org.ahocorasick.trie.Emit; import org.ahocorasick.trie.Trie; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; +import java.util.*; import java.util.regex.Pattern; public class MatchWords { @@ -21,6 +19,25 @@ public class MatchWords { System.out.println(patternMatch(inputString)); ahoCorasick(); + + wordIndices(inputString); + } + + private static void wordIndices(String inputString) { + Map wordIndices = new TreeMap<>(); + List words = new ArrayList<>(); + words.add("hello"); + words.add("Baeldung"); + + for (String word : words) { + int index = inputString.indexOf(word); + + if (index != -1) { + wordIndices.put(index, word); + } + } + + wordIndices.keySet().forEach(System.out::println); } private static boolean containsWords(String inputString, String[] items) { From ea5039f1a197156e9cb4686f6bd42e9659044e56 Mon Sep 17 00:00:00 2001 From: mherbaghinyan Date: Fri, 11 Jan 2019 15:05:34 +0400 Subject: [PATCH 05/14] indexOf changed example --- .../java/com/baeldung/string/MatchWords.java | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/java-strings/src/main/java/com/baeldung/string/MatchWords.java b/java-strings/src/main/java/com/baeldung/string/MatchWords.java index c0f89b635d..f0b64c19cf 100644 --- a/java-strings/src/main/java/com/baeldung/string/MatchWords.java +++ b/java-strings/src/main/java/com/baeldung/string/MatchWords.java @@ -20,24 +20,19 @@ public class MatchWords { ahoCorasick(); - wordIndices(inputString); + indexOfWords(inputString, items); } - private static void wordIndices(String inputString) { - Map wordIndices = new TreeMap<>(); - List words = new ArrayList<>(); - words.add("hello"); - words.add("Baeldung"); - + private static boolean indexOfWords(String inputString, String[] words) { + boolean found = true; for (String word : words) { int index = inputString.indexOf(word); - - if (index != -1) { - wordIndices.put(index, word); + if (index == -1) { + found = false; + break; } } - - wordIndices.keySet().forEach(System.out::println); + return found; } private static boolean containsWords(String inputString, String[] items) { From 16bed6f64b2a55fa36568119a92c3593345b00d1 Mon Sep 17 00:00:00 2001 From: mherbaghinyan Date: Sun, 13 Jan 2019 10:42:18 +0400 Subject: [PATCH 06/14] match words refactoring --- .../java/com/baeldung/string/MatchWords.java | 37 ++++++++++--------- 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/java-strings/src/main/java/com/baeldung/string/MatchWords.java b/java-strings/src/main/java/com/baeldung/string/MatchWords.java index f0b64c19cf..f4a52ae308 100644 --- a/java-strings/src/main/java/com/baeldung/string/MatchWords.java +++ b/java-strings/src/main/java/com/baeldung/string/MatchWords.java @@ -9,21 +9,21 @@ import java.util.regex.Pattern; public class MatchWords { public static void main(String[] args) { - String[] items = {"hello", "Baeldung"}; + String[] words = {"hello", "Baeldung"}; String inputString = "hello there, Baeldung"; - System.out.println(containsWords(inputString, items)); + containsWords(inputString, words); - System.out.println(java8(new ArrayList<>(Arrays.asList(inputString.split(" "))), new ArrayList<>(Arrays.asList(items)))); + containsWordsJava8(new ArrayList<>(Arrays.asList(inputString.split(" "))), new ArrayList<>(Arrays.asList(words))); - System.out.println(patternMatch(inputString)); + containsWordsPatternMatch(inputString, words); - ahoCorasick(); + containsWordsAhoCorasick(inputString, words); - indexOfWords(inputString, items); + containsWordsIndexOf(inputString, words); } - private static boolean indexOfWords(String inputString, String[] words) { + private static boolean containsWordsIndexOf(String inputString, String[] words) { boolean found = true; for (String word : words) { int index = inputString.indexOf(word); @@ -46,30 +46,31 @@ public class MatchWords { return found; } - private static void ahoCorasick() { + private static boolean containsWordsAhoCorasick(String inputString, String[] words) { Trie trie = Trie.builder() .onlyWholeWords() - .addKeyword("hello") - .addKeyword("Baeldung") + .addKeyword(words[0]) + .addKeyword(words[1]) .build(); - Collection emits = trie.parseText("hello there, Baeldung"); - emits.forEach(System.out::println); + Collection emits = trie.parseText(inputString); + + return emits.size() == words.length; } - private static boolean patternMatch(String inputString) { - Pattern pattern = Pattern.compile("(?=.*hello)(?=.*Baeldung)"); + private static boolean containsWordsPatternMatch(String inputString, String[] words) { + Pattern pattern = Pattern.compile("(?=.*words[0])(?=.*words[1])"); if (pattern.matcher(inputString).find()) { return true; } return false; } - private static boolean java8(ArrayList inputString, ArrayList items) { - return items.stream().allMatch(inputString::contains); + private static boolean containsWordsJava8(ArrayList inputString, ArrayList words) { + return words.stream().allMatch(inputString::contains); } - private static boolean array(ArrayList inputString, ArrayList items) { - return inputString.containsAll(items); + private static boolean containsWordsArray(ArrayList inputString, ArrayList words) { + return inputString.containsAll(words); } } From 06ffe3b5e42581d28e582d68ebf35f2403789954 Mon Sep 17 00:00:00 2001 From: mherbaghinyan Date: Sun, 13 Jan 2019 11:04:42 +0400 Subject: [PATCH 07/14] match words final refactor --- .../main/java/com/baeldung/string/MatchWords.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/java-strings/src/main/java/com/baeldung/string/MatchWords.java b/java-strings/src/main/java/com/baeldung/string/MatchWords.java index f4a52ae308..675f4577c3 100644 --- a/java-strings/src/main/java/com/baeldung/string/MatchWords.java +++ b/java-strings/src/main/java/com/baeldung/string/MatchWords.java @@ -4,7 +4,10 @@ import org.ahocorasick.trie.Emit; import org.ahocorasick.trie.Trie; import java.util.*; +import java.util.function.Function; import java.util.regex.Pattern; +import java.util.stream.Collectors; +import java.util.stream.Stream; public class MatchWords { @@ -51,14 +54,17 @@ public class MatchWords { .onlyWholeWords() .addKeyword(words[0]) .addKeyword(words[1]) + .ignoreOverlaps() .build(); - Collection emits = trie.parseText(inputString); - + Collection emits = trie.parseText(inputString) + .stream() + .filter(e -> !Objects.equals(e.getKeyword(), e.getKeyword())) + .collect(Collectors.toList()); return emits.size() == words.length; } private static boolean containsWordsPatternMatch(String inputString, String[] words) { - Pattern pattern = Pattern.compile("(?=.*words[0])(?=.*words[1])"); + Pattern pattern = Pattern.compile("(?=.*hello)(?=.*Baeldung)"); if (pattern.matcher(inputString).find()) { return true; } From 04c6cd1215be367f43652a6e771f4bf8eba0032e Mon Sep 17 00:00:00 2001 From: mherbaghinyan Date: Sun, 13 Jan 2019 11:35:54 +0400 Subject: [PATCH 08/14] replace hardcoded strings --- .../src/main/java/com/baeldung/string/MatchWords.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/java-strings/src/main/java/com/baeldung/string/MatchWords.java b/java-strings/src/main/java/com/baeldung/string/MatchWords.java index 675f4577c3..0b803da0ae 100644 --- a/java-strings/src/main/java/com/baeldung/string/MatchWords.java +++ b/java-strings/src/main/java/com/baeldung/string/MatchWords.java @@ -56,15 +56,20 @@ public class MatchWords { .addKeyword(words[1]) .ignoreOverlaps() .build(); + Collection emits = trie.parseText(inputString) .stream() .filter(e -> !Objects.equals(e.getKeyword(), e.getKeyword())) .collect(Collectors.toList()); + + emits.forEach(System.out::println); + return emits.size() == words.length; } private static boolean containsWordsPatternMatch(String inputString, String[] words) { - Pattern pattern = Pattern.compile("(?=.*hello)(?=.*Baeldung)"); + + Pattern pattern = Pattern.compile("(?=.*" + words[0] + ")(?=.*" + words[1] + ")"); if (pattern.matcher(inputString).find()) { return true; } From c9275edf90db9fc2c8d22ce7dd6f1f7780401605 Mon Sep 17 00:00:00 2001 From: mherbaghinyan Date: Mon, 14 Jan 2019 11:53:53 +0400 Subject: [PATCH 09/14] matching for all keywords --- .../java/com/baeldung/string/MatchWords.java | 51 +++++++++++++------ 1 file changed, 36 insertions(+), 15 deletions(-) diff --git a/java-strings/src/main/java/com/baeldung/string/MatchWords.java b/java-strings/src/main/java/com/baeldung/string/MatchWords.java index 0b803da0ae..9374ef84a2 100644 --- a/java-strings/src/main/java/com/baeldung/string/MatchWords.java +++ b/java-strings/src/main/java/com/baeldung/string/MatchWords.java @@ -1,6 +1,7 @@ package com.baeldung.string; import org.ahocorasick.trie.Emit; +import org.ahocorasick.trie.Token; import org.ahocorasick.trie.Trie; import java.util.*; @@ -17,7 +18,7 @@ public class MatchWords { containsWords(inputString, words); - containsWordsJava8(new ArrayList<>(Arrays.asList(inputString.split(" "))), new ArrayList<>(Arrays.asList(words))); + containsWordsJava8(inputString, words); containsWordsPatternMatch(inputString, words); @@ -52,36 +53,56 @@ public class MatchWords { private static boolean containsWordsAhoCorasick(String inputString, String[] words) { Trie trie = Trie.builder() .onlyWholeWords() - .addKeyword(words[0]) - .addKeyword(words[1]) - .ignoreOverlaps() + .addKeywords(words) .build(); - Collection emits = trie.parseText(inputString) - .stream() - .filter(e -> !Objects.equals(e.getKeyword(), e.getKeyword())) - .collect(Collectors.toList()); - + Collection emits = trie.parseText(inputString); emits.forEach(System.out::println); - return emits.size() == words.length; + boolean found = true; + for(String word : words) { + boolean contains = Arrays.toString(emits.toArray()).contains(word); + if (!contains) { + found = false; + break; + } + } + + return found; } private static boolean containsWordsPatternMatch(String inputString, String[] words) { - Pattern pattern = Pattern.compile("(?=.*" + words[0] + ")(?=.*" + words[1] + ")"); + StringBuilder regexp = new StringBuilder(); + for (String word : words) { + regexp.append("(?=.*").append(word).append(")"); + } + Pattern pattern = Pattern.compile(regexp.toString()); if (pattern.matcher(inputString).find()) { return true; } return false; } - private static boolean containsWordsJava8(ArrayList inputString, ArrayList words) { - return words.stream().allMatch(inputString::contains); + private static boolean containsWordsJava8(String inputString, String[] words) { + ArrayList inputStringList = new ArrayList<>(Arrays.asList(inputString.split(" "))); + ArrayList wordsList = new ArrayList<>(Arrays.asList(words)); + + return wordsList.stream().allMatch(inputStringList::contains); } - private static boolean containsWordsArray(ArrayList inputString, ArrayList words) { - return inputString.containsAll(words); + private static boolean containsWordsArray(String inputString, String[] words) { + ArrayList inputStringList = new ArrayList<>(Arrays.asList(inputString.split(" "))); + ArrayList wordsList = new ArrayList<>(Arrays.asList(words)); + + return inputStringList.containsAll(wordsList); + } + + private static boolean containsAnyWord(String inputString, String[] words) { + ArrayList inputStringList = new ArrayList<>(Arrays.asList(inputString.split(" "))); + ArrayList wordsList = new ArrayList<>(Arrays.asList(words)); + + return inputStringList.contains(wordsList); } } From aa125c6c6b4820fd5c2e058071ab169e345e533e Mon Sep 17 00:00:00 2001 From: mherbaghinyan Date: Mon, 14 Jan 2019 11:58:31 +0400 Subject: [PATCH 10/14] remove unnecessary method --- .../src/main/java/com/baeldung/string/MatchWords.java | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/java-strings/src/main/java/com/baeldung/string/MatchWords.java b/java-strings/src/main/java/com/baeldung/string/MatchWords.java index 9374ef84a2..647b60af9a 100644 --- a/java-strings/src/main/java/com/baeldung/string/MatchWords.java +++ b/java-strings/src/main/java/com/baeldung/string/MatchWords.java @@ -77,6 +77,7 @@ public class MatchWords { for (String word : words) { regexp.append("(?=.*").append(word).append(")"); } + Pattern pattern = Pattern.compile(regexp.toString()); if (pattern.matcher(inputString).find()) { return true; @@ -97,12 +98,4 @@ public class MatchWords { return inputStringList.containsAll(wordsList); } - - private static boolean containsAnyWord(String inputString, String[] words) { - ArrayList inputStringList = new ArrayList<>(Arrays.asList(inputString.split(" "))); - ArrayList wordsList = new ArrayList<>(Arrays.asList(words)); - - return inputStringList.contains(wordsList); - } - } From 9f798d483d03f07d179dd5542101af8eaa1fd9ef Mon Sep 17 00:00:00 2001 From: mherbaghinyan Date: Wed, 16 Jan 2019 13:18:04 +0400 Subject: [PATCH 11/14] test the methods with Unit test --- .../java/com/baeldung/string/MatchWords.java | 27 ++------- .../baeldung/string/MatchWordsUnitTest.java | 59 +++++++++++++++++++ 2 files changed, 65 insertions(+), 21 deletions(-) create mode 100644 java-strings/src/test/java/com/baeldung/string/MatchWordsUnitTest.java diff --git a/java-strings/src/main/java/com/baeldung/string/MatchWords.java b/java-strings/src/main/java/com/baeldung/string/MatchWords.java index 647b60af9a..d322d192fa 100644 --- a/java-strings/src/main/java/com/baeldung/string/MatchWords.java +++ b/java-strings/src/main/java/com/baeldung/string/MatchWords.java @@ -12,22 +12,7 @@ import java.util.stream.Stream; public class MatchWords { - public static void main(String[] args) { - String[] words = {"hello", "Baeldung"}; - String inputString = "hello there, Baeldung"; - - containsWords(inputString, words); - - containsWordsJava8(inputString, words); - - containsWordsPatternMatch(inputString, words); - - containsWordsAhoCorasick(inputString, words); - - containsWordsIndexOf(inputString, words); - } - - private static boolean containsWordsIndexOf(String inputString, String[] words) { + public static boolean containsWordsIndexOf(String inputString, String[] words) { boolean found = true; for (String word : words) { int index = inputString.indexOf(word); @@ -39,7 +24,7 @@ public class MatchWords { return found; } - private static boolean containsWords(String inputString, String[] items) { + public static boolean containsWords(String inputString, String[] items) { boolean found = true; for (String item : items) { if (!inputString.contains(item)) { @@ -50,7 +35,7 @@ public class MatchWords { return found; } - private static boolean containsWordsAhoCorasick(String inputString, String[] words) { + public static boolean containsWordsAhoCorasick(String inputString, String[] words) { Trie trie = Trie.builder() .onlyWholeWords() .addKeywords(words) @@ -71,7 +56,7 @@ public class MatchWords { return found; } - private static boolean containsWordsPatternMatch(String inputString, String[] words) { + public static boolean containsWordsPatternMatch(String inputString, String[] words) { StringBuilder regexp = new StringBuilder(); for (String word : words) { @@ -85,14 +70,14 @@ public class MatchWords { return false; } - private static boolean containsWordsJava8(String inputString, String[] words) { + public static boolean containsWordsJava8(String inputString, String[] words) { ArrayList inputStringList = new ArrayList<>(Arrays.asList(inputString.split(" "))); ArrayList wordsList = new ArrayList<>(Arrays.asList(words)); return wordsList.stream().allMatch(inputStringList::contains); } - private static boolean containsWordsArray(String inputString, String[] words) { + public static boolean containsWordsArray(String inputString, String[] words) { ArrayList inputStringList = new ArrayList<>(Arrays.asList(inputString.split(" "))); ArrayList wordsList = new ArrayList<>(Arrays.asList(words)); diff --git a/java-strings/src/test/java/com/baeldung/string/MatchWordsUnitTest.java b/java-strings/src/test/java/com/baeldung/string/MatchWordsUnitTest.java new file mode 100644 index 0000000000..0b25a265b3 --- /dev/null +++ b/java-strings/src/test/java/com/baeldung/string/MatchWordsUnitTest.java @@ -0,0 +1,59 @@ +package com.baeldung.string; + +import org.junit.Test; + +import static org.assertj.core.api.Assertions.assertThat; + +public class MatchWordsUnitTest { + + private final String[] words = {"hello", "Baeldung"}; + private final String inputString = "hello there, Baeldung"; + + @Test + public void givenText_whenCallingStringContains_shouldMatchWords() { + + final boolean result = MatchWords.containsWords(inputString, words); + + assertThat(result).isEqualTo(true); + } + + @Test + public void givenText_whenCallingJava8_shouldMatchWords() { + + final boolean result = MatchWords.containsWordsJava8(inputString, words); + + assertThat(result).isEqualTo(true); + } + + @Test + public void givenText_whenCallingPattern_shouldMatchWords() { + + final boolean result = MatchWords.containsWordsPatternMatch(inputString, words); + + assertThat(result).isEqualTo(true); + } + + @Test + public void givenText_whenCallingAhoCorasick_shouldMatchWords() { + + final boolean result = MatchWords.containsWordsAhoCorasick(inputString, words); + + assertThat(result).isEqualTo(true); + } + + @Test + public void givenText_whenCallingIndexOf_shouldMatchWords() { + + final boolean result = MatchWords.containsWordsIndexOf(inputString, words); + + assertThat(result).isEqualTo(true); + } + + @Test + public void givenText_whenCallingArrayList_shouldMatchWords() { + + final boolean result = MatchWords.containsWordsArray(inputString, words); + + assertThat(result).isEqualTo(true); + } +} From 5c1a0a06292115d99e24493ca1d69e32414e09b6 Mon Sep 17 00:00:00 2001 From: mherbaghinyan Date: Mon, 21 Jan 2019 09:57:15 +0400 Subject: [PATCH 12/14] change the ArrayList into List --- .../src/main/java/com/baeldung/string/MatchWords.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/java-strings/src/main/java/com/baeldung/string/MatchWords.java b/java-strings/src/main/java/com/baeldung/string/MatchWords.java index d322d192fa..4baaa49227 100644 --- a/java-strings/src/main/java/com/baeldung/string/MatchWords.java +++ b/java-strings/src/main/java/com/baeldung/string/MatchWords.java @@ -71,15 +71,15 @@ public class MatchWords { } public static boolean containsWordsJava8(String inputString, String[] words) { - ArrayList inputStringList = new ArrayList<>(Arrays.asList(inputString.split(" "))); - ArrayList wordsList = new ArrayList<>(Arrays.asList(words)); + List inputStringList = Arrays.asList(inputString.split(" ")); + List wordsList = Arrays.asList(words); return wordsList.stream().allMatch(inputStringList::contains); } public static boolean containsWordsArray(String inputString, String[] words) { - ArrayList inputStringList = new ArrayList<>(Arrays.asList(inputString.split(" "))); - ArrayList wordsList = new ArrayList<>(Arrays.asList(words)); + List inputStringList = Arrays.asList(inputString.split(" ")); + List wordsList = Arrays.asList(words); return inputStringList.containsAll(wordsList); } From 8c18214c558dc21ca0f956d50ad0587c19be1362 Mon Sep 17 00:00:00 2001 From: mherbaghinyan Date: Wed, 23 Jan 2019 09:44:05 +0400 Subject: [PATCH 13/14] more unit tests --- .../baeldung/string/MatchWordsUnitTest.java | 31 ++++++++++++------- 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/java-strings/src/test/java/com/baeldung/string/MatchWordsUnitTest.java b/java-strings/src/test/java/com/baeldung/string/MatchWordsUnitTest.java index 0b25a265b3..1c2288068b 100644 --- a/java-strings/src/test/java/com/baeldung/string/MatchWordsUnitTest.java +++ b/java-strings/src/test/java/com/baeldung/string/MatchWordsUnitTest.java @@ -8,52 +8,59 @@ public class MatchWordsUnitTest { private final String[] words = {"hello", "Baeldung"}; private final String inputString = "hello there, Baeldung"; + private final String wholeInput = "helloBaeldung"; @Test public void givenText_whenCallingStringContains_shouldMatchWords() { - final boolean result = MatchWords.containsWords(inputString, words); - assertThat(result).isEqualTo(true); } @Test public void givenText_whenCallingJava8_shouldMatchWords() { - final boolean result = MatchWords.containsWordsJava8(inputString, words); - assertThat(result).isEqualTo(true); } + @Test + public void givenText_whenCallingJava8_shouldNotMatchWords() { + final boolean result = MatchWords.containsWordsJava8(wholeInput, words); + assertThat(result).isEqualTo(false); + } + @Test public void givenText_whenCallingPattern_shouldMatchWords() { - final boolean result = MatchWords.containsWordsPatternMatch(inputString, words); - assertThat(result).isEqualTo(true); } @Test public void givenText_whenCallingAhoCorasick_shouldMatchWords() { - final boolean result = MatchWords.containsWordsAhoCorasick(inputString, words); - assertThat(result).isEqualTo(true); } + @Test + public void givenText_whenCallingAhoCorasick_shouldNotMatchWords() { + final boolean result = MatchWords.containsWordsAhoCorasick(wholeInput, words); + assertThat(result).isEqualTo(false); + } + @Test public void givenText_whenCallingIndexOf_shouldMatchWords() { - final boolean result = MatchWords.containsWordsIndexOf(inputString, words); - assertThat(result).isEqualTo(true); } @Test public void givenText_whenCallingArrayList_shouldMatchWords() { - final boolean result = MatchWords.containsWordsArray(inputString, words); - assertThat(result).isEqualTo(true); } + + @Test + public void givenText_whenCallingArrayList_shouldNotMatchWords() { + final boolean result = MatchWords.containsWordsArray(wholeInput, words); + assertThat(result).isEqualTo(false); + } } From 2a308c51cb3c68635a1510190528fdbd168a51c1 Mon Sep 17 00:00:00 2001 From: mherbaghinyan Date: Sun, 27 Jan 2019 10:34:13 +0400 Subject: [PATCH 14/14] suggested refactor --- .../main/java/com/baeldung/string/MatchWords.java | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/java-strings/src/main/java/com/baeldung/string/MatchWords.java b/java-strings/src/main/java/com/baeldung/string/MatchWords.java index 4baaa49227..0cad52c320 100644 --- a/java-strings/src/main/java/com/baeldung/string/MatchWords.java +++ b/java-strings/src/main/java/com/baeldung/string/MatchWords.java @@ -15,8 +15,7 @@ public class MatchWords { public static boolean containsWordsIndexOf(String inputString, String[] words) { boolean found = true; for (String word : words) { - int index = inputString.indexOf(word); - if (index == -1) { + if (inputString.indexOf(word) == -1) { found = false; break; } @@ -64,21 +63,19 @@ public class MatchWords { } Pattern pattern = Pattern.compile(regexp.toString()); - if (pattern.matcher(inputString).find()) { - return true; - } - return false; + + return pattern.matcher(inputString).find(); } public static boolean containsWordsJava8(String inputString, String[] words) { - List inputStringList = Arrays.asList(inputString.split(" ")); + List inputStringList = Arrays.asList(inputString.split(" ")); List wordsList = Arrays.asList(words); return wordsList.stream().allMatch(inputStringList::contains); } public static boolean containsWordsArray(String inputString, String[] words) { - List inputStringList = Arrays.asList(inputString.split(" ")); + List inputStringList = Arrays.asList(inputString.split(" ")); List wordsList = Arrays.asList(words); return inputStringList.containsAll(wordsList);