diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerConfiguration.java b/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerConfiguration.java index 1be3a4dc0..23e687748 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerConfiguration.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerConfiguration.java @@ -13,7 +13,6 @@ import org.whispersystems.textsecuregcm.configuration.AwsAttachmentsConfiguratio import org.whispersystems.textsecuregcm.configuration.CdnConfiguration; import org.whispersystems.textsecuregcm.configuration.DatabaseConfiguration; import org.whispersystems.textsecuregcm.configuration.DirectoryConfiguration; -import org.whispersystems.textsecuregcm.configuration.FeatureFlagConfiguration; import org.whispersystems.textsecuregcm.configuration.GcmConfiguration; import org.whispersystems.textsecuregcm.configuration.GcpAttachmentsConfiguration; import org.whispersystems.textsecuregcm.configuration.AccountsDatabaseConfiguration; @@ -217,11 +216,6 @@ public class WhisperServerConfiguration extends Configuration { @JsonProperty private RemoteConfigConfiguration remoteConfig; - @Valid - @NotNull - @JsonProperty - private FeatureFlagConfiguration featureFlag; - private Map transparentDataIndex = new HashMap<>(); public RecaptchaConfiguration getRecaptchaConfiguration() { @@ -377,8 +371,4 @@ public class WhisperServerConfiguration extends Configuration { public RemoteConfigConfiguration getRemoteConfigConfiguration() { return remoteConfig; } - - public FeatureFlagConfiguration getFeatureFlagConfiguration() { - return featureFlag; - } } diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/configuration/FeatureFlagConfiguration.java b/service/src/main/java/org/whispersystems/textsecuregcm/configuration/FeatureFlagConfiguration.java deleted file mode 100644 index 600196c88..000000000 --- a/service/src/main/java/org/whispersystems/textsecuregcm/configuration/FeatureFlagConfiguration.java +++ /dev/null @@ -1,22 +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.NotNull; -import java.util.LinkedList; -import java.util.List; - -public class FeatureFlagConfiguration { - @JsonProperty - @NotNull - private List authorizedTokens = new LinkedList<>(); - - public List getAuthorizedTokens() { - return authorizedTokens; - } -}