Remove unused configuration
This commit is contained in:
parent
1395dcc0be
commit
54207254f1
|
@ -78,9 +78,6 @@ twilio: # Twilio gateway configuration
|
||||||
androidAppHash: example # Hash appended to Android
|
androidAppHash: example # Hash appended to Android
|
||||||
verifyServiceFriendlyName: example # Service name used in template. Requires Twilio account rep to enable
|
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
|
turn: # TURN server configuration
|
||||||
secret: example # TURN server secret
|
secret: example # TURN server secret
|
||||||
uris:
|
uris:
|
||||||
|
|
|
@ -6,7 +6,6 @@ package org.whispersystems.textsecuregcm;
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
import io.dropwizard.Configuration;
|
import io.dropwizard.Configuration;
|
||||||
import io.dropwizard.client.JerseyClientConfiguration;
|
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.LinkedList;
|
import java.util.LinkedList;
|
||||||
import java.util.List;
|
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.MaxDeviceConfiguration;
|
||||||
import org.whispersystems.textsecuregcm.configuration.MessageCacheConfiguration;
|
import org.whispersystems.textsecuregcm.configuration.MessageCacheConfiguration;
|
||||||
import org.whispersystems.textsecuregcm.configuration.PaymentsServiceConfiguration;
|
import org.whispersystems.textsecuregcm.configuration.PaymentsServiceConfiguration;
|
||||||
import org.whispersystems.textsecuregcm.configuration.PushConfiguration;
|
|
||||||
import org.whispersystems.textsecuregcm.configuration.RateLimitsConfiguration;
|
import org.whispersystems.textsecuregcm.configuration.RateLimitsConfiguration;
|
||||||
import org.whispersystems.textsecuregcm.configuration.RecaptchaConfiguration;
|
import org.whispersystems.textsecuregcm.configuration.RecaptchaConfiguration;
|
||||||
import org.whispersystems.textsecuregcm.configuration.RedisClusterConfiguration;
|
import org.whispersystems.textsecuregcm.configuration.RedisClusterConfiguration;
|
||||||
|
@ -75,11 +73,6 @@ public class WhisperServerConfiguration extends Configuration {
|
||||||
@JsonProperty
|
@JsonProperty
|
||||||
private TwilioConfiguration twilio;
|
private TwilioConfiguration twilio;
|
||||||
|
|
||||||
@NotNull
|
|
||||||
@Valid
|
|
||||||
@JsonProperty
|
|
||||||
private PushConfiguration push;
|
|
||||||
|
|
||||||
@NotNull
|
@NotNull
|
||||||
@Valid
|
@Valid
|
||||||
@JsonProperty
|
@JsonProperty
|
||||||
|
@ -170,11 +163,6 @@ public class WhisperServerConfiguration extends Configuration {
|
||||||
@JsonProperty
|
@JsonProperty
|
||||||
private RateLimitsConfiguration limits = new RateLimitsConfiguration();
|
private RateLimitsConfiguration limits = new RateLimitsConfiguration();
|
||||||
|
|
||||||
@Valid
|
|
||||||
@NotNull
|
|
||||||
@JsonProperty
|
|
||||||
private JerseyClientConfiguration httpClient = new JerseyClientConfiguration();
|
|
||||||
|
|
||||||
@Valid
|
@Valid
|
||||||
@NotNull
|
@NotNull
|
||||||
@JsonProperty
|
@JsonProperty
|
||||||
|
@ -269,8 +257,6 @@ public class WhisperServerConfiguration extends Configuration {
|
||||||
@JsonProperty
|
@JsonProperty
|
||||||
private AbusiveMessageFilterConfiguration abusiveMessageFilter;
|
private AbusiveMessageFilterConfiguration abusiveMessageFilter;
|
||||||
|
|
||||||
private Map<String, String> transparentDataIndex = new HashMap<>();
|
|
||||||
|
|
||||||
public StripeConfiguration getStripe() {
|
public StripeConfiguration getStripe() {
|
||||||
return stripe;
|
return stripe;
|
||||||
}
|
}
|
||||||
|
@ -299,14 +285,6 @@ public class WhisperServerConfiguration extends Configuration {
|
||||||
return twilio;
|
return twilio;
|
||||||
}
|
}
|
||||||
|
|
||||||
public PushConfiguration getPushConfiguration() {
|
|
||||||
return push;
|
|
||||||
}
|
|
||||||
|
|
||||||
public JerseyClientConfiguration getJerseyClientConfiguration() {
|
|
||||||
return httpClient;
|
|
||||||
}
|
|
||||||
|
|
||||||
public AwsAttachmentsConfiguration getAwsAttachmentsConfiguration() {
|
public AwsAttachmentsConfiguration getAwsAttachmentsConfiguration() {
|
||||||
return awsAttachments;
|
return awsAttachments;
|
||||||
}
|
}
|
||||||
|
@ -413,10 +391,6 @@ public class WhisperServerConfiguration extends Configuration {
|
||||||
return results;
|
return results;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Map<String, String> getTransparentDataIndex() {
|
|
||||||
return transparentDataIndex;
|
|
||||||
}
|
|
||||||
|
|
||||||
public SecureBackupServiceConfiguration getSecureBackupServiceConfiguration() {
|
public SecureBackupServiceConfiguration getSecureBackupServiceConfiguration() {
|
||||||
return backupService;
|
return backupService;
|
||||||
}
|
}
|
||||||
|
|
|
@ -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;
|
|
||||||
}
|
|
||||||
}
|
|
Loading…
Reference in New Issue