hiifong/pmd
1
0
Fork 0
forked from phoedos/pmd
Code Pull Requests Activity

Small changes from code review

Browse Source 
* rename BaseParserHelper
* Not using org.jetbrains.annotations.NotNull
This commit is contained in:
Andreas Dangel
2020-01-10 12:18:43 +01:00
parent 4269fd1b73
commit c53d9508e9
9 changed files with 14 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/AccessNodeTest.java
View File

@ -150,10 +150,10 @@ public class AccessNodeTest extends BaseParserTest {
public static <T extends Node> T getDeclWithModifiers(String[] access, Class<T> target, String declRest) {
ASTCompilationUnit acu = JavaParsingHelper.JUST_PARSE.parse(makeAccessJavaCode(access, declRest));
List<T> fields = acu.getFirstDescendantOfType(ASTClassOrInterfaceDeclaration.class)
List<T> declarations = acu.getFirstDescendantOfType(ASTClassOrInterfaceDeclaration.class)
.findDescendantsOfType(target);
assertEquals("Wrong number of declarations", 1, fields.size());
return fields.get(0);
assertEquals("Wrong number of declarations", 1, declarations.size());
return declarations.get(0);
}
}

2
pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/MethodDeclTest.java
View File

@ -71,7 +71,7 @@ public class MethodDeclTest {
assertTrue("Expecting method to be public.", amd.isPublic());
}
public ASTMethodDeclaration getMethodDecl(String[] access) {
private ASTMethodDeclaration getMethodDecl(String[] access) {
return AccessNodeTest.getDeclWithModifiers(access, ASTMethodDeclaration.class, "void stuff(){}");
}
}

7
pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/ast/JsParsingHelper.java
View File

@ -4,8 +4,6 @@
package net.sourceforge.pmd.lang.ecmascript.ast;
import org.jetbrains.annotations.NotNull;
import net.sourceforge.pmd.lang.ast.test.BaseParsingHelper;
import net.sourceforge.pmd.lang.ecmascript.EcmascriptLanguageModule;
@ -13,13 +11,12 @@ public final class JsParsingHelper extends BaseParsingHelper<JsParsingHelper, AS
public static final JsParsingHelper DEFAULT = new JsParsingHelper(Params.getDefaultProcess());
private JsParsingHelper(@NotNull Params params) {
private JsParsingHelper(Params params) {
super(EcmascriptLanguageModule.NAME, ASTAstRoot.class, params);
}
@NotNull
@Override
protected JsParsingHelper clone(@NotNull Params params) {
protected JsParsingHelper clone(Params params) {
return new JsParsingHelper(params);
}
}

7
pmd-jsp/src/test/java/net/sourceforge/pmd/lang/jsp/ast/JspParsingHelper.java
View File

@ -4,8 +4,6 @@
package net.sourceforge.pmd.lang.jsp.ast;
import org.jetbrains.annotations.NotNull;
import net.sourceforge.pmd.lang.ast.test.BaseParsingHelper;
import net.sourceforge.pmd.lang.jsp.JspLanguageModule;
@ -13,13 +11,12 @@ public final class JspParsingHelper extends BaseParsingHelper<JspParsingHelper,
public static final JspParsingHelper DEFAULT = new JspParsingHelper(Params.getDefaultProcess());
private JspParsingHelper(@NotNull Params params) {
private JspParsingHelper(Params params) {
super(JspLanguageModule.NAME, ASTCompilationUnit.class, params);
}
@NotNull
@Override
protected JspParsingHelper clone(@NotNull Params params) {
protected JspParsingHelper clone(Params params) {
return new JspParsingHelper(params);
}
}

0
pmd-lang-test/src/main/kotlin/net/sourceforge/pmd/lang/ast/test/BaseParserTestUtil.kt → pmd-lang-test/src/main/kotlin/net/sourceforge/pmd/lang/ast/test/BaseParsingHelper.kt
View File

4
pmd-modelica/src/test/java/net/sourceforge/pmd/lang/modelica/ModelicaParsingHelper.java
View File

@ -4,7 +4,6 @@
package net.sourceforge.pmd.lang.modelica;
import org.jetbrains.annotations.NotNull;
import net.sourceforge.pmd.lang.ast.test.BaseParsingHelper;
import net.sourceforge.pmd.lang.modelica.ast.ASTStoredDefinition;
@ -18,9 +17,8 @@ public class ModelicaParsingHelper extends BaseParsingHelper<ModelicaParsingHelp
super(ModelicaLanguageModule.NAME, ASTStoredDefinition.class, params);
}
@NotNull
@Override
protected ModelicaParsingHelper clone(@NotNull Params params) {
protected ModelicaParsingHelper clone(Params params) {
return new ModelicaParsingHelper(params);
}

5
pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/PlsqlParsingHelper.java
View File

@ -4,8 +4,6 @@
package net.sourceforge.pmd.lang.plsql;
import org.jetbrains.annotations.NotNull;
import net.sourceforge.pmd.lang.ast.test.BaseParsingHelper;
import net.sourceforge.pmd.lang.plsql.ast.ASTInput;
@ -20,9 +18,8 @@ public class PlsqlParsingHelper extends BaseParsingHelper<PlsqlParsingHelper, AS
super(PLSQLLanguageModule.NAME, ASTInput.class, params);
}
@NotNull
@Override
protected PlsqlParsingHelper clone(@NotNull Params params) {
protected PlsqlParsingHelper clone(Params params) {
return new PlsqlParsingHelper(params);
}

7
pmd-scala/src/test/java/net/sourceforge/pmd/lang/scala/ast/ScalaParsingHelper.java
View File

@ -7,8 +7,6 @@ package net.sourceforge.pmd.lang.scala.ast;
import java.io.File;
import java.io.StringReader;
import org.jetbrains.annotations.NotNull;
import net.sourceforge.pmd.PMD;
import net.sourceforge.pmd.PMDException;
import net.sourceforge.pmd.Report;
@ -24,13 +22,12 @@ public final class ScalaParsingHelper extends BaseParsingHelper<ScalaParsingHelp
public static final ScalaParsingHelper DEFAULT = new ScalaParsingHelper(Params.getDefaultProcess());
private ScalaParsingHelper(@NotNull Params params) {
private ScalaParsingHelper(Params params) {
super(ScalaLanguageModule.NAME, ASTSource.class, params);
}
@NotNull
@Override
protected ScalaParsingHelper clone(@NotNull Params params) {
protected ScalaParsingHelper clone(Params params) {
return new ScalaParsingHelper(params);
}

7
pmd-xml/src/test/java/net/sourceforge/pmd/lang/xml/XmlParsingHelper.java
View File

@ -4,8 +4,6 @@
package net.sourceforge.pmd.lang.xml;
import org.jetbrains.annotations.NotNull;
import net.sourceforge.pmd.lang.ast.test.BaseParsingHelper;
import net.sourceforge.pmd.lang.pom.PomLanguageModule;
import net.sourceforge.pmd.lang.wsdl.WsdlLanguageModule;
@ -21,13 +19,12 @@ public final class XmlParsingHelper extends BaseParsingHelper<XmlParsingHelper,
public static final XmlParsingHelper POM = new XmlParsingHelper(PomLanguageModule.NAME, Params.getDefaultProcess());
private XmlParsingHelper(@NotNull String langName, @NotNull Params params) {
private XmlParsingHelper(String langName, Params params) {
super(langName, RootXmlNode.class, params);
}
@NotNull
@Override
protected XmlParsingHelper clone(@NotNull Params params) {
protected XmlParsingHelper clone(Params params) {
return new XmlParsingHelper(this.getLangName(), params);
}
}