Idiomatic refactor (eugenp#2063)

pivovarit · web-flow · commit fe11e8f7d43e · 2017-06-13T16:54:45.000+02:00
* StringToCharStream

* Spring integration tests

* Spring integration tests
diff --git a/core-java/src/main/java/com/baeldung/string/StringToCharStream.java b/core-java/src/main/java/com/baeldung/string/StringToCharStream.java
@@ -1,57 +1,34 @@
 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();
     }
-
-
 }
diff --git a/core-java/src/test/java/com/baeldung/string/StringToCharStreamUnitTest.java b/core-java/src/test/java/com/baeldung/string/StringToCharStreamUnitTest.java
@@ -10,12 +10,9 @@
 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 void givenIntStream_whenMapToObj_thenReturnCharacterStream() {
     }
 
     @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);
     }
 
diff --git a/spring-vertx/pom.xml b/spring-vertx/pom.xml
@@ -41,11 +41,6 @@
                 </exclusion>
             </exclusions>
         </dependency>
-        <dependency>
-            <groupId>io.vertx</groupId>
-            <artifactId>vertx-core</artifactId>
-            <version>${vertx.version}</version>
-        </dependency>
         <dependency>
             <groupId>io.vertx</groupId>
             <artifactId>vertx-web</artifactId>
@@ -70,6 +65,23 @@
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>${maven-surefire-plugin.version}</version>
+                <configuration>
+                    <forkCount>3</forkCount>
+                    <reuseForks>true</reuseForks>
+                    <excludes>
+                        <exclude>**/*IntegrationTest.java</exclude>
+                        <exclude>**/*LongRunningUnitTest.java</exclude>
+                        <exclude>**/*ManualTest.java</exclude>
+                        <exclude>**/JdbcTest.java</exclude>
+                        <exclude>**/*LiveTest.java</exclude>
+                    </excludes>
+                    <testFailureIgnore>true</testFailureIgnore>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 
diff --git a/spring-vertx/src/test/java/com/baeldung/vertxspring/VertxSpringApplicationIntegrationTest.java b/spring-vertx/src/test/java/com/baeldung/vertxspring/VertxSpringApplicationIntegrationTest.java
@@ -16,8 +16,9 @@ public class VertxSpringApplicationIntegrationTest {
     private TestRestTemplate restTemplate = new TestRestTemplate();
 
     @Test
-    public void givenUrl_whenReceivedArticles_thenSuccess() {
+    public void givenUrl_whenReceivedArticles_thenSuccess() throws InterruptedException {
         ResponseEntity<String> responseEntity = restTemplate.getForEntity("http://localhost:8080/api/baeldung/articles", String.class);
+
         assertEquals(200, responseEntity.getStatusCodeValue());
     }
 

Original file line number	Diff line number	Diff line change
`@@ -16,8 +16,9 @@ public class VertxSpringApplicationIntegrationTest {`
`16`	`16`	`private TestRestTemplate restTemplate = new TestRestTemplate();`
`17`	`17`
`18`	`18`	`@Test`
`19`		`- public void givenUrl_whenReceivedArticles_thenSuccess() {`
	`19`	`+ public void givenUrl_whenReceivedArticles_thenSuccess() throws InterruptedException {`
`20`	`20`	`ResponseEntity<String> responseEntity = restTemplate.getForEntity("http://localhost:8080/api/baeldung/articles", String.class);`
	`21`	`+`
`21`	`22`	`assertEquals(200, responseEntity.getStatusCodeValue());`
`22`	`23`	`}`
`23`	`24`