mindol1004/spring-boot-rest
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removing null checks as suggested by editor for BAEL-3083

Browse Source
This commit is contained in:
caroline
2019-09-23 14:44:51 +02:00
parent e479bea0b8
commit 48cc9a4409
2 changed files with 3 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core-java-modules/core-java-collections-list-2/src/main/java/com/baeldung/findastring/FindAStringInGivenList.java
View File

@@ -3,11 +3,8 @@ package com.baeldung.findastring;
import com.google.common.base.Predicates;
import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.collections4.IterableUtils;
import org.apache.commons.collections4.IteratorUtils;
import org.apache.commons.collections4.PredicateUtils;
import org.apache.commons.lang3.StringUtils;
import java.util.ArrayList;
import java.util.List;
import java.util.regex.Pattern;
@@ -38,7 +35,7 @@ public class FindAStringInGivenList {
List<String> matches = new ArrayList<String>();
for(String str: list) {
if (search != null && str.contains(search)) {
if (str.contains(search)) {
matches.add(str);
}
}
@@ -58,20 +55,15 @@ public class FindAStringInGivenList {
}
public List<String> findUsingGuava(String search, List<String> list) {
if (search == null) {
return Lists.newArrayList();
}
Iterable<String> result = Iterables.filter(Iterables.filter(list,Predicates.notNull()), Predicates.containsPattern(search));
Iterable<String> result = Iterables.filter(list, Predicates.containsPattern(search));
return Lists.newArrayList(result.iterator());
}
public List<String> findUsingCommonsCollection(String search, List<String> list) {
CollectionUtils.filter(list, PredicateUtils.notNullPredicate());
Iterable<String> result = IterableUtils.filteredIterable(list, new org.apache.commons.collections4.Predicate<String>() {
public boolean evaluate(String listElement) {
return search != null && StringUtils.isNotEmpty(listElement) ? listElement.contains(search) : false;
return listElement.contains(search);
}
});

31
core-java-modules/core-java-collections-list-2/src/test/java/com/baeldung/findastring/FindAStringInListUnitTest.java
View File

@@ -13,7 +13,6 @@ public class FindAStringInListUnitTest {
list.add("James and Sarah");
list.add("Sam and Louise");
list.add("Jack");
list.add(null);
list.add("");
}
@@ -27,12 +26,6 @@ public class FindAStringInListUnitTest {
assertEquals("Jack", matchingElements.get(1));
}
@Test
public void givenAString_whenNullFoundUsingLoopWithRegex_thenReturnEmptyList(){
List matchingElements = findAStringInGivenList.findUsingLoopWithRegex(null, list);
assertEquals(0, matchingElements.size());
}
@Test
public void givenAString_whenFoundUsingLoop_thenReturnList() {
List matchingElements = findAStringInGivenList.findUsingLoop("Jack", list);
@@ -41,12 +34,6 @@ public class FindAStringInListUnitTest {
assertEquals("Jack", matchingElements.get(1));
}
@Test
public void givenAString_whenNullFoundUsingLoop_thenReturnEmptyList(){
List matchingElements = findAStringInGivenList.findUsingLoop(null, list);
assertEquals(0, matchingElements.size());
}
@Test
public void givenAString_whenFoundUsingStream_thenReturnList(){
@@ -56,12 +43,6 @@ public class FindAStringInListUnitTest {
assertEquals("Jack", matchingElements.get(1));
}
@Test
public void givenAString_whenNullFoundUsingStream_thenReturnEmptyList(){
List matchingElements = findAStringInGivenList.findUsingStream(null, list);
assertEquals(0, matchingElements.size());
}
@Test
public void givenAString_whenFoundUsingCommonsCollection_thenReturnList(){
List matchingElements = findAStringInGivenList.findUsingCommonsCollection("Jack", list);
@@ -70,12 +51,6 @@ public class FindAStringInListUnitTest {
assertEquals("Jack", matchingElements.get(1));
}
@Test
public void givenAString_whenNullFoundUsingCommonsCollection_thenReturnEmptyList(){
List matchingElements = findAStringInGivenList.findUsingCommonsCollection(null, list);
assertEquals(0, matchingElements.size());
}
@Test
public void givenAString_whenFoundUsingGuava_thenReturnList(){
List matchingElements = findAStringInGivenList.findUsingGuava("Jack", list);
@@ -84,10 +59,4 @@ public class FindAStringInListUnitTest {
assertEquals("Jack", matchingElements.get(1));
}
@Test
public void givenAString_whenNullFoundUsingGuava_thenReturnEmptyList(){
List matchingElements = findAStringInGivenList.findUsingGuava(null, list);
assertEquals(0, matchingElements.size());
}
}