From ace948a705fc62c23b2d81e6f89aecbd9c340517 Mon Sep 17 00:00:00 2001
From: "nnhai1991@gmail.com" <Hai Nguyen>
Date: Sun, 1 Jul 2018 17:25:39 +0800
Subject: [PATCH 01/28] BAEL-1846: Java Image to Base64 String

---
 .../FileToBase64StringConversion.java         | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 core-java-8/src/main/java/com/baeldung/fileToBase64StringConversion/FileToBase64StringConversion.java

diff --git a/core-java-8/src/main/java/com/baeldung/fileToBase64StringConversion/FileToBase64StringConversion.java b/core-java-8/src/main/java/com/baeldung/fileToBase64StringConversion/FileToBase64StringConversion.java
new file mode 100644
index 0000000000..aa3bc9adee
--- /dev/null
+++ b/core-java-8/src/main/java/com/baeldung/fileToBase64StringConversion/FileToBase64StringConversion.java
@@ -0,0 +1,32 @@
+package com.baeldung.fileToBase64StringConversion;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.util.Base64;
+
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.FilenameUtils;
+
+public class FileToBase64StringConversion {
+	public static void main(String[] args) throws FileNotFoundException, IOException {
+		//read file path from first argument
+		String filePath = args[0];
+		
+		byte[] fileContent = FileUtils.readFileToByteArray(new File(filePath));
+		String encodedString = Base64.getEncoder().encodeToString(fileContent);
+
+		//print encoded base64 String
+		System.out.println(encodedString);
+		
+		//construct output file name
+		String extension = FilenameUtils.getExtension(filePath);
+		String baseFileName = FilenameUtils.getBaseName(filePath);
+		String directory = new File(filePath).getParentFile().getAbsolutePath();
+		String outputFileName = directory+File.separator+baseFileName+"_copy."+extension;
+		
+		//decode the string and write to file
+		byte[] decodedBytes = Base64.getDecoder().decode(encodedString);
+		FileUtils.writeByteArrayToFile(new File(outputFileName), decodedBytes);
+	}
+}

From 7de2556d6b35381b087744e849e8e455038b0237 Mon Sep 17 00:00:00 2001
From: Hai Nguyen <nn.hai@samsung.com>
Date: Tue, 3 Jul 2018 17:33:01 +0800
Subject: [PATCH 02/28] Move from using main method to Junit test

---
 .../FileToBase64StringConversion.java         | 32 -----------
 .../FileToBase64StringConversionTest.java     | 53 +++++++++++++++++++
 2 files changed, 53 insertions(+), 32 deletions(-)
 delete mode 100644 core-java-8/src/main/java/com/baeldung/fileToBase64StringConversion/FileToBase64StringConversion.java
 create mode 100644 core-java-8/src/test/java/com/baeldung/fileToBase64StringConversion/FileToBase64StringConversionTest.java

diff --git a/core-java-8/src/main/java/com/baeldung/fileToBase64StringConversion/FileToBase64StringConversion.java b/core-java-8/src/main/java/com/baeldung/fileToBase64StringConversion/FileToBase64StringConversion.java
deleted file mode 100644
index aa3bc9adee..0000000000
--- a/core-java-8/src/main/java/com/baeldung/fileToBase64StringConversion/FileToBase64StringConversion.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.baeldung.fileToBase64StringConversion;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.util.Base64;
-
-import org.apache.commons.io.FileUtils;
-import org.apache.commons.io.FilenameUtils;
-
-public class FileToBase64StringConversion {
-	public static void main(String[] args) throws FileNotFoundException, IOException {
-		//read file path from first argument
-		String filePath = args[0];
-		
-		byte[] fileContent = FileUtils.readFileToByteArray(new File(filePath));
-		String encodedString = Base64.getEncoder().encodeToString(fileContent);
-
-		//print encoded base64 String
-		System.out.println(encodedString);
-		
-		//construct output file name
-		String extension = FilenameUtils.getExtension(filePath);
-		String baseFileName = FilenameUtils.getBaseName(filePath);
-		String directory = new File(filePath).getParentFile().getAbsolutePath();
-		String outputFileName = directory+File.separator+baseFileName+"_copy."+extension;
-		
-		//decode the string and write to file
-		byte[] decodedBytes = Base64.getDecoder().decode(encodedString);
-		FileUtils.writeByteArrayToFile(new File(outputFileName), decodedBytes);
-	}
-}
diff --git a/core-java-8/src/test/java/com/baeldung/fileToBase64StringConversion/FileToBase64StringConversionTest.java b/core-java-8/src/test/java/com/baeldung/fileToBase64StringConversion/FileToBase64StringConversionTest.java
new file mode 100644
index 0000000000..4e023fbe64
--- /dev/null
+++ b/core-java-8/src/test/java/com/baeldung/fileToBase64StringConversion/FileToBase64StringConversionTest.java
@@ -0,0 +1,53 @@
+package com.baeldung.fileToBase64StringConversion;
+
+import static org.junit.Assert.assertTrue;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.Base64;
+import java.util.Collection;
+
+import org.apache.commons.io.FileUtils;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+@RunWith(Parameterized.class)
+public class FileToBase64StringConversionTest {
+
+	private String inputFilePath;
+	private String outputFilePath;
+
+	public FileToBase64StringConversionTest(String inputFilePath, String outputFilePath) {
+		this.inputFilePath = inputFilePath;
+		this.outputFilePath = outputFilePath;
+	}
+
+	@Parameterized.Parameters
+	public static Collection<String[]> parameters() {
+		return Arrays.asList(new String[][] { { "", "" } });
+	}
+
+	@Test
+	public void fileToBase64StringConversion() throws FileNotFoundException, IOException {
+		File outputFile = new File(outputFilePath);
+		File inputFile = new File(inputFilePath);
+
+		if (!inputFile.exists())
+			return;
+
+		byte[] fileContent = FileUtils.readFileToByteArray(inputFile);
+		String encodedString = Base64.getEncoder().encodeToString(fileContent);
+
+		// print encoded base64 String
+		System.out.println(encodedString);
+
+		// decode the string and write to file
+		byte[] decodedBytes = Base64.getDecoder().decode(encodedString);
+		FileUtils.writeByteArrayToFile(outputFile, decodedBytes);
+
+		assertTrue(outputFile.length() == fileContent.length);
+	}
+}

From 06f9a5f445d2235c4ebeaeccc9dfd972b7abf445 Mon Sep 17 00:00:00 2001
From: "nnhai1991@gmail.com" <Hai Nguyen>
Date: Tue, 3 Jul 2018 23:38:07 +0800
Subject: [PATCH 03/28] Update to use environment variables for testing

---
 ...FileToBase64StringConversionUnitTest.java} | 32 ++++++++-----------
 1 file changed, 14 insertions(+), 18 deletions(-)
 rename core-java-8/src/test/java/com/baeldung/fileToBase64StringConversion/{FileToBase64StringConversionTest.java => FileToBase64StringConversionUnitTest.java} (62%)

diff --git a/core-java-8/src/test/java/com/baeldung/fileToBase64StringConversion/FileToBase64StringConversionTest.java b/core-java-8/src/test/java/com/baeldung/fileToBase64StringConversion/FileToBase64StringConversionUnitTest.java
similarity index 62%
rename from core-java-8/src/test/java/com/baeldung/fileToBase64StringConversion/FileToBase64StringConversionTest.java
rename to core-java-8/src/test/java/com/baeldung/fileToBase64StringConversion/FileToBase64StringConversionUnitTest.java
index 4e023fbe64..1842554534 100644
--- a/core-java-8/src/test/java/com/baeldung/fileToBase64StringConversion/FileToBase64StringConversionTest.java
+++ b/core-java-8/src/test/java/com/baeldung/fileToBase64StringConversion/FileToBase64StringConversionUnitTest.java
@@ -5,33 +5,29 @@ import static org.junit.Assert.assertTrue;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
-import java.util.Arrays;
 import java.util.Base64;
-import java.util.Collection;
 
 import org.apache.commons.io.FileUtils;
 import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
 
-@RunWith(Parameterized.class)
-public class FileToBase64StringConversionTest {
+public class FileToBase64StringConversionUnitTest {
 
-	private String inputFilePath;
-	private String outputFilePath;
-
-	public FileToBase64StringConversionTest(String inputFilePath, String outputFilePath) {
-		this.inputFilePath = inputFilePath;
-		this.outputFilePath = outputFilePath;
-	}
-
-	@Parameterized.Parameters
-	public static Collection<String[]> parameters() {
-		return Arrays.asList(new String[][] { { "", "" } });
-	}
+	private String inputFilePath = "";
+	private String outputFilePath = "";
 
 	@Test
+	// file paths are from environment arguments:
+	// mvn test
+	// -Dtest=com.baeldung.fileToBase64StringConversion.FileToBase64StringConversionUnitTest
+	// -DinputFilePath="abc.png" -DoutFilePath="abc.png"
+
 	public void fileToBase64StringConversion() throws FileNotFoundException, IOException {
+		inputFilePath = System.getProperty("inputFilePath");
+		outputFilePath = System.getProperty("outputFilePath");
+
+		if (inputFilePath == null || outputFilePath == null)
+			return;
+
 		File outputFile = new File(outputFilePath);
 		File inputFile = new File(inputFilePath);
 

From f325351275eee451ec78c1a5cbfe79e8268f0b24 Mon Sep 17 00:00:00 2001
From: "nnhai1991@gmail.com" <Hai Nguyen>
Date: Thu, 5 Jul 2018 21:03:43 +0800
Subject: [PATCH 04/28] reformat and add test file

---
 .../FileToBase64StringConversionUnitTest.java |  54 ++++++++----------
 core-java-8/src/test/resources/test_image.jpg | Bin 0 -> 2865 bytes
 2 files changed, 24 insertions(+), 30 deletions(-)
 create mode 100644 core-java-8/src/test/resources/test_image.jpg

diff --git a/core-java-8/src/test/java/com/baeldung/fileToBase64StringConversion/FileToBase64StringConversionUnitTest.java b/core-java-8/src/test/java/com/baeldung/fileToBase64StringConversion/FileToBase64StringConversionUnitTest.java
index 1842554534..eef21a98c9 100644
--- a/core-java-8/src/test/java/com/baeldung/fileToBase64StringConversion/FileToBase64StringConversionUnitTest.java
+++ b/core-java-8/src/test/java/com/baeldung/fileToBase64StringConversion/FileToBase64StringConversionUnitTest.java
@@ -3,7 +3,6 @@ package com.baeldung.fileToBase64StringConversion;
 import static org.junit.Assert.assertTrue;
 
 import java.io.File;
-import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.util.Base64;
 
@@ -12,38 +11,33 @@ import org.junit.Test;
 
 public class FileToBase64StringConversionUnitTest {
 
-	private String inputFilePath = "";
-	private String outputFilePath = "";
+    private String inputFilePath = "test_image.jpg";
+    private String outputFilePath = "test_image_copy.jpg";
 
-	@Test
-	// file paths are from environment arguments:
-	// mvn test
-	// -Dtest=com.baeldung.fileToBase64StringConversion.FileToBase64StringConversionUnitTest
-	// -DinputFilePath="abc.png" -DoutFilePath="abc.png"
+    @Test
+    public void fileToBase64StringConversion() throws IOException {
+        //load file from /src/test/resources
+        ClassLoader classLoader = getClass().getClassLoader();
+        File inputFile = new File(classLoader
+          .getResource(inputFilePath)
+          .getFile());
 
-	public void fileToBase64StringConversion() throws FileNotFoundException, IOException {
-		inputFilePath = System.getProperty("inputFilePath");
-		outputFilePath = System.getProperty("outputFilePath");
+        byte[] fileContent = FileUtils.readFileToByteArray(inputFile);
+        String encodedString = Base64
+          .getEncoder()
+          .encodeToString(fileContent);
 
-		if (inputFilePath == null || outputFilePath == null)
-			return;
+        //create output file
+        File outputFile = new File(inputFile
+          .getParentFile()
+          .getAbsolutePath() + File.pathSeparator + outputFilePath);
 
-		File outputFile = new File(outputFilePath);
-		File inputFile = new File(inputFilePath);
+        // decode the string and write to file
+        byte[] decodedBytes = Base64
+          .getDecoder()
+          .decode(encodedString);
+        FileUtils.writeByteArrayToFile(outputFile, decodedBytes);
 
-		if (!inputFile.exists())
-			return;
-
-		byte[] fileContent = FileUtils.readFileToByteArray(inputFile);
-		String encodedString = Base64.getEncoder().encodeToString(fileContent);
-
-		// print encoded base64 String
-		System.out.println(encodedString);
-
-		// decode the string and write to file
-		byte[] decodedBytes = Base64.getDecoder().decode(encodedString);
-		FileUtils.writeByteArrayToFile(outputFile, decodedBytes);
-
-		assertTrue(outputFile.length() == fileContent.length);
-	}
+        assertTrue(FileUtils.contentEquals(inputFile, outputFile));
+    }
 }
diff --git a/core-java-8/src/test/resources/test_image.jpg b/core-java-8/src/test/resources/test_image.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..d0db1627c9b8a4db0fb023a7229e64b282b9a70a
GIT binary patch
literal 2865
zcmbVO3v5$m6h8OW4u%bbvBAJ`83QI^OUEX362SGbtpi5sHW0D|y6$$ptZU1?w;K>N
zFj0_@@bZCVi98hzi2(%xH8Mm{g8_uW251BknSudP#0Ol@fBPIkQ2(a?{q8y6fBy5G
zdwTz>9qKpGyS&6+0u%*Mh96Kbz+&5c(E~7L3XBARB;cq%z#yXV15^fZ8U`q*2F9?H
z%877jfMp`E5zZ{Ul7W%Q>d2MeNXHnd8<{vJRP`E|9NvHukiCH*Uyx@6li5CnB@uCG
zc$fxzpL%p<=PKC6b}jC){_1V>GwMbC6}!bU+u@vAVxMf&MCm(R!Jv=k0UG^^<SaGw
zPtBag>pOvl0gwzCknD2H!D5GFGKopJTI_Dqt<zfWa5DG){%+)ZZ<6Z-*^T0p&=IJU
z-HnLn18}YGpriokQ_*f}R)PeR98x7r5b+#>>%$m*kXjqY%Qa4w(}J8<#0Iz5Rfl*7
z;!(8;_WA@I&H))1r&RC@lIZ41EgVw7Bl-l*5uP66PGCL=Hu^%SSsR0K?j<)=PQq&r
zYF}FCvJ#w!c!%3%t3;fQ_-vCny&{6|1{Jdt@o)e-E7VY3j2L^7F7rqw)rc_;EqOy_
zQM_THw`vC3)6jm<Ut2LXvbMu5TSy0Hq5ZB`u#@^`0x-O&*sBm@9A<(Pa1uV|z<BBe
zs}1oe#48#ClSmF2li4FTRT4YNr(>blLh>Z`qjO#54#XLVFABa=!pFUszk-S*k^`IR
z_f?R6aWB>?$eLb^!)7Ypsxq|WzN}A?sv>LI)gH0L9^vouN@c`O)}9Uev>wIWI9duh
ziFVwJ%X3M#Qp6aOa|r%wQcr@LU^?Xj0Rm8qvm5+y2Y7HoDVXsZ1PMJJ5W$BQ0lflR
z1iXuKa<z3bG@xCCCe0_~?9iCul~FDa^=S3O6^-i#OXfBRVI(hHMXNU!lLrglh0s?2
z4{^e|bVcF>*mTy&7T|XrJDDBNn%E-X*@^6v>;%?|)*^OXEVcvJL=};Ix^S0poO!sT
zpz)@o_BPb0fD7jf$OwQOi_onqt2075aZighTXY{=bv>b0BCc$RF><?Abn3%u&RycJ
zaP2sEa_3_)c<vl`9zUH}o4A%h+#jhjc~T-i(Lguez0V@bDn_L~ZDk`?K}5|$g67=B
z7)KU;&_BLgJG-~$WUnKOJpR=gaVx2Uu&m-%1+<KcTa9Oo*NpAPO~$RpADMN`ZstQ~
zAG4o13OsXwX=6TO4l{2v@5lHL>Y>=P2a-AIE0Q<quBgJqT4To=%!Yx6p$4mAuwj^C
za*V|r(hd2BGQ$Y;42(Uucz^SW%CRmpakprF?!OoLt%$Km_zb8=umi;Sj@^2o8Z#E5
z8DmOVZ_;mmSb*HbUtUBJo5|+0_ItY9M0!3NTW8Z*b;ZEzM(T=m`MPp~qrYX{2=o=<
zY)i}y`y<Barc_Xb`Q$tSOCY#F66?JRKiX&<%NOI(C-8Q^J8u;4^7(kpCG(OX3sRF%
zmj~qBB<lcfI<@nVN;?*}DN_K(|Ag<p<8j-p5Wo%@AiXed%fWYLzt;fvj&X;irf@tw
zsJ{S^Jq4q+d#aZi-(O#=>P>u)>DL0>S);0dZdTPhTQL54fCE1D0Hh>ADx@-07SJga
zlR~M70FN4qqqGqT3>3|<oKBzAqh~S_cJ~IFVi=lbIF9_Gpq@rQuqj-hA^F9+zSCU#
zta+)Um#o>8G}OGat)KJ6_3VOLsijBHwDkT1GKLKwk@MKd!pFyqH5EN!vD!*X%k1Tq
zRn^mHpgeb-;HmeDb7dve)I5K|!e^I0_x!TuFRWO*?!}j0er5fu8#Zs*y6yEhw!it-
zu6N$uz308X`}QCF_|PYZk9_*s=U<*Y)qeU+N9WlK7r(vq-R1AEbp3GS=bOL$dh55_
zzyCpWQNV;{;T%?WkFFHdMYAl!>WMCjZYIK0SZ+wZu21nay=z|ItkFx7Qq5~N?QH8Y
zw7_}2U#)baXIggQg<&^{G)>vR6V~#-l*NR_b)Cb*V30P9g9aI`Mx)VMW5rRU)R3X9
zRJ5@&GPY~u5E<uVL&YFeR(7_j&@`v8aL(n{#jThB^H9ISKcKXF7J4xhHWQNq6QL_-
N^9mqe^>`e1{td~?vHAc2

literal 0
HcmV?d00001


From e92843493f1b8d2ff34a4f377e56f6472e5ff47b Mon Sep 17 00:00:00 2001
From: Hai Nguyen <nn.hai@samsung.com>
Date: Mon, 6 Aug 2018 11:33:13 +0800
Subject: [PATCH 05/28] spring boot jsp security taglibs

---
 spring-boot-security-taglibs/.gitignore       | 13 +++
 spring-boot-security-taglibs/README.md        | 19 +++++
 spring-boot-security-taglibs/pom.xml          | 84 +++++++++++++++++++
 .../org/baeldung/security/Application.java    | 23 +++++
 .../org/baeldung/security/HomeController.java | 18 ++++
 .../org/baeldung/security/SecurityConfig.java | 70 ++++++++++++++++
 .../src/main/resources/application.properties |  8 ++
 .../src/main/webapp/WEB-INF/views/home.jsp    | 20 +++++
 .../baeldung/security/HomeControllerTest.java | 27 ++++++
 9 files changed, 282 insertions(+)
 create mode 100644 spring-boot-security-taglibs/.gitignore
 create mode 100644 spring-boot-security-taglibs/README.md
 create mode 100644 spring-boot-security-taglibs/pom.xml
 create mode 100644 spring-boot-security-taglibs/src/main/java/org/baeldung/security/Application.java
 create mode 100644 spring-boot-security-taglibs/src/main/java/org/baeldung/security/HomeController.java
 create mode 100644 spring-boot-security-taglibs/src/main/java/org/baeldung/security/SecurityConfig.java
 create mode 100644 spring-boot-security-taglibs/src/main/resources/application.properties
 create mode 100644 spring-boot-security-taglibs/src/main/webapp/WEB-INF/views/home.jsp
 create mode 100644 spring-boot-security-taglibs/src/test/java/org/baeldung/security/HomeControllerTest.java

diff --git a/spring-boot-security-taglibs/.gitignore b/spring-boot-security-taglibs/.gitignore
new file mode 100644
index 0000000000..83c05e60c8
--- /dev/null
+++ b/spring-boot-security-taglibs/.gitignore
@@ -0,0 +1,13 @@
+*.class
+
+#folders#
+/target
+/neoDb*
+/data
+/src/main/webapp/WEB-INF/classes
+*/META-INF/*
+
+# Packaged files #
+*.jar
+*.war
+*.ear
\ No newline at end of file
diff --git a/spring-boot-security-taglibs/README.md b/spring-boot-security-taglibs/README.md
new file mode 100644
index 0000000000..f7eb314869
--- /dev/null
+++ b/spring-boot-security-taglibs/README.md
@@ -0,0 +1,19 @@
+=========
+
+## Spring Security Login Example Project
+
+###The Course
+The "Learn Spring Security" Classes: http://github.learnspringsecurity.com
+
+### Relevant Articles: 
+- [Spring Security Form Login](http://www.baeldung.com/spring-security-login)
+- [Spring Security Logout](http://www.baeldung.com/spring-security-logout)
+- [Spring Security Expressions – hasRole Example](http://www.baeldung.com/spring-security-expressions-basic)
+- [Spring HTTP/HTTPS Channel Security](http://www.baeldung.com/spring-channel-security-https)
+- [Spring Security - Customize the 403 Forbidden/Access Denied Page](http://www.baeldung.com/spring-security-custom-access-denied-page)
+- [Spring Security – Redirect to the Previous URL After Login](http://www.baeldung.com/spring-security-redirect-login)
+
+### Build the Project
+```
+mvn clean install
+```
diff --git a/spring-boot-security-taglibs/pom.xml b/spring-boot-security-taglibs/pom.xml
new file mode 100644
index 0000000000..bd04ec3c0b
--- /dev/null
+++ b/spring-boot-security-taglibs/pom.xml
@@ -0,0 +1,84 @@
+<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">
+	<modelVersion>4.0.0</modelVersion>
+
+	<artifactId>spring-boot-security-taglibs</artifactId>
+	<packaging>jar</packaging>
+	<name>spring-boot-security-taglibs</name>
+	<description>spring 5 security sample project</description>
+
+	<parent>
+		<groupId>com.baeldung</groupId>
+		<artifactId>parent-boot-2</artifactId>
+		<version>0.0.1-SNAPSHOT</version>
+		<relativePath>../parent-boot-2</relativePath>
+	</parent>
+
+	<dependencies>
+
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-security</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-web</artifactId>
+		</dependency>
+
+		<!-- security taglib -->
+		<dependency>
+			<groupId>org.springframework.security</groupId>
+			<artifactId>spring-security-taglibs</artifactId>
+		</dependency>
+
+		<!-- JSTL -->
+		<dependency>
+			<groupId>org.apache.tomcat.embed</groupId>
+			<artifactId>tomcat-embed-jasper</artifactId>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>javax.servlet</groupId>
+			<artifactId>jstl</artifactId>
+		</dependency>
+		<!-- test -->
+		<dependency>
+			<groupId>net.sourceforge.htmlunit</groupId>
+			<artifactId>htmlunit</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-test</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.security</groupId>
+			<artifactId>spring-security-test</artifactId>
+			<scope>test</scope>
+		</dependency>
+
+	</dependencies>
+
+	<build>
+		<finalName>spring-5-security-taglibs</finalName>
+		<resources>
+			<resource>
+				<directory>src/main/resources</directory>
+				<filtering>true</filtering>
+			</resource>
+		</resources>
+
+		<plugins>
+		</plugins>
+
+	</build>
+
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+		<java.version>1.8</java.version>
+	</properties>
+
+</project>
\ No newline at end of file
diff --git a/spring-boot-security-taglibs/src/main/java/org/baeldung/security/Application.java b/spring-boot-security-taglibs/src/main/java/org/baeldung/security/Application.java
new file mode 100644
index 0000000000..eef41bd375
--- /dev/null
+++ b/spring-boot-security-taglibs/src/main/java/org/baeldung/security/Application.java
@@ -0,0 +1,23 @@
+package org.baeldung.security;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.builder.SpringApplicationBuilder;
+import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
+
+@SpringBootApplication
+public class Application extends SpringBootServletInitializer {
+
+    public Application() {
+        super();
+    }
+
+    public static void main(String[] args) {
+        SpringApplication.run(Application.class, args);
+    }
+
+    @Override
+    protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) {
+        return builder.sources(Application.class);
+    }
+}
diff --git a/spring-boot-security-taglibs/src/main/java/org/baeldung/security/HomeController.java b/spring-boot-security-taglibs/src/main/java/org/baeldung/security/HomeController.java
new file mode 100644
index 0000000000..0eb6ee242d
--- /dev/null
+++ b/spring-boot-security-taglibs/src/main/java/org/baeldung/security/HomeController.java
@@ -0,0 +1,18 @@
+package org.baeldung.security;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+@Controller
+@RequestMapping("/")
+public class HomeController {
+
+    @RequestMapping("")
+    public String home(HttpServletRequest request, HttpServletResponse response) {
+        return "home";
+    }
+
+}
diff --git a/spring-boot-security-taglibs/src/main/java/org/baeldung/security/SecurityConfig.java b/spring-boot-security-taglibs/src/main/java/org/baeldung/security/SecurityConfig.java
new file mode 100644
index 0000000000..f6df516a0a
--- /dev/null
+++ b/spring-boot-security-taglibs/src/main/java/org/baeldung/security/SecurityConfig.java
@@ -0,0 +1,70 @@
+package org.baeldung.security;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.security.authentication.AuthenticationManager;
+import org.springframework.security.config.BeanIds;
+import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
+import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
+import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
+import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.core.authority.SimpleGrantedAuthority;
+import org.springframework.security.core.userdetails.User;
+import org.springframework.security.core.userdetails.UserDetails;
+import org.springframework.security.core.userdetails.UserDetailsService;
+import org.springframework.security.core.userdetails.UsernameNotFoundException;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
+import org.springframework.security.crypto.password.PasswordEncoder;
+
+@Configuration
+@EnableWebSecurity
+public class SecurityConfig extends WebSecurityConfigurerAdapter {
+    private static final String ROLE_PREFIX = "ROLE_";
+    public static final String DEFAULT_PASSWORD = "password";
+    @Bean
+    static PasswordEncoder bCryptPasswordEncoder() {
+        return new BCryptPasswordEncoder(10);
+    }
+    
+    @Bean
+    UserDetailsService customUserDetailsService() {
+        return new UserDetailsService() {
+			
+			@Override
+			public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException {
+				//authenticate and return dummy user
+		        Set<GrantedAuthority> authorities = new HashSet<GrantedAuthority>();
+				authorities.add(new SimpleGrantedAuthority(ROLE_PREFIX + username));
+				return new User(username, bCryptPasswordEncoder().encode(DEFAULT_PASSWORD), authorities);
+			}
+		};
+    }
+
+    @Override
+    protected void configure(AuthenticationManagerBuilder auth) throws Exception {
+        auth.userDetailsService(customUserDetailsService()).passwordEncoder(bCryptPasswordEncoder());
+
+    }
+
+    @Bean(name = BeanIds.AUTHENTICATION_MANAGER)
+    @Override
+    public AuthenticationManager authenticationManagerBean() throws Exception {
+        return super.authenticationManager();
+    }
+
+    @Override
+    protected void configure(HttpSecurity http) throws Exception {
+        http.csrf();
+        http.headers().frameOptions().sameOrigin();
+       
+        http.antMatcher("/**").userDetailsService(customUserDetailsService())
+            .authorizeRequests()
+            .antMatchers("/**").permitAll()
+            .and()
+            .httpBasic();
+    }
+}
diff --git a/spring-boot-security-taglibs/src/main/resources/application.properties b/spring-boot-security-taglibs/src/main/resources/application.properties
new file mode 100644
index 0000000000..9c49bd2137
--- /dev/null
+++ b/spring-boot-security-taglibs/src/main/resources/application.properties
@@ -0,0 +1,8 @@
+#jsp config
+spring.mvc.view.prefix: /WEB-INF/views/
+spring.mvc.view.suffix: .jsp
+spring.http.encoding.charset=UTF-8
+# Enable http encoding support.
+spring.http.encoding.enabled=true
+# Force the encoding to the configured charset on HTTP requests and responses.
+spring.http.encoding.force=true
diff --git a/spring-boot-security-taglibs/src/main/webapp/WEB-INF/views/home.jsp b/spring-boot-security-taglibs/src/main/webapp/WEB-INF/views/home.jsp
new file mode 100644
index 0000000000..9f5d8c34a3
--- /dev/null
+++ b/spring-boot-security-taglibs/src/main/webapp/WEB-INF/views/home.jsp
@@ -0,0 +1,20 @@
+<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
+    pageEncoding="ISO-8859-1"%>
+<%@ taglib prefix="security"
+           uri="http://www.springframework.org/security/tags" %>
+    
+<!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>Home Page</title>
+</head>
+<body>
+     <security:authorize access="isAuthenticated()">
+        AUTHENTICATED
+     </security:authorize>
+    <security:authorize access="hasRole('ADMIN')">
+        ADMIN ROLE
+    </security:authorize>
+</body>
+</html>
\ No newline at end of file
diff --git a/spring-boot-security-taglibs/src/test/java/org/baeldung/security/HomeControllerTest.java b/spring-boot-security-taglibs/src/test/java/org/baeldung/security/HomeControllerTest.java
new file mode 100644
index 0000000000..f13b23a10d
--- /dev/null
+++ b/spring-boot-security-taglibs/src/test/java/org/baeldung/security/HomeControllerTest.java
@@ -0,0 +1,27 @@
+package org.baeldung.security;
+
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
+import org.springframework.boot.test.web.client.TestRestTemplate;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT)
+public class HomeControllerTest {
+	
+    @Autowired
+    private TestRestTemplate restTemplate;
+
+	@Test
+	public void home() throws Exception {
+		String body = this.restTemplate.withBasicAuth("ADMIN", SecurityConfig.DEFAULT_PASSWORD).getForEntity("/", String.class).getBody();
+		System.out.println(body);
+		assertTrue(body.contains("AUTHENTICATED"));
+		assertTrue(body.contains("ADMIN ROLE"));
+	}
+}

From 4e4d11574ac5f3719d6eb8620ef54bda31b689ca Mon Sep 17 00:00:00 2001
From: "nnhai1991@gmail.com" <Hai Nguyen>
Date: Sat, 11 Aug 2018 16:10:53 +0800
Subject: [PATCH 06/28] add more test

---
 .../src/main/webapp/WEB-INF/views/home.jsp    | 25 ++++++++++-----
 .../baeldung/security/HomeControllerTest.java | 31 ++++++++++++++-----
 2 files changed, 40 insertions(+), 16 deletions(-)

diff --git a/spring-boot-security-taglibs/src/main/webapp/WEB-INF/views/home.jsp b/spring-boot-security-taglibs/src/main/webapp/WEB-INF/views/home.jsp
index 9f5d8c34a3..1117749ded 100644
--- a/spring-boot-security-taglibs/src/main/webapp/WEB-INF/views/home.jsp
+++ b/spring-boot-security-taglibs/src/main/webapp/WEB-INF/views/home.jsp
@@ -1,20 +1,29 @@
 <%@ page language="java" contentType="text/html; charset=ISO-8859-1"
-    pageEncoding="ISO-8859-1"%>
-<%@ taglib prefix="security"
-           uri="http://www.springframework.org/security/tags" %>
-    
+	pageEncoding="ISO-8859-1"%>
+<%@ taglib prefix="sec"
+	uri="http://www.springframework.org/security/tags"%>
+
 <!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">
+<sec:csrfMetaTags />
 <title>Home Page</title>
 </head>
 <body>
-     <security:authorize access="isAuthenticated()">
+	<sec:authorize access="isAuthenticated()">
         AUTHENTICATED
-     </security:authorize>
-    <security:authorize access="hasRole('ADMIN')">
+     </sec:authorize>
+	<sec:authorize access="hasRole('ADMIN')">
         ADMIN ROLE
-    </security:authorize>
+    </sec:authorize>
+
+	<h2>principal.username: <sec:authentication property="principal.username" /> </h2>
+
+	<form method="post" action="/do/something">
+		<sec:csrfInput />
+		Text Field:<br /> <input type="text" name="textField" />
+	</form>
+
 </body>
 </html>
\ No newline at end of file
diff --git a/spring-boot-security-taglibs/src/test/java/org/baeldung/security/HomeControllerTest.java b/spring-boot-security-taglibs/src/test/java/org/baeldung/security/HomeControllerTest.java
index f13b23a10d..dfdfda6234 100644
--- a/spring-boot-security-taglibs/src/test/java/org/baeldung/security/HomeControllerTest.java
+++ b/spring-boot-security-taglibs/src/test/java/org/baeldung/security/HomeControllerTest.java
@@ -13,15 +13,30 @@ import org.springframework.test.context.junit4.SpringRunner;
 @RunWith(SpringRunner.class)
 @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT)
 public class HomeControllerTest {
-	
+
     @Autowired
     private TestRestTemplate restTemplate;
 
-	@Test
-	public void home() throws Exception {
-		String body = this.restTemplate.withBasicAuth("ADMIN", SecurityConfig.DEFAULT_PASSWORD).getForEntity("/", String.class).getBody();
-		System.out.println(body);
-		assertTrue(body.contains("AUTHENTICATED"));
-		assertTrue(body.contains("ADMIN ROLE"));
-	}
+    @Test
+    public void home() throws Exception {
+        String body = this.restTemplate.withBasicAuth("ADMIN", SecurityConfig.DEFAULT_PASSWORD)
+            .getForEntity("/", String.class)
+            .getBody();
+        System.out.println(body);
+
+        // test <sec:authorize access="isAuthenticated()">
+        assertTrue(body.contains("AUTHENTICATED"));
+
+        // test <sec:authorize access="hasRole('ADMIN')">
+        assertTrue(body.contains("ADMIN ROLE"));
+
+        // test <sec:authentication property="principal.username" />
+        assertTrue(body.contains("principal.username: ADMIN"));
+
+        // test <sec:csrfInput />
+        assertTrue(body.contains("<input type=\"hidden\" name=\"_csrf\" value=\""));
+
+        // test <sec:csrfMetaTags />
+        assertTrue(body.contains("<meta name=\"_csrf_parameter\" content=\"_csrf\" />"));
+    }
 }

From 7b2dec656dfeb434881e1ad7205e23c18b7d7986 Mon Sep 17 00:00:00 2001
From: "nnhai1991@gmail.com" <Hai Nguyen>
Date: Sat, 11 Aug 2018 16:15:49 +0800
Subject: [PATCH 07/28] add more test

---
 .../org/baeldung/security/SecurityConfig.java | 35 +++++++++++--------
 .../baeldung/security/HomeControllerTest.java |  4 +--
 2 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/spring-boot-security-taglibs/src/main/java/org/baeldung/security/SecurityConfig.java b/spring-boot-security-taglibs/src/main/java/org/baeldung/security/SecurityConfig.java
index f6df516a0a..99c5f1e892 100644
--- a/spring-boot-security-taglibs/src/main/java/org/baeldung/security/SecurityConfig.java
+++ b/spring-boot-security-taglibs/src/main/java/org/baeldung/security/SecurityConfig.java
@@ -25,28 +25,29 @@ import org.springframework.security.crypto.password.PasswordEncoder;
 public class SecurityConfig extends WebSecurityConfigurerAdapter {
     private static final String ROLE_PREFIX = "ROLE_";
     public static final String DEFAULT_PASSWORD = "password";
+
     @Bean
     static PasswordEncoder bCryptPasswordEncoder() {
         return new BCryptPasswordEncoder(10);
     }
-    
+
     @Bean
     UserDetailsService customUserDetailsService() {
         return new UserDetailsService() {
-			
-			@Override
-			public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException {
-				//authenticate and return dummy user
-		        Set<GrantedAuthority> authorities = new HashSet<GrantedAuthority>();
-				authorities.add(new SimpleGrantedAuthority(ROLE_PREFIX + username));
-				return new User(username, bCryptPasswordEncoder().encode(DEFAULT_PASSWORD), authorities);
-			}
-		};
+            @Override
+            public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException {
+                // authenticate, grant ADMIN role and return dummy user
+                Set<GrantedAuthority> authorities = new HashSet<GrantedAuthority>();
+                authorities.add(new SimpleGrantedAuthority(ROLE_PREFIX + "ADMIN"));
+                return new User(username, bCryptPasswordEncoder().encode(DEFAULT_PASSWORD), authorities);
+            }
+        };
     }
 
     @Override
     protected void configure(AuthenticationManagerBuilder auth) throws Exception {
-        auth.userDetailsService(customUserDetailsService()).passwordEncoder(bCryptPasswordEncoder());
+        auth.userDetailsService(customUserDetailsService())
+            .passwordEncoder(bCryptPasswordEncoder());
 
     }
 
@@ -59,11 +60,15 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
     @Override
     protected void configure(HttpSecurity http) throws Exception {
         http.csrf();
-        http.headers().frameOptions().sameOrigin();
-       
-        http.antMatcher("/**").userDetailsService(customUserDetailsService())
+        http.headers()
+            .frameOptions()
+            .sameOrigin();
+
+        http.antMatcher("/**")
+            .userDetailsService(customUserDetailsService())
             .authorizeRequests()
-            .antMatchers("/**").permitAll()
+            .antMatchers("/**")
+            .permitAll()
             .and()
             .httpBasic();
     }
diff --git a/spring-boot-security-taglibs/src/test/java/org/baeldung/security/HomeControllerTest.java b/spring-boot-security-taglibs/src/test/java/org/baeldung/security/HomeControllerTest.java
index dfdfda6234..995d5fa3df 100644
--- a/spring-boot-security-taglibs/src/test/java/org/baeldung/security/HomeControllerTest.java
+++ b/spring-boot-security-taglibs/src/test/java/org/baeldung/security/HomeControllerTest.java
@@ -19,7 +19,7 @@ public class HomeControllerTest {
 
     @Test
     public void home() throws Exception {
-        String body = this.restTemplate.withBasicAuth("ADMIN", SecurityConfig.DEFAULT_PASSWORD)
+        String body = this.restTemplate.withBasicAuth("testUser", SecurityConfig.DEFAULT_PASSWORD)
             .getForEntity("/", String.class)
             .getBody();
         System.out.println(body);
@@ -31,7 +31,7 @@ public class HomeControllerTest {
         assertTrue(body.contains("ADMIN ROLE"));
 
         // test <sec:authentication property="principal.username" />
-        assertTrue(body.contains("principal.username: ADMIN"));
+        assertTrue(body.contains("principal.username: testUser"));
 
         // test <sec:csrfInput />
         assertTrue(body.contains("<input type=\"hidden\" name=\"_csrf\" value=\""));

From e080e587a0025535b83f3e0084d35dfcffaef106 Mon Sep 17 00:00:00 2001
From: Hai Nguyen <nn.hai@samsung.com>
Date: Tue, 14 Aug 2018 14:41:06 +0800
Subject: [PATCH 08/28] refactor spring config

---
 .../org/baeldung/security/Application.java    | 23 ------
 .../baeldung/security/ApplicationConfig.java  | 40 ++++++++++
 .../org/baeldung/security/HomeController.java |  2 -
 .../org/baeldung/security/SecurityConfig.java | 75 -------------------
 .../src/main/webapp/WEB-INF/views/home.jsp    | 28 ++++---
 .../baeldung/security/HomeControllerTest.java |  2 +-
 6 files changed, 54 insertions(+), 116 deletions(-)
 delete mode 100644 spring-boot-security-taglibs/src/main/java/org/baeldung/security/Application.java
 create mode 100644 spring-boot-security-taglibs/src/main/java/org/baeldung/security/ApplicationConfig.java
 delete mode 100644 spring-boot-security-taglibs/src/main/java/org/baeldung/security/SecurityConfig.java

diff --git a/spring-boot-security-taglibs/src/main/java/org/baeldung/security/Application.java b/spring-boot-security-taglibs/src/main/java/org/baeldung/security/Application.java
deleted file mode 100644
index eef41bd375..0000000000
--- a/spring-boot-security-taglibs/src/main/java/org/baeldung/security/Application.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package org.baeldung.security;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.builder.SpringApplicationBuilder;
-import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
-
-@SpringBootApplication
-public class Application extends SpringBootServletInitializer {
-
-    public Application() {
-        super();
-    }
-
-    public static void main(String[] args) {
-        SpringApplication.run(Application.class, args);
-    }
-
-    @Override
-    protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) {
-        return builder.sources(Application.class);
-    }
-}
diff --git a/spring-boot-security-taglibs/src/main/java/org/baeldung/security/ApplicationConfig.java b/spring-boot-security-taglibs/src/main/java/org/baeldung/security/ApplicationConfig.java
new file mode 100644
index 0000000000..6283a102aa
--- /dev/null
+++ b/spring-boot-security-taglibs/src/main/java/org/baeldung/security/ApplicationConfig.java
@@ -0,0 +1,40 @@
+package org.baeldung.security;
+
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
+import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
+import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
+import org.springframework.security.crypto.factory.PasswordEncoderFactories;
+import org.springframework.security.crypto.password.PasswordEncoder;
+
+@SpringBootApplication
+@Configuration
+@EnableWebSecurity
+public class ApplicationConfig extends WebSecurityConfigurerAdapter {
+    public static final String DEFAULT_PASSWORD = "password";
+
+    @Override
+    protected void configure(AuthenticationManagerBuilder auth) throws Exception {
+        PasswordEncoder encoder = PasswordEncoderFactories.createDelegatingPasswordEncoder();
+
+        auth.inMemoryAuthentication()
+            .passwordEncoder(encoder)
+            .withUser("testUser")
+            .password(encoder.encode(DEFAULT_PASSWORD))
+            .roles("ADMIN");
+    }
+
+    @Override
+    protected void configure(HttpSecurity http) throws Exception {
+        http.csrf();
+
+        http.authorizeRequests()
+            .antMatchers("/**")
+            .permitAll()
+            .and()
+            .httpBasic();
+    }
+}
diff --git a/spring-boot-security-taglibs/src/main/java/org/baeldung/security/HomeController.java b/spring-boot-security-taglibs/src/main/java/org/baeldung/security/HomeController.java
index 0eb6ee242d..e697e7e301 100644
--- a/spring-boot-security-taglibs/src/main/java/org/baeldung/security/HomeController.java
+++ b/spring-boot-security-taglibs/src/main/java/org/baeldung/security/HomeController.java
@@ -9,10 +9,8 @@ import javax.servlet.http.HttpServletResponse;
 @Controller
 @RequestMapping("/")
 public class HomeController {
-
     @RequestMapping("")
     public String home(HttpServletRequest request, HttpServletResponse response) {
         return "home";
     }
-
 }
diff --git a/spring-boot-security-taglibs/src/main/java/org/baeldung/security/SecurityConfig.java b/spring-boot-security-taglibs/src/main/java/org/baeldung/security/SecurityConfig.java
deleted file mode 100644
index 99c5f1e892..0000000000
--- a/spring-boot-security-taglibs/src/main/java/org/baeldung/security/SecurityConfig.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package org.baeldung.security;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.security.authentication.AuthenticationManager;
-import org.springframework.security.config.BeanIds;
-import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
-import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
-import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.core.authority.SimpleGrantedAuthority;
-import org.springframework.security.core.userdetails.User;
-import org.springframework.security.core.userdetails.UserDetails;
-import org.springframework.security.core.userdetails.UserDetailsService;
-import org.springframework.security.core.userdetails.UsernameNotFoundException;
-import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
-import org.springframework.security.crypto.password.PasswordEncoder;
-
-@Configuration
-@EnableWebSecurity
-public class SecurityConfig extends WebSecurityConfigurerAdapter {
-    private static final String ROLE_PREFIX = "ROLE_";
-    public static final String DEFAULT_PASSWORD = "password";
-
-    @Bean
-    static PasswordEncoder bCryptPasswordEncoder() {
-        return new BCryptPasswordEncoder(10);
-    }
-
-    @Bean
-    UserDetailsService customUserDetailsService() {
-        return new UserDetailsService() {
-            @Override
-            public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException {
-                // authenticate, grant ADMIN role and return dummy user
-                Set<GrantedAuthority> authorities = new HashSet<GrantedAuthority>();
-                authorities.add(new SimpleGrantedAuthority(ROLE_PREFIX + "ADMIN"));
-                return new User(username, bCryptPasswordEncoder().encode(DEFAULT_PASSWORD), authorities);
-            }
-        };
-    }
-
-    @Override
-    protected void configure(AuthenticationManagerBuilder auth) throws Exception {
-        auth.userDetailsService(customUserDetailsService())
-            .passwordEncoder(bCryptPasswordEncoder());
-
-    }
-
-    @Bean(name = BeanIds.AUTHENTICATION_MANAGER)
-    @Override
-    public AuthenticationManager authenticationManagerBean() throws Exception {
-        return super.authenticationManager();
-    }
-
-    @Override
-    protected void configure(HttpSecurity http) throws Exception {
-        http.csrf();
-        http.headers()
-            .frameOptions()
-            .sameOrigin();
-
-        http.antMatcher("/**")
-            .userDetailsService(customUserDetailsService())
-            .authorizeRequests()
-            .antMatchers("/**")
-            .permitAll()
-            .and()
-            .httpBasic();
-    }
-}
diff --git a/spring-boot-security-taglibs/src/main/webapp/WEB-INF/views/home.jsp b/spring-boot-security-taglibs/src/main/webapp/WEB-INF/views/home.jsp
index 1117749ded..fff93186a0 100644
--- a/spring-boot-security-taglibs/src/main/webapp/WEB-INF/views/home.jsp
+++ b/spring-boot-security-taglibs/src/main/webapp/WEB-INF/views/home.jsp
@@ -1,8 +1,5 @@
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
-	pageEncoding="ISO-8859-1"%>
-<%@ taglib prefix="sec"
-	uri="http://www.springframework.org/security/tags"%>
-
+<%@ page language="java" contentType="text/html; charset=ISO-8859-1" pageEncoding="ISO-8859-1"%>
+<%@ taglib prefix="sec" uri="http://www.springframework.org/security/tags"%>
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html>
 <head>
@@ -11,19 +8,20 @@
 <title>Home Page</title>
 </head>
 <body>
-	<sec:authorize access="isAuthenticated()">
+    <sec:authorize access="isAuthenticated()">
         AUTHENTICATED
      </sec:authorize>
-	<sec:authorize access="hasRole('ADMIN')">
+    <sec:authorize access="hasRole('ADMIN')">
         ADMIN ROLE
     </sec:authorize>
-
-	<h2>principal.username: <sec:authentication property="principal.username" /> </h2>
-
-	<form method="post" action="/do/something">
-		<sec:csrfInput />
-		Text Field:<br /> <input type="text" name="textField" />
-	</form>
-
+    <h2>
+        principal.username:
+        <sec:authentication property="principal.username" />
+    </h2>
+    <form method="post" action="/do/something">
+        <sec:csrfInput />
+        Text Field:<br />
+        <input type="text" name="textField" />
+    </form>
 </body>
 </html>
\ No newline at end of file
diff --git a/spring-boot-security-taglibs/src/test/java/org/baeldung/security/HomeControllerTest.java b/spring-boot-security-taglibs/src/test/java/org/baeldung/security/HomeControllerTest.java
index 995d5fa3df..c9c8698254 100644
--- a/spring-boot-security-taglibs/src/test/java/org/baeldung/security/HomeControllerTest.java
+++ b/spring-boot-security-taglibs/src/test/java/org/baeldung/security/HomeControllerTest.java
@@ -19,7 +19,7 @@ public class HomeControllerTest {
 
     @Test
     public void home() throws Exception {
-        String body = this.restTemplate.withBasicAuth("testUser", SecurityConfig.DEFAULT_PASSWORD)
+        String body = this.restTemplate.withBasicAuth("testUser", ApplicationConfig.DEFAULT_PASSWORD)
             .getForEntity("/", String.class)
             .getBody();
         System.out.println(body);

From d11fbc73adc2df6501ec9b8eb25d75cf6295d577 Mon Sep 17 00:00:00 2001
From: Hai Nguyen <nn.hai@samsung.com>
Date: Tue, 14 Aug 2018 14:46:35 +0800
Subject: [PATCH 09/28] refactor spring config

---
 spring-boot-security-taglibs/pom.xml | 132 +++++++++++++--------------
 1 file changed, 62 insertions(+), 70 deletions(-)

diff --git a/spring-boot-security-taglibs/pom.xml b/spring-boot-security-taglibs/pom.xml
index bd04ec3c0b..447f0c4be9 100644
--- a/spring-boot-security-taglibs/pom.xml
+++ b/spring-boot-security-taglibs/pom.xml
@@ -1,84 +1,76 @@
 <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">
-	<modelVersion>4.0.0</modelVersion>
+    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>
 
-	<artifactId>spring-boot-security-taglibs</artifactId>
-	<packaging>jar</packaging>
-	<name>spring-boot-security-taglibs</name>
-	<description>spring 5 security sample project</description>
+    <artifactId>spring-boot-security-taglibs</artifactId>
+    <packaging>jar</packaging>
+    <name>spring-boot-security-taglibs</name>
+    <description>spring 5 security sample project</description>
 
-	<parent>
-		<groupId>com.baeldung</groupId>
-		<artifactId>parent-boot-2</artifactId>
-		<version>0.0.1-SNAPSHOT</version>
-		<relativePath>../parent-boot-2</relativePath>
-	</parent>
+    <parent>
+        <groupId>com.baeldung</groupId>
+        <artifactId>parent-boot-2</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+        <relativePath>../parent-boot-2</relativePath>
+    </parent>
 
-	<dependencies>
+    <dependencies>
 
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-security</artifactId>
-		</dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-security</artifactId>
+        </dependency>
 
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-web</artifactId>
-		</dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
 
-		<!-- security taglib -->
-		<dependency>
-			<groupId>org.springframework.security</groupId>
-			<artifactId>spring-security-taglibs</artifactId>
-		</dependency>
+        <!-- security taglib -->
+        <dependency>
+            <groupId>org.springframework.security</groupId>
+            <artifactId>spring-security-taglibs</artifactId>
+        </dependency>
 
-		<!-- JSTL -->
-		<dependency>
-			<groupId>org.apache.tomcat.embed</groupId>
-			<artifactId>tomcat-embed-jasper</artifactId>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>jstl</artifactId>
-		</dependency>
-		<!-- test -->
-		<dependency>
-			<groupId>net.sourceforge.htmlunit</groupId>
-			<artifactId>htmlunit</artifactId>
-		</dependency>
+        <!-- JSTL -->
+        <dependency>
+            <groupId>org.apache.tomcat.embed</groupId>
+            <artifactId>tomcat-embed-jasper</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>jstl</artifactId>
+        </dependency>
 
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-test</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.security</groupId>
-			<artifactId>spring-security-test</artifactId>
-			<scope>test</scope>
-		</dependency>
+        <!-- test -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.security</groupId>
+            <artifactId>spring-security-test</artifactId>
+            <scope>test</scope>
+        </dependency>
 
-	</dependencies>
+    </dependencies>
 
-	<build>
-		<finalName>spring-5-security-taglibs</finalName>
-		<resources>
-			<resource>
-				<directory>src/main/resources</directory>
-				<filtering>true</filtering>
-			</resource>
-		</resources>
+    <build>
+        <finalName>spring-5-security-taglibs</finalName>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+    </build>
 
-		<plugins>
-		</plugins>
-
-	</build>
-
-	<properties>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-		<java.version>1.8</java.version>
-	</properties>
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <java.version>1.8</java.version>
+    </properties>
 
 </project>
\ No newline at end of file

From bdad13227e25b4c76ce8ca8c70e9fef51795f195 Mon Sep 17 00:00:00 2001
From: Hai Nguyen <nnhai1991@gmail.com>
Date: Tue, 14 Aug 2018 15:10:05 +0800
Subject: [PATCH 10/28] Update README.md

---
 spring-boot-security-taglibs/README.md | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/spring-boot-security-taglibs/README.md b/spring-boot-security-taglibs/README.md
index f7eb314869..8b13789179 100644
--- a/spring-boot-security-taglibs/README.md
+++ b/spring-boot-security-taglibs/README.md
@@ -1,19 +1 @@
-=========
 
-## Spring Security Login Example Project
-
-###The Course
-The "Learn Spring Security" Classes: http://github.learnspringsecurity.com
-
-### Relevant Articles: 
-- [Spring Security Form Login](http://www.baeldung.com/spring-security-login)
-- [Spring Security Logout](http://www.baeldung.com/spring-security-logout)
-- [Spring Security Expressions – hasRole Example](http://www.baeldung.com/spring-security-expressions-basic)
-- [Spring HTTP/HTTPS Channel Security](http://www.baeldung.com/spring-channel-security-https)
-- [Spring Security - Customize the 403 Forbidden/Access Denied Page](http://www.baeldung.com/spring-security-custom-access-denied-page)
-- [Spring Security – Redirect to the Previous URL After Login](http://www.baeldung.com/spring-security-redirect-login)
-
-### Build the Project
-```
-mvn clean install
-```

From 4b1f9559808e42099f57d1272b0c6f11cb06bc72 Mon Sep 17 00:00:00 2001
From: "nnhai1991@gmail.com" <Hai Nguyen>
Date: Tue, 14 Aug 2018 22:57:17 +0800
Subject: [PATCH 11/28] fi alignment

---
 .../src/main/webapp/WEB-INF/views/home.jsp                   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/spring-boot-security-taglibs/src/main/webapp/WEB-INF/views/home.jsp b/spring-boot-security-taglibs/src/main/webapp/WEB-INF/views/home.jsp
index fff93186a0..c13590a3df 100644
--- a/spring-boot-security-taglibs/src/main/webapp/WEB-INF/views/home.jsp
+++ b/spring-boot-security-taglibs/src/main/webapp/WEB-INF/views/home.jsp
@@ -10,7 +10,7 @@
 <body>
     <sec:authorize access="isAuthenticated()">
         AUTHENTICATED
-     </sec:authorize>
+    </sec:authorize>
     <sec:authorize access="hasRole('ADMIN')">
         ADMIN ROLE
     </sec:authorize>
@@ -20,7 +20,8 @@
     </h2>
     <form method="post" action="/do/something">
         <sec:csrfInput />
-        Text Field:<br />
+        Text Field:
+        <br />
         <input type="text" name="textField" />
     </form>
 </body>

From 0d684eed97acea7aaf326d3b399c64c5b0c5090b Mon Sep 17 00:00:00 2001
From: "nnhai1991@gmail.com" <Hai Nguyen>
Date: Sat, 18 Aug 2018 17:23:07 +0800
Subject: [PATCH 12/28] fix requested comments

---
 .../baeldung/security/ApplicationConfig.java  | 39 ++++++++++---------
 .../org/baeldung/security/HomeController.java |  6 ++-
 .../src/main/resources/application.properties |  5 ---
 .../src/main/webapp/WEB-INF/views/home.jsp    | 35 +++++++++--------
 .../baeldung/security/HomeControllerTest.java | 23 +++++++++--
 5 files changed, 62 insertions(+), 46 deletions(-)

diff --git a/spring-boot-security-taglibs/src/main/java/org/baeldung/security/ApplicationConfig.java b/spring-boot-security-taglibs/src/main/java/org/baeldung/security/ApplicationConfig.java
index 6283a102aa..763422e6df 100644
--- a/spring-boot-security-taglibs/src/main/java/org/baeldung/security/ApplicationConfig.java
+++ b/spring-boot-security-taglibs/src/main/java/org/baeldung/security/ApplicationConfig.java
@@ -1,40 +1,41 @@
 package org.baeldung.security;
 
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
 import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
-import org.springframework.security.crypto.factory.PasswordEncoderFactories;
-import org.springframework.security.crypto.password.PasswordEncoder;
+import org.springframework.security.core.userdetails.User;
+import org.springframework.security.core.userdetails.UserDetails;
+import org.springframework.security.core.userdetails.UserDetailsService;
+import org.springframework.security.provisioning.InMemoryUserDetailsManager;
 
 @SpringBootApplication
 @Configuration
 @EnableWebSecurity
 public class ApplicationConfig extends WebSecurityConfigurerAdapter {
-    public static final String DEFAULT_PASSWORD = "password";
 
+    // Using withDefaultPasswordEncoder and InMemoryUserDetailsManager for demonstration and testing purpose
+    @Bean
     @Override
-    protected void configure(AuthenticationManagerBuilder auth) throws Exception {
-        PasswordEncoder encoder = PasswordEncoderFactories.createDelegatingPasswordEncoder();
+    public UserDetailsService userDetailsService() {
+        UserDetails user = User.withDefaultPasswordEncoder()
+            .username("testUser")
+            .password("password")
+            .roles("ADMIN")
+            .build();
 
-        auth.inMemoryAuthentication()
-            .passwordEncoder(encoder)
-            .withUser("testUser")
-            .password(encoder.encode(DEFAULT_PASSWORD))
-            .roles("ADMIN");
+        return new InMemoryUserDetailsManager(user);
     }
 
     @Override
     protected void configure(HttpSecurity http) throws Exception {
-        http.csrf();
-
-        http.authorizeRequests()
-            .antMatchers("/**")
-            .permitAll()
-            .and()
-            .httpBasic();
+        // @formatter:off
+        http.csrf()
+                .and()
+            .authorizeRequests()
+                .anyRequest().permitAll().and().httpBasic();
+        // @formatter:on
     }
 }
diff --git a/spring-boot-security-taglibs/src/main/java/org/baeldung/security/HomeController.java b/spring-boot-security-taglibs/src/main/java/org/baeldung/security/HomeController.java
index e697e7e301..cdd4c3f42b 100644
--- a/spring-boot-security-taglibs/src/main/java/org/baeldung/security/HomeController.java
+++ b/spring-boot-security-taglibs/src/main/java/org/baeldung/security/HomeController.java
@@ -1,6 +1,7 @@
 package org.baeldung.security;
 
 import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import javax.servlet.http.HttpServletRequest;
@@ -9,8 +10,9 @@ import javax.servlet.http.HttpServletResponse;
 @Controller
 @RequestMapping("/")
 public class HomeController {
-    @RequestMapping("")
-    public String home(HttpServletRequest request, HttpServletResponse response) {
+    
+    @GetMapping
+    public String home() {
         return "home";
     }
 }
diff --git a/spring-boot-security-taglibs/src/main/resources/application.properties b/spring-boot-security-taglibs/src/main/resources/application.properties
index 9c49bd2137..218868405f 100644
--- a/spring-boot-security-taglibs/src/main/resources/application.properties
+++ b/spring-boot-security-taglibs/src/main/resources/application.properties
@@ -1,8 +1,3 @@
 #jsp config
 spring.mvc.view.prefix: /WEB-INF/views/
 spring.mvc.view.suffix: .jsp
-spring.http.encoding.charset=UTF-8
-# Enable http encoding support.
-spring.http.encoding.enabled=true
-# Force the encoding to the configured charset on HTTP requests and responses.
-spring.http.encoding.force=true
diff --git a/spring-boot-security-taglibs/src/main/webapp/WEB-INF/views/home.jsp b/spring-boot-security-taglibs/src/main/webapp/WEB-INF/views/home.jsp
index c13590a3df..7291608e3e 100644
--- a/spring-boot-security-taglibs/src/main/webapp/WEB-INF/views/home.jsp
+++ b/spring-boot-security-taglibs/src/main/webapp/WEB-INF/views/home.jsp
@@ -1,5 +1,7 @@
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1" pageEncoding="ISO-8859-1"%>
-<%@ taglib prefix="sec" uri="http://www.springframework.org/security/tags"%>
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+    pageEncoding="UTF-8"%>
+<%@ taglib prefix="sec"
+    uri="http://www.springframework.org/security/tags"%>
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html>
 <head>
@@ -8,21 +10,22 @@
 <title>Home Page</title>
 </head>
 <body>
+    <sec:authorize access="isAnonymous()">
+        ANONYMOUS
+    </sec:authorize>
     <sec:authorize access="isAuthenticated()">
-        AUTHENTICATED
+        AUTHENTICATED    
+        <sec:authorize access="hasRole('ADMIN')">
+            ADMIN ROLE
+        </sec:authorize>
+        <h2>
+            principal.username:
+            <sec:authentication property="principal.username" />
+        </h2>
+        <form>
+            <sec:csrfInput />
+            Text Field: <br /> <input type="text" name="textField" />
+        </form>
     </sec:authorize>
-    <sec:authorize access="hasRole('ADMIN')">
-        ADMIN ROLE
-    </sec:authorize>
-    <h2>
-        principal.username:
-        <sec:authentication property="principal.username" />
-    </h2>
-    <form method="post" action="/do/something">
-        <sec:csrfInput />
-        Text Field:
-        <br />
-        <input type="text" name="textField" />
-    </form>
 </body>
 </html>
\ No newline at end of file
diff --git a/spring-boot-security-taglibs/src/test/java/org/baeldung/security/HomeControllerTest.java b/spring-boot-security-taglibs/src/test/java/org/baeldung/security/HomeControllerTest.java
index c9c8698254..c005185c92 100644
--- a/spring-boot-security-taglibs/src/test/java/org/baeldung/security/HomeControllerTest.java
+++ b/spring-boot-security-taglibs/src/test/java/org/baeldung/security/HomeControllerTest.java
@@ -1,5 +1,6 @@
 package org.baeldung.security;
 
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
@@ -18,11 +19,13 @@ public class HomeControllerTest {
     private TestRestTemplate restTemplate;
 
     @Test
-    public void home() throws Exception {
-        String body = this.restTemplate.withBasicAuth("testUser", ApplicationConfig.DEFAULT_PASSWORD)
+    public void whenUserIsAuthenticatedThenAuthenticatedSectionsShowOnSite() throws Exception {
+        String body = this.restTemplate.withBasicAuth("testUser", "password")
             .getForEntity("/", String.class)
             .getBody();
-        System.out.println(body);
+
+        // test <sec:authorize access="isAnonymous()">
+        assertFalse(body.contains("ANONYMOUS"));
 
         // test <sec:authorize access="isAuthenticated()">
         assertTrue(body.contains("AUTHENTICATED"));
@@ -31,7 +34,7 @@ public class HomeControllerTest {
         assertTrue(body.contains("ADMIN ROLE"));
 
         // test <sec:authentication property="principal.username" />
-        assertTrue(body.contains("principal.username: testUser"));
+        assertTrue(body.contains("testUser"));
 
         // test <sec:csrfInput />
         assertTrue(body.contains("<input type=\"hidden\" name=\"_csrf\" value=\""));
@@ -39,4 +42,16 @@ public class HomeControllerTest {
         // test <sec:csrfMetaTags />
         assertTrue(body.contains("<meta name=\"_csrf_parameter\" content=\"_csrf\" />"));
     }
+
+    @Test
+    public void whenUserIsNotAuthenticatedThenOnlyAnonymousSectionsShowOnSite() throws Exception {
+        String body = this.restTemplate.getForEntity("/", String.class)
+            .getBody();
+
+        // test <sec:authorize access="isAnonymous()">
+        assertTrue(body.contains("ANONYMOUS"));
+
+        // test <sec:authorize access="isAuthenticated()">
+        assertFalse(body.contains("AUTHENTICATED"));
+    }
 }

From 3f8eddad332a4b7e3013e977ca9c57de12050ebc Mon Sep 17 00:00:00 2001
From: "nnhai1991@gmail.com" <Hai Nguyen>
Date: Sun, 19 Aug 2018 17:24:43 +0800
Subject: [PATCH 13/28] additional tests and content

---
 .../main/java/org/baeldung/security/ApplicationConfig.java | 1 +
 .../src/main/webapp/WEB-INF/views/home.jsp                 | 7 +++++--
 .../java/org/baeldung/security/HomeControllerTest.java     | 5 ++++-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/spring-boot-security-taglibs/src/main/java/org/baeldung/security/ApplicationConfig.java b/spring-boot-security-taglibs/src/main/java/org/baeldung/security/ApplicationConfig.java
index 763422e6df..6419da3bdd 100644
--- a/spring-boot-security-taglibs/src/main/java/org/baeldung/security/ApplicationConfig.java
+++ b/spring-boot-security-taglibs/src/main/java/org/baeldung/security/ApplicationConfig.java
@@ -35,6 +35,7 @@ public class ApplicationConfig extends WebSecurityConfigurerAdapter {
         http.csrf()
                 .and()
             .authorizeRequests()
+                .antMatchers("/adminOnlyURL").hasRole("ADMIN")
                 .anyRequest().permitAll().and().httpBasic();
         // @formatter:on
     }
diff --git a/spring-boot-security-taglibs/src/main/webapp/WEB-INF/views/home.jsp b/spring-boot-security-taglibs/src/main/webapp/WEB-INF/views/home.jsp
index 7291608e3e..eed24182e2 100644
--- a/spring-boot-security-taglibs/src/main/webapp/WEB-INF/views/home.jsp
+++ b/spring-boot-security-taglibs/src/main/webapp/WEB-INF/views/home.jsp
@@ -14,9 +14,9 @@
         ANONYMOUS
     </sec:authorize>
     <sec:authorize access="isAuthenticated()">
-        AUTHENTICATED    
+        AUTHENTICATED Content 
         <sec:authorize access="hasRole('ADMIN')">
-            ADMIN ROLE
+            Content for users who have the "ADMIN" role.
         </sec:authorize>
         <h2>
             principal.username:
@@ -26,6 +26,9 @@
             <sec:csrfInput />
             Text Field: <br /> <input type="text" name="textField" />
         </form>
+        <sec:authorize url="/adminOnlyURL">
+            <a href="/adminOnlyURL">Go to Admin Only URL</a>
+        </sec:authorize>
     </sec:authorize>
 </body>
 </html>
\ No newline at end of file
diff --git a/spring-boot-security-taglibs/src/test/java/org/baeldung/security/HomeControllerTest.java b/spring-boot-security-taglibs/src/test/java/org/baeldung/security/HomeControllerTest.java
index c005185c92..78b3089fba 100644
--- a/spring-boot-security-taglibs/src/test/java/org/baeldung/security/HomeControllerTest.java
+++ b/spring-boot-security-taglibs/src/test/java/org/baeldung/security/HomeControllerTest.java
@@ -31,11 +31,14 @@ public class HomeControllerTest {
         assertTrue(body.contains("AUTHENTICATED"));
 
         // test <sec:authorize access="hasRole('ADMIN')">
-        assertTrue(body.contains("ADMIN ROLE"));
+        assertTrue(body.contains("Content for users who have the \"ADMIN\" role."));
 
         // test <sec:authentication property="principal.username" />
         assertTrue(body.contains("testUser"));
 
+        // test <sec:authorize url="/adminOnlyURL">
+        assertTrue(body.contains("<a href=\"/adminOnlyURL\">"));
+        
         // test <sec:csrfInput />
         assertTrue(body.contains("<input type=\"hidden\" name=\"_csrf\" value=\""));
 

From 1842c33b3a51afa7fcb0d1e649a483f33454ef3a Mon Sep 17 00:00:00 2001
From: "nnhai1991@gmail.com" <Hai Nguyen>
Date: Sun, 19 Aug 2018 17:34:29 +0800
Subject: [PATCH 14/28] additional tests and content

---
 .../src/main/webapp/WEB-INF/views/home.jsp                  | 5 ++---
 .../test/java/org/baeldung/security/HomeControllerTest.java | 6 +++---
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/spring-boot-security-taglibs/src/main/webapp/WEB-INF/views/home.jsp b/spring-boot-security-taglibs/src/main/webapp/WEB-INF/views/home.jsp
index eed24182e2..9bb96fe5fd 100644
--- a/spring-boot-security-taglibs/src/main/webapp/WEB-INF/views/home.jsp
+++ b/spring-boot-security-taglibs/src/main/webapp/WEB-INF/views/home.jsp
@@ -11,7 +11,7 @@
 </head>
 <body>
     <sec:authorize access="isAnonymous()">
-        ANONYMOUS
+        ANONYMOUS Content
     </sec:authorize>
     <sec:authorize access="isAuthenticated()">
         AUTHENTICATED Content 
@@ -19,8 +19,7 @@
             Content for users who have the "ADMIN" role.
         </sec:authorize>
         <h2>
-            principal.username:
-            <sec:authentication property="principal.username" />
+            Welcome back, <sec:authentication property="name" />
         </h2>
         <form>
             <sec:csrfInput />
diff --git a/spring-boot-security-taglibs/src/test/java/org/baeldung/security/HomeControllerTest.java b/spring-boot-security-taglibs/src/test/java/org/baeldung/security/HomeControllerTest.java
index 78b3089fba..189a691496 100644
--- a/spring-boot-security-taglibs/src/test/java/org/baeldung/security/HomeControllerTest.java
+++ b/spring-boot-security-taglibs/src/test/java/org/baeldung/security/HomeControllerTest.java
@@ -28,7 +28,7 @@ public class HomeControllerTest {
         assertFalse(body.contains("ANONYMOUS"));
 
         // test <sec:authorize access="isAuthenticated()">
-        assertTrue(body.contains("AUTHENTICATED"));
+        assertTrue(body.contains("AUTHENTICATED Content"));
 
         // test <sec:authorize access="hasRole('ADMIN')">
         assertTrue(body.contains("Content for users who have the \"ADMIN\" role."));
@@ -52,9 +52,9 @@ public class HomeControllerTest {
             .getBody();
 
         // test <sec:authorize access="isAnonymous()">
-        assertTrue(body.contains("ANONYMOUS"));
+        assertTrue(body.contains("ANONYMOUS Content"));
 
         // test <sec:authorize access="isAuthenticated()">
-        assertFalse(body.contains("AUTHENTICATED"));
+        assertFalse(body.contains("AUTHENTICATED Content"));
     }
 }

From 7263e223c5c2cfd5f8c81be494eb47710098dbd2 Mon Sep 17 00:00:00 2001
From: "nnhai1991@gmail.com" <Hai Nguyen>
Date: Tue, 21 Aug 2018 22:31:44 +0800
Subject: [PATCH 15/28] update examples

---
 .../baeldung/security/ApplicationConfig.java  |  2 +-
 .../src/main/webapp/WEB-INF/views/home.jsp    | 24 +++++++++++--------
 .../baeldung/security/HomeControllerTest.java | 16 ++++++-------
 3 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/spring-boot-security-taglibs/src/main/java/org/baeldung/security/ApplicationConfig.java b/spring-boot-security-taglibs/src/main/java/org/baeldung/security/ApplicationConfig.java
index 6419da3bdd..e8a95af5ce 100644
--- a/spring-boot-security-taglibs/src/main/java/org/baeldung/security/ApplicationConfig.java
+++ b/spring-boot-security-taglibs/src/main/java/org/baeldung/security/ApplicationConfig.java
@@ -35,7 +35,7 @@ public class ApplicationConfig extends WebSecurityConfigurerAdapter {
         http.csrf()
                 .and()
             .authorizeRequests()
-                .antMatchers("/adminOnlyURL").hasRole("ADMIN")
+                .antMatchers("/userManagement").hasRole("ADMIN")
                 .anyRequest().permitAll().and().httpBasic();
         // @formatter:on
     }
diff --git a/spring-boot-security-taglibs/src/main/webapp/WEB-INF/views/home.jsp b/spring-boot-security-taglibs/src/main/webapp/WEB-INF/views/home.jsp
index 9bb96fe5fd..70440e8dc9 100644
--- a/spring-boot-security-taglibs/src/main/webapp/WEB-INF/views/home.jsp
+++ b/spring-boot-security-taglibs/src/main/webapp/WEB-INF/views/home.jsp
@@ -9,24 +9,28 @@
 <sec:csrfMetaTags />
 <title>Home Page</title>
 </head>
-<body>
-    <sec:authorize access="isAnonymous()">
-        ANONYMOUS Content
+<body>    
+    <sec:authorize access="!isAuthenticated()">
+        Login
     </sec:authorize>
+    
+    <sec:authorize access="isAuthenticated()">
+        Logout
+    </sec:authorize>
+    
     <sec:authorize access="isAuthenticated()">
-        AUTHENTICATED Content 
-        <sec:authorize access="hasRole('ADMIN')">
-            Content for users who have the "ADMIN" role.
-        </sec:authorize>
         <h2>
             Welcome back, <sec:authentication property="name" />
-        </h2>
+        </h2>         
+        <sec:authorize access="hasRole('ADMIN')">
+            Manage Users
+        </sec:authorize>
         <form>
             <sec:csrfInput />
             Text Field: <br /> <input type="text" name="textField" />
         </form>
-        <sec:authorize url="/adminOnlyURL">
-            <a href="/adminOnlyURL">Go to Admin Only URL</a>
+        <sec:authorize url="/userManagement">
+            <a href="/userManagement">Manage Users</a>
         </sec:authorize>
     </sec:authorize>
 </body>
diff --git a/spring-boot-security-taglibs/src/test/java/org/baeldung/security/HomeControllerTest.java b/spring-boot-security-taglibs/src/test/java/org/baeldung/security/HomeControllerTest.java
index 189a691496..e085fb4083 100644
--- a/spring-boot-security-taglibs/src/test/java/org/baeldung/security/HomeControllerTest.java
+++ b/spring-boot-security-taglibs/src/test/java/org/baeldung/security/HomeControllerTest.java
@@ -24,20 +24,20 @@ public class HomeControllerTest {
             .getForEntity("/", String.class)
             .getBody();
 
-        // test <sec:authorize access="isAnonymous()">
-        assertFalse(body.contains("ANONYMOUS"));
+        // test <sec:authorize access="!isAuthenticated()">
+        assertFalse(body.contains("Login"));
 
         // test <sec:authorize access="isAuthenticated()">
-        assertTrue(body.contains("AUTHENTICATED Content"));
+        assertTrue(body.contains("Logout"));
 
         // test <sec:authorize access="hasRole('ADMIN')">
-        assertTrue(body.contains("Content for users who have the \"ADMIN\" role."));
+        assertTrue(body.contains("Manage Users"));
 
         // test <sec:authentication property="principal.username" />
         assertTrue(body.contains("testUser"));
 
         // test <sec:authorize url="/adminOnlyURL">
-        assertTrue(body.contains("<a href=\"/adminOnlyURL\">"));
+        assertTrue(body.contains("<a href=\"/userManagement\">"));
         
         // test <sec:csrfInput />
         assertTrue(body.contains("<input type=\"hidden\" name=\"_csrf\" value=\""));
@@ -51,10 +51,10 @@ public class HomeControllerTest {
         String body = this.restTemplate.getForEntity("/", String.class)
             .getBody();
 
-        // test <sec:authorize access="isAnonymous()">
-        assertTrue(body.contains("ANONYMOUS Content"));
+        // test <sec:authorize access="!isAuthenticated()">
+        assertTrue(body.contains("Login"));
 
         // test <sec:authorize access="isAuthenticated()">
-        assertFalse(body.contains("AUTHENTICATED Content"));
+        assertFalse(body.contains("Logout"));
     }
 }

From 221ecbdae68b7e706e99236754b727d506e5943f Mon Sep 17 00:00:00 2001
From: Hai Nguyen <nnhai1991@gmail.com>
Date: Wed, 22 Aug 2018 22:07:20 +0800
Subject: [PATCH 16/28] Delete Readme file

---
 spring-boot-security-taglibs/README.md | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 spring-boot-security-taglibs/README.md

diff --git a/spring-boot-security-taglibs/README.md b/spring-boot-security-taglibs/README.md
deleted file mode 100644
index 8b13789179..0000000000
--- a/spring-boot-security-taglibs/README.md
+++ /dev/null
@@ -1 +0,0 @@
-

From fe7b8bf4ba67ce520c764049da162af307837443 Mon Sep 17 00:00:00 2001
From: "nnhai1991@gmail.com" <Hai Nguyen>
Date: Wed, 22 Aug 2018 23:19:31 +0800
Subject: [PATCH 17/28] edit form example

---
 .../src/main/java/org/baeldung/security/HomeController.java | 6 +-----
 .../src/main/webapp/WEB-INF/views/home.jsp                  | 3 ++-
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/spring-boot-security-taglibs/src/main/java/org/baeldung/security/HomeController.java b/spring-boot-security-taglibs/src/main/java/org/baeldung/security/HomeController.java
index cdd4c3f42b..7e70c269cb 100644
--- a/spring-boot-security-taglibs/src/main/java/org/baeldung/security/HomeController.java
+++ b/spring-boot-security-taglibs/src/main/java/org/baeldung/security/HomeController.java
@@ -1,17 +1,13 @@
 package org.baeldung.security;
 
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 @Controller
 @RequestMapping("/")
 public class HomeController {
     
-    @GetMapping
+    @RequestMapping
     public String home() {
         return "home";
     }
diff --git a/spring-boot-security-taglibs/src/main/webapp/WEB-INF/views/home.jsp b/spring-boot-security-taglibs/src/main/webapp/WEB-INF/views/home.jsp
index 70440e8dc9..80ecd61cb5 100644
--- a/spring-boot-security-taglibs/src/main/webapp/WEB-INF/views/home.jsp
+++ b/spring-boot-security-taglibs/src/main/webapp/WEB-INF/views/home.jsp
@@ -25,9 +25,10 @@
         <sec:authorize access="hasRole('ADMIN')">
             Manage Users
         </sec:authorize>
-        <form>
+        <form method="post">
             <sec:csrfInput />
             Text Field: <br /> <input type="text" name="textField" />
+            <input type="submit" value="Submit form with CSRF input">
         </form>
         <sec:authorize url="/userManagement">
             <a href="/userManagement">Manage Users</a>

From 8e5586ca48f7d12b2666a47d269dad9bc21d527d Mon Sep 17 00:00:00 2001
From: "nnhai1991@gmail.com" <Hai Nguyen>
Date: Fri, 24 Aug 2018 23:46:12 +0800
Subject: [PATCH 18/28] adding example for spring boot security tag libs

---
 spring-boot-security/pom.xml                  | 17 ++++++
 .../springsecuritytaglibs/HomeController.java | 14 +++++
 .../SpringBootSecurityTagLibsApplication.java |  9 +++
 .../SpringBootSecurityTagLibsConfig.java      | 31 ++++++++++
 .../resources/application-taglibs.properties  |  3 +
 .../src/main/resources/application.properties |  2 +-
 .../src/main/webapp/WEB-INF/views/home.jsp    | 38 ++++++++++++
 .../HomeControllerUnitTest.java               | 60 +++++++++++++++++++
 8 files changed, 173 insertions(+), 1 deletion(-)
 create mode 100644 spring-boot-security/src/main/java/com/baeldung/springsecuritytaglibs/HomeController.java
 create mode 100644 spring-boot-security/src/main/java/com/baeldung/springsecuritytaglibs/SpringBootSecurityTagLibsApplication.java
 create mode 100644 spring-boot-security/src/main/java/com/baeldung/springsecuritytaglibs/config/SpringBootSecurityTagLibsConfig.java
 create mode 100644 spring-boot-security/src/main/resources/application-taglibs.properties
 create mode 100644 spring-boot-security/src/main/webapp/WEB-INF/views/home.jsp
 create mode 100644 spring-boot-security/src/test/java/com/baeldung/springsecuritytaglibs/HomeControllerUnitTest.java

diff --git a/spring-boot-security/pom.xml b/spring-boot-security/pom.xml
index 12f51eec94..b1673d383e 100644
--- a/spring-boot-security/pom.xml
+++ b/spring-boot-security/pom.xml
@@ -44,6 +44,23 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
+        
+        <!-- security taglib -->
+        <dependency>
+            <groupId>org.springframework.security</groupId>
+            <artifactId>spring-security-taglibs</artifactId>
+        </dependency>
+
+        <!-- JSTL -->
+        <dependency>
+            <groupId>org.apache.tomcat.embed</groupId>
+            <artifactId>tomcat-embed-jasper</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>jstl</artifactId>
+        </dependency>
 
         <dependency>
             <groupId>org.springframework.boot</groupId>
diff --git a/spring-boot-security/src/main/java/com/baeldung/springsecuritytaglibs/HomeController.java b/spring-boot-security/src/main/java/com/baeldung/springsecuritytaglibs/HomeController.java
new file mode 100644
index 0000000000..eca093a76f
--- /dev/null
+++ b/spring-boot-security/src/main/java/com/baeldung/springsecuritytaglibs/HomeController.java
@@ -0,0 +1,14 @@
+package com.baeldung.springsecuritytaglibs;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+@Controller
+@RequestMapping("/")
+public class HomeController {
+    
+    @RequestMapping
+    public String home() {
+        return "home";
+    }
+}
diff --git a/spring-boot-security/src/main/java/com/baeldung/springsecuritytaglibs/SpringBootSecurityTagLibsApplication.java b/spring-boot-security/src/main/java/com/baeldung/springsecuritytaglibs/SpringBootSecurityTagLibsApplication.java
new file mode 100644
index 0000000000..397ea47f96
--- /dev/null
+++ b/spring-boot-security/src/main/java/com/baeldung/springsecuritytaglibs/SpringBootSecurityTagLibsApplication.java
@@ -0,0 +1,9 @@
+package com.baeldung.springsecuritytaglibs;
+
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.PropertySource;
+
+@SpringBootApplication
+@PropertySource("classpath:application-taglibs.properties")
+public class SpringBootSecurityTagLibsApplication {
+}
diff --git a/spring-boot-security/src/main/java/com/baeldung/springsecuritytaglibs/config/SpringBootSecurityTagLibsConfig.java b/spring-boot-security/src/main/java/com/baeldung/springsecuritytaglibs/config/SpringBootSecurityTagLibsConfig.java
new file mode 100644
index 0000000000..665dd0bce9
--- /dev/null
+++ b/spring-boot-security/src/main/java/com/baeldung/springsecuritytaglibs/config/SpringBootSecurityTagLibsConfig.java
@@ -0,0 +1,31 @@
+package com.baeldung.springsecuritytaglibs.config;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
+import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
+import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
+
+@Configuration
+@EnableWebSecurity
+public class SpringBootSecurityTagLibsConfig extends WebSecurityConfigurerAdapter {
+
+    @Override
+    protected void configure(AuthenticationManagerBuilder auth) throws Exception {
+        auth.inMemoryAuthentication()
+            .withUser("testUser")
+            .password("password")
+            .roles("ADMIN");
+    }
+
+    @Override
+    protected void configure(HttpSecurity http) throws Exception {
+        // @formatter:off
+        http.csrf()
+                .and()
+            .authorizeRequests()
+                .antMatchers("/userManagement").hasRole("ADMIN")
+                .anyRequest().permitAll().and().httpBasic();
+        // @formatter:on
+    }
+}
\ No newline at end of file
diff --git a/spring-boot-security/src/main/resources/application-taglibs.properties b/spring-boot-security/src/main/resources/application-taglibs.properties
new file mode 100644
index 0000000000..218868405f
--- /dev/null
+++ b/spring-boot-security/src/main/resources/application-taglibs.properties
@@ -0,0 +1,3 @@
+#jsp config
+spring.mvc.view.prefix: /WEB-INF/views/
+spring.mvc.view.suffix: .jsp
diff --git a/spring-boot-security/src/main/resources/application.properties b/spring-boot-security/src/main/resources/application.properties
index c2b8d70dc6..e776132359 100644
--- a/spring-boot-security/src/main/resources/application.properties
+++ b/spring-boot-security/src/main/resources/application.properties
@@ -1,4 +1,4 @@
 #spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.security.SecurityAutoConfiguration
 #security.user.password=password
 #security.oauth2.client.client-id=client
-#security.oauth2.client.client-secret=secret
+#security.oauth2.client.client-secret=secret
\ No newline at end of file
diff --git a/spring-boot-security/src/main/webapp/WEB-INF/views/home.jsp b/spring-boot-security/src/main/webapp/WEB-INF/views/home.jsp
new file mode 100644
index 0000000000..80ecd61cb5
--- /dev/null
+++ b/spring-boot-security/src/main/webapp/WEB-INF/views/home.jsp
@@ -0,0 +1,38 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+    pageEncoding="UTF-8"%>
+<%@ taglib prefix="sec"
+    uri="http://www.springframework.org/security/tags"%>
+<!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">
+<sec:csrfMetaTags />
+<title>Home Page</title>
+</head>
+<body>    
+    <sec:authorize access="!isAuthenticated()">
+        Login
+    </sec:authorize>
+    
+    <sec:authorize access="isAuthenticated()">
+        Logout
+    </sec:authorize>
+    
+    <sec:authorize access="isAuthenticated()">
+        <h2>
+            Welcome back, <sec:authentication property="name" />
+        </h2>         
+        <sec:authorize access="hasRole('ADMIN')">
+            Manage Users
+        </sec:authorize>
+        <form method="post">
+            <sec:csrfInput />
+            Text Field: <br /> <input type="text" name="textField" />
+            <input type="submit" value="Submit form with CSRF input">
+        </form>
+        <sec:authorize url="/userManagement">
+            <a href="/userManagement">Manage Users</a>
+        </sec:authorize>
+    </sec:authorize>
+</body>
+</html>
\ No newline at end of file
diff --git a/spring-boot-security/src/test/java/com/baeldung/springsecuritytaglibs/HomeControllerUnitTest.java b/spring-boot-security/src/test/java/com/baeldung/springsecuritytaglibs/HomeControllerUnitTest.java
new file mode 100644
index 0000000000..0585c06a59
--- /dev/null
+++ b/spring-boot-security/src/test/java/com/baeldung/springsecuritytaglibs/HomeControllerUnitTest.java
@@ -0,0 +1,60 @@
+package com.baeldung.springsecuritytaglibs;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
+import org.springframework.boot.test.web.client.TestRestTemplate;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT, classes = SpringBootSecurityTagLibsApplication.class)
+public class HomeControllerUnitTest {
+
+    @Autowired
+    private TestRestTemplate restTemplate;
+
+    @Test
+    public void whenUserIsAuthenticatedThenAuthenticatedSectionsShowOnSite() throws Exception {
+        String body = this.restTemplate.withBasicAuth("testUser", "password")
+            .getForEntity("/", String.class)
+            .getBody();
+
+        // test <sec:authorize access="!isAuthenticated()">
+        assertFalse(body.contains("Login"));
+
+        // test <sec:authorize access="isAuthenticated()">
+        assertTrue(body.contains("Logout"));
+
+        // test <sec:authorize access="hasRole('ADMIN')">
+        assertTrue(body.contains("Manage Users"));
+
+        // test <sec:authentication property="principal.username" />
+        assertTrue(body.contains("testUser"));
+
+        // test <sec:authorize url="/adminOnlyURL">
+        assertTrue(body.contains("<a href=\"/userManagement\">"));
+
+        // test <sec:csrfInput />
+        assertTrue(body.contains("<input type=\"hidden\" name=\"_csrf\" value=\""));
+
+        // test <sec:csrfMetaTags />
+        assertTrue(body.contains("<meta name=\"_csrf_parameter\" content=\"_csrf\" />"));
+    }
+
+    @Test
+    public void whenUserIsNotAuthenticatedThenOnlyAnonymousSectionsShowOnSite() throws Exception {
+        String body = this.restTemplate.getForEntity("/", String.class)
+            .getBody();
+
+        // test <sec:authorize access="!isAuthenticated()">
+        assertTrue(body.contains("Login"));
+
+        // test <sec:authorize access="isAuthenticated()">
+        assertFalse(body.contains("Logout"));
+    }
+}

From afdb37eb02b5f833a6278d2b8fdd651d8d0e436d Mon Sep 17 00:00:00 2001
From: "nnhai1991@gmail.com" <Hai Nguyen>
Date: Fri, 24 Aug 2018 23:48:20 +0800
Subject: [PATCH 19/28] Remove old tag libs module

---
 spring-boot-security-taglibs/.gitignore       | 13 ----
 spring-boot-security-taglibs/pom.xml          | 76 -------------------
 .../baeldung/security/ApplicationConfig.java  | 42 ----------
 .../org/baeldung/security/HomeController.java | 14 ----
 .../src/main/resources/application.properties |  3 -
 .../src/main/webapp/WEB-INF/views/home.jsp    | 38 ----------
 .../baeldung/security/HomeControllerTest.java | 60 ---------------
 7 files changed, 246 deletions(-)
 delete mode 100644 spring-boot-security-taglibs/.gitignore
 delete mode 100644 spring-boot-security-taglibs/pom.xml
 delete mode 100644 spring-boot-security-taglibs/src/main/java/org/baeldung/security/ApplicationConfig.java
 delete mode 100644 spring-boot-security-taglibs/src/main/java/org/baeldung/security/HomeController.java
 delete mode 100644 spring-boot-security-taglibs/src/main/resources/application.properties
 delete mode 100644 spring-boot-security-taglibs/src/main/webapp/WEB-INF/views/home.jsp
 delete mode 100644 spring-boot-security-taglibs/src/test/java/org/baeldung/security/HomeControllerTest.java

diff --git a/spring-boot-security-taglibs/.gitignore b/spring-boot-security-taglibs/.gitignore
deleted file mode 100644
index 83c05e60c8..0000000000
--- a/spring-boot-security-taglibs/.gitignore
+++ /dev/null
@@ -1,13 +0,0 @@
-*.class
-
-#folders#
-/target
-/neoDb*
-/data
-/src/main/webapp/WEB-INF/classes
-*/META-INF/*
-
-# Packaged files #
-*.jar
-*.war
-*.ear
\ No newline at end of file
diff --git a/spring-boot-security-taglibs/pom.xml b/spring-boot-security-taglibs/pom.xml
deleted file mode 100644
index 447f0c4be9..0000000000
--- a/spring-boot-security-taglibs/pom.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<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">
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>spring-boot-security-taglibs</artifactId>
-    <packaging>jar</packaging>
-    <name>spring-boot-security-taglibs</name>
-    <description>spring 5 security sample project</description>
-
-    <parent>
-        <groupId>com.baeldung</groupId>
-        <artifactId>parent-boot-2</artifactId>
-        <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../parent-boot-2</relativePath>
-    </parent>
-
-    <dependencies>
-
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-security</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-        </dependency>
-
-        <!-- security taglib -->
-        <dependency>
-            <groupId>org.springframework.security</groupId>
-            <artifactId>spring-security-taglibs</artifactId>
-        </dependency>
-
-        <!-- JSTL -->
-        <dependency>
-            <groupId>org.apache.tomcat.embed</groupId>
-            <artifactId>tomcat-embed-jasper</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>jstl</artifactId>
-        </dependency>
-
-        <!-- test -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.security</groupId>
-            <artifactId>spring-security-test</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-        <finalName>spring-5-security-taglibs</finalName>
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-                <filtering>true</filtering>
-            </resource>
-        </resources>
-    </build>
-
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <java.version>1.8</java.version>
-    </properties>
-
-</project>
\ No newline at end of file
diff --git a/spring-boot-security-taglibs/src/main/java/org/baeldung/security/ApplicationConfig.java b/spring-boot-security-taglibs/src/main/java/org/baeldung/security/ApplicationConfig.java
deleted file mode 100644
index e8a95af5ce..0000000000
--- a/spring-boot-security-taglibs/src/main/java/org/baeldung/security/ApplicationConfig.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package org.baeldung.security;
-
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
-import org.springframework.security.core.userdetails.User;
-import org.springframework.security.core.userdetails.UserDetails;
-import org.springframework.security.core.userdetails.UserDetailsService;
-import org.springframework.security.provisioning.InMemoryUserDetailsManager;
-
-@SpringBootApplication
-@Configuration
-@EnableWebSecurity
-public class ApplicationConfig extends WebSecurityConfigurerAdapter {
-
-    // Using withDefaultPasswordEncoder and InMemoryUserDetailsManager for demonstration and testing purpose
-    @Bean
-    @Override
-    public UserDetailsService userDetailsService() {
-        UserDetails user = User.withDefaultPasswordEncoder()
-            .username("testUser")
-            .password("password")
-            .roles("ADMIN")
-            .build();
-
-        return new InMemoryUserDetailsManager(user);
-    }
-
-    @Override
-    protected void configure(HttpSecurity http) throws Exception {
-        // @formatter:off
-        http.csrf()
-                .and()
-            .authorizeRequests()
-                .antMatchers("/userManagement").hasRole("ADMIN")
-                .anyRequest().permitAll().and().httpBasic();
-        // @formatter:on
-    }
-}
diff --git a/spring-boot-security-taglibs/src/main/java/org/baeldung/security/HomeController.java b/spring-boot-security-taglibs/src/main/java/org/baeldung/security/HomeController.java
deleted file mode 100644
index 7e70c269cb..0000000000
--- a/spring-boot-security-taglibs/src/main/java/org/baeldung/security/HomeController.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package org.baeldung.security;
-
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-@Controller
-@RequestMapping("/")
-public class HomeController {
-    
-    @RequestMapping
-    public String home() {
-        return "home";
-    }
-}
diff --git a/spring-boot-security-taglibs/src/main/resources/application.properties b/spring-boot-security-taglibs/src/main/resources/application.properties
deleted file mode 100644
index 218868405f..0000000000
--- a/spring-boot-security-taglibs/src/main/resources/application.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-#jsp config
-spring.mvc.view.prefix: /WEB-INF/views/
-spring.mvc.view.suffix: .jsp
diff --git a/spring-boot-security-taglibs/src/main/webapp/WEB-INF/views/home.jsp b/spring-boot-security-taglibs/src/main/webapp/WEB-INF/views/home.jsp
deleted file mode 100644
index 80ecd61cb5..0000000000
--- a/spring-boot-security-taglibs/src/main/webapp/WEB-INF/views/home.jsp
+++ /dev/null
@@ -1,38 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=UTF-8"
-    pageEncoding="UTF-8"%>
-<%@ taglib prefix="sec"
-    uri="http://www.springframework.org/security/tags"%>
-<!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">
-<sec:csrfMetaTags />
-<title>Home Page</title>
-</head>
-<body>    
-    <sec:authorize access="!isAuthenticated()">
-        Login
-    </sec:authorize>
-    
-    <sec:authorize access="isAuthenticated()">
-        Logout
-    </sec:authorize>
-    
-    <sec:authorize access="isAuthenticated()">
-        <h2>
-            Welcome back, <sec:authentication property="name" />
-        </h2>         
-        <sec:authorize access="hasRole('ADMIN')">
-            Manage Users
-        </sec:authorize>
-        <form method="post">
-            <sec:csrfInput />
-            Text Field: <br /> <input type="text" name="textField" />
-            <input type="submit" value="Submit form with CSRF input">
-        </form>
-        <sec:authorize url="/userManagement">
-            <a href="/userManagement">Manage Users</a>
-        </sec:authorize>
-    </sec:authorize>
-</body>
-</html>
\ No newline at end of file
diff --git a/spring-boot-security-taglibs/src/test/java/org/baeldung/security/HomeControllerTest.java b/spring-boot-security-taglibs/src/test/java/org/baeldung/security/HomeControllerTest.java
deleted file mode 100644
index e085fb4083..0000000000
--- a/spring-boot-security-taglibs/src/test/java/org/baeldung/security/HomeControllerTest.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package org.baeldung.security;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
-import org.springframework.boot.test.web.client.TestRestTemplate;
-import org.springframework.test.context.junit4.SpringRunner;
-
-@RunWith(SpringRunner.class)
-@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT)
-public class HomeControllerTest {
-
-    @Autowired
-    private TestRestTemplate restTemplate;
-
-    @Test
-    public void whenUserIsAuthenticatedThenAuthenticatedSectionsShowOnSite() throws Exception {
-        String body = this.restTemplate.withBasicAuth("testUser", "password")
-            .getForEntity("/", String.class)
-            .getBody();
-
-        // test <sec:authorize access="!isAuthenticated()">
-        assertFalse(body.contains("Login"));
-
-        // test <sec:authorize access="isAuthenticated()">
-        assertTrue(body.contains("Logout"));
-
-        // test <sec:authorize access="hasRole('ADMIN')">
-        assertTrue(body.contains("Manage Users"));
-
-        // test <sec:authentication property="principal.username" />
-        assertTrue(body.contains("testUser"));
-
-        // test <sec:authorize url="/adminOnlyURL">
-        assertTrue(body.contains("<a href=\"/userManagement\">"));
-        
-        // test <sec:csrfInput />
-        assertTrue(body.contains("<input type=\"hidden\" name=\"_csrf\" value=\""));
-
-        // test <sec:csrfMetaTags />
-        assertTrue(body.contains("<meta name=\"_csrf_parameter\" content=\"_csrf\" />"));
-    }
-
-    @Test
-    public void whenUserIsNotAuthenticatedThenOnlyAnonymousSectionsShowOnSite() throws Exception {
-        String body = this.restTemplate.getForEntity("/", String.class)
-            .getBody();
-
-        // test <sec:authorize access="!isAuthenticated()">
-        assertTrue(body.contains("Login"));
-
-        // test <sec:authorize access="isAuthenticated()">
-        assertFalse(body.contains("Logout"));
-    }
-}

From 2ee3d2ffd9c627f39e0cbcb0df0e5a23741a4be0 Mon Sep 17 00:00:00 2001
From: "nnhai1991@gmail.com" <Hai Nguyen>
Date: Mon, 10 Sep 2018 19:05:14 +0800
Subject: [PATCH 20/28] BAEL-2147 Add GsonTest

---
 .../com/baeldung/kotlin/gson/GsonUnitTest.kt  | 34 +++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 core-kotlin/src/test/kotlin/com/baeldung/kotlin/gson/GsonUnitTest.kt

diff --git a/core-kotlin/src/test/kotlin/com/baeldung/kotlin/gson/GsonUnitTest.kt b/core-kotlin/src/test/kotlin/com/baeldung/kotlin/gson/GsonUnitTest.kt
new file mode 100644
index 0000000000..fce3225ef8
--- /dev/null
+++ b/core-kotlin/src/test/kotlin/com/baeldung/kotlin/gson/GsonUnitTest.kt
@@ -0,0 +1,34 @@
+package com.baeldung.kotlin.gson
+
+import com.baeldung.datetime.UsePeriod
+import com.google.gson.Gson
+import com.google.gson.annotations.SerializedName
+import java.time.LocalDate
+import java.time.Period
+
+import org.junit.Assert
+import org.junit.Test
+
+class GsonUnitTest {
+
+    var gson = Gson()
+
+    @Test
+    fun givenObject_thenGetJSONString() {
+        var jsonString = gson.toJson(TestModel(1,"Test"))
+        Assert.assertEquals(jsonString, "{\"id\":1,\"description\":\"Test\"}")
+    }
+
+    @Test
+    fun givenJSONString_thenGetObject() {
+        var jsonString = "{\"id\":1,\"description\":\"Test\"}";
+        var testModel = gson.fromJson(jsonString, TestModel::class.java)
+        Assert.assertEquals(testModel.id, 1)
+        Assert.assertEquals(testModel.description, "Test")
+    }
+
+    data class TestModel(
+        val id: Int,
+        val description: String
+    )
+}
\ No newline at end of file

From 8962f0a3b6fc985712db3605b3520ff095076eb5 Mon Sep 17 00:00:00 2001
From: "nnhai1991@gmail.com" <Hai Nguyen>
Date: Mon, 10 Sep 2018 19:11:44 +0800
Subject: [PATCH 21/28] BAEL-2147 Remove unused import

---
 .../src/test/kotlin/com/baeldung/kotlin/gson/GsonUnitTest.kt  | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/core-kotlin/src/test/kotlin/com/baeldung/kotlin/gson/GsonUnitTest.kt b/core-kotlin/src/test/kotlin/com/baeldung/kotlin/gson/GsonUnitTest.kt
index fce3225ef8..bdf44d3b49 100644
--- a/core-kotlin/src/test/kotlin/com/baeldung/kotlin/gson/GsonUnitTest.kt
+++ b/core-kotlin/src/test/kotlin/com/baeldung/kotlin/gson/GsonUnitTest.kt
@@ -1,10 +1,6 @@
 package com.baeldung.kotlin.gson
 
-import com.baeldung.datetime.UsePeriod
 import com.google.gson.Gson
-import com.google.gson.annotations.SerializedName
-import java.time.LocalDate
-import java.time.Period
 
 import org.junit.Assert
 import org.junit.Test

From af993076f16d079bf50f71ec005f2cefd1011dca Mon Sep 17 00:00:00 2001
From: "nnhai1991@gmail.com" <Hai Nguyen>
Date: Wed, 26 Sep 2018 23:24:26 +0800
Subject: [PATCH 22/28] LoopTest class

---
 .../kotlin/com/baeldung/kotlin/LoopTest.kt    | 79 +++++++++++++++++++
 1 file changed, 79 insertions(+)
 create mode 100644 core-kotlin/src/test/kotlin/com/baeldung/kotlin/LoopTest.kt

diff --git a/core-kotlin/src/test/kotlin/com/baeldung/kotlin/LoopTest.kt b/core-kotlin/src/test/kotlin/com/baeldung/kotlin/LoopTest.kt
new file mode 100644
index 0000000000..e95592590b
--- /dev/null
+++ b/core-kotlin/src/test/kotlin/com/baeldung/kotlin/LoopTest.kt
@@ -0,0 +1,79 @@
+package com.baeldung.kotlin
+
+import org.junit.Test
+import kotlin.test.assertEquals
+import kotlin.test.assertFalse
+
+class LoopTest {
+
+    @Test
+    fun givenLoop_whenBreak_thenComplete() {
+        var value = 0
+
+        for (i in 1..100) {
+            value = i
+            if (value == 30)
+                break;
+        }
+
+        assertEquals(value, 30)
+
+        outer_loop@ for (i in 1..10) {
+            for (j in 1..10) {
+                value = i * j
+                if (value == 30)
+                    break@outer_loop;
+            }
+        }
+
+        assertEquals(value, 30)
+    }
+
+    @Test
+    fun givenLambda_whenReturn_thenComplete() {
+        listOf(1, 2, 3, 4, 5).forEach {
+            if (it == 3) return // non-local return directly to the caller
+            assert(it < 3)
+        }
+        //this point is unreachable
+        assert(false);
+    }
+
+    @Test
+    fun givenLambda_whenReturnWithExplicitLabel_thenComplete() {
+        var result = mutableListOf<Int>();
+
+        listOf(1, 2, 3, 4, 5).forEach lit@{
+            if (it == 3){
+                // local return to the caller of the lambda, i.e. the forEach loop
+                return@lit
+            }
+            result.add(it)
+        }
+
+        assert(1 in result
+                && 2 in result
+                && 4 in result
+                && 5 in result)
+        assertFalse(3 in result)
+    }
+
+    @Test
+    fun givenLambda_whenReturnWithImplicitLabel_thenComplete() {
+        var result = mutableListOf<Int>();
+
+        listOf(1, 2, 3, 4, 5).forEach {
+            if (it == 3){
+                // local return to the caller of the lambda, i.e. the forEach loop
+                return@forEach
+            }
+            result.add(it)
+        }
+
+        assert(1 in result
+                && 2 in result
+                && 4 in result
+                && 5 in result)
+        assertFalse(3 in result)
+    }
+}
\ No newline at end of file

From df99b29fb3756f5a01bda012553760666d84fed6 Mon Sep 17 00:00:00 2001
From: Hai Nguyen <nn.hai@samsung.com>
Date: Fri, 28 Sep 2018 10:00:44 +0800
Subject: [PATCH 23/28] test cases

---
 .../kotlin/com/baeldung/kotlin/LoopTest.kt    | 72 +++++++++++++++----
 1 file changed, 57 insertions(+), 15 deletions(-)

diff --git a/core-kotlin/src/test/kotlin/com/baeldung/kotlin/LoopTest.kt b/core-kotlin/src/test/kotlin/com/baeldung/kotlin/LoopTest.kt
index e95592590b..3f1afb19c3 100644
--- a/core-kotlin/src/test/kotlin/com/baeldung/kotlin/LoopTest.kt
+++ b/core-kotlin/src/test/kotlin/com/baeldung/kotlin/LoopTest.kt
@@ -10,14 +10,16 @@ class LoopTest {
     fun givenLoop_whenBreak_thenComplete() {
         var value = 0
 
-        for (i in 1..100) {
+        //break loop without label
+        for (i in 1..10) {
             value = i
-            if (value == 30)
+            if (value == 3)
                 break;
         }
 
-        assertEquals(value, 30)
+        assertEquals(value, 3)
 
+        //break loop with label
         outer_loop@ for (i in 1..10) {
             for (j in 1..10) {
                 value = i * j
@@ -29,6 +31,31 @@ class LoopTest {
         assertEquals(value, 30)
     }
 
+    @Test
+    fun givenLoop_whenContinue_thenComplete() {
+        var processedList = mutableListOf<Int>()
+        //continue loop without label
+        for (i in 1..10) {
+            if (i == 3)
+                continue;
+            processedList.add(i)
+        }
+
+        assert(processedList.all { it -> it != 3 })
+
+        //continue loop with label
+        processedList = mutableListOf<Int>()
+        outer_loop@ for (i in 1..10) {
+            for (j in 1..10) {
+                if (i == 3)
+                    continue@outer_loop;
+                processedList.add(i*j)
+            }
+        }
+
+        assertEquals(processedList.size, 90)
+    }
+
     @Test
     fun givenLambda_whenReturn_thenComplete() {
         listOf(1, 2, 3, 4, 5).forEach {
@@ -44,18 +71,14 @@ class LoopTest {
         var result = mutableListOf<Int>();
 
         listOf(1, 2, 3, 4, 5).forEach lit@{
-            if (it == 3){
+            if (it == 3) {
                 // local return to the caller of the lambda, i.e. the forEach loop
                 return@lit
             }
             result.add(it)
         }
 
-        assert(1 in result
-                && 2 in result
-                && 4 in result
-                && 5 in result)
-        assertFalse(3 in result)
+        assert(result.all { it -> it != 3 });
     }
 
     @Test
@@ -63,17 +86,36 @@ class LoopTest {
         var result = mutableListOf<Int>();
 
         listOf(1, 2, 3, 4, 5).forEach {
-            if (it == 3){
+            if (it == 3) {
                 // local return to the caller of the lambda, i.e. the forEach loop
                 return@forEach
             }
             result.add(it)
         }
 
-        assert(1 in result
-                && 2 in result
-                && 4 in result
-                && 5 in result)
-        assertFalse(3 in result)
+        assert(result.all { it -> it != 3 });
+    }
+
+    @Test
+    fun givenAnonymousFunction_return_thenComplete() {
+        var result = mutableListOf<Int>();
+        listOf(1, 2, 3, 4, 5).forEach(fun(element: Int) {
+            if (element == 3) return  // local return to the caller of the anonymous fun, i.e. the forEach loop
+            result.add(element);
+        })
+
+        assert(result.all { it -> it != 3 });
+    }
+
+    @Test
+    fun givenAnonymousFunction_returnToLabel_thenComplete() {
+        var value = 0;
+        run loop@{
+            listOf(1, 2, 3, 4, 5).forEach {
+                value = it;
+                if (it == 3) return@loop // non-local return from the lambda passed to run
+            }
+        }
+        assertEquals(value, 3)
     }
 }
\ No newline at end of file

From 6c0c94449d7e43eadd0406fa65dcc2897179da1b Mon Sep 17 00:00:00 2001
From: Hai Nguyen <nn.hai@samsung.com>
Date: Fri, 28 Sep 2018 10:01:45 +0800
Subject: [PATCH 24/28] StructuralJumpTest

---
 .../com/baeldung/kotlin/{LoopTest.kt => StructuralJumpTest.kt}  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename core-kotlin/src/test/kotlin/com/baeldung/kotlin/{LoopTest.kt => StructuralJumpTest.kt} (99%)

diff --git a/core-kotlin/src/test/kotlin/com/baeldung/kotlin/LoopTest.kt b/core-kotlin/src/test/kotlin/com/baeldung/kotlin/StructuralJumpTest.kt
similarity index 99%
rename from core-kotlin/src/test/kotlin/com/baeldung/kotlin/LoopTest.kt
rename to core-kotlin/src/test/kotlin/com/baeldung/kotlin/StructuralJumpTest.kt
index 3f1afb19c3..55b90deaa4 100644
--- a/core-kotlin/src/test/kotlin/com/baeldung/kotlin/LoopTest.kt
+++ b/core-kotlin/src/test/kotlin/com/baeldung/kotlin/StructuralJumpTest.kt
@@ -4,7 +4,7 @@ import org.junit.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertFalse
 
-class LoopTest {
+class StructuralJumpTest  {
 
     @Test
     fun givenLoop_whenBreak_thenComplete() {

From 3b4e23cedf14ce23de22b56d8346d64f8afada2b Mon Sep 17 00:00:00 2001
From: "nnhai1991@gmail.com" <Hai Nguyen>
Date: Sun, 30 Sep 2018 23:40:19 +0800
Subject: [PATCH 25/28] refactor some code

---
 .../com/baeldung/kotlin/StructuralJumpTest.kt | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/core-kotlin/src/test/kotlin/com/baeldung/kotlin/StructuralJumpTest.kt b/core-kotlin/src/test/kotlin/com/baeldung/kotlin/StructuralJumpTest.kt
index 55b90deaa4..076adfb94e 100644
--- a/core-kotlin/src/test/kotlin/com/baeldung/kotlin/StructuralJumpTest.kt
+++ b/core-kotlin/src/test/kotlin/com/baeldung/kotlin/StructuralJumpTest.kt
@@ -14,7 +14,7 @@ class StructuralJumpTest  {
         for (i in 1..10) {
             value = i
             if (value == 3)
-                break;
+                break
         }
 
         assertEquals(value, 3)
@@ -24,7 +24,7 @@ class StructuralJumpTest  {
             for (j in 1..10) {
                 value = i * j
                 if (value == 30)
-                    break@outer_loop;
+                    break@outer_loop
             }
         }
 
@@ -37,7 +37,7 @@ class StructuralJumpTest  {
         //continue loop without label
         for (i in 1..10) {
             if (i == 3)
-                continue;
+                continue
             processedList.add(i)
         }
 
@@ -48,7 +48,7 @@ class StructuralJumpTest  {
         outer_loop@ for (i in 1..10) {
             for (j in 1..10) {
                 if (i == 3)
-                    continue@outer_loop;
+                    continue@outer_loop
                 processedList.add(i*j)
             }
         }
@@ -63,12 +63,12 @@ class StructuralJumpTest  {
             assert(it < 3)
         }
         //this point is unreachable
-        assert(false);
+        assert(false)
     }
 
     @Test
     fun givenLambda_whenReturnWithExplicitLabel_thenComplete() {
-        var result = mutableListOf<Int>();
+        var result = mutableListOf<Int>()
 
         listOf(1, 2, 3, 4, 5).forEach lit@{
             if (it == 3) {
@@ -78,12 +78,12 @@ class StructuralJumpTest  {
             result.add(it)
         }
 
-        assert(result.all { it -> it != 3 });
+        assert(result.all { it -> it != 3 })
     }
 
     @Test
     fun givenLambda_whenReturnWithImplicitLabel_thenComplete() {
-        var result = mutableListOf<Int>();
+        var result = mutableListOf<Int>()
 
         listOf(1, 2, 3, 4, 5).forEach {
             if (it == 3) {
@@ -93,26 +93,26 @@ class StructuralJumpTest  {
             result.add(it)
         }
 
-        assert(result.all { it -> it != 3 });
+        assert(result.all { it -> it != 3 })
     }
 
     @Test
     fun givenAnonymousFunction_return_thenComplete() {
-        var result = mutableListOf<Int>();
+        var result = mutableListOf<Int>()
         listOf(1, 2, 3, 4, 5).forEach(fun(element: Int) {
             if (element == 3) return  // local return to the caller of the anonymous fun, i.e. the forEach loop
-            result.add(element);
+            result.add(element)
         })
 
-        assert(result.all { it -> it != 3 });
+        assert(result.all { it -> it != 3 })
     }
 
     @Test
     fun givenAnonymousFunction_returnToLabel_thenComplete() {
-        var value = 0;
+        var value = 0
         run loop@{
             listOf(1, 2, 3, 4, 5).forEach {
-                value = it;
+                value = it
                 if (it == 3) return@loop // non-local return from the lambda passed to run
             }
         }

From 2c6a3a69b09ed2d901a452304030d21f5d3ca58a Mon Sep 17 00:00:00 2001
From: Hai Nguyen <nn.hai@samsung.com>
Date: Tue, 2 Oct 2018 10:43:04 +0800
Subject: [PATCH 26/28] change example

---
 .../com/baeldung/kotlin/StructuralJumpTest.kt | 126 +++++++++---------
 1 file changed, 63 insertions(+), 63 deletions(-)

diff --git a/core-kotlin/src/test/kotlin/com/baeldung/kotlin/StructuralJumpTest.kt b/core-kotlin/src/test/kotlin/com/baeldung/kotlin/StructuralJumpTest.kt
index 076adfb94e..6866816517 100644
--- a/core-kotlin/src/test/kotlin/com/baeldung/kotlin/StructuralJumpTest.kt
+++ b/core-kotlin/src/test/kotlin/com/baeldung/kotlin/StructuralJumpTest.kt
@@ -4,118 +4,118 @@ import org.junit.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertFalse
 
-class StructuralJumpTest  {
+class StructuralJumpTest {
 
     @Test
     fun givenLoop_whenBreak_thenComplete() {
-        var value = 0
-
-        //break loop without label
-        for (i in 1..10) {
-            value = i
-            if (value == 3)
+        var value = ""
+        for (i in 'a'..'e') {
+            value += i.toString()
+            if (i == 'c')
                 break
         }
-
-        assertEquals(value, 3)
-
-        //break loop with label
-        outer_loop@ for (i in 1..10) {
-            for (j in 1..10) {
-                value = i * j
-                if (value == 30)
+        assertEquals("abc", value)
+    }
+    @Test
+    fun givenLoop_whenBreakWithLabel_thenComplete() {
+        var value = ""
+        outer_loop@ for (i in 'a'..'d') {
+            for (j in 1..3) {
+                value += "" + i + j
+                if (i == 'b' && j == 1)
                     break@outer_loop
             }
         }
-
-        assertEquals(value, 30)
+        assertEquals("a1a2a3b1", value)
     }
 
     @Test
     fun givenLoop_whenContinue_thenComplete() {
-        var processedList = mutableListOf<Int>()
-        //continue loop without label
-        for (i in 1..10) {
-            if (i == 3)
+        var result = ""
+        for (i in 'a'..'d') {
+            if (i == 'b')
                 continue
-            processedList.add(i)
+            result += i
         }
-
-        assert(processedList.all { it -> it != 3 })
-
-        //continue loop with label
-        processedList = mutableListOf<Int>()
-        outer_loop@ for (i in 1..10) {
-            for (j in 1..10) {
-                if (i == 3)
+        assertEquals("acd", result)
+    }
+    @Test
+    fun givenLoop_whenContinueWithLabel_thenComplete() {
+        var result = ""
+        outer_loop@ for (i in 'a'..'c') {
+            for (j in 1..3) {
+                if (i == 'b')
                     continue@outer_loop
-                processedList.add(i*j)
+                result += "" + i + j
             }
         }
-
-        assertEquals(processedList.size, 90)
+        assertEquals("a1a2a3c1c2c3", result)
     }
 
     @Test
     fun givenLambda_whenReturn_thenComplete() {
-        listOf(1, 2, 3, 4, 5).forEach {
-            if (it == 3) return // non-local return directly to the caller
-            assert(it < 3)
+        var result = returnInLambda();
+        assertEquals("hello", result)
+    }
+
+    private fun returnInLambda(): String {
+        var result = ""
+        "hello_world".forEach {
+            // non-local return directly to the caller
+            if (it == '_') return result
+            result += it.toString()
         }
-        //this point is unreachable
-        assert(false)
+        //this line won't be reached
+        return result;
     }
 
     @Test
     fun givenLambda_whenReturnWithExplicitLabel_thenComplete() {
-        var result = mutableListOf<Int>()
-
-        listOf(1, 2, 3, 4, 5).forEach lit@{
-            if (it == 3) {
+        var result = ""
+        "hello_world".forEach lit@{
+            if (it == 'o') {
                 // local return to the caller of the lambda, i.e. the forEach loop
                 return@lit
             }
-            result.add(it)
+            result += it.toString()
         }
-
-        assert(result.all { it -> it != 3 })
+        assertEquals("hell_wrld", result)
     }
 
     @Test
     fun givenLambda_whenReturnWithImplicitLabel_thenComplete() {
-        var result = mutableListOf<Int>()
-
-        listOf(1, 2, 3, 4, 5).forEach {
-            if (it == 3) {
+        var result = ""
+        "hello_world".forEach {
+            if (it == 'o') {
                 // local return to the caller of the lambda, i.e. the forEach loop
                 return@forEach
             }
-            result.add(it)
+            result += it.toString()
         }
-
-        assert(result.all { it -> it != 3 })
+        assertEquals("hell_wrld", result)
     }
 
     @Test
     fun givenAnonymousFunction_return_thenComplete() {
-        var result = mutableListOf<Int>()
-        listOf(1, 2, 3, 4, 5).forEach(fun(element: Int) {
-            if (element == 3) return  // local return to the caller of the anonymous fun, i.e. the forEach loop
-            result.add(element)
+        var result = ""
+        "hello_world".forEach(fun(element) {
+            // local return to the caller of the anonymous fun, i.e. the forEach loop
+            if (element == 'o') return
+            result += element.toString()
         })
-
-        assert(result.all { it -> it != 3 })
+        assertEquals("hell_wrld", result)
     }
 
     @Test
     fun givenAnonymousFunction_returnToLabel_thenComplete() {
-        var value = 0
+        var result = ""
         run loop@{
-            listOf(1, 2, 3, 4, 5).forEach {
-                value = it
-                if (it == 3) return@loop // non-local return from the lambda passed to run
+            "hello_world".forEach {
+                // non-local return from the lambda passed to run
+                if (it == '_') return@loop
+                result += it.toString()
             }
         }
-        assertEquals(value, 3)
+        assertEquals("hello", result)
     }
 }
\ No newline at end of file

From 9eb81e705999bf44e0ec5fdffe6cc8d1aa9d1d57 Mon Sep 17 00:00:00 2001
From: Hai Nguyen <nn.hai@samsung.com>
Date: Tue, 2 Oct 2018 10:45:31 +0800
Subject: [PATCH 27/28] change example

---
 .../com/baeldung/kotlin/StructuralJumpTest.kt | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/core-kotlin/src/test/kotlin/com/baeldung/kotlin/StructuralJumpTest.kt b/core-kotlin/src/test/kotlin/com/baeldung/kotlin/StructuralJumpTest.kt
index 6866816517..b5183d3568 100644
--- a/core-kotlin/src/test/kotlin/com/baeldung/kotlin/StructuralJumpTest.kt
+++ b/core-kotlin/src/test/kotlin/com/baeldung/kotlin/StructuralJumpTest.kt
@@ -9,12 +9,12 @@ class StructuralJumpTest {
     @Test
     fun givenLoop_whenBreak_thenComplete() {
         var value = ""
-        for (i in 'a'..'e') {
-            value += i.toString()
-            if (i == 'c')
+        for (i in "hello_world") {
+            if (i == '_')
                 break
+            value += i.toString()
         }
-        assertEquals("abc", value)
+        assertEquals("hello", value)
     }
     @Test
     fun givenLoop_whenBreakWithLabel_thenComplete() {
@@ -32,12 +32,12 @@ class StructuralJumpTest {
     @Test
     fun givenLoop_whenContinue_thenComplete() {
         var result = ""
-        for (i in 'a'..'d') {
-            if (i == 'b')
+        for (i in "hello_world") {
+            if (i == '_')
                 continue
             result += i
         }
-        assertEquals("acd", result)
+        assertEquals("helloworld", result)
     }
     @Test
     fun givenLoop_whenContinueWithLabel_thenComplete() {
@@ -73,26 +73,26 @@ class StructuralJumpTest {
     fun givenLambda_whenReturnWithExplicitLabel_thenComplete() {
         var result = ""
         "hello_world".forEach lit@{
-            if (it == 'o') {
+            if (it == '_') {
                 // local return to the caller of the lambda, i.e. the forEach loop
                 return@lit
             }
             result += it.toString()
         }
-        assertEquals("hell_wrld", result)
+        assertEquals("helloworld", result)
     }
 
     @Test
     fun givenLambda_whenReturnWithImplicitLabel_thenComplete() {
         var result = ""
         "hello_world".forEach {
-            if (it == 'o') {
+            if (it == '_') {
                 // local return to the caller of the lambda, i.e. the forEach loop
                 return@forEach
             }
             result += it.toString()
         }
-        assertEquals("hell_wrld", result)
+        assertEquals("helloworld", result)
     }
 
     @Test
@@ -100,10 +100,10 @@ class StructuralJumpTest {
         var result = ""
         "hello_world".forEach(fun(element) {
             // local return to the caller of the anonymous fun, i.e. the forEach loop
-            if (element == 'o') return
+            if (element == '_') return
             result += element.toString()
         })
-        assertEquals("hell_wrld", result)
+        assertEquals("helloworld", result)
     }
 
     @Test

From 0b792c58f21e55904e53600ab577b2cdefb92b3b Mon Sep 17 00:00:00 2001
From: Loredana Crusoveanu <lore.crusoveanu@gmail.com>
Date: Wed, 3 Oct 2018 21:29:42 +0300
Subject: [PATCH 28/28] Update and rename StructuralJumpTest.kt to
 StructuralJumpUnitTest.kt

---
 .../{StructuralJumpTest.kt => StructuralJumpUnitTest.kt}      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename core-kotlin/src/test/kotlin/com/baeldung/kotlin/{StructuralJumpTest.kt => StructuralJumpUnitTest.kt} (98%)

diff --git a/core-kotlin/src/test/kotlin/com/baeldung/kotlin/StructuralJumpTest.kt b/core-kotlin/src/test/kotlin/com/baeldung/kotlin/StructuralJumpUnitTest.kt
similarity index 98%
rename from core-kotlin/src/test/kotlin/com/baeldung/kotlin/StructuralJumpTest.kt
rename to core-kotlin/src/test/kotlin/com/baeldung/kotlin/StructuralJumpUnitTest.kt
index b5183d3568..436dc9e2ba 100644
--- a/core-kotlin/src/test/kotlin/com/baeldung/kotlin/StructuralJumpTest.kt
+++ b/core-kotlin/src/test/kotlin/com/baeldung/kotlin/StructuralJumpUnitTest.kt
@@ -4,7 +4,7 @@ import org.junit.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertFalse
 
-class StructuralJumpTest {
+class StructuralJumpUnitTest {
 
     @Test
     fun givenLoop_whenBreak_thenComplete() {
@@ -118,4 +118,4 @@ class StructuralJumpTest {
         }
         assertEquals("hello", result)
     }
-}
\ No newline at end of file
+}