Bump Dropwizard to version 4.0.0 (#170)

.github/workflows/build.yml

@@ -4,6 +4,7 @@ on:
     branches:
     - 2.1.x
     - 3.0.x
+    - 4.0.x
   pull_request:
 jobs:
   build:

pom.xml

@@ -69,7 +69,7 @@
     <sonar.host.url>https://sonarcloud.io</sonar.host.url>
 
     <brave.version>5.15.0</brave.version>
-    <dropwizard.version>3.0.0</dropwizard.version>
+    <dropwizard.version>4.0.0</dropwizard.version>
     <lettuce.version>6.2.3.RELEASE</lettuce.version>
     <redis-mock.version>1.0.7</redis-mock.version>
   </properties>

src/main/java/io/dropwizard/redis/AbstractRedisClientFactory.java

@@ -24,8 +24,8 @@
 
 import java.util.List;
 
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
 
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, property = "type")
 public abstract class AbstractRedisClientFactory<K, V> implements Discoverable {

src/main/java/io/dropwizard/redis/RedisClientFactory.java

@@ -17,8 +17,8 @@
 import io.lettuce.core.codec.RedisCodec;
 import io.lettuce.core.resource.ClientResources;
 
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
 
 @JsonTypeName("basic")
 public class RedisClientFactory<K, V> extends AbstractRedisClientFactory<K, V> {

src/main/java/io/dropwizard/redis/RedisClusterClientFactory.java

@@ -20,8 +20,8 @@
 import org.checkerframework.checker.nullness.qual.Nullable;
 import org.hibernate.validator.constraints.NotEmpty;
 
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
 import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;

src/main/java/io/dropwizard/redis/clientoptions/ClientOptionsFactory.java

@@ -6,9 +6,9 @@
 import io.dropwizard.redis.timeout.TimeoutOptionsFactory;
 import io.lettuce.core.ClientOptions;
 
-import javax.validation.Valid;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotNull;
 
 public class ClientOptionsFactory {
     @JsonProperty

src/main/java/io/dropwizard/redis/clientoptions/ClusterClientOptionsFactory.java

@@ -5,8 +5,8 @@
 import io.lettuce.core.cluster.ClusterClientOptions;
 import io.lettuce.core.cluster.ClusterTopologyRefreshOptions;
 
-import javax.validation.Valid;
-import javax.validation.constraints.Min;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.Min;
 
 public class ClusterClientOptionsFactory extends ClientOptionsFactory {
     @JsonProperty

src/main/java/io/dropwizard/redis/clientresources/ClientResourcesFactory.java

@@ -21,9 +21,9 @@
 import io.lettuce.core.resource.DefaultClientResources;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
-import javax.validation.Valid;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotNull;
 
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, property = "type")
 public abstract class ClientResourcesFactory implements Discoverable {

src/main/java/io/dropwizard/redis/codec/CompressionCodecFactory.java

@@ -5,8 +5,8 @@
 import io.lettuce.core.codec.CompressionCodec;
 import io.lettuce.core.codec.RedisCodec;
 
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
 
 @JsonTypeName("compression")
 public class CompressionCodecFactory<K, V> implements RedisCodecFactory<K, V> {

src/main/java/io/dropwizard/redis/delay/ConstantDelayFactory.java

@@ -7,7 +7,7 @@
 
 import java.util.function.Supplier;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 @JsonTypeName("constant")
 public class ConstantDelayFactory implements DelayFactory {

src/main/java/io/dropwizard/redis/delay/DecorrelatedJitterDelayFactory.java

@@ -8,8 +8,8 @@
 import java.util.concurrent.TimeUnit;
 import java.util.function.Supplier;
 
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotNull;
 
 @JsonTypeName("decorrelated-jitter")
 public class DecorrelatedJitterDelayFactory implements DelayFactory {

src/main/java/io/dropwizard/redis/delay/EqualJitterDelayFactory.java

@@ -8,8 +8,8 @@
 import java.util.concurrent.TimeUnit;
 import java.util.function.Supplier;
 
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotNull;
 
 @JsonTypeName("equal-jitter")
 public class EqualJitterDelayFactory implements DelayFactory {

src/main/java/io/dropwizard/redis/delay/ExponentialDelayFactory.java

@@ -8,8 +8,8 @@
 import java.util.concurrent.TimeUnit;
 import java.util.function.Supplier;
 
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotNull;
 
 @JsonTypeName("exponential")
 public class ExponentialDelayFactory implements DelayFactory {

src/main/java/io/dropwizard/redis/delay/FullJitterDelayFactory.java

@@ -8,8 +8,8 @@
 import java.util.concurrent.TimeUnit;
 import java.util.function.Supplier;
 
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotNull;
 
 @JsonTypeName("full-jitter")
 public class FullJitterDelayFactory implements DelayFactory {

src/main/java/io/dropwizard/redis/metrics/DefaultCommandLatencyCollectorFactory.java

@@ -8,8 +8,8 @@
 
 import java.util.concurrent.TimeUnit;
 
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
 
 @JsonTypeName("default")
 public class DefaultCommandLatencyCollectorFactory implements CommandLatencyRecorderFactory {

src/main/java/io/dropwizard/redis/metrics/DefaultEventPublisherOptionsFactory.java

@@ -6,7 +6,7 @@
 import io.lettuce.core.event.DefaultEventPublisherOptions;
 import io.lettuce.core.event.EventPublisherOptions;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 @JsonTypeName("default")
 public class DefaultEventPublisherOptionsFactory implements EventPublisherOptionsFactory {

src/main/java/io/dropwizard/redis/socket/SocketOptionsFactory.java

@@ -4,7 +4,7 @@
 import io.dropwizard.util.Duration;
 import io.lettuce.core.SocketOptions;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 public class SocketOptionsFactory {
     @NotNull

src/main/java/io/dropwizard/redis/ssl/SslOptionsFactory.java

@@ -6,7 +6,7 @@
 
 import java.io.File;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 public class SslOptionsFactory {
     @JsonProperty

src/main/java/io/dropwizard/redis/topology/ClusterTopologyRefreshOptionsFactory.java

@@ -6,8 +6,8 @@
 
 import java.util.Set;
 
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotNull;
 
 public class ClusterTopologyRefreshOptionsFactory {
     @JsonProperty

src/main/java/io/dropwizard/redis/uri/RedisModeURIFactory.java

@@ -5,8 +5,8 @@
 import com.google.common.net.HostAndPort;
 import io.lettuce.core.RedisURI;
 
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
 
 @JsonTypeName("redis")
 public class RedisModeURIFactory extends RedisURIFactory {

src/main/java/io/dropwizard/redis/uri/RedisURIFactory.java

@@ -6,7 +6,7 @@
 import io.dropwizard.util.Duration;
 import io.lettuce.core.RedisURI;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, property = "type")
 public abstract class RedisURIFactory implements Discoverable {

src/main/java/io/dropwizard/redis/uri/SentinelModeURIFactory.java

@@ -6,7 +6,7 @@
 import io.lettuce.core.RedisURI;
 import org.hibernate.validator.constraints.NotEmpty;
 
-import javax.validation.Valid;
+import jakarta.validation.Valid;
 import java.util.Collections;
 import java.util.Set;
 

src/test/java/io/dropwizard/redis/clientoptions/ClusterClientOptionsFactoryTest.java

@@ -8,7 +8,7 @@
 import io.lettuce.core.cluster.ClusterClientOptions;
 import org.junit.jupiter.api.Test;
 
-import javax.validation.Validator;
+import jakarta.validation.Validator;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

src/test/java/io/dropwizard/redis/clientresources/DefaultClientResourcesFactoryTest.java

@@ -14,7 +14,7 @@
 
 import java.io.File;
 
-import javax.validation.Validator;
+import jakarta.validation.Validator;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

src/test/java/io/dropwizard/redis/codec/CompressionCodecFactoryTest.java

@@ -12,7 +12,7 @@
 
 import java.io.File;
 
-import javax.validation.Validator;
+import jakarta.validation.Validator;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

src/test/java/io/dropwizard/redis/delay/ConstantDelayFactoryTest.java

@@ -11,7 +11,7 @@
 
 import java.io.File;
 
-import javax.validation.Validator;
+import jakarta.validation.Validator;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

src/test/java/io/dropwizard/redis/delay/DecorrelatedJitterDelayFactoryTest.java

@@ -11,7 +11,7 @@
 
 import java.io.File;
 
-import javax.validation.Validator;
+import jakarta.validation.Validator;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

src/test/java/io/dropwizard/redis/delay/EqualJitterDelayFactoryTest.java

@@ -11,7 +11,7 @@
 
 import java.io.File;
 
-import javax.validation.Validator;
+import jakarta.validation.Validator;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

src/test/java/io/dropwizard/redis/delay/ExponentialDelayFactoryTest.java

@@ -11,7 +11,7 @@
 
 import java.io.File;
 
-import javax.validation.Validator;
+import jakarta.validation.Validator;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

src/test/java/io/dropwizard/redis/delay/FullJitterDelayFactoryTest.java

@@ -11,7 +11,7 @@
 
 import java.io.File;
 
-import javax.validation.Validator;
+import jakarta.validation.Validator;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

src/test/java/io/dropwizard/redis/metrics/DefaultCommandLatencyCollectorFactoryTest.java

@@ -14,7 +14,7 @@
 import java.io.File;
 import java.util.concurrent.TimeUnit;
 
-import javax.validation.Validator;
+import jakarta.validation.Validator;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

src/test/java/io/dropwizard/redis/metrics/DefaultEventPublisherOptionsFactoryTest.java

@@ -12,7 +12,7 @@
 
 import java.io.File;
 
-import javax.validation.Validator;
+import jakarta.validation.Validator;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

src/test/java/io/dropwizard/redis/netty/DefaultEventExecutorGroupFactoryTest.java

@@ -12,7 +12,7 @@
 
 import java.io.File;
 
-import javax.validation.Validator;
+import jakarta.validation.Validator;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

src/test/java/io/dropwizard/redis/socket/SocketOptionsFactoryTest.java

@@ -11,7 +11,7 @@
 
 import java.io.File;
 
-import javax.validation.Validator;
+import jakarta.validation.Validator;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

src/test/java/io/dropwizard/redis/ssl/SslOptionsFactoryTest.java

@@ -10,7 +10,7 @@
 
 import java.io.File;
 
-import javax.validation.Validator;
+import jakarta.validation.Validator;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

src/test/java/io/dropwizard/redis/test/TestConfiguration.java

@@ -4,8 +4,8 @@
 import io.dropwizard.core.Configuration;
 import io.dropwizard.redis.RedisClientFactory;
 
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
 
 public class TestConfiguration extends Configuration {
     @Valid

src/test/java/io/dropwizard/redis/timeout/TimeoutOptionsFactoryTest.java

@@ -11,7 +11,7 @@
 
 import java.io.File;
 
-import javax.validation.Validator;
+import jakarta.validation.Validator;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

src/test/java/io/dropwizard/redis/topology/ClusterTopologyRefreshOptionsFactoryTest.java

@@ -11,7 +11,7 @@
 
 import java.io.File;
 
-import javax.validation.Validator;
+import jakarta.validation.Validator;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

src/test/java/io/dropwizard/redis/uri/RedisModeURIFactoryTest.java

@@ -13,7 +13,7 @@
 
 import java.io.File;
 
-import javax.validation.Validator;
+import jakarta.validation.Validator;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

src/test/java/io/dropwizard/redis/uri/SentinelModeURIFactoryTest.java

@@ -14,7 +14,7 @@
 
 import java.io.File;
 
-import javax.validation.Validator;
+import jakarta.validation.Validator;
 
 import static org.assertj.core.api.Assertions.assertThat;