Fixed conflict

2019-11-02 12:51:10 +00:00
parent f1673ce653 d47ea19834
commit 65cfa6ab2b
703 changed files with 10277 additions and 6864 deletions
@@ -84,4 +84,10 @@ software-security/sql-injection-samples/derby.log
 spring-soap/src/main/java/com/baeldung/springsoap/gen/
 /report-*.json
 transaction.log
-*-shell.log
+*-shell.log
+
+apache-cxf/cxf-aegis/baeldung.xml
+apache-fop/src/test/resources/input.xml
+apache-fop/src/test/resources/output_herold.pdf
+apache-fop/src/test/resources/output_html2fo.pdf
+apache-fop/src/test/resources/output_jtidy.pdf
@@ -1,3 +1,7 @@
-## Relevant articles:
+## Akka HTTP
+
+This module contains articles about Akka HTTP. 
+
+### Relevant articles:

 - [Introduction to Akka HTTP](https://www.baeldung.com/akka-http)
@@ -1,3 +1,7 @@
+## Akka Streams
+
+This module contains articles about Akka Streams. 
+
 ### Relevant articles

 - [Guide to Akka Streams](https://www.baeldung.com/akka-streams)
@@ -1,4 +1,8 @@
-## Relevant articles:
+## Genetic Algorithms
+
+This module contains articles about genetic algorithms. 
+
+### Relevant articles:

 - [Introduction to Jenetics Library](https://www.baeldung.com/jenetics)
 - [Ant Colony Optimization](https://www.baeldung.com/java-ant-colony-optimization)
@@ -1,4 +1,9 @@
-## Relevant articles:
+## Algorithms - Miscellaneous
+
+This module contains articles about algorithms. Some classes of algorithms, e.g., [sorting](/../algorithms-sorting) and
+[genetic algorithms](/../algorithms-genetic), have their own dedicated modules. 
+
+### Relevant articles:

 - [Validating Input With Finite Automata in Java](https://www.baeldung.com/java-finite-automata)
 - [Example of Hill Climbing Algorithm](https://www.baeldung.com/java-hill-climbing-algorithm)
@@ -6,4 +11,5 @@
 - [Binary Search Algorithm in Java](https://www.baeldung.com/java-binary-search)
 - [Introduction to Minimax Algorithm](https://www.baeldung.com/java-minimax-algorithm)
 - [How to Calculate Levenshtein Distance in Java?](https://www.baeldung.com/java-levenshtein-distance)
- [How to Find the Kth Largest Element in Java](https://www.baeldung.com/java-kth-largest-element)
+- [How to Find the Kth Largest Element in Java](https://www.baeldung.com/java-kth-largest-element)
+- More articles: [[next -->]](/../algorithms-miscellaneous-2)
@@ -1,4 +1,9 @@
-## Relevant articles:
+## Algorithms - Miscellaneous
+
+This module contains articles about algorithms. Some classes of algorithms, e.g., [sorting](/../algorithms-sorting) and
+[genetic algorithms](/../algorithms-genetic), have their own dedicated modules. 
+
+### Relevant articles:

 - [Dijkstra Shortest Path Algorithm in Java](https://www.baeldung.com/java-dijkstra)
 - [Introduction to Cobertura](https://www.baeldung.com/cobertura)
@@ -8,3 +13,4 @@
 - [Create a Sudoku Solver in Java](https://www.baeldung.com/java-sudoku)
 - [Displaying Money Amounts in Words](https://www.baeldung.com/java-money-into-words)
 - [A Collaborative Filtering Recommendation System in Java](https://www.baeldung.com/java-collaborative-filtering-recommendations)
+- More articles: [[<-- prev]](/../algorithms-miscellaneous-1) [[next -->]](/../algorithms-miscellaneous-3)
@@ -16,4 +16,6 @@ This module contains articles about algorithms. Some classes of algorithms, e.g.
 - [Efficient Word Frequency Calculator in Java](https://www.baeldung.com/java-word-frequency)
 - [Interpolation Search in Java](https://www.baeldung.com/java-interpolation-search)
 - [The K-Means Clustering Algorithm in Java](https://www.baeldung.com/java-k-means-clustering-algorithm)
+- [Creating a Custom Annotation in Java](https://www.baeldung.com/java-custom-annotation)
+- [Breadth-First Search Algorithm in Java](https://www.baeldung.com/java-breadth-first-search)
 - More articles: [[<-- prev]](/algorithms-miscellaneous-2) [[next -->]](/algorithms-miscellaneous-4)
@@ -1,4 +1,8 @@
-## Relevant articles:
+## Algorithms - Miscellaneous
+
+This module contains articles about algorithms. Some classes of algorithms, e.g., [sorting](https://github.com/eugenp/tutorials/blob/algorithms-sorting) and [genetic algorithms](https://github.com/eugenp/tutorials/blob/algorithms-genetic), have their own dedicated modules.
+
+### Relevant articles:

 - [Multi-Swarm Optimization Algorithm in Java](https://www.baeldung.com/java-multi-swarm-algorithm)
 - [String Search Algorithms for Large Texts](https://www.baeldung.com/java-full-text-search-algorithms)
@@ -6,4 +10,5 @@
 - [Find the Middle Element of a Linked List](https://www.baeldung.com/java-linked-list-middle-element)
 - [Find Substrings That Are Palindromes in Java](https://www.baeldung.com/java-palindrome-substrings)
 - [Find the Longest Substring without Repeating Characters](https://www.baeldung.com/java-longest-substring-without-repeated-characters)
- [Permutations of an Array in Java](https://www.baeldung.com/java-array-permutations)
+- [Permutations of an Array in Java](https://www.baeldung.com/java-array-permutations)
+- More articles: [[<-- prev]](/algorithms-miscellaneous-3) [[next -->]](/algorithms-miscellaneous-5)
@@ -1,5 +1,11 @@
-## Relevant articles:
+## Algorithms - Miscellaneous
+
+This module contains articles about algorithms. Some classes of algorithms, e.g., [sorting](/../algorithms-sorting) and
+[genetic algorithms](/../algorithms-genetic), have their own dedicated modules. 
+
+### Relevant articles:

 - [Converting Between Byte Arrays and Hexadecimal Strings in Java](https://www.baeldung.com/java-byte-arrays-hex-strings)
 - [Reversing a Binary Tree in Java](https://www.baeldung.com/java-reversing-a-binary-tree)
- [Find If Two Numbers Are Relatively Prime in Java](https://www.baeldung.com/java-two-relatively-prime-numbers)
+- [Find If Two Numbers Are Relatively Prime in Java](https://www.baeldung.com/java-two-relatively-prime-numbers)
+- More articles: [[<-- prev]](/../algorithms-miscellaneous-4)
@@ -0,0 +1,36 @@
+package com.baeldung.algorithms.knapsack;
+
+public class Knapsack {
+
+    public int knapsackRec(int[] w, int[] v, int n, int W) {
+        if (n <= 0) {
+            return 0;
+        } else if (w[n - 1] > W) {
+            return knapsackRec(w, v, n - 1, W);
+        } else {
+            return Math.max(knapsackRec(w, v, n - 1, W), v[n - 1] + knapsackRec(w, v, n - 1, W - w[n - 1]));
+        }
+    }
+
+    public int knapsackDP(int[] w, int[] v, int n, int W) {
+        if (n <= 0 || W <= 0) {
+            return 0;
+        }
+
+        int[][] m = new int[n + 1][W + 1];
+        for (int j = 0; j <= W; j++) {
+            m[0][j] = 0;
+        }
+
+        for (int i = 1; i <= n; i++) {
+            for (int j = 1; j <= W; j++) {
+                if (w[i - 1] > j) {
+                    m[i][j] = m[i - 1][j];
+                } else {
+                    m[i][j] = Math.max(m[i - 1][j], m[i - 1][j - w[i - 1]] + v[i - 1]);
+                }
+            }
+        }
+        return m[n][W];
+    }
+}
@@ -0,0 +1,44 @@
+package com.baeldung.algorithms.knapsack;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.junit.jupiter.api.Test;
+
+public class KnapsackUnitTest {
+
+    @Test
+    public void givenWeightsandValues_whenCalculateMax_thenOutputCorrectResult() {
+        final int[] w = new int[] { 23, 26, 20, 18, 32, 27, 29, 26, 30, 27 };
+        final int[] v = new int[] { 505, 352, 458, 220, 354, 414, 498, 545, 473, 543 };
+        final int n = 10;
+        final int W = 67;
+        final Knapsack knapsack = new Knapsack();
+
+        assertEquals(1270, knapsack.knapsackRec(w, v, n, W));
+        assertEquals(1270, knapsack.knapsackDP(w, v, n, W));
+    }
+
+    @Test
+    public void givenZeroItems_whenCalculateMax_thenOutputZero() {
+        final int[] w = new int[] {};
+        final int[] v = new int[] {};
+        final int n = 0;
+        final int W = 67;
+        final Knapsack knapsack = new Knapsack();
+
+        assertEquals(0, knapsack.knapsackRec(w, v, n, W));
+        assertEquals(0, knapsack.knapsackDP(w, v, n, W));
+    }
+
+    @Test
+    public void givenZeroWeightLimit_whenCalculateMax_thenOutputZero() {
+        final int[] w = new int[] { 23, 26, 20, 18, 32, 27, 29, 26, 30, 27 };
+        final int[] v = new int[] { 505, 352, 458, 220, 354, 414, 498, 545, 473, 543 };
+        final int n = 10;
+        final int W = 0;
+        final Knapsack knapsack = new Knapsack();
+
+        assertEquals(0, knapsack.knapsackRec(w, v, n, W));
+        assertEquals(0, knapsack.knapsackDP(w, v, n, W));
+    }
+}
@@ -16,3 +16,5 @@ This module contains articles about sorting algorithms.
 - [Selection Sort in Java](https://www.baeldung.com/java-selection-sort)
 - [Sorting Strings by Contained Numbers in Java](https://www.baeldung.com/java-sort-strings-contained-numbers)
 - [Radix Sort in Java](https://www.baeldung.com/java-radix-sort)
+- [Sorting a String Alphabetically in Java](https://www.baeldung.com/java-sort-string-alphabetically)
+- [Bucket Sort in Java](https://www.baeldung.com/java-bucket-sort)
@@ -28,6 +28,12 @@
            <version>${lombok.version}</version>
            <scope>provided</scope>
        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <version>${junit-jupiter-api.version}</version>
+            <scope>test</scope>
+        </dependency>
        <dependency>
            <groupId>org.assertj</groupId>
            <artifactId>assertj-core</artifactId>
@@ -52,6 +58,7 @@
        <commons-math3.version>3.6.1</commons-math3.version>
        <org.assertj.core.version>3.9.0</org.assertj.core.version>
        <commons-codec.version>1.11</commons-codec.version>
+        <junit-jupiter-api.version>5.3.1</junit-jupiter-api.version>
    </properties>

 </project>
@@ -1,4 +1,4 @@
-package com.baeldung.string.sorting;
+package com.baeldung.algorithms.stringsort;

 import java.util.Arrays;

@@ -1,12 +1,10 @@
-package com.baeldung.string.sorting;
+package com.baeldung.algorithms.stringsort;


-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-
 import org.junit.jupiter.api.Test;

-import com.baeldung.string.sorting.AnagramValidator;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;

 class AnagramValidatorUnitTest {
    
@@ -1,9 +1,9 @@
-package com.baeldung.string.sorting;
-
-import java.util.Arrays;
+package com.baeldung.algorithms.stringsort;

 import org.junit.jupiter.api.Test;

+import java.util.Arrays;
+
 import static org.assertj.core.api.Assertions.assertThat;

 class SortStringUnitTest {
@@ -12,10 +12,16 @@
    </parent>

    <dependencies>
+        <dependency>
+            <groupId>com.google.auto.value</groupId>
+            <artifactId>auto-value-annotations</artifactId>
+            <version>${auto-value.version}</version>
+        </dependency>
        <dependency>
            <groupId>com.google.auto.value</groupId>
            <artifactId>auto-value</artifactId>
            <version>${auto-value.version}</version>
+            <scope>provided</scope>
        </dependency>
        <dependency>
            <groupId>com.google.auto.factory</groupId>
@@ -43,9 +49,9 @@
    </dependencies>

    <properties>
-        <auto-value.version>1.3</auto-value.version>
-        <auto-factory.version>1.0-beta5</auto-factory.version>
-        <auto-service.version>1.0-rc5</auto-service.version>
+        <auto-value.version>1.6.6</auto-value.version>
+        <auto-factory.version>1.0-beta6</auto-factory.version>
+        <auto-service.version>1.0-rc6</auto-service.version>
        <guice.version>4.2.0</guice.version>
    </properties>

@@ -0,0 +1,38 @@
+package com.baeldung.autovalue;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import com.google.auto.value.AutoValue;
+
+@AutoValue
+public abstract class Person {
+
+    public abstract String name();
+
+    public abstract List<String> favoriteMovies();
+
+    public static Builder builder() {
+        return new AutoValue_Person.Builder();
+    }
+
+    @AutoValue.Builder
+    public static abstract class Builder {
+
+        public abstract Builder name(String value);
+
+        public abstract Builder favoriteMovies(List<String> value);
+
+        abstract List<String> favoriteMovies();
+
+        abstract Person autoBuild();
+
+        public Person build() {
+            List<String> favoriteMovies = favoriteMovies();
+            List<String> copy = Collections.unmodifiableList(new ArrayList<>(favoriteMovies));
+            favoriteMovies(copy);
+            return autoBuild();
+        }
+    }
+}
@@ -0,0 +1,37 @@
+package com.baeldung.autovalue;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.junit.Test;
+
+/**
+ * Unit Test which verifies that the {@link Person} value object creates defensive copies of its favoriteMovies list.
+ */
+public class PersonUnitTest {
+
+    @Test
+    public void givenNewPerson_whenModifyOriginalList_thenValueObjectIsNotAlsoModified() {
+        // GIVEN new Person
+        List<String> originalFavoriteMoviesList = new ArrayList<String>();
+        originalFavoriteMoviesList.add("Training Day");
+        originalFavoriteMoviesList.add("Fast and the Furious");
+        Person person = Person.builder()
+            .name("Dan")
+            .favoriteMovies(originalFavoriteMoviesList)
+            .build();
+
+        // WHEN modify original list
+        originalFavoriteMoviesList.add("Friday");
+
+        // THEN Person remains unaffected
+        assertFalse(person.favoriteMovies()
+            .contains("Friday"));
+        assertEquals(2, person.favoriteMovies()
+            .size());
+    }
+
+}
@@ -12,4 +12,5 @@ This module contains articles about core Groovy concepts
 - [Concatenate Strings with Groovy](https://www.baeldung.com/groovy-concatenate-strings)
 - [Metaprogramming in Groovy](https://www.baeldung.com/groovy-metaprogramming)
 - [A Quick Guide to Working with Web Services in Groovy](https://www.baeldung.com/groovy-web-services)
+- [Categories in Groovy](https://www.baeldung.com/groovy-categories)
 - [[<-- Prev]](/core-groovy)
@@ -5,4 +5,6 @@ This module contains articles about Groovy core collections
 ## Relevant articles:

 - [Maps in Groovy](https://www.baeldung.com/groovy-maps)
-
+- [Finding Elements in Collections in Groovy](https://www.baeldung.com/groovy-collections-find-elements)
+- [Lists in Groovy](https://www.baeldung.com/groovy-lists)
+- [A Quick Guide to Iterating a Map in Groovy](https://www.baeldung.com/groovy-map-iterating)
@@ -1,11 +1,11 @@
-package com.baeldung.lists
+package com.baeldung.find

-import com.baeldung.Person
+import com.baeldung.find.Person
 import org.junit.Test

 import static org.junit.Assert.*

-class ListUnitTest {
+class ListFindUnitTest {

    private final personList = [
      new Person("Regina", "Fitzpatrick", 25),
@@ -1,11 +1,11 @@
-package com.baeldung.map
+package com.baeldung.find

-import com.baeldung.Person
+import com.baeldung.find.Person
 import org.junit.Test

 import static org.junit.Assert.*

-class MapUnitTest {
+class MapFindUnitTest {

    private final personMap = [
      Regina : new Person("Regina", "Fitzpatrick", 25),
@@ -13,84 +13,6 @@ class MapUnitTest {
      Lucian : new Person("Lucian", "Walter", 30)
    ]

-    @Test
-    void whenUsingEach_thenMapIsIterated() {
-        def map = [
-            'FF0000' : 'Red',
-            '00FF00' : 'Lime',
-            '0000FF' : 'Blue',
-            'FFFF00' : 'Yellow'
-        ]
-
-        map.each { println "Hex Code: $it.key = Color Name: $it.value" }
-    }
-
-    @Test
-    void whenUsingEachWithEntry_thenMapIsIterated() {
-        def map = [
-            'E6E6FA' : 'Lavender',
-            'D8BFD8' : 'Thistle',
-            'DDA0DD' : 'Plum',
-        ]
-
-        map.each { entry -> println "Hex Code: $entry.key = Color Name: $entry.value" }
-    }
-
-    @Test
-    void whenUsingEachWithKeyAndValue_thenMapIsIterated() {
-        def map = [
-            '000000' : 'Black',
-            'FFFFFF' : 'White',
-            '808080' : 'Gray'
-        ]
-
-        map.each { key, val ->
-            println "Hex Code: $key = Color Name $val"
-        }
-    }
-
-    @Test
-    void whenUsingEachWithIndexAndEntry_thenMapIsIterated() {
-        def map = [
-            '800080' : 'Purple',
-            '4B0082' : 'Indigo',
-            '6A5ACD' : 'Slate Blue'
-        ]
-
-        map.eachWithIndex { entry, index ->
-            def indent = ((index == 0 || index % 2 == 0) ? "   " : "")
-            println "$indent Hex Code: $entry.key = Color Name: $entry.value"
-        }
-    }
-
-    @Test
-    void whenUsingEachWithIndexAndKeyAndValue_thenMapIsIterated() {
-        def map = [
-            'FFA07A' : 'Light Salmon',
-            'FF7F50' : 'Coral',
-            'FF6347' : 'Tomato',
-            'FF4500' : 'Orange Red'
-        ]
-
-        map.eachWithIndex { key, val, index ->
-            def indent = ((index == 0 || index % 2 == 0) ? "   " : "")
-            println "$indent Hex Code: $key = Color Name: $val"
-        }
-    }
-
-    @Test
-    void whenUsingForLoop_thenMapIsIterated() {
-        def map = [
-            '2E8B57' : 'Seagreen',
-            '228B22' : 'Forest Green',
-            '008000' : 'Green'
-        ]
-
-        for (entry in map) {
-            println "Hex Code: $entry.key = Color Name: $entry.value"
-        }
-    }
-
    @Test
    void whenMapContainsKeyElement_thenCheckReturnsTrue() {
        def map = [a: 'd', b: 'e', c: 'f']
@@ -1,4 +1,4 @@
-package com.baeldung
+package com.baeldung.find

 class Person {
    private String firstname
@@ -1,10 +1,10 @@
-package com.baeldung.set
+package com.baeldung.find

 import org.junit.Test

 import static org.junit.Assert.assertTrue

-class SetUnitTest {
+class SetFindUnitTest {

    @Test
    void whenSetContainsElement_thenCheckReturnsTrue() {
@@ -0,0 +1,87 @@
+package com.baeldung.iteratemap
+
+import com.baeldung.find.Person
+import org.junit.Test
+
+import static org.junit.Assert.*
+
+class IterateMapUnitTest {
+
+    @Test
+    void whenUsingEach_thenMapIsIterated() {
+        def map = [
+                'FF0000' : 'Red',
+                '00FF00' : 'Lime',
+                '0000FF' : 'Blue',
+                'FFFF00' : 'Yellow'
+        ]
+
+        map.each { println "Hex Code: $it.key = Color Name: $it.value" }
+    }
+
+    @Test
+    void whenUsingEachWithEntry_thenMapIsIterated() {
+        def map = [
+                'E6E6FA' : 'Lavender',
+                'D8BFD8' : 'Thistle',
+                'DDA0DD' : 'Plum',
+        ]
+
+        map.each { entry -> println "Hex Code: $entry.key = Color Name: $entry.value" }
+    }
+
+    @Test
+    void whenUsingEachWithKeyAndValue_thenMapIsIterated() {
+        def map = [
+                '000000' : 'Black',
+                'FFFFFF' : 'White',
+                '808080' : 'Gray'
+        ]
+
+        map.each { key, val ->
+            println "Hex Code: $key = Color Name $val"
+        }
+    }
+
+    @Test
+    void whenUsingEachWithIndexAndEntry_thenMapIsIterated() {
+        def map = [
+                '800080' : 'Purple',
+                '4B0082' : 'Indigo',
+                '6A5ACD' : 'Slate Blue'
+        ]
+
+        map.eachWithIndex { entry, index ->
+            def indent = ((index == 0 || index % 2 == 0) ? "   " : "")
+            println "$indent Hex Code: $entry.key = Color Name: $entry.value"
+        }
+    }
+
+    @Test
+    void whenUsingEachWithIndexAndKeyAndValue_thenMapIsIterated() {
+        def map = [
+                'FFA07A' : 'Light Salmon',
+                'FF7F50' : 'Coral',
+                'FF6347' : 'Tomato',
+                'FF4500' : 'Orange Red'
+        ]
+
+        map.eachWithIndex { key, val, index ->
+            def indent = ((index == 0 || index % 2 == 0) ? "   " : "")
+            println "$indent Hex Code: $key = Color Name: $val"
+        }
+    }
+
+    @Test
+    void whenUsingForLoop_thenMapIsIterated() {
+        def map = [
+                '2E8B57' : 'Seagreen',
+                '228B22' : 'Forest Green',
+                '008000' : 'Green'
+        ]
+
+        for (entry in map) {
+            println "Hex Code: $entry.key = Color Name: $entry.value"
+        }
+    }
+}
--- a/Show More
+++ b/Show More