Skip to content

Commit

Permalink
#1046.Now JavadocParameterOrder work with Generics.
Browse files Browse the repository at this point in the history
  • Loading branch information
zCRUSADERz committed May 4, 2019
1 parent 0dc23f5 commit c02fdfb
Show file tree
Hide file tree
Showing 6 changed files with 382 additions and 65 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,12 @@
import com.puppycrawl.tools.checkstyle.api.TextBlock;
import com.puppycrawl.tools.checkstyle.api.TokenTypes;
import com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTag;
import com.qulice.checkstyle.parameters.Arguments;
import com.qulice.checkstyle.parameters.TypeParameters;
import java.util.ArrayList;
import java.util.LinkedList;
import java.util.List;
import java.util.function.Consumer;
import java.util.regex.Matcher;
import java.util.regex.Pattern;

Expand Down Expand Up @@ -84,6 +87,8 @@ public final class JavadocParameterOrderCheck extends AbstractCheck {
@Override
public int[] getDefaultTokens() {
return new int[] {
TokenTypes.INTERFACE_DEF,
TokenTypes.CLASS_DEF,
TokenTypes.CTOR_DEF,
TokenTypes.METHOD_DEF,
};
Expand All @@ -101,7 +106,7 @@ public int[] getRequiredTokens() {

@Override
public void visitToken(final DetailAST ast) {
final FileContents contents = getFileContents();
final FileContents contents = this.getFileContents();
final TextBlock doc = contents.getJavadocBefore(ast.getLineNo());
if (doc != null) {
this.checkParameters(ast, doc);
Expand Down Expand Up @@ -208,28 +213,6 @@ private static List<JavadocTag> getMultilineArgTags(
return tags;
}

/**
* Computes the parameter nodes for a method.
*
* @param ast The method node.
* @return The list of parameter nodes for ast.
*/
private static List<DetailAST> getParameters(final DetailAST ast) {
final DetailAST params = ast.findFirstToken(TokenTypes.PARAMETERS);
final List<DetailAST> value = new ArrayList<>(0);
DetailAST child = params.getFirstChild();
while (child != null) {
if (child.getType() == TokenTypes.PARAMETER_DEF) {
final DetailAST ident = child.findFirstToken(TokenTypes.IDENT);
if (ident != null) {
value.add(ident);
}
}
child = child.getNextSibling();
}
return value;
}

/**
* Checks method parameters order to comply with what is defined in method
* javadoc.
Expand All @@ -238,19 +221,17 @@ private static List<DetailAST> getParameters(final DetailAST ast) {
*/
private void checkParameters(final DetailAST ast, final TextBlock doc) {
final List<JavadocTag> tags = getMethodTags(doc);
final List<DetailAST> parameters = getParameters(ast);
if (tags.size() == parameters.size()) {
for (int param = 0; param < parameters.size(); param = param + 1) {
final String parameter = parameters.get(param).getText();
final JavadocTag tag = tags.get(param);
if (!parameter.equals(tag.getFirstArg())) {
this.log(
tag.getLineNo(),
// @checkstyle LineLength (1 line)
"Javadoc parameter order different than method signature"
);
}
}
final Arguments args = new Arguments(ast);
final TypeParameters types = new TypeParameters(ast);
final int count = args.count() + types.count();
if (tags.size() == count) {
final Consumer<JavadocTag> logger = (tag) -> this.log(
tag.getLineNo(),
// @checkstyle LineLength (1 line)
"Javadoc parameter order different than method signature"
);
args.checkOrder(tags, logger);
types.checkOrder(tags, logger);
} else {
this.log(
ast.getLineNo(),
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,107 @@
/*
* Copyright (c) 2011-2019, Qulice.com
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met: 1) Redistributions of source code must retain the above
* copyright notice, this list of conditions and the following
* disclaimer. 2) Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the following
* disclaimer in the documentation and/or other materials provided
* with the distribution. 3) Neither the name of the Qulice.com nor
* the names of its contributors may be used to endorse or promote
* products derived from this software without specific prior written
* permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT
* NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
* THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
* INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
* OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package com.qulice.checkstyle.parameters;

import com.puppycrawl.tools.checkstyle.api.DetailAST;
import com.puppycrawl.tools.checkstyle.api.TokenTypes;
import com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTag;
import java.util.Iterator;
import java.util.List;
import java.util.function.Consumer;

/**
* Method or constructor arguments.
*
* @since 0.18.18
*/
public class Arguments {

/**
* Parameters.
*/
private final Parameters parameters;

/**
* Secondary ctor.
* @param node Constructor or method defenition node.
*/
public Arguments(final DetailAST node) {
this(
new Parameters(
node, TokenTypes.PARAMETERS, TokenTypes.PARAMETER_DEF
)
);
}

/**
* Primary ctor.
* @param parameters Parameters.
*/
public Arguments(final Parameters parameters) {
this.parameters = parameters;
}

/**
* Return number of arguments.
* @return Number of arguments.
*/
public final int count() {
return this.parameters.count();
}

/**
* Checks for consistency the order of arguments and their Javadoc
* parameters.
* @param tags Javadoc parameter tags.
* @param consumer Consumer accepts JavadocTag which is located out of
* order.
*/
public final void checkOrder(
final List<JavadocTag> tags, final Consumer<JavadocTag> consumer
) {
final List<DetailAST> params = this.parameters.parameters();
if (tags.size() < params.size()) {
throw new IllegalStateException(
// @checkstyle LineLength (1 lines)
"Number of Javadoc parameters does not match the number of arguments"
);
}
final Iterator<JavadocTag> iterator = tags.listIterator();
for (final DetailAST param : params) {
final String type =
param.findFirstToken(TokenTypes.IDENT).getText();
final JavadocTag tag = iterator.next();
final String arg = tag.getFirstArg();
if (!arg.equals(type)) {
consumer.accept(tag);
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,113 @@
/*
* Copyright (c) 2011-2019, Qulice.com
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met: 1) Redistributions of source code must retain the above
* copyright notice, this list of conditions and the following
* disclaimer. 2) Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the following
* disclaimer in the documentation and/or other materials provided
* with the distribution. 3) Neither the name of the Qulice.com nor
* the names of its contributors may be used to endorse or promote
* products derived from this software without specific prior written
* permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT
* NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
* THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
* INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
* OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package com.qulice.checkstyle.parameters;

import com.puppycrawl.tools.checkstyle.api.DetailAST;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;

/**
* Abstract parameters. Is used for Generic type parameters or
* method(constructor) arguments.
*
* @since 0.18.18
*/
public class Parameters {

/**
* Class, interface, constructor or method definition node.
*/
private final DetailAST node;

/**
* Parent TokenType (TYPE_PARAMETERS or PARAMETERS).
* @see com.puppycrawl.tools.checkstyle.api.TokenTypes
*/
private final int parent;

/**
* Childs TokenType (TYPE_PARAMETER or PARAMETER_DEF).
* @see com.puppycrawl.tools.checkstyle.api.TokenTypes
*/
private final int childs;

/**
* Primary ctor.
* @param node Class, interface, constructor or method definition node.
* @param parent Parent TokenType (TYPE_PARAMETERS or PARAMETERS).
* @param childs Childs TokenType (TYPE_PARAMETER or PARAMETER_DEF).
*/
public Parameters(
final DetailAST node, final int parent, final int childs
) {
this.node = node;
this.parent = parent;
this.childs = childs;
}

/**
* Return number of arguments.
* @return Number of parameters.
*/
public final int count() {
final int result;
final DetailAST params = this.node.findFirstToken(this.parent);
if (params == null) {
result = 0;
} else {
result = params.getChildCount(this.childs);
}
return result;
}

/**
* Return parameters for this node.
* @return Parameters for this node.
*/
public final List<DetailAST> parameters() {
final List<DetailAST> result;
final int count = this.count();
if (count == 0) {
result = Collections.emptyList();
} else {
final DetailAST params = this.node.findFirstToken(this.parent);
result = new ArrayList<>(count);
DetailAST child = params.getFirstChild();
while (child != null) {
if (child.getType() == this.childs) {
result.add(child);
}
child = child.getNextSibling();
}
}
return result;
}
}

0 comments on commit c02fdfb

Please sign in to comment.