Skip to content

Commit 196ea6b

Browse files
pivovaritmaibin
authored andcommitted
Refactor Tokenizer (eugenp#1605)
1 parent e7d81e6 commit 196ea6b

1 file changed

Lines changed: 38 additions & 38 deletions

File tree

core-java/src/main/java/com/baeldung/stringtokenizer/Application.java

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -7,46 +7,46 @@
77
import java.util.Collections;
88
import java.util.List;
99
import java.util.StringTokenizer;
10+
import java.util.stream.Collectors;
1011

1112
public class Application {
1213

13-
public List<String> getTokens(String str) {
14-
List<String> tokens = new ArrayList<String>();
15-
// StringTokenizer tokenizer = new StringTokenizer( str );
16-
StringTokenizer tokenizer = new StringTokenizer(str, ",");
17-
// StringTokenizer tokenizer = new StringTokenizer( str , "," , true );
18-
while (tokenizer.hasMoreElements()) {
19-
tokens.add(tokenizer.nextToken());
20-
// tokens.add( tokenizer.nextToken("e") );
21-
}
22-
int tokenLength = tokens.size();
23-
return tokens;
24-
}
25-
26-
public List<String> getTokensWithCollection( String str ) {
27-
StringTokenizer tokenizer = new StringTokenizer(str, ",");
28-
List<String> tokens = new ArrayList<String>();
29-
Collections.list(tokenizer).forEach(token -> tokens.add((String) token));
30-
return tokens;
31-
}
32-
33-
public List<String> getTokensFromFile(String path, String delim) {
34-
List<String> tokens = new ArrayList<String>();
35-
String currLine = "";
36-
StringTokenizer tokenizer;
37-
try (BufferedReader br = new BufferedReader(
38-
new InputStreamReader(Application.class.getResourceAsStream("/" + path)))) {
39-
while ((currLine = br.readLine()) != null) {
40-
tokenizer = new StringTokenizer(currLine, delim);
41-
while (tokenizer.hasMoreElements()) {
42-
tokens.add(tokenizer.nextToken());
43-
}
44-
}
45-
} catch (IOException e) {
46-
e.printStackTrace();
47-
}
48-
return tokens;
49-
}
50-
14+
public List<String> getTokens(String str) {
15+
List<String> tokens = new ArrayList<String>();
16+
// StringTokenizer tokenizer = new StringTokenizer( str );
17+
StringTokenizer tokenizer = new StringTokenizer(str, ",");
18+
// StringTokenizer tokenizer = new StringTokenizer( str , "," , true );
19+
while (tokenizer.hasMoreElements()) {
20+
tokens.add(tokenizer.nextToken());
21+
// tokens.add( tokenizer.nextToken("e") );
22+
}
23+
int tokenLength = tokens.size();
24+
return tokens;
25+
}
26+
27+
public List<String> getTokensWithCollection(String str) {
28+
StringTokenizer tokenizer = new StringTokenizer(str, ",");
29+
30+
return Collections.list(tokenizer).stream()
31+
.map(token -> (String) token)
32+
.collect(Collectors.toList());
33+
}
34+
35+
public List<String> getTokensFromFile(String path, String delim) {
36+
List<String> tokens = new ArrayList<>();
37+
String currLine = "";
38+
StringTokenizer tokenizer;
39+
try (BufferedReader br = new BufferedReader(new InputStreamReader(Application.class.getResourceAsStream("/" + path)))) {
40+
while ((currLine = br.readLine()) != null) {
41+
tokenizer = new StringTokenizer(currLine, delim);
42+
while (tokenizer.hasMoreElements()) {
43+
tokens.add(tokenizer.nextToken());
44+
}
45+
}
46+
} catch (IOException e) {
47+
e.printStackTrace();
48+
}
49+
return tokens;
50+
}
5151

5252
}

0 commit comments

Comments
 (0)