Merge branch 'master' into pr/858-tim

core-java/src/main/java/com/baeldung/java/nio2/visitor/FileSearchExample.java

@@ -0,0 +1,60 @@
+package com.baeldung.java.nio2.visitor;
+
+import static java.nio.file.FileVisitResult.CONTINUE;
+import static java.nio.file.FileVisitResult.TERMINATE;
+
+import java.io.IOException;
+import java.nio.file.FileVisitResult;
+import java.nio.file.FileVisitor;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.attribute.BasicFileAttributes;
+
+public class FileSearchExample implements FileVisitor<Path> {
+    private static String FILE_NAME;
+    private static Path START_DIR;
+
+    public FileSearchExample(String fileName, Path startingDir) {
+        FILE_NAME = fileName;
+        START_DIR = startingDir;
+    }
+
+    @Override
+    public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) throws IOException {
+        return CONTINUE;
+    }
+
+    @Override
+    public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
+        String fileName = file.getFileName().toString();
+        if (FILE_NAME.equals(fileName)) {
+            System.out.println("File found: " + file.toString());
+            return TERMINATE;
+        }
+        return CONTINUE;
+    }
+
+    @Override
+    public FileVisitResult visitFileFailed(Path file, IOException exc) throws IOException {
+        System.out.println("Failed to access file: " + file.toString());
+        return CONTINUE;
+    }
+
+    @Override
+    public FileVisitResult postVisitDirectory(Path dir, IOException exc) throws IOException {
+        boolean finishedSearch = Files.isSameFile(dir, START_DIR);
+        if (finishedSearch) {
+            System.out.println("File:" + FILE_NAME + " not found");
+            return TERMINATE;
+        }
+        return CONTINUE;
+    }
+
+    public static void main(String[] args) throws IOException {
+        Path startingDir = Paths.get("C:/Users/new/Desktop");
+        FileSearchExample crawler = new FileSearchExample("hibernate.txt", startingDir);
+        Files.walkFileTree(startingDir, crawler);
+    }
+
+}

core-java/src/main/java/com/baeldung/java/nio2/visitor/FileVisitorImpl.java

@@ -0,0 +1,30 @@
+package com.baeldung.java.nio2.visitor;
+
+import java.io.IOException;
+import java.nio.file.FileVisitResult;
+import java.nio.file.FileVisitor;
+import java.nio.file.Path;
+import java.nio.file.attribute.BasicFileAttributes;
+
+public class FileVisitorImpl implements FileVisitor<Path> {
+
+    @Override
+    public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) {
+        return null;
+    }
+
+    @Override
+    public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) {
+        return null;
+    }
+
+    @Override
+    public FileVisitResult visitFileFailed(Path file, IOException exc) {       
+        return null;
+    }
+
+    @Override
+    public FileVisitResult postVisitDirectory(Path dir, IOException exc) {    
+        return null;
+    }
+}

core-java/src/main/java/com/baeldung/java/nio2/watcher/DirectoryWatcherExample.java

@@ -0,0 +1,25 @@
+package com.baeldung.java.nio2.watcher;
+
+import java.io.IOException;
+import java.nio.file.FileSystems;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.StandardWatchEventKinds;
+import java.nio.file.WatchEvent;
+import java.nio.file.WatchKey;
+import java.nio.file.WatchService;
+
+public class DirectoryWatcherExample {
+    public static void main(String[] args) throws IOException, InterruptedException {
+        WatchService watchService = FileSystems.getDefault().newWatchService();
+        Path path = Paths.get(System.getProperty("user.home"));
+        path.register(watchService, StandardWatchEventKinds.ENTRY_CREATE, StandardWatchEventKinds.ENTRY_DELETE, StandardWatchEventKinds.ENTRY_MODIFY);
+        WatchKey key;
+        while ((key = watchService.take()) != null) {
+            for (WatchEvent<?> event : key.pollEvents()) {
+                System.out.println("Event kind:" + event.kind() + ". File affected: " + event.context() + ".");
+            }
+            key.reset();
+        }
+    }
+}

core-java/src/test/java/com/baeldung/file/FileOperationsUnitTest.java

@@ -1,11 +1,12 @@
 package com.baeldung.file;
 
-import java.io.BufferedReader;
+import org.apache.commons.io.FileUtils;
-import java.io.File;
+import org.hamcrest.CoreMatchers;
-import java.io.FileInputStream;
+import org.hamcrest.Matchers;
-import java.io.IOException;
+import org.junit.Assert;
-import java.io.InputStream;
+import org.junit.Test;
-import java.io.InputStreamReader;
+
+import java.io.*;
 import java.net.URISyntaxException;
 import java.net.URL;
 import java.net.URLConnection;
@@ -14,12 +15,6 @@ import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.stream.Stream;
 
-import org.apache.commons.io.FileUtils;
-import org.hamcrest.CoreMatchers;
-import org.hamcrest.Matchers;
-import org.junit.Assert;
-import org.junit.Test;
-
 public class FileOperationsUnitTest {
 
     @Test
@@ -58,9 +53,9 @@ public class FileOperationsUnitTest {
 
     @Test
     public void givenURLName_whenUsingURL_thenFileData() throws IOException {
-        String expectedData = "Baeldung";
+        String expectedData = "Example Domain";
 
-        URL urlObject = new URL("http://www.baeldung.com/");
+        URL urlObject = new URL("http://www.example.com/");
 
         URLConnection urlConnection = urlObject.openConnection();
 

core-java/src/test/java/com/baeldung/java/nio2/async/AsyncEchoClient.java

@@ -0,0 +1,82 @@
+package com.baeldung.java.nio2.async;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.net.InetSocketAddress;
+import java.nio.ByteBuffer;
+import java.nio.channels.AsynchronousSocketChannel;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Future;
+
+public class AsyncEchoClient {
+    private AsynchronousSocketChannel client;
+    private Future<Void> future;
+    private static AsyncEchoClient instance;
+
+    private AsyncEchoClient() {
+        try {
+            client = AsynchronousSocketChannel.open();
+            InetSocketAddress hostAddress = new InetSocketAddress("localhost", 4999);
+            future = client.connect(hostAddress);
+            start();
+
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    public static AsyncEchoClient getInstance() {
+        if (instance == null)
+            instance = new AsyncEchoClient();
+        return instance;
+    }
+
+    private void start() {
+        try {
+            future.get();
+        } catch (InterruptedException | ExecutionException e) {
+            e.printStackTrace();
+        }
+    }
+
+    public String sendMessage(String message) {
+        byte[] byteMsg = new String(message).getBytes();
+        ByteBuffer buffer = ByteBuffer.wrap(byteMsg);
+        Future<Integer> writeResult = client.write(buffer);
+
+        while (!writeResult.isDone()) {
+            // do nothing
+        }
+        buffer.flip();
+        Future<Integer> readResult = client.read(buffer);
+        while (!readResult.isDone()) {
+
+        }
+        String echo = new String(buffer.array()).trim();
+        buffer.clear();
+        return echo;
+    }
+
+    public void stop() {
+        try {
+            client.close();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    public static void main(String[] args) throws IOException {
+        AsyncEchoClient client = AsyncEchoClient.getInstance();
+        client.start();
+        BufferedReader br = new BufferedReader(new InputStreamReader(System.in));
+        String line = null;
+        System.out.println("Message to server:");
+        while ((line = br.readLine()) != null) {
+            String response = client.sendMessage(line);
+            System.out.println("response from server: " + response);
+            System.out.println("Message to server:");
+        }
+    }
+
+}

core-java/src/test/java/com/baeldung/java/nio2/async/AsyncEchoServer.java

@@ -0,0 +1,79 @@
+package com.baeldung.java.nio2.async;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.InetSocketAddress;
+import java.nio.ByteBuffer;
+import java.nio.channels.AsynchronousServerSocketChannel;
+import java.nio.channels.AsynchronousSocketChannel;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Future;
+
+public class AsyncEchoServer {
+    private AsynchronousServerSocketChannel serverChannel;
+    private Future<AsynchronousSocketChannel> acceptResult;
+    private AsynchronousSocketChannel clientChannel;
+
+    public AsyncEchoServer() {
+        try {
+            serverChannel = AsynchronousServerSocketChannel.open();
+            InetSocketAddress hostAddress = new InetSocketAddress("localhost", 4999);
+            serverChannel.bind(hostAddress);
+            acceptResult = serverChannel.accept();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    public void runServer() {
+        try {
+            clientChannel = acceptResult.get();
+            if ((clientChannel != null) && (clientChannel.isOpen())) {
+                while (true) {
+
+                    ByteBuffer buffer = ByteBuffer.allocate(32);
+                    Future<Integer> readResult = clientChannel.read(buffer);
+
+                    while (!readResult.isDone()) {
+                        // do nothing
+                    }
+
+                    buffer.flip();
+                    String message = new String(buffer.array()).trim();
+                    if (message.equals("bye")) {
+                        break; // while loop
+                    }
+                    buffer = ByteBuffer.wrap(new String(message).getBytes());
+                    Future<Integer> writeResult = clientChannel.write(buffer);
+                    while (!writeResult.isDone()) {
+                        // do nothing
+                    }
+                    buffer.clear();
+
+                } // while()
+
+                clientChannel.close();
+                serverChannel.close();
+
+            }
+        } catch (InterruptedException | ExecutionException | IOException e) {
+            e.printStackTrace();
+        }
+
+    }
+
+    public static void main(String[] args) {
+        AsyncEchoServer server = new AsyncEchoServer();
+        server.runServer();
+    }
+    public static Process start() throws IOException, InterruptedException {
+        String javaHome = System.getProperty("java.home");
+        String javaBin = javaHome + File.separator + "bin" + File.separator + "java";
+        String classpath = System.getProperty("java.class.path");
+        String className = AsyncEchoServer.class.getCanonicalName();
+
+        ProcessBuilder builder = new ProcessBuilder(javaBin, "-cp", classpath, className);
+
+        return builder.start();
+    }
+}

core-java/src/test/java/com/baeldung/java/nio2/async/AsyncEchoServer2.java

@@ -0,0 +1,99 @@
+package com.baeldung.java.nio2.async;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.InetSocketAddress;
+import java.nio.ByteBuffer;
+import java.nio.channels.AsynchronousServerSocketChannel;
+import java.nio.channels.AsynchronousSocketChannel;
+import java.nio.channels.CompletionHandler;
+import java.util.HashMap;
+import java.util.Map;
+
+public class AsyncEchoServer2 {
+    private AsynchronousServerSocketChannel serverChannel;
+    private AsynchronousSocketChannel clientChannel;
+
+    public AsyncEchoServer2() {
+        try {
+            serverChannel = AsynchronousServerSocketChannel.open();
+            InetSocketAddress hostAddress = new InetSocketAddress("localhost", 4999);
+            serverChannel.bind(hostAddress);
+            while (true) {
+
+                serverChannel.accept(null, new CompletionHandler<AsynchronousSocketChannel, Object>() {
+
+                    @Override
+                    public void completed(AsynchronousSocketChannel result, Object attachment) {
+                        if (serverChannel.isOpen())
+                            serverChannel.accept(null, this);
+                        clientChannel = result;
+                        if ((clientChannel != null) && (clientChannel.isOpen())) {
+                            ReadWriteHandler handler = new ReadWriteHandler();
+                            ByteBuffer buffer = ByteBuffer.allocate(32);
+                            Map<String, Object> readInfo = new HashMap<>();
+                            readInfo.put("action", "read");
+                            readInfo.put("buffer", buffer);
+                            clientChannel.read(buffer, readInfo, handler);
+                        }
+                    }
+
+                    @Override
+                    public void failed(Throwable exc, Object attachment) {
+                        // process error
+                    }
+                });
+                try {
+                    System.in.read();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    class ReadWriteHandler implements CompletionHandler<Integer, Map<String, Object>> {
+
+        @Override
+        public void completed(Integer result, Map<String, Object> attachment) {
+            String action = (String) attachment.get("action");
+            if ("read".equals(action)) {
+                ByteBuffer buffer = (ByteBuffer) attachment.get("buffer");
+                buffer.flip();
+                attachment.put("action", "write");
+                clientChannel.write(buffer, attachment, this);
+                buffer.clear();
+            } else if ("write".equals(action)) {
+                ByteBuffer buffer = ByteBuffer.allocate(32);
+                attachment.put("action", "read");
+                attachment.put("buffer", buffer);
+                clientChannel.read(buffer, attachment, this);
+            }
+
+        }
+
+        @Override
+        public void failed(Throwable exc, Map<String, Object> attachment) {
+
+        }
+
+    }
+
+
+    public static void main(String[] args) {
+        new AsyncEchoServer2();
+    }
+
+    public static Process start() throws IOException, InterruptedException {
+        String javaHome = System.getProperty("java.home");
+        String javaBin = javaHome + File.separator + "bin" + File.separator + "java";
+        String classpath = System.getProperty("java.class.path");
+        String className = AsyncEchoServer2.class.getCanonicalName();
+
+        ProcessBuilder builder = new ProcessBuilder(javaBin, "-cp", classpath, className);
+
+        return builder.start();
+    }
+}

core-java/src/test/java/com/baeldung/java/nio2/async/AsyncEchoTest.java

@@ -0,0 +1,36 @@
+package com.baeldung.java.nio2.async;
+
+import static org.junit.Assert.*;
+
+import java.io.IOException;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+public class AsyncEchoTest {
+
+    Process server;
+    AsyncEchoClient client;
+
+    @Before
+    public void setup() throws IOException, InterruptedException {
+        server = AsyncEchoServer2.start();
+        client = AsyncEchoClient.getInstance();
+    }
+
+    @Test
+    public void givenServerClient_whenServerEchosMessage_thenCorrect() {
+        String resp1 = client.sendMessage("hello");
+        String resp2 = client.sendMessage("world");
+        assertEquals("hello", resp1);
+        assertEquals("world", resp2);
+    }
+
+    @After
+    public void teardown() throws IOException {
+        server.destroy();
+        client.stop();
+    }
+
+}

core-java/src/test/java/com/baeldung/java/nio2/async/AsyncFileTest.java

@@ -0,0 +1,127 @@
+package com.baeldung.java.nio2.async;
+
+import org.junit.Test;
+
+import java.io.IOException;
+import java.net.URI;
+import java.nio.ByteBuffer;
+import java.nio.channels.AsynchronousFileChannel;
+import java.nio.channels.CompletionHandler;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.StandardOpenOption;
+import java.util.UUID;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Future;
+
+import static org.junit.Assert.assertEquals;
+
+public class AsyncFileTest {
+    @Test
+    public void givenPath_whenReadsContentWithFuture_thenCorrect() throws IOException, ExecutionException, InterruptedException {
+        Path path = Paths.get(URI.create(this.getClass().getClassLoader().getResource("file.txt").toString()));
+        AsynchronousFileChannel fileChannel = AsynchronousFileChannel.open(path, StandardOpenOption.READ);
+
+        ByteBuffer buffer = ByteBuffer.allocate(1024);
+
+        Future<Integer> operation = fileChannel.read(buffer, 0);
+
+        operation.get();
+
+        String fileContent = new String(buffer.array()).trim();
+        buffer.clear();
+
+        assertEquals(fileContent, "baeldung.com");
+    }
+
+    @Test
+    public void givenPath_whenReadsContentWithCompletionHandler_thenCorrect() throws IOException {
+        Path path = Paths.get(URI.create(AsyncFileTest.class.getResource("/file.txt").toString()));
+        AsynchronousFileChannel fileChannel = AsynchronousFileChannel.open(path, StandardOpenOption.READ);
+
+        ByteBuffer buffer = ByteBuffer.allocate(1024);
+
+        fileChannel.read(buffer, 0, buffer, new CompletionHandler<Integer, ByteBuffer>() {
+
+            @Override
+            public void completed(Integer result, ByteBuffer attachment) {
+                // result is number of bytes read
+                // attachment is the buffer
+
+            }
+
+            @Override
+            public void failed(Throwable exc, ByteBuffer attachment) {
+
+            }
+        });
+    }
+
+    @Test
+    public void givenPathAndContent_whenWritesToFileWithFuture_thenCorrect() throws IOException, ExecutionException, InterruptedException {
+        String fileName = "temp";
+        Path path = Paths.get(fileName);
+        AsynchronousFileChannel fileChannel = AsynchronousFileChannel.open(path, StandardOpenOption.WRITE, StandardOpenOption.CREATE);
+
+        ByteBuffer buffer = ByteBuffer.allocate(1024);
+        long position = 0;
+
+        buffer.put("hello world".getBytes());
+        buffer.flip();
+
+        Future<Integer> operation = fileChannel.write(buffer, position);
+        buffer.clear();
+
+        operation.get();
+
+        String content = readContent(path);
+        assertEquals("hello world", content);
+    }
+
+    @Test
+    public void givenPathAndContent_whenWritesToFileWithHandler_thenCorrect() throws IOException {
+        String fileName = UUID.randomUUID().toString();
+        Path path = Paths.get(fileName);
+        AsynchronousFileChannel fileChannel = AsynchronousFileChannel.open(path, StandardOpenOption.WRITE, StandardOpenOption.CREATE,StandardOpenOption.DELETE_ON_CLOSE);
+
+
+        ByteBuffer buffer = ByteBuffer.allocate(1024);
+        buffer.put("hello world".getBytes());
+        buffer.flip();
+
+        fileChannel.write(buffer, 0, buffer, new CompletionHandler<Integer, ByteBuffer>() {
+
+            @Override
+            public void completed(Integer result, ByteBuffer attachment) {
+                // result is number of bytes written
+                // attachment is the buffer
+
+            }
+
+            @Override
+            public void failed(Throwable exc, ByteBuffer attachment) {
+
+            }
+        });
+    }
+
+    public static String readContent(Path file) throws ExecutionException, InterruptedException {
+        AsynchronousFileChannel fileChannel = null;
+        try {
+            fileChannel = AsynchronousFileChannel.open(file, StandardOpenOption.READ);
+        } catch (IOException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+
+        ByteBuffer buffer = ByteBuffer.allocate(1024);
+
+        Future<Integer> operation = fileChannel.read(buffer, 0);
+
+        operation.get();
+
+        String fileContent = new String(buffer.array()).trim();
+        buffer.clear();
+        return fileContent;
+    }
+}

core-java/src/test/java/com/baeldung/java/nio2/attributes/BasicAttribsTest.java

@@ -0,0 +1,69 @@
+package com.baeldung.java.nio2.attributes;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.attribute.BasicFileAttributeView;
+import java.nio.file.attribute.BasicFileAttributes;
+import java.nio.file.attribute.FileTime;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+public class BasicAttribsTest {
+    private static final String HOME = System.getProperty("user.home");
+    private static BasicFileAttributes basicAttribs;
+
+    @BeforeClass
+    public static void setup() throws IOException {
+        Path home = Paths.get(HOME);
+        BasicFileAttributeView basicView = Files.getFileAttributeView(home, BasicFileAttributeView.class);
+        basicAttribs = basicView.readAttributes();
+    }
+
+    @Test
+    public void givenFileTimes_whenComparesThem_ThenCorrect() {
+        FileTime created = basicAttribs.creationTime();
+        FileTime modified = basicAttribs.lastModifiedTime();
+        FileTime accessed = basicAttribs.lastAccessTime();
+
+        System.out.println("Created: " + created);
+        System.out.println("Modified: " + modified);
+        System.out.println("Accessed: " + accessed);
+
+    }
+
+    @Test
+    public void givenPath_whenGetsFileSize_thenCorrect() {
+        long size = basicAttribs.size();
+        assertTrue(size > 0);
+    }
+
+    @Test
+    public void givenPath_whenChecksIfDirectory_thenCorrect() {
+        boolean isDir = basicAttribs.isDirectory();
+        assertTrue(isDir);
+    }
+
+    @Test
+    public void givenPath_whenChecksIfFile_thenCorrect() {
+        boolean isFile = basicAttribs.isRegularFile();
+        assertFalse(isFile);
+    }
+
+    @Test
+    public void givenPath_whenChecksIfSymLink_thenCorrect() {
+        boolean isSymLink = basicAttribs.isSymbolicLink();
+        assertFalse(isSymLink);
+    }
+
+    @Test
+    public void givenPath_whenChecksIfOther_thenCorrect() {
+        boolean isOther = basicAttribs.isOther();
+        assertFalse(isOther);
+    }
+}

core-java/src/test/java/org/baeldung/java/collections/CollectionsConcatenateUnitTest.java

@@ -1,21 +1,15 @@
 package org.baeldung.java.collections;
 
-import static java.util.Arrays.asList;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-import java.util.NoSuchElementException;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import org.junit.Assert;
-import org.junit.Test;
-
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.util.*;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import static java.util.Arrays.asList;
 
 public class CollectionsConcatenateUnitTest {
 
@@ -63,16 +57,16 @@ public class CollectionsConcatenateUnitTest {
         Assert.assertEquals(Arrays.asList("S", "T", "U", "V"), collectionCombined);
     }
 
-    public static <E> Iterable<E> concat(Iterable<? extends E> list1, Iterable<? extends E> list2) {
+    public static <E> Iterable<E> concat(Iterable<? extends E> i1, Iterable<? extends E> i2) {
         return new Iterable<E>() {
             public Iterator<E> iterator() {
                 return new Iterator<E>() {
-                    protected Iterator<? extends E> listIterator = list1.iterator();
+                    Iterator<? extends E> listIterator = i1.iterator();
-                    protected Boolean checkedHasNext;
+                    Boolean checkedHasNext;
-                    protected E nextValue;
+                    E nextValue;
                     private boolean startTheSecond;
 
-                    public void theNext() {
+                    void theNext() {
                         if (listIterator.hasNext()) {
                             checkedHasNext = true;
                             nextValue = listIterator.next();
@@ -80,7 +74,7 @@ public class CollectionsConcatenateUnitTest {
                             checkedHasNext = false;
                         else {
                             startTheSecond = true;
-                            listIterator = list2.iterator();
+                            listIterator = i2.iterator();
                             theNext();
                         }
                     }
@@ -107,7 +101,7 @@ public class CollectionsConcatenateUnitTest {
     }
 
     public static <E> List<E> makeListFromIterable(Iterable<E> iter) {
-        List<E> list = new ArrayList<E>();
+        List<E> list = new ArrayList<>();
         for (E item : iter) {
             list.add(item);
         }

core-java/src/test/resources/file.txt

@@ -0,0 +1 @@
+baeldung.com

pom.xml

@@ -109,6 +109,7 @@
         <module>spring-katharsis</module>
         <module>spring-mockito</module>
         <module>spring-mvc-java</module>
+        <module>spring-mvc-forms</module>
         <module>spring-mvc-no-xml</module>
         <module>spring-mvc-tiles</module>
         <module>spring-mvc-velocity</module>

spring-core/src/main/java/com/baeldung/factorybean/FactoryBeanAppConfig.java

@@ -7,20 +7,15 @@ import org.springframework.context.annotation.Configuration;
 public class FactoryBeanAppConfig {
     
     @Bean
-    public ToolFactory tool() {
+    public ToolFactory toolFactory() {
         ToolFactory factory = new ToolFactory();
         factory.setFactoryId(7070);
         factory.setToolId(2);
-        factory.setToolName("wrench");
-        factory.setToolPrice(3.7);
         return factory;
     }
 
     @Bean
-    public Worker worker() throws Exception {
+    public Tool tool() throws Exception {
-        Worker worker = new Worker();
+        return toolFactory().getObject();
-        worker.setNumber("1002");
-        worker.setTool(tool().getObject());
-        return worker;
     }
 }

spring-core/src/main/java/com/baeldung/factorybean/InitializationToolFactory.java

@@ -1,68 +0,0 @@
-package com.baeldung.factorybean;
-
-import static com.google.common.base.Preconditions.checkArgument;
-
-import org.springframework.beans.factory.FactoryBean;
-import org.springframework.beans.factory.InitializingBean;
-import org.springframework.util.StringUtils;
-
-public class InitializationToolFactory implements FactoryBean<Tool>, InitializingBean {
-    
-    private int factoryId;
-    private int toolId;
-    private String toolName;
-    private double toolPrice;
-
-    @Override
-    public void afterPropertiesSet() throws Exception {
-        checkArgument(!StringUtils.isEmpty(toolName), "tool name cannot be empty");
-        checkArgument(toolPrice >= 0, "tool price should not be less than 0");
-    }
-
-    @Override
-    public Tool getObject() throws Exception {
-        return new Tool(toolId, toolName, toolPrice);
-    }
-
-    @Override
-    public Class<?> getObjectType() {
-        return Tool.class;
-    }
-
-    @Override
-    public boolean isSingleton() {
-        return false;
-    }
-
-    public int getFactoryId() {
-        return factoryId;
-    }
-
-    public void setFactoryId(int factoryId) {
-        this.factoryId = factoryId;
-    }
-
-    public int getToolId() {
-        return toolId;
-    }
-
-    public void setToolId(int toolId) {
-        this.toolId = toolId;
-    }
-
-    public String getToolName() {
-        return toolName;
-    }
-
-    public void setToolName(String toolName) {
-        this.toolName = toolName;
-    }
-
-    public double getToolPrice() {
-        return toolPrice;
-    }
-
-    public void setToolPrice(double toolPrice) {
-        this.toolPrice = toolPrice;
-    }
-}

spring-core/src/main/java/com/baeldung/factorybean/NonSingleToolFactory.java

@@ -6,8 +6,6 @@ public class NonSingleToolFactory extends AbstractFactoryBean<Tool> {
     
     private int factoryId;
     private int toolId;
-    private String toolName;
-    private double toolPrice;
 
     public NonSingleToolFactory() {
         setSingleton(false);
@@ -20,7 +18,7 @@ public class NonSingleToolFactory extends AbstractFactoryBean<Tool> {
 
     @Override
     protected Tool createInstance() throws Exception {
-        return new Tool(toolId, toolName, toolPrice);
+        return new Tool(toolId);
     }
 
     public int getFactoryId() {
@@ -38,20 +36,4 @@ public class NonSingleToolFactory extends AbstractFactoryBean<Tool> {
     public void setToolId(int toolId) {
         this.toolId = toolId;
     }
-
-    public String getToolName() {
-        return toolName;
-    }
-
-    public void setToolName(String toolName) {
-        this.toolName = toolName;
-    }
-
-    public double getToolPrice() {
-        return toolPrice;
-    }
-
-    public void setToolPrice(double toolPrice) {
-        this.toolPrice = toolPrice;
-    }
 }

spring-core/src/main/java/com/baeldung/factorybean/PostConstructToolFactory.java

@@ -1,69 +0,0 @@
-package com.baeldung.factorybean;
-
-import static com.google.common.base.Preconditions.checkArgument;
-
-import javax.annotation.PostConstruct;
-
-import org.springframework.beans.factory.FactoryBean;
-import org.springframework.util.StringUtils;
-
-public class PostConstructToolFactory implements FactoryBean<Tool> {
-    
-    private int factoryId;
-    private int toolId;
-    private String toolName;
-    private double toolPrice;
-
-    @Override
-    public Tool getObject() throws Exception {
-        return new Tool(toolId, toolName, toolPrice);
-    }
-
-    @Override
-    public Class<?> getObjectType() {
-        return Tool.class;
-    }
-
-    @Override
-    public boolean isSingleton() {
-        return false;
-    }
-
-    @PostConstruct
-    public void checkParams() {
-        checkArgument(!StringUtils.isEmpty(toolName), "tool name cannot be empty");
-        checkArgument(toolPrice >= 0, "tool price should not be less than 0");
-    }
-
-    public int getFactoryId() {
-        return factoryId;
-    }
-
-    public void setFactoryId(int factoryId) {
-        this.factoryId = factoryId;
-    }
-
-    public int getToolId() {
-        return toolId;
-    }
-
-    public void setToolId(int toolId) {
-        this.toolId = toolId;
-    }
-
-    public String getToolName() {
-        return toolName;
-    }
-
-    public void setToolName(String toolName) {
-        this.toolName = toolName;
-    }
-
-    public double getToolPrice() {
-        return toolPrice;
-    }
-
-    public void setToolPrice(double toolPrice) {
-        this.toolPrice = toolPrice;
-    }
-}

spring-core/src/main/java/com/baeldung/factorybean/SingleToolFactory.java

@@ -7,8 +7,6 @@ public class SingleToolFactory extends AbstractFactoryBean<Tool> {
     
     private int factoryId;
     private int toolId;
-    private String toolName;
-    private double toolPrice;
 
     @Override
     public Class<?> getObjectType() {
@@ -17,7 +15,7 @@ public class SingleToolFactory extends AbstractFactoryBean<Tool> {
 
     @Override
     protected Tool createInstance() throws Exception {
-        return new Tool(toolId, toolName, toolPrice);
+        return new Tool(toolId);
     }
 
     public int getFactoryId() {
@@ -35,20 +33,4 @@ public class SingleToolFactory extends AbstractFactoryBean<Tool> {
     public void setToolId(int toolId) {
         this.toolId = toolId;
     }
-
-    public String getToolName() {
-        return toolName;
-    }
-
-    public void setToolName(String toolName) {
-        this.toolName = toolName;
-    }
-
-    public double getToolPrice() {
-        return toolPrice;
-    }
-
-    public void setToolPrice(double toolPrice) {
-        this.toolPrice = toolPrice;
-    }
 }

spring-core/src/main/java/com/baeldung/factorybean/Tool.java

@@ -1,15 +1,13 @@
 package com.baeldung.factorybean;
 
 public class Tool {
-    
     private int id;
-    private String name;
-    private double price;
 
-    public Tool(int id, String name, double price) {
+    public Tool() {
+    }
+
+    public Tool(int id) {
         this.id = id;
-        this.name = name;
-        this.price = price;
     }
 
     public int getId() {
@@ -19,20 +17,4 @@ public class Tool {
     public void setId(int id) {
         this.id = id;
     }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public double getPrice() {
-        return price;
-    }
-
-    public void setPrice(double price) {
-        this.price = price;
-    }
 }

spring-core/src/main/java/com/baeldung/factorybean/ToolFactory.java

@@ -6,12 +6,10 @@ public class ToolFactory implements FactoryBean<Tool> {
    
     private int factoryId;
     private int toolId;
-    private String toolName;
-    private double toolPrice;
 
     @Override
     public Tool getObject() throws Exception {
-        return new Tool(toolId, toolName, toolPrice);
+        return new Tool(toolId);
     }
 
     @Override
@@ -39,20 +37,4 @@ public class ToolFactory implements FactoryBean<Tool> {
     public void setToolId(int toolId) {
         this.toolId = toolId;
     }
-
-    public String getToolName() {
-        return toolName;
-    }
-
-    public void setToolName(String toolName) {
-        this.toolName = toolName;
-    }
-
-    public double getToolPrice() {
-        return toolPrice;
-    }
-
-    public void setToolPrice(double toolPrice) {
-        this.toolPrice = toolPrice;
-    }
 }

spring-core/src/main/java/com/baeldung/factorybean/Worker.java

@@ -1,30 +0,0 @@
-package com.baeldung.factorybean;
-
-public class Worker {
-
-    private String number;
-    private Tool tool;
-
-    public Worker() {}
-
-    public Worker(String number, Tool tool) {
-        this.number = number;
-        this.tool = tool;
-    }
-
-    public String getNumber() {
-        return number;
-    }
-
-    public void setNumber(String number) {
-        this.number = number;
-    }
-
-    public Tool getTool() {
-        return tool;
-    }
-
-    public void setTool(Tool tool) {
-        this.tool = tool;
-    }
-}

spring-core/src/main/resources/factorybean-abstract-spring-ctx.xml

@@ -6,34 +6,10 @@
     <bean id="singleTool" class="com.baeldung.factorybean.SingleToolFactory">
         <property name="factoryId" value="3001"/>
         <property name="toolId" value="1"/>
-        <property name="toolName" value="screwdriver"/>
-        <property name="toolPrice" value="1.5"/>
     </bean>
 
     <bean id="nonSingleTool" class="com.baeldung.factorybean.NonSingleToolFactory">
         <property name="factoryId" value="3002"/>
         <property name="toolId" value="2"/>
-        <property name="toolName" value="screwdriver"/>
-        <property name="toolPrice" value="1.5"/>
-    </bean>
-
-    <bean id="worker1" class="com.baeldung.factorybean.Worker">
-        <property name="number" value="50001"/>
-        <property name="tool" ref="singleTool"/>
-    </bean>
-
-    <bean id="worker2" class="com.baeldung.factorybean.Worker">
-        <property name="number" value="50002"/>
-        <property name="tool" ref="singleTool"/>
-    </bean>
-
-    <bean id="worker3" class="com.baeldung.factorybean.Worker">
-        <property name="number" value="50003"/>
-        <property name="tool" ref="nonSingleTool"/>
-    </bean>
-
-    <bean id="worker4" class="com.baeldung.factorybean.Worker">
-        <property name="number" value="50004"/>
-        <property name="tool" ref="nonSingleTool"/>
     </bean>
 </beans>

spring-core/src/main/resources/factorybean-init-spring-ctx.xml

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xmlns="http://www.springframework.org/schema/beans"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
-
-    <bean id="initializationTool" class="com.baeldung.factorybean.InitializationToolFactory">
-        <property name="factoryId" value="1010"/>
-        <property name="toolId" value="1"/>
-        <property name="toolName" value="screwdriver"/>
-        <property name="toolPrice" value="-1"/>
-    </bean>
-
-    <bean id="worker" class="com.baeldung.factorybean.Worker">
-        <property name="number" value="36"/>
-        <property name="tool" ref="initializationTool"/>
-    </bean>
-</beans>

spring-core/src/main/resources/factorybean-postconstruct-spring-ctx.xml

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xmlns:context="http://www.springframework.org/schema/context"
-  xmlns="http://www.springframework.org/schema/beans"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
-
-    <context:annotation-config/>
-
-    <bean id="postConstructTool" class="com.baeldung.factorybean.PostConstructToolFactory">
-        <property name="factoryId" value="2020"/>
-        <property name="toolId" value="1"/>
-        <property name="toolName" value=""/>
-        <property name="toolPrice" value="2.2"/>
-    </bean>
-
-    <bean id="worker" class="com.baeldung.factorybean.Worker">
-        <property name="number" value="37"/>
-        <property name="tool" ref="postConstructTool"/>
-    </bean>
-</beans>

spring-core/src/main/resources/factorybean-spring-ctx.xml

@@ -6,12 +6,5 @@
     <bean id="tool" class="com.baeldung.factorybean.ToolFactory">
         <property name="factoryId" value="9090"/>
         <property name="toolId" value="1"/>
-        <property name="toolName" value="screwdriver"/>
-        <property name="toolPrice" value="1.5"/>
-    </bean>
-
-    <bean id="worker" class="com.baeldung.factorybean.Worker">
-        <property name="number" value="1001"/>
-        <property name="tool" ref="tool"/>
     </bean>
 </beans>

spring-core/src/test/java/com/baeldung/factorybean/AbstractFactoryBeanTest.java

@@ -4,33 +4,36 @@ import static org.hamcrest.core.IsEqual.equalTo;
 import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 
-import org.junit.Test;
+import javax.annotation.Resource;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
 
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(locations = { "classpath:factorybean-abstract-spring-ctx.xml" })
 public class AbstractFactoryBeanTest {
-    
+
+    @Resource(name = "singleTool")
+    private Tool tool1;
+    @Resource(name = "singleTool")
+    private Tool tool2;
+    @Resource(name = "nonSingleTool")
+    private Tool tool3;
+    @Resource(name = "nonSingleTool")
+    private Tool tool4;
+
     @Test
     public void testSingleToolFactory() {
-        ApplicationContext context = new ClassPathXmlApplicationContext("classpath:factorybean-abstract-spring-ctx.xml");
+        assertThat(tool1.getId(), equalTo(1));
-
+        assertTrue(tool1 == tool2);
-        Worker worker1 = (Worker) context.getBean("worker1");
-        Worker worker2 = (Worker) context.getBean("worker2");
-
-        assertThat(worker1.getNumber(), equalTo("50001"));
-        assertThat(worker2.getNumber(), equalTo("50002"));
-        assertTrue(worker1.getTool() == worker2.getTool());
     }
 
     @Test
     public void testNonSingleToolFactory() {
-        ApplicationContext context = new ClassPathXmlApplicationContext("classpath:factorybean-abstract-spring-ctx.xml");
+        assertThat(tool3.getId(), equalTo(2));
-
+        assertThat(tool4.getId(), equalTo(2));
-        Worker worker3 = (Worker) context.getBean("worker3");
+        assertTrue(tool3 != tool4);
-        Worker worker4 = (Worker) context.getBean("worker4");
-
-        assertThat(worker3.getNumber(), equalTo("50003"));
-        assertThat(worker4.getNumber(), equalTo("50004"));
-        assertTrue(worker3.getTool() != worker4.getTool());
     }
 }

spring-core/src/test/java/com/baeldung/factorybean/FactoryBeanInitializeTest.java

@@ -1,18 +0,0 @@
-package com.baeldung.factorybean;
-
-import org.junit.Test;
-import org.springframework.beans.factory.BeanCreationException;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
-
-public class FactoryBeanInitializeTest {
-	
-    @Test(expected = BeanCreationException.class)
-    public void testInitializationToolFactory() {
-        new ClassPathXmlApplicationContext("classpath:factorybean-init-spring-ctx.xml");
-    }
-
-    @Test(expected = BeanCreationException.class)
-    public void testPostConstructToolFactory() {
-        new ClassPathXmlApplicationContext("classpath:factorybean-postconstruct-spring-ctx.xml");
-    }
-}

spring-core/src/test/java/com/baeldung/factorybean/FactoryBeanJavaConfigTest.java

@@ -0,0 +1,27 @@
+package com.baeldung.factorybean;
+
+import static org.hamcrest.core.IsEqual.equalTo;
+import static org.junit.Assert.assertThat;
+
+import javax.annotation.Resource;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(classes = FactoryBeanAppConfig.class)
+public class FactoryBeanJavaConfigTest {
+
+    @Resource
+    private Tool tool;
+    @Resource(name = "&toolFactory")
+    private ToolFactory toolFactory;
+
+    @Test
+    public void testConstructWorkerByJava() {
+        assertThat(tool.getId(), equalTo(2));
+        assertThat(toolFactory.getFactoryId(), equalTo(7070));
+    }
+}

spring-core/src/test/java/com/baeldung/factorybean/FactoryBeanTest.java

@@ -1,40 +0,0 @@
-package com.baeldung.factorybean;
-
-import static org.hamcrest.core.IsEqual.equalTo;
-import static org.junit.Assert.assertThat;
-
-import org.junit.Test;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.annotation.AnnotationConfigApplicationContext;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
-
-public class FactoryBeanTest {
-    
-    @Test
-    public void testConstructWorkerByXml() {
-        ApplicationContext context = new ClassPathXmlApplicationContext("classpath:factorybean-spring-ctx.xml");
-
-        Worker worker = (Worker) context.getBean("worker");
-        assertThat(worker.getNumber(), equalTo("1001"));
-        assertThat(worker.getTool().getId(), equalTo(1));
-        assertThat(worker.getTool().getName(), equalTo("screwdriver"));
-        assertThat(worker.getTool().getPrice(), equalTo(1.5));
-
-        ToolFactory toolFactory = (ToolFactory) context.getBean("&tool");
-        assertThat(toolFactory.getFactoryId(), equalTo(9090));
-    }
-
-    @Test
-    public void testConstructWorkerByJava() {
-        ApplicationContext context = new AnnotationConfigApplicationContext(FactoryBeanAppConfig.class);
-
-        Worker worker = (Worker) context.getBean("worker");
-        assertThat(worker.getNumber(), equalTo("1002"));
-        assertThat(worker.getTool().getId(), equalTo(2));
-        assertThat(worker.getTool().getName(), equalTo("wrench"));
-        assertThat(worker.getTool().getPrice(), equalTo(3.7));
-
-        ToolFactory toolFactory = (ToolFactory) context.getBean("&tool");
-        assertThat(toolFactory.getFactoryId(), equalTo(7070));
-    }
-}

spring-core/src/test/java/com/baeldung/factorybean/FactoryBeanXmlConfigTest.java

@@ -0,0 +1,27 @@
+package com.baeldung.factorybean;
+
+import static org.hamcrest.core.IsEqual.equalTo;
+import static org.junit.Assert.assertThat;
+
+import javax.annotation.Resource;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(locations = { "classpath:factorybean-spring-ctx.xml" })
+public class FactoryBeanXmlConfigTest {
+
+    @Resource
+    private Tool tool;
+    @Resource(name = "&tool")
+    private ToolFactory toolFactory;
+
+    @Test
+    public void testConstructWorkerByXml() {
+        assertThat(tool.getId(), equalTo(1));
+        assertThat(toolFactory.getFactoryId(), equalTo(9090));
+    }
+}

spring-mvc-forms/pom.xml

@@ -0,0 +1,99 @@
+<?xml version="1.0"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+         xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>com.baeldung</groupId>
+    <version>0.1-SNAPSHOT</version>
+    <artifactId>spring-mvc-forms</artifactId>
+
+    <name>spring-mvc-forms</name>
+    <packaging>war</packaging>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-webmvc</artifactId>
+            <version>${springframework.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+            <version>${javax.servlet-api.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>javax.servlet.jsp</groupId>
+            <artifactId>javax.servlet.jsp-api</artifactId>
+            <version>${javax.servlet.jsp-api.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>jstl</artifactId>
+            <version>${jstl.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-validator</artifactId>
+            <version>${hibernate-validator.version}</version>
+        </dependency>
+
+
+    </dependencies>
+    <profiles>
+        <!-- Local -->
+        <profile>
+            <id>spring-mvc-forms</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <build>
+                <pluginManagement>
+                    <plugins>
+
+                        <plugin>
+                            <groupId>org.apache.maven.plugins</groupId>
+                            <artifactId>maven-compiler-plugin</artifactId>
+                            <version>${maven-compiler-plugin.version}</version>
+                            <configuration>
+                                <source>${maven-compiler-plugin.source}</source>
+                                <target>${maven-compiler-plugin.source}</target>
+                            </configuration>
+                        </plugin>
+
+                        <plugin>
+                            <groupId>org.apache.maven.plugins</groupId>
+                            <artifactId>maven-war-plugin</artifactId>
+                            <version>${maven-war-plugin.version}</version>
+                            <configuration>
+                                <warSourceDirectory>src/main/webapp</warSourceDirectory>
+                                <warName>spring-mvc-forms</warName>
+                                <failOnMissingWebXml>false</failOnMissingWebXml>
+                                <outputDirectory>${deploy-path}</outputDirectory>
+                            </configuration>
+                        </plugin>
+
+                    </plugins>
+                </pluginManagement>
+                <finalName>spring-mvc-forms</finalName>
+            </build>
+        </profile>
+    </profiles>
+
+    <properties>
+        <springframework.version>4.0.6.RELEASE</springframework.version>
+        <maven-war-plugin.version>2.4</maven-war-plugin.version>
+        <jstl.version>1.2</jstl.version>
+        <javax.servlet.jsp-api.version>2.3.1</javax.servlet.jsp-api.version>
+        <javax.servlet-api.version>3.1.0</javax.servlet-api.version>
+        <maven-compiler-plugin.version>3.5.1</maven-compiler-plugin.version>
+        <maven-compiler-plugin.source>1.8</maven-compiler-plugin.source>
+        <hibernate-validator.version>5.1.1.Final</hibernate-validator.version>
+        <deploy-path>enter-location-of-server</deploy-path>
+    </properties>
+
+</project>
+

spring-mvc-forms/src/main/java/com/baeldung/springmvcforms/configuration/ApplicationConfiguration.java

@@ -0,0 +1,29 @@
+package com.baeldung.springmvcforms.configuration;
+
+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.DefaultServletHandlerConfigurer;
+import org.springframework.web.servlet.config.annotation.EnableWebMvc;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
+import org.springframework.web.servlet.view.InternalResourceViewResolver;
+
+@Configuration
+@EnableWebMvc
+@ComponentScan(basePackages = "com.baeldung.springmvcforms")
+class ApplicationConfiguration extends WebMvcConfigurerAdapter {
+
+    @Override
+    public void configureDefaultServletHandling(DefaultServletHandlerConfigurer configurer) {
+        configurer.enable();
+    }
+
+    @Bean
+    public InternalResourceViewResolver jspViewResolver() {
+        InternalResourceViewResolver bean = new InternalResourceViewResolver();
+        bean.setPrefix("/WEB-INF/views/");
+        bean.setSuffix(".jsp");
+        return bean;
+    }
+
+}

spring-mvc-forms/src/main/java/com/baeldung/springmvcforms/configuration/WebInitializer.java

@@ -0,0 +1,47 @@
+package com.baeldung.springmvcforms.configuration;
+
+import org.springframework.web.WebApplicationInitializer;
+import org.springframework.web.context.ContextLoaderListener;
+import org.springframework.web.context.support.AnnotationConfigWebApplicationContext;
+import org.springframework.web.servlet.DispatcherServlet;
+
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRegistration;
+
+public class WebInitializer implements WebApplicationInitializer {
+
+	public void onStartup(ServletContext container) throws ServletException {
+
+		AnnotationConfigWebApplicationContext ctx = new AnnotationConfigWebApplicationContext();
+		ctx.register(ApplicationConfiguration.class);
+		ctx.setServletContext(container);
+
+		// Manage the lifecycle of the root application context
+		container.addListener(new ContextLoaderListener(ctx));
+
+		ServletRegistration.Dynamic servlet = container.addServlet("dispatcher", new DispatcherServlet(ctx));
+
+		servlet.setLoadOnStartup(1);
+		servlet.addMapping("/");
+	}
+//	@Override
+//	public void onStartup(ServletContext container) {
+//		// Create the 'root' Spring application context
+//		AnnotationConfigWebApplicationContext rootContext = new AnnotationConfigWebApplicationContext();
+//		rootContext.register(ServiceConfig.class, JPAConfig.class, SecurityConfig.class);
+//
+//		// Manage the lifecycle of the root application context
+//		container.addListener(new ContextLoaderListener(rootContext));
+//
+//		// Create the dispatcher servlet's Spring application context
+//		AnnotationConfigWebApplicationContext dispatcherServlet = new AnnotationConfigWebApplicationContext();
+//		dispatcherServlet.register(MvcConfig.class);
+//
+//		// Register and map the dispatcher servlet
+//		ServletRegistration.Dynamic dispatcher = container.addServlet("dispatcher", new DispatcherServlet(dispatcherServlet));
+//		dispatcher.setLoadOnStartup(1);
+//		dispatcher.addMapping("/");
+//
+//	}
+}

spring-mvc-forms/src/main/java/com/baeldung/springmvcforms/controller/EmployeeController.java

@@ -0,0 +1,41 @@
+package com.baeldung.springmvcforms.controller;
+
+import com.baeldung.springmvcforms.domain.Employee;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.validation.Valid;
+import java.util.HashMap;
+import java.util.Map;
+
+@Controller
+public class EmployeeController {
+
+    Map<Long, Employee> employeeMap = new HashMap<>();
+
+    @RequestMapping(value = "/employee", method = RequestMethod.GET)
+    public ModelAndView showForm() {
+        return new ModelAndView("employeeHome", "employee", new Employee());
+    }
+
+    @RequestMapping(value = "/employee/{Id}", produces = { "application/json", "application/xml" }, method = RequestMethod.GET)
+    public @ResponseBody Employee getEmployeeById(@PathVariable final long Id) {
+        return employeeMap.get(Id);
+    }
+
+    @RequestMapping(value = "/addEmployee", method = RequestMethod.POST)
+    public String submit(@Valid @ModelAttribute("employee") final Employee employee, final BindingResult result, final ModelMap model) {
+        if (result.hasErrors()) {
+            return "error";
+        }
+        model.addAttribute("name", employee.getName());
+        model.addAttribute("contactNumber", employee.getContactNumber());
+        model.addAttribute("id", employee.getId());
+        employeeMap.put(employee.getId(), employee);
+        return "employeeView";
+    }
+
+}

spring-mvc-forms/src/main/java/com/baeldung/springmvcforms/domain/Employee.java

@@ -0,0 +1,46 @@
+package com.baeldung.springmvcforms.domain;
+
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
+
+public class Employee {
+
+    private long id;
+
+    @NotNull
+    @Size(min = 5)
+    private String name;
+
+    @NotNull
+    @Size(min = 7)
+    private String contactNumber;
+
+    public Employee() {
+        super();
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(final String name) {
+        this.name = name;
+    }
+
+    public long getId() {
+        return id;
+    }
+
+    public void setId(final long id) {
+        this.id = id;
+    }
+
+    public String getContactNumber() {
+        return contactNumber;
+    }
+
+    public void setContactNumber(final String contactNumber) {
+        this.contactNumber = contactNumber;
+    }
+
+}

spring-mvc-forms/src/main/webapp/WEB-INF/views/employeeHome.jsp

@@ -0,0 +1,33 @@
+<%@ page language="java" contentType="text/html; charset=ISO-8859-1" pageEncoding="ISO-8859-1"%>
+<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%>
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title>Form Example - Register an Employee</title>
+</head>
+<body>
+	<h3>Welcome, Enter The Employee Details</h3>
+
+	<form:form method="POST" action="${pageContext.request.contextPath}/addEmployee" modelAttribute="employee">
+		<table>
+			<tr>
+				<td><form:label path="name">Name</form:label></td>
+				<td><form:input path="name" /></td>
+			</tr>
+			<tr>
+				<td><form:label path="id">Id</form:label></td>
+				<td><form:input path="id" /></td>
+			</tr>
+			<tr>
+				<td><form:label path="contactNumber">Contact Number</form:label></td>
+				<td><form:input path="contactNumber" /></td>
+			</tr>
+			<tr>
+				<td><input type="submit" value="Submit" /></td>
+			</tr>
+		</table>
+	</form:form>
+
+</body>
+
+</html>

spring-mvc-forms/src/main/webapp/WEB-INF/views/employeeView.jsp

@@ -0,0 +1,24 @@
+<%@taglib uri="http://www.springframework.org/tags/form" prefix="form"%>
+<html>
+<head>
+<title>Spring MVC Form Handling</title>
+</head>
+<body>
+
+	<h2>Submitted Employee Information</h2>
+	<table>
+		<tr>
+			<td>Name :</td>
+			<td>${name}</td>
+		</tr>
+		<tr>
+			<td>ID :</td>
+			<td>${id}</td>
+		</tr>
+		<tr>
+			<td>Contact Number :</td>
+			<td>${contactNumber}</td>
+		</tr>
+	</table>
+</body>
+</html>

spring-mvc-forms/src/main/webapp/WEB-INF/views/error.jsp

@@ -0,0 +1,20 @@
+<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
+	pageEncoding="ISO-8859-1"%>
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title>SpringMVCExample</title>
+</head>
+
+<body>
+	<h3>Pleas enter the correct details</h3>
+	<table>
+		<tr>
+			<td><a href="employee">Retry</a></td>
+		</tr>
+	</table>
+
+</body>
+
+</html>

spring-mvc-java/src/main/webapp/WEB-INF/templates/message.html

@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml"
+    xmlns:th="http://www.thymeleaf.org">
+<head>
+<meta charset="UTF-8" />
+</head>
+<body>
+    <form action="#" th:action="@{/message/processForm}" method="post">
+        Message: <input type="text" value="message" id="message" name="message"/>
+        <input type="submit" />
+    </form>
+
+    <span th:text="${message}" id="received"></span>
+</body>
+</html>

spring-mvc-java/src/test/java/com/baeldung/htmlunit/HtmlUnitAndJUnitTest.java

@@ -0,0 +1,31 @@
+package com.baeldung.htmlunit;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import com.gargoylesoftware.htmlunit.WebClient;
+import com.gargoylesoftware.htmlunit.html.HtmlPage;
+
+public class HtmlUnitAndJUnitTest {
+
+	@Before
+	public void init() throws Exception {
+	    webClient = new WebClient();
+	}
+
+	@After
+	public void close() throws Exception {
+	    webClient.close();
+	}
+
+	@Test
+	public void givenAClient_whenEnteringBaeldung_thenPageTitleIsOk()
+	  throws Exception {
+	    webClient.getOptions().setThrowExceptionOnScriptError(false);
+	    HtmlPage page = webClient.getPage("http://www.baeldung.com/");
+	    Assert.assertEquals(
+	      "Baeldung | Java, Spring and Web Development tutorials",
+		page.getTitleText());
+	}
+
+}

spring-mvc-java/src/test/java/com/baeldung/htmlunit/HtmlUnitAndSpringIntegrationTest.java

@@ -1,72 +0,0 @@
-package com.baeldung.htmlunit;
-
-import java.io.IOException;
-import java.net.MalformedURLException;
-
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.test.context.web.WebAppConfiguration;
-import org.springframework.test.web.servlet.htmlunit.MockMvcWebClientBuilder;
-import org.springframework.web.context.WebApplicationContext;
-
-import com.gargoylesoftware.htmlunit.FailingHttpStatusCodeException;
-import com.gargoylesoftware.htmlunit.WebClient;
-import com.gargoylesoftware.htmlunit.html.HtmlForm;
-import com.gargoylesoftware.htmlunit.html.HtmlPage;
-import com.gargoylesoftware.htmlunit.html.HtmlSubmitInput;
-import com.gargoylesoftware.htmlunit.html.HtmlTextInput;
-
-@RunWith(SpringJUnit4ClassRunner.class)
-@WebAppConfiguration
-@ContextConfiguration(classes = { TestConfig.class })
-public class HtmlUnitAndSpringIntegrationTest {
-
-    @Autowired
-    private WebApplicationContext wac;
-
-    private WebClient webClient;
-
-    @Before
-    public void setup() {
-        webClient = MockMvcWebClientBuilder.webAppContextSetup(wac).build();
-    }
-
-    //
-
-    @Test
-    @Ignore("Related view message.html does not exist check MessageController")
-    public void givenAMessage_whenSent_thenItShows() throws FailingHttpStatusCodeException, MalformedURLException, IOException {
-        final String text = "Hello world!";
-        final HtmlPage page = webClient.getPage("http://localhost/message/showForm");
-        System.out.println(page.asXml());
-
-        final HtmlTextInput messageText = page.getHtmlElementById("message");
-        messageText.setValueAttribute(text);
-
-        final HtmlForm form = page.getForms().get(0);
-        final HtmlSubmitInput submit = form.getOneHtmlElementByAttribute("input", "type", "submit");
-        final HtmlPage newPage = submit.click();
-
-        final String receivedText = newPage.getHtmlElementById("received").getTextContent();
-
-        Assert.assertEquals(receivedText, text);
-        System.out.println(newPage.asXml());
-    }
-
-    @Test
-    public void givenAClient_whenEnteringBaeldung_thenPageTitleIsCorrect() throws Exception {
-        try (final WebClient client = new WebClient()) {
-            webClient.getOptions().setThrowExceptionOnScriptError(false);
-
-            final HtmlPage page = webClient.getPage("http://www.baeldung.com/");
-            Assert.assertEquals("Baeldung | Java, Spring and Web Development tutorials", page.getTitleText());
-        }
-    }
-
-}

spring-mvc-java/src/test/java/com/baeldung/htmlunit/HtmlUnitAndSpringTest.java

@@ -0,0 +1,61 @@
+package com.baeldung.htmlunit;
+
+import java.io.IOException;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.web.WebAppConfiguration;
+import org.springframework.test.web.servlet.htmlunit.MockMvcWebClientBuilder;
+import org.springframework.web.context.WebApplicationContext;
+
+import com.gargoylesoftware.htmlunit.FailingHttpStatusCodeException;
+import com.gargoylesoftware.htmlunit.WebClient;
+import com.gargoylesoftware.htmlunit.html.HtmlForm;
+import com.gargoylesoftware.htmlunit.html.HtmlPage;
+import com.gargoylesoftware.htmlunit.html.HtmlSubmitInput;
+import com.gargoylesoftware.htmlunit.html.HtmlTextInput;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@WebAppConfiguration
+@ContextConfiguration(classes = { TestConfig.class })
+public class HtmlUnitAndSpringTest {
+
+    @Autowired
+    private WebApplicationContext wac;
+
+    private WebClient webClient;
+
+    @Before
+    public void setup() {
+        webClient = MockMvcWebClientBuilder
+            .webAppContextSetup(wac).build();
+    }
+
+    @Test
+    public void givenAMessage_whenSent_thenItShows() throws Exception {
+        String text = "Hello world!";
+        HtmlPage page;
+
+        String url = "http://localhost/message/showForm";
+        page = webClient.getPage(url);
+            
+        HtmlTextInput messageText = page.getHtmlElementById("message");
+        messageText.setValueAttribute(text);
+
+        HtmlForm form = page.getForms().get(0);
+        HtmlSubmitInput submit = form.getOneHtmlElementByAttribute(
+          "input", "type", "submit");
+        HtmlPage newPage = submit.click();
+
+        String receivedText = newPage.getHtmlElementById("received")
+            .getTextContent();
+
+        Assert.assertEquals(receivedText, text);     
+    }
+}

spring-mvc-java/src/test/java/com/baeldung/htmlunit/HtmlUnitTest.java

@@ -1,21 +0,0 @@
-package com.baeldung.htmlunit;
-
-import org.junit.Assert;
-import org.junit.Test;
-
-import com.gargoylesoftware.htmlunit.WebClient;
-import com.gargoylesoftware.htmlunit.html.HtmlPage;
-
-public class HtmlUnitTest {
-
-    @Test
-    public void givenAClient_whenEnteringBaeldung_thenPageTitleIsCorrect() throws Exception {
-        try (final WebClient webClient = new WebClient()) {
-            webClient.getOptions().setThrowExceptionOnScriptError(false);
-
-            final HtmlPage page = webClient.getPage("http://www.baeldung.com/");
-            Assert.assertEquals("Baeldung | Java, Spring and Web Development tutorials", page.getTitleText());
-        }
-    }
-
-}

spring-mvc-java/src/test/java/com/baeldung/htmlunit/HtmlUnitWebScraping.java

@@ -5,36 +5,38 @@ import java.util.List;
 import com.gargoylesoftware.htmlunit.WebClient;
 import com.gargoylesoftware.htmlunit.html.HtmlAnchor;
 import com.gargoylesoftware.htmlunit.html.HtmlHeading1;
-import com.gargoylesoftware.htmlunit.html.HtmlHeading2;
 import com.gargoylesoftware.htmlunit.html.HtmlPage;
 
 public class HtmlUnitWebScraping {
 
-    public static void main(final String[] args) throws Exception {
+	private WebClient webClient;
-        try (final WebClient webClient = new WebClient()) {
 
-            webClient.getOptions().setCssEnabled(false);
+	@Before
-            webClient.getOptions().setJavaScriptEnabled(false);
+	public void init() throws Exception {
+	    webClient = new WebClient();
+	}
 
-            final HtmlPage page = webClient.getPage("http://www.baeldung.com/full_archive");
+	@After
-            final HtmlAnchor latestPostLink = (HtmlAnchor) page.getByXPath("(//ul[@class='car-monthlisting']/li)[1]/a").get(0);
+	public void close() throws Exception {
+	    webClient.close();
+	}
 
-            System.out.println("Entering: " + latestPostLink.getHrefAttribute());
+	@Test
+	public void givenBaeldungArchive_whenRetrievingArticle_thenHasH1() 
+	  throws Exception {
+	    webClient.getOptions().setCssEnabled(false);
+	    webClient.getOptions().setJavaScriptEnabled(false);
 
-            final HtmlPage postPage = latestPostLink.click();
+	    String url = "http://www.baeldung.com/full_archive";
+	    HtmlPage page = webClient.getPage(url);
+	    String xpath = "(//ul[@class='car-monthlisting']/li)[1]/a";
+	    HtmlAnchor latestPostLink 
+	      = (HtmlAnchor) page.getByXPath(xpath).get(0);
+	    HtmlPage postPage = latestPostLink.click();
 
-            final HtmlHeading1 heading1 = (HtmlHeading1) postPage.getByXPath("//h1").get(0);
+	    List<HtmlHeading1> h1  
-            System.out.println("Title: " + heading1.getTextContent());
+	      = (List<HtmlHeading1>) postPage.getByXPath("//h1");
-
-            final List<HtmlHeading2> headings2 = (List<HtmlHeading2>) postPage.getByXPath("//h2");
-
-            final StringBuilder sb = new StringBuilder(heading1.getTextContent());
-            for (final HtmlHeading2 h2 : headings2) {
-                sb.append("\n").append(h2.getTextContent());
-            }
-
-            System.out.println(sb.toString());
-        }
-    }
 
+	    Assert.assertTrue(h1.size() > 0);
+	}
 }

spring-mvc-xml/README.md

@@ -12,3 +12,4 @@ The "REST With Spring" Classes: http://bit.ly/restwithspring
 - [Servlet Session Timeout](http://www.baeldung.com/servlet-session-timeout)
 - [Basic Forms with Spring MVC](http://www.baeldung.com/spring-mvc-form-tutorial)
 - [Returning Image/Media Data with Spring MVC](http://www.baeldung.com/spring-mvc-image-media-data)
+- [Geolocation by IP in Java](http://www.baeldung.com/geolocation-by-ip-with-maxmind)

spring-rest/src/main/java/org/baeldung/web/controller/MyFooController.java

@@ -0,0 +1,76 @@
+package org.baeldung.web.controller;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.baeldung.web.dto.Foo;
+import org.baeldung.web.exception.ResourceNotFoundException;
+import org.springframework.http.HttpStatus;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.ResponseStatus;
+import org.springframework.web.servlet.support.ServletUriComponentsBuilder;
+
+@Controller
+@RequestMapping(value = "/myfoos")
+public class MyFooController {
+
+    private final Map<Long, Foo> myfoos;
+
+    public MyFooController() {
+        super();
+        myfoos = new HashMap<Long, Foo>();
+        myfoos.put(1L, new Foo(1L, "sample foo"));
+    }
+
+    // API - read
+
+    @RequestMapping(method = RequestMethod.GET)
+    @ResponseBody
+    public Collection<Foo> findAll() {
+        return myfoos.values();
+    }
+
+    @RequestMapping(method = RequestMethod.GET, value = "/{id}", produces = { "application/json" })
+    @ResponseBody
+    public Foo findById(@PathVariable final long id) {
+        final Foo foo = myfoos.get(id);
+        if (foo == null) {
+            throw new ResourceNotFoundException();
+        }
+        return foo;
+    }
+
+    // API - write
+
+    @RequestMapping(method = RequestMethod.PUT, value = "/{id}")
+    @ResponseStatus(HttpStatus.OK)
+    @ResponseBody
+    public Foo updateFoo(@PathVariable("id") final long id, @RequestBody final Foo foo) {
+        myfoos.put(id, foo);
+        return foo;
+    }
+
+    @RequestMapping(method = RequestMethod.POST)
+    @ResponseStatus(HttpStatus.CREATED)
+    @ResponseBody
+    public Foo createFoo(@RequestBody final Foo foo, HttpServletResponse response) {
+        myfoos.put(foo.getId(), foo);
+        response.setHeader("Location", ServletUriComponentsBuilder.fromCurrentRequest().path("/" + foo.getId()).toUriString());
+        return foo;
+    }
+
+    @RequestMapping(method = RequestMethod.DELETE, value = "/{id}")
+    @ResponseStatus(HttpStatus.OK)
+    public void deleteById(@PathVariable final long id) {
+        myfoos.remove(id);
+    }
+
+}

spring-rest/src/main/java/org/baeldung/web/dto/Foo.java

@@ -11,6 +11,12 @@ public class Foo {
         super();
     }
 
+    public Foo(final String name) {
+        super();
+
+        this.name = name;
+    }
+
     public Foo(final long id, final String name) {
         super();
 

spring-rest/src/main/java/org/baeldung/web/exception/ResourceNotFoundException.java

@@ -0,0 +1,8 @@
+package org.baeldung.web.exception;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.ResponseStatus;
+
+@ResponseStatus(value = HttpStatus.NOT_FOUND)
+public class ResourceNotFoundException extends RuntimeException {
+}

spring-rest/src/main/webapp/WEB-INF/api-servlet.xml

@@ -8,7 +8,7 @@
 
     <context:component-scan base-package="org.baeldung.web" />
 
-    <mvc:annotation-driven>
+    <mvc:annotation-driven content-negotiation-manager="contentNegotiationManager" >
         <mvc:message-converters register-defaults="true">
            <!--  
            <bean class="org.springframework.http.converter.json.MappingJackson2HttpMessageConverter"/>
@@ -18,6 +18,7 @@
 		        <property name="unmarshaller" ref="xstreamMarshaller" />
 		    </bean> 
             -->     
+           <bean class="org.springframework.http.converter.json.MappingJackson2HttpMessageConverter"/>
            <bean class="org.baeldung.config.converter.KryoHttpMessageConverter"/>  
            <bean class="org.springframework.http.converter.protobuf.ProtobufHttpMessageConverter"/>         
         </mvc:message-converters>
@@ -43,6 +44,11 @@
         <property name="maxInMemorySize" value="1048576" /> <!-- 1MB -->
 
     </bean>
+    
+    <bean id="contentNegotiationManager"
+             class="org.springframework.web.accept.ContentNegotiationManagerFactoryBean">
+       <property name="defaultContentType" value="application/json" />
+  </bean>
 
 
 </beans>

spring-rest/src/test/java/org/baeldung/client/RestTemplateBasicLiveTest.java

@@ -1,28 +1,42 @@
 package org.baeldung.client;
 
+import static org.apache.commons.codec.binary.Base64.encodeBase64;
 import static org.baeldung.client.Consts.APPLICATION_PORT;
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.notNullValue;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.mockito.Matchers.notNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
 import java.io.IOException;
+import java.net.URI;
+import java.util.Arrays;
+import java.util.Set;
 
 import org.baeldung.web.dto.Foo;
 import org.junit.Before;
 import org.junit.Test;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
+import org.springframework.http.client.ClientHttpRequestFactory;
+import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
+import org.springframework.web.client.HttpClientErrorException;
+import org.springframework.web.client.RequestCallback;
 import org.springframework.web.client.RestTemplate;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.common.base.Charsets;
 
 public class RestTemplateBasicLiveTest {
 
     private RestTemplate restTemplate;
-    private static final String fooResourceUrl = "http://localhost:" + APPLICATION_PORT + "/spring-rest/foos";
+    private static final String fooResourceUrl = "http://localhost:" + APPLICATION_PORT + "/spring-rest/myfoos";
 
     @Before
     public void beforeTest() {
@@ -33,19 +47,19 @@ public class RestTemplateBasicLiveTest {
 
     @Test
     public void givenResourceUrl_whenSendGetForRequestEntity_thenStatusOk() throws IOException {
-        ResponseEntity<String> response = restTemplate.getForEntity(fooResourceUrl + "/1", String.class);
+        final ResponseEntity<String> response = restTemplate.getForEntity(fooResourceUrl + "/1", String.class);
 
         assertThat(response.getStatusCode(), equalTo(HttpStatus.OK));
     }
 
     @Test
     public void givenResourceUrl_whenSendGetForRequestEntity_thenBodyCorrect() throws IOException {
-        ResponseEntity<String> response = restTemplate.getForEntity(fooResourceUrl + "/1", String.class);
+        final ResponseEntity<String> response = restTemplate.getForEntity(fooResourceUrl + "/1", String.class);
 
-        ObjectMapper mapper = new ObjectMapper();
+        final ObjectMapper mapper = new ObjectMapper();
-        JsonNode root = mapper.readTree(response.getBody());
+        final JsonNode root = mapper.readTree(response.getBody());
-        JsonNode name = root.path("name");
+        final JsonNode name = root.path("name");
-        assertThat(name.asText(), is(notNull()));
+        assertThat(name.asText(), notNullValue());
     }
 
     @Test
@@ -56,4 +70,147 @@ public class RestTemplateBasicLiveTest {
         assertThat(foo.getId(), is(1L));
     }
 
+    // HEAD, OPTIONS
+
+    @Test
+    public void givenFooService_whenCallHeadForHeaders_thenReceiveAllHeadersForThatResource() {
+        final HttpHeaders httpHeaders = restTemplate.headForHeaders(fooResourceUrl);
+
+        assertTrue(httpHeaders.getContentType().includes(MediaType.APPLICATION_JSON));
+    }
+
+    // POST
+
+    @Test
+    public void givenFooService_whenPostForObject_thenCreatedObjectIsReturned() {
+        final HttpEntity<Foo> request = new HttpEntity<>(new Foo("bar"));
+        final Foo foo = restTemplate.postForObject(fooResourceUrl, request, Foo.class);
+        assertThat(foo, notNullValue());
+        assertThat(foo.getName(), is("bar"));
+    }
+
+    @Test
+    public void givenFooService_whenPostForLocation_thenCreatedLocationIsReturned() {
+        final HttpEntity<Foo> request = new HttpEntity<>(new Foo("bar"));
+        final URI location = restTemplate.postForLocation(fooResourceUrl, request);
+        assertThat(location, notNullValue());
+    }
+
+    @Test
+    public void givenFooService_whenPostResource_thenResourceIsCreated() {
+        final RestTemplate template = new RestTemplate();
+
+        final HttpEntity<Foo> request = new HttpEntity<>(new Foo("bar"));
+
+        final ResponseEntity<Foo> response = template.exchange(fooResourceUrl, HttpMethod.POST, request, Foo.class);
+        assertThat(response.getStatusCode(), is(HttpStatus.CREATED));
+        final Foo foo = response.getBody();
+        assertThat(foo, notNullValue());
+        assertThat(foo.getName(), is("bar"));
+    }
+
+    @Test
+    public void givenFooService_whenCallOptionsForAllow_thenReceiveValueOfAllowHeader() {
+        final Set<HttpMethod> optionsForAllow = restTemplate.optionsForAllow(fooResourceUrl);
+        final HttpMethod[] supportedMethods = { HttpMethod.GET, HttpMethod.POST, HttpMethod.HEAD };
+
+        assertTrue(optionsForAllow.containsAll(Arrays.asList(supportedMethods)));
+    }
+
+    // PUT
+
+    @Test
+    public void givenFooService_whenPutExistingEntity_thenItIsUpdated() {
+        final RestTemplate template = new RestTemplate();
+        final HttpHeaders headers = prepareBasicAuthHeaders();
+        final HttpEntity<Foo> request = new HttpEntity<>(new Foo("bar"), headers);
+
+        // Create Resource
+        final ResponseEntity<Foo> createResponse = template.exchange(fooResourceUrl, HttpMethod.POST, request, Foo.class);
+
+        // Update Resource
+        final Foo updatedInstance = new Foo("newName");
+        updatedInstance.setId(createResponse.getBody().getId());
+        final String resourceUrl = fooResourceUrl + '/' + createResponse.getBody().getId();
+        final HttpEntity<Foo> requestUpdate = new HttpEntity<>(updatedInstance, headers);
+        template.exchange(resourceUrl, HttpMethod.PUT, requestUpdate, Void.class);
+
+        // Check that Resource was updated
+        final ResponseEntity<Foo> updateResponse = template.exchange(resourceUrl, HttpMethod.GET, new HttpEntity<>(headers), Foo.class);
+        final Foo foo = updateResponse.getBody();
+        assertThat(foo.getName(), is(updatedInstance.getName()));
+    }
+
+    @Test
+    public void givenFooService_whenPutExistingEntityWithCallback_thenItIsUpdated() {
+        final RestTemplate template = new RestTemplate();
+        final HttpHeaders headers = prepareBasicAuthHeaders();
+        final HttpEntity<Foo> request = new HttpEntity<>(new Foo("bar"), headers);
+
+        // Create entity
+        ResponseEntity<Foo> response = template.exchange(fooResourceUrl, HttpMethod.POST, request, Foo.class);
+        assertThat(response.getStatusCode(), is(HttpStatus.CREATED));
+
+        // Update entity
+        final Foo updatedInstance = new Foo("newName");
+        updatedInstance.setId(response.getBody().getId());
+        final String resourceUrl = fooResourceUrl + '/' + response.getBody().getId();
+        template.execute(resourceUrl, HttpMethod.PUT, requestCallback(updatedInstance), clientHttpResponse -> null);
+
+        // Check that entity was updated
+        response = template.exchange(resourceUrl, HttpMethod.GET, new HttpEntity<>(headers), Foo.class);
+        final Foo foo = response.getBody();
+        assertThat(foo.getName(), is(updatedInstance.getName()));
+    }
+
+    // DELETE
+
+    @Test
+    public void givenFooService_whenCallDelete_thenEntityIsRemoved() {
+        final Foo foo = new Foo("remove me");
+        final ResponseEntity<Foo> response = restTemplate.postForEntity(fooResourceUrl, foo, Foo.class);
+        assertThat(response.getStatusCode(), is(HttpStatus.CREATED));
+
+        final String entityUrl = fooResourceUrl + "/" + response.getBody().getId();
+        restTemplate.delete(entityUrl);
+        try {
+            restTemplate.getForEntity(entityUrl, Foo.class);
+            fail();
+        } catch (final HttpClientErrorException ex) {
+            assertThat(ex.getStatusCode(), is(HttpStatus.NOT_FOUND));
+        }
+    }
+
+    //
+
+    private HttpHeaders prepareBasicAuthHeaders() {
+        final HttpHeaders headers = new HttpHeaders();
+        final String encodedLogPass = getBase64EncodedLogPass();
+        headers.add(HttpHeaders.AUTHORIZATION, "Basic " + encodedLogPass);
+        return headers;
+    }
+
+    private String getBase64EncodedLogPass() {
+        final String logPass = "user1:user1Pass";
+        final byte[] authHeaderBytes = encodeBase64(logPass.getBytes(Charsets.US_ASCII));
+        return new String(authHeaderBytes, Charsets.US_ASCII);
+    }
+
+    private RequestCallback requestCallback(final Foo updatedInstance) {
+        return clientHttpRequest -> {
+            final ObjectMapper mapper = new ObjectMapper();
+            mapper.writeValue(clientHttpRequest.getBody(), updatedInstance);
+            clientHttpRequest.getHeaders().add(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE);
+            clientHttpRequest.getHeaders().add(HttpHeaders.AUTHORIZATION, "Basic " + getBase64EncodedLogPass());
+        };
+    }
+
+    // Simply setting restTemplate timeout using ClientHttpRequestFactory
+
+    ClientHttpRequestFactory getSimpleClientHttpRequestFactory() {
+        final int timeout = 5;
+        final HttpComponentsClientHttpRequestFactory clientHttpRequestFactory = new HttpComponentsClientHttpRequestFactory();
+        clientHttpRequestFactory.setConnectTimeout(timeout * 1000);
+        return clientHttpRequestFactory;
+    }
 }

spring-rest/src/test/java/org/baeldung/okhttp/OkHttpFileUploadingLiveTest.java

@@ -1,5 +1,6 @@
 package org.baeldung.okhttp;
 
+import static org.baeldung.client.Consts.APPLICATION_PORT;
 import static org.hamcrest.Matchers.equalTo;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertThat;
@@ -7,10 +8,6 @@ import static org.junit.Assert.assertThat;
 import java.io.File;
 import java.io.IOException;
 
-import org.baeldung.okhttp.ProgressRequestWrapper;
-import org.junit.Before;
-import org.junit.Test;
-
 import okhttp3.Call;
 import okhttp3.MediaType;
 import okhttp3.MultipartBody;
@@ -19,33 +16,29 @@ import okhttp3.Request;
 import okhttp3.RequestBody;
 import okhttp3.Response;
 
+import org.junit.Before;
+import org.junit.Test;
+
 public class OkHttpFileUploadingLiveTest {
 
-    private static final String BASE_URL = "http://localhost:8080/spring-rest";
+    private static final String BASE_URL = "http://localhost:" + APPLICATION_PORT + "/spring-rest";
 
     OkHttpClient client;
 
     @Before
     public void init() {
-    	client = new OkHttpClient();
+        client = new OkHttpClient();
     }
 
     @Test
     public void whenUploadFile_thenCorrect() throws IOException {
 
-        RequestBody requestBody = new MultipartBody.Builder()
+        final RequestBody requestBody = new MultipartBody.Builder().setType(MultipartBody.FORM).addFormDataPart("file", "file.txt", RequestBody.create(MediaType.parse("application/octet-stream"), new File("src/test/resources/test.txt"))).build();
-          .setType(MultipartBody.FORM)
-          .addFormDataPart("file", "file.txt",
-            RequestBody.create(MediaType.parse("application/octet-stream"), new File("src/test/resources/test.txt")))
-          .build();
 
-        Request request = new Request.Builder()
+        final Request request = new Request.Builder().url(BASE_URL + "/users/upload").post(requestBody).build();
-                .url(BASE_URL + "/users/upload")
-                .post(requestBody)
-                .build();
 
-        Call call = client.newCall(request);
+        final Call call = client.newCall(request);
-        Response response = call.execute();
+        final Response response = call.execute();
 
         assertThat(response.code(), equalTo(200));
     }
@@ -53,25 +46,18 @@ public class OkHttpFileUploadingLiveTest {
     @Test
     public void whenGetUploadFileProgress_thenCorrect() throws IOException {
 
-        RequestBody requestBody = new MultipartBody.Builder()
+        final RequestBody requestBody = new MultipartBody.Builder().setType(MultipartBody.FORM).addFormDataPart("file", "file.txt", RequestBody.create(MediaType.parse("application/octet-stream"), new File("src/test/resources/test.txt"))).build();
-          .setType(MultipartBody.FORM)
-          .addFormDataPart("file", "file.txt",
-            RequestBody.create(MediaType.parse("application/octet-stream"), new File("src/test/resources/test.txt")))
-          .build();
 
-        ProgressRequestWrapper countingBody = new ProgressRequestWrapper(requestBody, (long bytesWritten, long contentLength) -> {
+        final ProgressRequestWrapper countingBody = new ProgressRequestWrapper(requestBody, (long bytesWritten, long contentLength) -> {
 
-        	float percentage = 100f * bytesWritten / contentLength;
+            final float percentage = (100f * bytesWritten) / contentLength;
             assertFalse(Float.compare(percentage, 100) > 0);
         });
 
-        Request request = new Request.Builder()
+        final Request request = new Request.Builder().url(BASE_URL + "/users/upload").post(countingBody).build();
-                .url(BASE_URL + "/users/upload")
-                .post(countingBody)
-                .build();
 
-        Call call = client.newCall(request);
+        final Call call = client.newCall(request);
-        Response response = call.execute();
+        final Response response = call.execute();
 
         assertThat(response.code(), equalTo(200));
 

spring-rest/src/test/java/org/baeldung/okhttp/OkHttpGetLiveTest.java

@@ -1,14 +1,12 @@
 package org.baeldung.okhttp;
 
+import static org.baeldung.client.Consts.APPLICATION_PORT;
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.junit.Assert.assertThat;
 import static org.junit.Assert.fail;
 
 import java.io.IOException;
 
-import org.junit.Before;
-import org.junit.Test;
-
 import okhttp3.Call;
 import okhttp3.Callback;
 import okhttp3.HttpUrl;
@@ -16,9 +14,12 @@ import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.Response;
 
+import org.junit.Before;
+import org.junit.Test;
+
 public class OkHttpGetLiveTest {
 
-    private static final String BASE_URL = "http://localhost:8080/spring-rest";
+    private static final String BASE_URL = "http://localhost:" + APPLICATION_PORT + "/spring-rest";
 
     OkHttpClient client;
 
@@ -30,40 +31,42 @@ public class OkHttpGetLiveTest {
 
     @Test
     public void whenGetRequest_thenCorrect() throws IOException {
-        Request request = new Request.Builder().url(BASE_URL + "/date").build();
+        final Request request = new Request.Builder().url(BASE_URL + "/date").build();
 
-        Call call = client.newCall(request);
+        final Call call = client.newCall(request);
-        Response response = call.execute();
+        final Response response = call.execute();
 
         assertThat(response.code(), equalTo(200));
     }
 
     @Test
     public void whenGetRequestWithQueryParameter_thenCorrect() throws IOException {
-        HttpUrl.Builder urlBuilder = HttpUrl.parse(BASE_URL + "/ex/bars").newBuilder();
+        final HttpUrl.Builder urlBuilder = HttpUrl.parse(BASE_URL + "/ex/bars").newBuilder();
         urlBuilder.addQueryParameter("id", "1");
 
-        String url = urlBuilder.build().toString();
+        final String url = urlBuilder.build().toString();
 
-        Request request = new Request.Builder().url(url).build();
+        final Request request = new Request.Builder().url(url).build();
 
-        Call call = client.newCall(request);
+        final Call call = client.newCall(request);
-        Response response = call.execute();
+        final Response response = call.execute();
 
         assertThat(response.code(), equalTo(200));
     }
 
     @Test
     public void whenAsynchronousGetRequest_thenCorrect() throws InterruptedException {
-        Request request = new Request.Builder().url(BASE_URL + "/date").build();
+        final Request request = new Request.Builder().url(BASE_URL + "/date").build();
 
-        Call call = client.newCall(request);
+        final Call call = client.newCall(request);
 
         call.enqueue(new Callback() {
+            @Override
             public void onResponse(Call call, Response response) throws IOException {
                 System.out.println("OK");
             }
 
+            @Override
             public void onFailure(Call call, IOException e) {
                 fail();
             }

spring-rest/src/test/java/org/baeldung/okhttp/OkHttpMiscLiveTest.java

@@ -1,27 +1,27 @@
 package org.baeldung.okhttp;
 
-import okhttp3.*;
+import static org.baeldung.client.Consts.APPLICATION_PORT;
-import org.junit.Test;
+
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import java.io.File;
 import java.io.IOException;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
-import org.junit.Before;
+
-import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import okhttp3.Cache;
 import okhttp3.Call;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.Response;
 
+import org.junit.Before;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 public class OkHttpMiscLiveTest {
 
-    private static final String BASE_URL = "http://localhost:8080/spring-rest";
+    private static final String BASE_URL = "http://localhost:" + APPLICATION_PORT + "/spring-rest";
     private static Logger logger = LoggerFactory.getLogger(OkHttpMiscLiveTest.class);
 
     OkHttpClient client;
@@ -29,31 +29,27 @@ public class OkHttpMiscLiveTest {
     @Before
     public void init() {
 
-    	client = new OkHttpClient();
+        client = new OkHttpClient();
     }
 
     @Test
     public void whenSetRequestTimeout_thenFail() throws IOException {
-        OkHttpClient clientWithTimeout = new OkHttpClient.Builder()
+        final OkHttpClient clientWithTimeout = new OkHttpClient.Builder().readTimeout(1, TimeUnit.SECONDS).build();
-          .readTimeout(1, TimeUnit.SECONDS)
-          .build();
 
-        Request request = new Request.Builder()
+        final Request request = new Request.Builder().url(BASE_URL + "/delay/2") // This URL is served with a 2 second delay.
-          .url(BASE_URL + "/delay/2")  // This URL is served with a 2 second delay.
+                .build();
-          .build();
 
-        Call call = clientWithTimeout.newCall(request);
+        final Call call = clientWithTimeout.newCall(request);
-        Response response = call.execute();
+        final Response response = call.execute();
         response.close();
     }
 
     @Test(expected = IOException.class)
     public void whenCancelRequest_thenCorrect() throws IOException {
-        ScheduledExecutorService executor = Executors.newScheduledThreadPool(1);
+        final ScheduledExecutorService executor = Executors.newScheduledThreadPool(1);
 
-        Request request = new Request.Builder()
+        final Request request = new Request.Builder().url(BASE_URL + "/delay/2") // This URL is served with a 2 second delay.
-          .url(BASE_URL + "/delay/2")  // This URL is served with a 2 second delay.
+                .build();
-          .build();
 
         final int seconds = 1;
         final long startNanos = System.nanoTime();
@@ -63,42 +59,38 @@ public class OkHttpMiscLiveTest {
         // Schedule a job to cancel the call in 1 second.
         executor.schedule(() -> {
 
-        	logger.debug("Canceling call: " + (System.nanoTime() - startNanos) / 1e9f);
+            logger.debug("Canceling call: " + ((System.nanoTime() - startNanos) / 1e9f));
             call.cancel();
-            logger.debug("Canceled call: " + (System.nanoTime() - startNanos) / 1e9f);
+            logger.debug("Canceled call: " + ((System.nanoTime() - startNanos) / 1e9f));
 
         }, seconds, TimeUnit.SECONDS);
 
-        logger.debug("Executing call: " + (System.nanoTime() - startNanos) / 1e9f);
+        logger.debug("Executing call: " + ((System.nanoTime() - startNanos) / 1e9f));
-        Response response = call.execute();
+        final Response response = call.execute();
-        logger.debug("Call completed: " + (System.nanoTime() - startNanos) / 1e9f, response);
+        logger.debug("Call completed: " + ((System.nanoTime() - startNanos) / 1e9f), response);
     }
 
     @Test
-    public void  whenSetResponseCache_thenCorrect() throws IOException {
+    public void whenSetResponseCache_thenCorrect() throws IOException {
 
-        int cacheSize = 10 * 1024 * 1024; // 10 MiB
+        final int cacheSize = 10 * 1024 * 1024; // 10 MiB
-        File cacheDirectory = new File("src/test/resources/cache");
+        final File cacheDirectory = new File("src/test/resources/cache");
-        Cache cache = new Cache(cacheDirectory, cacheSize);
+        final Cache cache = new Cache(cacheDirectory, cacheSize);
 
-        OkHttpClient clientCached = new OkHttpClient.Builder()
+        final OkHttpClient clientCached = new OkHttpClient.Builder().cache(cache).build();
-          .cache(cache)
-          .build();
 
-        Request request = new Request.Builder()
+        final Request request = new Request.Builder().url("http://publicobject.com/helloworld.txt").build();
-          .url("http://publicobject.com/helloworld.txt")
-          .build();
 
-        Response response1 = clientCached.newCall(request).execute();
+        final Response response1 = clientCached.newCall(request).execute();
         logResponse(response1);
 
-        Response response2 = clientCached.newCall(request).execute();
+        final Response response2 = clientCached.newCall(request).execute();
         logResponse(response2);
     }
 
     private void logResponse(Response response) throws IOException {
 
-    	logger.debug("Response response:          " + response);
+        logger.debug("Response response:          " + response);
         logger.debug("Response cache response:    " + response.cacheResponse());
         logger.debug("Response network response:  " + response.networkResponse());
         logger.debug("Response responseBody:      " + response.body().string());

spring-rest/src/test/java/org/baeldung/okhttp/OkHttpPostingLiveTest.java

@@ -1,14 +1,12 @@
 package org.baeldung.okhttp;
 
+import static org.baeldung.client.Consts.APPLICATION_PORT;
 import static org.hamcrest.Matchers.equalTo;
 import static org.junit.Assert.assertThat;
 
 import java.io.File;
 import java.io.IOException;
 
-import org.junit.Before;
-import org.junit.Test;
-
 import okhttp3.Call;
 import okhttp3.Credentials;
 import okhttp3.FormBody;
@@ -19,9 +17,12 @@ import okhttp3.Request;
 import okhttp3.RequestBody;
 import okhttp3.Response;
 
+import org.junit.Before;
+import org.junit.Test;
+
 public class OkHttpPostingLiveTest {
 
-    private static final String BASE_URL = "http://localhost:8080/spring-rest";
+    private static final String BASE_URL = "http://localhost:" + APPLICATION_PORT + "/spring-rest";
     private static final String URL_SECURED_BY_BASIC_AUTHENTICATION = "http://browserspy.dk/password-ok.php";
 
     OkHttpClient client;
@@ -29,77 +30,56 @@ public class OkHttpPostingLiveTest {
     @Before
     public void init() {
 
-    	client = new OkHttpClient();
+        client = new OkHttpClient();
     }
 
     @Test
     public void whenSendPostRequest_thenCorrect() throws IOException {
-        RequestBody formBody = new FormBody.Builder()
+        final RequestBody formBody = new FormBody.Builder().add("username", "test").add("password", "test").build();
-          .add("username", "test")
-          .add("password", "test")
-          .build();
 
-        Request request = new Request.Builder()
+        final Request request = new Request.Builder().url(BASE_URL + "/users").post(formBody).build();
-                .url(BASE_URL + "/users")
-                .post(formBody)
-                .build();
 
-        Call call = client.newCall(request);
+        final Call call = client.newCall(request);
-        Response response = call.execute();
+        final Response response = call.execute();
 
         assertThat(response.code(), equalTo(200));
     }
 
     @Test
     public void whenSendPostRequestWithAuthorization_thenCorrect() throws IOException {
-        String postBody = "test post";
+        final String postBody = "test post";
 
-        Request request = new Request.Builder()
+        final Request request = new Request.Builder().url(URL_SECURED_BY_BASIC_AUTHENTICATION).addHeader("Authorization", Credentials.basic("test", "test")).post(RequestBody.create(MediaType.parse("text/x-markdown; charset=utf-8"), postBody)).build();
-                .url(URL_SECURED_BY_BASIC_AUTHENTICATION)
-                .addHeader("Authorization", Credentials.basic("test", "test"))
-                .post(RequestBody.create(MediaType.parse("text/x-markdown; charset=utf-8"), postBody))
-                .build();
 
-        Call call = client.newCall(request);
+        final Call call = client.newCall(request);
-        Response response = call.execute();
+        final Response response = call.execute();
 
         assertThat(response.code(), equalTo(200));
     }
 
     @Test
     public void whenPostJson_thenCorrect() throws IOException {
-        String json = "{\"id\":1,\"name\":\"John\"}";
+        final String json = "{\"id\":1,\"name\":\"John\"}";
 
-        RequestBody body = RequestBody.create(MediaType.parse("application/json; charset=utf-8"), json);
+        final RequestBody body = RequestBody.create(MediaType.parse("application/json; charset=utf-8"), json);
 
-        Request request = new Request.Builder()
+        final Request request = new Request.Builder().url(BASE_URL + "/users/detail").post(body).build();
-            .url(BASE_URL + "/users/detail")
-            .post(body)
-            .build();
 
-        Call call = client.newCall(request);
+        final Call call = client.newCall(request);
-        Response response = call.execute();
+        final Response response = call.execute();
 
         assertThat(response.code(), equalTo(200));
     }
 
     @Test
     public void whenSendMultipartRequest_thenCorrect() throws IOException {
-        RequestBody requestBody = new MultipartBody.Builder()
+        final RequestBody requestBody = new MultipartBody.Builder().setType(MultipartBody.FORM).addFormDataPart("username", "test").addFormDataPart("password", "test")
-          .setType(MultipartBody.FORM)
+                .addFormDataPart("file", "file.txt", RequestBody.create(MediaType.parse("application/octet-stream"), new File("src/test/resources/test.txt"))).build();
-          .addFormDataPart("username", "test")
-          .addFormDataPart("password", "test")
-          .addFormDataPart("file", "file.txt",
-            RequestBody.create(MediaType.parse("application/octet-stream"), new File("src/test/resources/test.txt")))
-          .build();
 
-        Request request = new Request.Builder()
+        final Request request = new Request.Builder().url(BASE_URL + "/users/multipart").post(requestBody).build();
-            .url(BASE_URL + "/users/multipart")
-            .post(requestBody)
-            .build();
 
-        Call call = client.newCall(request);
+        final Call call = client.newCall(request);
-        Response response = call.execute();
+        final Response response = call.execute();
 
         assertThat(response.code(), equalTo(200));
     }

spring-rest/src/test/java/org/baeldung/uribuilder/SpringUriBuilderTest.java

@@ -0,0 +1,53 @@
+package org.baeldung.uribuilder;
+
+import static org.junit.Assert.assertEquals;
+
+import java.util.Collections;
+
+import org.junit.Test;
+import org.springframework.web.util.UriComponents;
+import org.springframework.web.util.UriComponentsBuilder;
+
+public class SpringUriBuilderTest {
+
+	@Test
+	public void constructUri() {
+		UriComponents uriComponents = UriComponentsBuilder.newInstance().scheme("http").host("www.baeldung.com")
+				.path("/junit-5").build();
+
+		assertEquals("http://www.baeldung.com/junit-5", uriComponents.toUriString());
+	}
+
+	@Test
+	public void constructUriEncoded() {
+		UriComponents uriComponents = UriComponentsBuilder.newInstance().scheme("http").host("www.baeldung.com")
+				.path("/junit 5").build().encode();
+
+		assertEquals("http://www.baeldung.com/junit%205", uriComponents.toUriString());
+	}
+
+	@Test
+	public void constructUriFromTemplate() {
+		UriComponents uriComponents = UriComponentsBuilder.newInstance().scheme("http").host("www.baeldung.com")
+				.path("/{article-name}").buildAndExpand("junit-5");
+
+		assertEquals("http://www.baeldung.com/junit-5", uriComponents.toUriString());
+	}
+
+	@Test
+	public void constructUriWithQueryParameter() {
+		UriComponents uriComponents = UriComponentsBuilder.newInstance().scheme("http").host("www.google.com")
+				.path("/").query("q={keyword}").buildAndExpand("baeldung");
+
+		assertEquals("http://www.google.com/?q=baeldung", uriComponents.toUriString());
+	}
+	
+	@Test
+	public void expandWithRegexVar() {
+		String template = "/myurl/{name:[a-z]{1,5}}/show";
+		UriComponents uriComponents = UriComponentsBuilder.fromUriString(template).build();
+		uriComponents = uriComponents.expand(Collections.singletonMap("name", "test"));
+		
+		assertEquals("/myurl/test/show", uriComponents.getPath());
+	}
+}

spring-rest/src/test/java/org/baeldung/web/test/RequestMappingLiveTest.java

@@ -1,5 +1,6 @@
 package org.baeldung.web.test;
 
+import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.equalTo;
 
 import org.junit.Test;
@@ -31,7 +32,7 @@ public class RequestMappingLiveTest {
 
     @Test
     public void givenAcceptHeader_whenGetFoos_thenOk() {
-        RestAssured.given().accept("application/json").get(BASE_URI + "foos").then().assertThat().body(equalTo("Get some Foos with Header New"));
+        RestAssured.given().accept("application/json").get(BASE_URI + "foos").then().assertThat().body(containsString("Get some Foos with Header New"));
     }
 
     @Test

spring-security-basic-auth/src/main/java/org/baeldung/security/filter/configuration/CustomWebSecurityConfigurerAdapter.java

@@ -13,28 +13,27 @@ import org.springframework.security.web.authentication.www.BasicAuthenticationFi
 @Configuration
 @EnableWebSecurity
 public class CustomWebSecurityConfigurerAdapter extends WebSecurityConfigurerAdapter {
+
     @Autowired
     private MyBasicAuthenticationEntryPoint authenticationEntryPoint;
 
     @Autowired
-    public void configureGlobal(AuthenticationManagerBuilder auth)
+    public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception {
-            throws Exception {
+        auth.inMemoryAuthentication()
-        auth
+          .withUser("user1").password("user1Pass")
-            .inMemoryAuthentication()
+          .authorities("ROLE_USER");
-            .withUser("user1").password("user1Pass")
-            .authorities("ROLE_USER");
     }
 
     @Override
     protected void configure(HttpSecurity http) throws Exception {
         http.authorizeRequests()
-            .antMatchers("/securityNone").permitAll()
+          .antMatchers("/securityNone").permitAll()
-            .anyRequest().authenticated()
+          .anyRequest().authenticated()
-            .and()
+          .and()
-            .httpBasic()
+          .httpBasic()
-            .authenticationEntryPoint(authenticationEntryPoint);
+          .authenticationEntryPoint(authenticationEntryPoint);
 
         http.addFilterAfter(new CustomFilter(),
-                BasicAuthenticationFilter.class);
+          BasicAuthenticationFilter.class);
     }
 }

spring-security-rest/pom.xml

@@ -1,393 +1,400 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
+	<modelVersion>4.0.0</modelVersion>
-    <groupId>com.baeldung</groupId>
+	<groupId>com.baeldung</groupId>
-    <artifactId>spring-security-rest</artifactId>
+	<artifactId>spring-security-rest</artifactId>
-    <version>0.1-SNAPSHOT</version>
+	<version>0.1-SNAPSHOT</version>
 
-    <name>spring-security-rest</name>
+	<name>spring-security-rest</name>
-    <packaging>war</packaging>
+	<packaging>war</packaging>
 
-    <dependencies>
+	<dependencies>
 
-        <!-- Spring Security -->
+		<!-- Spring Security -->
 
-        <dependency>
+		<dependency>
-            <groupId>org.springframework.security</groupId>
+			<groupId>org.springframework.security</groupId>
-            <artifactId>spring-security-web</artifactId>
+			<artifactId>spring-security-web</artifactId>
-            <version>${org.springframework.security.version}</version>
+			<version>${org.springframework.security.version}</version>
-        </dependency>
+		</dependency>
-        <dependency>
+		<dependency>
-            <groupId>org.springframework.security</groupId>
+			<groupId>org.springframework.security</groupId>
-            <artifactId>spring-security-config</artifactId>
+			<artifactId>spring-security-config</artifactId>
-            <version>${org.springframework.security.version}</version>
+			<version>${org.springframework.security.version}</version>
-        </dependency>
+		</dependency>
 
-        <!-- Spring -->
+		<!-- Spring -->
 
-        <dependency>
+		<dependency>
-            <groupId>org.springframework</groupId>
+			<groupId>org.springframework</groupId>
-            <artifactId>spring-core</artifactId>
+			<artifactId>spring-core</artifactId>
-            <version>${org.springframework.version}</version>
+			<version>${org.springframework.version}</version>
-            <exclusions>
+			<exclusions>
-                <exclusion>
+				<exclusion>
-                    <artifactId>commons-logging</artifactId>
+					<artifactId>commons-logging</artifactId>
-                    <groupId>commons-logging</groupId>
+					<groupId>commons-logging</groupId>
-                </exclusion>
+				</exclusion>
-            </exclusions>
+			</exclusions>
-        </dependency>
+		</dependency>
-        <dependency>
+		<dependency>
-            <groupId>org.springframework</groupId>
+			<groupId>org.springframework</groupId>
-            <artifactId>spring-context</artifactId>
+			<artifactId>spring-context</artifactId>
-            <version>${org.springframework.version}</version>
+			<version>${org.springframework.version}</version>
-        </dependency>
+		</dependency>
-        <dependency>
+		<dependency>
-            <groupId>org.springframework</groupId>
+			<groupId>org.springframework</groupId>
-            <artifactId>spring-jdbc</artifactId>
+			<artifactId>spring-jdbc</artifactId>
-            <version>${org.springframework.version}</version>
+			<version>${org.springframework.version}</version>
-        </dependency>
+		</dependency>
-        <dependency>
+		<dependency>
-            <groupId>org.springframework</groupId>
+			<groupId>org.springframework</groupId>
-            <artifactId>spring-beans</artifactId>
+			<artifactId>spring-beans</artifactId>
-            <version>${org.springframework.version}</version>
+			<version>${org.springframework.version}</version>
-        </dependency>
+		</dependency>
-        <dependency>
+		<dependency>
-            <groupId>org.springframework</groupId>
+			<groupId>org.springframework</groupId>
-            <artifactId>spring-aop</artifactId>
+			<artifactId>spring-aop</artifactId>
-            <version>${org.springframework.version}</version>
+			<version>${org.springframework.version}</version>
-        </dependency>
+		</dependency>
-        <dependency>
+		<dependency>
-            <groupId>org.springframework</groupId>
+			<groupId>org.springframework</groupId>
-            <artifactId>spring-tx</artifactId>
+			<artifactId>spring-tx</artifactId>
-            <version>${org.springframework.version}</version>
+			<version>${org.springframework.version}</version>
-        </dependency>
+		</dependency>
-        <dependency>
+		<dependency>
-            <groupId>org.springframework</groupId>
+			<groupId>org.springframework</groupId>
-            <artifactId>spring-expression</artifactId>
+			<artifactId>spring-expression</artifactId>
-            <version>${org.springframework.version}</version>
+			<version>${org.springframework.version}</version>
-        </dependency>
+		</dependency>
 
-        <dependency>
+		<dependency>
-            <groupId>org.springframework</groupId>
+			<groupId>org.springframework</groupId>
-            <artifactId>spring-web</artifactId>
+			<artifactId>spring-web</artifactId>
-            <version>${org.springframework.version}</version>
+			<version>${org.springframework.version}</version>
-        </dependency>
+		</dependency>
-        <dependency>
+		<dependency>
-            <groupId>org.springframework</groupId>
+			<groupId>org.springframework</groupId>
-            <artifactId>spring-webmvc</artifactId>
+			<artifactId>spring-webmvc</artifactId>
-            <version>${org.springframework.version}</version>
+			<version>${org.springframework.version}</version>
-        </dependency>
+		</dependency>
 
-        <!-- Spring HATEOAS -->
+		<!-- Spring HATEOAS -->
-        <dependency>
+		<dependency>
-            <groupId>org.springframework.hateoas</groupId>
+			<groupId>org.springframework.hateoas</groupId>
-            <artifactId>spring-hateoas</artifactId>
+			<artifactId>spring-hateoas</artifactId>
-            <version>${org.springframework.hateoas.version}</version>
+			<version>${org.springframework.hateoas.version}</version>
-        </dependency>
+		</dependency>
 
-        <!-- web -->
+		<!-- web -->
 
-        <dependency>
+		<dependency>
-            <groupId>javax.servlet</groupId>
+			<groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
+			<artifactId>javax.servlet-api</artifactId>
-            <version>${javax.servlet-api.version}</version>
+			<version>${javax.servlet-api.version}</version>
-            <scope>provided</scope>
+			<scope>provided</scope>
-        </dependency>
+		</dependency>
 
-        <dependency>
+		<dependency>
-            <groupId>javax.servlet</groupId>
+			<groupId>javax.servlet</groupId>
-            <artifactId>jstl</artifactId>
+			<artifactId>jstl</artifactId>
-            <version>${jstl.version}</version>
+			<version>${jstl.version}</version>
-            <scope>runtime</scope>
+			<scope>runtime</scope>
-        </dependency>
+		</dependency>
 
-        <dependency>
+		<dependency>
-            <groupId>javax.validation</groupId>
+			<groupId>javax.validation</groupId>
-            <artifactId>validation-api</artifactId>
+			<artifactId>validation-api</artifactId>
-            <version>${javax.validation.version}</version>
+			<version>${javax.validation.version}</version>
-        </dependency>
+		</dependency>
 
 
-        <!-- marshalling -->
+		<!-- marshalling -->
-        <dependency>
+		<dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
+			<groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
+			<artifactId>jackson-databind</artifactId>
-            <version>${jackson.version}</version>
+			<version>${jackson.version}</version>
-        </dependency>
+		</dependency>
 
-        <!-- util -->
+		<!-- util -->
-        <dependency>
+		<dependency>
-            <groupId>com.google.guava</groupId>
+			<groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
+			<artifactId>guava</artifactId>
-            <version>${guava.version}</version>
+			<version>${guava.version}</version>
-        </dependency>
+		</dependency>
-        <dependency>
+		<dependency>
-            <groupId>org.apache.commons</groupId>
+			<groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
+			<artifactId>commons-lang3</artifactId>
-            <version>${commons-lang3.version}</version>
+			<version>${commons-lang3.version}</version>
-        </dependency>
+		</dependency>
-        
-        <!-- logging -->
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-            <version>${org.slf4j.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-classic</artifactId>
-            <version>${logback.version}</version>
-            <!-- <scope>runtime</scope> -->
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>jcl-over-slf4j</artifactId>
-            <version>${org.slf4j.version}</version>
-            <!-- <scope>runtime</scope> --> <!-- some spring dependencies need to compile against jcl -->
-        </dependency>
-        <dependency> <!-- needed to bridge to slf4j for projects that use the log4j APIs directly -->
-            <groupId>org.slf4j</groupId>
-            <artifactId>log4j-over-slf4j</artifactId>
-            <version>${org.slf4j.version}</version>
-        </dependency>
 
-        <!-- test scoped -->
+		<!-- logging -->
-        <dependency>
+		<dependency>
-            <groupId>org.springframework</groupId>
+			<groupId>org.slf4j</groupId>
-            <artifactId>spring-test</artifactId>
+			<artifactId>slf4j-api</artifactId>
-            <version>${org.springframework.version}</version>
+			<version>${org.slf4j.version}</version>
-            <scope>test</scope>
+		</dependency>
-        </dependency>
+		<dependency>
+			<groupId>ch.qos.logback</groupId>
+			<artifactId>logback-classic</artifactId>
+			<version>${logback.version}</version>
+			<!-- <scope>runtime</scope> -->
+		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>jcl-over-slf4j</artifactId>
+			<version>${org.slf4j.version}</version>
+			<!-- <scope>runtime</scope> --> <!-- some spring dependencies need to compile against jcl -->
+		</dependency>
+		<dependency> <!-- needed to bridge to slf4j for projects that use the log4j APIs directly -->
+			<groupId>org.slf4j</groupId>
+			<artifactId>log4j-over-slf4j</artifactId>
+			<version>${org.slf4j.version}</version>
+		</dependency>
 
-        <dependency>
+		<!-- test scoped -->
-            <groupId>org.springframework.security</groupId>
+		<dependency>
-            <artifactId>spring-security-test</artifactId>
+			<groupId>org.springframework</groupId>
-            <version>${org.springframework.security.version}</version>
+			<artifactId>spring-test</artifactId>
-            <scope>test</scope>
+			<version>${org.springframework.version}</version>
-        </dependency>
+			<scope>test</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.springframework.security</groupId>
+			<artifactId>spring-security-test</artifactId>
+			<version>${org.springframework.security.version}</version>
+			<scope>test</scope>
+		</dependency>
 
 
-        <dependency>
+		<dependency>
-            <groupId>com.jayway.restassured</groupId>
+			<groupId>com.jayway.restassured</groupId>
-            <artifactId>rest-assured</artifactId>
+			<artifactId>rest-assured</artifactId>
-            <version>${rest-assured.version}</version>
+			<version>${rest-assured.version}</version>
-            <scope>test</scope>
+			<scope>test</scope>
-            <exclusions>
+			<exclusions>
-                <exclusion>
+				<exclusion>
-                    <artifactId>commons-logging</artifactId>
+					<artifactId>commons-logging</artifactId>
-                    <groupId>commons-logging</groupId>
+					<groupId>commons-logging</groupId>
-                </exclusion>
+				</exclusion>
-            </exclusions>
+			</exclusions>
-        </dependency>
+		</dependency>
 
-        <dependency>
+		<dependency>
-            <groupId>junit</groupId>
+			<groupId>junit</groupId>
-            <artifactId>junit</artifactId>
+			<artifactId>junit</artifactId>
-            <version>${junit.version}</version>
+			<version>${junit.version}</version>
-            <scope>test</scope>
+			<scope>test</scope>
-        </dependency>
+		</dependency>
 
-        <dependency>
+		<dependency>
-            <groupId>org.hamcrest</groupId>
+			<groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-core</artifactId>
+			<artifactId>hamcrest-core</artifactId>
-            <version>${org.hamcrest.version}</version>
+			<version>${org.hamcrest.version}</version>
-            <scope>test</scope>
+			<scope>test</scope>
-        </dependency>
+		</dependency>
-        <dependency>
+		<dependency>
-            <groupId>org.hamcrest</groupId>
+			<groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-library</artifactId>
+			<artifactId>hamcrest-library</artifactId>
-            <version>${org.hamcrest.version}</version>
+			<version>${org.hamcrest.version}</version>
-            <scope>test</scope>
+			<scope>test</scope>
-        </dependency>
+		</dependency>
 
-        <dependency>
+		<dependency>
-            <groupId>org.mockito</groupId>
+			<groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
+			<artifactId>mockito-core</artifactId>
-            <version>${mockito.version}</version>
+			<version>${mockito.version}</version>
-            <scope>test</scope>
+			<scope>test</scope>
-        </dependency>
+		</dependency>
 
-        <!-- swagger -->
+		<!-- swagger -->
-        <dependency>
+		<dependency>
-            <groupId>io.springfox</groupId>
+			<groupId>io.springfox</groupId>
-            <artifactId>springfox-swagger2</artifactId>
+			<artifactId>springfox-swagger2</artifactId>
-            <version>${springfox-swagger.version}</version>
+			<version>${springfox-swagger.version}</version>
-        </dependency>
+		</dependency>
 
-        <dependency>
+		<dependency>
-            <groupId>io.springfox</groupId>
+			<groupId>io.springfox</groupId>
-            <artifactId>springfox-swagger-ui</artifactId>
+			<artifactId>springfox-swagger-ui</artifactId>
-            <version>${springfox-swagger.version}</version>
+			<version>${springfox-swagger.version}</version>
-        </dependency>
+		</dependency>
 
-    </dependencies>
+		<!-- https://mvnrepository.com/artifact/commons-fileupload/commons-fileupload -->
+		<dependency>
+			<groupId>commons-fileupload</groupId>
+			<artifactId>commons-fileupload</artifactId>
+			<version>1.3.2</version>
+		</dependency>
 
-    <build>
+	</dependencies>
-        <finalName>spring-security-rest</finalName>
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-                <filtering>true</filtering>
-            </resource>
-        </resources>
 
-        <plugins>
+	<build>
+		<finalName>spring-security-rest</finalName>
+		<resources>
+			<resource>
+				<directory>src/main/resources</directory>
+				<filtering>true</filtering>
+			</resource>
+		</resources>
 
-            <plugin>
+		<plugins>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>${maven-compiler-plugin.version}</version>
-                <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
-                </configuration>
-            </plugin>
 
-            <plugin>
+			<plugin>
-                <groupId>org.apache.maven.plugins</groupId>
+				<groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-war-plugin</artifactId>
+				<artifactId>maven-compiler-plugin</artifactId>
-                <version>${maven-war-plugin.version}</version>
+				<version>${maven-compiler-plugin.version}</version>
-            </plugin>
+				<configuration>
+					<source>1.8</source>
+					<target>1.8</target>
+				</configuration>
+			</plugin>
 
-            <plugin>
+			<plugin>
-                <groupId>org.apache.maven.plugins</groupId>
+				<groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
+				<artifactId>maven-war-plugin</artifactId>
-                <version>${maven-surefire-plugin.version}</version>
+				<version>${maven-war-plugin.version}</version>
-                <configuration>
+			</plugin>
-                    <excludes>
-                        <exclude>**/*LiveTest.java</exclude>
-                    </excludes>
-                    <systemPropertyVariables>
-                        <!-- <provPersistenceTarget>h2</provPersistenceTarget> -->
-                    </systemPropertyVariables>
-                </configuration>
-            </plugin>
 
-            <plugin>
+			<plugin>
-                <groupId>org.codehaus.cargo</groupId>
+				<groupId>org.apache.maven.plugins</groupId>
-                <artifactId>cargo-maven2-plugin</artifactId>
+				<artifactId>maven-surefire-plugin</artifactId>
-                <version>${cargo-maven2-plugin.version}</version>
+				<version>${maven-surefire-plugin.version}</version>
-                <configuration>
+				<configuration>
-                    <container>
+					<excludes>
-                        <containerId>jetty8x</containerId>
+						<exclude>**/*LiveTest.java</exclude>
-                        <type>embedded</type>
+					</excludes>
-                        <systemProperties>
+					<systemPropertyVariables>
-                            <!-- <provPersistenceTarget>cargo</provPersistenceTarget> -->
+						<!-- <provPersistenceTarget>h2</provPersistenceTarget> -->
-                        </systemProperties>
+					</systemPropertyVariables>
-                    </container>
+				</configuration>
-                    <configuration>
+			</plugin>
-                        <properties>
-                            <cargo.servlet.port>8082</cargo.servlet.port>
-                        </properties>
-                    </configuration>
-                </configuration>
-            </plugin>
 
-        </plugins>
+			<plugin>
+				<groupId>org.codehaus.cargo</groupId>
+				<artifactId>cargo-maven2-plugin</artifactId>
+				<version>${cargo-maven2-plugin.version}</version>
+				<configuration>
+					<container>
+						<containerId>jetty8x</containerId>
+						<type>embedded</type>
+						<systemProperties>
+							<!-- <provPersistenceTarget>cargo</provPersistenceTarget> -->
+						</systemProperties>
+					</container>
+					<configuration>
+						<properties>
+							<cargo.servlet.port>8082</cargo.servlet.port>
+						</properties>
+					</configuration>
+				</configuration>
+			</plugin>
 
-    </build>
+		</plugins>
 
-    <profiles>
+	</build>
-        <profile>
-            <id>live</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.codehaus.cargo</groupId>
-                        <artifactId>cargo-maven2-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>start-server</id>
-                                <phase>pre-integration-test</phase>
-                                <goals>
-                                    <goal>start</goal>
-                                </goals>
-                            </execution>
-                            <execution>
-                                <id>stop-server</id>
-                                <phase>post-integration-test</phase>
-                                <goals>
-                                    <goal>stop</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
 
-                    <plugin>
+	<profiles>
-                        <groupId>org.apache.maven.plugins</groupId>
+		<profile>
-                        <artifactId>maven-surefire-plugin</artifactId>
+			<id>live</id>
-                        <executions>
+			<build>
-                            <execution>
+				<plugins>
-                                <phase>integration-test</phase>
+					<plugin>
-                                <goals>
+						<groupId>org.codehaus.cargo</groupId>
-                                    <goal>test</goal>
+						<artifactId>cargo-maven2-plugin</artifactId>
-                                </goals>
+						<executions>
-                                <configuration>
+							<execution>
-                                    <excludes>
+								<id>start-server</id>
-                                        <exclude>none</exclude>
+								<phase>pre-integration-test</phase>
-                                    </excludes>
+								<goals>
-                                    <includes>
+									<goal>start</goal>
-                                        <include>**/*LiveTest.java</include>
+								</goals>
-                                    </includes>
+							</execution>
-                                    <systemPropertyVariables>
+							<execution>
-                                        <webTarget>cargo</webTarget>
+								<id>stop-server</id>
-                                    </systemPropertyVariables>
+								<phase>post-integration-test</phase>
-                                </configuration>
+								<goals>
-                            </execution>
+									<goal>stop</goal>
-                        </executions>
+								</goals>
-                    </plugin>
+							</execution>
+						</executions>
+					</plugin>
 
-                </plugins>
+					<plugin>
-            </build>
+						<groupId>org.apache.maven.plugins</groupId>
-        </profile>
+						<artifactId>maven-surefire-plugin</artifactId>
-    </profiles>
+						<executions>
-    
+							<execution>
-    
+								<phase>integration-test</phase>
-    <properties>
+								<goals>
-        <!-- Spring -->
+									<goal>test</goal>
-        <org.springframework.version>4.2.5.RELEASE</org.springframework.version>
+								</goals>
-        <org.springframework.security.version>4.0.4.RELEASE</org.springframework.security.version>
+								<configuration>
-        <org.springframework.hateoas.version>0.19.0.RELEASE</org.springframework.hateoas.version>
+									<excludes>
+										<exclude>none</exclude>
+									</excludes>
+									<includes>
+										<include>**/*LiveTest.java</include>
+									</includes>
+									<systemPropertyVariables>
+										<webTarget>cargo</webTarget>
+									</systemPropertyVariables>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
 
-        <!-- persistence -->
+				</plugins>
-        <hibernate.version>4.3.11.Final</hibernate.version>
+			</build>
-        <mysql-connector-java.version>5.1.38</mysql-connector-java.version>
+		</profile>
+	</profiles>
 
-        <!-- logging -->
-        <org.slf4j.version>1.7.13</org.slf4j.version>
-        <logback.version>1.1.3</logback.version>
 
-        <!-- various -->
+	<properties>
-        <hibernate-validator.version>5.2.2.Final</hibernate-validator.version>
+		<!-- Spring -->
-        <javax.servlet-api.version>3.0.1</javax.servlet-api.version>
+		<org.springframework.version>4.2.5.RELEASE</org.springframework.version>
-        <javax.validation.version>1.1.0.Final</javax.validation.version>
+		<org.springframework.security.version>4.0.4.RELEASE</org.springframework.security.version>
-        <jstl.version>1.2</jstl.version>
+		<org.springframework.hateoas.version>0.19.0.RELEASE</org.springframework.hateoas.version>
-        <jackson.version>2.7.8</jackson.version>
 
-        <!-- util -->
+		<!-- persistence -->
-        <guava.version>19.0</guava.version>
+		<hibernate.version>4.3.11.Final</hibernate.version>
-        <commons-lang3.version>3.4</commons-lang3.version>
+		<mysql-connector-java.version>5.1.38</mysql-connector-java.version>
 
-        <!-- testing -->
+		<!-- logging -->
-        <org.hamcrest.version>1.3</org.hamcrest.version>
+		<org.slf4j.version>1.7.13</org.slf4j.version>
-        <junit.version>4.12</junit.version>
+		<logback.version>1.1.3</logback.version>
-        <mockito.version>1.10.19</mockito.version>
-        <rest-assured.version>2.9.0</rest-assured.version>
 
-        <!-- swagger -->
+		<!-- various -->
-        <springfox-swagger.version>2.4.0</springfox-swagger.version>
+		<hibernate-validator.version>5.2.2.Final</hibernate-validator.version>
+		<javax.servlet-api.version>3.0.1</javax.servlet-api.version>
+		<javax.validation.version>1.1.0.Final</javax.validation.version>
+		<jstl.version>1.2</jstl.version>
+		<jackson.version>2.7.8</jackson.version>
 
-        <httpcore.version>4.4.1</httpcore.version>
+		<!-- util -->
-        <httpclient.version>4.5</httpclient.version>
+		<guava.version>19.0</guava.version>
+		<commons-lang3.version>3.4</commons-lang3.version>
 
-        <rest-assured.version>2.9.0</rest-assured.version>
+		<!-- testing -->
+		<org.hamcrest.version>1.3</org.hamcrest.version>
+		<junit.version>4.12</junit.version>
+		<mockito.version>1.10.19</mockito.version>
+		<rest-assured.version>2.9.0</rest-assured.version>
 
-        <!-- Maven plugins -->
+		<!-- swagger -->
-        <maven-compiler-plugin.version>3.5.1</maven-compiler-plugin.version>
+		<springfox-swagger.version>2.4.0</springfox-swagger.version>
-        <maven-war-plugin.version>2.6</maven-war-plugin.version>
-        <maven-surefire-plugin.version>2.19.1</maven-surefire-plugin.version>
-        <cargo-maven2-plugin.version>1.4.18</cargo-maven2-plugin.version>
 
-    </properties>
+		<httpcore.version>4.4.1</httpcore.version>
+		<httpclient.version>4.5</httpclient.version>
+
+		<rest-assured.version>2.9.0</rest-assured.version>
+
+		<!-- Maven plugins -->
+		<maven-compiler-plugin.version>3.5.1</maven-compiler-plugin.version>
+		<maven-war-plugin.version>2.6</maven-war-plugin.version>
+		<maven-surefire-plugin.version>2.19.1</maven-surefire-plugin.version>
+		<cargo-maven2-plugin.version>1.4.18</cargo-maven2-plugin.version>
+
+	</properties>
 
 </project>

spring-security-rest/src/main/java/org/baeldung/web/controller/AsyncController.java

@@ -0,0 +1,24 @@
+package org.baeldung.web.controller;
+
+import java.util.concurrent.Callable;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.multipart.MultipartFile;
+
+@Controller
+public class AsyncController {
+
+	@RequestMapping(method = RequestMethod.POST, value = "/upload")
+	public Callable<Boolean> processUpload(final MultipartFile file) {
+
+		return new Callable<Boolean>() {
+			public Boolean call() throws Exception {
+				// ...
+				return true;
+			}
+		};
+	}
+
+}

spring-security-rest/src/main/webapp/WEB-INF/api-servlet.xml

@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd" >
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd">
 
+	<bean id="multipartResolver"
+		class="org.springframework.web.multipart.commons.CommonsMultipartResolver">
+		<property name="maxUploadSize" value="1000000" />
+	</bean>
 </beans>

spring-security-rest/src/main/webapp/WEB-INF/web.xml

@@ -1,54 +1,57 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
+<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="
+	xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
+	xsi:schemaLocation="
       http://java.sun.com/xml/ns/javaee
-      http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" id="WebApp_ID" version="3.0"
+      http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
->
+	id="WebApp_ID" version="3.0">
 
-    <display-name>Spring MVC Application</display-name>
+	<display-name>Spring MVC Application</display-name>
 
-    <!-- Spring root -->
+	<!-- Spring root -->
-    <context-param>
+	<context-param>
-        <param-name>contextClass</param-name>
+		<param-name>contextClass</param-name>
-        <param-value>
+		<param-value>
          org.springframework.web.context.support.AnnotationConfigWebApplicationContext
       </param-value>
-    </context-param>
+	</context-param>
-    <context-param>
+	<context-param>
-        <param-name>contextConfigLocation</param-name>
+		<param-name>contextConfigLocation</param-name>
-        <param-value>org.baeldung.spring</param-value>
+		<param-value>org.baeldung.spring</param-value>
-    </context-param>
+	</context-param>
 
-    <listener>
+	<listener>
-        <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
+		<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
-    </listener>
+	</listener>
 
-    <!-- Spring child -->
+	<!-- Spring child -->
-    <servlet>
+	<servlet>
-        <servlet-name>api</servlet-name>
+		<servlet-name>api</servlet-name>
-        <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>        
+		<servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
-        <init-param>
+		<init-param>
-	        <param-name>throwExceptionIfNoHandlerFound</param-name>
+			<param-name>throwExceptionIfNoHandlerFound</param-name>
-	        <param-value>true</param-value>
+			<param-value>true</param-value>
-	    </init-param>
+		</init-param>
-    </servlet>
+	</servlet>
-    <servlet-mapping>
+	<servlet-mapping>
-        <servlet-name>api</servlet-name>
+		<servlet-name>api</servlet-name>
-        <url-pattern>/api/*</url-pattern>
+		<url-pattern>/api/*</url-pattern>
-    </servlet-mapping>
+	</servlet-mapping>
 
-    <!-- Spring Security -->
+	<!-- Spring Security -->
-    <filter>
+	<filter>
-        <filter-name>springSecurityFilterChain</filter-name>
+		<filter-name>springSecurityFilterChain</filter-name>
-        <filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class>
+		<filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class>
-    </filter>
+	</filter>
-    <filter-mapping>
+	<filter-mapping>
-        <filter-name>springSecurityFilterChain</filter-name>
+		<filter-name>springSecurityFilterChain</filter-name>
-        <url-pattern>/*</url-pattern>
+		<url-pattern>/*</url-pattern>
-    </filter-mapping>
+		<dispatcher>REQUEST</dispatcher>
+		<dispatcher>ASYNC</dispatcher>
+	</filter-mapping>
 
-    <!-- <welcome-file-list> -->
+	<!-- <welcome-file-list> -->
-    <!-- <welcome-file>index.html</welcome-file> -->
+	<!-- <welcome-file>index.html</welcome-file> -->
-    <!-- </welcome-file-list> -->
+	<!-- </welcome-file-list> -->
 
 </web-app>

spring-security-rest/src/test/java/org/baeldung/web/AsyncControllerTest.java

@@ -0,0 +1,51 @@
+package org.baeldung.web;
+
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+import org.baeldung.spring.ClientWebConfig;
+import org.baeldung.spring.SecurityJavaConfig;
+import org.baeldung.spring.WebConfig;
+import org.baeldung.web.controller.AsyncController;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.mock.web.MockHttpSession;
+import org.springframework.mock.web.MockMultipartFile;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.web.WebAppConfiguration;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
+import org.springframework.test.web.servlet.setup.MockMvcBuilders;
+import org.springframework.web.context.WebApplicationContext;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@WebAppConfiguration
+@ContextConfiguration(classes = { ClientWebConfig.class, SecurityJavaConfig.class, WebConfig.class})
+public class AsyncControllerTest {
+
+	@Autowired
+	WebApplicationContext wac;
+	@Autowired
+	MockHttpSession session;
+	
+	@Mock
+	AsyncController controller;
+
+	private MockMvc mockMvc;
+
+	@Before
+	public void setup() {
+		mockMvc = MockMvcBuilders.webAppContextSetup(wac).build();
+	}
+
+	@Test
+	public void testProcessUpload() throws Exception {
+		MockMultipartFile jsonFile = new MockMultipartFile("json", "", "application/json",
+				"{\"json\": \"someValue\"}".getBytes());
+		mockMvc.perform(MockMvcRequestBuilders.fileUpload("/upload").file(jsonFile)).andExpect(status().isOk());
+	}
+
+}

spring-security-rest/src/test/java/org/baeldung/web/TestConfig.java

@@ -1,10 +1,19 @@
 package org.baeldung.web;
 
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.web.multipart.MultipartResolver;
+import org.springframework.web.multipart.commons.CommonsMultipartResolver;
 
 @Configuration
 @ComponentScan({ "org.baeldung.web" })
 public class TestConfig {
 
+	@Bean
+	public MultipartResolver multipartResolver() {
+		CommonsMultipartResolver multipartResolver = new CommonsMultipartResolver();
+		return multipartResolver;
+	}
+
 }