From ec3b311de052f0cf178a3cb794e1a81ef5834e87 Mon Sep 17 00:00:00 2001 From: Steven Schlansker Date: Mon, 7 Aug 2023 10:20:59 -0700 Subject: [PATCH] Actually remove findbugs annotations As discussed in #2408, we should prefer the `jakarta` annotations, but that's not what actually got committed here. So clean that up --- core/pom.xml | 16 ++--- core/src/main/java/org/jdbi/v3/core/Sql.java | 5 +- .../JdbiInterceptionChainHolder.java | 6 +- .../v3/core/interceptor/JdbiInterceptor.java | 8 ++- .../v3/core/internal/exceptions/Sneaky.java | 7 ++- .../locator/internal/ClasspathBuilder.java | 10 +-- .../core/mapper/reflect/InstanceFactory.java | 2 +- .../v3/core/statement/ArgumentBinder.java | 11 ++-- .../jdbi/v3/core/statement/OutParameters.java | 63 ++++++++++--------- .../jdbi/v3/core/statement/SqlStatements.java | 3 +- .../v3/core/statement/StatementContext.java | 3 +- docs/pom.xml | 5 -- guice/pom.xml | 10 +-- .../guice/AbstractJdbiDefinitionModule.java | 3 +- .../InternalImportBindingBuilder.java | 2 - .../InternalLooseImportBindingBuilder.java | 6 +- internal/build/pom.xml | 8 --- jackson2/pom.xml | 12 ++-- postgis/pom.xml | 5 -- postgres/pom.xml | 5 -- sqlobject/pom.xml | 4 +- .../internal/UseTemplateEngineImpl.java | 3 +- stringtemplate4/pom.xml | 5 -- testing/pom.xml | 10 +-- .../jdbi/v3/testing/junit5/JdbiExtension.java | 9 +-- .../junit5/JdbiExternalPostgresExtension.java | 13 ++-- 26 files changed, 101 insertions(+), 133 deletions(-) diff --git a/core/pom.xml b/core/pom.xml index fd4809a2d2..baa70fe460 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -51,11 +51,6 @@ slf4j-api - - com.github.spotbugs - spotbugs-annotations - - com.google.errorprone error_prone_annotations @@ -66,6 +61,11 @@ geantyref + + jakarta.annotation + jakarta.annotation-api + + org.immutables value @@ -92,12 +92,6 @@ test - - jakarta.annotation - jakarta.annotation-api - test - - com.google.guava guava diff --git a/core/src/main/java/org/jdbi/v3/core/Sql.java b/core/src/main/java/org/jdbi/v3/core/Sql.java index b18fadd1df..adef9605d7 100644 --- a/core/src/main/java/org/jdbi/v3/core/Sql.java +++ b/core/src/main/java/org/jdbi/v3/core/Sql.java @@ -18,7 +18,8 @@ import java.util.stream.Collectors; import java.util.stream.StreamSupport; -import edu.umd.cs.findbugs.annotations.NonNull; +import jakarta.annotation.Nonnull; + import org.jdbi.v3.meta.Beta; /** @@ -103,7 +104,7 @@ public char charAt(int index) { return str.charAt(index); } - @NonNull + @Nonnull @Override public CharSequence subSequence(int start, int end) { return str.subSequence(start, end); diff --git a/core/src/main/java/org/jdbi/v3/core/interceptor/JdbiInterceptionChainHolder.java b/core/src/main/java/org/jdbi/v3/core/interceptor/JdbiInterceptionChainHolder.java index d02c0314d5..fe4bd70cc7 100644 --- a/core/src/main/java/org/jdbi/v3/core/interceptor/JdbiInterceptionChainHolder.java +++ b/core/src/main/java/org/jdbi/v3/core/interceptor/JdbiInterceptionChainHolder.java @@ -18,9 +18,9 @@ import java.util.concurrent.CopyOnWriteArrayList; import java.util.function.Function; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import org.jdbi.v3.meta.Alpha; import static java.util.Objects.requireNonNull; @@ -66,7 +66,7 @@ public JdbiInterceptionChainHolder(JdbiInterceptionChainHolder that) { * @param source A source object. * @return A target object processed by one of the registered {@link JdbiInterceptor} instances. */ - @NonNull + @Nonnull public T process(@Nullable S source) { ChainInstance instance = new ChainInstance(source); T result = instance.next(); diff --git a/core/src/main/java/org/jdbi/v3/core/interceptor/JdbiInterceptor.java b/core/src/main/java/org/jdbi/v3/core/interceptor/JdbiInterceptor.java index 5486ad9e44..745ef2cb58 100644 --- a/core/src/main/java/org/jdbi/v3/core/interceptor/JdbiInterceptor.java +++ b/core/src/main/java/org/jdbi/v3/core/interceptor/JdbiInterceptor.java @@ -13,8 +13,9 @@ */ package org.jdbi.v3.core.interceptor; -import edu.umd.cs.findbugs.annotations.CheckForNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import com.google.errorprone.annotations.CheckReturnValue; +import jakarta.annotation.Nullable; + import org.jdbi.v3.meta.Alpha; /** @@ -50,6 +51,7 @@ public interface JdbiInterceptor { * @param source A source object. * @return The destination type. */ - @CheckForNull + @Nullable + @CheckReturnValue T intercept(@Nullable S source, JdbiInterceptionChain chain); } diff --git a/core/src/main/java/org/jdbi/v3/core/internal/exceptions/Sneaky.java b/core/src/main/java/org/jdbi/v3/core/internal/exceptions/Sneaky.java index d709037cc4..3f651c6d1b 100644 --- a/core/src/main/java/org/jdbi/v3/core/internal/exceptions/Sneaky.java +++ b/core/src/main/java/org/jdbi/v3/core/internal/exceptions/Sneaky.java @@ -19,8 +19,9 @@ import java.io.UncheckedIOException; import java.lang.reflect.InvocationTargetException; -import edu.umd.cs.findbugs.annotations.CheckReturnValue; -import edu.umd.cs.findbugs.annotations.NonNull; +import jakarta.annotation.Nonnull; + +import com.google.errorprone.annotations.CheckReturnValue; import org.jdbi.v3.core.internal.UtilityClassException; public class Sneaky { @@ -33,7 +34,7 @@ private Sneaky() { * Will always throw an exception, so the caller should also always throw the dummy return value to make sure the control flow remains clear. */ @CheckReturnValue - @NonNull + @Nonnull public static DummyException throwAnyway(Throwable t) { if (t instanceof Error) { diff --git a/core/src/main/java/org/jdbi/v3/core/locator/internal/ClasspathBuilder.java b/core/src/main/java/org/jdbi/v3/core/locator/internal/ClasspathBuilder.java index 5edef50e22..789145c386 100644 --- a/core/src/main/java/org/jdbi/v3/core/locator/internal/ClasspathBuilder.java +++ b/core/src/main/java/org/jdbi/v3/core/locator/internal/ClasspathBuilder.java @@ -19,8 +19,8 @@ import java.util.regex.Pattern; import java.util.stream.Collectors; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; public class ClasspathBuilder { private static final String DOT = "."; @@ -42,17 +42,17 @@ public ClasspathBuilder setExtension(@Nullable String extension) { } // org.foo.Bar$Inner -> org/foo/Bar$Inner - public ClasspathBuilder appendFullyQualifiedClassName(@NonNull Class clazz) { + public ClasspathBuilder appendFullyQualifiedClassName(@Nonnull Class clazz) { return appendDotPath(clazz.getName()); } // com.google.guava -> com/google/guava - public ClasspathBuilder appendDotPath(@NonNull String path) { + public ClasspathBuilder appendDotPath(@Nonnull String path) { return appendVerbatim(path.replace(DOT, SLASH)); } // because sometimes you just don't have fancy data structures or patterns to work on - public ClasspathBuilder appendVerbatim(@NonNull String s) { + public ClasspathBuilder appendVerbatim(@Nonnull String s) { return addCarefully(s); } diff --git a/core/src/main/java/org/jdbi/v3/core/mapper/reflect/InstanceFactory.java b/core/src/main/java/org/jdbi/v3/core/mapper/reflect/InstanceFactory.java index 33c9d0d6f5..6b559a571a 100644 --- a/core/src/main/java/org/jdbi/v3/core/mapper/reflect/InstanceFactory.java +++ b/core/src/main/java/org/jdbi/v3/core/mapper/reflect/InstanceFactory.java @@ -19,7 +19,7 @@ import java.util.Objects; import java.util.stream.Stream; -import edu.umd.cs.findbugs.annotations.Nullable; +import jakarta.annotation.Nullable; import static java.util.Objects.requireNonNull; diff --git a/core/src/main/java/org/jdbi/v3/core/statement/ArgumentBinder.java b/core/src/main/java/org/jdbi/v3/core/statement/ArgumentBinder.java index 4441c81344..894ed3e64b 100644 --- a/core/src/main/java/org/jdbi/v3/core/statement/ArgumentBinder.java +++ b/core/src/main/java/org/jdbi/v3/core/statement/ArgumentBinder.java @@ -28,9 +28,10 @@ import java.util.function.Consumer; import java.util.function.Function; -import edu.umd.cs.findbugs.annotations.CheckForNull; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import com.google.errorprone.annotations.CheckReturnValue; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; + import org.jdbi.v3.core.argument.Argument; import org.jdbi.v3.core.argument.Arguments; import org.jdbi.v3.core.argument.NamedArgumentFinder; @@ -138,7 +139,7 @@ void bindNamedCheck(Binding binding, List paramNames) { } } - @NonNull + @Nonnull QualifiedType typeOf(@Nullable Object value) { return value instanceof TypedValue ? ((TypedValue) value).getType() @@ -197,7 +198,7 @@ private UnableToCreateStatementException factoryNotFound(QualifiedType qualif return new UnableToCreateStatementException("No argument factory registered for '" + value + "' of qualified type " + qualifiedType, ctx); } - @CheckForNull + @CheckReturnValue static Object unwrap(@Nullable Object maybeTypedValue) { return maybeTypedValue instanceof TypedValue ? ((TypedValue) maybeTypedValue).getValue() : maybeTypedValue; } diff --git a/core/src/main/java/org/jdbi/v3/core/statement/OutParameters.java b/core/src/main/java/org/jdbi/v3/core/statement/OutParameters.java index b1ed0f34a6..c6d18493c1 100644 --- a/core/src/main/java/org/jdbi/v3/core/statement/OutParameters.java +++ b/core/src/main/java/org/jdbi/v3/core/statement/OutParameters.java @@ -19,8 +19,9 @@ import java.util.HashMap; import java.util.Map; -import edu.umd.cs.findbugs.annotations.CheckForNull; -import edu.umd.cs.findbugs.annotations.NonNull; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; + import org.jdbi.v3.core.result.ResultBearing; import static java.lang.String.format; @@ -46,7 +47,7 @@ public class OutParameters { * @param the output parameter type * @return the output of name as type T */ - @CheckForNull + @Nullable public T getObject(String name, Class type) { return type.cast(getObject(name)); } @@ -58,7 +59,7 @@ public T getObject(String name, Class type) { * @param name The out parameter name * @return the output of name as type T */ - @CheckForNull + @Nullable public Object getObject(String name) { return map.get(name); } @@ -70,7 +71,7 @@ public Object getObject(String name) { * @param position The out parameter name * @return the output of name as type T */ - @CheckForNull + @Nullable public Object getObject(int position) { return map.get(position); } @@ -84,12 +85,12 @@ public Object getObject(int position) { * @param the output parameter type * @return the output of name as type T */ - @CheckForNull + @Nullable public T getObject(int pos, Class type) { return type.cast(getObject(pos)); } - @CheckForNull + @Nullable public String getString(String name) { Object obj = map.get(name); if (obj == null) { @@ -103,7 +104,7 @@ public String getString(String name) { return obj.toString(); } - @CheckForNull + @Nullable public String getString(int pos) { Object obj = map.get(pos); @@ -118,7 +119,7 @@ public String getString(int pos) { return obj.toString(); } - @CheckForNull + @Nullable public byte[] getBytes(String name) { Object obj = map.get(name); if (obj == null) { @@ -135,7 +136,7 @@ public byte[] getBytes(String name) { } } - @CheckForNull + @Nullable public byte[] getBytes(int pos) { Object obj = map.get(pos); if (obj == null) { @@ -153,43 +154,43 @@ public byte[] getBytes(int pos) { } } - @CheckForNull + @Nullable public Integer getInt(String name) { final Number n = getNumber(name); return n == null ? null : n.intValue(); } - @CheckForNull + @Nullable public Integer getInt(int pos) { final Number n = getNumber(pos); return n == null ? null : n.intValue(); } - @CheckForNull + @Nullable public Long getLong(String name) { final Number n = getNumber(name); return n == null ? null : n.longValue(); } - @CheckForNull + @Nullable public Long getLong(int pos) { final Number n = getNumber(pos); return n == null ? null : n.longValue(); } - @CheckForNull + @Nullable public Short getShort(String name) { final Number n = getNumber(name); return n == null ? null : n.shortValue(); } - @CheckForNull + @Nullable public Short getShort(int pos) { final Number n = getNumber(pos); return n == null ? null : n.shortValue(); } - @CheckForNull + @Nullable public Date getDate(String name) { Long epoch = getEpoch(name); @@ -200,7 +201,7 @@ public Date getDate(String name) { return new Date(epoch); } - @CheckForNull + @Nullable public Date getDate(int pos) { Long epoch = getEpoch(pos); @@ -211,7 +212,7 @@ public Date getDate(int pos) { return new Date(epoch); } - @CheckForNull + @Nullable public Timestamp getTimestamp(String name) { Long epoch = getEpoch(name); @@ -222,7 +223,7 @@ public Timestamp getTimestamp(String name) { return new Timestamp(epoch); } - @CheckForNull + @Nullable public Timestamp getTimestamp(int pos) { Long epoch = getEpoch(pos); @@ -233,31 +234,31 @@ public Timestamp getTimestamp(int pos) { return new Timestamp(epoch); } - @CheckForNull + @Nullable public Double getDouble(String name) { final Number n = getNumber(name); return n == null ? null : n.doubleValue(); } - @CheckForNull + @Nullable public Double getDouble(int pos) { final Number n = getNumber(pos); return n == null ? null : n.doubleValue(); } - @CheckForNull + @Nullable public Float getFloat(String name) { final Number n = getNumber(name); return n == null ? null : n.floatValue(); } - @CheckForNull + @Nullable public Float getFloat(int pos) { final Number n = getNumber(pos); return n == null ? null : n.floatValue(); } - @NonNull + @Nonnull public ResultBearing getRowSet(String name) { return ResultBearing.of(() -> { ResultSet resultSet = getObject(name, ResultSet.class); @@ -266,7 +267,7 @@ public ResultBearing getRowSet(String name) { }, ctx); } - @NonNull + @Nonnull public ResultBearing getRowSet(int pos) { return ResultBearing.of(() -> { ResultSet resultSet = getObject(pos, ResultSet.class); @@ -275,7 +276,7 @@ public ResultBearing getRowSet(int pos) { }, ctx); } - @CheckForNull + @Nullable private Number getNumber(String name) { Object obj = map.get(name); if (obj == null) { @@ -292,7 +293,7 @@ private Number getNumber(String name) { } } - @CheckForNull + @Nullable private Number getNumber(int pos) { Object obj = map.get(pos); if (obj == null) { @@ -309,7 +310,7 @@ private Number getNumber(int pos) { } } - @CheckForNull + @Nullable @SuppressWarnings("JavaUtilDate") private Long getEpoch(String name) { Object obj = map.get(name); @@ -329,7 +330,7 @@ private Long getEpoch(String name) { } } - @CheckForNull + @Nullable @SuppressWarnings("JavaUtilDate") private Long getEpoch(int pos) { Object obj = map.get(pos); @@ -348,7 +349,7 @@ private Long getEpoch(int pos) { } } - @NonNull + @Nonnull Map getMap() { return map; } diff --git a/core/src/main/java/org/jdbi/v3/core/statement/SqlStatements.java b/core/src/main/java/org/jdbi/v3/core/statement/SqlStatements.java index 36cfa66070..c2075688f0 100644 --- a/core/src/main/java/org/jdbi/v3/core/statement/SqlStatements.java +++ b/core/src/main/java/org/jdbi/v3/core/statement/SqlStatements.java @@ -27,7 +27,8 @@ import java.util.concurrent.CopyOnWriteArraySet; import java.util.function.Function; -import edu.umd.cs.findbugs.annotations.Nullable; +import jakarta.annotation.Nullable; + import org.jdbi.v3.core.Handle; import org.jdbi.v3.core.Jdbi; import org.jdbi.v3.core.cache.JdbiCache; diff --git a/core/src/main/java/org/jdbi/v3/core/statement/StatementContext.java b/core/src/main/java/org/jdbi/v3/core/statement/StatementContext.java index 2acf2ca36f..ba0a5ba54c 100644 --- a/core/src/main/java/org/jdbi/v3/core/statement/StatementContext.java +++ b/core/src/main/java/org/jdbi/v3/core/statement/StatementContext.java @@ -32,7 +32,8 @@ import java.util.Set; import java.util.stream.Collector; -import edu.umd.cs.findbugs.annotations.Nullable; +import jakarta.annotation.Nullable; + import org.jdbi.v3.core.CloseException; import org.jdbi.v3.core.Handle; import org.jdbi.v3.core.argument.Argument; diff --git a/docs/pom.xml b/docs/pom.xml index b03a53dd8d..c1b4a94373 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -157,11 +157,6 @@ jdbi3-vavr - - com.github.spotbugs - spotbugs-annotations - - jakarta.inject jakarta.inject-api diff --git a/guice/pom.xml b/guice/pom.xml index d24693db48..f93f1aa4a1 100644 --- a/guice/pom.xml +++ b/guice/pom.xml @@ -53,8 +53,8 @@ - com.github.spotbugs - spotbugs-annotations + jakarta.annotation + jakarta.annotation-api @@ -71,12 +71,6 @@ true - - jakarta.annotation - jakarta.annotation-api - test - - org.jdbi jdbi3-core diff --git a/guice/src/main/java/org/jdbi/v3/guice/AbstractJdbiDefinitionModule.java b/guice/src/main/java/org/jdbi/v3/guice/AbstractJdbiDefinitionModule.java index 0eee922184..198e4a7207 100644 --- a/guice/src/main/java/org/jdbi/v3/guice/AbstractJdbiDefinitionModule.java +++ b/guice/src/main/java/org/jdbi/v3/guice/AbstractJdbiDefinitionModule.java @@ -17,13 +17,14 @@ import javax.sql.DataSource; +import jakarta.annotation.Nullable; + import com.google.inject.Key; import com.google.inject.PrivateModule; import com.google.inject.Scopes; import com.google.inject.TypeLiteral; import com.google.inject.binder.LinkedBindingBuilder; import com.google.inject.multibindings.Multibinder; -import edu.umd.cs.findbugs.annotations.Nullable; import org.jdbi.v3.core.Jdbi; import org.jdbi.v3.guice.internal.InternalGuiceJdbiCustomizer; import org.jdbi.v3.guice.internal.InternalGuiceJdbiFactory; diff --git a/guice/src/main/java/org/jdbi/v3/guice/internal/InternalImportBindingBuilder.java b/guice/src/main/java/org/jdbi/v3/guice/internal/InternalImportBindingBuilder.java index 43a74b6f49..7ace3cae74 100644 --- a/guice/src/main/java/org/jdbi/v3/guice/internal/InternalImportBindingBuilder.java +++ b/guice/src/main/java/org/jdbi/v3/guice/internal/InternalImportBindingBuilder.java @@ -23,7 +23,6 @@ import com.google.inject.TypeLiteral; import com.google.inject.binder.LinkedBindingBuilder; import com.google.inject.binder.ScopedBindingBuilder; -import edu.umd.cs.findbugs.annotations.CheckForNull; import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkState; @@ -108,7 +107,6 @@ void setInjector(final Injector injector) { } @Override - @CheckForNull public T get() { checkState(this.injector != null, "calling get() before setInjector()!"); return injector.getInstance(key); diff --git a/guice/src/main/java/org/jdbi/v3/guice/internal/InternalLooseImportBindingBuilder.java b/guice/src/main/java/org/jdbi/v3/guice/internal/InternalLooseImportBindingBuilder.java index 11255846f3..1bd7b2038b 100644 --- a/guice/src/main/java/org/jdbi/v3/guice/internal/InternalLooseImportBindingBuilder.java +++ b/guice/src/main/java/org/jdbi/v3/guice/internal/InternalLooseImportBindingBuilder.java @@ -15,6 +15,8 @@ import java.lang.annotation.Annotation; +import jakarta.annotation.Nullable; + import com.google.inject.Inject; import com.google.inject.Injector; import com.google.inject.Key; @@ -23,8 +25,6 @@ import com.google.inject.TypeLiteral; import com.google.inject.binder.LinkedBindingBuilder; import com.google.inject.binder.ScopedBindingBuilder; -import edu.umd.cs.findbugs.annotations.CheckForNull; -import edu.umd.cs.findbugs.annotations.Nullable; import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkState; @@ -128,7 +128,7 @@ void setInjector(final Injector injector) { } @Override - @CheckForNull + @Nullable public T get() { checkState(this.injector != null, "calling get() before setInjector()!"); diff --git a/internal/build/pom.xml b/internal/build/pom.xml index 872afa3b08..890f74fc76 100644 --- a/internal/build/pom.xml +++ b/internal/build/pom.xml @@ -496,14 +496,6 @@ true - - com.github.spotbugs - spotbugs-annotations - ${dep.spotbugs.version} - provided - true - - org.jetbrains annotations diff --git a/jackson2/pom.xml b/jackson2/pom.xml index fdfe88a3a2..fcab3dc592 100644 --- a/jackson2/pom.xml +++ b/jackson2/pom.xml @@ -49,19 +49,17 @@ com.fasterxml.jackson.core jackson-databind - - - com.github.spotbugs - spotbugs-annotations - provided - - com.fasterxml.jackson.core jackson-annotations runtime + + jakarta.annotation + jakarta.annotation-api + + org.jdbi jdbi3-core diff --git a/postgis/pom.xml b/postgis/pom.xml index 5c65f3bdca..5c7515dbfb 100644 --- a/postgis/pom.xml +++ b/postgis/pom.xml @@ -37,11 +37,6 @@ jdbi3-core - - com.github.spotbugs - spotbugs-annotations - - org.locationtech.jts jts-core diff --git a/postgres/pom.xml b/postgres/pom.xml index 735f465925..aaad1519df 100644 --- a/postgres/pom.xml +++ b/postgres/pom.xml @@ -47,11 +47,6 @@ true - - com.github.spotbugs - spotbugs-annotations - - org.postgresql postgresql diff --git a/sqlobject/pom.xml b/sqlobject/pom.xml index 1717c2f13d..7e8b99801c 100644 --- a/sqlobject/pom.xml +++ b/sqlobject/pom.xml @@ -45,8 +45,8 @@ - com.github.spotbugs - spotbugs-annotations + jakarta.annotation + jakarta.annotation-api diff --git a/sqlobject/src/main/java/org/jdbi/v3/sqlobject/config/internal/UseTemplateEngineImpl.java b/sqlobject/src/main/java/org/jdbi/v3/sqlobject/config/internal/UseTemplateEngineImpl.java index cced7b5429..0f9a58c9be 100644 --- a/sqlobject/src/main/java/org/jdbi/v3/sqlobject/config/internal/UseTemplateEngineImpl.java +++ b/sqlobject/src/main/java/org/jdbi/v3/sqlobject/config/internal/UseTemplateEngineImpl.java @@ -16,7 +16,8 @@ import java.lang.annotation.Annotation; import java.lang.reflect.Method; -import edu.umd.cs.findbugs.annotations.Nullable; +import jakarta.annotation.Nullable; + import org.jdbi.v3.core.config.ConfigRegistry; import org.jdbi.v3.core.extension.SimpleExtensionConfigurer; import org.jdbi.v3.core.internal.JdbiClassUtils; diff --git a/stringtemplate4/pom.xml b/stringtemplate4/pom.xml index 3e045d5689..5f2fa94f15 100644 --- a/stringtemplate4/pom.xml +++ b/stringtemplate4/pom.xml @@ -48,11 +48,6 @@ ST4 - - com.github.spotbugs - spotbugs-annotations - - org.jdbi jdbi3-testing diff --git a/testing/pom.xml b/testing/pom.xml index be937ddba2..04a8f12eae 100644 --- a/testing/pom.xml +++ b/testing/pom.xml @@ -39,11 +39,6 @@ jdbi3-core - - com.github.spotbugs - spotbugs-annotations - - junit junit @@ -92,6 +87,11 @@ true + + jakarta.annotation + jakarta.annotation-api + + org.apache.derby derby diff --git a/testing/src/main/java/org/jdbi/v3/testing/junit5/JdbiExtension.java b/testing/src/main/java/org/jdbi/v3/testing/junit5/JdbiExtension.java index 27a97d2185..2e37e65a37 100644 --- a/testing/src/main/java/org/jdbi/v3/testing/junit5/JdbiExtension.java +++ b/testing/src/main/java/org/jdbi/v3/testing/junit5/JdbiExtension.java @@ -23,9 +23,10 @@ import javax.sql.DataSource; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; + import de.softwareforge.testing.postgres.junit5.EmbeddedPgExtension; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import org.jdbi.v3.core.Handle; import org.jdbi.v3.core.Handles; import org.jdbi.v3.core.Jdbi; @@ -121,9 +122,9 @@ public static JdbiExtension postgres(EmbeddedPgExtension pg) { * @see JdbiExternalPostgresExtension */ @SuppressWarnings("PMD.UseObjectForClearerAPI") - public static JdbiExtension externalPostgres(@NonNull String hostname, + public static JdbiExtension externalPostgres(@Nonnull String hostname, @Nullable Integer port, - @NonNull String database, + @Nonnull String database, @Nullable String username, @Nullable String password) { return JdbiExternalPostgresExtension.instance(hostname, port, database, username, password); diff --git a/testing/src/main/java/org/jdbi/v3/testing/junit5/JdbiExternalPostgresExtension.java b/testing/src/main/java/org/jdbi/v3/testing/junit5/JdbiExternalPostgresExtension.java index e757fe3244..94fb79073c 100644 --- a/testing/src/main/java/org/jdbi/v3/testing/junit5/JdbiExternalPostgresExtension.java +++ b/testing/src/main/java/org/jdbi/v3/testing/junit5/JdbiExternalPostgresExtension.java @@ -15,8 +15,9 @@ import javax.sql.DataSource; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; + import org.postgresql.ds.PGSimpleDataSource; import static java.util.Objects.requireNonNull; @@ -46,9 +47,9 @@ public class JdbiExternalPostgresExtension extends JdbiExtension { * }; * } */ - protected JdbiExternalPostgresExtension(@NonNull String hostname, + protected JdbiExternalPostgresExtension(@Nonnull String hostname, @Nullable Integer port, - @NonNull String database, + @Nonnull String database, @Nullable String username, @Nullable String password) { @@ -73,9 +74,9 @@ protected JdbiExternalPostgresExtension(@NonNull String hostname, this.jdbcUri = sb.toString(); } - static JdbiExtension instance(@NonNull String hostname, + static JdbiExtension instance(@Nonnull String hostname, @Nullable Integer port, - @NonNull String database, + @Nonnull String database, @Nullable String username, @Nullable String password) { return new JdbiExternalPostgresExtension(hostname, port, database, username, password);