Skip to content

Commit dbfac74

Browse files
committed
Replace Nullable from JSR-305 with Jetbrains annotations
1 parent 1dae7ac commit dbfac74

19 files changed

+30
-22
lines changed

pom.xml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -168,9 +168,10 @@
168168
</dependency>
169169

170170
<dependency>
171-
<groupId>com.google.code.findbugs</groupId>
172-
<artifactId>jsr305</artifactId>
173-
<version>3.0.2</version>
171+
<groupId>org.jetbrains</groupId>
172+
<artifactId>annotations</artifactId>
173+
<version>24.0.1</version>
174+
<scope>provided</scope>
174175
</dependency>
175176
</dependencies>
176177
</project>

src/main/java/ch/jalu/typeresolver/CommonTypeUtils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package ch.jalu.typeresolver;
22

33
import ch.jalu.typeresolver.array.ArrayTypeUtils;
4+
import org.jetbrains.annotations.Nullable;
45

5-
import javax.annotation.Nullable;
66
import java.lang.reflect.GenericArrayType;
77
import java.lang.reflect.ParameterizedType;
88
import java.lang.reflect.Type;

src/main/java/ch/jalu/typeresolver/EnumUtils.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package ch.jalu.typeresolver;
22

3-
import javax.annotation.Nullable;
3+
import org.jetbrains.annotations.Nullable;
4+
45
import java.util.EnumSet;
56
import java.util.Optional;
67
import java.util.stream.Collector;

src/main/java/ch/jalu/typeresolver/TypeInfo.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
import ch.jalu.typeresolver.array.ArrayTypeUtils;
44
import ch.jalu.typeresolver.typeimpl.ParameterizedTypeImpl;
5+
import org.jetbrains.annotations.Nullable;
56

6-
import javax.annotation.Nullable;
77
import java.lang.reflect.Field;
88
import java.lang.reflect.GenericArrayType;
99
import java.lang.reflect.Modifier;
@@ -15,7 +15,7 @@
1515
import java.util.function.Consumer;
1616

1717
/**
18-
* Wraps a {@link Type} to offer easy retrieval of generic type information.
18+
* Wraps a {@link Type} to offer easy retrieval of various type information.
1919
*/
2020
public class TypeInfo {
2121

src/main/java/ch/jalu/typeresolver/TypeToClassUtils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package ch.jalu.typeresolver;
22

33
import ch.jalu.typeresolver.array.ArrayTypeUtils;
4+
import org.jetbrains.annotations.Nullable;
45

5-
import javax.annotation.Nullable;
66
import java.lang.reflect.GenericArrayType;
77
import java.lang.reflect.ParameterizedType;
88
import java.lang.reflect.Type;

src/main/java/ch/jalu/typeresolver/TypeVisitor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
import ch.jalu.typeresolver.array.ArrayTypeProperties;
44
import ch.jalu.typeresolver.array.ArrayTypeUtils;
5+
import org.jetbrains.annotations.Nullable;
56

6-
import javax.annotation.Nullable;
77
import java.io.Serializable;
88
import java.lang.reflect.Type;
99
import java.util.ArrayList;

src/main/java/ch/jalu/typeresolver/array/ArrayUtils.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package ch.jalu.typeresolver.array;
22

3-
import javax.annotation.Nullable;
3+
import org.jetbrains.annotations.Nullable;
4+
45
import java.lang.reflect.Array;
56
import java.util.Arrays;
67
import java.util.Collections;

src/main/java/ch/jalu/typeresolver/classutil/ClassTypeCallback.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package ch.jalu.typeresolver.classutil;
22

3-
import javax.annotation.Nullable;
3+
import org.jetbrains.annotations.Nullable;
4+
45
import java.lang.annotation.Annotation;
56

67
/**

src/main/java/ch/jalu/typeresolver/classutil/ClassUtils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
import ch.jalu.typeresolver.EnumUtils;
44
import ch.jalu.typeresolver.array.ArrayClassProperties;
5+
import org.jetbrains.annotations.Nullable;
56

6-
import javax.annotation.Nullable;
77
import java.lang.annotation.Annotation;
88
import java.lang.reflect.Proxy;
99
import java.util.Optional;

src/main/java/ch/jalu/typeresolver/numbers/NumberTypes.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package ch.jalu.typeresolver.numbers;
22

33
import ch.jalu.typeresolver.primitives.PrimitiveType;
4+
import org.jetbrains.annotations.Nullable;
45

5-
import javax.annotation.Nullable;
66
import java.util.Collections;
77
import java.util.HashMap;
88
import java.util.Map;

0 commit comments

Comments
 (0)