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() {
+    private StringToCharStream() {
-
-        //let's use the Stream API to manipulate a string
-        //this will count the occurrence of each character in the test string
-
         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 = "Noww".codePoints()
-
+          .mapToObj(c -> (char) c)
-        Map<Character, Integer> map = new HashMap<>();
+          .filter(Character::isLetter)
-
+          .collect(Collectors.toMap(c -> c, c -> 1, Integer::sum));
-        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);
-                    }
-                });
 
         //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);
     }
 

spring-boot/src/main/java/com/baeldung/displayallbeans/Application.java

@@ -11,6 +11,10 @@ public class Application {
     public static void main(String[] args) {
         applicationContext = SpringApplication.run(Application.class, args);
         
+        displayAllBeans();
+    }
+    
+    public static void displayAllBeans() {
         String[] allBeanNames = applicationContext.getBeanDefinitionNames();
         for(String beanName : allBeanNames) {
             System.out.println(beanName);

spring-boot/src/main/java/com/baeldung/displayallbeans/SpringConfig.java

@@ -1,19 +0,0 @@
-package com.baeldung.displayallbeans;
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.servlet.config.annotation.EnableWebMvc;
-
-import com.baeldung.displayallbeans.model.Person;
-
-@Configuration
-@ComponentScan(basePackages = "com.baeldung.displayallbeans")
-public class SpringConfig {
-    @Bean
-    public Person person() {
-        Person person = new Person();
-        person.setName("Jon Doe");
-        return person;
-    }
-}

spring-boot/src/main/java/com/baeldung/displayallbeans/controller/FooController.java

@@ -0,0 +1,22 @@
+package com.baeldung.displayallbeans.controller;
+
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import com.baeldung.displayallbeans.service.FooService;
+
+@Controller
+public class FooController {
+    @Autowired
+    private FooService fooService;
+    
+    @RequestMapping(value="/displayallbeans") 
+    public String getHeaderAndBody (Map<String, Object> model){
+        model.put("header", fooService.getHeader());
+        model.put("message", fooService.getBody());
+        return "displayallbeans";
+    }
+}

spring-boot/src/main/java/com/baeldung/displayallbeans/controller/PersonController.java

@@ -1,19 +0,0 @@
-package com.baeldung.displayallbeans.controller;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import com.baeldung.displayallbeans.model.Person;
-
-@Controller
-public class PersonController {
-    @Autowired
-    Person person;
-    
-    @RequestMapping("/getPerson")
-    public @ResponseBody Person getPerson() {
-        return person;
-    }
-}

spring-boot/src/main/java/com/baeldung/displayallbeans/model/Person.java

@@ -1,13 +0,0 @@
-package com.baeldung.displayallbeans.model;
-
-public class Person {
-    String name;
-    
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-}

spring-boot/src/main/java/com/baeldung/displayallbeans/service/FooService.java

@@ -0,0 +1,18 @@
+package com.baeldung.displayallbeans.service;
+
+import org.springframework.stereotype.Service;
+
+@Service
+public class FooService {
+    
+    public String getHeader() {
+        return "Display All Beans";
+    }
+    
+    public String getBody() {
+        return "This is a sample application that displays all beans "
+          + "in Spring IoC container using ListableBeanFactory interface "
+          + "and Spring Boot Actuators.";
+    }
+    
+}

spring-boot/src/main/resources/templates/displayallbeans.html

@@ -0,0 +1,10 @@
+<html>
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+        <title>Baeldung</title>
+    </head>
+    <body>
+        <h2 th:text="${header}"></h2>
+        <p th:text="${message}"></p>
+    </body>
+</html>

spring-boot/src/test/java/com/baeldung/displayallbeans/DisplayBeanIntegrationTest.java

@@ -44,9 +44,8 @@ public class DisplayBeanIntegrationTest {
 
     @Test
     public void givenRestTemplate_whenAccessServerUrl_thenHttpStatusOK() throws Exception {
-        @SuppressWarnings("rawtypes")
+        ResponseEntity<String> entity = this.testRestTemplate.getForEntity(
-        ResponseEntity<Map> entity = this.testRestTemplate.getForEntity(
+          "http://localhost:" + this.port + "/displayallbeans", String.class);
-          "http://localhost:" + this.port + "/getPerson", Map.class);
         
         then(entity.getStatusCode()).isEqualTo(HttpStatus.OK);
     }
@@ -69,8 +68,8 @@ public class DisplayBeanIntegrationTest {
         List<Map<String, Object>> allBeans = (List) ((Map) entity.getBody().get(0)).get("beans");
         List<String> beanNamesList = allBeans.stream().map(x -> (String) x.get("bean")).collect(Collectors.toList());
 
-        assertThat( beanNamesList, hasItem("personController"));
+        assertThat( beanNamesList, hasItem("fooController"));
-        assertThat( beanNamesList, hasItem("person"));
+        assertThat( beanNamesList, hasItem("fooService"));
     }
     
     @Test
@@ -78,7 +77,7 @@ public class DisplayBeanIntegrationTest {
         String[] beanNames = context.getBeanDefinitionNames();
         
         List<String> beanNamesList = Arrays.asList(beanNames);
-        assertTrue(beanNamesList.contains("personController"));
+        assertTrue(beanNamesList.contains("fooController"));
-        assertTrue(beanNamesList.contains("person"));
+        assertTrue(beanNamesList.contains("fooService"));
     }
 }

spring-mvc-java/src/main/java/com/baeldung/spring/web/config/WebSocketConfig.java

@@ -18,6 +18,7 @@ public class WebSocketConfig extends AbstractWebSocketMessageBrokerConfigurer {
 
     @Override
     public void registerStompEndpoints(final StompEndpointRegistry registry) {
+        registry.addEndpoint("/chat");
         registry.addEndpoint("/chat").withSockJS();
     }
 

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>
 

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());
     }