Update dependency io.dropwizard:dropwizard-dependencies to v4 (releas…

…e/4.0.x) (#242) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Jochen Schalanda <[email protected]>
dropwizard · Dec 13, 2023 · 9db4343 · 9db4343
1 parent 3397dc0
commit 9db4343
Show file tree

Hide file tree

Showing 29 changed files with 185 additions and 192 deletions.
diff --git a/pom.xml b/pom.xml
@@ -96,7 +96,7 @@
         <sonar.host.url>https://sonarcloud.io</sonar.host.url>
 
         <javadoc.doclint.none>-Xdoclint:none</javadoc.doclint.none>
-        <dropwizard.version>2.0.29</dropwizard.version>
+        <dropwizard.version>4.0.4</dropwizard.version>
         <curator.version>5.5.0</curator.version>
         <error_prone.javac.version>9+181-r4173-1</error_prone.javac.version>
     </properties>

diff --git a/src/main/java/io/dropwizard/discovery/AbstractDiscoveryBundle.java b/src/main/java/io/dropwizard/discovery/AbstractDiscoveryBundle.java
@@ -1,17 +1,17 @@
 package io.dropwizard.discovery;
 
-import io.dropwizard.Configuration;
-import io.dropwizard.ConfiguredBundle;
+import io.dropwizard.core.Configuration;
+import io.dropwizard.core.ConfiguredBundle;
+import io.dropwizard.core.setup.Bootstrap;
+import io.dropwizard.core.setup.Environment;
 import io.dropwizard.discovery.client.DiscoveryClient;
 import io.dropwizard.discovery.core.CuratorAdvertisementListener;
 import io.dropwizard.discovery.core.CuratorAdvertiser;
 import io.dropwizard.discovery.core.CuratorFactory;
 import io.dropwizard.discovery.core.JacksonInstanceSerializer;
 import io.dropwizard.discovery.manage.CuratorAdvertiserManager;
 import io.dropwizard.discovery.manage.ServiceDiscoveryManager;
-import io.dropwizard.setup.Bootstrap;
-import io.dropwizard.setup.Environment;
-import javax.annotation.Nonnull;
+import org.checkerframework.checker.nullness.qual.NonNull;
 import org.apache.curator.framework.CuratorFramework;
 import org.apache.curator.x.discovery.DownInstancePolicy;
 import org.apache.curator.x.discovery.ProviderStrategy;
@@ -31,13 +31,13 @@ public abstract class AbstractDiscoveryBundle<T extends Configuration, V>
     public abstract Class<V> getPayloadClass();
 
     @Override
-    public void initialize(@Nonnull final Bootstrap<?> bootstrap) {
+    public void initialize(@NonNull final Bootstrap<?> bootstrap) {
         mapper = bootstrap.getObjectMapper();
     }
 
     @Override
-    public void run(@Nonnull final T configuration,
-            @Nonnull final Environment environment) throws Exception {
+    public void run(@NonNull final T configuration,
+            @NonNull final Environment environment) throws Exception {
 
         final DiscoveryFactory discoveryConfig = getDiscoveryFactory(configuration);
         // Allow disabling all discovery functionality
@@ -77,21 +77,21 @@ public void run(@Nonnull final T configuration,
      * Return a new {@link DiscoveryClient} instance that uses a
      * {@link RoundRobinStrategy} when selecting a instance to return and the
      * default {@link DownInstancePolicy}.
-     * 
+     *
      * @param serviceName
      *            name of the service to monitor
      * @return {@link DiscoveryClient}
      */
     public DiscoveryClient<V> newDiscoveryClient(
-            @Nonnull final String serviceName) {
+            @NonNull final String serviceName) {
         return newDiscoveryClient(serviceName, new RoundRobinStrategy<V>());
     }
 
     /**
      * Return a new {@link DiscoveryClient} instance uses a default
      * {@link DownInstancePolicy} and the provided {@link ProviderStrategy} for
      * selecting an instance.
-     * 
+     *
      * @param serviceName
      *            name of the service to monitor
      * @param providerStrategy
@@ -100,8 +100,8 @@ public DiscoveryClient<V> newDiscoveryClient(
      * @return {@link DiscoveryClient}
      */
     public DiscoveryClient<V> newDiscoveryClient(
-            @Nonnull final String serviceName,
-            @Nonnull final ProviderStrategy<V> providerStrategy) {
+            @NonNull final String serviceName,
+            @NonNull final ProviderStrategy<V> providerStrategy) {
         return new DiscoveryClient<V>(serviceName, discovery,
                 new DownInstancePolicy(), providerStrategy);
     }

diff --git a/src/main/java/io/dropwizard/discovery/DiscoveryBundle.java b/src/main/java/io/dropwizard/discovery/DiscoveryBundle.java
@@ -1,6 +1,6 @@
 package io.dropwizard.discovery;
 
-import io.dropwizard.Configuration;
+import io.dropwizard.core.Configuration;
 import io.dropwizard.discovery.core.CuratorAdvertiser;
 import io.dropwizard.discovery.core.DefaultServiceInstanceFactory;
 import io.dropwizard.discovery.core.InstanceMetadata;
@@ -11,12 +11,12 @@
  * <code>DiscoveryBundle</code> provides a more completed implementation of
  * <code>AbstractDiscoveryBundle</code>, using <code>InstanceMetadata</code> as
  * payload for <code>ServiceInstance</code>
- * 
+ *
  * <p>
  * Users should extend <code>AbstractDiscoveryBundle</code> if more fine-grain
  * control is necessary of the <code>ServiceInstance</code> payload.
  * </p>
- * 
+ *
  * @see io.dropwizard.discovery.core.InstanceMetadata
  * @see io.dropwizard.discovery.DiscoveryBundle
  */

diff --git a/src/main/java/io/dropwizard/discovery/DiscoveryConfiguration.java b/src/main/java/io/dropwizard/discovery/DiscoveryConfiguration.java
@@ -1,6 +1,6 @@
 package io.dropwizard.discovery;
 
-import io.dropwizard.Configuration;
+import io.dropwizard.core.Configuration;
 import io.dropwizard.discovery.core.CuratorAdvertiser;
 import org.apache.curator.x.discovery.ServiceDiscovery;
 

diff --git a/src/main/java/io/dropwizard/discovery/DiscoveryFactory.java b/src/main/java/io/dropwizard/discovery/DiscoveryFactory.java
@@ -2,10 +2,10 @@
 
 import static com.google.common.base.Preconditions.checkNotNull;
 import java.util.concurrent.TimeUnit;
-import javax.annotation.Nonnull;
-import javax.validation.constraints.Max;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
+import org.checkerframework.checker.nullness.qual.NonNull;
+import jakarta.validation.constraints.Max;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotNull;
 import org.apache.curator.RetryPolicy;
 import org.apache.curator.framework.api.CompressionProvider;
 import org.apache.curator.framework.imps.GzipCompressionProvider;
@@ -38,7 +38,7 @@ enum CompressionCodec {
 
         final private CompressionProvider provider;
 
-        CompressionCodec(@Nonnull final CompressionProvider provider) {
+        CompressionCodec(@NonNull final CompressionProvider provider) {
             this.provider = provider;
         }
 
@@ -125,7 +125,7 @@ public String getServiceName() {
     }
 
     @JsonProperty
-    public void setServiceName(@Nonnull final String serviceName) {
+    public void setServiceName(@NonNull final String serviceName) {
         this.serviceName = checkNotNull(serviceName);
     }
 
@@ -135,7 +135,7 @@ public String getNamespace() {
     }
 
     @JsonProperty
-    public void setNamespace(@Nonnull final String namespace) {
+    public void setNamespace(@NonNull final String namespace) {
         this.namespace = checkNotNull(namespace);
     }
 
@@ -145,7 +145,7 @@ public String getBasePath() {
     }
 
     @JsonProperty
-    public void setBasePath(@Nonnull final String basePath) {
+    public void setBasePath(@NonNull final String basePath) {
         this.basePath = checkNotNull(basePath);
     }
 
@@ -155,7 +155,7 @@ public String getListenAddress() {
     }
 
     @JsonProperty
-    public void setListenAddress(@Nonnull final String listenAddress) {
+    public void setListenAddress(@NonNull final String listenAddress) {
         this.listenAddress = checkNotNull(listenAddress);
     }
 
@@ -166,7 +166,7 @@ public Duration getConnectionTimeout() {
 
     @JsonProperty
     public void setConnectionTimeout(
-            @Nonnull final Duration connectionTimeout) {
+            @NonNull final Duration connectionTimeout) {
         this.connectionTimeout = checkNotNull(connectionTimeout);
     }
 
@@ -176,7 +176,7 @@ public Duration getSessionTimeout() {
     }
 
     @JsonProperty
-    public void setSessionTimeout(@Nonnull final Duration sessionTimeout) {
+    public void setSessionTimeout(@NonNull final Duration sessionTimeout) {
         this.sessionTimeout = checkNotNull(sessionTimeout);
     }
 
@@ -216,7 +216,7 @@ public Duration getBaseSleepTime() {
     }
 
     @JsonProperty
-    public void setBaseSleepTime(@Nonnull final Duration baseSleepTime) {
+    public void setBaseSleepTime(@NonNull final Duration baseSleepTime) {
         this.baseSleepTime = checkNotNull(baseSleepTime);
     }
 

diff --git a/src/main/java/io/dropwizard/discovery/client/DiscoveryClient.java b/src/main/java/io/dropwizard/discovery/client/DiscoveryClient.java
@@ -5,8 +5,7 @@
 import java.io.Closeable;
 import java.io.IOException;
 import java.util.Collection;
-import javax.annotation.Nonnull;
-import javax.annotation.concurrent.ThreadSafe;
+import org.checkerframework.checker.nullness.qual.NonNull;
 import org.apache.curator.x.discovery.DownInstancePolicy;
 import org.apache.curator.x.discovery.ProviderStrategy;
 import org.apache.curator.x.discovery.ServiceCache;
@@ -16,7 +15,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-@ThreadSafe
 public class DiscoveryClient<T> implements Closeable {
 
     private static final Logger LOGGER = LoggerFactory
@@ -27,7 +25,7 @@ public class DiscoveryClient<T> implements Closeable {
 
     /**
      * Constructor
-     * 
+     *
      * @param serviceName
      *            name of the service to monitor
      * @param discovery
@@ -38,10 +36,10 @@ public class DiscoveryClient<T> implements Closeable {
      * @param providerStrategy
      *            {@link ProviderStrategy} to use when selecting an instance
      */
-    public DiscoveryClient(@Nonnull final String serviceName,
-            @Nonnull final ServiceDiscovery<T> discovery,
-            @Nonnull final DownInstancePolicy downInstancePolicy,
-            @Nonnull final ProviderStrategy<T> providerStrategy) {
+    public DiscoveryClient(@NonNull final String serviceName,
+            @NonNull final ServiceDiscovery<T> discovery,
+            @NonNull final DownInstancePolicy downInstancePolicy,
+            @NonNull final ProviderStrategy<T> providerStrategy) {
         checkNotNull(serviceName);
         checkArgument(!serviceName.isEmpty(), "serviceName cannot be empty");
         checkNotNull(providerStrategy);
@@ -58,7 +56,7 @@ public DiscoveryClient(@Nonnull final String serviceName,
 
     /**
      * Return a list of discoverable services
-     * 
+     *
      * @return Collection of service names
      */
     public Collection<String> getServices() throws Exception {
@@ -67,17 +65,17 @@ public Collection<String> getServices() throws Exception {
 
     /**
      * Return the running instances for the service.
-     * 
+     *
      * @return Collection of service instances
      */
     public Collection<ServiceInstance<T>> getInstances(
-            @Nonnull final String serviceName) throws Exception {
+            @NonNull final String serviceName) throws Exception {
         return discovery.queryForInstances(serviceName);
     }
 
     /**
      * Return a cached list of the running instances for the service.
-     * 
+     *
      * @return Collection of service instances
      */
     public Collection<ServiceInstance<T>> getInstances() {
@@ -86,7 +84,7 @@ public Collection<ServiceInstance<T>> getInstances() {
 
     /**
      * Return an instance of this service.
-     * 
+     *
      * @return ServiceInstance
      * @throws Exception
      */
@@ -96,17 +94,17 @@ public ServiceInstance<T> getInstance() throws Exception {
 
     /**
      * Note an error when connecting to a service instance.
-     * 
+     *
      * @param instance
      *            {@link ServiceInstance} that is causing the error.
      */
-    public void noteError(@Nonnull final ServiceInstance<T> instance) {
+    public void noteError(@NonNull final ServiceInstance<T> instance) {
         provider.noteError(instance);
     }
 
     /**
      * Start the internal {@link ServiceProvider} and {@link ServiceCache}
-     * 
+     *
      * @throws Exception
      */
     public void start() throws Exception {

diff --git a/src/main/java/io/dropwizard/discovery/client/DiscoveryClientManager.java b/src/main/java/io/dropwizard/discovery/client/DiscoveryClientManager.java
@@ -2,7 +2,7 @@
 
 import static com.google.common.base.Preconditions.checkNotNull;
 import io.dropwizard.lifecycle.Managed;
-import javax.annotation.Nonnull;
+import org.checkerframework.checker.nullness.qual.NonNull;
 
 public class DiscoveryClientManager<T> implements Managed {
 
@@ -14,7 +14,7 @@ public class DiscoveryClientManager<T> implements Managed {
      * @param client
      *            {@link DiscoveryClient}
      */
-    public DiscoveryClientManager(@Nonnull final DiscoveryClient<T> client) {
+    public DiscoveryClientManager(@NonNull final DiscoveryClient<T> client) {
         this.client = checkNotNull(client);
     }
 

diff --git a/src/main/java/io/dropwizard/discovery/core/CuratorAdvertisementListener.java b/src/main/java/io/dropwizard/discovery/core/CuratorAdvertisementListener.java
@@ -1,7 +1,7 @@
 package io.dropwizard.discovery.core;
 
 import static com.google.common.base.Preconditions.checkNotNull;
-import javax.annotation.Nonnull;
+import org.checkerframework.checker.nullness.qual.NonNull;
 import org.eclipse.jetty.server.Server;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -21,7 +21,7 @@ public class CuratorAdvertisementListener<T>
      *            {@link CuratorAdvertiser}
      */
     public CuratorAdvertisementListener(
-            @Nonnull final CuratorAdvertiser<T> advertiser) {
+            @NonNull final CuratorAdvertiser<T> advertiser) {
         this.advertiser = checkNotNull(advertiser);
     }