Upgrade to Dropwizard 4.0.0 (#1667)

api/src/test/java/com/sanctionco/thunder/models/EmailTest.java

@@ -3,7 +3,7 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 import io.dropwizard.jackson.Jackson;
-import io.dropwizard.testing.FixtureHelpers;
+import io.dropwizard.util.Resources;
 
 import java.util.StringJoiner;
 
@@ -25,14 +25,14 @@ class EmailTest {
   @Test
   void shouldSerializeToJson() throws Exception {
     String expected = MAPPER.writeValueAsString(
-        MAPPER.readValue(FixtureHelpers.fixture("fixtures/email.json"), Email.class));
+        MAPPER.readValue(Resources.getResource("fixtures/email.json"), Email.class));
 
     assertEquals(expected, MAPPER.writeValueAsString(email));
   }
 
   @Test
   void shouldDeserializeFromJson() throws Exception {
-    Email fromJson = MAPPER.readValue(FixtureHelpers.fixture("fixtures/email.json"), Email.class);
+    Email fromJson = MAPPER.readValue(Resources.getResource("fixtures/email.json"), Email.class);
 
     assertEquals(email, fromJson);
   }

api/src/test/java/com/sanctionco/thunder/models/UserTest.java

@@ -3,7 +3,7 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 import io.dropwizard.jackson.Jackson;
-import io.dropwizard.testing.FixtureHelpers;
+import io.dropwizard.util.Resources;
 
 import java.util.Arrays;
 import java.util.Collections;
@@ -43,15 +43,15 @@ static void setup() {
   @Test
   void testNoPropertiesJsonSerialization() throws Exception {
     String expected = MAPPER.writeValueAsString(MAPPER.readValue(
-        FixtureHelpers.fixture("fixtures/no_properties_user.json"), User.class));
+        Resources.getResource("fixtures/no_properties_user.json"), User.class));
 
     assertEquals(expected, MAPPER.writeValueAsString(emptyPropertiesUser));
   }
 
   @Test
   void testNoPropertiesJsonDeserialization() throws Exception {
     User fromJson = MAPPER.readValue(
-        FixtureHelpers.fixture("fixtures/no_properties_user.json"), User.class);
+        Resources.getResource("fixtures/no_properties_user.json"), User.class);
 
     assertEquals(emptyPropertiesUser, fromJson);
   }
@@ -69,7 +69,7 @@ void testMultiplePropertiesJsonSerialization() throws Exception {
   @Test
   void testMultiplePropertiesJsonDeserialization() throws Exception {
     User fromJson = MAPPER.readValue(
-        FixtureHelpers.fixture("fixtures/multiple_properties_user.json"), User.class);
+        Resources.getResource("fixtures/multiple_properties_user.json"), User.class);
 
     assertEquals(multiplePropertiesUser, fromJson);
   }

application/pom.xml

@@ -133,15 +133,15 @@
     </dependency>
     <dependency>
       <groupId>io.swagger.core.v3</groupId>
-      <artifactId>swagger-core</artifactId>
+      <artifactId>swagger-core-jakarta</artifactId>
     </dependency>
     <dependency>
       <groupId>io.swagger.core.v3</groupId>
-      <artifactId>swagger-jaxrs2</artifactId>
+      <artifactId>swagger-jaxrs2-jakarta</artifactId>
     </dependency>
     <dependency>
       <groupId>io.swagger.core.v3</groupId>
-      <artifactId>swagger-integration</artifactId>
+      <artifactId>swagger-integration-jakarta</artifactId>
     </dependency>
     <dependency>
       <groupId>net.jodah</groupId>

application/src/main/java/com/sanctionco/thunder/ThunderApplication.java

@@ -6,9 +6,9 @@
 import com.sanctionco.thunder.openapi.OpenApiConfiguration;
 import com.sanctionco.thunder.secrets.SecretSourceProvider;
 
-import io.dropwizard.Application;
-import io.dropwizard.setup.Bootstrap;
-import io.dropwizard.setup.Environment;
+import io.dropwizard.core.Application;
+import io.dropwizard.core.setup.Bootstrap;
+import io.dropwizard.core.setup.Environment;
 
 /**
  * Starts up the Thunder application. The run method will add resources, health checks,

application/src/main/java/com/sanctionco/thunder/ThunderConfiguration.java

@@ -14,11 +14,12 @@
 import com.sanctionco.thunder.validation.PropertyValidationConfiguration;
 import com.sanctionco.thunder.validation.email.EmailValidationConfiguration;
 
-import io.dropwizard.Configuration;
+import io.dropwizard.core.Configuration;
+
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
 
 import java.util.Optional;
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
 
 /**
  * Provides Thunder configuration options that are defined in the configuration file. The

application/src/main/java/com/sanctionco/thunder/ThunderException.java

@@ -1,6 +1,6 @@
 package com.sanctionco.thunder;
 
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response;
 
 /**
  * An exception class that is the parent class of internal exceptions within

application/src/main/java/com/sanctionco/thunder/authentication/AuthConfiguration.java

@@ -2,8 +2,8 @@
 
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 
+import io.dropwizard.core.setup.Environment;
 import io.dropwizard.jackson.Discoverable;
-import io.dropwizard.setup.Environment;
 
 /**
  * Provides the base interface for {@code AuthConfiguration} objects. Implementing classes

application/src/main/java/com/sanctionco/thunder/authentication/basic/BasicAuthConfiguration.java

@@ -7,13 +7,14 @@
 import io.dropwizard.auth.AuthDynamicFeature;
 import io.dropwizard.auth.AuthValueFactoryProvider;
 import io.dropwizard.auth.basic.BasicCredentialAuthFilter;
-import io.dropwizard.setup.Environment;
+import io.dropwizard.core.setup.Environment;
+
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
 
 import java.security.Principal;
 import java.util.Collections;
 import java.util.List;
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
 
 /**
  * Provides the HTTP Basic Authentication implementation of {@link AuthConfiguration}.

application/src/main/java/com/sanctionco/thunder/authentication/oauth/OAuthConfiguration.java

@@ -9,15 +9,16 @@
 import io.dropwizard.auth.AuthDynamicFeature;
 import io.dropwizard.auth.AuthValueFactoryProvider;
 import io.dropwizard.auth.oauth.OAuthCredentialAuthFilter;
-import io.dropwizard.setup.Environment;
+import io.dropwizard.core.setup.Environment;
 import io.dropwizard.validation.ValidationMethod;
 
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotEmpty;
+
 import java.security.Principal;
 import java.security.interfaces.RSAPublicKey;
 import java.util.Objects;
 import java.util.Optional;
-import javax.validation.Valid;
-import javax.validation.constraints.NotEmpty;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

application/src/main/java/com/sanctionco/thunder/crypto/PasswordHashConfiguration.java

@@ -2,7 +2,7 @@
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
-import javax.validation.Valid;
+import jakarta.validation.Valid;
 
 /**
  * Provides optional configuration options for password hashing, including the hash algorithm.

application/src/main/java/com/sanctionco/thunder/dao/DatabaseException.java

@@ -2,7 +2,7 @@
 
 import com.sanctionco.thunder.ThunderException;
 
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response;
 
 /**
  * Represents an exception that occurred during a database operation. Provides constructors

application/src/main/java/com/sanctionco/thunder/dao/dynamodb/DynamoDbUsersDaoFactory.java

@@ -7,9 +7,10 @@
 import com.sanctionco.thunder.dao.UsersDao;
 import com.sanctionco.thunder.dao.UsersDaoFactory;
 
+import jakarta.validation.constraints.NotEmpty;
+
 import java.net.URI;
 import java.util.Objects;
-import javax.validation.constraints.NotEmpty;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

application/src/main/java/com/sanctionco/thunder/dao/inmemorydb/InMemoryDbUsersDaoFactory.java

@@ -7,8 +7,8 @@
 import com.sanctionco.thunder.dao.UsersDao;
 import com.sanctionco.thunder.dao.UsersDaoFactory;
 
-import javax.validation.constraints.Max;
-import javax.validation.constraints.Min;
+import jakarta.validation.constraints.Max;
+import jakarta.validation.constraints.Min;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

application/src/main/java/com/sanctionco/thunder/dao/mongodb/MongoDbUsersDaoFactory.java

@@ -11,8 +11,9 @@
 import com.sanctionco.thunder.dao.UsersDao;
 import com.sanctionco.thunder.dao.UsersDaoFactory;
 
+import jakarta.validation.constraints.NotEmpty;
+
 import java.util.Objects;
-import javax.validation.constraints.NotEmpty;
 
 import org.bson.Document;
 import org.slf4j.Logger;

application/src/main/java/com/sanctionco/thunder/openapi/OpenApiBundle.java

@@ -1,11 +1,11 @@
 package com.sanctionco.thunder.openapi;
 
-import io.dropwizard.Configuration;
-import io.dropwizard.ConfiguredBundle;
 import io.dropwizard.assets.AssetsBundle;
-import io.dropwizard.setup.Bootstrap;
-import io.dropwizard.setup.Environment;
-import io.dropwizard.views.ViewBundle;
+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.views.common.ViewBundle;
 import io.swagger.v3.core.converter.ModelConverters;
 import io.swagger.v3.core.jackson.ModelResolver;
 import io.swagger.v3.jaxrs2.SwaggerSerializers;
@@ -17,8 +17,8 @@
 import org.slf4j.LoggerFactory;
 
 /**
- * A {@link io.dropwizard.ConfiguredBundle} that provides configuration of Swagger and Swagger UI
- * on top of Dropwizard.
+ * A {@link io.dropwizard.core.ConfiguredBundle} that provides configuration of Swagger
+ * and Swagger UI on top of Dropwizard.
  *
  * <p>Code originally taken from <a href="https://github.com/smoketurner/dropwizard-swagger">
  *   Dropwizard Swagger</a>, with modifications for this project.

application/src/main/java/com/sanctionco/thunder/openapi/SwaggerResource.java

@@ -2,18 +2,18 @@
 
 import com.codahale.metrics.annotation.Metered;
 
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
  * Provides a API method to get Swagger UI for all available endpoints. The methods contained
  * in this class are available at the {@code /swagger} endpoint, and return a HTML
- * {@link io.dropwizard.views.View} in the response.
+ * {@link io.dropwizard.views.common.View} in the response.
  *
  * <p>Code originally taken from <a href="https://github.com/smoketurner/dropwizard-swagger">
  *   Dropwizard Swagger</a>, with modifications for this project.

application/src/main/java/com/sanctionco/thunder/openapi/SwaggerView.java

@@ -1,6 +1,6 @@
 package com.sanctionco.thunder.openapi;
 
-import io.dropwizard.views.View;
+import io.dropwizard.views.common.View;
 
 import java.nio.charset.StandardCharsets;
 import javax.annotation.Nullable;

application/src/main/java/com/sanctionco/thunder/resources/RequestOptions.java

@@ -5,10 +5,11 @@
 
 import io.dropwizard.util.Duration;
 
+import jakarta.validation.Valid;
+import jakarta.ws.rs.container.AsyncResponse;
+import jakarta.ws.rs.core.Response;
+
 import java.util.concurrent.TimeUnit;
-import javax.validation.Valid;
-import javax.ws.rs.container.AsyncResponse;
-import javax.ws.rs.core.Response;
 
 /**
  * Provides optional configuration options for Thunder operations.

application/src/main/java/com/sanctionco/thunder/resources/UserResource.java

@@ -16,22 +16,23 @@
 import io.dropwizard.auth.Auth;
 import io.swagger.v3.oas.annotations.Parameter;
 
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.HeaderParam;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.container.AsyncResponse;
+import jakarta.ws.rs.container.Suspended;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+
 import java.security.Principal;
 import java.util.Objects;
 import java.util.Optional;
 import javax.inject.Inject;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.container.AsyncResponse;
-import javax.ws.rs.container.Suspended;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

application/src/main/java/com/sanctionco/thunder/resources/VerificationResource.java

@@ -17,25 +17,26 @@
 import io.dropwizard.auth.Auth;
 import io.swagger.v3.oas.annotations.Parameter;
 
+import jakarta.ws.rs.DefaultValue;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.HeaderParam;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.container.AsyncResponse;
+import jakarta.ws.rs.container.Suspended;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.UriBuilder;
+import jakarta.ws.rs.core.UriInfo;
+
 import java.net.URI;
 import java.security.Principal;
 import java.util.Objects;
 import java.util.UUID;
 import javax.inject.Inject;
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.GET;
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.container.AsyncResponse;
-import javax.ws.rs.container.Suspended;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriBuilder;
-import javax.ws.rs.core.UriInfo;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

application/src/main/java/com/sanctionco/thunder/secrets/SecretSourceProvider.java

@@ -10,9 +10,10 @@
 import io.dropwizard.jackson.Jackson;
 import io.dropwizard.jersey.validation.Validators;
 
+import jakarta.validation.Validator;
+
 import java.io.IOException;
 import java.io.InputStream;
-import javax.validation.Validator;
 
 import org.apache.commons.text.StringSubstitutor;
 

application/src/main/java/com/sanctionco/thunder/secrets/secretsmanager/SecretsManagerSecretProvider.java

@@ -4,10 +4,11 @@
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.sanctionco.thunder.secrets.SecretProvider;
 
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotEmpty;
+
 import java.net.URI;
 import java.time.Duration;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotEmpty;
 
 import net.jodah.failsafe.Failsafe;
 import net.jodah.failsafe.RetryPolicy;