joerg/datastructures
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

drop jsr305 annotations because of javax namespace, fix JDK17 internal reflection access in validation

Browse source
This commit is contained in:
Jörg Prante 2022-08-27 20:35:22 +02:00
parent 085debd1fe
commit 754f1d5873
12 changed files with 2 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
datastructures-json-dsl/build.gradle
View file

@ -1,4 +1,3 @@
dependencies { dependencies {
api libs.jsr305
testImplementation libs.junit4 testImplementation libs.junit4
} }

4
datastructures-json-dsl/src/main/java/com/dslplatform/json/NonNull.java
View file

@ -5,8 +5,6 @@ import java.lang.annotation.ElementType;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target; import java.lang.annotation.Target;
import javax.annotation.Nonnull;
import javax.annotation.meta.TypeQualifierNickname;
/** /**
* A common DslJson annotation to declare that annotated elements cannot be {@code null}. * A common DslJson annotation to declare that annotated elements cannot be {@code null}.
@ -25,7 +23,5 @@ import javax.annotation.meta.TypeQualifierNickname;
@Target({ElementType.METHOD, ElementType.PARAMETER, ElementType.FIELD}) @Target({ElementType.METHOD, ElementType.PARAMETER, ElementType.FIELD})
@Retention(RetentionPolicy.RUNTIME) @Retention(RetentionPolicy.RUNTIME)
@Documented @Documented
@Nonnull
@TypeQualifierNickname
public @interface NonNull { public @interface NonNull {
} }

4
datastructures-json-dsl/src/main/java/com/dslplatform/json/NonNullApi.java
View file

@ -5,8 +5,6 @@ import java.lang.annotation.ElementType;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target; import java.lang.annotation.Target;
import javax.annotation.Nonnull;
import javax.annotation.meta.TypeQualifierDefault;
/** /**
* A common DslJson annotation to declare that parameters and return values * A common DslJson annotation to declare that parameters and return values
@ -24,7 +22,5 @@ import javax.annotation.meta.TypeQualifierDefault;
@Target(ElementType.PACKAGE) @Target(ElementType.PACKAGE)
@Retention(RetentionPolicy.RUNTIME) @Retention(RetentionPolicy.RUNTIME)
@Documented @Documented
@Nonnull
@TypeQualifierDefault({ElementType.METHOD, ElementType.PARAMETER})
public @interface NonNullApi { public @interface NonNullApi {
} }

5
datastructures-json-dsl/src/main/java/com/dslplatform/json/Nullable.java
View file

@ -5,9 +5,6 @@ import java.lang.annotation.ElementType;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target; import java.lang.annotation.Target;
import javax.annotation.Nonnull;
import javax.annotation.meta.TypeQualifierNickname;
import javax.annotation.meta.When;
/** /**
* A common DslJson annotation to declare that annotated elements can be {@code null} under * A common DslJson annotation to declare that annotated elements can be {@code null} under
@ -26,7 +23,5 @@ import javax.annotation.meta.When;
@Target({ElementType.METHOD, ElementType.PARAMETER, ElementType.FIELD}) @Target({ElementType.METHOD, ElementType.PARAMETER, ElementType.FIELD})
@Retention(RetentionPolicy.RUNTIME) @Retention(RetentionPolicy.RUNTIME)
@Documented @Documented
@Nonnull(when = When.MAYBE)
@TypeQualifierNickname
public @interface Nullable { public @interface Nullable {
} }

1
datastructures-queue-tape/build.gradle
View file

@ -1,5 +1,4 @@
dependencies { dependencies {
testCompileOnly libs.jsr305
testImplementation libs.junit4 testImplementation libs.junit4
testImplementation libs.google.truth testImplementation libs.google.truth
testImplementation libs.burst.junit4 testImplementation libs.burst.junit4

1
datastructures-validation/build.gradle
View file

@ -1,5 +1,4 @@
dependencies { dependencies {
api libs.jsr305
testImplementation libs.assertj testImplementation libs.assertj
testImplementation libs.compile.testing testImplementation libs.compile.testing
} }

1
datastructures-validation/src/main/java/module-info.java
View file

@ -1,4 +1,3 @@
module org.xbib.datastructures.validation { module org.xbib.datastructures.validation {
requires org.xbib.annotation;
requires java.compiler; requires java.compiler;
} }

5
datastructures-validation/src/main/java/org/xbib/datastructures/validation/jsr305/NonNull.java
View file

@ -6,9 +6,6 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target; import java.lang.annotation.Target;
import org.xbib.annotation.Nonnull;
import org.xbib.annotation.meta.TypeQualifierNickname;
/** /**
* A common annotation (similar to Spring ones) to declare that annotated elements * A common annotation (similar to Spring ones) to declare that annotated elements
* cannot be {@code null}. Leverages JSR 305 meta-annotations to indicate nullability in * cannot be {@code null}. Leverages JSR 305 meta-annotations to indicate nullability in
@ -29,7 +26,5 @@ import org.xbib.annotation.meta.TypeQualifierNickname;
@Target({ ElementType.METHOD, ElementType.PARAMETER, ElementType.FIELD }) @Target({ ElementType.METHOD, ElementType.PARAMETER, ElementType.FIELD })
@Retention(RetentionPolicy.RUNTIME) @Retention(RetentionPolicy.RUNTIME)
@Documented @Documented
@Nonnull
@TypeQualifierNickname
public @interface NonNull { public @interface NonNull {
} }

5
datastructures-validation/src/main/java/org/xbib/datastructures/validation/jsr305/NonNullApi.java
View file

@ -6,9 +6,6 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target; import java.lang.annotation.Target;
import org.xbib.annotation.Nonnull;
import org.xbib.annotation.meta.TypeQualifierDefault;
/** /**
* A common annotation (similar to Spring one) to declare that parameters and return * A common annotation (similar to Spring one) to declare that parameters and return
* values are to be considered as non-nullable by default for a given package. Leverages * values are to be considered as non-nullable by default for a given package. Leverages
@ -25,7 +22,5 @@ import org.xbib.annotation.meta.TypeQualifierDefault;
@Target(ElementType.PACKAGE) @Target(ElementType.PACKAGE)
@Retention(RetentionPolicy.RUNTIME) @Retention(RetentionPolicy.RUNTIME)
@Documented @Documented
@Nonnull
@TypeQualifierDefault({ ElementType.METHOD, ElementType.PARAMETER })
public @interface NonNullApi { public @interface NonNullApi {
} }

6
datastructures-validation/src/main/java/org/xbib/datastructures/validation/jsr305/Nullable.java
View file

@ -6,10 +6,6 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target; import java.lang.annotation.Target;
import org.xbib.annotation.Nonnull;
import org.xbib.annotation.meta.TypeQualifierNickname;
import org.xbib.annotation.meta.When;
/** /**
* A common annotation (similar to Spring ones) to declare that annotated elements * A common annotation (similar to Spring ones) to declare that annotated elements
* can be {@code null} under some circumstance. Leverages JSR 305 meta-annotations to * can be {@code null} under some circumstance. Leverages JSR 305 meta-annotations to
@ -29,7 +25,5 @@ import org.xbib.annotation.meta.When;
@Target({ ElementType.METHOD, ElementType.PARAMETER, ElementType.FIELD }) @Target({ ElementType.METHOD, ElementType.PARAMETER, ElementType.FIELD })
@Retention(RetentionPolicy.RUNTIME) @Retention(RetentionPolicy.RUNTIME)
@Documented @Documented
@Nonnull(when = When.MAYBE)
@TypeQualifierNickname
public @interface Nullable { public @interface Nullable {
} }

2
gradle/test/junit5.gradle
View file

@ -17,6 +17,8 @@ test {
'--add-exports=jdk.unsupported/sun.misc=ALL-UNNAMED', '--add-exports=jdk.unsupported/sun.misc=ALL-UNNAMED',
'--add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED', '--add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED',
'--add-opens=jdk.compiler/com.sun.tools.javac=ALL-UNNAMED', '--add-opens=jdk.compiler/com.sun.tools.javac=ALL-UNNAMED',
'--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED',
'--add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED',
'--add-opens=java.base/java.lang=ALL-UNNAMED', '--add-opens=java.base/java.lang=ALL-UNNAMED',
'--add-opens=java.base/java.lang.reflect=ALL-UNNAMED', '--add-opens=java.base/java.lang.reflect=ALL-UNNAMED',
'--add-opens=java.base/java.io=ALL-UNNAMED', '--add-opens=java.base/java.io=ALL-UNNAMED',

1
settings.gradle
View file

@ -12,7 +12,6 @@ dependencyResolutionManagement {
library('junit4', 'junit', 'junit').version('4.13.2') library('junit4', 'junit', 'junit').version('4.13.2')
library('chronicle-core', 'net.openhft', 'chronicle-core').version('2.21ea14') library('chronicle-core', 'net.openhft', 'chronicle-core').version('2.21ea14')
library('affinity', 'net.openhft', 'affinity').version('3.21ea0') library('affinity', 'net.openhft', 'affinity').version('3.21ea0')
library('jsr305', 'org.xbib', 'jsr-305').version('2.0.0')
library('javassist', 'org.javassist', 'javassist').version('3.28.0-GA') library('javassist', 'org.javassist', 'javassist').version('3.28.0-GA')
library('jackson', 'com.fasterxml.jackson.core', 'jackson-databind').versionRef('jackson') library('jackson', 'com.fasterxml.jackson.core', 'jackson-databind').versionRef('jackson')
library('gson', 'com.google.code.gson', 'gson').version('2.8.9') library('gson', 'com.google.code.gson', 'gson').version('2.8.9')