StringTokenizerTest refactor (#1611)

* TokenizerRefactor

* TokenizerRefactor

* TokenizerRefactor
This commit is contained in:
Grzegorz Piwowarek
2017-04-08 13:49:01 +02:00
committed by maibin
parent 13a42ea281
commit 60c2edaaeb
3 changed files with 36 additions and 54 deletions

View File

@@ -9,10 +9,10 @@ import java.util.List;
import java.util.StringTokenizer;
import java.util.stream.Collectors;
public class Application {
public class MyTokenizer {
public List<String> getTokens(String str) {
List<String> tokens = new ArrayList<String>();
List<String> tokens = new ArrayList<>();
// StringTokenizer tokenizer = new StringTokenizer( str );
StringTokenizer tokenizer = new StringTokenizer(str, ",");
// StringTokenizer tokenizer = new StringTokenizer( str , "," , true );
@@ -25,18 +25,18 @@ public class Application {
}
public List<String> getTokensWithCollection(String str) {
StringTokenizer tokenizer = new StringTokenizer(str, ",");
return Collections.list(tokenizer).stream()
return Collections
.list(new StringTokenizer(str, ","))
.stream()
.map(token -> (String) token)
.collect(Collectors.toList());
}
public List<String> getTokensFromFile(String path, String delim) {
List<String> tokens = new ArrayList<>();
String currLine = "";
String currLine;
StringTokenizer tokenizer;
try (BufferedReader br = new BufferedReader(new InputStreamReader(Application.class.getResourceAsStream("/" + path)))) {
try (BufferedReader br = new BufferedReader(new InputStreamReader(MyTokenizer.class.getResourceAsStream("/" + path)))) {
while ((currLine = br.readLine()) != null) {
tokenizer = new StringTokenizer(currLine, delim);
while (tokenizer.hasMoreElements()) {