From cd7e41a9cbc04c486826bd57641056eca492c86e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Mart=C3=ADn=20Sotuyo=20Dodero?= Date: Mon, 29 Aug 2022 18:45:14 -0300 Subject: [PATCH] Remove name normalization - Terse names are becoming more strictly defined soon --- .../typesupport/internal/PmdLanguageTypeSupport.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pmd-cli/src/main/java/net/sourceforge/pmd/cli/commands/typesupport/internal/PmdLanguageTypeSupport.java b/pmd-cli/src/main/java/net/sourceforge/pmd/cli/commands/typesupport/internal/PmdLanguageTypeSupport.java index e57d346733..a250f61b5c 100644 --- a/pmd-cli/src/main/java/net/sourceforge/pmd/cli/commands/typesupport/internal/PmdLanguageTypeSupport.java +++ b/pmd-cli/src/main/java/net/sourceforge/pmd/cli/commands/typesupport/internal/PmdLanguageTypeSupport.java @@ -23,16 +23,12 @@ public class PmdLanguageTypeSupport implements ITypeConverter, Iterabl @Override public Language convert(final String value) throws Exception { return LanguageRegistry.getLanguages().stream() - .filter(l -> normalizeName(l).equals(value)).findFirst() + .filter(l -> l.getTerseName().equals(value)).findFirst() .orElseThrow(() -> new TypeConversionException("Unknown language: " + value)); } @Override public Iterator iterator() { - return LanguageRegistry.getLanguages().stream().map(PmdLanguageTypeSupport::normalizeName).iterator(); - } - - public static String normalizeName(final Language lang) { - return lang.getTerseName().replace(' ', '-'); + return LanguageRegistry.getLanguages().stream().map(Language::getTerseName).iterator(); } }