Merge pull request #272 from ronmamo/migrate/java8

migrate to java 8. removed guava and migrated to streams api. simplified store. cleanups.
ronmamo · Jan 7, 2020 · 7741e8f · 7741e8f
2 parents 43ee4af + 7befa02
commit 7741e8f
Show file tree

Hide file tree

Showing 43 changed files with 880 additions and 1,211 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1 +1,5 @@
 language: java
+
+jdk:
+  - openjdk8
+  - openjdk11
diff --git a/pom.xml b/pom.xml
@@ -52,19 +52,12 @@
     </distributionManagement>
 
     <properties>
-        <guava.version>20.0</guava.version>
-        <javassist.version>3.21.0-GA</javassist.version>
-        <jdk.version>1.7</jdk.version>
+        <javassist.version>3.26.0-GA</javassist.version>
+        <jdk.version>1.8</jdk.version>
         <additionalparam>-Xdoclint:none</additionalparam>
     </properties>
 
     <dependencies>
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-            <version>${guava.version}</version>
-        </dependency>
-
         <dependency>
             <groupId>org.javassist</groupId>
             <artifactId>javassist</artifactId>
@@ -76,21 +69,21 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <version>1.7.24</version>
+            <version>1.7.30</version>
             <optional>true</optional> <!-- case: when logging is not needed -->
         </dependency>
 
         <dependency>
-            <groupId>dom4j</groupId>
+            <groupId>org.dom4j</groupId>
             <artifactId>dom4j</artifactId>
-            <version>1.6.1</version>
+            <version>2.1.1</version>
             <optional>true</optional> <!-- case: when no xml de/serialization -->
         </dependency>
 
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>2.8.0</version>
+            <version>2.8.6</version>
             <optional>true</optional> <!-- case: when no json de/serialization -->
         </dependency>
 
@@ -110,17 +103,10 @@
             <optional>true</optional> <!-- case: when other logging implementation used or logging is not needed -->
         </dependency>
 
-        <dependency>
-            <groupId>com.google.code.findbugs</groupId>
-            <artifactId>jsr305</artifactId>
-            <version>3.0.1</version>
-            <scope>provided</scope>
-        </dependency>
-
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.12</version>
+            <version>4.13</version>
             <scope>test</scope>
         </dependency>
 

diff --git a/src/main/java/org/reflections/Configuration.java b/src/main/java/org/reflections/Configuration.java
@@ -1,14 +1,13 @@
 package org.reflections;
 
-import com.google.common.base.Predicate;
 import org.reflections.adapters.MetadataAdapter;
 import org.reflections.scanners.Scanner;
 import org.reflections.serializers.Serializer;
 
-import javax.annotation.Nullable;
 import java.net.URL;
 import java.util.Set;
 import java.util.concurrent.ExecutorService;
+import java.util.function.Predicate;
 
 /**
  * Configuration is used to create a configured instance of {@link Reflections}
@@ -26,7 +25,6 @@ public interface Configuration {
     MetadataAdapter getMetadataAdapter();
 
     /** get the fully qualified name filter used to filter types to be scanned */
-    @Nullable
     Predicate<String> getInputsFilter();
 
     /** executor service used to scan files. if null, scanning is done in a simple for loop */
@@ -36,7 +34,6 @@ public interface Configuration {
     Serializer getSerializer();
 
     /** get class loaders, might be used for resolving methods/fields */
-    @Nullable
     ClassLoader[] getClassLoaders();
 
     /** if true (default), expand super types after scanning, for super types that were not scanned.