Remove usage of DEFAULT_* sentinels
DownloadConfig has changed to just populate the respective sets with
the proper default values.
Change-Id: I98a742793430cad2bbef84d3e1d269bfffc4de9c
diff --git a/src/main/java/com/googlesource/gerrit/plugins/download/command/GitDownloadCommand.java b/src/main/java/com/googlesource/gerrit/plugins/download/command/GitDownloadCommand.java
index e929bff..3a1a304 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/download/command/GitDownloadCommand.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/download/command/GitDownloadCommand.java
@@ -14,8 +14,6 @@
package com.googlesource.gerrit.plugins.download.command;
-import static com.google.gerrit.reviewdb.client.AccountGeneralPreferences.DownloadCommand.DEFAULT_DOWNLOADS;
-
import com.google.gerrit.extensions.config.DownloadCommand;
import com.google.gerrit.extensions.config.DownloadScheme;
import com.google.gerrit.reviewdb.client.AccountGeneralPreferences;
@@ -57,8 +55,7 @@
DownloadConfig downloadConfig,
AccountGeneralPreferences.DownloadCommand cmd,
GitRepositoryManager repoManager) {
- this.commandAllowed = downloadConfig.getDownloadCommands().contains(cmd)
- || downloadConfig.getDownloadCommands().contains(DEFAULT_DOWNLOADS);
+ this.commandAllowed = downloadConfig.getDownloadCommands().contains(cmd);
this.repoManager = repoManager;
this.checkForHiddenChangeRefs =
cfg.getBoolean(DOWNLOAD, KEY_CHECK_FOR_HIDDEN_CHANGE_REFS, false);
diff --git a/src/main/java/com/googlesource/gerrit/plugins/download/scheme/AnonymousHttpScheme.java b/src/main/java/com/googlesource/gerrit/plugins/download/scheme/AnonymousHttpScheme.java
index 1ea2cf0..2ed365c 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/download/scheme/AnonymousHttpScheme.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/download/scheme/AnonymousHttpScheme.java
@@ -15,7 +15,6 @@
package com.googlesource.gerrit.plugins.download.scheme;
import static com.google.gerrit.reviewdb.client.AccountGeneralPreferences.DownloadScheme.ANON_HTTP;
-import static com.google.gerrit.reviewdb.client.AccountGeneralPreferences.DownloadScheme.DEFAULT_DOWNLOADS;
import com.google.gerrit.common.Nullable;
import com.google.gerrit.extensions.config.DownloadScheme;
@@ -39,8 +38,8 @@
DownloadConfig downloadConfig) {
this.gitHttpUrl = ensureSlash(cfg.getString("gerrit", null, "gitHttpUrl"));
this.canonicalWebUrl = provider != null ? provider.get() : null;
- this.schemeAllowed = downloadConfig.getDownloadSchemes().contains(ANON_HTTP)
- || downloadConfig.getDownloadSchemes().contains(DEFAULT_DOWNLOADS);
+ this.schemeAllowed =
+ downloadConfig.getDownloadSchemes().contains(ANON_HTTP);
}
@Override
diff --git a/src/main/java/com/googlesource/gerrit/plugins/download/scheme/GitScheme.java b/src/main/java/com/googlesource/gerrit/plugins/download/scheme/GitScheme.java
index e185fdc..af7dcf7 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/download/scheme/GitScheme.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/download/scheme/GitScheme.java
@@ -15,7 +15,6 @@
package com.googlesource.gerrit.plugins.download.scheme;
import static com.google.gerrit.reviewdb.client.AccountGeneralPreferences.DownloadScheme.ANON_GIT;
-import static com.google.gerrit.reviewdb.client.AccountGeneralPreferences.DownloadScheme.DEFAULT_DOWNLOADS;
import com.google.gerrit.extensions.config.DownloadScheme;
import com.google.gerrit.server.config.DownloadConfig;
@@ -34,8 +33,7 @@
DownloadConfig downloadConfig) {
this.gitDaemonUrl =
ensureSlash(cfg.getString("gerrit", null, "canonicalGitUrl"));
- this.schemeAllowed = downloadConfig.getDownloadSchemes().contains(ANON_GIT)
- || downloadConfig.getDownloadSchemes().contains(DEFAULT_DOWNLOADS);
+ this.schemeAllowed = downloadConfig.getDownloadSchemes().contains(ANON_GIT);
}
@Override
diff --git a/src/main/java/com/googlesource/gerrit/plugins/download/scheme/HttpScheme.java b/src/main/java/com/googlesource/gerrit/plugins/download/scheme/HttpScheme.java
index 01b0293..27d4267 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/download/scheme/HttpScheme.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/download/scheme/HttpScheme.java
@@ -14,7 +14,6 @@
package com.googlesource.gerrit.plugins.download.scheme;
-import static com.google.gerrit.reviewdb.client.AccountGeneralPreferences.DownloadScheme.DEFAULT_DOWNLOADS;
import static com.google.gerrit.reviewdb.client.AccountGeneralPreferences.DownloadScheme.HTTP;
import com.google.gerrit.common.Nullable;
@@ -43,8 +42,7 @@
this.gitHttpUrl = ensureSlash(cfg.getString("gerrit", null, "gitHttpUrl"));
this.canonicalWebUrl = urlProvider != null ? urlProvider.get() : null;
this.userProvider = userProvider;
- this.schemeAllowed = downloadConfig.getDownloadSchemes().contains(HTTP)
- || downloadConfig.getDownloadSchemes().contains(DEFAULT_DOWNLOADS);
+ this.schemeAllowed = downloadConfig.getDownloadSchemes().contains(HTTP);
}
@Override
diff --git a/src/main/java/com/googlesource/gerrit/plugins/download/scheme/SshScheme.java b/src/main/java/com/googlesource/gerrit/plugins/download/scheme/SshScheme.java
index 7af728d..5e1ded1 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/download/scheme/SshScheme.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/download/scheme/SshScheme.java
@@ -14,7 +14,6 @@
package com.googlesource.gerrit.plugins.download.scheme;
-import static com.google.gerrit.reviewdb.client.AccountGeneralPreferences.DownloadScheme.DEFAULT_DOWNLOADS;
import static com.google.gerrit.reviewdb.client.AccountGeneralPreferences.DownloadScheme.SSH;
import com.google.common.base.Strings;
@@ -72,8 +71,7 @@
this.sshdPort = port;
this.userProvider = userProvider;
- this.schemeAllowed = downloadConfig.getDownloadSchemes().contains(SSH)
- || downloadConfig.getDownloadSchemes().contains(DEFAULT_DOWNLOADS);
+ this.schemeAllowed = downloadConfig.getDownloadSchemes().contains(SSH);
}
@Override
