src/jdk.jlink/share/classes/jdk/tools/jlink/internal/JlinkTask.java

*** 41,52 ****
  import java.nio.file.Files;
  import java.nio.file.Path;
  import java.nio.file.Paths;
  import java.util.ArrayList;
  import java.util.Arrays;
- import java.util.Collection;
- import java.util.Collections;
  import java.util.Comparator;
  import java.util.Date;
  import java.util.HashMap;
  import java.util.HashSet;
  import java.util.List;
--- 41,50 ----
*** 229,239 ****
                     new PrintWriter(System.err, true));
          }
          try {
              List<String> remaining = optionsHelper.handleOptions(this, args);
              if (remaining.size() > 0 && !options.suggestProviders) {
!                 throw taskHelper.newBadArgs("err.orphan.arguments", toString(remaining))
                                  .showUsage(true);
              }
              if (options.help) {
                  optionsHelper.showHelp(PROGNAME);
                  return EXIT_OK;
--- 227,238 ----
                     new PrintWriter(System.err, true));
          }
          try {
              List<String> remaining = optionsHelper.handleOptions(this, args);
              if (remaining.size() > 0 && !options.suggestProviders) {
!                 throw taskHelper.newBadArgs("err.orphan.arguments",
!                                             remaining.stream().collect(Collectors.joining(" ")))
                                  .showUsage(true);
              }
              if (options.help) {
                  optionsHelper.showHelp(PROGNAME);
                  return EXIT_OK;
*** 657,669 ****
  
      private void suggestProviders(JlinkConfiguration config, List<String> args)
          throws BadArgs
      {
          if (args.size() > 1) {
!             throw taskHelper.newBadArgs("err.orphan.argument",
!                                         toString(args.subList(1, args.size())))
!                             .showUsage(true);
          }
  
          if (options.bindServices) {
              log.println(taskHelper.getMessage("no.suggested.providers"));
              return;
--- 656,671 ----
  
      private void suggestProviders(JlinkConfiguration config, List<String> args)
          throws BadArgs
      {
          if (args.size() > 1) {
!             List<String> arguments = args.get(0).startsWith("-")
!                                         ? args
!                                         : args.subList(1, args.size());
!             throw taskHelper.newBadArgs("err.invalid.arg.for.option",
!                                         "--suggest-providers",
!                                         arguments.stream().collect(Collectors.joining(" ")));
          }
  
          if (options.bindServices) {
              log.println(taskHelper.getMessage("no.suggested.providers"));
              return;
*** 712,734 ****
                   .flatMap(mref -> mref.descriptor().provides().stream()
                                        .map(ModuleDescriptor.Provides::service))
                   .forEach(names::remove);
              if (!names.isEmpty()) {
                  log.println(taskHelper.getMessage("warn.provider.notfound",
!                                                   toString(names)));
              }
  
              String msg = String.format("%n%s:", taskHelper.getMessage("suggested.providers.header"));
              printProviders(log, msg, mrefs, uses);
          }
      }
  
-     private static String toString(Collection<String> collection) {
-         return collection.stream().sorted()
-                          .collect(Collectors.joining(","));
-     }
- 
      private String getSaveOpts() {
          StringBuilder sb = new StringBuilder();
          sb.append('#').append(new Date()).append("\n");
          for (String c : optionsHelper.getInputCommand()) {
              sb.append(c).append(" ");
--- 714,731 ----
                   .flatMap(mref -> mref.descriptor().provides().stream()
                                        .map(ModuleDescriptor.Provides::service))
                   .forEach(names::remove);
              if (!names.isEmpty()) {
                  log.println(taskHelper.getMessage("warn.provider.notfound",
!                     names.stream().sorted().collect(Collectors.joining(","))));
              }
  
              String msg = String.format("%n%s:", taskHelper.getMessage("suggested.providers.header"));
              printProviders(log, msg, mrefs, uses);
          }
      }
  
      private String getSaveOpts() {
          StringBuilder sb = new StringBuilder();
          sb.append('#').append(new Date()).append("\n");
          for (String c : optionsHelper.getInputCommand()) {
              sb.append(c).append(" ");