Merge pull request #35 from eugenp/master

update

core-java-modules/core-java-arrays-3/README.md

@@ -0,0 +1,5 @@
+## Core Java Arrays (Part 3)
+
+This module contains articles about Java arrays
+
+## Relevant Articles

core-java-modules/core-java-arrays-3/pom.xml

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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-arrays-3</artifactId>
+	<version>0.1.0-SNAPSHOT</version>
+	<name>core-java-arrays-3</name>
+	<packaging>jar</packaging>
+
+	<parent>
+		<groupId>com.baeldung</groupId>
+		<artifactId>parent-java</artifactId>
+		<version>0.0.1-SNAPSHOT</version>
+		<relativePath>../../parent-java</relativePath>
+	</parent>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.assertj</groupId>
+			<artifactId>assertj-core</artifactId>
+			<version>${assertj.version}</version>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
+
+	<properties>
+		<assertj.version>3.14.0</assertj.version>
+	</properties>
+
+</project>

core-java-modules/core-java-arrays-3/src/test/java/com/baeldung/arrays/deepequals/ArraysDeepEqualsUnitTest.java

@@ -0,0 +1,96 @@
+package com.baeldung.arrays.deepequals;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import java.util.Arrays;
+import java.util.Objects;
+import org.junit.jupiter.api.Test;
+
+public class ArraysDeepEqualsUnitTest {
+
+    class Person {
+        private int id;
+        private String name;
+        private int age;
+
+        Person(int id, String name, int age) {
+            this.id = id;
+            this.name = name;
+            this.age = age;
+        }
+
+        @Override
+        public boolean equals(Object obj) {
+            if (this == obj) {
+                return true;
+            }
+            if (obj == null) {
+                return false;
+            }
+            if (!(obj instanceof Person))
+                return false;
+            Person person = (Person) obj;
+            return id == person.id && name.equals(person.name) && age == person.age;
+        }
+
+        @Override
+        public int hashCode() {
+            return Objects.hash(id, name, age);
+        }
+    }
+
+    @Test
+    void givenTwoUnidimensionalObjectTypeArrays_whenUsingEqualsAndDeepEquals_thenBothShouldReturnTrue() {
+        Object[] anArray = new Object[] { "string1", "string2", "string3" };
+        Object[] anotherArray = new Object[] { "string1", "string2", "string3" };
+
+        assertTrue(Arrays.equals(anArray, anotherArray));
+        assertTrue(Arrays.deepEquals(anArray, anotherArray));
+    }
+
+    @Test
+    void givenTwoUnidimensionalObjectTypeArraysWithNullElements_whenUsingEqualsAndDeepEquals_thenBothShouldReturnTrue() {
+        Object[] anArray = new Object[] { "string1", null, "string3" };
+        Object[] anotherArray = new Object[] { "string1", null, "string3" };
+
+        assertTrue(Arrays.equals(anArray, anotherArray));
+        assertTrue(Arrays.deepEquals(anArray, anotherArray));
+    }
+
+    @Test
+    void givenTwoUnidimensionalObjectTypeArraysWithNestedElements_whenUsingEqualsAndDeepEquals_thenShouldReturnDifferently() {
+        Object[] anArray = new Object[] { "string1", null, new String[] { "nestedString1", "nestedString2" } };
+        Object[] anotherArray = new Object[] { "string1", null, new String[] { "nestedString1", "nestedString2" } };
+
+        assertFalse(Arrays.equals(anArray, anotherArray));
+        assertTrue(Arrays.deepEquals(anArray, anotherArray));
+    }
+
+    @Test
+    void givenTwoMultidimensionalPrimitiveTypeArrays_whenUsingEqualsAndDeepEquals_thenBothShouldReturnDifferently() {
+        int[][] anArray = { { 1, 2, 3 }, { 4, 5, 6, 9 }, { 7 } };
+        int[][] anotherArray = { { 1, 2, 3 }, { 4, 5, 6, 9 }, { 7 } };
+
+        assertFalse(Arrays.equals(anArray, anotherArray));
+        assertTrue(Arrays.deepEquals(anArray, anotherArray));
+    }
+
+    @Test
+    void givenTwoMultidimensionalObjectTypeArrays_whenUsingEqualsAndDeepEquals_thenBothShouldReturnDifferently() {
+        Person personArray1[][] = { { new Person(1, "John", 22), new Person(2, "Mike", 23) }, { new Person(3, "Steve", 27), new Person(4, "Gary", 28) } };
+        Person personArray2[][] = { { new Person(1, "John", 22), new Person(2, "Mike", 23) }, { new Person(3, "Steve", 27), new Person(4, "Gary", 28) } };
+
+        assertFalse(Arrays.equals(personArray1, personArray2));
+        assertTrue(Arrays.deepEquals(personArray1, personArray2));
+    }
+
+    @Test
+    void givenTwoMultidimensionalObjectTypeArrays_whenUsingDeepEqualsFromObjectsAndArraysClasses_thenBothShouldReturnTrue() {
+        Person personArray1[][] = { { new Person(1, "John", 22), new Person(2, "Mike", 23) }, { new Person(3, "Steve", 27), new Person(4, "Gary", 28) } };
+        Person personArray2[][] = { { new Person(1, "John", 22), new Person(2, "Mike", 23) }, { new Person(3, "Steve", 27), new Person(4, "Gary", 28) } };
+
+        assertTrue(Objects.deepEquals(personArray1, personArray2));
+        assertTrue(Arrays.deepEquals(personArray1, personArray2));
+    }
+}

core-java-modules/core-java-arrays/src/main/java/com/baeldung/array/Find2ndLargestInArray.java

@@ -1,20 +0,0 @@
-package com.baeldung.array;
-
-public class Find2ndLargestInArray {
-
-    public static int find2ndLargestElement(int[] array) {
-        int maxElement = array[0];
-        int secondLargestElement = -1;
-
-        for (int index = 0; index < array.length; index++) {
-            if (maxElement <= array[index]) {
-                secondLargestElement = maxElement;
-                maxElement = array[index];
-            } else if (secondLargestElement < array[index]) {
-                secondLargestElement = array[index];
-            }
-        }
-        return secondLargestElement;
-    }
-
-}

core-java-modules/core-java-arrays/src/main/java/com/baeldung/array/FindElementInArray.java

@@ -1,22 +0,0 @@
-package com.baeldung.array;
-
-import java.util.Arrays;
-
-public class FindElementInArray {
-
-    public static boolean findGivenElementInArrayWithoutUsingStream(int[] array, int element) {
-        boolean actualResult = false;
-
-        for (int index = 0; index < array.length; index++) {
-            if (element == array[index]) {
-                actualResult = true;
-                break;
-            }
-        }
-        return actualResult;
-    }
-
-    public static boolean findGivenElementInArrayUsingStream(int[] array, int element) {
-        return Arrays.stream(array).filter(x -> element == x).findFirst().isPresent();
-    }
-}

core-java-modules/core-java-arrays/src/test/java/com/baeldung/array/Find2ndLargestInArrayUnitTest.java

@@ -1,16 +0,0 @@
-package com.baeldung.array;
-
-import org.junit.Assert;
-import org.junit.Test;
-
-public class Find2ndLargestInArrayUnitTest {
-    @Test
-    public void givenAnIntArray_thenFind2ndLargestElement() {
-        int[] array = { 1, 3, 24, 16, 87, 20 };
-        int expected2ndLargest = 24;
-
-        int actualSecondLargestElement = Find2ndLargestInArray.find2ndLargestElement(array);
-
-        Assert.assertEquals(expected2ndLargest, actualSecondLargestElement);
-    }
-}

core-java-modules/core-java-arrays/src/test/java/com/baeldung/array/FindElementInArrayUnitTest.java

@@ -1,35 +0,0 @@
-package com.baeldung.array;
-
-import org.junit.Assert;
-import org.junit.Test;
-
-public class FindElementInArrayUnitTest {
-    @Test
-    public void givenAnIntArray_whenNotUsingStream_thenFindAnElement() {
-        int[] array = { 1, 3, 4, 8, 19, 20 };
-        int element = 19;
-        boolean expectedResult = true;
-        boolean actualResult = FindElementInArray.findGivenElementInArrayWithoutUsingStream(array, element);
-        Assert.assertEquals(expectedResult, actualResult);
-
-        element = 78;
-        expectedResult = false;
-        actualResult = FindElementInArray.findGivenElementInArrayWithoutUsingStream(array, element);
-        Assert.assertEquals(expectedResult, actualResult);
-    }
-
-    @Test
-    public void givenAnIntArray_whenUsingStream_thenFindAnElement() {
-        int[] array = { 15, 16, 12, 18 };
-        int element = 16;
-        boolean expectedResult = true;
-        boolean actualResult = FindElementInArray.findGivenElementInArrayUsingStream(array, element);
-        Assert.assertEquals(expectedResult, actualResult);
-
-        element = 20;
-        expectedResult = false;
-        actualResult = FindElementInArray.findGivenElementInArrayUsingStream(array, element);
-        Assert.assertEquals(expectedResult, actualResult);
-    }
-
-}

core-java-modules/core-java-io/README.md

@@ -3,7 +3,7 @@
 This module contains articles about core Java input and output (IO)
 
 ### Relevant Articles: 
-- [How to Read a File in Java](https://www.baeldung.com/reading-file-in-java)
+- [Java – Read from File](https://www.baeldung.com/java-read-file)
 - [Read a File into an ArrayList](https://www.baeldung.com/java-file-to-arraylist)
 - [Java – Directory Size](https://www.baeldung.com/java-folder-size)
 - [File Size in Java](https://www.baeldung.com/java-file-size)

core-java-modules/core-java-io/src/test/java/com/baeldung/readfile/FileOperationsManualTest.java

@@ -1,134 +0,0 @@
-package com.baeldung.readfile;
-
-import org.apache.commons.io.FileUtils;
-import org.apache.commons.io.IOUtils;
-import org.hamcrest.CoreMatchers;
-import org.hamcrest.Matchers;
-import org.junit.Test;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.net.URLConnection;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
-
-public class FileOperationsManualTest {
-
-    @Test
-    public void givenFileName_whenUsingClassloader_thenFileData() throws IOException {
-        String expectedData = "Hello World from fileTest.txt!!!";
-
-        ClassLoader classLoader = getClass().getClassLoader();
-        File file = new File(classLoader.getResource("fileTest.txt").getFile());
-        InputStream inputStream = new FileInputStream(file);
-        String data = readFromInputStream(inputStream);
-
-        assertEquals(expectedData, data.trim());
-    }
-
-    @Test
-    public void givenFileNameAsAbsolutePath_whenUsingClasspath_thenFileData() throws IOException {
-        String expectedData = "Hello World from fileTest.txt!!!";
-
-        Class clazz = FileOperationsManualTest.class;
-        InputStream inputStream = clazz.getResourceAsStream("/fileTest.txt");
-        String data = readFromInputStream(inputStream);
-
-        assertEquals(expectedData, data.trim());
-    }
-
-    @Test
-    public void givenFileName_whenUsingJarFile_thenFileData() throws IOException {
-        String expectedData = "MIT License";
-
-        Class clazz = Matchers.class;
-        InputStream inputStream = clazz.getResourceAsStream("/LICENSE.txt");
-        String data = readFromInputStream(inputStream);
-
-        assertThat(data.trim(), CoreMatchers.containsString(expectedData));
-    }
-
-    @Test
-    public void givenURLName_whenUsingURL_thenFileData() throws IOException {
-        String expectedData = "Example Domain";
-
-        URL urlObject = new URL("http://www.example.com/");
-
-        URLConnection urlConnection = urlObject.openConnection();
-
-        InputStream inputStream = urlConnection.getInputStream();
-        String data = readFromInputStream(inputStream);
-
-        assertThat(data.trim(), CoreMatchers.containsString(expectedData));
-    }
-
-    @Test
-    public void givenFileName_whenUsingFileUtils_thenFileData() throws IOException {
-        String expectedData = "Hello World from fileTest.txt!!!";
-
-        ClassLoader classLoader = getClass().getClassLoader();
-        File file = new File(classLoader.getResource("fileTest.txt").getFile());
-        String data = FileUtils.readFileToString(file, "UTF-8");
-
-        assertEquals(expectedData, data.trim());
-    }
-
-    @Test
-    public void givenFilePath_whenUsingFilesReadAllBytes_thenFileData() throws IOException, URISyntaxException {
-        String expectedData = "Hello World from fileTest.txt!!!";
-
-        Path path = Paths.get(getClass().getClassLoader().getResource("fileTest.txt").toURI());
-
-        byte[] fileBytes = Files.readAllBytes(path);
-        String data = new String(fileBytes);
-
-        assertEquals(expectedData, data.trim());
-    }
-
-    @Test
-    public void givenFilePath_whenUsingFilesLines_thenFileData() throws IOException, URISyntaxException {
-        String expectedData = "Hello World from fileTest.txt!!!";
-
-        Path path = Paths.get(getClass().getClassLoader().getResource("fileTest.txt").toURI());
-
-        Stream<String> lines = Files.lines(path);
-        String data = lines.collect(Collectors.joining("\n"));
-        lines.close();
-
-        assertEquals(expectedData, data.trim());
-    }
-
-    private String readFromInputStream(InputStream inputStream) throws IOException {
-        StringBuilder resultStringBuilder = new StringBuilder();
-        try (BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(inputStream))) {
-            String line;
-            while ((line = bufferedReader.readLine()) != null) {
-                resultStringBuilder.append(line).append("\n");
-            }
-        }
-
-        return resultStringBuilder.toString();
-    }
-    
-    @Test
-    public void givenFileName_whenUsingIOUtils_thenFileData() throws IOException {
-        String expectedData = "This is a content of the file";
-
-        FileInputStream fis = new FileInputStream("src/test/resources/fileToRead.txt");
-        String data = IOUtils.toString(fis, "UTF-8");
-        
-        assertEquals(expectedData, data.trim());
-    }
-}

core-java-modules/core-java-io/src/test/java/com/baeldung/readfile/JavaReadFromFileUnitTest.java

@@ -1,11 +1,15 @@
 package com.baeldung.readfile;
 
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.IOUtils;
+import org.hamcrest.CoreMatchers;
+import org.hamcrest.Matchers;
 import org.junit.Test;
-import org.junit.Ignore;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import java.io.*;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.net.URLConnection;
 import java.nio.ByteBuffer;
 import java.nio.channels.FileChannel;
 import java.nio.charset.Charset;
@@ -13,55 +17,148 @@ import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.Scanner;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
 public class JavaReadFromFileUnitTest {
 
-    private static final Logger LOG = LoggerFactory.getLogger(JavaReadFromFileUnitTest.class);
-
     @Test
     public void whenReadWithBufferedReader_thenCorrect() throws IOException {
-        final String expected_value = "Hello world";
+        final String expected_value = "Hello, world!";
 
-        final BufferedReader reader = new BufferedReader(new FileReader("src/test/resources/test_read.in"));
+        final BufferedReader reader = new BufferedReader(new FileReader("src/test/resources/fileTest.txt"));
         final String currentLine = reader.readLine();
         reader.close();
 
         assertEquals(expected_value, currentLine);
     }
 
+    @Test
+    public void givenFileName_whenUsingClassloader_thenFileData() throws IOException {
+        String expectedData = "Hello, world!";
+
+        ClassLoader classLoader = getClass().getClassLoader();
+        File file = new File(classLoader.getResource("fileTest.txt").getFile());
+        InputStream inputStream = new FileInputStream(file);
+        String data = readFromInputStream(inputStream);
+
+        assertEquals(expectedData, data.trim());
+    }
+
+    @Test
+    public void givenFileNameAsAbsolutePath_whenUsingClasspath_thenFileData() throws IOException {
+        String expectedData = "Hello, world!";
+
+        Class clazz = JavaReadFromFileUnitTest.class;
+        InputStream inputStream = clazz.getResourceAsStream("/fileTest.txt");
+        String data = readFromInputStream(inputStream);
+
+        assertEquals(expectedData, data.trim());
+    }
+
+    @Test
+    public void givenFileName_whenUsingJarFile_thenFileData() throws IOException {
+        String expectedData = "BSD License";
+
+        Class clazz = Matchers.class;
+        InputStream inputStream = clazz.getResourceAsStream("/LICENSE.txt");
+        String data = readFromInputStream(inputStream);
+
+        assertThat(data.trim(), CoreMatchers.containsString(expectedData));
+    }
+
+    @Test
+    public void givenURLName_whenUsingURL_thenFileData() throws IOException {
+        String expectedData = "Example Domain";
+
+        URL urlObject = new URL("http://www.example.com/");
+
+        URLConnection urlConnection = urlObject.openConnection();
+
+        InputStream inputStream = urlConnection.getInputStream();
+        String data = readFromInputStream(inputStream);
+
+        assertThat(data.trim(), CoreMatchers.containsString(expectedData));
+    }
+
+    @Test
+    public void givenFileName_whenUsingFileUtils_thenFileData() throws IOException {
+        String expectedData = "Hello, world!";
+
+        ClassLoader classLoader = getClass().getClassLoader();
+        File file = new File(classLoader.getResource("fileTest.txt").getFile());
+        String data = FileUtils.readFileToString(file, "UTF-8");
+
+        assertEquals(expectedData, data.trim());
+    }
+
+    @Test
+    public void givenFilePath_whenUsingFilesReadAllBytes_thenFileData() throws IOException, URISyntaxException {
+        String expectedData = "Hello, world!";
+
+        Path path = Paths.get(getClass().getClassLoader().getResource("fileTest.txt").toURI());
+
+        byte[] fileBytes = Files.readAllBytes(path);
+        String data = new String(fileBytes);
+
+        assertEquals(expectedData, data.trim());
+    }
+
+    @Test
+    public void givenFilePath_whenUsingFilesLines_thenFileData() throws IOException, URISyntaxException {
+        String expectedData = "Hello, world!";
+
+        Path path = Paths.get(getClass().getClassLoader().getResource("fileTest.txt").toURI());
+
+        Stream<String> lines = Files.lines(path);
+        String data = lines.collect(Collectors.joining("\n"));
+        lines.close();
+
+        assertEquals(expectedData, data.trim());
+    }
+
+    @Test
+    public void givenFileName_whenUsingIOUtils_thenFileData() throws IOException {
+        String expectedData = "Hello, world!";
+
+        FileInputStream fis = new FileInputStream("src/test/resources/fileTest.txt");
+        String data = IOUtils.toString(fis, "UTF-8");
+
+        assertEquals(expectedData, data.trim());
+    }
+
     @Test
     public void whenReadWithScanner_thenCorrect() throws IOException {
-        final Scanner scanner = new Scanner(new File("src/test/resources/test_read1.in"));
+        final Scanner scanner = new Scanner(new File("src/test/resources/fileTest.txt"));
         scanner.useDelimiter(" ");
 
         assertTrue(scanner.hasNext());
-        assertEquals("Hello", scanner.next());
+        assertEquals("Hello,", scanner.next());
-        assertEquals("world", scanner.next());
+        assertEquals("world!", scanner.next());
-        assertEquals(1, scanner.nextInt());
 
         scanner.close();
-
     }
 
     @Test
     public void whenReadWithScannerTwoDelimiters_thenCorrect() throws IOException {
-        final Scanner scanner = new Scanner(new File("src/test/resources/test_read2.in"));
+        final Scanner scanner = new Scanner(new File("src/test/resources/fileTest.txt"));
-        scanner.useDelimiter(",| ");
+        scanner.useDelimiter("\\s|,");
 
-        assertTrue(scanner.hasNextInt());
+        assertTrue(scanner.hasNext());
-        assertEquals(2, scanner.nextInt());
+        assertEquals("Hello", scanner.next());
-        assertEquals(3, scanner.nextInt());
+        assertEquals("", scanner.next());
-        assertEquals(4, scanner.nextInt());
+        assertEquals("world!", scanner.next());
 
         scanner.close();
     }
 
     @Test
     public void whenReadWithStreamTokenizer_thenCorrectTokens() throws IOException {
-        final FileReader reader = new FileReader("src/test/resources/test_read3.in");
+        final FileReader reader = new FileReader("src/test/resources/fileTestTokenizer.txt");
         final StreamTokenizer tokenizer = new StreamTokenizer(reader);
 
         tokenizer.nextToken();
@@ -78,49 +175,36 @@ public class JavaReadFromFileUnitTest {
 
     @Test
     public void whenReadWithDataInputStream_thenCorrect() throws IOException {
-        final String expected_value = "Hello";
+        String expectedValue = "Hello, world!";
+        String file ="src/test/resources/fileTest.txt";
 
-        String result;
+        String result = null;
-        final DataInputStream reader = new DataInputStream(new FileInputStream("src/test/resources/test_read4.in"));
-        result = reader.readUTF();
-        reader.close();
 
-        assertEquals(expected_value, result);
+        DataInputStream reader = new DataInputStream(new FileInputStream(file));
+        int nBytesToRead = reader.available();
+        if(nBytesToRead > 0) {
+            byte[] bytes = new byte[nBytesToRead];
+            reader.read(bytes);
+            result = new String(bytes);
         }
 
-    public void whenReadTwoFilesWithSequenceInputStream_thenCorrect() throws IOException {
+        assertEquals(expectedValue, result);
-        final int expected_value1 = 2000;
-        final int expected_value2 = 5000;
-
-        final FileInputStream stream1 = new FileInputStream("src/test/resources/test_read5.in");
-        final FileInputStream stream2 = new FileInputStream("src/test/resources/test_read6.in");
-
-        final SequenceInputStream sequence = new SequenceInputStream(stream1, stream2);
-        final DataInputStream reader = new DataInputStream(sequence);
-
-        assertEquals(expected_value1, reader.readInt());
-        assertEquals(expected_value2, reader.readInt());
-
-        reader.close();
-        stream2.close();
     }
 
     @Test
-    @Ignore // TODO
     public void whenReadUTFEncodedFile_thenCorrect() throws IOException {
         final String expected_value = "青空";
-        final BufferedReader reader = new BufferedReader(new InputStreamReader(new FileInputStream("src/test/resources/test_read7.in"), "UTF-8"));
+        final BufferedReader reader = new BufferedReader(new InputStreamReader(new FileInputStream("src/test/resources/fileTestUtf8.txt"), "UTF-8"));
         final String currentLine = reader.readLine();
         reader.close();
-        LOG.debug(currentLine);
 
         assertEquals(expected_value, currentLine);
     }
 
     @Test
     public void whenReadFileContentsIntoString_thenCorrect() throws IOException {
-        final String expected_value = "Hello world \n Test line \n";
+        final String expected_value = "Hello, world!\n";
-        final BufferedReader reader = new BufferedReader(new FileReader("src/test/resources/test_read8.in"));
+        final BufferedReader reader = new BufferedReader(new FileReader("src/test/resources/fileTest.txt"));
         final StringBuilder builder = new StringBuilder();
         String currentLine = reader.readLine();
         while (currentLine != null) {
@@ -136,8 +220,8 @@ public class JavaReadFromFileUnitTest {
 
     @Test
     public void whenReadWithFileChannel_thenCorrect() throws IOException {
-        final String expected_value = "Hello world";
+        final String expected_value = "Hello, world!";
-        final RandomAccessFile reader = new RandomAccessFile("src/test/resources/test_read.in", "r");
+        final RandomAccessFile reader = new RandomAccessFile("src/test/resources/fileTest.txt", "r");
         final FileChannel channel = reader.getChannel();
 
         int bufferSize = 1024;
@@ -154,8 +238,8 @@ public class JavaReadFromFileUnitTest {
 
     @Test
     public void whenReadSmallFileJava7_thenCorrect() throws IOException {
-        final String expected_value = "Hello world";
+        final String expected_value = "Hello, world!";
-        final Path path = Paths.get("src/test/resources/test_read.in");
+        final Path path = Paths.get("src/test/resources/fileTest.txt");
 
         final String read = Files.readAllLines(path, Charset.defaultCharset()).get(0);
         assertEquals(expected_value, read);
@@ -163,12 +247,24 @@ public class JavaReadFromFileUnitTest {
 
     @Test
     public void whenReadLargeFileJava7_thenCorrect() throws IOException {
-        final String expected_value = "Hello world";
+        final String expected_value = "Hello, world!";
 
-        final Path path = Paths.get("src/test/resources/test_read.in");
+        final Path path = Paths.get("src/test/resources/fileTest.txt");
         final BufferedReader reader = Files.newBufferedReader(path, Charset.defaultCharset());
         final String line = reader.readLine();
         assertEquals(expected_value, line);
     }
 
+    private String readFromInputStream(InputStream inputStream) throws IOException {
+        StringBuilder resultStringBuilder = new StringBuilder();
+        try (BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(inputStream))) {
+            String line;
+            while ((line = bufferedReader.readLine()) != null) {
+                resultStringBuilder.append(line).append("\n");
+            }
+        }
+
+        return resultStringBuilder.toString();
+    }
+
 }

core-java-modules/core-java-io/src/test/resources/fileTest.txt

@@ -1 +1 @@
-Hello World from fileTest.txt!!!
+Hello, world!

core-java-modules/core-java-io/src/test/resources/test_read1.in

@@ -1 +0,0 @@
-Hello world 1

core-java-modules/core-java-io/src/test/resources/test_read2.in

@@ -1 +0,0 @@
-2,3 4

core-java-modules/core-java-io/src/test/resources/test_read8.in

@@ -1,2 +0,0 @@
-Hello world 
- Test line 

core-java-modules/pom.xml

@@ -31,6 +31,7 @@
         <module>core-java-annotations</module>
         <module>core-java-arrays</module>
         <module>core-java-arrays-2</module>
+        <module>core-java-arrays-3</module>
 
         <module>core-java-collections</module>
         <module>core-java-collections-2</module>

ddd/pom.xml

@@ -20,6 +20,10 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-mongodb</artifactId>
         </dependency>
+        <dependency>
+        	<groupId>org.springframework.boot</groupId>
+        	<artifactId>spring-boot-starter-data-cassandra</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-api</artifactId>

ddd/src/main/java/com/baeldung/dddhexagonalspring/DomainLayerApplication.java

@@ -1,13 +1,37 @@
 package com.baeldung.dddhexagonalspring;
 
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.CommandLineRunner;
 import org.springframework.boot.SpringApplication;
+import org.springframework.boot.WebApplicationType;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.PropertySource;
 
+import com.baeldung.dddhexagonalspring.application.cli.CliOrderController;
+
 @SpringBootApplication
 @PropertySource(value = { "classpath:ddd-layers.properties" })
-public class DomainLayerApplication {
+public class DomainLayerApplication implements CommandLineRunner {
+
     public static void main(final String[] args) {
-        SpringApplication.run(DomainLayerApplication.class, args);
+        SpringApplication application = new SpringApplication(DomainLayerApplication.class);
+        // uncomment to run just the console application
+        // application.setWebApplicationType(WebApplicationType.NONE);
+        application.run(args);
+    }
+
+    @Autowired
+    public CliOrderController orderController;
+
+    @Autowired
+    public ConfigurableApplicationContext context;
+
+    @Override
+    public void run(String... args) throws Exception {
+        orderController.createCompleteOrder();
+        orderController.createIncompleteOrder();
+        // uncomment to stop the context when execution is done
+        // context.close();
     }
 }

ddd/src/main/java/com/baeldung/dddhexagonalspring/application/cli/CliOrderController.java

@@ -0,0 +1,47 @@
+package com.baeldung.dddhexagonalspring.application.cli;
+
+import java.math.BigDecimal;
+import java.util.UUID;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import com.baeldung.dddhexagonalspring.domain.Product;
+import com.baeldung.dddhexagonalspring.domain.service.OrderService;
+
+@Component
+public class CliOrderController {
+
+    private static final Logger LOG = LoggerFactory.getLogger(CliOrderController.class);
+
+    private final OrderService orderService;
+
+    @Autowired
+    public CliOrderController(OrderService orderService) {
+        this.orderService = orderService;
+    }
+
+    public void createCompleteOrder() {
+        LOG.info("<<Create complete order>>");
+        UUID orderId = createOrder();
+        orderService.completeOrder(orderId);
+    }
+
+    public void createIncompleteOrder() {
+        LOG.info("<<Create incomplete order>>");
+        UUID orderId = createOrder();
+    }
+
+    private UUID createOrder() {
+        LOG.info("Placing a new order with two products");
+        Product mobilePhone = new Product(UUID.randomUUID(), BigDecimal.valueOf(200), "mobile");
+        Product razor = new Product(UUID.randomUUID(), BigDecimal.valueOf(50), "razor");
+        LOG.info("Creating order with mobile phone");
+        UUID orderId = orderService.createOrder(mobilePhone);
+        LOG.info("Adding a razor to the order");
+        orderService.addProduct(orderId, razor);
+        return orderId;
+    }
+}

ddd/src/main/java/com/baeldung/dddhexagonalspring/application/rest/OrderController.java

@@ -1,4 +1,4 @@
-package com.baeldung.dddhexagonalspring.application.controller;
+package com.baeldung.dddhexagonalspring.application.rest;
 
 import com.baeldung.dddhexagonalspring.application.request.AddProductRequest;
 import com.baeldung.dddhexagonalspring.application.request.CreateOrderRequest;

ddd/src/main/java/com/baeldung/dddhexagonalspring/domain/Order.java

@@ -4,6 +4,7 @@ import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.Objects;
 import java.util.UUID;
 
 public class Order {
@@ -40,10 +41,8 @@ public class Order {
     }
 
     private OrderItem getOrderItem(final UUID id) {
-        return orderItems
+        return orderItems.stream()
-          .stream()
+            .filter(orderItem -> orderItem.getProductId()
-          .filter(orderItem -> orderItem
-            .getProductId()
                 .equals(id))
             .findFirst()
             .orElseThrow(() -> new DomainException("Product with " + id + " doesn't exist."));
@@ -77,6 +76,21 @@ public class Order {
         return Collections.unmodifiableList(orderItems);
     }
 
+    @Override
+    public int hashCode() {
+        return Objects.hash(id, orderItems, price, status);
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (!(obj instanceof Order))
+            return false;
+        Order other = (Order) obj;
+        return Objects.equals(id, other.id) && Objects.equals(orderItems, other.orderItems) && Objects.equals(price, other.price) && status == other.status;
+    }
+
     private Order() {
     }
 }

ddd/src/main/java/com/baeldung/dddhexagonalspring/infrastracture/configuration/CassandraConfiguration.java

@@ -0,0 +1,10 @@
+package com.baeldung.dddhexagonalspring.infrastracture.configuration;
+
+import org.springframework.data.cassandra.repository.config.EnableCassandraRepositories;
+
+import com.baeldung.dddhexagonalspring.infrastracture.repository.cassandra.SpringDataCassandraOrderRepository;
+
+@EnableCassandraRepositories(basePackageClasses = SpringDataCassandraOrderRepository.class)
+public class CassandraConfiguration {
+
+}

ddd/src/main/java/com/baeldung/dddhexagonalspring/infrastracture/configuration/MongoDBConfiguration.java

@@ -1,8 +1,9 @@
 package com.baeldung.dddhexagonalspring.infrastracture.configuration;
 
-import com.baeldung.dddhexagonalspring.infrastracture.repository.SpringDataOrderRepository;
 import org.springframework.data.mongodb.repository.config.EnableMongoRepositories;
 
-@EnableMongoRepositories(basePackageClasses = SpringDataOrderRepository.class)
+import com.baeldung.dddhexagonalspring.infrastracture.repository.mongo.SpringDataMongoOrderRepository;
+
+@EnableMongoRepositories(basePackageClasses = SpringDataMongoOrderRepository.class)
 public class MongoDBConfiguration {
 }

ddd/src/main/java/com/baeldung/dddhexagonalspring/infrastracture/repository/cassandra/CassandraDbOrderRepository.java

@@ -0,0 +1,38 @@
+package com.baeldung.dddhexagonalspring.infrastracture.repository.cassandra;
+
+import java.util.Optional;
+import java.util.UUID;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import com.baeldung.dddhexagonalspring.domain.Order;
+import com.baeldung.dddhexagonalspring.domain.repository.OrderRepository;
+
+@Component
+public class CassandraDbOrderRepository implements OrderRepository {
+
+    private final SpringDataCassandraOrderRepository orderRepository;
+
+    @Autowired
+    public CassandraDbOrderRepository(SpringDataCassandraOrderRepository orderRepository) {
+        this.orderRepository = orderRepository;
+    }
+
+    @Override
+    public Optional<Order> findById(UUID id) {
+        Optional<OrderEntity> orderEntity = orderRepository.findById(id);
+        if (orderEntity.isPresent()) {
+            return Optional.of(orderEntity.get()
+                .toOrder());
+        } else {
+            return Optional.empty();
+        }
+    }
+
+    @Override
+    public void save(Order order) {
+        orderRepository.save(new OrderEntity(order));
+    }
+
+}

ddd/src/main/java/com/baeldung/dddhexagonalspring/infrastracture/repository/cassandra/OrderEntity.java

@@ -0,0 +1,75 @@
+package com.baeldung.dddhexagonalspring.infrastracture.repository.cassandra;
+
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.UUID;
+import java.util.stream.Collectors;
+
+import org.springframework.data.cassandra.core.mapping.PrimaryKey;
+
+import com.baeldung.dddhexagonalspring.domain.Order;
+import com.baeldung.dddhexagonalspring.domain.OrderItem;
+import com.baeldung.dddhexagonalspring.domain.OrderStatus;
+import com.baeldung.dddhexagonalspring.domain.Product;
+
+public class OrderEntity {
+
+    @PrimaryKey
+    private UUID id;
+    private OrderStatus status;
+    private List<OrderItemEntity> orderItemEntities;
+    private BigDecimal price;
+
+    public OrderEntity(UUID id, OrderStatus status, List<OrderItemEntity> orderItemEntities, BigDecimal price) {
+        this.id = id;
+        this.status = status;
+        this.orderItemEntities = orderItemEntities;
+        this.price = price;
+    }
+
+    public OrderEntity() {
+    }
+
+    public OrderEntity(Order order) {
+        this.id = order.getId();
+        this.price = order.getPrice();
+        this.status = order.getStatus();
+        this.orderItemEntities = order.getOrderItems()
+            .stream()
+            .map(OrderItemEntity::new)
+            .collect(Collectors.toList());
+
+    }
+
+    public Order toOrder() {
+        List<OrderItem> orderItems = orderItemEntities.stream()
+            .map(OrderItemEntity::toOrderItem)
+            .collect(Collectors.toList());
+        List<Product> namelessProducts = orderItems.stream()
+            .map(orderItem -> new Product(orderItem.getProductId(), orderItem.getPrice(), ""))
+            .collect(Collectors.toList());
+        Order order = new Order(id, namelessProducts.remove(0));
+        namelessProducts.forEach(product -> order.addOrder(product));
+        if (status == OrderStatus.COMPLETED) {
+            order.complete();
+        }
+        return order;
+    }
+
+    public UUID getId() {
+        return id;
+    }
+
+    public OrderStatus getStatus() {
+        return status;
+    }
+
+    public List<OrderItemEntity> getOrderItems() {
+        return orderItemEntities;
+    }
+
+    public BigDecimal getPrice() {
+        return price;
+    }
+
+}

ddd/src/main/java/com/baeldung/dddhexagonalspring/infrastracture/repository/cassandra/OrderItemEntity.java

@@ -0,0 +1,44 @@
+package com.baeldung.dddhexagonalspring.infrastracture.repository.cassandra;
+
+import java.math.BigDecimal;
+import java.util.UUID;
+
+import org.springframework.data.cassandra.core.mapping.UserDefinedType;
+
+import com.baeldung.dddhexagonalspring.domain.OrderItem;
+import com.baeldung.dddhexagonalspring.domain.Product;
+
+@UserDefinedType
+public class OrderItemEntity {
+
+    private UUID productId;
+    private BigDecimal price;
+
+    public OrderItemEntity() {
+    }
+
+    public OrderItemEntity(final OrderItem orderItem) {
+        this.productId = orderItem.getProductId();
+        this.price = orderItem.getPrice();
+    }
+
+    public OrderItem toOrderItem() {
+        return new OrderItem(new Product(productId, price, ""));
+    }
+
+    public UUID getProductId() {
+        return productId;
+    }
+
+    public void setProductId(UUID productId) {
+        this.productId = productId;
+    }
+
+    public BigDecimal getPrice() {
+        return price;
+    }
+
+    public void setPrice(BigDecimal price) {
+        this.price = price;
+    }
+}

ddd/src/main/java/com/baeldung/dddhexagonalspring/infrastracture/repository/cassandra/SpringDataCassandraOrderRepository.java

@@ -0,0 +1,10 @@
+package com.baeldung.dddhexagonalspring.infrastracture.repository.cassandra;
+
+import java.util.UUID;
+
+import org.springframework.data.cassandra.repository.CassandraRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface SpringDataCassandraOrderRepository extends CassandraRepository<OrderEntity, UUID> {
+}

ddd/src/main/java/com/baeldung/dddhexagonalspring/infrastracture/repository/mongo/MongoDbOrderRepository.java

@@ -1,20 +1,23 @@
-package com.baeldung.dddhexagonalspring.infrastracture.repository;
+package com.baeldung.dddhexagonalspring.infrastracture.repository.mongo;
-
-import com.baeldung.dddhexagonalspring.domain.Order;
-import com.baeldung.dddhexagonalspring.domain.repository.OrderRepository;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
 
 import java.util.Optional;
 import java.util.UUID;
 
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Primary;
+import org.springframework.stereotype.Component;
+
+import com.baeldung.dddhexagonalspring.domain.Order;
+import com.baeldung.dddhexagonalspring.domain.repository.OrderRepository;
+
 @Component
+@Primary
 public class MongoDbOrderRepository implements OrderRepository {
 
-    private final SpringDataOrderRepository orderRepository;
+    private final SpringDataMongoOrderRepository orderRepository;
 
     @Autowired
-    public MongoDbOrderRepository(final SpringDataOrderRepository orderRepository) {
+    public MongoDbOrderRepository(final SpringDataMongoOrderRepository orderRepository) {
         this.orderRepository = orderRepository;
     }
 

ddd/src/main/java/com/baeldung/dddhexagonalspring/infrastracture/repository/mongo/SpringDataMongoOrderRepository.java

@@ -1,4 +1,4 @@
-package com.baeldung.dddhexagonalspring.infrastracture.repository;
+package com.baeldung.dddhexagonalspring.infrastracture.repository.mongo;
 
 import com.baeldung.dddhexagonalspring.domain.Order;
 import org.springframework.data.mongodb.repository.MongoRepository;
@@ -7,5 +7,5 @@ import org.springframework.stereotype.Repository;
 import java.util.UUID;
 
 @Repository
-public interface SpringDataOrderRepository extends MongoRepository<Order, UUID> {
+public interface SpringDataMongoOrderRepository extends MongoRepository<Order, UUID> {
 }

ddd/src/main/resources/ddd-layers.properties

@@ -1,5 +1,12 @@
+spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration
 spring.data.mongodb.host=localhost
 spring.data.mongodb.port=27017
 spring.data.mongodb.database=order-database
 spring.data.mongodb.username=order
 spring.data.mongodb.password=order
+
+spring.data.cassandra.keyspaceName=order_database
+spring.data.cassandra.username=cassandra
+spring.data.cassandra.password=cassandra
+spring.data.cassandra.contactPoints=localhost
+spring.data.cassandra.port=9042

ddd/src/test/java/com/baeldung/dddhexagonalspring/infrastracture/repository/CassandraDbOrderRepositoryIntegrationTest.java

@@ -0,0 +1,57 @@
+package com.baeldung.dddhexagonalspring.infrastracture.repository;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.math.BigDecimal;
+import java.util.Optional;
+import java.util.UUID;
+
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.TestPropertySource;
+import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
+
+import com.baeldung.dddhexagonalspring.domain.Order;
+import com.baeldung.dddhexagonalspring.domain.Product;
+import com.baeldung.dddhexagonalspring.domain.repository.OrderRepository;
+import com.baeldung.dddhexagonalspring.infrastracture.repository.cassandra.SpringDataCassandraOrderRepository;
+
+@SpringJUnitConfig
+@SpringBootTest
+@TestPropertySource("classpath:ddd-layers-test.properties")
+class CassandraDbOrderRepositoryIntegrationTest {
+
+    @Autowired
+    private SpringDataCassandraOrderRepository cassandraOrderRepository;
+
+    @Autowired
+    private OrderRepository orderRepository;
+
+    @AfterEach
+    void cleanUp() {
+        cassandraOrderRepository.deleteAll();
+    }
+
+    @Test
+    void shouldFindById_thenReturnOrder() {
+
+        // given
+        final UUID id = UUID.randomUUID();
+        final Order order = createOrder(id);
+        order.addOrder(new Product(UUID.randomUUID(), BigDecimal.TEN, "second"));
+        order.complete();
+
+        // when
+        orderRepository.save(order);
+
+        final Optional<Order> result = orderRepository.findById(id);
+
+        assertEquals(order, result.get());
+    }
+
+    private Order createOrder(UUID id) {
+        return new Order(id, new Product(UUID.randomUUID(), BigDecimal.TEN, "product"));
+    }
+}

ddd/src/test/java/com/baeldung/dddhexagonalspring/infrastracture/repository/MongoDbOrderRepositoryIntegrationTest.java

@@ -0,0 +1,55 @@
+package com.baeldung.dddhexagonalspring.infrastracture.repository;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.math.BigDecimal;
+import java.util.Optional;
+import java.util.UUID;
+
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.TestPropertySource;
+import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
+
+import com.baeldung.dddhexagonalspring.domain.Order;
+import com.baeldung.dddhexagonalspring.domain.Product;
+import com.baeldung.dddhexagonalspring.domain.repository.OrderRepository;
+import com.baeldung.dddhexagonalspring.infrastracture.repository.mongo.SpringDataMongoOrderRepository;
+
+@SpringJUnitConfig
+@SpringBootTest
+@TestPropertySource("classpath:ddd-layers-test.properties")
+class MongoDbOrderRepositoryIntegrationTest {
+
+    @Autowired
+    private SpringDataMongoOrderRepository mongoOrderRepository;
+
+    @Autowired
+    private OrderRepository orderRepository;
+
+    @AfterEach
+    void cleanUp() {
+        mongoOrderRepository.deleteAll();
+    }
+
+    @Test
+    void shouldFindById_thenReturnOrder() {
+
+        // given
+        final UUID id = UUID.randomUUID();
+        final Order order = createOrder(id);
+
+        // when
+        orderRepository.save(order);
+
+        final Optional<Order> result = orderRepository.findById(id);
+
+        assertEquals(order, result.get());
+    }
+
+    private Order createOrder(UUID id) {
+        return new Order(id, new Product(UUID.randomUUID(), BigDecimal.TEN, "product"));
+    }
+}

ddd/src/test/java/com/baeldung/dddhexagonalspring/infrastracture/repository/MongoDbOrderRepositoryUnitTest.java

@@ -2,6 +2,9 @@ package com.baeldung.dddhexagonalspring.infrastracture.repository;
 
 import com.baeldung.dddhexagonalspring.domain.Order;
 import com.baeldung.dddhexagonalspring.domain.Product;
+import com.baeldung.dddhexagonalspring.infrastracture.repository.mongo.MongoDbOrderRepository;
+import com.baeldung.dddhexagonalspring.infrastracture.repository.mongo.SpringDataMongoOrderRepository;
+
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
@@ -14,12 +17,12 @@ import static org.mockito.Mockito.*;
 
 class MongoDbOrderRepositoryUnitTest {
 
-    private SpringDataOrderRepository springDataOrderRepository;
+    private SpringDataMongoOrderRepository springDataOrderRepository;
     private MongoDbOrderRepository tested;
 
     @BeforeEach
     void setUp() {
-        springDataOrderRepository = mock(SpringDataOrderRepository.class);
+        springDataOrderRepository = mock(SpringDataMongoOrderRepository.class);
 
         tested = new MongoDbOrderRepository(springDataOrderRepository);
     }

ddd/src/test/resources/com/baeldung/dddhexagonalspring/README.md

@@ -4,4 +4,6 @@ To run this project, follow these steps:
 
 * Run the application database by executing `docker-compose up` in this directory.
 * Launch the Spring Boot Application (DomainLayerApplication). 
-* By default, application will connect to this database (configuration in *ddd-layers.properties*)
+* By default, the application will connect to the one of the two databases (configuration in *ddd-layers.properties*)
+     * check `CassandraDbOrderRepository.java` and `MongoDbOrderRepository.java` 
+     * switch between the databases by making one of the above beans primary using the `@Primary` annotation  

ddd/src/test/resources/com/baeldung/dddhexagonalspring/cassandra-init.cql

@@ -0,0 +1,12 @@
+CREATE KEYSPACE IF NOT exists order_database
+WITH replication = {'class':'SimpleStrategy', 'replication_factor':1};
+
+CREATE TYPE IF NOT EXISTS order_database.orderitementity (productid uuid, price decimal); 
+
+CREATE TABLE IF NOT EXISTS order_database.orderentity(
+   id uuid,
+   status text,
+   orderitementities list<frozen<orderitementity>>,
+   price decimal,
+   primary key(id)
+);

ddd/src/test/resources/com/baeldung/dddhexagonalspring/docker-compose.yml

@@ -3,6 +3,7 @@ version: '3'
 services:
   order-mongo-database:
     image: mongo:3.4.13
+    container_name: order-mongo-db
     restart: always
     ports:
       - 27017:27017
@@ -12,3 +13,18 @@ services:
       MONGO_INITDB_DATABASE: order-database
     volumes:
       - ./mongo-init.js:/docker-entrypoint-initdb.d/mongo-init.js:ro
+  order-cassandra-database:
+    image: cassandra:3.11.5
+    container_name: order-cassandra-db
+    restart: always
+    ports: 
+      - 9042:9042
+  order-cassandra-init:
+    image: cassandra:3.11.5
+    container_name: order-cassandra-db-init
+    depends_on:
+      - order-cassandra-database
+    volumes:
+      - ./cassandra-init.cql:/cassandra-init.cql:ro
+    command: bin/bash -c "echo Initializing cassandra schema... && sleep 30 && cqlsh -u cassandra -p cassandra -f cassandra-init.cql order-cassandra-db" 
+      

ddd/src/test/resources/ddd-layers-test.properties

@@ -0,0 +1,12 @@
+spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.mongo.embedded.EmbeddedMongoAutoConfiguration,org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration 
+spring.data.mongodb.host=127.0.0.1
+spring.data.mongodb.port=27017
+spring.data.mongodb.database=order-database
+spring.data.mongodb.username=order
+spring.data.mongodb.password=order
+
+spring.data.cassandra.keyspaceName=order_database
+spring.data.cassandra.username=cassandra
+spring.data.cassandra.password=cassandra
+spring.data.cassandra.contactPoints=127.0.0.1
+spring.data.cassandra.port=9042

persistence-modules/spring-data-couchbase-2/README.md

@@ -1,9 +1,9 @@
 ## Spring Data Couchbase Tutorial Project
 
 ### Relevant Articles:
-- [Intro to Spring Data Couchbase](http://www.baeldung.com/spring-data-couchbase)
+- [Intro to Spring Data Couchbase](https://www.baeldung.com/spring-data-couchbase)
-- [Entity Validation, Optimistic Locking, and Query Consistency in Spring Data Couchbase](http://www.baeldung.com/entity-validation-locking-and-query-consistency-in-spring-data-couchbase)
+- [Entity Validation, Optimistic Locking, and Query Consistency in Spring Data Couchbase](https://www.baeldung.com/entity-validation-locking-and-query-consistency-in-spring-data-couchbase)
-- [Multiple Buckets and Spatial View Queries in Spring Data Couchbase](http://www.baeldung.com/spring-data-couchbase-buckets-and-spatial-view-queries)
+- [Multiple Buckets and Spatial View Queries in Spring Data Couchbase](https://www.baeldung.com/spring-data-couchbase-buckets-and-spatial-view-queries)
 
 ### Overview
 This Maven project contains the Java code for Spring Data Couchbase
@@ -25,14 +25,14 @@ mvn clean install
 
 ### Package Organization
 Java classes for the first two tutorials listed above are in src/main/java in the package hierarchy
-org.baeldung.spring.data.couchbase
+com.baeldung.spring.data.couchbase
 
 Java classes for the multiple-bucket tutorials are in src/main/java in the package hierarchy
-org.baeldung.spring.data.couchbase2b
+com.baeldung.spring.data.couchbase2b
 
 ### Running the tests
 The test classes for the single-bucket tutorials are in src/test/java in the package
-org.baeldung.spring.data.couchbase.service:
+com.baeldung.spring.data.couchbase.service:
 - PersonServiceTest (abstract)
 - PersonRepositoryTest (concrete)
 - PersonTemplateServiceTest (concrete)
@@ -41,7 +41,7 @@ org.baeldung.spring.data.couchbase.service:
 - StudentTemplateServiceTest (concrete)
 
 The concrete test classes for the multiple-bucket tutorial are in src/test/java in the package
-org.baeldung.spring.data.couchbase2b.service:
+com.baeldung.spring.data.couchbase2b.service:
 - CampusRepositoryServiceImplTest
 - PersonRepositoryServiceImplTest
 - StudentRepositoryServiceImplTest

persistence-modules/spring-data-couchbase-2/pom.xml

@@ -3,7 +3,7 @@
          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>
-    <groupId>org.baeldung</groupId>
+    <groupId>com.baeldung</groupId>
     <artifactId>spring-data-couchbase-2</artifactId>
     <version>0.1-SNAPSHOT</version>
     <name>spring-data-couchbase-2</name>

persistence-modules/spring-data-couchbase-2/src/main/java/com/baeldung/spring/data/couchbase/model/Campus.java

@@ -1,4 +1,4 @@
-package org.baeldung.spring.data.couchbase.model;
+package com.baeldung.spring.data.couchbase.model;
 
 import javax.validation.constraints.NotNull;
 

persistence-modules/spring-data-couchbase-2/src/main/java/com/baeldung/spring/data/couchbase/model/Person.java

@@ -1,4 +1,4 @@
-package org.baeldung.spring.data.couchbase.model;
+package com.baeldung.spring.data.couchbase.model;
 
 import javax.validation.constraints.NotNull;
 

persistence-modules/spring-data-couchbase-2/src/main/java/com/baeldung/spring/data/couchbase/model/Student.java

@@ -1,4 +1,4 @@
-package org.baeldung.spring.data.couchbase.model;
+package com.baeldung.spring.data.couchbase.model;
 
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Past;

persistence-modules/spring-data-couchbase-2/src/main/java/com/baeldung/spring/data/couchbase/repos/CustomStudentRepository.java

@@ -1,8 +1,8 @@
-package org.baeldung.spring.data.couchbase.repos;
+package com.baeldung.spring.data.couchbase.repos;
 
 import java.util.List;
 
-import org.baeldung.spring.data.couchbase.model.Student;
+import com.baeldung.spring.data.couchbase.model.Student;
 
 public interface CustomStudentRepository {
     List<Student> findByFirstNameStartsWith(String s);

persistence-modules/spring-data-couchbase-2/src/main/java/com/baeldung/spring/data/couchbase/repos/CustomStudentRepositoryImpl.java

@@ -1,8 +1,8 @@
-package org.baeldung.spring.data.couchbase.repos;
+package com.baeldung.spring.data.couchbase.repos;
 
 import java.util.List;
 
-import org.baeldung.spring.data.couchbase.model.Student;
+import com.baeldung.spring.data.couchbase.model.Student;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.couchbase.core.CouchbaseTemplate;
 

persistence-modules/spring-data-couchbase-2/src/main/java/com/baeldung/spring/data/couchbase/repos/PersonRepository.java

@@ -1,8 +1,8 @@
-package org.baeldung.spring.data.couchbase.repos;
+package com.baeldung.spring.data.couchbase.repos;
 
 import java.util.List;
 
-import org.baeldung.spring.data.couchbase.model.Person;
+import com.baeldung.spring.data.couchbase.model.Person;
 import org.springframework.data.repository.CrudRepository;
 
 public interface PersonRepository extends CrudRepository<Person, String> {

persistence-modules/spring-data-couchbase-2/src/main/java/com/baeldung/spring/data/couchbase/repos/StudentRepository.java

@@ -1,8 +1,8 @@
-package org.baeldung.spring.data.couchbase.repos;
+package com.baeldung.spring.data.couchbase.repos;
 
 import java.util.List;
 
-import org.baeldung.spring.data.couchbase.model.Student;
+import com.baeldung.spring.data.couchbase.model.Student;
 import org.springframework.data.repository.CrudRepository;
 
 public interface StudentRepository extends CrudRepository<Student, String>, CustomStudentRepository {

persistence-modules/spring-data-couchbase-2/src/main/java/com/baeldung/spring/data/couchbase/service/PersonRepositoryService.java

@@ -1,11 +1,11 @@
-package org.baeldung.spring.data.couchbase.service;
+package com.baeldung.spring.data.couchbase.service;
 
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
-import org.baeldung.spring.data.couchbase.model.Person;
+import com.baeldung.spring.data.couchbase.model.Person;
-import org.baeldung.spring.data.couchbase.repos.PersonRepository;
+import com.baeldung.spring.data.couchbase.repos.PersonRepository;
 import org.joda.time.DateTime;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;

persistence-modules/spring-data-couchbase-2/src/main/java/com/baeldung/spring/data/couchbase/service/PersonService.java

@@ -1,8 +1,8 @@
-package org.baeldung.spring.data.couchbase.service;
+package com.baeldung.spring.data.couchbase.service;
 
 import java.util.List;
 
-import org.baeldung.spring.data.couchbase.model.Person;
+import com.baeldung.spring.data.couchbase.model.Person;
 
 public interface PersonService {
 

persistence-modules/spring-data-couchbase-2/src/main/java/com/baeldung/spring/data/couchbase/service/PersonTemplateService.java

@@ -1,8 +1,8 @@
-package org.baeldung.spring.data.couchbase.service;
+package com.baeldung.spring.data.couchbase.service;
 
 import java.util.List;
 
-import org.baeldung.spring.data.couchbase.model.Person;
+import com.baeldung.spring.data.couchbase.model.Person;
 import org.joda.time.DateTime;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;

persistence-modules/spring-data-couchbase-2/src/main/java/com/baeldung/spring/data/couchbase/service/StudentRepositoryService.java

@@ -1,11 +1,11 @@
-package org.baeldung.spring.data.couchbase.service;
+package com.baeldung.spring.data.couchbase.service;
 
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
-import org.baeldung.spring.data.couchbase.model.Student;
+import com.baeldung.spring.data.couchbase.model.Student;
-import org.baeldung.spring.data.couchbase.repos.StudentRepository;
+import com.baeldung.spring.data.couchbase.repos.StudentRepository;
 import org.joda.time.DateTime;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;

persistence-modules/spring-data-couchbase-2/src/main/java/com/baeldung/spring/data/couchbase/service/StudentService.java

@@ -1,8 +1,8 @@
-package org.baeldung.spring.data.couchbase.service;
+package com.baeldung.spring.data.couchbase.service;
 
 import java.util.List;
 
-import org.baeldung.spring.data.couchbase.model.Student;
+import com.baeldung.spring.data.couchbase.model.Student;
 
 public interface StudentService {
 

persistence-modules/spring-data-couchbase-2/src/main/java/com/baeldung/spring/data/couchbase/service/StudentTemplateService.java

@@ -1,8 +1,8 @@
-package org.baeldung.spring.data.couchbase.service;
+package com.baeldung.spring.data.couchbase.service;
 
 import java.util.List;
 
-import org.baeldung.spring.data.couchbase.model.Student;
+import com.baeldung.spring.data.couchbase.model.Student;
 import org.joda.time.DateTime;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;

persistence-modules/spring-data-couchbase-2/src/main/java/com/baeldung/spring/data/couchbase2b/repos/CampusRepository.java

@@ -1,8 +1,8 @@
-package org.baeldung.spring.data.couchbase2b.repos;
+package com.baeldung.spring.data.couchbase2b.repos;
 
 import java.util.Set;
 
-import org.baeldung.spring.data.couchbase.model.Campus;
+import com.baeldung.spring.data.couchbase.model.Campus;
 import org.springframework.data.couchbase.core.query.Dimensional;
 import org.springframework.data.couchbase.core.query.View;
 import org.springframework.data.geo.Distance;

persistence-modules/spring-data-couchbase-2/src/main/java/com/baeldung/spring/data/couchbase2b/repos/PersonRepository.java

@@ -1,8 +1,8 @@
-package org.baeldung.spring.data.couchbase2b.repos;
+package com.baeldung.spring.data.couchbase2b.repos;
 
 import java.util.List;
 
-import org.baeldung.spring.data.couchbase.model.Person;
+import com.baeldung.spring.data.couchbase.model.Person;
 import org.springframework.data.repository.CrudRepository;
 
 public interface PersonRepository extends CrudRepository<Person, String> {

persistence-modules/spring-data-couchbase-2/src/main/java/com/baeldung/spring/data/couchbase2b/repos/StudentRepository.java

@@ -1,8 +1,8 @@
-package org.baeldung.spring.data.couchbase2b.repos;
+package com.baeldung.spring.data.couchbase2b.repos;
 
 import java.util.List;
 
-import org.baeldung.spring.data.couchbase.model.Student;
+import com.baeldung.spring.data.couchbase.model.Student;
 import org.springframework.data.repository.CrudRepository;
 
 public interface StudentRepository extends CrudRepository<Student, String> {

persistence-modules/spring-data-couchbase-2/src/main/java/com/baeldung/spring/data/couchbase2b/service/CampusService.java

@@ -1,8 +1,8 @@
-package org.baeldung.spring.data.couchbase2b.service;
+package com.baeldung.spring.data.couchbase2b.service;
 
 import java.util.Set;
 
-import org.baeldung.spring.data.couchbase.model.Campus;
+import com.baeldung.spring.data.couchbase.model.Campus;
 import org.springframework.data.geo.Distance;
 import org.springframework.data.geo.Point;
 

persistence-modules/spring-data-couchbase-2/src/main/java/com/baeldung/spring/data/couchbase2b/service/CampusServiceImpl.java

@@ -1,11 +1,11 @@
-package org.baeldung.spring.data.couchbase2b.service;
+package com.baeldung.spring.data.couchbase2b.service;
 
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Set;
 
-import org.baeldung.spring.data.couchbase.model.Campus;
+import com.baeldung.spring.data.couchbase2b.repos.CampusRepository;
-import org.baeldung.spring.data.couchbase2b.repos.CampusRepository;
+import com.baeldung.spring.data.couchbase.model.Campus;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.geo.Distance;
 import org.springframework.data.geo.Point;

persistence-modules/spring-data-couchbase-2/src/main/java/com/baeldung/spring/data/couchbase2b/service/PersonService.java

@@ -1,8 +1,8 @@
-package org.baeldung.spring.data.couchbase2b.service;
+package com.baeldung.spring.data.couchbase2b.service;
 
 import java.util.List;
 
-import org.baeldung.spring.data.couchbase.model.Person;
+import com.baeldung.spring.data.couchbase.model.Person;
 
 public interface PersonService {
 

persistence-modules/spring-data-couchbase-2/src/main/java/com/baeldung/spring/data/couchbase2b/service/PersonServiceImpl.java

@@ -1,11 +1,11 @@
-package org.baeldung.spring.data.couchbase2b.service;
+package com.baeldung.spring.data.couchbase2b.service;
 
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
-import org.baeldung.spring.data.couchbase.model.Person;
+import com.baeldung.spring.data.couchbase2b.repos.PersonRepository;
-import org.baeldung.spring.data.couchbase2b.repos.PersonRepository;
+import com.baeldung.spring.data.couchbase.model.Person;
 import org.joda.time.DateTime;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

persistence-modules/spring-data-couchbase-2/src/main/java/com/baeldung/spring/data/couchbase2b/service/StudentService.java

@@ -1,8 +1,8 @@
-package org.baeldung.spring.data.couchbase2b.service;
+package com.baeldung.spring.data.couchbase2b.service;
 
 import java.util.List;
 
-import org.baeldung.spring.data.couchbase.model.Student;
+import com.baeldung.spring.data.couchbase.model.Student;
 
 public interface StudentService {
 

persistence-modules/spring-data-couchbase-2/src/main/java/com/baeldung/spring/data/couchbase2b/service/StudentServiceImpl.java

@@ -1,11 +1,11 @@
-package org.baeldung.spring.data.couchbase2b.service;
+package com.baeldung.spring.data.couchbase2b.service;
 
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
-import org.baeldung.spring.data.couchbase.model.Student;
+import com.baeldung.spring.data.couchbase2b.repos.StudentRepository;
-import org.baeldung.spring.data.couchbase2b.repos.StudentRepository;
+import com.baeldung.spring.data.couchbase.model.Student;
 import org.joda.time.DateTime;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

persistence-modules/spring-data-couchbase-2/src/test/java/com/baeldung/SpringContextLiveTest.java

@@ -1,7 +1,7 @@
-package org.baeldung;
+package com.baeldung;
 
-import org.baeldung.spring.data.couchbase2b.MultiBucketCouchbaseConfig;
+import com.baeldung.spring.data.couchbase2b.MultiBucketCouchbaseConfig;
-import org.baeldung.spring.data.couchbase2b.MultiBucketIntegrationTestConfig;
+import com.baeldung.spring.data.couchbase2b.MultiBucketIntegrationTestConfig;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.test.context.ContextConfiguration;
@@ -25,7 +25,7 @@ import org.springframework.test.context.support.DependencyInjectionTestExecution
  * {@code
  * function (doc) {
  *     if (doc.location &&
- *       doc._class == "org.baeldung.spring.data.couchbase.model.Campus") {
+ *       doc._class == "com.baeldung.spring.data.couchbase.model.Campus") {
  *         emit([doc.location.x, doc.location.y], null);
  *   }
  * }}
@@ -34,7 +34,7 @@ import org.springframework.test.context.support.DependencyInjectionTestExecution
  * 2.4.1- view 'all' with function:
  * {@code
  * function (doc, meta) {
- *     if(doc._class == "org.baeldung.spring.data.couchbase.model.Campus") {    
+ *     if(doc._class == "com.baeldung.spring.data.couchbase.model.Campus") {
  *         emit(meta.id, null);
  *     }
  * }}
@@ -42,7 +42,7 @@ import org.springframework.test.context.support.DependencyInjectionTestExecution
  * 2.4.2- view 'byName' with function:
  * {@code
  * function (doc, meta) {
- *     if(doc._class == "org.baeldung.spring.data.couchbase.model.Campus" &&
+ *     if(doc._class == "com.baeldung.spring.data.couchbase.model.Campus" &&
  *       doc.name) {    
  *         emit(doc.name, null);
  *     }

persistence-modules/spring-data-couchbase-2/src/test/java/com/baeldung/spring/data/couchbase/CustomTypeKeyCouchbaseConfig.java

@@ -1,4 +1,4 @@
-package org.baeldung.spring.data.couchbase;
+package com.baeldung.spring.data.couchbase;
 
 import org.springframework.data.couchbase.core.convert.MappingCouchbaseConverter;
 

persistence-modules/spring-data-couchbase-2/src/test/java/com/baeldung/spring/data/couchbase/IntegrationTest.java

@@ -1,4 +1,4 @@
-package org.baeldung.spring.data.couchbase;
+package com.baeldung.spring.data.couchbase;
 
 import org.junit.runner.RunWith;
 import org.springframework.test.context.ContextConfiguration;

persistence-modules/spring-data-couchbase-2/src/test/java/com/baeldung/spring/data/couchbase/IntegrationTestConfig.java

@@ -1,9 +1,9 @@
-package org.baeldung.spring.data.couchbase;
+package com.baeldung.spring.data.couchbase;
 
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 
 @Configuration
-@ComponentScan(basePackages = "org.baeldung.spring.data.couchbase")
+@ComponentScan(basePackages = "com.baeldung.spring.data.couchbase")
 public class IntegrationTestConfig {
 }

persistence-modules/spring-data-couchbase-2/src/test/java/com/baeldung/spring/data/couchbase/MyCouchbaseConfig.java

@@ -1,4 +1,4 @@
-package org.baeldung.spring.data.couchbase;
+package com.baeldung.spring.data.couchbase;
 
 import java.util.Arrays;
 import java.util.List;
@@ -12,7 +12,7 @@ import org.springframework.data.couchbase.repository.config.EnableCouchbaseRepos
 import org.springframework.validation.beanvalidation.LocalValidatorFactoryBean;
 
 @Configuration
-@EnableCouchbaseRepositories(basePackages = { "org.baeldung.spring.data.couchbase" })
+@EnableCouchbaseRepositories(basePackages = { "com.baeldung.spring.data.couchbase" })
 public class MyCouchbaseConfig extends AbstractCouchbaseConfiguration {
 
     public static final List<String> NODE_LIST = Arrays.asList("localhost");

persistence-modules/spring-data-couchbase-2/src/test/java/com/baeldung/spring/data/couchbase/ReadYourOwnWritesCouchbaseConfig.java

@@ -1,4 +1,4 @@
-package org.baeldung.spring.data.couchbase;
+package com.baeldung.spring.data.couchbase;
 
 import org.springframework.data.couchbase.core.query.Consistency;
 

persistence-modules/spring-data-couchbase-2/src/test/java/com/baeldung/spring/data/couchbase/service/PersonRepositoryServiceLiveTest.java

@@ -1,4 +1,4 @@
-package org.baeldung.spring.data.couchbase.service;
+package com.baeldung.spring.data.couchbase.service;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;

persistence-modules/spring-data-couchbase-2/src/test/java/com/baeldung/spring/data/couchbase/service/PersonServiceLiveTest.java

@@ -1,4 +1,4 @@
-package org.baeldung.spring.data.couchbase.service;
+package com.baeldung.spring.data.couchbase.service;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -7,9 +7,9 @@ import static org.junit.Assert.assertTrue;
 
 import java.util.List;
 
-import org.baeldung.spring.data.couchbase.IntegrationTest;
+import com.baeldung.spring.data.couchbase.IntegrationTest;
-import org.baeldung.spring.data.couchbase.MyCouchbaseConfig;
+import com.baeldung.spring.data.couchbase.MyCouchbaseConfig;
-import org.baeldung.spring.data.couchbase.model.Person;
+import com.baeldung.spring.data.couchbase.model.Person;
 import org.joda.time.DateTime;
 import org.junit.BeforeClass;
 import org.junit.Test;

persistence-modules/spring-data-couchbase-2/src/test/java/com/baeldung/spring/data/couchbase/service/PersonTemplateServiceLiveTest.java

@@ -1,4 +1,4 @@
-package org.baeldung.spring.data.couchbase.service;
+package com.baeldung.spring.data.couchbase.service;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;

persistence-modules/spring-data-couchbase-2/src/test/java/com/baeldung/spring/data/couchbase/service/StudentRepositoryServiceLiveTest.java

@@ -1,4 +1,4 @@
-package org.baeldung.spring.data.couchbase.service;
+package com.baeldung.spring.data.couchbase.service;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;

persistence-modules/spring-data-couchbase-2/src/test/java/com/baeldung/spring/data/couchbase/service/StudentServiceLiveTest.java

@@ -1,4 +1,4 @@
-package org.baeldung.spring.data.couchbase.service;
+package com.baeldung.spring.data.couchbase.service;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -9,9 +9,9 @@ import java.util.List;
 
 import javax.validation.ConstraintViolationException;
 
-import org.baeldung.spring.data.couchbase.IntegrationTest;
+import com.baeldung.spring.data.couchbase.IntegrationTest;
-import org.baeldung.spring.data.couchbase.MyCouchbaseConfig;
+import com.baeldung.spring.data.couchbase.MyCouchbaseConfig;
-import org.baeldung.spring.data.couchbase.model.Student;
+import com.baeldung.spring.data.couchbase.model.Student;
 import org.joda.time.DateTime;
 import org.junit.BeforeClass;
 import org.junit.Test;

persistence-modules/spring-data-couchbase-2/src/test/java/com/baeldung/spring/data/couchbase/service/StudentTemplateServiceLiveTest.java

@@ -1,4 +1,4 @@
-package org.baeldung.spring.data.couchbase.service;
+package com.baeldung.spring.data.couchbase.service;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;

persistence-modules/spring-data-couchbase-2/src/test/java/com/baeldung/spring/data/couchbase2b/MultiBucketCouchbaseConfig.java

@@ -1,9 +1,9 @@
-package org.baeldung.spring.data.couchbase2b;
+package com.baeldung.spring.data.couchbase2b;
 
 import java.util.Arrays;
 import java.util.List;
 
-import org.baeldung.spring.data.couchbase.model.Campus;
+import com.baeldung.spring.data.couchbase.model.Campus;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.couchbase.config.AbstractCouchbaseConfiguration;
@@ -17,7 +17,7 @@ import org.springframework.validation.beanvalidation.LocalValidatorFactoryBean;
 import com.couchbase.client.java.Bucket;
 
 @Configuration
-@EnableCouchbaseRepositories(basePackages = { "org.baeldung.spring.data.couchbase2b" })
+@EnableCouchbaseRepositories(basePackages = { "com.baeldung.spring.data.couchbase2b" })
 public class MultiBucketCouchbaseConfig extends AbstractCouchbaseConfiguration {
 
     public static final List<String> NODE_LIST = Arrays.asList("localhost");

persistence-modules/spring-data-couchbase-2/src/test/java/com/baeldung/spring/data/couchbase2b/MultiBucketIntegrationTestConfig.java

@@ -1,10 +1,10 @@
-package org.baeldung.spring.data.couchbase2b;
+package com.baeldung.spring.data.couchbase2b;
 
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 
 @Configuration
-@ComponentScan(basePackages = { "org.baeldung.spring.data.couchbase2b" })
+@ComponentScan(basePackages = { "com.baeldung.spring.data.couchbase2b" })
 public class MultiBucketIntegrationTestConfig {
 
 }

persistence-modules/spring-data-couchbase-2/src/test/java/com/baeldung/spring/data/couchbase2b/MultiBucketLiveTest.java

@@ -1,4 +1,4 @@
-package org.baeldung.spring.data.couchbase2b;
+package com.baeldung.spring.data.couchbase2b;
 
 import org.junit.runner.RunWith;
 import org.springframework.test.context.ContextConfiguration;

persistence-modules/spring-data-couchbase-2/src/test/java/com/baeldung/spring/data/couchbase2b/service/CampusServiceImplLiveTest.java

@@ -1,4 +1,4 @@
-package org.baeldung.spring.data.couchbase2b.service;
+package com.baeldung.spring.data.couchbase2b.service;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -9,9 +9,9 @@ import java.util.Set;
 
 import javax.annotation.PostConstruct;
 
-import org.baeldung.spring.data.couchbase.model.Campus;
+import com.baeldung.spring.data.couchbase.model.Campus;
-import org.baeldung.spring.data.couchbase2b.MultiBucketLiveTest;
+import com.baeldung.spring.data.couchbase2b.MultiBucketLiveTest;
-import org.baeldung.spring.data.couchbase2b.repos.CampusRepository;
+import com.baeldung.spring.data.couchbase2b.repos.CampusRepository;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.geo.Distance;

persistence-modules/spring-data-couchbase-2/src/test/java/com/baeldung/spring/data/couchbase2b/service/PersonServiceImplLiveTest.java

@@ -1,4 +1,4 @@
-package org.baeldung.spring.data.couchbase2b.service;
+package com.baeldung.spring.data.couchbase2b.service;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -7,9 +7,9 @@ import static org.junit.Assert.assertTrue;
 
 import java.util.List;
 
-import org.baeldung.spring.data.couchbase.model.Person;
+import com.baeldung.spring.data.couchbase.model.Person;
-import org.baeldung.spring.data.couchbase2b.MultiBucketCouchbaseConfig;
+import com.baeldung.spring.data.couchbase2b.MultiBucketLiveTest;
-import org.baeldung.spring.data.couchbase2b.MultiBucketLiveTest;
+import com.baeldung.spring.data.couchbase2b.MultiBucketCouchbaseConfig;
 import org.joda.time.DateTime;
 import org.junit.BeforeClass;
 import org.junit.Test;

persistence-modules/spring-data-couchbase-2/src/test/java/com/baeldung/spring/data/couchbase2b/service/StudentServiceImplLiveTest.java

@@ -1,4 +1,4 @@
-package org.baeldung.spring.data.couchbase2b.service;
+package com.baeldung.spring.data.couchbase2b.service;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -9,9 +9,9 @@ import java.util.List;
 
 import javax.validation.ConstraintViolationException;
 
-import org.baeldung.spring.data.couchbase.model.Student;
+import com.baeldung.spring.data.couchbase.model.Student;
-import org.baeldung.spring.data.couchbase2b.MultiBucketCouchbaseConfig;
+import com.baeldung.spring.data.couchbase2b.MultiBucketCouchbaseConfig;
-import org.baeldung.spring.data.couchbase2b.MultiBucketLiveTest;
+import com.baeldung.spring.data.couchbase2b.MultiBucketLiveTest;
 import org.joda.time.DateTime;
 import org.junit.BeforeClass;
 import org.junit.Test;

persistence-modules/spring-data-eclipselink/README.md

@@ -4,5 +4,5 @@ This module contains articles about Spring Data with EclipseLink.
 
 ### Relevant articles
 
-- [A Guide to EclipseLink with Spring](http://www.baeldung.com/spring-eclipselink)
+- [A Guide to EclipseLink with Spring](https://www.baeldung.com/spring-eclipselink)
 - [Pessimistic Locking in JPA](https://www.baeldung.com/jpa-pessimistic-locking)

persistence-modules/spring-data-eclipselink/src/test/java/com/baeldung/SpringContextTest.java

@@ -1,4 +1,4 @@
-package org.baeldung;
+package com.baeldung;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

persistence-modules/spring-data-elasticsearch/README.md

@@ -1,11 +1,11 @@
 ## Spring Data Elasticsearch
 
 ### Relevant Articles:
-- [Introduction to Spring Data Elasticsearch](http://www.baeldung.com/spring-data-elasticsearch-tutorial)
+- [Introduction to Spring Data Elasticsearch](https://www.baeldung.com/spring-data-elasticsearch-tutorial)
-- [Elasticsearch Queries with Spring Data](http://www.baeldung.com/spring-data-elasticsearch-queries)
+- [Elasticsearch Queries with Spring Data](https://www.baeldung.com/spring-data-elasticsearch-queries)
-- [Guide to Elasticsearch in Java](http://www.baeldung.com/elasticsearch-java)
+- [Guide to Elasticsearch in Java](https://www.baeldung.com/elasticsearch-java)
-- [Geospatial Support in ElasticSearch](http://www.baeldung.com/elasticsearch-geo-spatial)
+- [Geospatial Support in ElasticSearch](https://www.baeldung.com/elasticsearch-geo-spatial)
-- [A Simple Tagging Implementation with Elasticsearch](http://www.baeldung.com/elasticsearch-tagging)
+- [A Simple Tagging Implementation with Elasticsearch](https://www.baeldung.com/elasticsearch-tagging)
 
 ### Build the Project with Tests Running
 ```

persistence-modules/spring-data-elasticsearch/src/test/java/com/baeldung/SpringContextManualTest.java

@@ -1,4 +1,4 @@
-package org.baeldung;
+package com.baeldung;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

persistence-modules/spring-data-gemfire/README.md

@@ -1,3 +1,3 @@
 ### Relevant articles
 
-- [A Guide to GemFire with Spring Data](http://www.baeldung.com/spring-data-gemfire)
+- [A Guide to GemFire with Spring Data](https://www.baeldung.com/spring-data-gemfire)

persistence-modules/spring-data-gemfire/src/test/java/com/baeldung/SpringContextTest.java

@@ -1,4 +1,4 @@
-package org.baeldung;
+package com.baeldung;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

persistence-modules/spring-data-jpa/src/test/java/com/baeldung/SpringContextTest.java

@@ -1,4 +1,4 @@
-package org.baeldung;
+package com.baeldung;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

persistence-modules/spring-data-jpa/src/test/java/com/baeldung/SpringJpaContextIntegrationTest.java

@@ -1,4 +1,4 @@
-package org.baeldung;
+package com.baeldung;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

persistence-modules/spring-data-keyvalue/README.md

@@ -3,4 +3,4 @@
 This module contains articles about Spring Data Key-Value
 
 ### Relevant Articles:
-- [A Guide to Spring Data Key Value](http://www.baeldung.com/spring-data-key-value)
+- [A Guide to Spring Data Key Value](https://www.baeldung.com/spring-data-key-value)

persistence-modules/spring-data-keyvalue/src/test/java/com/baeldung/SpringContextTest.java

@@ -1,4 +1,4 @@
-package org.baeldung;
+package com.baeldung;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

persistence-modules/spring-data-neo4j/README.md

@@ -1,8 +1,8 @@
 ## Spring Data Neo4j
 
 ### Relevant Articles:
-- [Introduction to Spring Data Neo4j](http://www.baeldung.com/spring-data-neo4j-intro)
+- [Introduction to Spring Data Neo4j](https://www.baeldung.com/spring-data-neo4j-intro)
-- [A Guide to Neo4J with Java](http://www.baeldung.com/java-neo4j)
+- [A Guide to Neo4J with Java](https://www.baeldung.com/java-neo4j)
 
 ### Build the Project with Tests Running
 ```

persistence-modules/spring-data-neo4j/src/test/java/com/baeldung/SpringContextTest.java

@@ -1,4 +1,4 @@
-package org.baeldung;
+package com.baeldung;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

persistence-modules/spring-data-redis/README.md

@@ -1,8 +1,8 @@
 ## Spring Data Redis
 
 ### Relevant Articles:
-- [Introduction to Spring Data Redis](http://www.baeldung.com/spring-data-redis-tutorial)
+- [Introduction to Spring Data Redis](https://www.baeldung.com/spring-data-redis-tutorial)
-- [PubSub Messaging with Spring Data Redis](http://www.baeldung.com/spring-data-redis-pub-sub)
+- [PubSub Messaging with Spring Data Redis](https://www.baeldung.com/spring-data-redis-pub-sub)
 - [An Introduction to Spring Data Redis Reactive](https://www.baeldung.com/spring-data-redis-reactive)
 
 ### Build the Project with Tests Running

persistence-modules/spring-data-redis/src/test/java/com/baeldung/SpringContextTest.java

@@ -1,4 +1,4 @@
-package org.baeldung;
+package com.baeldung;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

persistence-modules/spring-data-solr/README.md

@@ -3,4 +3,4 @@
 This module contains articles about Spring Data with Solr.
 
 ### Relevant Articles:
-- [Introduction to Spring Data Solr](http://www.baeldung.com/spring-data-solr)
+- [Introduction to Spring Data Solr](https://www.baeldung.com/spring-data-solr)

persistence-modules/spring-data-solr/src/test/java/com/baeldung/SpringContextTest.java

@@ -1,4 +1,4 @@
-package org.baeldung;
+package com.baeldung;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

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

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

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

@@ -18,7 +18,7 @@ class BuildInfoServiceIntegrationTest {
     
     @Test
     void whenGetApplicationDescription_thenSuccess() {
-        assertThat(service.getApplicationDescription(), Matchers.is("This is simple boot application for Spring boot actuator test"));
+        assertThat(service.getApplicationDescription(), Matchers.is("Spring Boot Properties Module"));
         assertThat(service.getApplicationVersion(), Matchers.is("0.0.1-SNAPSHOT"));
     }
 }

spring-cloud/spring-cloud-zuul/spring-zuul-post-filter/src/main/java/com/baeldung/filters/ResponseLogFilter.java

@@ -12,6 +12,7 @@ import java.io.InputStream;
 import java.io.InputStreamReader;
 
 import static org.springframework.cloud.netflix.zuul.filters.support.FilterConstants.POST_TYPE;
+import static org.springframework.http.HttpStatus.INTERNAL_SERVER_ERROR;
 
 @Component
 public class ResponseLogFilter extends ZuulFilter {
@@ -49,8 +50,8 @@ public class ResponseLogFilter extends ZuulFilter {
 
             context.setResponseBody(responseData);
         }
-        catch (Throwable e) {
+        catch (Exception e) {
-            e.printStackTrace();
+            throw new ZuulException(e, INTERNAL_SERVER_ERROR.value(), e.getMessage());
         }
 
         return null;