JAMES-2127 Server: Replaced guava's Optional by java.util.Optional an…

…d it's related
apache · Aug 30, 2017 · 3de1401 · 3de1401
1 parent a50cd62
commit 3de1401
Show file tree

Hide file tree

Showing 55 changed files with 236 additions and 285 deletions.
diff --git a/server/container/core/src/main/java/org/apache/james/core/filesystem/SimpleUrl.java b/server/container/core/src/main/java/org/apache/james/core/filesystem/SimpleUrl.java
@@ -18,12 +18,12 @@
  ****************************************************************/
 package org.apache.james.core.filesystem;
 
+import java.util.Optional;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.CharMatcher;
-import com.google.common.base.Optional;
 import com.google.common.io.Files;
 
 public class SimpleUrl {
@@ -50,8 +50,8 @@ public SimpleUrl(String url) {
     private static void extractComponents(String urlWithUnixSeparators) {
         Matcher m = URL_REGEXP.matcher(urlWithUnixSeparators);
         m.matches();
-        protocol = Optional.fromNullable(m.group(1)).or("");
-        path = Optional.fromNullable(m.group(2)).or("");
+        protocol = Optional.ofNullable(m.group(1)).orElse("");
+        path = Optional.ofNullable(m.group(2)).orElse("");
     }
 
     @VisibleForTesting

diff --git a/server/container/util-java8/src/main/java/org/apache/james/util/OptionalConverter.java b/server/container/util-java8/src/main/java/org/apache/james/util/OptionalConverter.java
@@ -35,12 +35,12 @@ public static <T> Optional<T> ifEmpty(Optional<T> optional, Operation operation)
         return optional;
     }
 
-    public static <T> Optional<T> fromGuava(com.google.common.base.Optional<T> guava) {
-        return Optional.ofNullable(guava.orNull());
+    public static <T> Optional<T> fromGuava(Optional<T> guava) {
+        return Optional.ofNullable(guava.orElse(null));
     }
 
-    public static <T> com.google.common.base.Optional<T> toGuava(Optional<T> java) {
-        return com.google.common.base.Optional.fromNullable(java.orElse(null));
+    public static <T> Optional<T> toGuava(Optional<T> java) {
+        return Optional.ofNullable(java.orElse(null));
     }
 
     public static <T> Stream<T> toStream(Optional<T> optional) {

diff --git a/server/container/util-java8/src/test/java/org/apache/james/util/OptionalConverterTest.java b/server/container/util-java8/src/test/java/org/apache/james/util/OptionalConverterTest.java
@@ -19,7 +19,6 @@
 package org.apache.james.util;
 
 import static org.assertj.core.api.Assertions.assertThat;
-
 import java.util.Optional;
 import java.util.concurrent.atomic.AtomicInteger;
 
@@ -92,15 +91,15 @@ public void fromGuavaShouldThrowWhenGuavaIsNull() {
 
     @Test
     public void fromGuavaShouldReturnEmptyWhenGuavaIsEmpty() {
-        Optional<String> fromGuava = OptionalConverter.fromGuava(com.google.common.base.Optional.<String> absent());
+        Optional<String> fromGuava = OptionalConverter.fromGuava(Optional.<String> empty());
 
         assertThat(fromGuava).isEmpty();
     }
 
     @Test
     public void fromGuavaShouldReturnNonEmptyWhenGuavaIsNonEmpty() {
         String value = "my string";
-        Optional<String> fromGuava = OptionalConverter.fromGuava(com.google.common.base.Optional.of(value));
+        Optional<String> fromGuava = OptionalConverter.fromGuava(Optional.of(value));
 
         assertThat(fromGuava).contains(value);
     }
@@ -113,15 +112,15 @@ public void toGuavaShouldThrowWhenGuavaIsNull() {
 
     @Test
     public void toGuavaShouldReturnEmptyWhenGuavaIsEmpty() {
-        com.google.common.base.Optional<String> toGuava = OptionalConverter.toGuava(Optional.<String> empty());
+        Optional<String> toGuava = OptionalConverter.toGuava(Optional.<String> empty());
 
         assertThat(toGuava.isPresent()).isFalse();
     }
 
     @Test
     public void toGuavaShouldReturnNonEmptyWhenGuavaIsNonEmpty() {
         String value = "my string";
-        com.google.common.base.Optional<String> toGuava = OptionalConverter.toGuava(Optional.of(value));
+        Optional<String> toGuava = OptionalConverter.toGuava(Optional.of(value));
 
         assertThat(toGuava.get()).isEqualTo(value);
     }

diff --git a/server/data/data-api/src/main/java/org/apache/james/rrt/lib/Mappings.java b/server/data/data-api/src/main/java/org/apache/james/rrt/lib/Mappings.java
@@ -20,9 +20,9 @@
 
 package org.apache.james.rrt.lib;
 
-import org.apache.james.rrt.lib.Mapping.Type;
+import java.util.Optional;
 
-import com.google.common.base.Optional;
+import org.apache.james.rrt.lib.Mapping.Type;
 
 public interface Mappings extends Iterable<Mapping> {
 

diff --git a/...assandra/src/main/java/org/apache/james/rrt/cassandra/CassandraRecipientRewriteTable.java b/...assandra/src/main/java/org/apache/james/rrt/cassandra/CassandraRecipientRewriteTable.java
@@ -27,10 +27,9 @@
 import static org.apache.james.rrt.cassandra.tables.CassandraRecipientRewriteTableTable.MAPPING;
 import static org.apache.james.rrt.cassandra.tables.CassandraRecipientRewriteTableTable.TABLE_NAME;
 import static org.apache.james.rrt.cassandra.tables.CassandraRecipientRewriteTableTable.USER;
-
 import java.util.List;
 import java.util.Map;
-
+import java.util.Optional;
 import javax.inject.Inject;
 
 import org.apache.james.backends.cassandra.utils.CassandraAsyncExecutor;
@@ -43,7 +42,6 @@
 import com.datastax.driver.core.PreparedStatement;
 import com.datastax.driver.core.Session;
 import com.github.steveash.guavate.Guavate;
-import com.google.common.base.Optional;
 
 public class CassandraRecipientRewriteTable extends AbstractRecipientRewriteTable {
 
@@ -112,7 +110,7 @@ protected void removeMappingInternal(String user, String domain, String mapping)
     @Override
     protected Mappings getUserDomainMappingsInternal(String user, String domain) throws RecipientRewriteTableException {
         return retrieveMappings(user, domain)
-            .orNull();
+            .orElse(null);
     }
 
     private Optional<Mappings> retrieveMappings(String user, String domain) {
@@ -176,9 +174,9 @@ public String asKey() {
     @Override
     protected String mapAddressInternal(String user, String domain) throws RecipientRewriteTableException {
         Mappings mappings = retrieveMappings(user, domain)
-            .or(() -> retrieveMappings(WILDCARD, domain)
-                    .or(() -> retrieveMappings(user, WILDCARD)
-                            .or(MappingsImpl.empty())));
+            .orElse(retrieveMappings(WILDCARD, domain)
+                    .orElse(retrieveMappings(user, WILDCARD)
+                            .orElse(MappingsImpl.empty())));
         return !mappings.isEmpty() ? mappings.serialize() : null;
     }
 

diff --git a/.../data/data-file/src/test/java/org/apache/james/rrt/file/XMLRecipientRewriteTableTest.java b/.../data/data-file/src/test/java/org/apache/james/rrt/file/XMLRecipientRewriteTableTest.java
@@ -20,19 +20,18 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
 
-import org.apache.commons.configuration.DefaultConfigurationBuilder;
 import org.apache.james.rrt.api.RecipientRewriteTable;
 import org.apache.james.rrt.api.RecipientRewriteTableException;
 import org.apache.james.rrt.lib.AbstractRecipientRewriteTable;
 import org.apache.james.rrt.lib.AbstractRecipientRewriteTableTest;
 import org.apache.james.rrt.lib.Mappings;
 import org.apache.james.rrt.lib.MappingsImpl;
 import org.apache.james.rrt.lib.MappingsImpl.Builder;
+import org.apache.commons.configuration.DefaultConfigurationBuilder;
 import org.junit.Before;
 
-import com.google.common.base.Optional;
-
 /**
  * Test the XML Virtual User Table implementation.
  */
@@ -62,7 +61,7 @@ protected boolean addMapping(String user, String domain, String mapping, int typ
             removeMappingsFromConfig(user, domain, mappings);
         }
 
-        Builder builder = MappingsImpl.from(Optional.fromNullable(mappings).or(MappingsImpl.empty()));
+        Builder builder = MappingsImpl.from(Optional.ofNullable(mappings).orElse(MappingsImpl.empty()));
 
         if (type == ERROR_TYPE) {
             builder.add(RecipientRewriteTable.ERROR_PREFIX + mapping);

diff --git a/.../data/data-hbase/src/main/java/org/apache/james/rrt/hbase/HBaseRecipientRewriteTable.java b/.../data/data-hbase/src/main/java/org/apache/james/rrt/hbase/HBaseRecipientRewriteTable.java
@@ -22,7 +22,14 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 
+import org.apache.james.rrt.api.RecipientRewriteTableException;
+import org.apache.james.rrt.hbase.def.HRecipientRewriteTable;
+import org.apache.james.rrt.lib.AbstractRecipientRewriteTable;
+import org.apache.james.rrt.lib.Mappings;
+import org.apache.james.rrt.lib.MappingsImpl;
+import org.apache.james.system.hbase.TablePool;
 import org.apache.hadoop.hbase.KeyValue;
 import org.apache.hadoop.hbase.client.Delete;
 import org.apache.hadoop.hbase.client.Get;
@@ -32,17 +39,9 @@
 import org.apache.hadoop.hbase.client.ResultScanner;
 import org.apache.hadoop.hbase.client.Scan;
 import org.apache.hadoop.hbase.util.Bytes;
-import org.apache.james.rrt.api.RecipientRewriteTableException;
-import org.apache.james.rrt.hbase.def.HRecipientRewriteTable;
-import org.apache.james.rrt.lib.AbstractRecipientRewriteTable;
-import org.apache.james.rrt.lib.Mappings;
-import org.apache.james.rrt.lib.MappingsImpl;
-import org.apache.james.system.hbase.TablePool;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.base.Optional;
-
 /**
  * Implementation of the RecipientRewriteTable for a HBase persistence.
  */
@@ -134,9 +133,9 @@ protected Map<String, Mappings> getAllMappingsInternal() throws RecipientRewrite
                         }
                         Mappings mappings = 
                                 MappingsImpl.from(
-                                    Optional.fromNullable(
+                                    Optional.ofNullable(
                                         map.get(email))
-                                        .or(MappingsImpl.empty()))
+                                        .orElse(MappingsImpl.empty()))
                                 .add(Bytes.toString(keyValue.getRow()))
                                 .build();
                         map.put(email, mappings);

diff --git a/.../data/data-ldap/src/main/java/org/apache/james/user/ldap/ReadOnlyUsersLDAPRepository.java b/.../data/data-ldap/src/main/java/org/apache/james/user/ldap/ReadOnlyUsersLDAPRepository.java
@@ -25,9 +25,9 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.Properties;
 import java.util.Set;
-
 import javax.annotation.PostConstruct;
 import javax.naming.Context;
 import javax.naming.NamingEnumeration;
@@ -39,9 +39,6 @@
 import javax.naming.ldap.InitialLdapContext;
 import javax.naming.ldap.LdapContext;
 
-import org.apache.commons.configuration.ConfigurationException;
-import org.apache.commons.configuration.HierarchicalConfiguration;
-import org.apache.commons.lang.StringUtils;
 import org.apache.james.lifecycle.api.Configurable;
 import org.apache.james.user.api.UsersRepository;
 import org.apache.james.user.api.UsersRepositoryException;
@@ -50,12 +47,14 @@
 import org.apache.james.util.retry.DoublingRetrySchedule;
 import org.apache.james.util.retry.api.RetrySchedule;
 import org.apache.james.util.retry.naming.ldap.RetryingLdapContext;
+import org.apache.commons.configuration.ConfigurationException;
+import org.apache.commons.configuration.HierarchicalConfiguration;
+import org.apache.commons.lang.StringUtils;
 import org.apache.mailet.MailAddress;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import com.github.steveash.guavate.Guavate;
-import com.google.common.base.Optional;
 
 /**
  * <p>
@@ -387,7 +386,7 @@ public void configure(HierarchicalConfiguration configuration) throws Configurat
         //see if there is a filter argument
         filter = configuration.getString("[@filter]");
 
-        administratorId = Optional.fromNullable(configuration.getString("[@administratorId]"));
+        administratorId = Optional.ofNullable(configuration.getString("[@administratorId]"));
 
         checkState();
     }

diff --git a/server/data/data-library/src/main/java/org/apache/james/rrt/lib/MappingsImpl.java b/server/data/data-library/src/main/java/org/apache/james/rrt/lib/MappingsImpl.java
@@ -24,14 +24,14 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Iterator;
+import java.util.Optional;
 import java.util.StringTokenizer;
 
 import org.apache.james.rrt.lib.Mapping.Type;
 
 import com.google.common.base.Joiner;
 import com.google.common.base.MoreObjects;
 import com.google.common.base.Objects;
-import com.google.common.base.Optional;
 import com.google.common.base.Preconditions;
 import com.google.common.base.Predicate;
 import com.google.common.base.Predicates;
@@ -198,7 +198,7 @@ public Mapping getError() {
     @Override
     public Optional<Mappings> toOptional() {
         if (isEmpty()) {
-            return Optional.absent();
+            return Optional.empty();
         }
         return Optional.<Mappings> of(this);
     }

diff --git a/...er/data/data-library/src/main/java/org/apache/james/user/lib/AbstractUsersRepository.java b/...er/data/data-library/src/main/java/org/apache/james/user/lib/AbstractUsersRepository.java
@@ -19,20 +19,20 @@
 
 package org.apache.james.user.lib;
 
+import java.util.Optional;
 import javax.inject.Inject;
 
-import org.apache.commons.configuration.ConfigurationException;
-import org.apache.commons.configuration.HierarchicalConfiguration;
 import org.apache.james.domainlist.api.DomainList;
 import org.apache.james.domainlist.api.DomainListException;
 import org.apache.james.lifecycle.api.Configurable;
 import org.apache.james.user.api.AlreadyExistInUsersRepositoryException;
 import org.apache.james.user.api.UsersRepository;
 import org.apache.james.user.api.UsersRepositoryException;
+import org.apache.commons.configuration.ConfigurationException;
+import org.apache.commons.configuration.HierarchicalConfiguration;
 import org.apache.mailet.MailAddress;
 
 import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Optional;
 
 public abstract class AbstractUsersRepository implements UsersRepository, Configurable {
 
@@ -47,7 +47,7 @@ public abstract class AbstractUsersRepository implements UsersRepository, Config
     public void configure(HierarchicalConfiguration configuration) throws ConfigurationException {
 
         virtualHosting = configuration.getBoolean("enableVirtualHosting", getDefaultVirtualHostingValue());
-        administratorId = Optional.fromNullable(configuration.getString("administratorId"));
+        administratorId = Optional.ofNullable(configuration.getString("administratorId"));
 
         doConfigure(configuration);
     }

diff --git a/server/data/data-library/src/test/java/org/apache/james/rrt/lib/MappingsImplTest.java b/server/data/data-library/src/test/java/org/apache/james/rrt/lib/MappingsImplTest.java
@@ -21,11 +21,10 @@
 package org.apache.james.rrt.lib;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import java.util.Optional;
 
 import org.junit.Test;
 
-import com.google.common.base.Optional;
-
 
 public class MappingsImplTest {
 

diff --git a/...ata/data-library/src/test/java/org/apache/james/user/lib/AbstractUsersRepositoryTest.java b/...ata/data-library/src/test/java/org/apache/james/user/lib/AbstractUsersRepositoryTest.java
@@ -19,9 +19,9 @@
 package org.apache.james.user.lib;
 
 import static org.assertj.core.api.Assertions.assertThat;
-
 import java.util.ArrayList;
 import java.util.Iterator;
+import java.util.Optional;
 
 import org.apache.james.domainlist.api.mock.SimpleDomainList;
 import org.apache.james.lifecycle.api.LifecycleUtil;
@@ -34,8 +34,6 @@
 import org.junit.Before;
 import org.junit.Test;
 
-import com.google.common.base.Optional;
-
 
 public abstract class AbstractUsersRepositoryTest {
 
@@ -331,7 +329,7 @@ protected void disposeUsersRepository() throws UsersRepositoryException {
 
     @Test
     public void isAdministratorShouldReturnFalseWhenNotConfigured() throws Exception {
-        usersRepository.setAdministratorId(Optional.<String>absent());
+        usersRepository.setAdministratorId(Optional.empty());
 
         assertThat(usersRepository.isAdministrator(admin)).isFalse();
     }

diff --git a/...ta/data-memory/src/main/java/org/apache/james/rrt/memory/MemoryRecipientRewriteTable.java b/...ta/data-memory/src/main/java/org/apache/james/rrt/memory/MemoryRecipientRewriteTable.java
@@ -23,14 +23,14 @@
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 
 import org.apache.james.rrt.api.RecipientRewriteTableException;
 import org.apache.james.rrt.lib.AbstractRecipientRewriteTable;
 import org.apache.james.rrt.lib.Mappings;
 import org.apache.james.rrt.lib.MappingsImpl;
 
 import com.google.common.base.Objects;
-import com.google.common.base.Optional;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
@@ -103,15 +103,15 @@ protected void removeMappingInternal(String user, String domain, String mapping)
     @Override
     protected Mappings getUserDomainMappingsInternal(String user, String domain) throws RecipientRewriteTableException {
         return retrieveMappings(user, domain)
-            .orNull();
+            .orElse(null);
     }
 
     @Override
     protected String mapAddressInternal(String user, String domain) throws RecipientRewriteTableException {
         Mappings mappings = retrieveMappings(user, domain)
-            .or(retrieveMappings(WILDCARD, domain)
-                .or(retrieveMappings(user, WILDCARD)
-                    .or(MappingsImpl.empty())));
+            .orElse(retrieveMappings(WILDCARD, domain)
+                .orElse(retrieveMappings(user, WILDCARD)
+                    .orElse(MappingsImpl.empty())));
 
         return !mappings.isEmpty() ? mappings.serialize() : null;
     }