Merge remote-tracking branch 'upstream/master'

algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/minheapmerge/HeapNode.java

@@ -0,0 +1,13 @@
+package com.baeldung.algorithms.minheapmerge;
+
+public class HeapNode {
+
+    int element;
+    int arrayIndex;
+    int nextElementIndex = 1;
+
+    public HeapNode(int element, int arrayIndex) {
+        this.element = element;
+        this.arrayIndex = arrayIndex;
+    }
+}

algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/minheapmerge/MinHeap.java

@@ -0,0 +1,88 @@
+package com.baeldung.algorithms.minheapmerge;
+
+public class MinHeap {
+
+    HeapNode[] heapNodes;
+
+    public MinHeap(HeapNode heapNodes[]) {
+        this.heapNodes = heapNodes;
+        heapifyFromLastLeafsParent();
+    }
+
+    void heapifyFromLastLeafsParent() {
+        int lastLeafsParentIndex = getParentNodeIndex(heapNodes.length);
+        while (lastLeafsParentIndex >= 0) {
+            heapify(lastLeafsParentIndex);
+            lastLeafsParentIndex--;
+        }
+    }
+
+    void heapify(int index) {
+        int leftNodeIndex = getLeftNodeIndex(index);
+        int rightNodeIndex = getRightNodeIndex(index);
+        int smallestElementIndex = index;
+        if (leftNodeIndex < heapNodes.length && heapNodes[leftNodeIndex].element < heapNodes[index].element) {
+            smallestElementIndex = leftNodeIndex;
+        }
+        if (rightNodeIndex < heapNodes.length && heapNodes[rightNodeIndex].element < heapNodes[smallestElementIndex].element) {
+            smallestElementIndex = rightNodeIndex;
+        }
+        if (smallestElementIndex != index) {
+            swap(index, smallestElementIndex);
+            heapify(smallestElementIndex);
+        }
+    }
+
+    int getParentNodeIndex(int index) {
+        return (index - 1) / 2;
+    }
+
+    int getLeftNodeIndex(int index) {
+        return (2 * index + 1);
+    }
+
+    int getRightNodeIndex(int index) {
+        return (2 * index + 2);
+    }
+
+    HeapNode getRootNode() {
+        return heapNodes[0];
+    }
+
+    void heapifyFromRoot() {
+        heapify(0);
+    }
+
+    void swap(int i, int j) {
+        HeapNode temp = heapNodes[i];
+        heapNodes[i] = heapNodes[j];
+        heapNodes[j] = temp;
+    }
+    
+    static int[] merge(int[][] array) {
+        HeapNode[] heapNodes = new HeapNode[array.length];
+        int resultingArraySize = 0;
+
+        for (int i = 0; i < array.length; i++) {
+            HeapNode node = new HeapNode(array[i][0], i);
+            heapNodes[i] = node;
+            resultingArraySize += array[i].length;
+        }
+        
+        MinHeap minHeap = new MinHeap(heapNodes);
+        int[] resultingArray = new int[resultingArraySize];
+
+        for (int i = 0; i < resultingArraySize; i++) {
+            HeapNode root = minHeap.getRootNode();
+            resultingArray[i] = root.element;
+
+            if (root.nextElementIndex < array[root.arrayIndex].length) {
+                root.element = array[root.arrayIndex][root.nextElementIndex++];
+            } else {
+                root.element = Integer.MAX_VALUE;
+            }
+            minHeap.heapifyFromRoot();
+        }
+        return resultingArray;
+    }
+}

algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/minheapmerge/MinHeapUnitTest.java

@@ -0,0 +1,22 @@
+package com.baeldung.algorithms.minheapmerge;
+
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
+import org.junit.Test;
+
+public class MinHeapUnitTest {
+
+    private final int[][] inputArray = { { 0, 6 }, { 1, 5, 10, 100 }, { 2, 4, 200, 650 } };
+    private final int[] expectedArray = { 0, 1, 2, 4, 5, 6, 10, 100, 200, 650 };
+
+    @Test
+    public void givenSortedArrays_whenMerged_thenShouldReturnASingleSortedarray() {
+        int[] resultArray = MinHeap.merge(inputArray);
+        
+        assertThat(resultArray.length, is(equalTo(10)));
+        assertThat(resultArray, is(equalTo(expectedArray)));
+    }
+    
+}

apache-poi/pom.xml

@@ -32,7 +32,7 @@
     </dependencies>
 
     <properties>
-        <poi.version>3.15</poi.version>
+        <poi.version>4.1.1</poi.version>
         <jexcel.version>1.0.6</jexcel.version>
     </properties>
 

apache-poi/src/main/java/com/baeldung/poi/excel/ExcelCellFormatter.java

@@ -0,0 +1,20 @@
+package com.baeldung.poi.excel;
+
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.DataFormatter;
+import org.apache.poi.ss.usermodel.FormulaEvaluator;
+import org.apache.poi.ss.usermodel.Workbook;
+
+public class ExcelCellFormatter {
+
+    public String getCellStringValue(Cell cell) {
+        DataFormatter formatter = new DataFormatter();
+        return formatter.formatCellValue(cell);
+    }
+
+    public String getCellStringValueWithFormula(Cell cell, Workbook workbook) {
+        DataFormatter formatter = new DataFormatter();
+        FormulaEvaluator evaluator = workbook.getCreationHelper().createFormulaEvaluator();
+        return formatter.formatCellValue(cell, evaluator);
+    }
+}

apache-poi/src/main/java/com/baeldung/poi/excel/read/cellvalueandnotformula/CellValueAndNotFormulaHelper.java

@@ -0,0 +1,83 @@
+package com.baeldung.poi.excel.read.cellvalueandnotformula;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.CellType;
+import org.apache.poi.ss.usermodel.FormulaEvaluator;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.apache.poi.ss.util.CellAddress;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+
+public class CellValueAndNotFormulaHelper {
+
+    public Object getCellValueByFetchingLastCachedValue(String fileLocation, String cellLocation) throws IOException {
+        Object cellValue = new Object();
+
+        FileInputStream inputStream = new FileInputStream(new File(fileLocation));
+        Workbook workbook = new XSSFWorkbook(inputStream);
+
+        Sheet sheet = workbook.getSheetAt(0);
+
+        CellAddress cellAddress = new CellAddress(cellLocation);
+        Row row = sheet.getRow(cellAddress.getRow());
+        Cell cell = row.getCell(cellAddress.getColumn());
+
+        if (cell.getCellType() == CellType.FORMULA) {
+            switch (cell.getCachedFormulaResultType()) {
+                case BOOLEAN:
+                    cellValue = cell.getBooleanCellValue();
+                    break;
+                case NUMERIC:
+                    cellValue = cell.getNumericCellValue();
+                    break;
+                case STRING:
+                    cellValue = cell.getStringCellValue();
+                    break;
+                default:
+                    cellValue = null;
+            }
+        }
+
+        workbook.close();
+        return cellValue;
+    }
+
+    public Object getCellValueByEvaluatingFormula(String fileLocation, String cellLocation) throws IOException {
+        Object cellValue = new Object();
+
+        FileInputStream inputStream = new FileInputStream(new File(fileLocation));
+        Workbook workbook = new XSSFWorkbook(inputStream);
+
+        Sheet sheet = workbook.getSheetAt(0);
+        FormulaEvaluator evaluator = workbook.getCreationHelper()
+            .createFormulaEvaluator();
+
+        CellAddress cellAddress = new CellAddress(cellLocation);
+        Row row = sheet.getRow(cellAddress.getRow());
+        Cell cell = row.getCell(cellAddress.getColumn());
+
+        if (cell.getCellType() == CellType.FORMULA) {
+            switch (evaluator.evaluateFormulaCell(cell)) {
+                case BOOLEAN:
+                    cellValue = cell.getBooleanCellValue();
+                    break;
+                case NUMERIC:
+                    cellValue = cell.getNumericCellValue();
+                    break;
+                case STRING:
+                    cellValue = cell.getStringCellValue();
+                    break;
+                default:
+                    cellValue = null;
+            }
+        }
+
+        workbook.close();
+        return cellValue;
+    }
+}

apache-poi/src/test/java/com/baeldung/poi/excel/ExcelCellFormatterUnitTest.java

@@ -0,0 +1,87 @@
+package com.baeldung.poi.excel;
+
+import static org.junit.Assert.assertEquals;
+
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.nio.file.Paths;
+
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.junit.Before;
+import org.junit.Test;
+
+public class ExcelCellFormatterUnitTest {
+    private static final String FILE_NAME = "ExcelCellFormatterTest.xlsx";
+    private static final int STRING_CELL_INDEX = 0;
+    private static final int BOOLEAN_CELL_INDEX = 1;
+    private static final int RAW_NUMERIC_CELL_INDEX = 2;
+    private static final int FORMATTED_NUMERIC_CELL_INDEX = 3;
+    private static final int FORMULA_CELL_INDEX = 4;
+
+    private String fileLocation;
+
+    @Before
+    public void setup() throws IOException, URISyntaxException {
+            fileLocation = Paths.get(ClassLoader.getSystemResource(FILE_NAME).toURI()).toString();
+    }
+
+    @Test
+    public void givenStringCell_whenGetCellStringValue_thenReturnStringValue() throws IOException {
+        Workbook workbook = new XSSFWorkbook(fileLocation);
+        Sheet sheet = workbook.getSheetAt(0);
+        Row row = sheet.getRow(0);
+
+        ExcelCellFormatter formatter = new ExcelCellFormatter();
+        assertEquals("String Test", formatter.getCellStringValue(row.getCell(STRING_CELL_INDEX)));
+        workbook.close();
+    }
+
+    @Test
+    public void givenBooleanCell_whenGetCellStringValue_thenReturnBooleanStringValue() throws IOException {
+        Workbook workbook = new XSSFWorkbook(fileLocation);
+        Sheet sheet = workbook.getSheetAt(0);
+        Row row = sheet.getRow(0);
+
+        ExcelCellFormatter formatter = new ExcelCellFormatter();
+        assertEquals("TRUE", formatter.getCellStringValue(row.getCell(BOOLEAN_CELL_INDEX)));
+        workbook.close();
+    }
+
+    @Test
+    public void givenNumericCell_whenGetCellStringValue_thenReturnNumericStringValue() throws IOException {
+        Workbook workbook = new XSSFWorkbook(fileLocation);
+        Sheet sheet = workbook.getSheetAt(0);
+        Row row = sheet.getRow(0);
+
+        ExcelCellFormatter formatter = new ExcelCellFormatter();
+        assertEquals("1.234", formatter.getCellStringValue(row.getCell(RAW_NUMERIC_CELL_INDEX)));
+        assertEquals("1.23", formatter.getCellStringValue(row.getCell(FORMATTED_NUMERIC_CELL_INDEX)));
+        workbook.close();
+    }
+
+    @Test
+    public void givenFormualCell_whenGetCellStringValue_thenReturnOriginalFormulaString() throws IOException {
+        Workbook workbook = new XSSFWorkbook(fileLocation);
+        Sheet sheet = workbook.getSheetAt(0);
+        Row row = sheet.getRow(0);
+
+        ExcelCellFormatter formatter = new ExcelCellFormatter();
+        assertEquals("SUM(1+2)", formatter.getCellStringValue(row.getCell(FORMULA_CELL_INDEX)));
+        workbook.close();
+    }
+
+    @Test
+    public void givenFormualCell_whenGetCellStringValueForFormula_thenReturnOriginalFormulatring() throws IOException {
+        Workbook workbook = new XSSFWorkbook(fileLocation);
+        Sheet sheet = workbook.getSheetAt(0);
+        Row row = sheet.getRow(0);
+
+        ExcelCellFormatter formatter = new ExcelCellFormatter();
+        assertEquals("3", formatter.getCellStringValueWithFormula(row.getCell(FORMULA_CELL_INDEX), workbook));
+        workbook.close();
+    }
+
+}

apache-poi/src/test/java/com/baeldung/poi/excel/read/cellvalueandnotformula/CellValueAndNotFormulaUnitTest.java

@@ -0,0 +1,39 @@
+package com.baeldung.poi.excel.read.cellvalueandnotformula;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.nio.file.Paths;
+
+import org.junit.Before;
+import org.junit.Test;
+
+public class CellValueAndNotFormulaUnitTest {
+
+    private CellValueAndNotFormulaHelper readCellValueAndNotFormulaHelper;
+    private String fileLocation;
+    private static final String FILE_NAME = "test.xlsx";
+
+    @Before
+    public void setup() throws URISyntaxException {
+        fileLocation = Paths.get(ClassLoader.getSystemResource(FILE_NAME).toURI()).toString();
+        readCellValueAndNotFormulaHelper = new CellValueAndNotFormulaHelper();
+    }
+
+    @Test
+    public void givenExcelCell_whenReadCellValueByLastCachedValue_thenProduceCorrectResult() throws IOException {
+        final double expectedResult = 7.0;
+        final Object cellValue = readCellValueAndNotFormulaHelper.getCellValueByFetchingLastCachedValue(fileLocation, "C2");
+
+        assertEquals(expectedResult, cellValue);
+    }
+
+    @Test
+    public void givenExcelCell_whenReadCellValueByEvaluatingFormula_thenProduceCorrectResult() throws IOException {
+        final double expectedResult = 7.0;
+        final Object cellValue = readCellValueAndNotFormulaHelper.getCellValueByEvaluatingFormula(fileLocation, "C2");
+
+        assertEquals(expectedResult, cellValue);
+    }
+}

core-groovy-2/src/test/groovy/com/baeldung/webservice/WebserviceUnitTest.groovy

@@ -75,6 +75,7 @@ class WebserviceUnitTest extends GroovyTestCase {
         assert stories.size() == 5
     }
     
+    /* see BAEL-3753
     void test_whenConsumingSoap_thenReceiveResponse() {
         def url = "http://www.dataaccess.com/webservicesserver/numberconversion.wso"
         def soapClient = new SOAPClient(url)
@@ -89,6 +90,7 @@ class WebserviceUnitTest extends GroovyTestCase {
         def words = response.NumberToWordsResponse
         assert words == "one thousand two hundred and thirty four "
     }
+    */
 
     void test_whenConsumingRestGet_thenReceiveResponse() {
         def path = "/get"

core-java-modules/core-java-date-operations-1/README.md

@@ -1,6 +1,5 @@
-## Java Date/time computations Cookbooks and Examples
+## Core Date Operations (Part 1)
-
+This module contains articles about date operations in Java.
-This module contains articles about date and time computations in Java.
 
 ### Relevant Articles: 
 - [Difference Between Two Dates in Java](http://www.baeldung.com/java-date-difference)
@@ -13,3 +12,4 @@ This module contains articles about date and time computations in Java.
 - [Increment Date in Java](http://www.baeldung.com/java-increment-date)
 - [Add Hours To a Date In Java](http://www.baeldung.com/java-add-hours-date)
 - [Introduction to Joda-Time](http://www.baeldung.com/joda-time)
+- [[Next -->]](/core-java-modules/core-java-date-operations-2)

core-java-modules/core-java-date-operations-1/pom.xml

@@ -2,9 +2,9 @@
 <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>core-java-datetime-computations</artifactId>
+    <artifactId>core-java-date-operations-1</artifactId>
     <version>${project.parent.version}</version>
-    <name>core-java-datetime-computations</name>
+    <name>core-java-date-operations-1</name>
     <packaging>jar</packaging>
 
     <parent>
@@ -41,7 +41,7 @@
     </dependencies>
 
     <build>
-        <finalName>core-java-datetime-computations</finalName>
+        <finalName>core-java-date-operations-1</finalName>
         <resources>
             <resource>
                 <directory>src/main/resources</directory>

core-java-modules/core-java-date-operations-2/README.md

@@ -1,4 +1,4 @@
-## Core Date Operations
+## Core Date Operations (Part 2)
 This module contains articles about date operations in Java.
 
 ### Relevant Articles:
@@ -6,3 +6,4 @@ This module contains articles about date operations in Java.
 - [Skipping Weekends While Adding Days to LocalDate in Java 8](https://www.baeldung.com/java-localdate-add-days-skip-weekends)
 - [Checking If Two Java Dates Are on the Same Day](https://www.baeldung.com/java-check-two-dates-on-same-day)
 - [Converting Java Date to OffsetDateTime](https://www.baeldung.com/java-convert-date-to-offsetdatetime)
+- [[<-- Prev]](/core-java-modules/core-java-date-operations-1)

core-java-modules/core-java-date-operations-2/pom.xml

@@ -3,9 +3,9 @@
     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>core-java-date-operations</artifactId>
+    <artifactId>core-java-date-operations-2</artifactId>
     <version>${project.parent.version}</version>
-    <name>core-java-date-operations</name>
+    <name>core-java-date-operations-2</name>
     <packaging>jar</packaging>
 
     <parent>
@@ -31,11 +31,18 @@
             <artifactId>hirondelle-date4j</artifactId>
             <version>${hirondelle-date4j.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <version>${assertj.version}</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <properties>
         <joda-time.version>2.10</joda-time.version>
         <hirondelle-date4j.version>1.5.1</hirondelle-date4j.version>
+        <assertj.version>3.14.0</assertj.version>
     </properties>
 
 </project>

core-java-modules/core-java-date-operations-2/src/main/java/com/baeldung/timer/DatabaseMigrationTask.java

@@ -0,0 +1,19 @@
+package com.baeldung.timer;
+
+import java.util.List;
+import java.util.TimerTask;
+
+public class DatabaseMigrationTask extends TimerTask {
+    private List<String> oldDatabase;
+    private List<String> newDatabase;
+
+    public DatabaseMigrationTask(List<String> oldDatabase, List<String> newDatabase) {
+        this.oldDatabase = oldDatabase;
+        this.newDatabase = newDatabase;
+    }
+
+    @Override
+    public void run() {
+        newDatabase.addAll(oldDatabase);
+    }
+}

core-java-modules/core-java-date-operations-2/src/main/java/com/baeldung/timer/NewsletterTask.java

@@ -0,0 +1,14 @@
+package com.baeldung.timer;
+
+import java.time.Instant;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.util.TimerTask;
+
+public class NewsletterTask extends TimerTask {
+    @Override
+    public void run() {
+        System.out.println("Email sent at: "
+          + LocalDateTime.ofInstant(Instant.ofEpochMilli(scheduledExecutionTime()), ZoneId.systemDefault()));
+    }
+}

core-java-modules/core-java-date-operations-2/src/test/java/com/baeldung/timer/DatabaseMigrationTaskUnitTest.java

@@ -0,0 +1,44 @@
+package com.baeldung.timer;
+
+import org.junit.jupiter.api.Test;
+
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.util.*;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class DatabaseMigrationTaskUnitTest {
+    @Test
+    void givenDatabaseMigrationTask_whenTimerScheduledForNowPlusTwoSeconds_thenDataMigratedAfterTwoSeconds() throws Exception {
+        List<String> oldDatabase = Arrays.asList("Harrison Ford", "Carrie Fisher", "Mark Hamill");
+        List<String> newDatabase = new ArrayList<>();
+
+        LocalDateTime twoSecondsLater = LocalDateTime.now().plusSeconds(2);
+        Date twoSecondsLaterAsDate = Date.from(twoSecondsLater.atZone(ZoneId.systemDefault()).toInstant());
+
+        new Timer().schedule(new DatabaseMigrationTask(oldDatabase, newDatabase), twoSecondsLaterAsDate);
+
+        while (LocalDateTime.now().isBefore(twoSecondsLater)) {
+            assertThat(newDatabase).isEmpty();
+            Thread.sleep(500);
+        }
+        assertThat(newDatabase).containsExactlyElementsOf(oldDatabase);
+    }
+
+    @Test
+    void givenDatabaseMigrationTask_whenTimerScheduledInTwoSeconds_thenDataMigratedAfterTwoSeconds() throws Exception {
+        List<String> oldDatabase = Arrays.asList("Harrison Ford", "Carrie Fisher", "Mark Hamill");
+        List<String> newDatabase = new ArrayList<>();
+
+        new Timer().schedule(new DatabaseMigrationTask(oldDatabase, newDatabase), 2000);
+
+        LocalDateTime twoSecondsLater = LocalDateTime.now().plusSeconds(2);
+
+        while (LocalDateTime.now().isBefore(twoSecondsLater)) {
+            assertThat(newDatabase).isEmpty();
+            Thread.sleep(500);
+        }
+        assertThat(newDatabase).containsExactlyElementsOf(oldDatabase);
+    }
+}

core-java-modules/core-java-date-operations-2/src/test/java/com/baeldung/timer/NewsletterTaskUnitTest.java

@@ -0,0 +1,33 @@
+package com.baeldung.timer;
+
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
+
+import java.util.Timer;
+
+class NewsletterTaskUnitTest {
+    private final Timer timer = new Timer();
+
+    @AfterEach
+    void afterEach() {
+        timer.cancel();
+    }
+
+    @Test
+    void givenNewsletterTask_whenTimerScheduledEachSecondFixedDelay_thenNewsletterSentEachSecond() throws Exception {
+        timer.schedule(new NewsletterTask(), 0, 1000);
+
+        for (int i = 0; i < 3; i++) {
+            Thread.sleep(1000);
+        }
+    }
+
+    @Test
+    void givenNewsletterTask_whenTimerScheduledEachSecondFixedRate_thenNewsletterSentEachSecond() throws Exception {
+        timer.scheduleAtFixedRate(new NewsletterTask(), 0, 1000);
+
+        for (int i = 0; i < 3; i++) {
+            Thread.sleep(1000);
+        }
+    }
+}

core-java-modules/core-java-datetime-java8/src/main/java/com/baeldung/datebasics/CreateDate.java

@@ -0,0 +1,45 @@
+package com.baeldung.datebasics;
+
+import java.time.Clock;
+import java.time.LocalDate;
+import java.time.Month;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
+
+public class CreateDate {
+	public LocalDate getTodaysDate() {
+		return LocalDate.now();
+	}
+
+	public LocalDate getTodaysDateFromClock() {
+		return LocalDate.now(Clock.systemDefaultZone());
+	}
+
+	public LocalDate getTodaysDateFromZone(String zone) {
+		return LocalDate.now(ZoneId.of(zone));
+	}
+
+	public LocalDate getCustomDateOne(int year, int month, int dayOfMonth) {
+		return LocalDate.of(year, month, dayOfMonth);
+	}
+
+	public LocalDate getCustomDateTwo(int year, Month month, int dayOfMonth) {
+		return LocalDate.of(year, month, dayOfMonth);
+	}
+
+	public LocalDate getDateFromEpochDay(long epochDay) {
+		return LocalDate.ofEpochDay(epochDay);
+	}
+
+	public LocalDate getDateFromYearAndDayOfYear(int year, int dayOfYear) {
+		return LocalDate.ofYearDay(year, dayOfYear);
+	}
+
+	public LocalDate getDateFromString(String date) {
+		return LocalDate.parse(date);
+	}
+
+	public LocalDate getDateFromStringAndFormatter(String date, String pattern) {
+		return LocalDate.parse(date, DateTimeFormatter.ofPattern(pattern));
+	}
+}

core-java-modules/core-java-datetime-java8/src/test/java/com/baeldung/datebasics/CreateDateUnitTest.java

@@ -0,0 +1,56 @@
+package com.baeldung.datebasics;
+
+import static org.junit.Assert.assertEquals;
+
+import java.time.Month;
+
+import org.junit.Test;
+
+public class CreateDateUnitTest {
+    private CreateDate date = new CreateDate();
+    
+    @Test
+    public void whenUsingNowMethod_thenLocalDate() {
+        assertEquals("2020-01-08", date.getTodaysDate());
+    }
+    
+    @Test
+    public void whenUsingClock_thenLocalDate() {
+        assertEquals("2020-01-08", date.getTodaysDateFromClock());
+    }
+    
+    @Test
+    public void givenValues_whenUsingZone_thenLocalDate() {
+        assertEquals("2020-01-08", date.getTodaysDateFromZone("Asia/Kolkata"));
+    }
+    
+    @Test
+    public void givenValues_whenUsingOfMethod_thenLocalDate() {
+        assertEquals("2020-01-08", date.getCustomDateOne(2020, 1, 8));
+    }
+    
+    @Test
+    public void givenValuesWithMonthEnum_whenUsingOfMethod_thenLocalDate() {
+        assertEquals("2020-01-08", date.getCustomDateTwo(2020, Month.JANUARY, 8));
+    }
+    
+    @Test
+    public void givenValues_whenUsingEpochDay_thenLocalDate() {
+        assertEquals("2020-01-08", date.getDateFromEpochDay(18269));
+    }
+    
+    @Test
+    public void givenValues_whenUsingYearDay_thenLocalDate() {
+        assertEquals("2020-01-08", date.getDateFromYearAndDayOfYear(2020, 8));
+    }
+    
+    @Test
+    public void givenValues_whenUsingParse_thenLocalDate() {
+        assertEquals("2020-01-08", date.getDateFromString("2020-01-08"));
+    }
+    
+    @Test
+    public void givenValuesWithFormatter_whenUsingParse_thenLocalDate() {
+        assertEquals("2020-01-08", date.getDateFromStringAndFormatter("8-Jan-2020", "d-MMM-yyyy"));
+    }
+}

core-java-modules/core-java-lang-math/src/main/java/com/baeldung/powerset/PowerSetUtility.java

@@ -1,7 +1,5 @@
 package com.baeldung.powerset;
 
-import com.google.common.collect.Sets;
-
 import javax.annotation.Nullable;
 import java.util.AbstractSet;
 import java.util.ArrayList;
@@ -163,7 +161,7 @@ public class PowerSetUtility<T> {
         return unMapIndex(powerSetIndices);
     }
 
-    private List<List<Boolean>> iterativePowerSetByLoopOverNumbersWithReverseLexicographicalOrder(int n) {
+    private List<List<Boolean>> iterativePowerSetByLoopOverNumbers(int n) {
         List<List<Boolean>> powerSet = new ArrayList<>();
         for (int i = 0; i < (1 << n); i++) {
             List<Boolean> subset = new ArrayList<>(n);
@@ -174,7 +172,7 @@ public class PowerSetUtility<T> {
         return powerSet;
     }
 
-    private List<List<Boolean>> iterativePowerSetByLoopOverNumbersWithGrayCodeOrder(int n) {
+    private List<List<Boolean>> iterativePowerSetByLoopOverNumbersWithMinimalChange(int n) {
         List<List<Boolean>> powerSet = new ArrayList<>();
         for (int i = 0; i < (1 << n); i++) {
             List<Boolean> subset = new ArrayList<>(n);
@@ -195,32 +193,16 @@ public class PowerSetUtility<T> {
 
     public List<List<T>> iterativePowerSetByLoopOverNumbers(Set<T> set) {
         initializeMap(set);
-                List<List<Boolean>> sets = iterativePowerSetByLoopOverNumbersWithReverseLexicographicalOrder(set.size());
+        List<List<Boolean>> sets = iterativePowerSetByLoopOverNumbers(set.size());
         return unMapListBinary(sets);
     }
 
     public List<List<T>> iterativePowerSetByLoopOverNumbersMinimalChange(Set<T> set) {
         initializeMap(set);
-        List<List<Boolean>> sets = iterativePowerSetByLoopOverNumbersWithGrayCodeOrder(set.size());
+        List<List<Boolean>> sets = iterativePowerSetByLoopOverNumbersWithMinimalChange(set.size());
         return unMapListBinary(sets);
     }
 
-    public static int getRankInLexicographicalOrder(List<Boolean> subset) {
-        int rank = 0;
-        for (int i = 0; i < subset.size(); i++)
-            if (subset.get(i))
-                rank += (1 << (subset.size() - i - 1));
-        return rank;
-    }
-
-    public static List<Boolean> getSubsetForRankInLexicographicalOrder(int rank, int sizeOfSet) {
-        Boolean[] subset = new Boolean[sizeOfSet];
-        for(int j = 0; j < sizeOfSet; j++) {
-            subset[sizeOfSet - j - 1] = ((rank & (1 << j)) > 0);
-        }
-        return Arrays.asList(subset);
-    }
-
     private Set<Set<Integer>> recursivePowerSetIndexRepresentation(int idx, int n) {
         if (idx == n) {
             Set<Set<Integer>> empty = new HashSet<>();

core-java-modules/core-java-lang-math/src/test/java/com/baeldung/powerset/PowerSetUtilityUnitTest.java

@@ -137,7 +137,7 @@ public class PowerSetUtilityUnitTest {
     }
 
     @Test
-    public void givenSet_WhenPowerSetIsCalculatedIterativePowerSetByLoopOverNumbersMinimalChange_ThenItContainsAllSubsetsInGrayOrder() {
+    public void givenSet_WhenPowerSetIsCalculatedIterativePowerSetByLoopOverNumbersWithMinimalChange_ThenItContainsAllSubsets() {
 
         Set<String> set = RandomSetOfStringGenerator.generateRandomSet();
         List<List<String>> powerSet = new PowerSetUtility<String>().iterativePowerSetByLoopOverNumbersMinimalChange(set);
@@ -172,42 +172,6 @@ public class PowerSetUtilityUnitTest {
         }
     }
 
-    @Test
-    public void givenSubset_WhenPowerSetIsInLexicographicalOrder_ReturnCorrectRank() {
-        int n = new Random().nextInt(5) + 5; //a number in [5, 10)
-        for(int i = 0; i < ( 1 << n); i++) {
-            Boolean[] subset = new Boolean[n];
-            for(int j=0; j < n; j++) {
-                subset[n - j - 1] = ((i & (1 << j)) > 0);
-            }
-            Assertions.assertEquals(i, PowerSetUtility.getRankInLexicographicalOrder(Arrays.asList(subset)));
-        }
-    }
-
-    @Test
-    public void givenRanking_WhenPowerSetIsInLexicographicalOrder_ReturnTheSubset() {
-        int n = new Random().nextInt(5) + 5; //a number in [5, 10)
-        List<List<Boolean>> powerSet = new ArrayList<>();
-        for(int i = 0; i < (1 << n); i++) {
-            powerSet.add(PowerSetUtility.getSubsetForRankInLexicographicalOrder(i, n));
-        }
-        //To make sure that the size of power set is (2 power n)
-        MatcherAssert.assertThat(powerSet, IsCollectionWithSize.hasSize((1 << n)));
-        //To make sure that number of occurrence of each index is (2 power n-1)
-        Map<Integer, Integer> counter = new HashMap<>();
-        for (List<Boolean> subset : powerSet) {
-            for (int i = 0; i < subset.size(); i++) {
-                if(subset.get(i)) {
-                    int num = counter.getOrDefault(i, 0);
-                    counter.put(i, num + 1);
-                }
-            }
-        }
-        counter.forEach((k, v) -> Assertions.assertEquals((1 << (n - 1)), v.intValue()));
-        //To make sure that one subset is not generated twice
-        Assertions.assertEquals(powerSet.size(), new HashSet<>(powerSet).size());
-    }
-
     static class RandomSetOfStringGenerator {
         private static List<String> fruits = Arrays.asList("Apples", "Avocados", "Banana", "Blueberry", "Cherry", "Clementine", "Cucumber", "Date", "Fig",
           "Grapefruit"/*, "Grape", "Kiwi", "Lemon", "Mango", "Mulberry", "Melon", "Nectarine", "Olive", "Orange"*/);

core-java-modules/core-java-lang-operators/src/test/java/com/baeldung/ternaryoperator/TernaryOperatorUnitTest.java

@@ -6,7 +6,7 @@ import org.junit.Test;
 public class TernaryOperatorUnitTest {
 
     @Test
-    public void givenACondition_whenUsingTernaryOperator_thenItEvaluatesConditionAndReturnsAValue() {
+    public void whenUsingTernaryOperator_thenConditionIsEvaluatedAndValueReturned() {
         int number = 10;
         String msg = number > 10 ? "Number is greater than 10" : "Number is less than or equal to 10";
 
@@ -14,7 +14,7 @@ public class TernaryOperatorUnitTest {
     }
 
     @Test
-    public void givenATrueCondition_whenUsingTernaryOperator_thenOnlyExpression1IsEvaluated() {
+    public void whenConditionIsTrue_thenOnlyFirstExpressionIsEvaluated() {
         int exp1 = 0, exp2 = 0;
         int result = 12 > 10 ? ++exp1 : ++exp2;
 
@@ -24,7 +24,7 @@ public class TernaryOperatorUnitTest {
     }
 
     @Test
-    public void givenAFalseCondition_whenUsingTernaryOperator_thenOnlyExpression2IsEvaluated() {
+    public void whenConditionIsFalse_thenOnlySecondExpressionIsEvaluated() {
         int exp1 = 0, exp2 = 0;
         int result = 8 > 10 ? ++exp1 : ++exp2;
 

core-java-modules/pom.xml

@@ -18,7 +18,7 @@
         <module>core-java-optional</module>
         <module>core-java-lang-operators</module>
         <module>core-java-networking-2</module>
-        <module>core-java-date-operations</module>
+        <module>core-java-date-operations-2</module>
     </modules>
 
 </project>

netflix-modules/README.md

@@ -1,4 +1,4 @@
-## Netflix
+## Netflix Modules
 
 This module contains articles about Netflix. 
 

netflix-modules/genie/pom.xml

@@ -10,7 +10,7 @@
 
     <parent>
         <groupId>com.baeldung</groupId>
-        <artifactId>netflix</artifactId>
+        <artifactId>netflix-modules</artifactId>
         <version>1.0.0-SNAPSHOT</version>
     </parent>
 

netflix-modules/pom.xml

@@ -2,9 +2,9 @@
 <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>netflix</artifactId>
+    <artifactId>netflix-modules</artifactId>
     <version>1.0.0-SNAPSHOT</version>
-    <name>Netflix</name>
+    <name>Netflix Modules</name>
     <packaging>pom</packaging>
     <description>Module for Netflix projects</description>
 

pom.xml

@@ -400,7 +400,7 @@
                 <module>core-java-modules/core-java-lang-math</module>
                 <!-- We haven't upgraded to java 9.-->
                 <!--
-                <module>core-java-modules/core-java-datetime-computations</module>
+                <module>core-java-modules/core-java-date-operations-1</module>
                 <module>core-java-modules/core-java-datetime-conversion</module>
                 <module>core-java-modules/core-java-datetime-java8</module>
                 <module>core-java-modules/core-java-datetime-string</module>
@@ -586,8 +586,9 @@
                 <!-- <module>muleesb</module> --> <!-- Fixing in BAEL-10878 -->
                 <module>mustache</module>
                 <module>mybatis</module>
+
                 <module>ninja</module>
-                <module>netflix</module>
+                <module>netflix-modules</module>
 
                 <module>optaplanner</module>
                 <module>orika</module>
@@ -669,7 +670,7 @@
             </build>
 
             <modules>
-                <module>netflix</module>
+                <module>netflix-modules</module>
 
                 <module>parent-boot-1</module>
                 <module>parent-boot-2</module>
@@ -1040,7 +1041,7 @@
                 <module>core-java-modules/core-java-lang-math</module>
                 <!-- We haven't upgraded to java 9.-->
                 <!--
-                <module>core-java-modules/core-java-datetime-computations</module>
+                <module>core-java-modules/core-java-date-operations-1</module>
                 <module>core-java-modules/core-java-datetime-conversion</module>
                 <module>core-java-modules/core-java-datetime-java8</module>
                 <module>core-java-modules/core-java-datetime-string</module>
@@ -1218,8 +1219,9 @@
                 <!-- <module>muleesb</module> --> <!-- Fixing in BAEL-10878 -->
                 <module>mustache</module>
                 <module>mybatis</module>
+
                 <module>ninja</module>
-                <module>netflix</module>
+                <module>netflix-modules</module>
 
                 <module>optaplanner</module>
                 <module>orika</module>

spring-boot-admin/pom.xml

@@ -11,6 +11,7 @@
         <groupId>com.baeldung</groupId>
         <artifactId>parent-boot-2</artifactId>
         <version>0.0.1-SNAPSHOT</version>
+        <relativePath>../parent-boot-2</relativePath>
     </parent>
 
     <modules>

spring-boot-properties/src/test/java/com/baeldung/properties/testproperty/FilePropertyInjectionUnitTest.java

@@ -0,0 +1,24 @@
+package com.baeldung.properties.testproperty;
+
+import org.assertj.core.api.Assertions;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.TestPropertySource;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+@RunWith(SpringRunner.class)
+@TestPropertySource("/foo.properties")
+public class FilePropertyInjectionUnitTest {
+
+    @Value("${foo}")
+    private String foo;
+
+    @Test
+    public void whenFilePropertyProvided_thenProperlyInjected() {
+        assertThat(foo).isEqualTo("bar");
+    }
+}

spring-boot-properties/src/test/java/com/baeldung/properties/testproperty/PropertyInjectionUnitTest.java

@@ -0,0 +1,23 @@
+package com.baeldung.properties.testproperty;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.TestPropertySource;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+@RunWith(SpringRunner.class)
+@TestPropertySource(properties = {"foo=bar"})
+public class PropertyInjectionUnitTest {
+
+    @Value("${foo}")
+    private String foo;
+
+    @Test
+    public void whenPropertyProvided_thenProperlyInjected() {
+        assertThat(foo).isEqualTo("bar");
+    }
+}

spring-boot-properties/src/test/java/com/baeldung/properties/testproperty/SpringBootPropertyInjectionIntegrationTest.java

@@ -0,0 +1,23 @@
+package com.baeldung.properties.testproperty;
+
+import com.baeldung.properties.reloading.SpringBootPropertiesTestApplication;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(properties = {"foo=bar"}, classes = SpringBootPropertiesTestApplication.class)
+public class SpringBootPropertyInjectionIntegrationTest {
+
+    @Value("${foo}")
+    private String foo;
+
+    @Test
+    public void whenSpringBootPropertyProvided_thenProperlyInjected() {
+        assertThat(foo).isEqualTo("bar");
+    }
+}

spring-boot-properties/src/test/resources/foo.properties

@@ -0,0 +1 @@
+foo=bar

spring-boot/pom.xml

@@ -7,10 +7,11 @@
     <name>spring-boot</name>
     <packaging>war</packaging>
     <description>This is simple boot application for Spring boot actuator test</description>
+    <version>0.0.1-SNAPSHOT</version>
 
     <parent>
-        <groupId>com.baeldung</groupId>
         <artifactId>parent-boot-2</artifactId>
+        <groupId>com.baeldung</groupId>
         <version>0.0.1-SNAPSHOT</version>
         <relativePath>../parent-boot-2</relativePath>
     </parent>
@@ -198,6 +199,16 @@
                 </configuration>
             </plugin>
 
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <configuration>
+                    <delimiters>
+                        <delimiter>@</delimiter>
+                    </delimiters>
+                    <useDefaultDelimiters>false</useDefaultDelimiters>
+                </configuration>
+            </plugin>
         </plugins>
 
     </build>
@@ -251,6 +262,7 @@
         <graphql-java-tools.version>5.2.4</graphql-java-tools.version>
         <guava.version>18.0</guava.version>
         <git-commit-id-plugin.version>2.2.4</git-commit-id-plugin.version>
+        <resource.delimiter>@</resource.delimiter>
     </properties>
 
 </project>

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

@@ -0,0 +1,18 @@
+package com.baeldung.buildproperties;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.PropertySource;
+
+@SpringBootApplication
+@ComponentScan(basePackages = "com.baeldung.buildproperties")
+@PropertySource("classpath:build.properties")
+//@PropertySource("classpath:build.yml")
+public class Application {
+    
+    public static void main(String[] args) {
+        SpringApplication.run(Application.class, args);
+    }
+    
+}

spring-boot/src/main/java/com/baeldung/buildproperties/BuildInfoService.java

@@ -0,0 +1,21 @@
+package com.baeldung.buildproperties;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+
+@Service
+public class BuildInfoService {
+    @Value("${application-description}")
+    private String applicationDescription;
+    
+    @Value("${application-version}")
+    private String applicationVersion;
+
+    public String getApplicationDescription() {
+        return applicationDescription;
+    }
+
+    public String getApplicationVersion() {
+        return applicationVersion;
+    }
+}

spring-boot/src/main/resources/build.properties

@@ -0,0 +1,2 @@
+application-description=@project.description@
+application-version=@project.version@

spring-boot/src/main/resources/build.yml

@@ -0,0 +1,2 @@
+application-description: ^project.description^
+application-version: ^project.version^

spring-boot/src/test/java/com/baeldung/buildproperties/BuildInfoServiceIntegrationTest.java

@@ -0,0 +1,24 @@
+package com.baeldung.buildproperties;
+
+import static org.junit.Assert.assertThat;
+
+import org.hamcrest.Matchers;
+import org.junit.jupiter.api.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = Application.class)
+class BuildInfoServiceIntegrationTest {
+
+    @Autowired
+    private BuildInfoService service;
+    
+    @Test
+    void whenGetApplicationDescription_thenSuccess() {
+        assertThat(service.getApplicationDescription(), Matchers.is("This is simple boot application for Spring boot actuator test"));
+        assertThat(service.getApplicationVersion(), Matchers.is("0.0.1-SNAPSHOT"));
+    }
+}

spring-boot/src/test/java/org/baeldung/boot/repository/FooRepositoryIntegrationTest.java

@@ -1,19 +1,17 @@
 package org.baeldung.boot.repository;
 
-import static org.junit.Assert.assertThat;
-
 import org.baeldung.boot.DemoApplicationIntegrationTest;
 import org.baeldung.demo.model.Foo;
 import org.baeldung.demo.repository.FooRepository;
-
-import static org.hamcrest.Matchers.notNullValue;
-import static org.hamcrest.Matchers.is;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.notNullValue;
+import static org.junit.Assert.assertThat;
+
 @Transactional
 public class FooRepositoryIntegrationTest extends DemoApplicationIntegrationTest {
     @Autowired
@@ -28,8 +26,10 @@ public class FooRepositoryIntegrationTest extends DemoApplicationIntegrationTest
     @Test
     public void testFindByName() {
         Foo foo = fooRepository.findByName("Bar");
+
         assertThat(foo, notNullValue());
-        assertThat(foo.getId(), is(2));
+        assertThat(foo.getId(), notNullValue());
+        assertThat(foo.getName(), is("Bar"));
     }
 
 }

spring-boot/src/test/java/org/baeldung/boot/repository/HibernateSessionIntegrationTest.java

@@ -1,9 +1,5 @@
 package org.baeldung.boot.repository;
 
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.notNullValue;
-import static org.junit.Assert.assertThat;
-
 import org.baeldung.boot.DemoApplicationIntegrationTest;
 import org.baeldung.demo.model.Foo;
 import org.baeldung.demo.repository.FooRepository;
@@ -11,6 +7,10 @@ import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.notNullValue;
+import static org.junit.Assert.assertThat;
+
 @Transactional
 public class HibernateSessionIntegrationTest extends DemoApplicationIntegrationTest {
     @Autowired
@@ -18,13 +18,12 @@ public class HibernateSessionIntegrationTest extends DemoApplicationIntegrationT
 
     @Test
     public void whenSavingWithCurrentSession_thenThrowNoException() {
-        Foo foo = new Foo("Exception Solved");
+        fooRepository.save(new Foo("Exception Solved"));
-        fooRepository.save(foo);
+
-        foo = null;
+        Foo foo = fooRepository.findByName("Exception Solved");
-        foo = fooRepository.findByName("Exception Solved");
 
         assertThat(foo, notNullValue());
-        assertThat(foo.getId(), is(1));
+        assertThat(foo.getId(), notNullValue());
         assertThat(foo.getName(), is("Exception Solved"));
     }
 }

spring-core-2/src/main/java/com/baeldung/scopes/ScopesConfig.java

@@ -0,0 +1,49 @@
+package com.baeldung.scopes;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Scope;
+import org.springframework.context.annotation.ScopedProxyMode;
+import org.springframework.web.context.annotation.ApplicationScope;
+import org.springframework.web.context.annotation.RequestScope;
+import org.springframework.web.context.annotation.SessionScope;
+
+@Configuration
+public class ScopesConfig {
+
+    @Bean
+    @Scope("singleton")
+    public Person personSingleton() {
+        return new Person();
+    }
+
+    @Bean
+    @Scope("prototype")
+    public Person personPrototype() {
+        return new Person();
+    }
+
+    @Bean
+    @RequestScope
+    public HelloMessageGenerator requestScopedBean() {
+        return new HelloMessageGenerator();
+    }
+
+    @Bean
+    @SessionScope
+    public HelloMessageGenerator sessionScopedBean() {
+        return new HelloMessageGenerator();
+    }
+
+    @Bean
+    @ApplicationScope
+    public HelloMessageGenerator applicationScopedBean() {
+        return new HelloMessageGenerator();
+    }
+
+    @Bean
+    @Scope(scopeName = "websocket", proxyMode = ScopedProxyMode.TARGET_CLASS)
+    public HelloMessageGenerator websocketScopedBean() {
+        return new HelloMessageGenerator();
+    }
+}

spring-exceptions/README.md

@@ -1,4 +1,4 @@
-## Spring `Exception`s
+## Spring Exceptions
 
 This module contains articles about Spring `Exception`s
 

spring-mvc-basics/src/main/webapp/WEB-INF/view/userHome.jsp

@@ -0,0 +1,55 @@
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
+
+<!DOCTYPE HTML>
+<html>
+<head>
+    <title>User Form</title>
+    <style>
+        body { background-color: #eee; font: helvetica; }
+        #container { width: 500px; background-color: #fff; margin: 30px auto; padding: 30px; border-radius: 5px; }
+        .green { font-weight: bold; color: green; }
+        .message { margin-bottom: 10px; }
+        label {width:160px; display:inline-block;}
+        input { display:inline-block; margin-right: 10px; }
+        form {line-height: 160%; }
+        .hide { display: none; }
+        .error { color: red; font-size: 0.9em; font-weight: bold; }
+    </style>
+</head>
+<body>
+<div id="container">
+
+    <h2>New User</h2>
+    <c:if test="${not empty message}"><div class="message green">${message}</div></c:if>
+
+    <form:form action="/spring-mvc-basics/user" modelAttribute="newUserForm">
+
+        <form:errors path="" cssClass="error"/>
+        <br />
+
+        <label for="email">Email: </label>
+        <form:input path="email" id="emailInput" />
+        <form:errors path="email" cssClass="error" />
+        <br/>
+
+        <label for="verifyEmail">Verify email: </label>
+        <form:input path="verifyEmail" id="verifyEmailInput" />
+        <form:errors path="verifyEmail" cssClass="error" />
+        <br/>
+
+        <label for="password">Password: </label>
+        <form:input path="password" type="password" id="passwordInput" />
+        <form:errors path="password" cssClass="error" />
+        <br/>
+
+        <label for="verifyPassword">Verify password: </label>
+        <form:input path="verifyPassword" type="password" id="verifyPasswordInput" />
+        <form:errors path="verifyPassword" cssClass="error" />
+        <br/>
+
+        <input type="submit" value="Submit" />
+    </form:form>
+</div>
+</body>
+</html>

spring-mvc-views/src/main/java/com/baeldung/themes/config/DataSourceConfig.java

@@ -1,4 +1,4 @@
-package com.baeldung.config;
+package com.baeldung.themes.config;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.dao.annotation.PersistenceExceptionTranslationPostProcessor;
@@ -27,7 +27,7 @@ public class DataSourceConfig {
     public LocalContainerEntityManagerFactoryBean entityManagerFactory(DataSource dataSource) {
         LocalContainerEntityManagerFactoryBean em = new LocalContainerEntityManagerFactoryBean();
         em.setDataSource(dataSource);
-        em.setPackagesToScan("com.baeldung.domain");
+        em.setPackagesToScan("com.baeldung.themes.domain");
         em.setJpaVendorAdapter(new HibernateJpaVendorAdapter());
         return em;
     }

spring-mvc-views/src/main/java/com/baeldung/themes/config/InitSecurity.java

@@ -1,4 +1,4 @@
-package com.baeldung.config;
+package com.baeldung.themes.config;
 
 import org.springframework.security.web.context.AbstractSecurityWebApplicationInitializer;
 

spring-mvc-views/src/main/java/com/baeldung/themes/config/SecurityConfig.java

@@ -1,4 +1,4 @@
-package com.baeldung.config;
+package com.baeldung.themes.config;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;

spring-mvc-views/src/main/java/com/baeldung/themes/config/ThemeMVCConfig.java

@@ -1,6 +1,6 @@
-package com.baeldung.config;
+package com.baeldung.themes.config;
 
-import com.baeldung.theme.resolver.UserPreferenceThemeResolver;
+import com.baeldung.themes.resolver.UserPreferenceThemeResolver;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;

spring-mvc-views/src/main/java/com/baeldung/themes/config/WebInitializer.java

@@ -1,4 +1,4 @@
-package com.baeldung.config;
+package com.baeldung.themes.config;
 
 import org.springframework.web.WebApplicationInitializer;
 import org.springframework.web.context.ContextLoaderListener;

spring-mvc-views/src/main/java/com/baeldung/themes/controllers/AppController.java

@@ -1,4 +1,4 @@
-package com.baeldung.controllers;
+package com.baeldung.themes.controllers;
 
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;

spring-mvc-views/src/main/java/com/baeldung/themes/domain/UserPreference.java

@@ -1,4 +1,4 @@
-package com.baeldung.domain;
+package com.baeldung.themes.domain;
 
 import javax.persistence.Entity;
 import javax.persistence.Id;

spring-mvc-views/src/main/java/com/baeldung/themes/repository/UserPreferenceRepository.java

@@ -1,6 +1,6 @@
-package com.baeldung.repository;
+package com.baeldung.themes.repository;
 
-import com.baeldung.domain.UserPreference;
+import com.baeldung.themes.domain.UserPreference;
 import org.springframework.data.repository.PagingAndSortingRepository;
 
 public interface UserPreferenceRepository extends PagingAndSortingRepository<UserPreference, String> {