Update dropwizard to 3.x

signalapp · Mar 18, 2024 · e4ca635 · e4ca635
1 parent 7cd958f
commit e4ca635
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 33 deletions.
diff --git a/pom.xml b/pom.xml
@@ -25,7 +25,7 @@
             <dependency>
                 <groupId>io.dropwizard</groupId>
                 <artifactId>dropwizard-dependencies</artifactId>
-                <version>2.1.9</version>
+                <version>3.0.7</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -94,7 +94,7 @@
         <dependency>
             <groupId>commons-codec</groupId>
             <artifactId>commons-codec</artifactId>
-            <version>1.16.0</version>
+            <version>1.16.1</version>
         </dependency>
         <dependency>
             <groupId>org.syslog4j</groupId>
@@ -109,12 +109,19 @@
         <dependency>
             <groupId>net.logstash.logback</groupId>
             <artifactId>logstash-logback-encoder</artifactId>
-            <version>7.3</version>
+            <version>7.4</version>
         </dependency>
         <dependency>
             <groupId>org.coursera</groupId>
             <artifactId>dropwizard-metrics-datadog</artifactId>
             <version>2.0.0-RC2</version>
+            <exclusions>
+                <exclusion>
+                    <!--Conflicts with version in com.google.cloud:google-cloud-bigtable:jar:2.35.1 -->
+                    <groupId>org.apache.httpcomponents</groupId>
+                    <artifactId>httpclient</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.vdurmont</groupId>
@@ -126,16 +133,6 @@
             <groupId>io.dropwizard</groupId>
             <artifactId>dropwizard-testing</artifactId>
             <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>junit</groupId>
-                    <artifactId>junit</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>javax.servlet</groupId>
-                    <artifactId>javax.servlet-api</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>io.micrometer</groupId>

diff --git a/src/main/java/org/signal/storageservice/StorageService.java b/src/main/java/org/signal/storageservice/StorageService.java
@@ -17,14 +17,14 @@
 import com.google.cloud.bigtable.data.v2.BigtableDataSettings;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
-import io.dropwizard.Application;
 import io.dropwizard.auth.AuthFilter;
 import io.dropwizard.auth.PolymorphicAuthDynamicFeature;
 import io.dropwizard.auth.PolymorphicAuthValueFactoryProvider;
 import io.dropwizard.auth.basic.BasicCredentialAuthFilter;
 import io.dropwizard.auth.basic.BasicCredentials;
-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;
 import io.micrometer.core.instrument.Metrics;
 import io.micrometer.core.instrument.Tags;
 import io.micrometer.datadog.DatadogMeterRegistry;

diff --git a/src/main/java/org/signal/storageservice/StorageServiceConfiguration.java b/src/main/java/org/signal/storageservice/StorageServiceConfiguration.java
@@ -6,7 +6,7 @@
 package org.signal.storageservice;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import io.dropwizard.Configuration;
+import io.dropwizard.core.Configuration;
 import org.signal.storageservice.configuration.AuthenticationConfiguration;
 import org.signal.storageservice.configuration.BigTableConfiguration;
 import org.signal.storageservice.configuration.CdnConfiguration;

diff --git a/src/main/java/org/signal/storageservice/controllers/GroupsController.java b/src/main/java/org/signal/storageservice/controllers/GroupsController.java
@@ -11,7 +11,6 @@
 import com.google.common.net.HttpHeaders;
 import com.google.protobuf.ByteString;
 import io.dropwizard.auth.Auth;
-import io.dropwizard.util.Strings;
 import io.micrometer.core.instrument.DistributionSummary;
 import io.micrometer.core.instrument.Metrics;
 import io.micrometer.core.instrument.Tags;
@@ -28,7 +27,6 @@
 import java.util.Locale;
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
-import java.util.function.Consumer;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import javax.ws.rs.BadRequestException;
@@ -45,6 +43,7 @@
 import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.Response;
 import org.apache.commons.codec.binary.Base64;
+import org.apache.commons.lang3.StringUtils;
 import org.signal.libsignal.zkgroup.InvalidInputException;
 import org.signal.libsignal.zkgroup.NotarySignature;
 import org.signal.libsignal.zkgroup.ServerSecretParams;
@@ -68,11 +67,11 @@
 import org.signal.storageservice.storage.protos.groups.ExternalGroupCredential;
 import org.signal.storageservice.storage.protos.groups.Group;
 import org.signal.storageservice.storage.protos.groups.GroupChange;
-import org.signal.storageservice.storage.protos.groups.GroupChangeResponse;
-import org.signal.storageservice.storage.protos.groups.GroupResponse;
 import org.signal.storageservice.storage.protos.groups.GroupChange.Actions;
+import org.signal.storageservice.storage.protos.groups.GroupChangeResponse;
 import org.signal.storageservice.storage.protos.groups.GroupChanges;
 import org.signal.storageservice.storage.protos.groups.GroupJoinInfo;
+import org.signal.storageservice.storage.protos.groups.GroupResponse;
 import org.signal.storageservice.storage.protos.groups.Member;
 import org.signal.storageservice.storage.protos.groups.MemberPendingProfileKey;
 import org.signal.storageservice.util.CollectionUtil;
@@ -146,7 +145,7 @@ public CompletableFuture<Response> getGroup(@Auth GroupUser user) {
   @Path("/join/{inviteLinkPassword: [^/]*}")
   public CompletableFuture<Response> getGroupJoinInfo(@Auth GroupUser user, @PathParam("inviteLinkPassword") String inviteLinkPasswordString) {
     final byte[] inviteLinkPassword;
-    if (Strings.isNullOrEmpty(inviteLinkPasswordString)) {
+    if (StringUtils.isEmpty(inviteLinkPasswordString)) {
       inviteLinkPassword = null;
     } else {
       inviteLinkPassword = Base64.decodeBase64(inviteLinkPasswordString);
@@ -411,7 +410,7 @@ public CompletableFuture<Response> modifyGroup(
       @QueryParam("inviteLinkPassword") String inviteLinkPasswordString,
       @NoUnknownFields GroupChange.Actions submittedActions) {
     final byte[] inviteLinkPassword;
-    if (Strings.isNullOrEmpty(inviteLinkPasswordString)) {
+    if (StringUtils.isEmpty(inviteLinkPasswordString)) {
       inviteLinkPassword = null;
     } else {
       inviteLinkPassword = Base64.decodeBase64(inviteLinkPasswordString);

diff --git a/src/main/java/org/signal/storageservice/metrics/JsonMetricsReporterFactory.java b/src/main/java/org/signal/storageservice/metrics/JsonMetricsReporterFactory.java
@@ -9,7 +9,7 @@
 import com.codahale.metrics.ScheduledReporter;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonTypeName;
-import io.dropwizard.metrics.BaseReporterFactory;
+import io.dropwizard.metrics.common.BaseReporterFactory;
 
 import javax.validation.constraints.NotNull;
 import java.net.UnknownHostException;

diff --git a/src/main/java/org/signal/storageservice/metrics/LoggingNetworkAppenderFactory.java b/src/main/java/org/signal/storageservice/metrics/LoggingNetworkAppenderFactory.java
@@ -14,10 +14,10 @@
 import ch.qos.logback.core.Layout;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonTypeName;
-import io.dropwizard.logging.AbstractAppenderFactory;
-import io.dropwizard.logging.async.AsyncAppenderFactory;
-import io.dropwizard.logging.filter.LevelFilterFactory;
-import io.dropwizard.logging.layout.LayoutFactory;
+import io.dropwizard.logging.common.AbstractAppenderFactory;
+import io.dropwizard.logging.common.async.AsyncAppenderFactory;
+import io.dropwizard.logging.common.filter.LevelFilterFactory;
+import io.dropwizard.logging.common.layout.LayoutFactory;
 import io.dropwizard.validation.PortRange;
 import org.productivity.java.syslog4j.SyslogConfigIF;
 import org.productivity.java.syslog4j.SyslogIF;

diff --git a/src/main/java/org/signal/storageservice/metrics/LogstashTcpSocketAppenderFactory.java b/src/main/java/org/signal/storageservice/metrics/LogstashTcpSocketAppenderFactory.java
@@ -16,10 +16,10 @@
 import com.fasterxml.jackson.databind.node.JsonNodeFactory;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.fasterxml.jackson.databind.node.TextNode;
-import io.dropwizard.logging.AbstractAppenderFactory;
-import io.dropwizard.logging.async.AsyncAppenderFactory;
-import io.dropwizard.logging.filter.LevelFilterFactory;
-import io.dropwizard.logging.layout.LayoutFactory;
+import io.dropwizard.logging.common.AbstractAppenderFactory;
+import io.dropwizard.logging.common.async.AsyncAppenderFactory;
+import io.dropwizard.logging.common.filter.LevelFilterFactory;
+import io.dropwizard.logging.common.layout.LayoutFactory;
 import net.logstash.logback.appender.LogstashTcpSocketAppender;
 import net.logstash.logback.encoder.LogstashEncoder;
 

diff --git a/src/main/java/org/signal/storageservice/metrics/SignalDatadogReporterFactory.java b/src/main/java/org/signal/storageservice/metrics/SignalDatadogReporterFactory.java
@@ -9,7 +9,7 @@
 import com.codahale.metrics.ScheduledReporter;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonTypeName;
-import io.dropwizard.metrics.BaseReporterFactory;
+import io.dropwizard.metrics.common.BaseReporterFactory;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.util.EnumSet;