diff --git a/core-groovy-2/README.md b/core-groovy-2/README.md
index 95a00a1f5b..9f81ac6c16 100644
--- a/core-groovy-2/README.md
+++ b/core-groovy-2/README.md
@@ -13,4 +13,5 @@ This module contains articles about core Groovy concepts
- [Metaprogramming in Groovy](https://www.baeldung.com/groovy-metaprogramming)
- [A Quick Guide to Working with Web Services in Groovy](https://www.baeldung.com/groovy-web-services)
- [Categories in Groovy](https://www.baeldung.com/groovy-categories)
+- [How to Determine the Data Type in Groovy](https://www.baeldung.com/groovy-determine-data-type)
- [[<-- Prev]](/core-groovy)
diff --git a/core-java-modules/core-java-14/README.md b/core-java-modules/core-java-14/README.md
index 13bb468b30..dc80800054 100644
--- a/core-java-modules/core-java-14/README.md
+++ b/core-java-modules/core-java-14/README.md
@@ -8,3 +8,4 @@ This module contains articles about Java 14.
- [Java Text Blocks](https://www.baeldung.com/java-text-blocks)
- [Pattern Matching for instanceof in Java 14](https://www.baeldung.com/java-pattern-matching-instanceof)
- [Helpful NullPointerExceptions in Java 14](https://www.baeldung.com/java-14-nullpointerexception)
+- [Foreign Memory Access API in Java 14](https://www.baeldung.com/java-foreign-memory-access)
diff --git a/core-java-modules/core-java-concurrency-advanced-3/README.md b/core-java-modules/core-java-concurrency-advanced-3/README.md
index b11cde5158..dfd264116c 100644
--- a/core-java-modules/core-java-concurrency-advanced-3/README.md
+++ b/core-java-modules/core-java-concurrency-advanced-3/README.md
@@ -11,4 +11,5 @@ This module contains articles about advanced topics about multithreading with co
- [Guide to Work Stealing in Java](https://www.baeldung.com/java-work-stealing)
- [Asynchronous Programming in Java](https://www.baeldung.com/java-asynchronous-programming)
- [Java Thread Deadlock and Livelock](https://www.baeldung.com/java-deadlock-livelock)
+- [Guide to AtomicStampedReference in Java](https://www.baeldung.com/java-atomicstampedreference)
- [[<-- previous]](/core-java-modules/core-java-concurrency-advanced-2)
diff --git a/core-java-modules/core-java-date-operations-2/src/main/java/com/baeldung/weeknumber/WeekNumberUsingCalendar.java b/core-java-modules/core-java-date-operations-2/src/main/java/com/baeldung/weeknumber/WeekNumberUsingCalendar.java
new file mode 100644
index 0000000000..db32421aa4
--- /dev/null
+++ b/core-java-modules/core-java-date-operations-2/src/main/java/com/baeldung/weeknumber/WeekNumberUsingCalendar.java
@@ -0,0 +1,41 @@
+package com.baeldung.weeknumber;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.Locale;
+
+public class WeekNumberUsingCalendar {
+
+ public int getWeekNumberFrom(String day, String dateFormat, Locale locale) throws ParseException {
+ SimpleDateFormat sdf = new SimpleDateFormat(dateFormat);
+
+ Calendar calendar = Calendar.getInstance(locale);
+ Date date = sdf.parse(day);
+ calendar.setTime(date);
+
+ return calendar.get(Calendar.WEEK_OF_YEAR);
+ }
+
+ public int getWeekNumberFrom(int year, int month, int day, Locale locale) {
+ Calendar calendar = Calendar.getInstance(locale);
+ calendar.set(year, month, day);
+
+ return calendar.get(Calendar.WEEK_OF_YEAR);
+ }
+
+ public int getWeekNumberFrom(int year, int month, int day, int firstDayOfWeek, int minimalDaysInFirstWeek, Locale locale) {
+ Calendar calendar = Calendar.getInstance(locale);
+ calendar.setFirstDayOfWeek(firstDayOfWeek);
+ calendar.setMinimalDaysInFirstWeek(minimalDaysInFirstWeek);
+ calendar.set(year, month, day);
+
+ return calendar.get(Calendar.WEEK_OF_YEAR);
+ }
+
+ public static void main(String[] args) {
+ WeekNumberUsingCalendar calendar = new WeekNumberUsingCalendar();
+ System.out.println(calendar.getWeekNumberFrom(2020, 2, 22, Locale.CANADA));
+ }
+}
diff --git a/core-java-modules/core-java-date-operations-2/src/main/java/com/baeldung/weeknumber/WeekNumberUsingLocalDate.java b/core-java-modules/core-java-date-operations-2/src/main/java/com/baeldung/weeknumber/WeekNumberUsingLocalDate.java
new file mode 100644
index 0000000000..4e1b7be3be
--- /dev/null
+++ b/core-java-modules/core-java-date-operations-2/src/main/java/com/baeldung/weeknumber/WeekNumberUsingLocalDate.java
@@ -0,0 +1,30 @@
+package com.baeldung.weeknumber;
+
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+import java.time.temporal.ChronoField;
+import java.time.temporal.WeekFields;
+import java.util.Locale;
+
+public class WeekNumberUsingLocalDate {
+
+ public Integer getWeekNumberUsingWeekFiedsFrom(String day, String dayFormat, Locale locale) {
+ LocalDate date = LocalDate.parse(day, DateTimeFormatter.ofPattern(dayFormat));
+
+ return date.get(WeekFields.of(locale)
+ .weekOfYear());
+ }
+
+ public Integer getWeekNumberUsinWeekFieldsFrom(int year, int month, int day, Locale locale) {
+ LocalDate date = LocalDate.of(year, month, day);
+
+ return date.get(WeekFields.of(locale)
+ .weekOfYear());
+ }
+
+ public Integer getWeekNumberUsingChronoFieldFrom(int year, int month, int day) {
+ LocalDate date = LocalDate.of(year, month, day);
+
+ return date.get(ChronoField.ALIGNED_WEEK_OF_YEAR);
+ }
+}
\ No newline at end of file
diff --git a/core-java-modules/core-java-date-operations-2/src/test/java/com/baeldung/weeknumber/WeekNumberUsingCalendarUnitTest.java b/core-java-modules/core-java-date-operations-2/src/test/java/com/baeldung/weeknumber/WeekNumberUsingCalendarUnitTest.java
new file mode 100644
index 0000000000..587a459277
--- /dev/null
+++ b/core-java-modules/core-java-date-operations-2/src/test/java/com/baeldung/weeknumber/WeekNumberUsingCalendarUnitTest.java
@@ -0,0 +1,46 @@
+package com.baeldung.weeknumber;
+
+import static org.junit.Assert.assertEquals;
+
+import java.text.ParseException;
+import java.util.Calendar;
+import java.util.Locale;
+
+import org.junit.Test;
+
+public class WeekNumberUsingCalendarUnitTest {
+ @Test
+ public void givenDateInStringAndDateFormatUsingLocaleItaly_thenGettingWeekNumberUsingCalendarIsCorrectlyReturned() throws ParseException {
+ WeekNumberUsingCalendar calendar = new WeekNumberUsingCalendar();
+
+ assertEquals(12, calendar.getWeekNumberFrom("20200322", "yyyyMMdd", Locale.ITALY));
+ }
+
+ @Test
+ public void givenDateInStringAndDateFormatUsingLocaleCanada_thenGettingWeekNumberUsingCalendarIsCorrectlyReturned() throws ParseException {
+ WeekNumberUsingCalendar calendar = new WeekNumberUsingCalendar();
+
+ assertEquals(13, calendar.getWeekNumberFrom("20200322", "yyyyMMdd", Locale.CANADA));
+ }
+
+ @Test
+ public void givenDateInYearMonthDayNumbersLocaleItaly_thenGettingWeekNumberUsingCalendarIsCorrectlyReturned() {
+ WeekNumberUsingCalendar calendar = new WeekNumberUsingCalendar();
+
+ assertEquals(12, calendar.getWeekNumberFrom(2020, 2, 22, Locale.ITALY));
+ }
+
+ @Test
+ public void givenDateInYearMonthDayNumbersLocaleItalyChangingWeekCalculationSettings_thenGettingWeekNumberUsingCalendarIsCorrectlyReturned() {
+ WeekNumberUsingCalendar calendar = new WeekNumberUsingCalendar();
+
+ assertEquals(13, calendar.getWeekNumberFrom(2020, 2, 22, Calendar.SUNDAY, 4, Locale.ITALY));
+ }
+
+ @Test
+ public void givenDateInYearMonthDayNumbersLocaleCanada_thenGettingWeekNumberUsingCalendarIsCorrectlyReturned() {
+ WeekNumberUsingCalendar calendar = new WeekNumberUsingCalendar();
+
+ assertEquals(13, calendar.getWeekNumberFrom(2020, 2, 22, Locale.CANADA));
+ }
+}
diff --git a/core-java-modules/core-java-date-operations-2/src/test/java/com/baeldung/weeknumber/WeekNumberUsingLocalDateUnitTest.java b/core-java-modules/core-java-date-operations-2/src/test/java/com/baeldung/weeknumber/WeekNumberUsingLocalDateUnitTest.java
new file mode 100644
index 0000000000..9b98222ece
--- /dev/null
+++ b/core-java-modules/core-java-date-operations-2/src/test/java/com/baeldung/weeknumber/WeekNumberUsingLocalDateUnitTest.java
@@ -0,0 +1,49 @@
+package com.baeldung.weeknumber;
+
+import static org.junit.Assert.assertEquals;
+
+import java.util.Locale;
+
+import org.junit.Test;
+
+public class WeekNumberUsingLocalDateUnitTest {
+ @Test
+ public void givenDateInStringAndDateFormatUsingWeekFieldsWithLocaleItaly_thenGettingWeekNumberUsingLocalDateIsCorrectlyReturned() {
+ WeekNumberUsingLocalDate localDate = new WeekNumberUsingLocalDate();
+
+ assertEquals(12, localDate.getWeekNumberUsingWeekFiedsFrom("20200322", "yyyyMMdd", Locale.ITALY)
+ .longValue());
+ }
+
+ @Test
+ public void givenDateInStringAndDateFormatUsingWeekFieldsWithLocaleCanada_thenGettingWeekNumberUsingLocalDateIsCorrectlyReturned() {
+ WeekNumberUsingLocalDate localDate = new WeekNumberUsingLocalDate();
+
+ assertEquals(13, localDate.getWeekNumberUsingWeekFiedsFrom("20200322", "yyyyMMdd", Locale.CANADA)
+ .longValue());
+ }
+
+ @Test
+ public void givenDateInStringAndDateFormatUsingChronoFieds_thenGettingWeekNumberUsingLocalDateIsCorrectlyReturned() {
+ WeekNumberUsingLocalDate localDate = new WeekNumberUsingLocalDate();
+
+ assertEquals(12, localDate.getWeekNumberUsingChronoFieldFrom(2020, 3, 22)
+ .longValue());
+ }
+
+ @Test
+ public void givenDateInYearMonthDayNumbersUsingWeekFieldsWithLocaleItaly_thenGettingWeekNumberUsingLocalDateIsCorrectlyReturned() {
+ WeekNumberUsingLocalDate localDate = new WeekNumberUsingLocalDate();
+
+ assertEquals(12, localDate.getWeekNumberUsinWeekFieldsFrom(2020, 3, 22, Locale.ITALY)
+ .longValue());
+ }
+
+ @Test
+ public void givenDateInYearMonthDayNumbersUsingWeekFieldsWithLocaleCanada_thenGettingWeekNumberUsingLocalDateIsCorrectlyReturned() {
+ WeekNumberUsingLocalDate localDate = new WeekNumberUsingLocalDate();
+
+ assertEquals(13, localDate.getWeekNumberUsinWeekFieldsFrom(2020, 3, 22, Locale.CANADA)
+ .longValue());
+ }
+}
diff --git a/core-java-modules/core-java-regex/README.md b/core-java-modules/core-java-regex/README.md
index 6fdea9f2ca..8830af2c2d 100644
--- a/core-java-modules/core-java-regex/README.md
+++ b/core-java-modules/core-java-regex/README.md
@@ -10,3 +10,4 @@
- [Difference Between Java Matcher find() and matches()](https://www.baeldung.com/java-matcher-find-vs-matches)
- [How to Use Regular Expressions to Replace Tokens in Strings](https://www.baeldung.com/java-regex-token-replacement)
- [Regular Expressions \s and \s+ in Java](https://www.baeldung.com/java-regex-s-splus)
+- [Validate Phone Numbers With Java Regex](https://www.baeldung.com/java-regex-validate-phone-numbers)
diff --git a/core-java-modules/core-java-string-operations-2/src/test/java/com/baeldung/pdf/base64/EncodeDecodeUnitTest.java b/core-java-modules/core-java-string-operations-2/src/test/java/com/baeldung/pdf/base64/EncodeDecodeUnitTest.java
index 0fb61ea121..0df6f58136 100644
--- a/core-java-modules/core-java-string-operations-2/src/test/java/com/baeldung/pdf/base64/EncodeDecodeUnitTest.java
+++ b/core-java-modules/core-java-string-operations-2/src/test/java/com/baeldung/pdf/base64/EncodeDecodeUnitTest.java
@@ -4,8 +4,10 @@ import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotEquals;
+import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
+import java.io.OutputStream;
import java.nio.file.Files;
import java.nio.file.Paths;
@@ -39,6 +41,27 @@ public class EncodeDecodeUnitTest {
}
+ @Test
+ public void givenJavaBase64_whenEncodedStream_thenDecodedStreamOK() throws IOException {
+
+ try (OutputStream os = java.util.Base64.getEncoder().wrap(new FileOutputStream(OUT_FILE));
+ FileInputStream fis = new FileInputStream(IN_FILE)) {
+ byte[] bytes = new byte[1024];
+ int read;
+ while ((read = fis.read(bytes)) > -1) {
+ os.write(bytes, 0, read);
+ }
+ }
+
+ byte[] encoded = java.util.Base64.getEncoder().encode(inFileBytes);
+ byte[] encodedOnDisk = Files.readAllBytes(Paths.get(OUT_FILE));
+ assertArrayEquals(encoded, encodedOnDisk);
+
+ byte[] decoded = java.util.Base64.getDecoder().decode(encoded);
+ byte[] decodedOnDisk = java.util.Base64.getDecoder().decode(encodedOnDisk);
+ assertArrayEquals(decoded, decodedOnDisk);
+ }
+
@Test
public void givenApacheCommons_givenJavaBase64_whenEncoded_thenDecodedOK() throws IOException {
diff --git a/core-kotlin-modules/core-kotlin-collections/README.md b/core-kotlin-modules/core-kotlin-collections/README.md
index f0da2b4cfd..66f15e7419 100644
--- a/core-kotlin-modules/core-kotlin-collections/README.md
+++ b/core-kotlin-modules/core-kotlin-collections/README.md
@@ -9,3 +9,4 @@ This module contains articles about core Kotlin collections.
- [Converting a List to Map in Kotlin](https://www.baeldung.com/kotlin-list-to-map)
- [Filtering Kotlin Collections](https://www.baeldung.com/kotlin-filter-collection)
- [Collection Transformations in Kotlin](https://www.baeldung.com/kotlin-collection-transformations)
+- [Difference between fold and reduce in Kotlin](https://www.baeldung.com/kotlin/fold-vs-reduce)
diff --git a/gradle/gradle-employee-app/README.md b/gradle/gradle-employee-app/README.md
new file mode 100644
index 0000000000..1bf7c5e8dd
--- /dev/null
+++ b/gradle/gradle-employee-app/README.md
@@ -0,0 +1,3 @@
+### Relevant Articles:
+
+- [Building a Java Application With Gradle](https://www.baeldung.com/gradle-building-a-java-app)
diff --git a/java-collections-conversions-2/README.md b/java-collections-conversions-2/README.md
index 761e56253e..11dddadc5c 100644
--- a/java-collections-conversions-2/README.md
+++ b/java-collections-conversions-2/README.md
@@ -4,4 +4,5 @@ This module contains articles about conversions among Collection types and array
### Relevant Articles:
- [Array to String Conversions](https://www.baeldung.com/java-array-to-string)
-- More articles: [[<-- prev]](../java-collections-conversions)
\ No newline at end of file
+- [Mapping Lists with ModelMapper](https://www.baeldung.com/java-modelmapper-lists)
+- More articles: [[<-- prev]](../java-collections-conversions)
diff --git a/jee-7/README.md b/jee-7/README.md
index adaee67d74..88359a81ec 100644
--- a/jee-7/README.md
+++ b/jee-7/README.md
@@ -11,3 +11,4 @@ This module contains articles about JEE 7.
- [Introduction to Testing with Arquillian](https://www.baeldung.com/arquillian)
- [Java EE 7 Batch Processing](https://www.baeldung.com/java-ee-7-batch-processing)
- [The Difference Between CDI and EJB Singleton](https://www.baeldung.com/jee-cdi-vs-ejb-singleton)
+- [Invoking a SOAP Web Service in Java](https://www.baeldung.com/java-soap-web-service)
diff --git a/jsoup/README.md b/jsoup/README.md
index 271d04194d..690afe3099 100644
--- a/jsoup/README.md
+++ b/jsoup/README.md
@@ -4,6 +4,7 @@ This module contains articles about jsoup.
### Relevant Articles:
- [Parsing HTML in Java with Jsoup](https://www.baeldung.com/java-with-jsoup)
+- [How to add proxy support to Jsoup?](https://www.baeldung.com/java-jsoup-proxy)
### Build the Project
diff --git a/jsoup/src/test/java/com/baeldung/jsonproxy/JsoupProxyIntegrationTest.java b/jsoup/src/test/java/com/baeldung/jsonproxy/JsoupProxyLiveTest.java
similarity index 94%
rename from jsoup/src/test/java/com/baeldung/jsonproxy/JsoupProxyIntegrationTest.java
rename to jsoup/src/test/java/com/baeldung/jsonproxy/JsoupProxyLiveTest.java
index 8e854ead6a..931464c4db 100644
--- a/jsoup/src/test/java/com/baeldung/jsonproxy/JsoupProxyIntegrationTest.java
+++ b/jsoup/src/test/java/com/baeldung/jsonproxy/JsoupProxyLiveTest.java
@@ -7,7 +7,7 @@ import java.net.Proxy;
import org.jsoup.Jsoup;
import org.junit.Test;
-public class JsoupProxyIntegrationTest {
+public class JsoupProxyLiveTest {
@Test
public void whenUsingHostAndPort_thenConnect() throws IOException {
diff --git a/kaniko/README.md b/kaniko/README.md
new file mode 100644
index 0000000000..a69a3cb683
--- /dev/null
+++ b/kaniko/README.md
@@ -0,0 +1,3 @@
+### Relevant Articles:
+
+- [An Introduction to Kaniko](https://www.baeldung.com/ops/kaniko)
diff --git a/libraries-data-2/README.md b/libraries-data-2/README.md
index f992186bd9..ce7a1680d1 100644
--- a/libraries-data-2/README.md
+++ b/libraries-data-2/README.md
@@ -11,7 +11,8 @@ This module contains articles about libraries for data processing in Java.
- [Guide to JMapper](https://www.baeldung.com/jmapper)
- [An Introduction to SuanShu](https://www.baeldung.com/suanshu)
- [Intro to Derive4J](https://www.baeldung.com/derive4j)
-More articles: [[<-- prev]](/../libraries-data)
+- [Java-R Integration](https://www.baeldung.com/java-r-integration)
+- More articles: [[<-- prev]](/../libraries-data)
##### Building the project
You can build the project from the command line using: *mvn clean install*, or in an IDE. If you have issues with the derive4j imports in your IDE, you have to add the folder: *target/generated-sources/annotations* to the project build path in your IDE.
diff --git a/libraries-testing/src/test/java/com/baeldung/dbunit/DataSourceDBUnitTest.java b/libraries-testing/src/test/java/com/baeldung/dbunit/DataSourceDBUnitTest.java
index 93c7e9a456..ab3e9f3dbd 100644
--- a/libraries-testing/src/test/java/com/baeldung/dbunit/DataSourceDBUnitTest.java
+++ b/libraries-testing/src/test/java/com/baeldung/dbunit/DataSourceDBUnitTest.java
@@ -24,6 +24,8 @@ import java.sql.ResultSet;
import java.sql.SQLException;
import static com.baeldung.dbunit.ConnectionSettings.JDBC_URL;
+import static com.baeldung.dbunit.ConnectionSettings.PASSWORD;
+import static com.baeldung.dbunit.ConnectionSettings.USER;
import static java.util.stream.Collectors.joining;
import static org.assertj.core.api.Assertions.assertThat;
import static org.dbunit.Assertion.assertEqualsIgnoreCols;
@@ -33,12 +35,14 @@ public class DataSourceDBUnitTest extends DataSourceBasedDBTestCase {
private static final Logger logger = LoggerFactory.getLogger(DataSourceDBUnitTest.class);
+ private Connection connection;
+
@Override
protected DataSource getDataSource() {
JdbcDataSource dataSource = new JdbcDataSource();
dataSource.setURL(JDBC_URL);
- dataSource.setUser("sa");
- dataSource.setPassword("");
+ dataSource.setUser(USER);
+ dataSource.setPassword(PASSWORD);
return dataSource;
}
@@ -62,6 +66,7 @@ public class DataSourceDBUnitTest extends DataSourceBasedDBTestCase {
@Before
public void setUp() throws Exception {
super.setUp();
+ connection = getConnection().getConnection();
}
@After
@@ -71,9 +76,7 @@ public class DataSourceDBUnitTest extends DataSourceBasedDBTestCase {
@Test
public void givenDataSet_whenSelect_thenFirstTitleIsGreyTShirt() throws SQLException {
- final Connection connection = getDataSource().getConnection();
-
- final ResultSet rs = connection.createStatement().executeQuery("select * from ITEMS where id = 1");
+ ResultSet rs = connection.createStatement().executeQuery("select * from ITEMS where id = 1");
assertThat(rs.next()).isTrue();
assertThat(rs.getString("title")).isEqualTo("Grey T-Shirt");
@@ -81,58 +84,59 @@ public class DataSourceDBUnitTest extends DataSourceBasedDBTestCase {
@Test
public void givenDataSetEmptySchema_whenDataSetCreated_thenTablesAreEqual() throws Exception {
- final IDataSet expectedDataSet = getDataSet();
- final ITable expectedTable = expectedDataSet.getTable("CLIENTS");
- final IDataSet databaseDataSet = getConnection().createDataSet();
- final ITable actualTable = databaseDataSet.getTable("CLIENTS");
+ IDataSet expectedDataSet = getDataSet();
+ ITable expectedTable = expectedDataSet.getTable("CLIENTS");
+ IDataSet databaseDataSet = getConnection().createDataSet();
+ ITable actualTable = databaseDataSet.getTable("CLIENTS");
Assertion.assertEquals(expectedTable, actualTable);
}
@Test
public void givenDataSet_whenInsert_thenTableHasNewClient() throws Exception {
- try (final InputStream is = getClass().getClassLoader().getResourceAsStream("dbunit/expected-user.xml")) {
- final IDataSet expectedDataSet = new FlatXmlDataSetBuilder().build(is);
- final ITable expectedTable = expectedDataSet.getTable("CLIENTS");
- final Connection conn = getDataSource().getConnection();
+ try (InputStream is = getClass().getClassLoader().getResourceAsStream("dbunit/expected-user.xml")) {
+ // given
+ IDataSet expectedDataSet = new FlatXmlDataSetBuilder().build(is);
+ ITable expectedTable = expectedDataSet.getTable("CLIENTS");
+ Connection conn = getDataSource().getConnection();
+ // when
conn.createStatement()
- .executeUpdate(
- "INSERT INTO CLIENTS (first_name, last_name) VALUES ('John', 'Jansen')");
- final ITable actualData = getConnection()
- .createQueryTable(
- "result_name",
- "SELECT * FROM CLIENTS WHERE last_name='Jansen'");
+ .executeUpdate("INSERT INTO CLIENTS (first_name, last_name) VALUES ('John', 'Jansen')");
+ ITable actualData = getConnection()
+ .createQueryTable("result_name", "SELECT * FROM CLIENTS WHERE last_name='Jansen'");
+ // then
assertEqualsIgnoreCols(expectedTable, actualData, new String[] { "id" });
}
}
@Test
public void givenDataSet_whenDelete_thenItemIsDeleted() throws Exception {
- final Connection connection = getConnection().getConnection();
-
- try (final InputStream is = DataSourceDBUnitTest.class.getClassLoader().getResourceAsStream("dbunit/items_exp_delete.xml")) {
+ try (InputStream is = DataSourceDBUnitTest.class.getClassLoader()
+ .getResourceAsStream("dbunit/items_exp_delete.xml")) {
+ // given
ITable expectedTable = (new FlatXmlDataSetBuilder().build(is)).getTable("ITEMS");
+ // when
connection.createStatement().executeUpdate("delete from ITEMS where id = 2");
- final IDataSet databaseDataSet = getConnection().createDataSet();
+ // then
+ IDataSet databaseDataSet = getConnection().createDataSet();
ITable actualTable = databaseDataSet.getTable("ITEMS");
-
Assertion.assertEquals(expectedTable, actualTable);
}
}
@Test
public void givenDataSet_whenUpdate_thenItemHasNewName() throws Exception {
- final Connection connection = getConnection().getConnection();
-
- try (final InputStream is = DataSourceDBUnitTest.class.getClassLoader().getResourceAsStream("dbunit/items_exp_rename.xml")) {
+ try (InputStream is = DataSourceDBUnitTest.class.getClassLoader()
+ .getResourceAsStream("dbunit/items_exp_rename.xml")) {
+ // given
ITable expectedTable = (new FlatXmlDataSetBuilder().build(is)).getTable("ITEMS");
connection.createStatement().executeUpdate("update ITEMS set title='new name' where id = 1");
- final IDataSet databaseDataSet = getConnection().createDataSet();
+ IDataSet databaseDataSet = getConnection().createDataSet();
ITable actualTable = databaseDataSet.getTable("ITEMS");
Assertion.assertEquals(expectedTable, actualTable);
@@ -140,22 +144,24 @@ public class DataSourceDBUnitTest extends DataSourceBasedDBTestCase {
}
@Test
- public void givenDataSet_whenInsertUnexpectedData_thenFailOnAllUnexpectedValues() throws Exception {
- try (final InputStream is = getClass().getClassLoader().getResourceAsStream("dbunit/expected-multiple-failures.xml")) {
- final IDataSet expectedDataSet = new FlatXmlDataSetBuilder().build(is);
- final ITable expectedTable = expectedDataSet.getTable("ITEMS");
- final Connection conn = getDataSource().getConnection();
- final DiffCollectingFailureHandler collectingHandler = new DiffCollectingFailureHandler();
+ public void givenDataSet_whenInsertUnexpectedData_thenFail() throws Exception {
+ try (InputStream is = getClass().getClassLoader()
+ .getResourceAsStream("dbunit/expected-multiple-failures.xml")) {
- conn.createStatement().executeUpdate(
- "INSERT INTO ITEMS (title, price) VALUES ('Battery', '1000000')");
- final ITable actualData = getConnection().createDataSet().getTable("ITEMS");
+ // given
+ IDataSet expectedDataSet = new FlatXmlDataSetBuilder().build(is);
+ ITable expectedTable = expectedDataSet.getTable("ITEMS");
+ Connection conn = getDataSource().getConnection();
+ DiffCollectingFailureHandler collectingHandler = new DiffCollectingFailureHandler();
+ // when
+ conn.createStatement().executeUpdate("INSERT INTO ITEMS (title, price) VALUES ('Battery', '1000000')");
+ ITable actualData = getConnection().createDataSet().getTable("ITEMS");
+
+ // then
Assertion.assertEquals(expectedTable, actualData, collectingHandler);
if (!collectingHandler.getDiffList().isEmpty()) {
- String message = (String) collectingHandler
- .getDiffList()
- .stream()
+ String message = (String) collectingHandler.getDiffList().stream()
.map(d -> formatDifference((Difference) d)).collect(joining("\n"));
logger.error(() -> message);
}
@@ -163,6 +169,8 @@ public class DataSourceDBUnitTest extends DataSourceBasedDBTestCase {
}
private static String formatDifference(Difference diff) {
- return "expected value in " + diff.getExpectedTable().getTableMetaData().getTableName() + "." + diff.getColumnName() + " row " + diff.getRowIndex() + ":" + diff.getExpectedValue() + ", but was: " + diff.getActualValue();
+ return "expected value in " + diff.getExpectedTable().getTableMetaData().getTableName() + "." + diff
+ .getColumnName() + " row " + diff.getRowIndex() + ":" + diff.getExpectedValue() + ", but was: " + diff
+ .getActualValue();
}
}
diff --git a/libraries-testing/src/test/java/com/baeldung/dbunit/OldSchoolDbUnitTest.java b/libraries-testing/src/test/java/com/baeldung/dbunit/OldSchoolDbUnitTest.java
index 6243af9676..e2db31283f 100644
--- a/libraries-testing/src/test/java/com/baeldung/dbunit/OldSchoolDbUnitTest.java
+++ b/libraries-testing/src/test/java/com/baeldung/dbunit/OldSchoolDbUnitTest.java
@@ -31,13 +31,15 @@ public class OldSchoolDbUnitTest {
private static IDatabaseTester tester = null;
+ private Connection connection;
+
@BeforeClass
public static void setUp() throws Exception {
tester = initDatabaseTester();
}
private static IDatabaseTester initDatabaseTester() throws Exception {
- final JdbcDatabaseTester tester = new JdbcDatabaseTester(JDBC_DRIVER, JDBC_URL, USER, PASSWORD);
+ JdbcDatabaseTester tester = new JdbcDatabaseTester(JDBC_DRIVER, JDBC_URL, USER, PASSWORD);
tester.setDataSet(initDataSet());
tester.setSetUpOperation(DatabaseOperation.REFRESH);
tester.setTearDownOperation(DatabaseOperation.DELETE_ALL);
@@ -45,7 +47,7 @@ public class OldSchoolDbUnitTest {
}
private static IDataSet initDataSet() throws Exception {
- try (final InputStream is = OldSchoolDbUnitTest.class.getClassLoader().getResourceAsStream("dbunit/data.xml")) {
+ try (InputStream is = OldSchoolDbUnitTest.class.getClassLoader().getResourceAsStream("dbunit/data.xml")) {
return new FlatXmlDataSetBuilder().build(is);
}
}
@@ -53,6 +55,7 @@ public class OldSchoolDbUnitTest {
@Before
public void setup() throws Exception {
tester.onSetup();
+ connection = tester.getConnection().getConnection();
}
@After
@@ -62,94 +65,100 @@ public class OldSchoolDbUnitTest {
@Test
public void givenDataSet_whenSelect_thenFirstTitleIsGreyTShirt() throws Exception {
- final Connection connection = tester.getConnection().getConnection();
-
- final ResultSet rs = connection.createStatement().executeQuery("select * from ITEMS where id = 1");
+ ResultSet rs = connection.createStatement().executeQuery("select * from ITEMS where id = 1");
assertThat(rs.next()).isTrue();
assertThat(rs.getString("title")).isEqualTo("Grey T-Shirt");
}
@Test
- public void givenDataSet_whenInsert_thenGetResultsAreStillEqualIfIgnoringColumnsWithDifferentProduced() throws Exception {
- final Connection connection = tester.getConnection().getConnection();
- final String[] excludedColumns = { "id", "produced" };
- try (final InputStream is = getClass().getClassLoader().getResourceAsStream("dbunit/expected-ignoring-registered_at.xml")) {
- final IDataSet expectedDataSet = new FlatXmlDataSetBuilder().build(is);
- final ITable expectedTable = DefaultColumnFilter.excludedColumnsTable(
- expectedDataSet.getTable("ITEMS"), excludedColumns);
+ public void givenDataSet_whenInsert_thenGetResultsAreStillEqualIfIgnoringColumnsWithDifferentProduced()
+ throws Exception {
+ String[] excludedColumns = { "id", "produced" };
+ try (InputStream is = getClass().getClassLoader()
+ .getResourceAsStream("dbunit/expected-ignoring-registered_at.xml")) {
+ // given
+ IDataSet expectedDataSet = new FlatXmlDataSetBuilder().build(is);
+ ITable expectedTable = DefaultColumnFilter
+ .excludedColumnsTable(expectedDataSet.getTable("ITEMS"), excludedColumns);
- connection.createStatement().executeUpdate(
- "INSERT INTO ITEMS (title, price, produced) VALUES('Necklace', 199.99, now())");
-
- final IDataSet databaseDataSet = tester.getConnection().createDataSet();
- final ITable actualTable = DefaultColumnFilter.excludedColumnsTable(
- databaseDataSet.getTable("ITEMS"), excludedColumns);
+ // when
+ connection.createStatement()
+ .executeUpdate("INSERT INTO ITEMS (title, price, produced) VALUES('Necklace', 199.99, now())");
+ // then
+ IDataSet databaseDataSet = tester.getConnection().createDataSet();
+ ITable actualTable = DefaultColumnFilter
+ .excludedColumnsTable(databaseDataSet.getTable("ITEMS"), excludedColumns);
Assertion.assertEquals(expectedTable, actualTable);
}
}
@Test
public void givenDataSet_whenDelete_thenItemIsRemoved() throws Exception {
- final Connection connection = tester.getConnection().getConnection();
-
- try (final InputStream is = OldSchoolDbUnitTest.class.getClassLoader().getResourceAsStream("dbunit/items_exp_delete.xml")) {
+ try (InputStream is = OldSchoolDbUnitTest.class.getClassLoader()
+ .getResourceAsStream("dbunit/items_exp_delete.xml")) {
+ // given
ITable expectedTable = new FlatXmlDataSetBuilder().build(is).getTable("ITEMS");
+ // when
connection.createStatement().executeUpdate("delete from ITEMS where id = 2");
- final IDataSet databaseDataSet = tester.getConnection().createDataSet();
+ // then
+ IDataSet databaseDataSet = tester.getConnection().createDataSet();
ITable actualTable = databaseDataSet.getTable("ITEMS");
-
assertEquals(expectedTable, actualTable);
}
}
@Test
- public void givenDataSet_whenDelete_thenItemIsRemovedAndResultsEqualIfProducedIsIgnored() throws Exception {
- final Connection connection = tester.getConnection().getConnection();
-
- try (final InputStream is = OldSchoolDbUnitTest.class.getClassLoader().getResourceAsStream("dbunit/items_exp_delete_no_produced.xml")) {
- final ITable expectedTable = new FlatXmlDataSetBuilder().build(is).getTable("ITEMS");
+ public void givenDataSet_whenProductIgnoredAndDelete_thenItemIsRemoved() throws Exception {
+ try (InputStream is = OldSchoolDbUnitTest.class.getClassLoader()
+ .getResourceAsStream("dbunit/items_exp_delete_no_produced.xml")) {
+ // given
+ ITable expectedTable = new FlatXmlDataSetBuilder().build(is).getTable("ITEMS");
+ // when
connection.createStatement().executeUpdate("delete from ITEMS where id = 2");
- final IDataSet databaseDataSet = tester.getConnection().createDataSet();
+ // then
+ IDataSet databaseDataSet = tester.getConnection().createDataSet();
ITable actualTable = databaseDataSet.getTable("ITEMS");
actualTable = DefaultColumnFilter.excludedColumnsTable(actualTable, new String[] { "produced" });
-
assertEquals(expectedTable, actualTable);
}
}
@Test
public void givenDataSet_whenUpdate_thenItemHasNewName() throws Exception {
- final Connection connection = tester.getConnection().getConnection();
-
- try (final InputStream is = OldSchoolDbUnitTest.class.getClassLoader().getResourceAsStream("dbunit/items_exp_rename.xml")) {
- final ITable expectedTable = new FlatXmlDataSetBuilder().build(is).getTable("ITEMS");
+ try (InputStream is = OldSchoolDbUnitTest.class.getClassLoader()
+ .getResourceAsStream("dbunit/items_exp_rename.xml")) {
+ // given
+ ITable expectedTable = new FlatXmlDataSetBuilder().build(is).getTable("ITEMS");
+ // when
connection.createStatement().executeUpdate("update ITEMS set title='new name' where id = 1");
- final IDataSet databaseDataSet = tester.getConnection().createDataSet();
+ // then
+ IDataSet databaseDataSet = tester.getConnection().createDataSet();
ITable actualTable = databaseDataSet.getTable("ITEMS");
-
assertEquals(expectedTable, actualTable);
}
}
@Test
public void givenDataSet_whenUpdateWithNoProduced_thenItemHasNewName() throws Exception {
- final Connection connection = tester.getConnection().getConnection();
-
- try (final InputStream is = OldSchoolDbUnitTest.class.getClassLoader().getResourceAsStream("dbunit/items_exp_rename_no_produced.xml")) {
+ try (InputStream is = OldSchoolDbUnitTest.class.getClassLoader()
+ .getResourceAsStream("dbunit/items_exp_rename_no_produced.xml")) {
+ // given
ITable expectedTable = new FlatXmlDataSetBuilder().build(is).getTable("ITEMS");
expectedTable = DefaultColumnFilter.excludedColumnsTable(expectedTable, new String[] { "produced" });
+ // when
connection.createStatement().executeUpdate("update ITEMS set title='new name' where id = 1");
- final IDataSet databaseDataSet = tester.getConnection().createDataSet();
+ // then
+ IDataSet databaseDataSet = tester.getConnection().createDataSet();
ITable actualTable = databaseDataSet.getTable("ITEMS");
actualTable = DefaultColumnFilter.excludedColumnsTable(actualTable, new String[] { "produced" });
assertEquals(expectedTable, actualTable);
diff --git a/maven-all/README.md b/maven-all/README.md
index b20d944b14..b448be2cd0 100644
--- a/maven-all/README.md
+++ b/maven-all/README.md
@@ -5,3 +5,4 @@ This module contains articles about Apache Maven. Please refer to its submodules
### Relevant Articles
- [Apache Maven Tutorial](https://www.baeldung.com/maven)
+- [Find Unused Maven Dependencies](https://www.baeldung.com/maven-unused-dependencies)
diff --git a/patterns/solid/README.md b/patterns/solid/README.md
index ddd2f78b7e..cae346e3c9 100644
--- a/patterns/solid/README.md
+++ b/patterns/solid/README.md
@@ -1,5 +1,5 @@
### Relevant Articles:
- [A Solid Guide to Solid Principles](https://www.baeldung.com/solid-principles)
-
+- [Single Responsibility Principle in Java](https://www.baeldung.com/java-single-responsibility-principle)
diff --git a/persistence-modules/java-jpa-2/README.md b/persistence-modules/java-jpa-2/README.md
index 9d46c0d814..4b822c4782 100644
--- a/persistence-modules/java-jpa-2/README.md
+++ b/persistence-modules/java-jpa-2/README.md
@@ -12,4 +12,5 @@ This module contains articles about the Java Persistence API (JPA) in Java.
- [Combining JPA And/Or Criteria Predicates](https://www.baeldung.com/jpa-and-or-criteria-predicates)
- [JPA Annotation for the PostgreSQL TEXT Type](https://www.baeldung.com/jpa-annotation-postgresql-text-type)
- [Mapping a Single Entity to Multiple Tables in JPA](https://www.baeldung.com/jpa-mapping-single-entity-to-multiple-tables)
+- [Constructing a JPA Query Between Unrelated Entities](https://www.baeldung.com/jpa-query-unrelated-entities)
- More articles: [[<-- prev]](/java-jpa)
diff --git a/persistence-modules/redis/README.md b/persistence-modules/redis/README.md
index 668b8d33f8..71d009241a 100644
--- a/persistence-modules/redis/README.md
+++ b/persistence-modules/redis/README.md
@@ -3,3 +3,4 @@
- [A Guide to Redis with Redisson](http://www.baeldung.com/redis-redisson)
- [Introduction to Lettuce – the Java Redis Client](https://www.baeldung.com/java-redis-lettuce)
- [List All Available Redis Keys](https://www.baeldung.com/redis-list-available-keys)
+- [Spring Data Redis’s Property-Based Configuration](https://www.baeldung.com/spring-data-redis-properties)
diff --git a/persistence-modules/spring-data-jpa-5/README.md b/persistence-modules/spring-data-jpa-5/README.md
index e8f83654df..fa29c82bac 100644
--- a/persistence-modules/spring-data-jpa-5/README.md
+++ b/persistence-modules/spring-data-jpa-5/README.md
@@ -1,6 +1,7 @@
### Relevant Articles:
-- [Spring JPA @Embedded and @EmbeddedId](TBD)
+- [Spring JPA @Embedded and @EmbeddedId](https://www.baeldung.com/spring-jpa-embedded-method-parameters)
+- [Generate Database Schema with Spring Data JPA](https://www.baeldung.com/spring-data-jpa-generate-db-schema)
### Eclipse Config
After importing the project into Eclipse, you may see the following error:
diff --git a/persistence-modules/spring-persistence-simple-2/README.md b/persistence-modules/spring-persistence-simple-2/README.md
index a6408df8f2..70eab26d45 100644
--- a/persistence-modules/spring-persistence-simple-2/README.md
+++ b/persistence-modules/spring-persistence-simple-2/README.md
@@ -1,3 +1,4 @@
### Relevant Articles:
- [Spring JdbcTemplate Unit Testing](https://www.baeldung.com/spring-jdbctemplate-testing)
+- [Using a List of Values in a JdbcTemplate IN Clause](https://www.baeldung.com/spring-jdbctemplate-in-list)
diff --git a/spring-5-security/README.md b/spring-5-security/README.md
index 07f2d48b7f..764d726ff8 100644
--- a/spring-5-security/README.md
+++ b/spring-5-security/README.md
@@ -9,3 +9,5 @@ This module contains articles about Spring Security 5
- [New Password Storage In Spring Security 5](https://www.baeldung.com/spring-security-5-password-storage)
- [Default Password Encoder in Spring Security 5](https://www.baeldung.com/spring-security-5-default-password-encoder)
- [Guide to the AuthenticationManagerResolver in Spring Security](https://www.baeldung.com/spring-security-authenticationmanagerresolver)
+- [Disable Security for a Profile in Spring Boot](https://www.baeldung.com/spring-security-disable-profile)
+- [Manual Logout With Spring Security](https://www.baeldung.com/spring-security-manual-logout)
diff --git a/spring-boot-groovy/README.md b/spring-boot-groovy/README.md
new file mode 100644
index 0000000000..d2472a11d0
--- /dev/null
+++ b/spring-boot-groovy/README.md
@@ -0,0 +1,3 @@
+### Relevant Articles:
+
+- [Building a Simple Web Application with Spring Boot and Groovy](https://www.baeldung.com/spring-boot-groovy-web-app)
diff --git a/spring-boot-modules/spring-boot-logging-log4j2/README.md b/spring-boot-modules/spring-boot-logging-log4j2/README.md
index 76029caef8..aa6bb9b6e1 100644
--- a/spring-boot-modules/spring-boot-logging-log4j2/README.md
+++ b/spring-boot-modules/spring-boot-logging-log4j2/README.md
@@ -5,4 +5,4 @@ This module contains articles about logging in Spring Boot projects with Log4j 2
### Relevant Articles:
- [Logging in Spring Boot](https://www.baeldung.com/spring-boot-logging)
- [Logging to Graylog with Spring Boot](https://www.baeldung.com/graylog-with-spring-boot)
-
+- [Log Groups in Spring Boot 2.1](https://www.baeldung.com/spring-boot-log-groups)
diff --git a/spring-caching/README.md b/spring-caching/README.md
index 3efbfe3eaa..52ddc4f3eb 100644
--- a/spring-caching/README.md
+++ b/spring-caching/README.md
@@ -3,3 +3,4 @@
- [A Guide To Caching in Spring](http://www.baeldung.com/spring-cache-tutorial)
- [Spring Cache – Creating a Custom KeyGenerator](http://www.baeldung.com/spring-cache-custom-keygenerator)
- [Cache Eviction in Spring Boot](https://www.baeldung.com/spring-boot-evict-cache)
+- [Using Multiple Cache Managers in Spring](https://www.baeldung.com/spring-multiple-cache-managers)
diff --git a/spring-cloud/spring-cloud-gateway/README.md b/spring-cloud/spring-cloud-gateway/README.md
index 9c8e0d443a..90e81fe9a2 100644
--- a/spring-cloud/spring-cloud-gateway/README.md
+++ b/spring-cloud/spring-cloud-gateway/README.md
@@ -6,3 +6,4 @@ This module contains articles about Spring Cloud Gateway
- [Exploring the new Spring Cloud Gateway](http://www.baeldung.com/spring-cloud-gateway)
- [Writing Custom Spring Cloud Gateway Filters](https://www.baeldung.com/spring-cloud-custom-gateway-filters)
- [Spring Cloud Gateway Routing Predicate Factories](https://www.baeldung.com/spring-cloud-gateway-routing-predicate-factories)
+- [Spring Cloud Gateway WebFilter Factories](https://www.baeldung.com/spring-cloud-gateway-webfilter-factories)
diff --git a/spring-core-4/README.md b/spring-core-4/README.md
index f882c77179..592f4cd011 100644
--- a/spring-core-4/README.md
+++ b/spring-core-4/README.md
@@ -4,4 +4,6 @@ This module contains articles about core Spring functionality
## Relevant Articles:
+- [Creating Spring Beans Through Factory Methods](https://www.baeldung.com/spring-beans-factory-methods)
+- [How to dynamically Autowire a Bean in Spring](https://www.baeldung.com/spring-dynamic-autowire)
- More articles: [[<-- prev]](/spring-core-3)
diff --git a/spring-mobile/pom.xml b/spring-mobile/pom.xml
index ff90ac6ecb..465458ba49 100644
--- a/spring-mobile/pom.xml
+++ b/spring-mobile/pom.xml
@@ -10,9 +10,9 @@
com.baeldung
- parent-boot-1
+ parent-boot-2
0.0.1-SNAPSHOT
- ../parent-boot-1
+ ../parent-boot-2
@@ -23,11 +23,24 @@
org.springframework.mobile
spring-mobile-device
+ ${spring-mobile-device.version}
org.springframework.boot
spring-boot-starter-freemarker
-
+
+
+ spring-milestones
+ Spring Milestones
+ https://repo.spring.io/libs-milestone
+
+ false
+
+
+
+
+ 2.0.0.M3
+
diff --git a/spring-mobile/src/main/java/com/baeldung/AppConfig.java b/spring-mobile/src/main/java/com/baeldung/AppConfig.java
new file mode 100644
index 0000000000..efa073ae11
--- /dev/null
+++ b/spring-mobile/src/main/java/com/baeldung/AppConfig.java
@@ -0,0 +1,36 @@
+package com.baeldung;
+
+import java.util.List;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.mobile.device.DeviceHandlerMethodArgumentResolver;
+import org.springframework.mobile.device.DeviceResolverHandlerInterceptor;
+import org.springframework.web.method.support.HandlerMethodArgumentResolver;
+import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+@Configuration
+public class AppConfig implements WebMvcConfigurer {
+
+ @Bean
+ public DeviceResolverHandlerInterceptor deviceResolverHandlerInterceptor() {
+ return new DeviceResolverHandlerInterceptor();
+ }
+
+ @Bean
+ public DeviceHandlerMethodArgumentResolver deviceHandlerMethodArgumentResolver() {
+ return new DeviceHandlerMethodArgumentResolver();
+ }
+
+ @Override
+ public void addInterceptors(InterceptorRegistry registry) {
+ registry.addInterceptor(deviceResolverHandlerInterceptor());
+ }
+
+ @Override
+ public void addArgumentResolvers(List argumentResolvers) {
+ argumentResolvers.add(deviceHandlerMethodArgumentResolver());
+ }
+
+}
diff --git a/spring-mobile/src/main/java/com/baeldung/controller/IndexController.java b/spring-mobile/src/main/java/com/baeldung/controller/IndexController.java
index 196fb680e7..49880f355a 100644
--- a/spring-mobile/src/main/java/com/baeldung/controller/IndexController.java
+++ b/spring-mobile/src/main/java/com/baeldung/controller/IndexController.java
@@ -16,13 +16,16 @@ public class IndexController {
String deviceType = "browser";
String platform = "browser";
+ String viewName = "index";
if (device.isNormal()) {
deviceType = "browser";
} else if (device.isMobile()) {
deviceType = "mobile";
+ viewName = "mobile/index";
} else if (device.isTablet()) {
deviceType = "tablet";
+ viewName = "tablet/index";
}
platform = device.getDevicePlatform().name();
@@ -33,7 +36,7 @@ public class IndexController {
LOGGER.info("Client Device Type: " + deviceType + ", Platform: " + platform);
- return "index";
+ return viewName;
}
}
diff --git a/spring-mobile/src/main/resources/application.properties b/spring-mobile/src/main/resources/application.properties
index c0bc91f9ac..7d964f48fb 100644
--- a/spring-mobile/src/main/resources/application.properties
+++ b/spring-mobile/src/main/resources/application.properties
@@ -1 +1,3 @@
-spring.mobile.devicedelegatingviewresolver.enabled: true
\ No newline at end of file
+spring.mobile.devicedelegatingviewresolver.enabled: true
+spring.freemarker.template-loader-path: classpath:/templates
+spring.freemarker.suffix: .ftl
\ No newline at end of file
diff --git a/spring-rest-hal-browser/pom.xml b/spring-rest-hal-browser/pom.xml
index adef8bf2b0..32a0b52875 100644
--- a/spring-rest-hal-browser/pom.xml
+++ b/spring-rest-hal-browser/pom.xml
@@ -9,9 +9,9 @@
com.baeldung
- parent-boot-1
+ parent-boot-2
0.0.1-SNAPSHOT
- ../parent-boot-1
+ ../parent-boot-2
@@ -19,25 +19,26 @@
org.springframework.boot
spring-boot-starter-web
- ${spring-boot.version}
org.springframework.boot
spring-boot-starter-data-jpa
- ${spring-boot.version}
org.springframework.data
spring-data-rest-hal-browser
- ${spring-data.version}
com.h2database
h2
- ${h2.version}
+
+
+ net.bytebuddy
+ byte-buddy-dep
+ ${bytebuddy.version}
@@ -55,9 +56,7 @@
- 2.0.3.RELEASE
- 3.0.8.RELEASE
- 1.4.197
+ 1.10.10
1.8
1.8
diff --git a/spring-security-modules/spring-security-mvc-boot-2/README.md b/spring-security-modules/spring-security-mvc-boot-2/README.md
index 3c95086d21..7c53d03698 100644
--- a/spring-security-modules/spring-security-mvc-boot-2/README.md
+++ b/spring-security-modules/spring-security-mvc-boot-2/README.md
@@ -10,4 +10,5 @@ The "REST With Spring" Classes: http://github.learnspringsecurity.com
- [Multiple Authentication Providers in Spring Security](https://www.baeldung.com/spring-security-multiple-auth-providers)
- [Two Login Pages with Spring Security](https://www.baeldung.com/spring-security-two-login-pages)
- [HTTPS using Self-Signed Certificate in Spring Boot](https://www.baeldung.com/spring-boot-https-self-signed-certificate)
-- [Spring Security: Exploring JDBC Authentication](https://www.baeldung.com/spring-security-jdbc-authentication)
\ No newline at end of file
+- [Spring Security: Exploring JDBC Authentication](https://www.baeldung.com/spring-security-jdbc-authentication)
+- [Spring Security Custom Logout Handler](https://www.baeldung.com/spring-security-custom-logout-handler)
diff --git a/spring-security-modules/spring-security-okta/README.md b/spring-security-modules/spring-security-okta/README.md
new file mode 100644
index 0000000000..6ea4817e19
--- /dev/null
+++ b/spring-security-modules/spring-security-okta/README.md
@@ -0,0 +1,3 @@
+### Relevant Articles:
+
+- [Spring Security With Okta](https://www.baeldung.com/spring-security-okta)
diff --git a/spring-soap/README.md b/spring-soap/README.md
index c23f0bc6f0..ca5f58c67e 100644
--- a/spring-soap/README.md
+++ b/spring-soap/README.md
@@ -5,3 +5,4 @@ This module contains articles about SOAP APIs with Spring
### Relevant articles:
- [Creating a SOAP Web Service with Spring](https://www.baeldung.com/spring-boot-soap-web-service)
+- [Invoking a SOAP Web Service in Spring](https://www.baeldung.com/spring-soap-web-service)
diff --git a/spring-thymeleaf-3/src/main/java/com/baeldung/thymeleaf/currencies/CurrenciesController.java b/spring-thymeleaf-3/src/main/java/com/baeldung/thymeleaf/currencies/CurrenciesController.java
new file mode 100644
index 0000000000..206cf32683
--- /dev/null
+++ b/spring-thymeleaf-3/src/main/java/com/baeldung/thymeleaf/currencies/CurrenciesController.java
@@ -0,0 +1,22 @@
+package com.baeldung.thymeleaf.currencies;
+
+import java.util.List;
+import java.util.Locale;
+import java.util.Set;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+@Controller
+public class CurrenciesController {
+
+ @GetMapping(value = "/currency")
+ public String exchange(
+ @RequestParam(value = "amount", required = false) String amount,
+ @RequestParam(value = "amountList", required = false) List amountList,
+ Locale locale) {
+
+ return "currencies/currencies";
+ }
+}
diff --git a/spring-thymeleaf-3/src/main/resources/templates/currencies/currencies.html b/spring-thymeleaf-3/src/main/resources/templates/currencies/currencies.html
new file mode 100644
index 0000000000..c2f44265dd
--- /dev/null
+++ b/spring-thymeleaf-3/src/main/resources/templates/currencies/currencies.html
@@ -0,0 +1,21 @@
+
+
+
+
+ Currency table
+
+
+ Currency format by Locale
+
+
+ Currency Arrays format by Locale
+
+
+ Remove decimal values
+
+
+ Replace decimal points
+
+
+
\ No newline at end of file
diff --git a/spring-thymeleaf-3/src/test/java/com/baeldung/thymeleaf/currencies/CurrenciesControllerIntegrationTest.java b/spring-thymeleaf-3/src/test/java/com/baeldung/thymeleaf/currencies/CurrenciesControllerIntegrationTest.java
new file mode 100644
index 0000000000..02bf8a9ee0
--- /dev/null
+++ b/spring-thymeleaf-3/src/test/java/com/baeldung/thymeleaf/currencies/CurrenciesControllerIntegrationTest.java
@@ -0,0 +1,68 @@
+package com.baeldung.thymeleaf.currencies;
+
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest
+@AutoConfigureMockMvc(printOnlyOnFailure = false)
+public class CurrenciesControllerIntegrationTest {
+
+ @Autowired
+ private MockMvc mockMvc;
+
+ @Test
+ public void whenCallCurrencyWithSpanishLocale_ThenReturnProperCurrency() throws Exception {
+ mockMvc.perform(MockMvcRequestBuilders.get("/currency")
+ .header("Accept-Language", "es-ES")
+ .param("amount", "10032.5"))
+ .andExpect(status().isOk())
+ .andExpect(content().string(containsString("10.032,50 €")));
+ }
+
+ @Test
+ public void whenCallCurrencyWithUSALocale_ThenReturnProperCurrency() throws Exception {
+ mockMvc.perform(MockMvcRequestBuilders.get("/currency")
+ .header("Accept-Language", "en-US")
+ .param("amount", "10032.5"))
+ .andExpect(status().isOk())
+ .andExpect(content().string(containsString("$10,032.50")));
+ }
+
+ @Test
+ public void whenCallCurrencyWithRomanianLocaleWithArrays_ThenReturnLocaleCurrencies() throws Exception {
+ mockMvc.perform(MockMvcRequestBuilders.get("/currency")
+ .header("Accept-Language", "ro-RO")
+ .param("amountList", "10", "20", "30"))
+ .andExpect(status().isOk())
+ .andExpect(content().string(containsString("10,00 RON, 20,00 RON, 30,00 RON")));
+ }
+
+ @Test
+ public void whenCallCurrencyWithUSALocaleWithoutDecimal_ThenReturnCurrencyWithoutTrailingZeros() throws Exception {
+ mockMvc.perform(MockMvcRequestBuilders.get("/currency")
+ .header("Accept-Language", "en-US")
+ .param("amount", "10032"))
+ .andExpect(status().isOk())
+ .andExpect(content().string(containsString("$10,032")));
+ }
+
+ @Test
+ public void whenCallCurrencyWithUSALocale_ThenReturnReplacedDecimalPoint() throws Exception {
+ mockMvc.perform(MockMvcRequestBuilders.get("/currency")
+ .header("Accept-Language", "en-US")
+ .param("amount", "1.5"))
+ .andExpect(status().isOk())
+ .andExpect(content().string(containsString("1,5")));
+ }
+}
diff --git a/terraform/README.md b/terraform/README.md
index 19abd2ff20..b2a9539727 100644
--- a/terraform/README.md
+++ b/terraform/README.md
@@ -1,3 +1,4 @@
### Relevant Articles:
- [Introduction to Terraform](https://www.baeldung.com/ops/terraform-intro)
+- [Best Practices When Using Terraform](https://www.baeldung.com/ops/terraform-best-practices)
diff --git a/testing-modules/assertion-libraries/README.md b/testing-modules/assertion-libraries/README.md
index d69457fdeb..ca4cc86f7e 100644
--- a/testing-modules/assertion-libraries/README.md
+++ b/testing-modules/assertion-libraries/README.md
@@ -10,4 +10,4 @@
- [Custom Assertions with AssertJ](http://www.baeldung.com/assertj-custom-assertion)
- [Using Conditions with AssertJ Assertions](http://www.baeldung.com/assertj-conditions)
- [AssertJ Exception Assertions](http://www.baeldung.com/assertj-exception-assertion)
-
+- [Asserting Log Messages With JUnit](https://www.baeldung.com/junit-asserting-logs)