Bump dropwizard.version from 2.1.4 to 4.0.2 (#290)

* Bump dropwizard.version from 2.1.4 to 4.0.2 Bumps `dropwizard.version` from 2.1.4 to 4.0.2. Updates `io.dropwizard:dropwizard-core` from 2.1.4 to 4.0.2 Updates `io.dropwizard:dropwizard-testing` from 2.1.4 to 4.0.2 Updates `io.dropwizard:dropwizard-client` from 2.1.4 to 4.0.2 --- updated-dependencies: - dependency-name: io.dropwizard:dropwizard-core dependency-type: direct:production update-type: version-update:semver-major - dependency-name: io.dropwizard:dropwizard-testing dependency-type: direct:development update-type: version-update:semver-major - dependency-name: io.dropwizard:dropwizard-client dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> * Update code for Dropwizard 4 --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: André Schaffer <[email protected]>
andreschaffer · Oct 14, 2023 · 36473d5 · 36473d5
1 parent 62fb60d
commit 36473d5
Show file tree

Hide file tree

Showing 32 changed files with 139 additions and 131 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -19,7 +19,7 @@ jobs:
       - name: Set up JDK
         uses: actions/[email protected]
         with:
-          java-version: 14
+          java-version: 19
           distribution: 'adopt'
 
       - name: Cache

diff --git a/pom.xml b/pom.xml
@@ -9,17 +9,17 @@
   <version>1.0-SNAPSHOT</version>
 
   <properties>
-    <java.version>14</java.version>
-    <dropwizard.version>2.1.4</dropwizard.version>
-    <jersey.version>2.37</jersey.version>
+    <java.version>19</java.version>
+    <dropwizard.version>4.0.2</dropwizard.version>
+    <jersey.version>3.0.11</jersey.version>
+    <jakarta.version>2.1.1</jakarta.version>
     <junit.version>5.10.0</junit.version>
     <error_prone.version>2.22.0</error_prone.version>
     <mvn-test-plugins.version>3.1.2</mvn-test-plugins.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <automatic-module.name>bank.service</automatic-module.name>
-    <argLine>--add-opens java.base/java.math=${automatic-module.name}
-             --add-opens java.base/java.time=${automatic-module.name}</argLine>
+    <argLine>--add-opens java.base/java.math=ALL-UNNAMED
+             --add-opens java.base/java.time=ALL-UNNAMED</argLine>
   </properties>
 
   <dependencies>
@@ -55,14 +55,7 @@
 
     <dependency>
       <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter-api</artifactId>
-      <version>${junit.version}</version>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter-params</artifactId>
+      <artifactId>junit-jupiter</artifactId>
       <version>${junit.version}</version>
       <scope>test</scope>
     </dependency>
@@ -128,6 +121,18 @@
         <version>${jersey.version}</version>
       </dependency>
 
+      <dependency>
+        <groupId>jakarta.annotation</groupId>
+        <artifactId>jakarta.annotation-api</artifactId>
+        <version>${jakarta.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>jakarta.activation</groupId>
+        <artifactId>jakarta.activation-api</artifactId>
+        <version>${jakarta.version}</version>
+      </dependency>
+
       <dependency>
         <groupId>com.google.errorprone</groupId>
         <artifactId>error_prone_annotations</artifactId>
@@ -176,7 +181,8 @@
         <artifactId>maven-checkstyle-plugin</artifactId>
         <version>3.3.0</version>
         <configuration>
-          <encoding>UTF-8</encoding>
+          <inputEncoding>UTF-8</inputEncoding>
+          <outputEncoding>UTF-8</outputEncoding>
           <consoleOutput>true</consoleOutput>
           <failsOnError>true</failsOnError>
           <violationSeverity>warning</violationSeverity>
@@ -202,7 +208,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-enforcer-plugin</artifactId>
-        <version>3.2.1</version>
+        <version>3.4.1</version>
         <executions>
           <execution>
             <id>enforce</id>

diff --git a/src/main/java/bankservice/bootstrap/BankServiceApplication.java b/src/main/java/bankservice/bootstrap/BankServiceApplication.java
@@ -28,9 +28,9 @@
 import bankservice.service.client.ClientService;
 import com.google.common.eventbus.AsyncEventBus;
 import com.google.common.eventbus.EventBus;
-import io.dropwizard.Application;
-import io.dropwizard.Configuration;
-import io.dropwizard.setup.Environment;
+import io.dropwizard.core.Application;
+import io.dropwizard.core.Configuration;
+import io.dropwizard.core.setup.Environment;
 import org.glassfish.jersey.linking.DeclarativeLinkingFeature;
 import org.glassfish.jersey.logging.LoggingFeature;
 

diff --git a/...in/java/bankservice/port/incoming/adapter/resources/OptimisticLockingExceptionMapper.java b/...in/java/bankservice/port/incoming/adapter/resources/OptimisticLockingExceptionMapper.java
@@ -1,11 +1,12 @@
 package bankservice.port.incoming.adapter.resources;
 
-import static javax.ws.rs.core.Response.Status.CONFLICT;
+
+import static jakarta.ws.rs.core.Response.Status.CONFLICT;
 
 import bankservice.domain.model.OptimisticLockingException;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.ext.ExceptionMapper;
-import javax.ws.rs.ext.Provider;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.ext.ExceptionMapper;
+import jakarta.ws.rs.ext.Provider;
 
 @Provider
 public class OptimisticLockingExceptionMapper implements

diff --git a/.../bankservice/port/incoming/adapter/resources/accounts/AccountNotFoundExceptionMapper.java b/.../bankservice/port/incoming/adapter/resources/accounts/AccountNotFoundExceptionMapper.java
@@ -1,11 +1,12 @@
 package bankservice.port.incoming.adapter.resources.accounts;
 
-import static javax.ws.rs.core.Response.Status.NOT_FOUND;
+
+import static jakarta.ws.rs.core.Response.Status.NOT_FOUND;
 
 import bankservice.service.account.AccountNotFoundException;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.ext.ExceptionMapper;
-import javax.ws.rs.ext.Provider;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.ext.ExceptionMapper;
+import jakarta.ws.rs.ext.Provider;
 
 @Provider
 public class AccountNotFoundExceptionMapper implements ExceptionMapper<AccountNotFoundException> {

diff --git a/src/main/java/bankservice/port/incoming/adapter/resources/accounts/AccountResource.java b/src/main/java/bankservice/port/incoming/adapter/resources/accounts/AccountResource.java
@@ -1,19 +1,19 @@
 package bankservice.port.incoming.adapter.resources.accounts;
 
 import static com.google.common.base.Preconditions.checkNotNull;
-import static javax.ws.rs.core.MediaType.APPLICATION_JSON;
-import static javax.ws.rs.core.Response.Status.NOT_FOUND;
+import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON;
+import static jakarta.ws.rs.core.Response.Status.NOT_FOUND;
 
 import bankservice.domain.model.account.Account;
 import bankservice.service.account.AccountService;
 import io.dropwizard.jersey.params.UUIDParam;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.Response;
 import java.util.Optional;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.Response;
 
 @Consumes(APPLICATION_JSON)
 @Produces(APPLICATION_JSON)

diff --git a/src/main/java/bankservice/port/incoming/adapter/resources/accounts/AccountsResource.java b/src/main/java/bankservice/port/incoming/adapter/resources/accounts/AccountsResource.java
@@ -1,19 +1,19 @@
 package bankservice.port.incoming.adapter.resources.accounts;
 
 import static com.google.common.base.Preconditions.checkNotNull;
-import static javax.ws.rs.core.MediaType.APPLICATION_JSON;
-import static javax.ws.rs.core.UriBuilder.fromResource;
+import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON;
+import static jakarta.ws.rs.core.UriBuilder.fromResource;
 
 import bankservice.domain.model.account.Account;
 import bankservice.service.account.AccountService;
 import bankservice.service.account.OpenAccountCommand;
+import jakarta.validation.Valid;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.Response;
 import java.net.URI;
-import javax.validation.Valid;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.Response;
 
 @Consumes(APPLICATION_JSON)
 @Produces(APPLICATION_JSON)

diff --git a/src/main/java/bankservice/port/incoming/adapter/resources/accounts/deposits/DepositDto.java b/src/main/java/bankservice/port/incoming/adapter/resources/accounts/deposits/DepositDto.java
@@ -3,9 +3,9 @@
 import static com.fasterxml.jackson.annotation.JsonProperty.Access.READ_ONLY;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import jakarta.validation.constraints.NotNull;
 import java.math.BigDecimal;
 import java.util.UUID;
-import javax.validation.constraints.NotNull;
 
 public class DepositDto {
 

diff --git a/.../java/bankservice/port/incoming/adapter/resources/accounts/deposits/DepositsResource.java b/.../java/bankservice/port/incoming/adapter/resources/accounts/deposits/DepositsResource.java
@@ -1,20 +1,20 @@
 package bankservice.port.incoming.adapter.resources.accounts.deposits;
 
 import static com.google.common.base.Preconditions.checkNotNull;
-import static javax.ws.rs.core.MediaType.APPLICATION_JSON;
+import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON;
 
 import bankservice.domain.model.OptimisticLockingException;
 import bankservice.service.account.AccountNotFoundException;
 import bankservice.service.account.AccountService;
 import bankservice.service.account.DepositAccountCommand;
 import io.dropwizard.jersey.params.UUIDParam;
-import javax.validation.Valid;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.Response;
+import jakarta.validation.Valid;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.Response;
 
 @Consumes(APPLICATION_JSON)
 @Produces(APPLICATION_JSON)

diff --git a/.../java/bankservice/port/incoming/adapter/resources/accounts/withdrawals/WithdrawalDto.java b/.../java/bankservice/port/incoming/adapter/resources/accounts/withdrawals/WithdrawalDto.java
@@ -3,9 +3,9 @@
 import static com.fasterxml.jackson.annotation.JsonProperty.Access.READ_ONLY;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import jakarta.validation.constraints.NotNull;
 import java.math.BigDecimal;
 import java.util.UUID;
-import javax.validation.constraints.NotNull;
 
 public class WithdrawalDto {
 

diff --git a/...bankservice/port/incoming/adapter/resources/accounts/withdrawals/WithdrawalsResource.java b/...bankservice/port/incoming/adapter/resources/accounts/withdrawals/WithdrawalsResource.java
@@ -1,22 +1,22 @@
 package bankservice.port.incoming.adapter.resources.accounts.withdrawals;
 
 import static com.google.common.base.Preconditions.checkNotNull;
-import static javax.ws.rs.core.MediaType.APPLICATION_JSON;
-import static javax.ws.rs.core.Response.Status.BAD_REQUEST;
+import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON;
+import static jakarta.ws.rs.core.Response.Status.BAD_REQUEST;
 
 import bankservice.domain.model.OptimisticLockingException;
 import bankservice.domain.model.account.NonSufficientFundsException;
 import bankservice.service.account.AccountNotFoundException;
 import bankservice.service.account.AccountService;
 import bankservice.service.account.WithdrawAccountCommand;
 import io.dropwizard.jersey.params.UUIDParam;
-import javax.validation.Valid;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.Response;
+import jakarta.validation.Valid;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.Response;
 
 @Consumes(APPLICATION_JSON)
 @Produces(APPLICATION_JSON)

diff --git a/src/main/java/bankservice/port/incoming/adapter/resources/clients/ClientDto.java b/src/main/java/bankservice/port/incoming/adapter/resources/clients/ClientDto.java
@@ -3,8 +3,8 @@
 import static com.fasterxml.jackson.annotation.JsonProperty.Access.READ_ONLY;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import jakarta.validation.constraints.NotBlank;
 import java.util.UUID;
-import javax.validation.constraints.NotBlank;
 
 public class ClientDto {
 

diff --git a/src/main/java/bankservice/port/incoming/adapter/resources/clients/ClientResource.java b/src/main/java/bankservice/port/incoming/adapter/resources/clients/ClientResource.java
@@ -1,24 +1,24 @@
 package bankservice.port.incoming.adapter.resources.clients;
 
 import static com.google.common.base.Preconditions.checkNotNull;
-import static javax.ws.rs.core.MediaType.APPLICATION_JSON;
-import static javax.ws.rs.core.Response.Status.NOT_FOUND;
+import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON;
+import static jakarta.ws.rs.core.Response.Status.NOT_FOUND;
 
 import bankservice.domain.model.client.Client;
 import bankservice.domain.model.client.Email;
 import bankservice.service.client.ClientService;
 import bankservice.service.client.UpdateClientCommand;
 import io.dropwizard.jersey.params.UUIDParam;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.Response;
 import java.util.Optional;
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.Response;
 
 @Consumes(APPLICATION_JSON)
 @Produces(APPLICATION_JSON)

diff --git a/src/main/java/bankservice/port/incoming/adapter/resources/clients/ClientsResource.java b/src/main/java/bankservice/port/incoming/adapter/resources/clients/ClientsResource.java
@@ -1,20 +1,20 @@
 package bankservice.port.incoming.adapter.resources.clients;
 
 import static com.google.common.base.Preconditions.checkNotNull;
-import static javax.ws.rs.core.MediaType.APPLICATION_JSON;
-import static javax.ws.rs.core.UriBuilder.fromResource;
+import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON;
+import static jakarta.ws.rs.core.UriBuilder.fromResource;
 
 import bankservice.domain.model.client.Client;
 import bankservice.domain.model.client.Email;
 import bankservice.service.client.ClientService;
 import bankservice.service.client.EnrollClientCommand;
+import jakarta.validation.Valid;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.Response;
 import java.net.URI;
-import javax.validation.Valid;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.Response;
 
 @Consumes(APPLICATION_JSON)
 @Produces(APPLICATION_JSON)

diff --git a/src/main/java/bankservice/port/incoming/adapter/resources/clients/Email.java b/src/main/java/bankservice/port/incoming/adapter/resources/clients/Email.java
@@ -4,13 +4,13 @@
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
 import bankservice.domain.model.client.Email.EmailSpecification;
+import jakarta.validation.Constraint;
+import jakarta.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidatorContext;
+import jakarta.validation.Payload;
+import jakarta.validation.constraints.NotNull;
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
-import javax.validation.Constraint;
-import javax.validation.ConstraintValidator;
-import javax.validation.ConstraintValidatorContext;
-import javax.validation.Payload;
-import javax.validation.constraints.NotNull;
 
 @NotNull
 @Target(FIELD)

diff --git a/src/main/java/bankservice/projection/accounttransactions/AccountTransactionsResource.java b/src/main/java/bankservice/projection/accounttransactions/AccountTransactionsResource.java
@@ -1,15 +1,15 @@
 package bankservice.projection.accounttransactions;
 
 import static com.google.common.base.Preconditions.checkNotNull;
-import static javax.ws.rs.core.MediaType.APPLICATION_JSON;
+import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON;
 
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.Response;
 import java.util.List;
 import java.util.UUID;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.Response;
 
 @Produces(APPLICATION_JSON)
 @Path("/accounts/{id}/transactions")