Browse Source

Replace hidden language with language dependency removal in the CLI module.

Timur Sağlam 4 years ago
parent
commit
057941dd56

+ 0 - 5
cli/pom.xml

@@ -80,11 +80,6 @@
             <artifactId>emf-metamodel</artifactId>
             <version>${revision}</version>
         </dependency>
-        <dependency>
-            <groupId>de.jplag</groupId>
-            <artifactId>emf-metamodel-dynamic</artifactId>
-            <version>${revision}</version>
-        </dependency>
         <!-- CLI -->
         <dependency>
             <groupId>org.kohsuke.metainf-services</groupId>

+ 4 - 6
cli/src/test/java/de/jplag/cli/LanguageTest.java

@@ -37,12 +37,10 @@ class LanguageTest extends CommandLineInterfaceTest {
     @Test
     void testValidLanguages() {
         for (Language language : LanguageLoader.getAllAvailableLanguages().values()) {
-            if (!language.isHidden()) {
-                String argument = buildArgument(CommandLineArgument.LANGUAGE, language.getIdentifier());
-                buildOptionsFromCLI(argument, CURRENT_DIRECTORY);
-                assertEquals(language.getIdentifier(), options.language().getIdentifier());
-                assertEquals(Arrays.asList(language.suffixes()), options.fileSuffixes());
-            }
+            String argument = buildArgument(CommandLineArgument.LANGUAGE, language.getIdentifier());
+            buildOptionsFromCLI(argument, CURRENT_DIRECTORY);
+            assertEquals(language.getIdentifier(), options.language().getIdentifier());
+            assertEquals(Arrays.asList(language.suffixes()), options.fileSuffixes());
         }
     }
 

+ 0 - 8
language-api/src/main/java/de/jplag/Language.java

@@ -58,12 +58,4 @@ public interface Language {
     default String viewFileSuffix() {
         return "";
     }
-
-    /**
-     * Specifies if the language is hidden in the CLI interface.
-     * @return true if it is hidden.
-     */
-    default boolean isHidden() {
-        return false;
-    }
 }

+ 1 - 2
language-api/src/main/java/de/jplag/LanguageLoader.java

@@ -70,8 +70,7 @@ public final class LanguageLoader {
      * @see Language#getIdentifier()
      */
     public static Set<String> getAllAvailableLanguageIdentifiers() {
-        var identifiers = getAllAvailableLanguages().values().stream().filter(it -> !it.isHidden()).map(Language::getIdentifier).toList();
-        return new TreeSet<>(identifiers);
+        return new TreeSet<>(getAllAvailableLanguages().keySet());
     }
 
     /**

+ 0 - 5
languages/emf-metamodel-dynamic/src/main/java/de/jplag/emf/dynamic/Language.java

@@ -34,9 +34,4 @@ public class Language extends de.jplag.emf.Language {
     public int minimumTokenMatch() {
         return DEFAULT_MIN_TOKEN_MATCH;
     }
-
-    @Override
-    public boolean isHidden() {
-        return true; // currently hidden, as the other EMF language module should be used.
-    }
 }