[BAEL-16531] - Move all the existing articles on "optional" under jav…

…a-optional
earasoft · Nov 26, 2019 · 34e61ef · 34e61ef
1 parent 5df99fa
commit 34e61ef
Show file tree

Hide file tree

Showing 29 changed files with 230 additions and 201 deletions.
diff --git a/core-java-modules/core-java-11/README.md b/core-java-modules/core-java-11/README.md
@@ -12,4 +12,3 @@ This module contains articles about Java 11 core features
 - [An Introduction to Epsilon GC: A No-Op Experimental Garbage Collector](https://www.baeldung.com/jvm-epsilon-gc-garbage-collector)
 - [Guide to jlink](https://www.baeldung.com/jlink)
 - [Negate a Predicate Method Reference with Java 11](https://www.baeldung.com/java-negate-predicate-method-reference)
-- [Transforming an Empty String into an Empty Optional](https://www.baeldung.com/java-empty-string-to-empty-optional)
diff --git a/core-java-modules/core-java-8-2/src/main/resources/META-INF/persistence.xml b/core-java-modules/core-java-8-2/src/main/resources/META-INF/persistence.xml
@@ -5,14 +5,14 @@
 	version="2.0">
 
 	<persistence-unit
-		name="com.baeldung.optionalReturnType"
+		name="com.baeldung.optionalreturntype"
 		transaction-type="RESOURCE_LOCAL">
 		<description>Persist Optional Return Type Demo</description>
 		<provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
-		<class>com.baeldung.optionalReturnType.User</class>
-		<class>com.baeldung.optionalReturnType.UserOptional</class>
+		<class>com.baeldung.optionalreturntype.User</class>
+		<class>com.baeldung.optionalreturntype.UserOptional</class>
 		<!-- 
-		<class>com.baeldung.optionalReturnType.UserOptionalField</class>
+		<class>com.baeldung.optionalreturntype.UserOptionalField</class>
 		-->
 		<exclude-unlisted-classes>true</exclude-unlisted-classes>
 

diff --git a/core-java-modules/core-java-9-improvements/README.md b/core-java-modules/core-java-9-improvements/README.md
@@ -5,7 +5,6 @@ This module contains articles about the improvements to core Java features intro
 ### Relevant Articles:
 
 - [New Stream Collectors in Java 9](http://www.baeldung.com/java9-stream-collectors)
-- [Java 9 Optional API Additions](https://www.baeldung.com/java-9-optional)
 - [Java 9 Convenience Factory Methods for Collections](https://www.baeldung.com/java-9-collections-factory-methods)
 - [Java 9 Stream API Improvements](https://www.baeldung.com/java-9-stream-api)
 - [Java 9 java.util.Objects Additions](https://www.baeldung.com/java-9-objects-new)

diff --git a/...-modules/core-java-9-improvements/src/test/java/com/baeldung/java9/Java9OptionalTest.java b/...-modules/core-java-9-improvements/src/test/java/com/baeldung/java9/Java9OptionalTest.java
diff --git a/core-java-modules/core-java-9/README.md b/core-java-modules/core-java-9/README.md
@@ -4,13 +4,11 @@ This module contains articles about Java 9 core features
 
 ### Relevant Articles:
 
-- [Method Handles in Java](http://www.baeldung.com/java-method-handles)
-- [Introduction to Chronicle Queue](http://www.baeldung.com/java-chronicle-queue)
-- [Optional orElse Optional](http://www.baeldung.com/java-optional-or-else-optional)
+- [Method Handles in Java](https://www.baeldung.com/java-method-handles)
+- [Introduction to Chronicle Queue](https://www.baeldung.com/java-chronicle-queue)
 - [Iterate Through a Range of Dates in Java](https://www.baeldung.com/java-iterate-date-range)
 - [Initialize a HashMap in Java](https://www.baeldung.com/java-initialize-hashmap)
 - [Immutable Set in Java](https://www.baeldung.com/java-immutable-set)
-- [Filtering a Stream of Optionals in Java](https://www.baeldung.com/java-filter-stream-of-optional)
 
 Note: also contains part of the code for the article
 [How to Filter a Collection in Java](https://www.baeldung.com/java-collection-filtering).
diff --git a/core-java-modules/core-java-9/src/test/java/com/baeldung/optionals/OptionalsTest.java b/core-java-modules/core-java-9/src/test/java/com/baeldung/optionals/OptionalsTest.java
diff --git a/core-java-modules/core-java-exceptions/README.md b/core-java-modules/core-java-exceptions/README.md
@@ -15,6 +15,5 @@ This module contains articles about core java exceptions
 - [Java – Try with Resources](https://www.baeldung.com/java-try-with-resources)
 - [Java Global Exception Handler](https://www.baeldung.com/java-global-exception-handler)
 - [Common Java Exceptions](https://www.baeldung.com/java-common-exceptions)
-- [Throw Exception in Optional in Java 8](https://www.baeldung.com/java-optional-throw-exception)
 - [How to Find an Exception’s Root Cause in Java](https://www.baeldung.com/java-exception-root-cause)
 - [Is It a Bad Practice to Catch Throwable?](https://www.baeldung.com/java-catch-throwable-bad-practice)
diff --git a/core-java-modules/core-java-optional/README.md b/core-java-modules/core-java-optional/README.md
@@ -1,8 +1,13 @@
-=========
+## Java Optional
 
-## Core Java Optional
+This module contains articles about Java Optional.
 
 ### Relevant Articles: 
 - [Java Optional as Return Type](https://www.baeldung.com/java-optional-return)
-- [Guide To Java 8 Optional](https://www.baeldung.com/java-optional)
-- [Java Optional – orElse() vs orElseGet()](https://www.baeldung.com/java-optional-or-else-vs-or-else-get)
+- [Guide to Java 8 Optional](https://www.baeldung.com/java-optional)
+- [Java Optional – orElse() vs orElseGet()](https://www.baeldung.com/java-optional-or-else-vs-or-else-get)
+- [Transforming an Empty String into an Empty Optional](https://www.baeldung.com/java-empty-string-to-empty-optional)
+- [Filtering a Stream of Optionals in Java](https://www.baeldung.com/java-filter-stream-of-optional)
+- [Java 9 Optional API Additions](https://www.baeldung.com/java-9-optional)
+- [Throw Exception in Optional in Java 8](https://www.baeldung.com/java-optional-throw-exception)
+- [Optional orElse Optional](https://www.baeldung.com/java-optional-or-else-optional)
diff --git a/core-java-modules/core-java-optional/pom.xml b/core-java-modules/core-java-optional/pom.xml
@@ -42,11 +42,31 @@
             <artifactId>jmh-generator-bytecode</artifactId>
             <version>${jmh-generator.version}</version>
         </dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>${guava.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.rest-assured</groupId>
+            <artifactId>json-path</artifactId>
+            <version>${rest-assured.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <version>${assertj.version}</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <properties>
         <hibernate.core.version>5.4.0.Final</hibernate.core.version>
         <jmh-core.version>1.19</jmh-core.version>
         <jmh-generator.version>1.19</jmh-generator.version>
+        <guava.version>27.1-jre</guava.version>
+        <assertj.version>3.10.0</assertj.version>
+        <rest-assured.version>3.1.1</rest-assured.version>
     </properties>
 </project>
diff --git a/...baeldung/optional/OrElseAndOrElseGet.java → ...g/optional/orelse/OrElseAndOrElseGet.java b/...baeldung/optional/OrElseAndOrElseGet.java → ...g/optional/orelse/OrElseAndOrElseGet.java
@@ -1,4 +1,4 @@
-package com.baeldung.optional;
+package com.baeldung.optional.orelse;
 
 import java.util.Arrays;
 import java.util.List;

diff --git a/...al/OrElseAndOrElseGetBenchmarkRunner.java → ...se/OrElseAndOrElseGetBenchmarkRunner.java b/...al/OrElseAndOrElseGetBenchmarkRunner.java → ...se/OrElseAndOrElseGetBenchmarkRunner.java
@@ -1,4 +1,4 @@
-package com.baeldung.optional;
+package com.baeldung.optional.orelse;
 
 import java.io.IOException;
 import java.util.concurrent.TimeUnit;

diff --git a/...ReturnType/HandleOptionalTypeExample.java → ...returntype/HandleOptionalTypeExample.java b/...ReturnType/HandleOptionalTypeExample.java → ...returntype/HandleOptionalTypeExample.java
@@ -1,4 +1,4 @@
-package com.baeldung.optionalReturnType;
+package com.baeldung.optionalreturntype;
 
 import java.util.HashMap;
 import java.util.Map;

diff --git a/...onalReturnType/OptionalToJsonExample.java → ...onalreturntype/OptionalToJsonExample.java b/...onalReturnType/OptionalToJsonExample.java → ...onalreturntype/OptionalToJsonExample.java
@@ -1,4 +1,4 @@
-package com.baeldung.optionalReturnType;
+package com.baeldung.optionalreturntype;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;

diff --git a/...eturnType/PersistOptionalTypeExample.java → ...eturntype/PersistOptionalTypeExample.java b/...eturnType/PersistOptionalTypeExample.java → ...eturntype/PersistOptionalTypeExample.java
@@ -1,4 +1,4 @@
-package com.baeldung.optionalReturnType;
+package com.baeldung.optionalreturntype;
 
 import java.util.Optional;
 
@@ -7,13 +7,13 @@
 import javax.persistence.Persistence;
 
 public class PersistOptionalTypeExample {
-    static String persistenceUnit = "com.baeldung.optionalReturnType";
+    static String persistenceUnit = "com.baeldung.optionalreturntype";
     static EntityManagerFactory emf = Persistence.createEntityManagerFactory(persistenceUnit);
 
     static EntityManager entityManager = emf.createEntityManager();
 
     // to run this app, uncomment the follow line in META-INF/persistence.xml
-    // <class>com.baeldung.optionalReturnType.UserOptionalField</class>
+    // <class>com.baeldung.optionalreturntype.UserOptionalField</class>
     public static void main(String[] args) {
         UserOptionalField user1 = new UserOptionalField();
         user1.setUserId(1l);

diff --git a/...turnType/PersistOptionalTypeExample2.java → ...turntype/PersistOptionalTypeExample2.java b/...turnType/PersistOptionalTypeExample2.java → ...turntype/PersistOptionalTypeExample2.java
@@ -1,11 +1,11 @@
-package com.baeldung.optionalReturnType;
+package com.baeldung.optionalreturntype;
 
 import javax.persistence.EntityManager;
 import javax.persistence.EntityManagerFactory;
 import javax.persistence.Persistence;
 
 public class PersistOptionalTypeExample2 {
-    static String persistenceUnit = "com.baeldung.optionalReturnType";
+    static String persistenceUnit = "com.baeldung.optionalreturntype";
     static EntityManagerFactory emf = Persistence.createEntityManagerFactory(persistenceUnit);
 
     static EntityManager em = emf.createEntityManager();

diff --git a/...ptionalReturnType/PersistUserExample.java → ...ptionalreturntype/PersistUserExample.java b/...ptionalReturnType/PersistUserExample.java → ...ptionalreturntype/PersistUserExample.java
@@ -1,11 +1,11 @@
-package com.baeldung.optionalReturnType;
+package com.baeldung.optionalreturntype;
 
 import javax.persistence.EntityManager;
 import javax.persistence.EntityManagerFactory;
 import javax.persistence.Persistence;
 
 public class PersistUserExample {
-    static String persistenceUnit = "com.baeldung.optionalReturnType";
+    static String persistenceUnit = "com.baeldung.optionalreturntype";
     static EntityManagerFactory emf = Persistence.createEntityManagerFactory(persistenceUnit);
 
     static EntityManager em = emf.createEntityManager();

diff --git a/...urnType/SerializeOptionalTypeExample.java → ...urntype/SerializeOptionalTypeExample.java b/...urnType/SerializeOptionalTypeExample.java → ...urntype/SerializeOptionalTypeExample.java
@@ -1,4 +1,4 @@
-package com.baeldung.optionalReturnType;
+package com.baeldung.optionalreturntype;
 
 import java.io.FileOutputStream;
 import java.io.IOException;

diff --git a/...com/baeldung/optionalReturnType/User.java → ...com/baeldung/optionalreturntype/User.java b/...com/baeldung/optionalReturnType/User.java → ...com/baeldung/optionalreturntype/User.java
@@ -1,4 +1,4 @@
-package com.baeldung.optionalReturnType;
+package com.baeldung.optionalreturntype;
 
 import java.io.Serializable;
 

diff --git a/...dung/optionalReturnType/UserOptional.java → ...dung/optionalreturntype/UserOptional.java b/...dung/optionalReturnType/UserOptional.java → ...dung/optionalreturntype/UserOptional.java
@@ -1,4 +1,4 @@
-package com.baeldung.optionalReturnType;
+package com.baeldung.optionalreturntype;
 
 import java.io.Serializable;
 import java.util.Optional;

diff --git a/...optionalReturnType/UserOptionalField.java → ...optionalreturntype/UserOptionalField.java b/...optionalReturnType/UserOptionalField.java → ...optionalreturntype/UserOptionalField.java
@@ -1,4 +1,4 @@
-package com.baeldung.optionalReturnType;
+package com.baeldung.optionalreturntype;
 
 import java.io.Serializable;
 import java.util.Optional;

diff --git a/...ava/com/baeldung/optionals/Optionals.java → ...aeldung/orelseoptional/OptionalUtils.java b/...ava/com/baeldung/optionals/Optionals.java → ...aeldung/orelseoptional/OptionalUtils.java
@@ -1,20 +1,20 @@
-package com.baeldung.optionals;
+package com.baeldung.orelseoptional;
 
 import java.util.Optional;
 
-public class Optionals {
+public class OptionalUtils {
 
     public static <T> Optional<T> or(Optional<T> optional, Optional<T> fallback) {
         return optional.isPresent() ? optional : fallback;
     }
 
-    public static Optional<String> getName(Optional<String> name) {
-        return name.or(() -> getCustomMessage());
-    }
-
-    public static com.google.common.base.Optional<String> getOptionalGuavaName(com.google.common.base.Optional<String> name) {
-        return name.or(getCustomMessageGuava());
-    }
+//    public static Optional<String> getName(Optional<String> name) {
+//        return name.or(() -> getCustomMessage());
+//    }
+//
+//    public static com.google.common.base.Optional<String> getOptionalGuavaName(com.google.common.base.Optional<String> name) {
+//        return name.or(getCustomMessageGuava());
+//    }
 
     private static Optional<String> getCustomMessage() {
         return Optional.of("Name not provided");