diff options
| author |  ccalvarin <ccalvarin@google.com> | 2017-07-11 14:23:46 +0200 |
|---|---|---|
| committer |  László Csomor <laszlocsomor@google.com> | 2017-07-11 14:47:53 +0200 |
| commit | 456adb2267343a4e2e64f082e77169c18f9e6060 (patch) | |
| tree | b63794930df06ad9afc910ca16784cf4bab812f9 /src/main/java/com/google/devtools/build/lib/authandtls | |
| parent | 75483b58d047c3a4e26e098823dc3b77644c3c11 (diff) | |
Fold OptionUsageRestrictions into OptionDocumentationCategory and OptionMetadataTags.
These are similar, no need to have both fields. Removing the "DOCUMENTED" default, the absence of UNDOCUMENTED will be used instead.
Since requiring a documentation category for undocumented options doesn't make sense, list that as one of the OptionDocumentationCategories, but list HIDDEN and INTERNAL as part of OptionMetadata. These options should list UNDOCUMENTED as their category.
PiperOrigin-RevId: 161515674
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/authandtls')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/authandtls/AuthAndTLSOptions.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/authandtls/AuthAndTLSOptions.java b/src/main/java/com/google/devtools/build/lib/authandtls/AuthAndTLSOptions.java index ecb5e62577..ad9136beed 100644 --- a/src/main/java/com/google/devtools/build/lib/authandtls/AuthAndTLSOptions.java +++ b/src/main/java/com/google/devtools/build/lib/authandtls/AuthAndTLSOptions.java @@ -17,8 +17,8 @@ package com.google.devtools.build.lib.authandtls; import com.google.devtools.common.options.Option; import com.google.devtools.common.options.OptionDocumentationCategory; import com.google.devtools.common.options.OptionsBase; -import com.google.devtools.common.options.OptionsParser.OptionUsageRestrictions; import com.google.devtools.common.options.proto.OptionFilters.OptionEffectTag; +import com.google.devtools.common.options.proto.OptionFilters.OptionMetadataTag; /** * Common options for authentication and TLS. @@ -86,8 +86,8 @@ public class AuthAndTLSOptions extends OptionsBase { name = "tls_authority_override", defaultValue = "null", category = "remote", - optionUsageRestrictions = OptionUsageRestrictions.HIDDEN, - documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, + metadataTags = {OptionMetadataTag.HIDDEN}, + documentationCategory = OptionDocumentationCategory.UNDOCUMENTED, effectTags = {OptionEffectTag.UNKNOWN}, help = "TESTING ONLY! Can be used with a self-signed certificate to consider the specified " |