[JAVA-40671] Moved articles from vavr to vavr-2 (#17887)

panos-kakos · web-flow · commit d5564386cddd · 2024-11-02T00:11:04.000+02:00
diff --git a/pom.xml b/pom.xml
@@ -602,7 +602,6 @@
                 <!--<module>tablesaw</module>--><!-- failing after upgrading to jdk17-->
                 <!--<module>spring-swagger-codegen-modules/openapi-custom-generator</module>
                 <module>spring-swagger-codegen-modules/openapi-custom-generator-api-client</module> --> <!-- cannot add the individual modules here because the order is not guaranteed -->
-                <module>vavr-modules/vavr</module>
             </modules>
 
             <properties>
@@ -995,7 +994,6 @@
                 <!--<module>tablesaw</module>--><!-- failing after upgrading to jdk17-->
                 <!--<module>spring-swagger-codegen-modules/openapi-custom-generator</module>
                 <module>spring-swagger-codegen-modules/openapi-custom-generator-api-client</module> --> <!-- cannot add the individual modules here because the order is not guaranteed -->
-                <module>vavr-modules/vavr</module>
             </modules>
 
             <properties>
diff --git a/vavr-modules/pom.xml b/vavr-modules/pom.xml
@@ -14,22 +14,11 @@
     </parent>
 
     <modules>
-        <!-- <module>vavr</module> --> <!-- failing after upgrade to jdk21 -->
+        <module>vavr</module>
         <module>vavr-2</module>
         <module>java-vavr-stream</module>
     </modules>
 
-    <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.springframework.boot</groupId>
-                    <artifactId>spring-boot-maven-plugin</artifactId>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-    </build>
-
     <properties>
         <vavr.version>0.9.2</vavr.version>
     </properties>
diff --git a/vavr-modules/vavr-2/README.md b/vavr-modules/vavr-2/README.md
@@ -5,4 +5,12 @@ This module contains articles about Vavr.
 ### Relevant Articles:
 - [Introduction to Vavr’s Either](https://www.baeldung.com/vavr-either)
 - [Interoperability Between Java and Vavr](https://www.baeldung.com/java-vavr)
+- [Guide to Collections API in Vavr](https://www.baeldung.com/vavr-collections)
+- [Collection Factory Methods for Vavr](https://www.baeldung.com/vavr-collection-factory-methods)
+- [Introduction to Future in Vavr](https://www.baeldung.com/vavr-future)
+- [Introduction to Vavr’s Validation API](https://www.baeldung.com/vavr-validation-api)
+- [Guide to Pattern Matching in Vavr](https://www.baeldung.com/vavr-pattern-matching)
+- [Property Testing Example With Vavr](https://www.baeldung.com/vavr-property-testing) 
+- [Vavr Support in Spring Data](https://www.baeldung.com/spring-vavr)
+- [Exceptions in Lambda Expression Using Vavr](https://www.baeldung.com/exceptions-using-vavr)
 - [[<-- prev]](/vavr-modules/vavr)
diff --git a/vavr-modules/vavr-2/pom.xml b/vavr-modules/vavr-2/pom.xml
@@ -19,6 +19,37 @@
             <artifactId>vavr-test</artifactId>
             <version>${vavr.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-jpa</artifactId>
+            <version>${spring-boot.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <version>${h2.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <version>${spring-boot.version}</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
+    <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-maven-plugin</artifactId>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+    </build>
+
+    <properties>
+        <spring-boot.version>2.7.11</spring-boot.version>
+    </properties>
+
 </project>
diff --git a/vavr-modules/vavr-2/src/main/java/com/baeldung/vavr/spring/Application.java b/vavr-modules/vavr-2/src/main/java/com/baeldung/vavr/spring/Application.java
@@ -1,4 +1,4 @@
-package com.baeldung;
+package com.baeldung.vavr.spring;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/vavr-modules/vavr-2/src/main/java/com/baeldung/vavr/spring/model/User.java b/vavr-modules/vavr-2/src/main/java/com/baeldung/vavr/spring/model/User.java
@@ -1,4 +1,4 @@
-package com.baeldung.vavr;
+package com.baeldung.vavr.spring.model;
 
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
diff --git a/vavr-modules/vavr-2/src/main/java/com/baeldung/vavr/spring/repositories/VavrUserRepository.java b/vavr-modules/vavr-2/src/main/java/com/baeldung/vavr/spring/repositories/VavrUserRepository.java
@@ -1,12 +1,12 @@
-package com.baeldung.repositories;
+package com.baeldung.vavr.spring.repositories;
 
 import org.springframework.data.repository.Repository;
 
-import com.baeldung.vavr.User;
-
 import io.vavr.collection.Seq;
 import io.vavr.control.Option;
 
+import com.baeldung.vavr.spring.model.User;
+
 public interface VavrUserRepository extends Repository<User, Long> {
 
     Option<User> findById(long id);
diff --git a/vavr-modules/vavr-2/src/main/java/com/baeldung/vavr/vavrvalidation/application/Application.java b/vavr-modules/vavr-2/src/main/java/com/baeldung/vavr/vavrvalidation/application/Application.java
@@ -1,7 +1,8 @@
-package com.baeldung.vavrvalidation.application;
+package com.baeldung.vavr.vavrvalidation.application;
+
+import com.baeldung.vavr.vavrvalidation.model.User;
+import com.baeldung.vavr.vavrvalidation.validator.UserValidator;
 
-import com.baeldung.vavrvalidation.model.User;
-import com.baeldung.vavrvalidation.validator.UserValidator;
 import io.vavr.collection.Seq;
 import io.vavr.control.Validation;
 
diff --git a/vavr-modules/vavr-2/src/main/java/com/baeldung/vavr/vavrvalidation/model/User.java b/vavr-modules/vavr-2/src/main/java/com/baeldung/vavr/vavrvalidation/model/User.java
@@ -1,4 +1,4 @@
-package com.baeldung.vavrvalidation.model;
+package com.baeldung.vavr.vavrvalidation.model;
 
 public class User {
     private String name;
diff --git a/vavr-modules/vavr-2/src/main/java/com/baeldung/vavr/vavrvalidation/validator/UserValidator.java b/vavr-modules/vavr-2/src/main/java/com/baeldung/vavr/vavrvalidation/validator/UserValidator.java
@@ -1,6 +1,7 @@
-package com.baeldung.vavrvalidation.validator;
+package com.baeldung.vavr.vavrvalidation.validator;
+
+import com.baeldung.vavr.vavrvalidation.model.User;
 
-import com.baeldung.vavrvalidation.model.User;
 import io.vavr.collection.CharSeq;
 import io.vavr.collection.Seq;
 import io.vavr.control.Validation;
diff --git a/vavr-modules/vavr-2/src/main/resources/application.properties b/vavr-modules/vavr-2/src/main/resources/application.properties
diff --git a/vavr-modules/vavr-2/src/main/resources/logback.xml b/vavr-modules/vavr-2/src/main/resources/logback.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n
+            </pattern>
+        </encoder>
+    </appender>
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT" />
+    </root>
+</configuration>
diff --git a/vavr-modules/vavr-2/src/test/java/com/baeldung/vavr/collections/CollectionAPIUnitTest.java b/vavr-modules/vavr-2/src/test/java/com/baeldung/vavr/collections/CollectionAPIUnitTest.java
@@ -1,9 +1,23 @@
 package com.baeldung.vavr.collections;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+
+import java.util.Arrays;
+import java.util.Comparator;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+
+import org.junit.Test;
+
 import io.vavr.Tuple;
 import io.vavr.Tuple2;
-import io.vavr.collection.*;
+import io.vavr.collection.Array;
 import io.vavr.collection.BitSet;
+import io.vavr.collection.CharSeq;
 import io.vavr.collection.HashMap;
 import io.vavr.collection.HashSet;
 import io.vavr.collection.Iterator;
@@ -13,20 +27,10 @@
 import io.vavr.collection.Set;
 import io.vavr.collection.SortedMap;
 import io.vavr.collection.SortedSet;
+import io.vavr.collection.Stream;
 import io.vavr.collection.TreeMap;
 import io.vavr.collection.TreeSet;
 import io.vavr.collection.Vector;
-import org.junit.Test;
-
-import java.util.*;
-import java.util.stream.Collectors;
-import java.util.stream.IntStream;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotSame;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
 
 public class CollectionAPIUnitTest {
 
@@ -291,7 +295,7 @@ public void givenTreeMap_whenIterated_thenCorrect() {
 
     @Test
     public void givenJavaList_whenConverted_thenCorrect() {
-        java.util.List<Integer> javaList = java.util.Arrays.asList(1, 2, 3, 4);
+        java.util.List<Integer> javaList = Arrays.asList(1, 2, 3, 4);
         List<Integer> vavrList = List.ofAll(javaList);
 
         assertEquals(4, vavrList.size());
diff --git a/vavr-modules/vavr-2/src/test/java/com/baeldung/vavr/collections/CollectionFactoryMethodsUnitTest.java b/vavr-modules/vavr-2/src/test/java/com/baeldung/vavr/collections/CollectionFactoryMethodsUnitTest.java
diff --git a/vavr-modules/vavr-2/src/test/java/com/baeldung/vavr/exception/handling/VavrExceptionHandlingUnitTest.java b/vavr-modules/vavr-2/src/test/java/com/baeldung/vavr/exception/handling/VavrExceptionHandlingUnitTest.java
@@ -1,17 +1,18 @@
 package com.baeldung.vavr.exception.handling;
 
-import io.vavr.API;
-import io.vavr.CheckedFunction1;
-import io.vavr.Value;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.List;
+
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.List;
+import io.vavr.API;
+import io.vavr.CheckedFunction1;
+import io.vavr.Value;
 
 public class VavrExceptionHandlingUnitTest {
 
diff --git a/vavr-modules/vavr-2/src/test/java/com/baeldung/vavr/future/FutureUnitTest.java b/vavr-modules/vavr-2/src/test/java/com/baeldung/vavr/future/FutureUnitTest.java
@@ -1,18 +1,18 @@
 package com.baeldung.vavr.future;
 
-import io.vavr.Tuple;
-import io.vavr.concurrent.Future;
-import io.vavr.control.Option;
-import io.vavr.control.Try;
-import org.junit.Test;
-import org.junit.jupiter.api.Disabled;
+import static java.util.concurrent.Executors.newSingleThreadExecutor;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
 
-import static java.util.concurrent.Executors.newSingleThreadExecutor;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import org.junit.Test;
+
+import io.vavr.Tuple;
+import io.vavr.concurrent.Future;
+import io.vavr.control.Option;
+import io.vavr.control.Try;
 
 public class FutureUnitTest {
 
diff --git a/vavr-modules/vavr-2/src/test/java/com/baeldung/vavr/patternmatching/PatternMatchingUnitTest.java b/vavr-modules/vavr-2/src/test/java/com/baeldung/vavr/patternmatching/PatternMatchingUnitTest.java
@@ -1,8 +1,4 @@
-package com.baeldung.vavr;
-
-import io.vavr.MatchError;
-import io.vavr.control.Option;
-import org.junit.Test;
+package com.baeldung.vavr.patternmatching;
 
 import static io.vavr.API.$;
 import static io.vavr.API.Case;
@@ -19,6 +15,11 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
+import org.junit.Test;
+
+import io.vavr.MatchError;
+import io.vavr.control.Option;
+
 public class PatternMatchingUnitTest {
     @Test
     public void whenMatchesDefault_thenCorrect() {
diff --git a/vavr-modules/vavr-2/src/test/java/com/baeldung/vavr/propertytesting/PropertyBasedLongRunningUnitTest.java b/vavr-modules/vavr-2/src/test/java/com/baeldung/vavr/propertytesting/PropertyBasedLongRunningUnitTest.java
@@ -1,17 +1,18 @@
-package com.baeldung.vavr;
+package com.baeldung.vavr.propertytesting;
+
+import static io.vavr.API.$;
+import static io.vavr.API.Case;
+import static io.vavr.API.Match;
+
+import java.util.function.Predicate;
+
+import org.junit.Test;
 
 import io.vavr.CheckedFunction1;
 import io.vavr.collection.Stream;
 import io.vavr.test.Arbitrary;
 import io.vavr.test.CheckResult;
 import io.vavr.test.Property;
-import org.junit.Test;
-
-import java.util.function.Predicate;
-
-import static io.vavr.API.$;
-import static io.vavr.API.Case;
-import static io.vavr.API.Match;
 
 public class PropertyBasedLongRunningUnitTest {
 
diff --git a/vavr-modules/vavr-2/src/test/java/com/baeldung/vavr/spring/VavrRepositoryIntegrationTest.java b/vavr-modules/vavr-2/src/test/java/com/baeldung/vavr/spring/VavrRepositoryIntegrationTest.java
@@ -1,20 +1,21 @@
-package com.baeldung.vavr.repositories;
+package com.baeldung.vavr.spring;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
-import com.baeldung.Application;
-import com.baeldung.repositories.VavrUserRepository;
-import com.baeldung.vavr.User;
-import io.vavr.collection.Seq;
-import io.vavr.control.Option;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import com.baeldung.vavr.spring.repositories.VavrUserRepository;
+import com.baeldung.vavr.spring.model.User;
+
+import io.vavr.collection.Seq;
+import io.vavr.control.Option;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest(classes = Application.class)
diff --git a/vavr-modules/vavr-2/src/test/java/com/baeldung/vavr/vavrvalidation/validator/UserValidatorUnitTest.java b/vavr-modules/vavr-2/src/test/java/com/baeldung/vavr/vavrvalidation/validator/UserValidatorUnitTest.java
@@ -1,9 +1,10 @@
-package com.baeldung.vavrvalidation.validator;
+package com.baeldung.vavr.vavrvalidation.validator;
 
-import static org.junit.Assert.*;
 import static org.hamcrest.CoreMatchers.instanceOf;
+import static org.junit.Assert.assertThat;
+
 import org.junit.Test;
-import com.baeldung.vavrvalidation.validator.UserValidator;
+
 import io.vavr.control.Validation.Invalid;
 import io.vavr.control.Validation.Valid;
 
diff --git a/vavr-modules/vavr-2/src/test/java/com/baeldung/vavr/vavrvalidation/validator/ValidationUnitTest.java b/vavr-modules/vavr-2/src/test/java/com/baeldung/vavr/vavrvalidation/validator/ValidationUnitTest.java
@@ -1,11 +1,16 @@
-package com.baeldung.vavrvalidation.validator;
+package com.baeldung.vavr.vavrvalidation.validator;
+
+import static org.hamcrest.CoreMatchers.instanceOf;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
 
-import static org.hamcrest.CoreMatchers.*;
-import static org.junit.Assert.*;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
-import com.baeldung.vavrvalidation.model.User;
+
+import com.baeldung.vavr.vavrvalidation.model.User;
+
 import io.vavr.collection.Seq;
 import io.vavr.control.Either.Right;
 import io.vavr.control.Validation.Invalid;
diff --git a/vavr-modules/vavr/README.md b/vavr-modules/vavr/README.md
@@ -5,12 +5,4 @@ This module contains articles about Vavr.
 ### Relevant Articles:
 - [Introduction to Vavr](https://www.baeldung.com/vavr)
 - [Guide to Try in Vavr](https://www.baeldung.com/vavr-try)
-- [Guide to Pattern Matching in Vavr](https://www.baeldung.com/vavr-pattern-matching)
-- [Property Testing Example With Vavr](https://www.baeldung.com/vavr-property-testing)
-- [Exceptions in Lambda Expression Using Vavr](https://www.baeldung.com/exceptions-using-vavr)
-- [Vavr Support in Spring Data](https://www.baeldung.com/spring-vavr)
-- [Introduction to Vavr’s Validation API](https://www.baeldung.com/vavr-validation-api)
-- [Guide to Collections API in Vavr](https://www.baeldung.com/vavr-collections)
-- [Collection Factory Methods for Vavr](https://www.baeldung.com/vavr-collection-factory-methods)
-- [Introduction to Future in Vavr](https://www.baeldung.com/vavr-future)
 - [[next -->]](/vavr-modules/vavr-2)
diff --git a/vavr-modules/vavr/pom.xml b/vavr-modules/vavr/pom.xml

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.baeldung;`
	`1`	`+package com.baeldung.vavr.spring;`
`2`	`2`
`3`	`3`	`import org.springframework.boot.SpringApplication;`
`4`	`4`	`import org.springframework.boot.autoconfigure.SpringBootApplication;`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.baeldung.vavr;`
	`1`	`+package com.baeldung.vavr.spring.model;`
`2`	`2`
`3`	`3`	`import javax.persistence.Entity;`
`4`	`4`	`import javax.persistence.GeneratedValue;`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.baeldung.vavrvalidation.model;`
	`1`	`+package com.baeldung.vavr.vavrvalidation.model;`
`2`	`2`
`3`	`3`	`public class User {`
`4`	`4`	`private String name;`