allocations = innerDataSet.getInstantiationIterator(); allocations
- .hasNext();) {
- AllocData ad = allocations.next();
- // if the constructor matches the instantiation
- // flag the instantiation as a generator of an extra
- // class
- if (outerDataSet.getClassName().equals(ad.getName())
- && cd.getParameterCount() == ad.getArgumentCount()) {
- addViolation(ctx, ad.getASTAllocationExpression());
- }
- }
- }
- }
- }
- }
-
- private ClassData getCurrentClassData() {
- // TODO
- // this is a hack to bail out here
- // but I'm not sure why this is happening
- // TODO
- if (classID >= classDataList.size()) {
- return null;
- }
- return classDataList.get(classID);
- }
-
- private void setClassID(int id) {
- classID = id;
- }
-
- private int getClassID() {
- return classID;
- }
-
- // remove = Fire.
- // value = someFire.Fighter
- // 0123456789012345
- // index = 4
- // remove.size() = 5
- // value.substring(0,4) = some
- // value.substring(4 + remove.size()) = Fighter
- // return "someFighter"
-
- // TODO move this into StringUtil
- private static String stripString(String remove, String value) {
- String returnValue;
- int index = value.indexOf(remove);
- if (index != -1) { // if the package name can start anywhere but 0
- // please inform the author because this will break
- returnValue = value.substring(0, index) + value.substring(index + remove.length());
- } else {
- returnValue = value;
- }
- return returnValue;
- }
-
-}
+/**
+ * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
+ */
+
+package net.sourceforge.pmd.lang.java.rule.design;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import net.sourceforge.pmd.RuleContext;
+import net.sourceforge.pmd.lang.java.ast.ASTAllocationExpression;
+import net.sourceforge.pmd.lang.java.ast.ASTArguments;
+import net.sourceforge.pmd.lang.java.ast.ASTClassOrInterfaceType;
+import net.sourceforge.pmd.lang.java.ast.ASTConstructorDeclaration;
+import net.sourceforge.pmd.lang.java.rule.AbstractJavaRule;
+import net.sourceforge.pmd.lang.java.symboltable.ClassScope;
+
+/**
+ * 1. Note all private constructors. 2. Note all instantiations from outside of
+ * the class by way of the private constructor. 3. Flag instantiations.
+ *
+ *
+ * Parameter types can not be matched because they can come as exposed members
+ * of classes. In this case we have no way to know what the type is. We can make
+ * a best effort though which can filter some?
+ *
+ *
+ * @author CL Gilbert (dnoyeb@users.sourceforge.net)
+ * @author David Konecny (david.konecny@)
+ * @author Romain PELISSE, belaran@gmail.com, patch bug#1807370
+ * @author Juan Martin Sotuyo Dodero (juansotuyo@gmail.com), complete rewrite
+ */
+public class AccessorClassGenerationRule extends AbstractJavaRule {
+
+ private Map> privateConstructors = new HashMap<>();
+
+ public AccessorClassGenerationRule() {
+ super();
+ /*
+ * Order is important. Visit constructors first to find the private
+ * ones, then visit allocations to find violations
+ */
+ addRuleChainVisit(ASTConstructorDeclaration.class);
+ addRuleChainVisit(ASTAllocationExpression.class);
+ }
+
+ @Override
+ public void end(final RuleContext ctx) {
+ super.end(ctx);
+ // Clean up all references to the AST
+ privateConstructors.clear();
+ }
+
+ @Override
+ public Object visit(final ASTConstructorDeclaration node, final Object data) {
+ if (node.isPrivate()) {
+ final String className = node.jjtGetParent().jjtGetParent().jjtGetParent().getImage();
+ if (!privateConstructors.containsKey(className)) {
+ privateConstructors.put(className, new ArrayList());
+ }
+ privateConstructors.get(className).add(node);
+ }
+ return data;
+ }
+
+ @Override
+ public Object visit(final ASTAllocationExpression node, final Object data) {
+ if (node.jjtGetChild(0) instanceof ASTClassOrInterfaceType) { // Ignore primitives
+ final ASTClassOrInterfaceType type = (ASTClassOrInterfaceType) node.jjtGetChild(0);
+ final List constructors = privateConstructors.get(type.getImage());
+
+ if (constructors != null) {
+ final ASTArguments callArguments = (ASTArguments) node.jjtGetChild(1);
+ final ClassScope enclosingScope = node.getScope().getEnclosingScope(ClassScope.class);
+
+ for (final ASTConstructorDeclaration cd : constructors) {
+ // Are we within the same class scope?
+ if (cd.getScope().getEnclosingScope(ClassScope.class) == enclosingScope) {
+ break;
+ }
+
+ if (cd.getParameterCount() == callArguments.getArgumentCount()) {
+ // TODO : Check types
+ addViolation(data, node);
+ break;
+ }
+ }
+ }
+ }
+
+ return data;
+ }
+}
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/AccessorClassGeneration.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/AccessorClassGeneration.xml
index 38c02df0d5..cbe0fe1446 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/AccessorClassGeneration.xml
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/AccessorClassGeneration.xml
@@ -99,28 +99,7 @@ public class Foo1 {
}
}
]]>
-
-
+
#1452 ArrayIndexOutOfBoundsException with Annotations for AccessorClassGenerationRule
0
@@ -128,4 +107,28 @@ public class Foo1 {
public @interface Something { public interface SomthingElse{}; }
]]>
+
+
+ 1
+