Merge pull request #1 from eugenp/master

sync the fork
2019-08-04 00:51:24 +05:30
parent 30cb9ad592 255ae3b234
commit b4297f8711
1456 changed files with 24891 additions and 4748 deletions
@@ -1,4 +1,5 @@
 */bin/*
+bin/

 *.class

@@ -21,6 +22,9 @@
 *.iws
 out/

+# VSCode
+.vscode/
+
 # Mac
 .DS_Store

@@ -77,4 +81,5 @@ apache-avro/src/main/java/com/baeldung/avro/model/
 jta/transaction-logs/
 software-security/sql-injection-samples/derby.log
 spring-soap/src/main/java/com/baeldung/springsoap/gen/
-/report-*.json
+/report-*.json
+transaction.log
@@ -1,12 +1,16 @@

-The "REST with Spring" Classes
+The Courses
 ==============================

-Here's the Master Class of REST With Spring (along with the newly announced Boot 2 material): <br/>
-**[>> THE REST WITH SPRING - MASTER CLASS](http://www.baeldung.com/rest-with-spring-course?utm_source=github&utm_medium=social&utm_content=tutorials&utm_campaign=rws#master-class)**

-And here's the Master Class of Learn Spring Security: <br/>
-**[>> LEARN SPRING SECURITY - MASTER CLASS](http://www.baeldung.com/learn-spring-security-course?utm_source=github&utm_medium=social&utm_content=tutorials&utm_campaign=lss#master-class)**
+Here's the new "Learn Spring" course: <br/>
+**[>> LEARN SPRING - THE MASTER CLASS](https://www.baeldung.com/learn-spring-course?utm_source=github&utm_medium=social&utm_content=tutorials&utm_campaign=ls#master-class)**
+
+Here's the Master Class of "REST With Spring" (along with the new announced Boot 2 material): <br/>
+**[>> THE REST WITH SPRING - MASTER CLASS](https://www.baeldung.com/rest-with-spring-course?utm_source=github&utm_medium=social&utm_content=tutorials&utm_campaign=rws#master-class)**
+
+And here's the Master Class of "Learn Spring Security": <br/>
+**[>> LEARN SPRING SECURITY - MASTER CLASS](https://www.baeldung.com/learn-spring-security-course?utm_source=github&utm_medium=social&utm_content=tutorials&utm_campaign=lss#master-class)**



@@ -15,7 +19,7 @@ Java and Spring Tutorials

 This project is **a collection of small and focused tutorials** - each covering a single and well defined area of development in the Java ecosystem. 
 A strong focus of these is, of course, the Spring Framework - Spring, Spring Boot and Spring Security. 
-In additional to Spring, the following technologies are in focus: `core Java`, `Jackson`, `HttpClient`, `Guava`. 
+In additional to Spring, the modules here are covering a number of aspects in Java. 


 Building the project
@@ -32,8 +36,15 @@ Running a Spring Boot module
 ====================
 To run a Spring Boot module run the command: `mvn spring-boot:run` in the module directory

-#Running Tests

+Working with the IDE
+====================
+This repo contains a large number of modules. 
+When you're working with an individual module, there's no need to import all of them (or build all of them) - you can simply import that particular module in either Eclipse or IntelliJ. 
+
+
+Running Tests
+=============
 The command `mvn clean install` will run the unit tests in a module.
 To run the integration tests, use the command `mvn clean install -Pintegration-lite-first`

@@ -42,7 +42,7 @@
        <dependency>
            <groupId>com.github.dpaukov</groupId>
            <artifactId>combinatoricslib3</artifactId>
-            <version>3.3.0</version>
+            <version>${combinatoricslib3.version}</version>
         </dependency>
    </dependencies>

@@ -83,6 +83,7 @@
        <org.assertj.core.version>3.9.0</org.assertj.core.version>
        <commons-codec.version>1.11</commons-codec.version>
        <guava.version>27.0.1-jre</guava.version>
+        <combinatoricslib3.version>3.3.0</combinatoricslib3.version>
    </properties>

 </project>
@@ -4,3 +4,6 @@
 - [Implementing Simple State Machines with Java Enums](https://www.baeldung.com/java-enum-simple-state-machine)
 - [Converting Between Roman and Arabic Numerals in Java](http://www.baeldung.com/java-convert-roman-arabic)
 - [Practical Java Examples of the Big O Notation](http://www.baeldung.com/java-algorithm-complexity)
+- [Checking If a List Is Sorted in Java](https://www.baeldung.com/java-check-if-list-sorted)
+- [Checking if a Java Graph has a Cycle](https://www.baeldung.com/java-graph-has-a-cycle)
+- [A Guide to the Folding Technique in Java](https://www.baeldung.com/folding-hashing-technique)
@@ -27,6 +27,7 @@ public class SortedListChecker {
            if (previous.compareTo(current) > 0) {
                return false;
            }
+            previous = current;
        }
        return true;
    }
@@ -43,6 +44,7 @@ public class SortedListChecker {
            if (employeeComparator.compare(previous, current) > 0) {
                return false;
            }
+            previous = current;
        }
        return true;
    }
@@ -0,0 +1,30 @@
+package com.baeldung.algorithms.stringsortingbynumber;
+
+import java.util.Comparator;
+
+public final class NaturalOrderComparators {
+
+    private static final String DIGIT_AND_DECIMAL_REGEX = "[^\\d.]";
+
+    private NaturalOrderComparators() {
+        throw new AssertionError("Let's keep this static");
+    }
+
+    public static Comparator<String> createNaturalOrderRegexComparator() {
+        return Comparator.comparingDouble(NaturalOrderComparators::parseStringToNumber);
+    }
+
+    private static double parseStringToNumber(String input){
+
+        final String digitsOnly = input.replaceAll(DIGIT_AND_DECIMAL_REGEX, "");
+
+        if("".equals(digitsOnly)) return 0;
+
+        try{
+            return Double.parseDouble(digitsOnly);
+        }catch (NumberFormatException nfe){
+            return 0;
+        }
+    }
+
+}
@@ -0,0 +1,79 @@
+package com.baeldung.algorithms.stringsortingbynumber;
+
+import com.baeldung.algorithms.stringsortingbynumber.NaturalOrderComparators;
+import org.junit.Test;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import static org.junit.Assert.*;
+
+public class NaturalOrderComparatorsUnitTest {
+
+    @Test
+    public void givenSimpleStringsContainingIntsAndDoubles_whenSortedByRegex_checkSortingCorrect() {
+
+        List<String> testStrings = Arrays.asList("a1", "b3", "c4", "d2.2", "d2.4", "d2.3d");
+
+        testStrings.sort(NaturalOrderComparators.createNaturalOrderRegexComparator());
+
+        List<String> expected = Arrays.asList("a1", "d2.2", "d2.3d", "d2.4", "b3", "c4");
+
+        assertEquals(expected, testStrings);
+
+
+    }
+
+    @Test
+    public void givenSimpleStringsContainingIntsAndDoublesWithAnInvalidNumber_whenSortedByRegex_checkSortingCorrect() {
+
+        List<String> testStrings = Arrays.asList("a1", "b3", "c4", "d2.2", "d2.4", "d2.3.3d");
+
+        testStrings.sort(NaturalOrderComparators.createNaturalOrderRegexComparator());
+
+        List<String> expected = Arrays.asList("d2.3.3d", "a1", "d2.2", "d2.4", "b3", "c4");
+
+        assertEquals(expected, testStrings);
+
+
+    }
+
+    @Test
+    public void givenAllForseenProblems_whenSortedByRegex_checkSortingCorrect() {
+
+        List<String> testStrings = Arrays.asList("a1", "b3", "c4", "d2.2", "d2.f4", "d2.3.3d");
+
+        testStrings.sort(NaturalOrderComparators.createNaturalOrderRegexComparator());
+
+        List<String> expected = Arrays.asList("d2.3.3d", "a1", "d2.2", "d2.f4", "b3", "c4");
+
+        assertEquals(expected, testStrings);
+
+
+    }
+
+    @Test
+    public void givenComplexStringsContainingSeparatedNumbers_whenSortedByRegex_checkNumbersCondensedAndSorted() {
+
+        List<String> testStrings = Arrays.asList("a1b2c5", "b3ght3.2", "something65.thensomething5"); //125, 33.2, 65.5
+
+        List<String> expected = Arrays.asList("b3ght3.2", "something65.thensomething5", "a1b2c5" );
+
+        testStrings.sort(NaturalOrderComparators.createNaturalOrderRegexComparator());
+
+        assertEquals(expected, testStrings);
+
+    }
+
+    @Test
+    public void givenStringsNotContainingNumbers_whenSortedByRegex_checkOrderNotChanged() {
+
+        List<String> testStrings = Arrays.asList("a", "c", "d", "e");
+        List<String> expected = new ArrayList<>(testStrings);
+
+        testStrings.sort(NaturalOrderComparators.createNaturalOrderRegexComparator());
+
+        assertEquals(expected, testStrings);
+    }
+}
@@ -0,0 +1,20 @@
+package com.baeldung.algorithms.shellsort;
+
+public class ShellSort {
+
+    public static void sort(int arrayToSort[]) {
+        int n = arrayToSort.length;
+
+        for (int gap = n / 2; gap > 0; gap /= 2) {
+            for (int i = gap; i < n; i++) {
+                int key = arrayToSort[i];
+                int j = i;
+                while (j >= gap && arrayToSort[j - gap] > key) {
+                    arrayToSort[j] = arrayToSort[j - gap];
+                    j -= gap;
+                }
+                arrayToSort[j] = key;
+            }
+        }
+    }
+}
@@ -0,0 +1,17 @@
+package com.baeldung.algorithms.shellsort;
+
+import static org.junit.Assert.*;
+import static org.junit.Assert.assertArrayEquals;
+
+import org.junit.Test;
+
+public class ShellSortUnitTest {
+
+    @Test
+    public void givenUnsortedArray_whenShellSort_thenSortedAsc() {
+        int[] input = {41, 15, 82, 5, 65, 19, 32, 43, 8};
+        ShellSort.sort(input);
+        int[] expected = {5, 8, 15, 19, 32, 41, 43, 65, 82};
+        assertArrayEquals("the two arrays are not equal", expected, input);
+    }
+}
@@ -17,7 +17,7 @@
        <dependency>
            <groupId>junit</groupId>
            <artifactId>junit</artifactId>
-            <version>4.10</version>
+            <version>${junit.version}</version>
            <scope>test</scope>
        </dependency>
        <dependency>
@@ -3,37 +3,28 @@
 	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>
-	<parent>
-		<groupId>org.springframework.boot</groupId>
-		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.1.3.RELEASE</version>
-		<relativePath /> <!-- lookup parent from repository -->
-	</parent>
 	<groupId>org.baeldung.examples.olingo2</groupId>
 	<artifactId>olingo2-sample</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
 	<name>olingo2-sample</name>
 	<description>Sample Olingo 2 Project</description>

-	<properties>
-		<java.version>1.8</java.version>
-		<olingo2.version>2.0.11</olingo2.version>
-	</properties>
+    <parent>
+        <artifactId>parent-boot-2</artifactId>
+        <groupId>com.baeldung</groupId>
+        <version>0.0.1-SNAPSHOT</version>
+        <relativePath>../../parent-boot-2</relativePath>
+    </parent>

 	<dependencies>
-
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-jersey</artifactId>
 		</dependency>
-
-
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-data-jpa</artifactId>
 		</dependency>
-
-
 		<dependency>
 			<groupId>com.h2database</groupId>
 			<artifactId>h2</artifactId>
@@ -90,4 +81,8 @@
 		</plugins>
 	</build>

+	<properties>
+		<olingo2.version>2.0.11</olingo2.version>
+	</properties>
+
 </project>
@@ -7,7 +7,7 @@ import org.springframework.test.context.junit4.SpringRunner;

@RunWith(SpringRunner.class)
@SpringBootTest
-public class Olingo2SampleApplicationTests {
+public class Olingo2SampleApplicationUnitTest {

 	@Test
 	public void contextLoads() {
@@ -7,6 +7,13 @@
    <version>0.0.1</version>
    <name>apache-pulsar</name>

+    <parent>
+        <groupId>com.baeldung</groupId>
+        <artifactId>parent-modules</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+        <relativePath>..</relativePath>
+    </parent>
+
    <dependencies>
        <dependency>
            <groupId>org.apache.pulsar</groupId>
@@ -7,7 +7,7 @@ import org.apache.pulsar.client.api.Message;
 import org.apache.pulsar.client.api.PulsarClient;
 import org.apache.pulsar.client.api.SubscriptionType;

-public class ConsumerTest {
+public class ConsumerUnitTest {

    private static final String SERVICE_URL = "pulsar://localhost:6650";
    private static final String TOPIC_NAME = "test-topic";
@@ -11,7 +11,7 @@ import org.apache.pulsar.client.api.PulsarClientException;
 import java.io.IOException;
 import java.util.stream.IntStream;

-public class ProducerTest {
+public class ProducerUnitTest {

    private static final String SERVICE_URL = "pulsar://localhost:6650";
    private static final String TOPIC_NAME = "test-topic";
@@ -10,7 +10,7 @@ import org.apache.pulsar.client.api.SubscriptionType;

 import java.util.stream.IntStream;

-public class ExclusiveSubscriptionTest {
+public class ExclusiveSubscriptionUnitTest {
    private static final String SERVICE_URL = "pulsar://localhost:6650";
    private static final String TOPIC_NAME = "test-topic";
    private static final String SUBSCRIPTION_NAME = "test-subscription";
@@ -11,7 +11,7 @@ import org.apache.pulsar.client.api.SubscriptionType;

 import java.util.stream.IntStream;

-public class FailoverSubscriptionTest {
+public class FailoverSubscriptionUnitTest {
    private static final String SERVICE_URL = "pulsar://localhost:6650";
    private static final String TOPIC_NAME = "failover-subscription-test-topic";
    private static final String SUBSCRIPTION_NAME = "test-subscription";
@@ -49,6 +49,7 @@
 			<version>${com.datastax.spark.spark-cassandra-connector-java.version}</version>
 		</dependency>
    </dependencies>
+
 	<build>
    	<plugins>
    	  	<plugin>
@@ -78,6 +79,7 @@
      		</plugin>
   		</plugins>
  	</build>
+
    <properties>
        <org.apache.spark.spark-core.version>2.3.0</org.apache.spark.spark-core.version>
        <org.apache.spark.spark-sql.version>2.3.0</org.apache.spark.spark-sql.version>
@@ -1,3 +1,4 @@
 ### Relevant Articles:
 - [Introduction to AutoValue](http://www.baeldung.com/introduction-to-autovalue)
 - [Introduction to AutoFactory](http://www.baeldung.com/autofactory)
+- [Google AutoService](https://www.baeldung.com/google-autoservice)
@@ -112,7 +112,6 @@
    </repositories>

    <properties>
-        <commons-io.version>2.5</commons-io.version>
        <aws-lambda-java-events.version>1.3.0</aws-lambda-java-events.version>
        <aws-lambda-java-core.version>1.1.0</aws-lambda-java-core.version>
        <gson.version>2.8.0</gson.version>
@@ -18,12 +18,6 @@
            <groupId>org.axonframework</groupId>
            <artifactId>axon-spring-boot-starter</artifactId>
            <version>${axon.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.axonframework</groupId>
-                    <artifactId>axon-server-connector</artifactId>
-                </exclusion>
-            </exclusions>
        </dependency>

        <dependency>
@@ -58,7 +52,7 @@
    </dependencies>

    <properties>
-        <axon.version>4.0.3</axon.version>
+        <axon.version>4.1.2</axon.version>
    </properties>

 </project>
@@ -13,6 +13,7 @@ import com.baeldung.axon.coreapi.commands.ShipOrderCommand;
 import com.baeldung.axon.coreapi.events.OrderConfirmedEvent;
 import com.baeldung.axon.coreapi.events.OrderPlacedEvent;
 import com.baeldung.axon.coreapi.events.OrderShippedEvent;
+import com.baeldung.axon.coreapi.exceptions.UnconfirmedOrderException;

@Aggregate
 public class OrderAggregate {
@@ -34,7 +35,7 @@ public class OrderAggregate {
    @CommandHandler
    public void handle(ShipOrderCommand command) {
        if (!orderConfirmed) {
-            throw new IllegalStateException("Cannot ship an order which has not been confirmed yet.");
+            throw new UnconfirmedOrderException();
        }

        apply(new OrderShippedEvent(orderId));
@@ -43,12 +44,12 @@ public class OrderAggregate {
    @EventSourcingHandler
    public void on(OrderPlacedEvent event) {
        this.orderId = event.getOrderId();
-        orderConfirmed = false;
+        this.orderConfirmed = false;
    }

    @EventSourcingHandler
    public void on(OrderConfirmedEvent event) {
-        orderConfirmed = true;
+        this.orderConfirmed = true;
    }

    protected OrderAggregate() {
@@ -0,0 +1,8 @@
+package com.baeldung.axon.coreapi.exceptions;
+
+public class UnconfirmedOrderException extends IllegalStateException {
+
+    public UnconfirmedOrderException() {
+        super("Cannot ship an order which has not been confirmed yet.");
+    }
+}
@@ -5,6 +5,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;

+import org.axonframework.config.ProcessingGroup;
 import org.axonframework.eventhandling.EventHandler;
 import org.axonframework.queryhandling.QueryHandler;
 import org.springframework.stereotype.Service;
@@ -16,6 +17,7 @@ import com.baeldung.axon.coreapi.queries.FindAllOrderedProductsQuery;
 import com.baeldung.axon.coreapi.queries.OrderedProduct;

@Service
+@ProcessingGroup("ordered-products")
 public class OrderedProductsEventHandler {

    private final Map<String, OrderedProduct> orderedProducts = new HashMap<>();
@@ -0,0 +1 @@
+spring.application.name=Order Management Service
@@ -2,6 +2,7 @@ package com.baeldung.axon.commandmodel;

 import java.util.UUID;

+import com.baeldung.axon.coreapi.exceptions.UnconfirmedOrderException;
 import org.axonframework.test.aggregate.AggregateTestFixture;
 import org.axonframework.test.aggregate.FixtureConfiguration;
 import org.junit.*;
@@ -41,12 +42,12 @@ public class OrderAggregateUnitTest {
    }

    @Test
-    public void givenOrderPlacedEvent_whenShipOrderCommand_thenShouldThrowIllegalStateException() {
+    public void givenOrderPlacedEvent_whenShipOrderCommand_thenShouldThrowUnconfirmedOrderException() {
        String orderId = UUID.randomUUID().toString();
        String product = "Deluxe Chair";
        fixture.given(new OrderPlacedEvent(orderId, product))
               .when(new ShipOrderCommand(orderId))
-               .expectException(IllegalStateException.class);
+               .expectException(UnconfirmedOrderException.class);
    }

    @Test
@@ -65,7 +65,6 @@
    <properties>
        <main.class>com.baeldung.bootique.App</main.class>
        <bootique-bom.version>0.23</bootique-bom.version>
-
        <maven-shade-plugin.version>2.4.3</maven-shade-plugin.version>
    </properties>

@@ -5,4 +5,6 @@
 - [String Matching in Groovy](http://www.baeldung.com/)
 - [Template Engines in Groovy](https://www.baeldung.com/groovy-template-engines)
 - [Groovy def Keyword](https://www.baeldung.com/groovy-def-keyword)
- [Pattern Matching in Strings in Groovy](https://www.baeldung.com/groovy-pattern-matching)
+- [Pattern Matching in Strings in Groovy](https://www.baeldung.com/groovy-pattern-matching)
+- [Working with XML in Groovy](https://www.baeldung.com/groovy-xml)
+- [Integrating Groovy into Java Applications](https://www.baeldung.com/groovy-java-applications)
@@ -157,27 +157,24 @@
    </repositories>

    <pluginRepositories>
-                <pluginRepository>
-                    <id>bintray</id>
-                    <name>Groovy Bintray</name>
-                    <url>https://dl.bintray.com/groovy/maven</url>
-                    <releases>
-                        <!-- avoid automatic updates -->
-                        <updatePolicy>never</updatePolicy>
-                    </releases>
-                    <snapshots>
-                        <enabled>false</enabled>
-                    </snapshots>
-                </pluginRepository>
-            </pluginRepositories>
-
+        <pluginRepository>
+            <id>bintray</id>
+            <name>Groovy Bintray</name>
+            <url>https://dl.bintray.com/groovy/maven</url>
+            <releases>
+                <!-- avoid automatic updates -->
+                <updatePolicy>never</updatePolicy>
+            </releases>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </pluginRepository>
+    </pluginRepositories>

    <properties>
        <junit.platform.version>1.0.0</junit.platform.version>
        <hsqldb.version>2.4.0</hsqldb.version>
        <spock-core.version>1.1-groovy-2.4</spock-core.version>
-        <commons-lang3.version>3.9</commons-lang3.version>
-        <java.version>1.8</java.version>
        <maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
        <logback.version>1.2.3</logback.version>
        <groovy.version>2.5.7</groovy.version>
@@ -0,0 +1,52 @@
+package com.baeldung.concatenate
+
+class Wonder {
+
+    String numOfWonder = 'seven'
+
+    String operator_plus() {
+        return 'The ' + numOfWonder + ' wonders of the world'
+    }
+
+    String operator_left() {
+        return 'The ' << numOfWonder << ' wonders of ' << 'the world'
+    }
+
+    String interpolation_one() {
+        return "The $numOfWonder wonders of the world"
+
+    }
+
+    String interpolation_two() {
+        return "The ${numOfWonder} wonders of the world"
+    }
+
+    String multilineString() {
+        return """
+            There are $numOfWonder wonders of the world.
+            Can you name them all? 
+            1. The Great Pyramid of Giza
+            2. Hanging Gardens of Babylon
+            3. Colossus of Rhode
+            4. Lighthouse of Alexendra
+            5. Temple of Artemis
+            6. Status of Zeus at Olympia
+            7. Mausoleum at Halicarnassus
+        """
+    }
+
+    String method_concat() {
+        return 'The '.concat(numOfWonder).concat(' wonders of the world')
+
+    }
+
+    String method_builder() {
+        return new StringBuilder()
+                .append('The ').append(numOfWonder).append(' wonders of the world')
+    }
+
+    String method_buffer() {
+        return new StringBuffer()
+                .append('The ').append(numOfWonder).append(' wonders of the world')
+    }
+}
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				`spring.application.name=Order Management Service`