Skip to content

Commit 7741e8f

Browse files
authored
Merge pull request ronmamo#272 from ronmamo/migrate/java8
migrate to java 8. removed guava and migrated to streams api. simplified store. cleanups.
2 parents 43ee4af + 7befa02 commit 7741e8f

43 files changed

Lines changed: 880 additions & 1211 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.travis.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,5 @@
11
language: java
2+
3+
jdk:
4+
- openjdk8
5+
- openjdk11

pom.xml

Lines changed: 7 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -52,19 +52,12 @@
5252
</distributionManagement>
5353

5454
<properties>
55-
<guava.version>20.0</guava.version>
56-
<javassist.version>3.21.0-GA</javassist.version>
57-
<jdk.version>1.7</jdk.version>
55+
<javassist.version>3.26.0-GA</javassist.version>
56+
<jdk.version>1.8</jdk.version>
5857
<additionalparam>-Xdoclint:none</additionalparam>
5958
</properties>
6059

6160
<dependencies>
62-
<dependency>
63-
<groupId>com.google.guava</groupId>
64-
<artifactId>guava</artifactId>
65-
<version>${guava.version}</version>
66-
</dependency>
67-
6861
<dependency>
6962
<groupId>org.javassist</groupId>
7063
<artifactId>javassist</artifactId>
@@ -76,21 +69,21 @@
7669
<dependency>
7770
<groupId>org.slf4j</groupId>
7871
<artifactId>slf4j-api</artifactId>
79-
<version>1.7.24</version>
72+
<version>1.7.30</version>
8073
<optional>true</optional> <!-- case: when logging is not needed -->
8174
</dependency>
8275

8376
<dependency>
84-
<groupId>dom4j</groupId>
77+
<groupId>org.dom4j</groupId>
8578
<artifactId>dom4j</artifactId>
86-
<version>1.6.1</version>
79+
<version>2.1.1</version>
8780
<optional>true</optional> <!-- case: when no xml de/serialization -->
8881
</dependency>
8982

9083
<dependency>
9184
<groupId>com.google.code.gson</groupId>
9285
<artifactId>gson</artifactId>
93-
<version>2.8.0</version>
86+
<version>2.8.6</version>
9487
<optional>true</optional> <!-- case: when no json de/serialization -->
9588
</dependency>
9689

@@ -110,17 +103,10 @@
110103
<optional>true</optional> <!-- case: when other logging implementation used or logging is not needed -->
111104
</dependency>
112105

113-
<dependency>
114-
<groupId>com.google.code.findbugs</groupId>
115-
<artifactId>jsr305</artifactId>
116-
<version>3.0.1</version>
117-
<scope>provided</scope>
118-
</dependency>
119-
120106
<dependency>
121107
<groupId>junit</groupId>
122108
<artifactId>junit</artifactId>
123-
<version>4.12</version>
109+
<version>4.13</version>
124110
<scope>test</scope>
125111
</dependency>
126112

src/main/java/org/reflections/Configuration.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
package org.reflections;
22

3-
import com.google.common.base.Predicate;
43
import org.reflections.adapters.MetadataAdapter;
54
import org.reflections.scanners.Scanner;
65
import org.reflections.serializers.Serializer;
76

8-
import javax.annotation.Nullable;
97
import java.net.URL;
108
import java.util.Set;
119
import java.util.concurrent.ExecutorService;
10+
import java.util.function.Predicate;
1211

1312
/**
1413
* Configuration is used to create a configured instance of {@link Reflections}
@@ -26,7 +25,6 @@ public interface Configuration {
2625
MetadataAdapter getMetadataAdapter();
2726

2827
/** get the fully qualified name filter used to filter types to be scanned */
29-
@Nullable
3028
Predicate<String> getInputsFilter();
3129

3230
/** executor service used to scan files. if null, scanning is done in a simple for loop */
@@ -36,7 +34,6 @@ public interface Configuration {
3634
Serializer getSerializer();
3735

3836
/** get class loaders, might be used for resolving methods/fields */
39-
@Nullable
4037
ClassLoader[] getClassLoaders();
4138

4239
/** if true (default), expand super types after scanning, for super types that were not scanned.

0 commit comments

Comments
 (0)