diff --git a/service/config/sample.yml b/service/config/sample.yml index 4e2474609..74397fbfd 100644 --- a/service/config/sample.yml +++ b/service/config/sample.yml @@ -78,9 +78,6 @@ twilio: # Twilio gateway configuration androidAppHash: example # Hash appended to Android verifyServiceFriendlyName: example # Service name used in template. Requires Twilio account rep to enable -push: - queueSize: 1000 # Size of push pending queue - turn: # TURN server configuration secret: example # TURN server secret uris: diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerConfiguration.java b/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerConfiguration.java index 891a412b3..f9cc30c71 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerConfiguration.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerConfiguration.java @@ -6,7 +6,6 @@ package org.whispersystems.textsecuregcm; import com.fasterxml.jackson.annotation.JsonProperty; import io.dropwizard.Configuration; -import io.dropwizard.client.JerseyClientConfiguration; import java.util.HashMap; import java.util.LinkedList; import java.util.List; @@ -33,7 +32,6 @@ import org.whispersystems.textsecuregcm.configuration.GcpAttachmentsConfiguratio import org.whispersystems.textsecuregcm.configuration.MaxDeviceConfiguration; import org.whispersystems.textsecuregcm.configuration.MessageCacheConfiguration; import org.whispersystems.textsecuregcm.configuration.PaymentsServiceConfiguration; -import org.whispersystems.textsecuregcm.configuration.PushConfiguration; import org.whispersystems.textsecuregcm.configuration.RateLimitsConfiguration; import org.whispersystems.textsecuregcm.configuration.RecaptchaConfiguration; import org.whispersystems.textsecuregcm.configuration.RedisClusterConfiguration; @@ -75,11 +73,6 @@ public class WhisperServerConfiguration extends Configuration { @JsonProperty private TwilioConfiguration twilio; - @NotNull - @Valid - @JsonProperty - private PushConfiguration push; - @NotNull @Valid @JsonProperty @@ -170,11 +163,6 @@ public class WhisperServerConfiguration extends Configuration { @JsonProperty private RateLimitsConfiguration limits = new RateLimitsConfiguration(); - @Valid - @NotNull - @JsonProperty - private JerseyClientConfiguration httpClient = new JerseyClientConfiguration(); - @Valid @NotNull @JsonProperty @@ -269,8 +257,6 @@ public class WhisperServerConfiguration extends Configuration { @JsonProperty private AbusiveMessageFilterConfiguration abusiveMessageFilter; - private Map transparentDataIndex = new HashMap<>(); - public StripeConfiguration getStripe() { return stripe; } @@ -299,14 +285,6 @@ public class WhisperServerConfiguration extends Configuration { return twilio; } - public PushConfiguration getPushConfiguration() { - return push; - } - - public JerseyClientConfiguration getJerseyClientConfiguration() { - return httpClient; - } - public AwsAttachmentsConfiguration getAwsAttachmentsConfiguration() { return awsAttachments; } @@ -413,10 +391,6 @@ public class WhisperServerConfiguration extends Configuration { return results; } - public Map getTransparentDataIndex() { - return transparentDataIndex; - } - public SecureBackupServiceConfiguration getSecureBackupServiceConfiguration() { return backupService; } diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/configuration/PushConfiguration.java b/service/src/main/java/org/whispersystems/textsecuregcm/configuration/PushConfiguration.java deleted file mode 100644 index 1ffd83838..000000000 --- a/service/src/main/java/org/whispersystems/textsecuregcm/configuration/PushConfiguration.java +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright 2013-2020 Signal Messenger, LLC - * SPDX-License-Identifier: AGPL-3.0-only - */ - -package org.whispersystems.textsecuregcm.configuration; - -import com.fasterxml.jackson.annotation.JsonProperty; -import javax.validation.constraints.Min; - -public class PushConfiguration { - - @JsonProperty - @Min(0) - private int queueSize = 200; - - public int getQueueSize() { - return queueSize; - } -}