Fixed build errors and code style

jplag · Dec 2, 2024 · f9dfa80 · f9dfa80
1 parent d62a358
commit f9dfa80
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/cli/src/test/java/de/jplag/cli/LanguageTest.java b/cli/src/test/java/de/jplag/cli/LanguageTest.java
@@ -18,9 +18,11 @@
 import de.jplag.cli.test.CliArgument;
 import de.jplag.cli.test.CliTest;
 import de.jplag.exceptions.ExitException;
+import de.jplag.multilang.MultiLanguage;
 import de.jplag.options.JPlagOptions;
 
 class LanguageTest extends CliTest {
+    private static final List<Class<? extends Language>> ignoredLanguages = List.of(MultiLanguage.class);
 
     @Test
     void testDefaultLanguage() throws ExitException, IOException {
@@ -58,6 +60,7 @@ void testCustomSuffixes() throws ExitException, IOException {
     }
 
     public static Collection<Language> getAllLanguages() {
-        return LanguageLoader.getAllAvailableLanguages().values();
+        return LanguageLoader.getAllAvailableLanguages().values().stream().filter(language -> !ignoredLanguages.contains(language.getClass()))
+                .toList();
     }
 }
diff --git a/language-api/src/main/java/de/jplag/options/DefaultLanguageOption.java b/language-api/src/main/java/de/jplag/options/DefaultLanguageOption.java
@@ -20,7 +20,7 @@ public class DefaultLanguageOption<T> implements LanguageOption<T> {
         this.hasValue = true;
     }
 
-    DefaultLanguageOption(OptionType<T> type, String description, String name) {
+    DefaultLanguageOption(OptionType<T> type, String name, String description) {
         this(type, name, description, null);
         this.hasValue = false;
     }

diff --git a/language-api/src/main/java/de/jplag/options/LanguageOptions.java b/language-api/src/main/java/de/jplag/options/LanguageOptions.java
@@ -56,7 +56,7 @@ protected <T> LanguageOption<T> createDefaultOption(OptionType<T> type, String n
      * @return The new option
      */
     protected <T> LanguageOption<T> createOption(OptionType<T> type, String name, String description) {
-        LanguageOption<T> option = new DefaultLanguageOption<>(type, description, name);
+        LanguageOption<T> option = new DefaultLanguageOption<>(type, name, description);
         this.options.add(option);
         return option;
     }

diff --git a/languages/multi-language/src/main/java/de/jplag/multilang/MultiLanguageOptions.java b/languages/multi-language/src/main/java/de/jplag/multilang/MultiLanguageOptions.java
@@ -12,9 +12,9 @@
 public class MultiLanguageOptions extends LanguageOptions {
     private static final String ERROR_LANGUAGE_NOT_FOUND = "The selected language %s could not be found";
     private static final String ERROR_NOT_ENOUGH_LANGUAGES = "To use multi language specify at least 1 language";
+    private static final String OPTION_DESCRIPTION_LANGUAGES = "The languages that should be used. This is a ',' separated list";
 
-    public LanguageOption<String> languageNames = createOption(OptionType.string(), "languages",
-            "The languages that should be used. This is a ',' separated list");
+    public LanguageOption<String> languageNames = createOption(OptionType.string(), "languages", OPTION_DESCRIPTION_LANGUAGES);
     private List<Language> languages = null;
 
     public List<Language> getLanguages() {