Remove non-flag arguments.
PiperOrigin-RevId: 256009064
diff --git a/src/main/java/com/google/devtools/build/skydoc/BUILD b/src/main/java/com/google/devtools/build/skydoc/BUILD
index 39923b8..541a111 100644
--- a/src/main/java/com/google/devtools/build/skydoc/BUILD
+++ b/src/main/java/com/google/devtools/build/skydoc/BUILD
@@ -88,6 +88,5 @@
"//src/main/java/com/google/devtools/build/skydoc/rendering/proto:stardoc_output_java_proto",
"//src/main/java/com/google/devtools/common/options",
"//third_party:guava",
- "//third_party:jsr305",
],
)
diff --git a/src/main/java/com/google/devtools/build/skydoc/SkydocMain.java b/src/main/java/com/google/devtools/build/skydoc/SkydocMain.java
index 950a5e4..ea8f47b 100644
--- a/src/main/java/com/google/devtools/build/skydoc/SkydocMain.java
+++ b/src/main/java/com/google/devtools/build/skydoc/SkydocMain.java
@@ -193,27 +193,16 @@
ImmutableSet<String> symbolNames;
ImmutableList<String> depRoots;
- // TODO(cparsons): Remove optional positional arg parsing.
- List<String> residualArgs = parser.getResidue();
if (Strings.isNullOrEmpty(skydocOptions.targetFileLabel)
|| Strings.isNullOrEmpty(skydocOptions.outputFilePath)) {
- if (residualArgs.size() < 2) {
- throw new IllegalArgumentException(
- "Expected two or more arguments. Usage:\n"
- + "{skydoc_bin} {target_skylark_file_label} {output_file} [symbol_names]...");
- }
-
- targetFileLabelString = residualArgs.get(0);
- outputPath = residualArgs.get(1);
- symbolNames = getSymbolNames(residualArgs);
- depRoots = ImmutableList.of();
- } else {
- targetFileLabelString = skydocOptions.targetFileLabel;
- outputPath = skydocOptions.outputFilePath;
- symbolNames = ImmutableSet.copyOf(skydocOptions.symbolNames);
- depRoots = ImmutableList.copyOf(skydocOptions.depRoots);
+ throw new IllegalArgumentException("Expected a target file label and an output file path.");
}
+ targetFileLabelString = skydocOptions.targetFileLabel;
+ outputPath = skydocOptions.outputFilePath;
+ symbolNames = ImmutableSet.copyOf(skydocOptions.symbolNames);
+ depRoots = ImmutableList.copyOf(skydocOptions.depRoots);
+
Label targetFileLabel = Label.parseAbsolute(targetFileLabelString, ImmutableMap.of());
ImmutableMap.Builder<String, RuleInfo> ruleInfoMap = ImmutableMap.builder();
@@ -278,14 +267,6 @@
return false;
}
- private static ImmutableSet<String> getSymbolNames(List<String> args) {
- ImmutableSet.Builder<String> symbolNameSet = ImmutableSet.builder();
- for (int argi = 2; argi < args.size(); argi++) {
- symbolNameSet.add(args.get(argi));
- }
- return symbolNameSet.build();
- }
-
private static void printRuleInfos(
PrintWriter printWriter, MarkdownRenderer renderer, Map<String, RuleInfo> ruleInfos)
throws IOException {