[core] Rename Tokenizer to CpdLexer

See #4065

pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/cpd/ScalaCpdLexer.java

@@ -23,15 +23,17 @@ import scala.meta.tokens.Token;
 
 /**
  * Scala Tokenizer class. Uses the Scala Meta Tokenizer, but adapts it for use with generic filtering
+ *
+ * <p>Note: This class has been called ScalaTokenizer in PMD 6</p>.
  */
-public class ScalaTokenizer implements Tokenizer {
+public class ScalaCpdLexer implements CpdLexer {
 
     private final Dialect dialect;
 
     /**
      * Create the Tokenizer using properties from the system environment.
      */
-    public ScalaTokenizer(LanguagePropertyBundle bundle) {
+    public ScalaCpdLexer(LanguagePropertyBundle bundle) {
         LanguageVersion langVer = bundle.getLanguageVersion();
         dialect = ScalaLanguageModule.dialectOf(langVer);
     }

pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ScalaLanguageModule.java

@@ -7,8 +7,8 @@ package net.sourceforge.pmd.lang.scala;
 import org.checkerframework.checker.nullness.qual.NonNull;
 
 import net.sourceforge.pmd.annotation.InternalApi;
-import net.sourceforge.pmd.cpd.ScalaTokenizer;
-import net.sourceforge.pmd.cpd.Tokenizer;
+import net.sourceforge.pmd.cpd.CpdLexer;
+import net.sourceforge.pmd.cpd.ScalaCpdLexer;
 import net.sourceforge.pmd.lang.LanguagePropertyBundle;
 import net.sourceforge.pmd.lang.LanguageRegistry;
 import net.sourceforge.pmd.lang.LanguageVersion;
@@ -52,7 +52,7 @@ public class ScalaLanguageModule extends SimpleLanguageModuleBase {
     }
 
     @Override
-    public Tokenizer createCpdTokenizer(LanguagePropertyBundle bundle) {
-        return new ScalaTokenizer(bundle);
+    public CpdLexer createCpdLexer(LanguagePropertyBundle bundle) {
+        return new ScalaCpdLexer(bundle);
     }
 }

pmd-scala-modules/pmd-scala-common/src/test/java/net/sourceforge/pmd/cpd/ScalaCpdLexerTest.java

@@ -12,9 +12,9 @@ import net.sourceforge.pmd.cpd.test.CpdTextComparisonTest;
 import net.sourceforge.pmd.lang.ast.LexException;
 import net.sourceforge.pmd.lang.scala.ScalaLanguageModule;
 
-class ScalaTokenizerTest extends CpdTextComparisonTest {
+class ScalaCpdLexerTest extends CpdTextComparisonTest {
 
-    ScalaTokenizerTest() {
+    ScalaCpdLexerTest() {
         super(ScalaLanguageModule.getInstance(), ".scala");
     }