fix for 98952 : @AJ if pointcut

org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/ValidateAtAspectJAnnotationsVisitor.java

@@ -40,7 +40,9 @@ import org.aspectj.weaver.AjAttribute;
 import org.aspectj.weaver.ISourceContext;
 import org.aspectj.weaver.ResolvedPointcutDefinition;
 import org.aspectj.weaver.UnresolvedType;
+import org.aspectj.weaver.patterns.AbstractPatternNodeVisitor;
 import org.aspectj.weaver.patterns.FormalBinding;
+import org.aspectj.weaver.patterns.IfPointcut;
 import org.aspectj.weaver.patterns.ParserException;
 import org.aspectj.weaver.patterns.PatternParser;
 import org.aspectj.weaver.patterns.Pointcut;
@@ -57,6 +59,7 @@ public class ValidateAtAspectJAnnotationsVisitor extends ASTVisitor {
 	private static final char[] adviceNameSig = "Lorg/aspectj/lang/annotation/AdviceName;".toCharArray();
 	private static final char[] orgAspectJLangAnnotation = "org/aspectj/lang/annotation/".toCharArray();
 	private static final char[] voidType = "void".toCharArray();
+	private static final char[] booleanType = "boolean".toCharArray();
 	private static final char[] joinPoint = "Lorg/aspectj/lang/JoinPoint;".toCharArray();
 	private static final char[] joinPointStaticPart = "Lorg/aspectj/lang/JoinPoint$StaticPart;".toCharArray();
 	private static final char[] joinPointEnclosingStaticPart = "Lorg/aspectj/lang/JoinPoint$EnclosingStaticPart;".toCharArray();
@@ -431,28 +434,7 @@ public class ValidateAtAspectJAnnotationsVisitor extends ASTVisitor {
 			methodDeclaration.scope.problemReporter().disallowedTargetForAnnotation(ajAnnotations.adviceNameAnnotation);			
 		}
 	
-
-		boolean returnsVoid = true;
-		if ((methodDeclaration.returnType instanceof SingleTypeReference)) {
-			SingleTypeReference retType = (SingleTypeReference) methodDeclaration.returnType;
-			if (!CharOperation.equals(voidType,retType.token)) {
-				returnsVoid = false;
-			}
-		} else {
-			returnsVoid = false;
-		}
-		if (!returnsVoid) {
-			methodDeclaration.scope.problemReporter().signalError(methodDeclaration.returnType.sourceStart,
-																					  methodDeclaration.returnType.sourceEnd, 
-																					  "Methods annotated with @Pointcut must return void");
-		}
-		
-		if (methodDeclaration.statements != null && methodDeclaration.statements.length > 0) {
-			methodDeclaration.scope.problemReporter().signalError(methodDeclaration.returnType.sourceStart,
-					  methodDeclaration.returnType.sourceEnd, 
-					  "Pointcuts should have an empty method body");			
-		}
-		
+		boolean containsIfPcd = false;
 		int[] pcLocation = new int[2];
 		String pointcutExpression = getStringLiteralFor("value",ajAnnotations.pointcutAnnotation,pcLocation);
 		try {
@@ -473,6 +455,9 @@ public class ValidateAtAspectJAnnotationsVisitor extends ASTVisitor {
 	        }
 			swap(onType,methodDeclaration,pcDecl);
 			pc.resolve(new EclipseScope(bindings,methodDeclaration.scope));
+			HasIfPCDVisitor ifFinder = new HasIfPCDVisitor();
+			pc.traverse(ifFinder, null);
+			containsIfPcd = ifFinder.containsIfPcd;
 		} catch(ParserException pEx) {
 			methodDeclaration.scope.problemReporter().parseError(
 					pcLocation[0] + pEx.getLocation().getStart(),
@@ -482,6 +467,30 @@ public class ValidateAtAspectJAnnotationsVisitor extends ASTVisitor {
 					pointcutExpression, 
 					new String[] {pEx.getMessage()});
 		}
+		
+		boolean returnsVoid = false;
+		boolean returnsBoolean = false;
+		if ((methodDeclaration.returnType instanceof SingleTypeReference)) {
+			SingleTypeReference retType = (SingleTypeReference) methodDeclaration.returnType;
+			if (CharOperation.equals(voidType,retType.token)) returnsVoid = true;
+			if (CharOperation.equals(booleanType,retType.token)) returnsBoolean = true;
+		} 
+		if (!returnsVoid && !containsIfPcd) {
+			methodDeclaration.scope.problemReporter().signalError(methodDeclaration.returnType.sourceStart,
+																					  methodDeclaration.returnType.sourceEnd, 
+																					  "Methods annotated with @Pointcut must return void unless the pointcut contains an if() expression");
+		}
+		if (!returnsBoolean && containsIfPcd) {
+			methodDeclaration.scope.problemReporter().signalError(methodDeclaration.returnType.sourceStart,
+																					  methodDeclaration.returnType.sourceEnd, 
+																					  "Methods annotated with @Pointcut must return boolean when the pointcut contains an if() expression");
+		}
+		
+		if (methodDeclaration.statements != null && methodDeclaration.statements.length > 0 && !containsIfPcd) {
+			methodDeclaration.scope.problemReporter().signalError(methodDeclaration.returnType.sourceStart,
+					  methodDeclaration.returnType.sourceEnd, 
+					  "Pointcuts without an if() expression should have an empty method body");			
+		}
 	}
 	
 	private void copyAllFields(MethodDeclaration from, MethodDeclaration to) {
@@ -597,4 +606,13 @@ public class ValidateAtAspectJAnnotationsVisitor extends ASTVisitor {
 			}
 		}
 	}
+	
+	private static class HasIfPCDVisitor extends AbstractPatternNodeVisitor {
+		public boolean containsIfPcd = false;
+		
+		public Object visit(IfPointcut node, Object data) {
+			containsIfPcd = true;
+			return data;
+		}
+	}
 }

weaver/src/org/aspectj/weaver/patterns/IfPointcut.java

@@ -122,13 +122,18 @@ public class IfPointcut extends Pointcut {
 	
 	public void write(DataOutputStream s) throws IOException {
 		s.writeByte(Pointcut.IF);
-		testMethod.write(s);//FIXME Adrian, do something if this one happens to be null for @style if() from JDT stuff
+		s.writeBoolean(testMethod != null);  // do we have a test method?
+		if (testMethod != null) testMethod.write(s);
 		s.writeByte(extraParameterFlags);
 		writeLocation(s);
 	}
 	public static Pointcut read(VersionedDataInputStream s, ISourceContext context) throws IOException {
-        //FIXME Adrian, read may failt if testMethod happens to be null for @style if() from JDT stuff
-		IfPointcut ret = new IfPointcut(ResolvedMemberImpl.readResolvedMember(s, context), s.readByte());
+		boolean hasTestMethod = s.readBoolean();
+		ResolvedMember resolvedTestMethod = null;  
+		if (hasTestMethod) {  // should always have a test method unless @AJ style
+			resolvedTestMethod = ResolvedMemberImpl.readResolvedMember(s, context);
+		}
+		IfPointcut ret = new IfPointcut(resolvedTestMethod, s.readByte());
 		ret.readLocation(context, s);
 		return ret;
 	}