Skip to content

[docs] Sorted doc outputs and clean up duplicated CliOptions #5046

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jimschubert merged 6 commits into from
Jan 20, 2020
Merged

[docs] Sorted doc outputs and clean up duplicated CliOptions #5046

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
57237f8
[config-help] Sort all outputs
jimschubert Jan 19, 2020
103c035
Remove old/stale generator docs (these have been renamed previously)
jimschubert Jan 19, 2020
3a2ad7a
Sort config doc outputs, making it easier to find relevant info
jimschubert Jan 19, 2020
f7e1584
Fixes cliOptions duplicates
jimschubert Jan 19, 2020
16a25d3
Add --github-nested-index for generating docs/generators/README.md
jimschubert Jan 19, 2020
943fd19
:memo: Regenerate generator docs
jimschubert Jan 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Sort config doc outputs, making it easier to find relevant info
  • Loading branch information
@jimschubert
jimschubert committed Jan 19, 2020
commit 3a2ad7a14ff751c5aeb8e45f431fb460b8ca41ff
8 changes: 4 additions & 4 deletions modules/openapi-generator-cli/src/main/java/org/openapitools/codegen/cmd/ConfigHelp.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ private void generateMarkdownHelp(StringBuilder sb, CodegenConfig config) {
Map<String, CliOption> langCliOptions = config.cliOptions()
.stream()
.collect(Collectors.toMap(CliOption::getOpt, Function.identity(), (a, b) -> {
throw new IllegalStateException();
throw new IllegalStateException(String.format(Locale.ROOT, "Duplicated options! %s and %s", a.getOpt(), b.getOpt()));
}, TreeMap::new));

langCliOptions.forEach((key, langCliOption) -> {
Expand Down Expand Up @@ -320,7 +320,7 @@ private void generatePlainTextHelp(StringBuilder sb, CodegenConfig config) {
Map<String, CliOption> langCliOptions = config.cliOptions()
.stream()
.collect(Collectors.toMap(CliOption::getOpt, Function.identity(), (a, b) -> {
throw new IllegalStateException();
throw new IllegalStateException(String.format(Locale.ROOT, "Duplicated options! %s and %s", a.getOpt(), b.getOpt()));
}, TreeMap::new));

langCliOptions.forEach((key, langCliOption) -> {
Expand All @@ -341,7 +341,7 @@ private void generatePlainTextHelp(StringBuilder sb, CodegenConfig config) {
.entrySet()
.stream()
.collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (a, b) -> {
throw new IllegalStateException();
throw new IllegalStateException(String.format(Locale.ROOT, "Duplicated options! %s and %s", a, b));
}, TreeMap::new));
writePlainTextFromMap(sb, map, optIndent, optNestedIndent, "Type/Alias", "Imports");
sb.append(newline);
Expand All @@ -356,7 +356,7 @@ private void generatePlainTextHelp(StringBuilder sb, CodegenConfig config) {
.entrySet()
.stream()
.collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (a, b) -> {
throw new IllegalStateException();
throw new IllegalStateException(String.format(Locale.ROOT, "Duplicated options! %s and %s", a, b));
}, TreeMap::new));
writePlainTextFromMap(sb, map, optIndent, optNestedIndent, "Type/Alias", "Instantiated By");
sb.append(newline);
Expand Down