From 196ea6b5f77c554fd00a21a5cb5bde3607929dc2 Mon Sep 17 00:00:00 2001
From: Grzegorz Piwowarek <gpiwowarek@gmail.com>
Date: Fri, 7 Apr 2017 18:15:19 +0200
Subject: [PATCH] Refactor Tokenizer (#1605)

---
 .../baeldung/stringtokenizer/Application.java | 76 +++++++++----------
 1 file changed, 38 insertions(+), 38 deletions(-)

diff --git a/core-java/src/main/java/com/baeldung/stringtokenizer/Application.java b/core-java/src/main/java/com/baeldung/stringtokenizer/Application.java
index 3fc169f1f7..4560e40697 100644
--- a/core-java/src/main/java/com/baeldung/stringtokenizer/Application.java
+++ b/core-java/src/main/java/com/baeldung/stringtokenizer/Application.java
@@ -7,46 +7,46 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.StringTokenizer;
+import java.util.stream.Collectors;
 
 public class Application {
 
-	public List<String> getTokens(String str) {
-		List<String> tokens = new ArrayList<String>();
-		// StringTokenizer tokenizer = new StringTokenizer( str );
-		StringTokenizer tokenizer = new StringTokenizer(str, ",");
-		// StringTokenizer tokenizer = new StringTokenizer( str , "," , true );
-		while (tokenizer.hasMoreElements()) {
-			tokens.add(tokenizer.nextToken());
-			// tokens.add( tokenizer.nextToken("e") );
-		}
-		int tokenLength = tokens.size();
-		return tokens;
-	}
-	
-	public List<String> getTokensWithCollection( String str ) {
-		StringTokenizer tokenizer = new StringTokenizer(str, ",");
-		List<String> tokens = new ArrayList<String>();
-		Collections.list(tokenizer).forEach(token -> tokens.add((String) token));
-		return tokens;
-	}
-	
-	public List<String> getTokensFromFile(String path, String delim) {
-		List<String> tokens = new ArrayList<String>();
-		String currLine = "";
-		StringTokenizer tokenizer;
-		try (BufferedReader br = new BufferedReader(
-				new InputStreamReader(Application.class.getResourceAsStream("/" + path)))) {
-			while ((currLine = br.readLine()) != null) {
-				tokenizer = new StringTokenizer(currLine, delim);
-				while (tokenizer.hasMoreElements()) {
-					tokens.add(tokenizer.nextToken());
-				}
-			}
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-		return tokens;
-	}
-	
+    public List<String> getTokens(String str) {
+        List<String> tokens = new ArrayList<String>();
+        // StringTokenizer tokenizer = new StringTokenizer( str );
+        StringTokenizer tokenizer = new StringTokenizer(str, ",");
+        // StringTokenizer tokenizer = new StringTokenizer( str , "," , true );
+        while (tokenizer.hasMoreElements()) {
+            tokens.add(tokenizer.nextToken());
+            // tokens.add( tokenizer.nextToken("e") );
+        }
+        int tokenLength = tokens.size();
+        return tokens;
+    }
+
+    public List<String> getTokensWithCollection(String str) {
+        StringTokenizer tokenizer = new StringTokenizer(str, ",");
+
+        return Collections.list(tokenizer).stream()
+          .map(token -> (String) token)
+          .collect(Collectors.toList());
+    }
+
+    public List<String> getTokensFromFile(String path, String delim) {
+        List<String> tokens = new ArrayList<>();
+        String currLine = "";
+        StringTokenizer tokenizer;
+        try (BufferedReader br = new BufferedReader(new InputStreamReader(Application.class.getResourceAsStream("/" + path)))) {
+            while ((currLine = br.readLine()) != null) {
+                tokenizer = new StringTokenizer(currLine, delim);
+                while (tokenizer.hasMoreElements()) {
+                    tokens.add(tokenizer.nextToken());
+                }
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return tokens;
+    }
 
 }