Skip to content

Fixed #146 - Replace Collection based sorting with Stream based sorting #147

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
rvesse merged 1 commit into from
Jul 23, 2025
Merged

Fixed #146 - Replace Collection based sorting with Stream based sorting #147

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
77 changes: 40 additions & 37 deletions airline-core/src/main/java/com/github/rvesse/airline/help/common/AbstractUsageGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,12 @@
*/
package com.github.rvesse.airline.help.common;

import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
import java.util.Set;
import java.util.function.Predicate;
import java.util.stream.Collectors;

import org.apache.commons.collections4.ListUtils;
import org.apache.commons.lang3.StringUtils;

import com.github.rvesse.airline.help.UsageHelper;
Expand Down Expand Up @@ -80,37 +79,41 @@ protected final Comparator<? super CommandMetadata> getCommandComparator() {
* @return Sorted options
*/
protected List<OptionMetadata> sortOptions(List<OptionMetadata> options) {
if (optionComparator != null) {
options = new ArrayList<OptionMetadata>(options);
Collections.sort(options, optionComparator);
if (optionComparator == null) {
return options;
}
return options;

return options.stream()
.sorted(optionComparator)
.collect(Collectors.toList());
}

protected List<HelpHint> sortOptionRestrictions(List<OptionRestriction> restrictions) {
List<HelpHint> hints = new ArrayList<>();
for (OptionRestriction restriction : restrictions) {
if (restriction instanceof HelpHint) {
hints.add((HelpHint)restriction);
}
}
if (hintComparator != null) {
Collections.sort(hints, hintComparator);
var hints = restrictions.stream()
.filter(HelpHint.class::isInstance)
.map(HelpHint.class::cast);

if (hintComparator == null) {
return hints.collect(Collectors.toList());
}
return hints;

return hints
.sorted(hintComparator)
.collect(Collectors.toList());
}

protected List<HelpHint> sortArgumentsRestrictions(List<ArgumentsRestriction> restrictions) {
List<HelpHint> hints = new ArrayList<>();
for (ArgumentsRestriction restriction : restrictions) {
if (restriction instanceof HelpHint) {
hints.add((HelpHint)restriction);
}
}
if (hintComparator != null) {
Collections.sort(hints, hintComparator);
var hints = restrictions.stream()
.filter(HelpHint.class::isInstance)
.map(HelpHint.class::cast);

if (hintComparator == null) {
return hints.collect(Collectors.toList());
}
return hints;

return hints
.sorted(hintComparator)
.collect(Collectors.toList());
}

/**
Expand All @@ -122,11 +125,13 @@ protected List<HelpHint> sortArgumentsRestrictions(List<ArgumentsRestriction> re
* @return Sorted commands
*/
protected List<CommandMetadata> sortCommands(List<CommandMetadata> commands) {
if (commandComparator != null) {
commands = new ArrayList<>(commands);
Collections.sort(commands, commandComparator);
if (commandComparator == null) {
return commands;
}
return commands;

return commands.stream()
.sorted(commandComparator)
.collect(Collectors.toList());
}

/**
Expand Down Expand Up @@ -172,13 +177,11 @@ protected String toDefaultCommand(String command) {
* @return Option synopses
*/
protected List<String> toSynopsisUsage(List<OptionMetadata> options) {
List<String> synopsisOptions = new ArrayList<String>();
for (OptionMetadata option : options) {
if (option.isHidden() && !includeHidden)
continue;
synopsisOptions.add(toUsage(option));
}
return List.copyOf(synopsisOptions);
Predicate<OptionMetadata> noHidden = o -> o.isHidden() && !includeHidden;
return options.stream()
.filter(noHidden.negate())
.map(this::toUsage)
.collect(Collectors.toList());
}

protected String toUsage(ArgumentsMetadata arguments) {
Expand Down