fixed local conflict

core-java/src/main/java/com/baeldung/string/StringToCharStream.java

@@ -1,57 +1,36 @@
 package com.baeldung.string;
 
-import java.util.HashMap;
 import java.util.Map;
+import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 import java.util.stream.Stream;
 
-/**
- * Created by smatt on 26/05/2017.
- */
 public class StringToCharStream {
 
-    public StringToCharStream() {
-
-        //let's use the Stream API to manipulate a string
-        //this will count the occurrence of each character in the test string
-
+    private StringToCharStream() {
         String testString = "tests";
 
-        //first get an IntStream
         IntStream intStream = testString.chars();
         IntStream intStream1 = testString.codePoints();
 
-        //now let's map them
         Stream<Character> characterStream = intStream.mapToObj(c -> (char) c);
         Stream<Character> characterStream1 = intStream1.mapToObj(c -> (char) c);
 
         System.out.println("Counting Occurrence of Letter");
-        testString = "Noww";
 
-        //we don't want to use foreach, so . . .
-
-        Map<Character, Integer> map = new HashMap<>();
-
-        testString.codePoints()
-                .mapToObj(c -> (char) c)
-                .filter(c -> Character.isLetter(c))
-                .forEach(c -> {
-                    if(map.containsKey(c)) {
-                        map.put(c, map.get(c) + 1);
-                    } else {
-                        map.put(c, 1);
-                    }
-                });
+        Map<Character, Integer> map = "Noww".codePoints()
+          .mapToObj(c -> (char) c)
+          .filter(Character::isLetter)
+          .collect(Collectors.toMap(c -> c, c -> 1, Integer::sum));
 
         //printing out the result here
         System.out.println(map.toString());
 
     }
 
+    public static void main(String[] args) {
 
-    public static void main(String [] args) {
         new StringToCharStream();
+
     }
-
-
 }

core-java/src/test/java/com/baeldung/string/StringToCharStreamUnitTest.java

@@ -10,12 +10,9 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 
-/**
- * Created by smatt on 09/06/2017.
- */
 public class StringToCharStreamUnitTest {
 
-    String testString = "Tests";
+    private String testString = "Tests";
 
     @Test
     public void givenTestString_whenChars_thenReturnIntStream() {
@@ -37,9 +34,9 @@ public class StringToCharStreamUnitTest {
     }
 
     @Test
-    public void givenIntStream_whenMapToObj_thenReturnStringStream(){
+    public void givenIntStream_whenMapToObj_thenReturnStringStream() {
         Stream<String> stringStream
-                = testString.codePoints().mapToObj(c -> String.valueOf((char) c));
+          = testString.codePoints().mapToObj(c -> String.valueOf((char) c));
         assertNotNull(stringStream);
     }