Attachment #194881 for bug #328575

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

Lines 10-12 Link Here

(-)processors/META-INF/services/javax.annotation.processing.Processor (+1 lines)
10	org.eclipse.jdt.compiler.apt.tests.processors.typemirror.TypeMirrorProc	10	org.eclipse.jdt.compiler.apt.tests.processors.typemirror.TypeMirrorProc
11	org.eclipse.jdt.compiler.apt.tests.processors.typeutils.TypeUtilsProc	11	org.eclipse.jdt.compiler.apt.tests.processors.typeutils.TypeUtilsProc
12	org.eclipse.jdt.compiler.apt.tests.processors.negative.NegativeModelProc	12	org.eclipse.jdt.compiler.apt.tests.processors.negative.NegativeModelProc
		13	org.eclipse.jdt.compiler.apt.tests.processors.inherited.ArgsConstructorProcessor




/*******************************************************************************
 * Copyright (c) 2011 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *******************************************************************************/
package org.eclipse.jdt.compiler.apt.tests.annotations;

import java.lang.annotation.Documented;
import java.lang.annotation.Inherited;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;

import static java.lang.annotation.ElementType.TYPE;
import static java.lang.annotation.RetentionPolicy.SOURCE;

@Inherited
@Documented
@Retention(SOURCE)
@Target(TYPE)
public @interface ArgsConstructor {

	Class<?>[] value();
}




/*******************************************************************************
 * Copyright (c) 2011 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *******************************************************************************/
package org.eclipse.jdt.compiler.apt.tests.processors.inherited;

import java.util.ArrayList;
import java.util.List;
import java.util.Map.Entry;
import java.util.Set;

import javax.annotation.processing.AbstractProcessor;
import javax.annotation.processing.RoundEnvironment;
import javax.lang.model.element.Element;
import javax.lang.model.element.TypeElement;
import javax.annotation.processing.*;
import javax.lang.model.SourceVersion;
import javax.lang.model.element.*;
import javax.lang.model.type.*;
import javax.lang.model.util.SimpleTypeVisitor6;
import javax.lang.model.util.Types;
import javax.tools.Diagnostic.Kind;

import org.eclipse.jdt.compiler.apt.tests.annotations.ArgsConstructor;

@SupportedAnnotationTypes("org.eclipse.jdt.compiler.apt.tests.annotations.ArgsConstructor")
@SupportedSourceVersion(SourceVersion.RELEASE_6)
public class ArgsConstructorProcessor extends AbstractProcessor {

	@Override
	public boolean process(Set<? extends TypeElement> annotations,
			RoundEnvironment env) {

		for (TypeElement type : annotations) {
			processArgsConstructorClasses(env, type);
		}
		return true;

	}

	private void processArgsConstructorClasses(RoundEnvironment env,
			TypeElement type) {
		for (Element element : env.getElementsAnnotatedWith(type)) {
			processClass(element);
			processingEnv.getMessager().printMessage(Kind.NOTE,
					"Class " + element + " is processed");
		}
	}

	private void processClass(Element element) {

		String actionName = ArgsConstructor.class.getName();
		AnnotationValue action = null;
		for (AnnotationMirror am : processingEnv.getElementUtils()
				.getAllAnnotationMirrors(element)) {
			if (actionName.equals(am.getAnnotationType().toString())) {
				for (Entry<? extends ExecutableElement, ? extends AnnotationValue> entry : am
						.getElementValues().entrySet()) {
					if ("value".equals(entry.getKey().getSimpleName()
							.toString())) {
						action = entry.getValue();
						break;
					}

				}

			}
		}

		if (action == null) {
			processingEnv.getMessager()
					.printMessage(
							Kind.WARNING,
							"Class " + element
									+ " lacks a annotation with required args",
							element);
			return;
		}

		List<TypeMirror> mirrors = new ArrayList<TypeMirror>();
		for (Object val : (List<?>) action.getValue()) {
			AnnotationValue v = (AnnotationValue) val;
			TypeMirror m = (TypeMirror) v.getValue();
			mirrors.add(m);
		}

		if (!doesClassContainArgsConstructor(element, mirrors)) {
			String s = "";
			for (TypeMirror tm : mirrors) {
				if (!s.isEmpty()) {
					s += ",";
				}
				s += tm.toString();

			}
			processingEnv.getMessager().printMessage(
					Kind.ERROR,
					"Class " + element
							+ " lacks a public constructor with args: " + s,
					element);
		} else {
			processingEnv.getMessager().printMessage(Kind.NOTE,
					"Processed type: " + element);
		}
	}

	private boolean doesClassContainArgsConstructor(Element el,
			List<TypeMirror> annotTypes) {
		for (Element subelement : el.getEnclosedElements()) {
			if (subelement.getKind() == ElementKind.CONSTRUCTOR
					&& subelement.getModifiers().contains(Modifier.PUBLIC)) {
				TypeMirror mirror = subelement.asType();
				if (mirror.accept(argsVisitor, annotTypes))
					return true;
			}
		}
		return false;
	}

	private final TypeVisitor<Boolean, List<TypeMirror>> argsVisitor = new SimpleTypeVisitor6<Boolean, List<TypeMirror>>() {
		public Boolean visitExecutable(ExecutableType t,
				List<TypeMirror> annotatedTypes) {

			List<? extends TypeMirror> types = t.getParameterTypes();
			if (annotatedTypes.size() != types.size()) {
				return false;
			}
			Types tutil = processingEnv.getTypeUtils();

			for (int i = 0; i < types.size(); i++) {
				TypeMirror test = tutil.erasure(types.get(i));// because same
																// type bad
																// Map<String,String>
																// != Map
				TypeMirror expected = tutil.erasure(annotatedTypes.get(i));

				if (!tutil.isAssignable(expected, test)) {
					return false;
				}
			}
			return true;
		}
	};

}




/*******************************************************************************
 * Copyright (c) 2011 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *******************************************************************************/
package targets.inherited;

import java.awt.Point;

import org.eclipse.jdt.compiler.apt.tests.annotations.ArgsConstructor;

@ArgsConstructor({ Point.class })
public class TestGeneric<K extends Point> {

	public TestGeneric(K k) {
	}
}




/*******************************************************************************
 * Copyright (c) 2011 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *******************************************************************************/
package targets.inherited;

public class TestGenericChild extends TestGeneric<TestPoint> {

	public TestGenericChild(int i, TestPoint k) {
		super(k);
	}

}




/*******************************************************************************
 * Copyright (c) 2011 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *******************************************************************************/
package targets.inherited;

import java.awt.Point;

import org.eclipse.jdt.compiler.apt.tests.annotations.ArgsConstructor;

@ArgsConstructor({ Point.class })
public class TestNormal {

	public TestNormal(Point p) {
	}
}




/*******************************************************************************
 * Copyright (c) 2011 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *******************************************************************************/
package targets.inherited;

import java.awt.Point;

public class TestNormalChild extends TestNormal {

	public TestNormalChild(Point p, int i) {
		super(p);
	}
}




/*******************************************************************************
 * Copyright (c) 2011 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *******************************************************************************/
package targets.inherited;

import java.awt.Point;

public class TestPoint extends Point {

}

Lines 12-19 Link Here

(-)src/org/eclipse/jdt/compiler/apt/tests/NegativeTests.java (-3 / +52 lines)
12		12
13	package org.eclipse.jdt.compiler.apt.tests;	13	package org.eclipse.jdt.compiler.apt.tests;
14		14
		15	import java.io.ByteArrayOutputStream;
15	import java.io.File;	16	import java.io.File;
16	import java.io.IOException;	17	import java.io.IOException;
		18	import java.io.PrintWriter;
17	import java.util.ArrayList;	19	import java.util.ArrayList;
18	import java.util.Collection;	20	import java.util.Collection;
19	import java.util.Collections;	21	import java.util.Collections;
Lines 21-27 Link Here
21	import java.util.Set;	23	import java.util.Set;
22		24
23	import javax.lang.model.SourceVersion;	25	import javax.lang.model.SourceVersion;
		26	import javax.tools.Diagnostic;
		27	import javax.tools.DiagnosticListener;
24	import javax.tools.JavaCompiler;	28	import javax.tools.JavaCompiler;
		29	import javax.tools.JavaFileObject;
25	import javax.tools.ToolProvider;	30	import javax.tools.ToolProvider;
26		31
27	import junit.framework.TestCase;	32	import junit.framework.TestCase;
Lines 29-36 Link Here
29	/**	34	/**
30	* Test cases for annotation processing behavior when code contains semantic errors	35	* Test cases for annotation processing behavior when code contains semantic errors
31	*/	36	*/
32	public class NegativeTests extends TestCase	37	public class NegativeTests extends TestCase {
33	{	38	static class TestDiagnosticListener implements DiagnosticListener<JavaFileObject> {
		39	public static final int NONE = 0;
		40	public static final int ERROR = 1;
		41	public static final int INFO = 2;
		42	public static final int WARNING = 4;
		43
		44	private PrintWriter err;
		45	public int errorCounter;
		46
		47	public TestDiagnosticListener(PrintWriter err) {
		48	this.err = err;
		49	}
		50	@Override
		51	public void report(Diagnostic<? extends JavaFileObject> diagnostic) {
		52	err.println(diagnostic);
		53	switch(diagnostic.getKind()) {
		54	case ERROR :
		55	this.errorCounter++;
		56	break;
		57	}
		58	}
		59	}
		60
34	// See corresponding usages in the NegativeModelProc class	61	// See corresponding usages in the NegativeModelProc class
35	private static final String NEGATIVEMODELPROCNAME = "org.eclipse.jdt.compiler.apt.tests.processors.negative.NegativeModelProc";	62	private static final String NEGATIVEMODELPROCNAME = "org.eclipse.jdt.compiler.apt.tests.processors.negative.NegativeModelProc";
36	private static final String IGNOREJAVACBUGS = "ignoreJavacBugs";	63	private static final String IGNOREJAVACBUGS = "ignoreJavacBugs";
Lines 149-154 Link Here
149	JavaCompiler compiler = BatchTestUtils.getEclipseCompiler();	176	JavaCompiler compiler = BatchTestUtils.getEclipseCompiler();
150	internalTestNegativeModel(compiler, 9, null);	177	internalTestNegativeModel(compiler, 9, null);
151	}	178	}
		179
		180	/*
		181	* https://bugs.eclipse.org/bugs/show_bug.cgi?id=328575
		182	*/
		183	public void testNegativeModel10WithEclipseCompiler() throws IOException {
		184	JavaCompiler compiler = BatchTestUtils.getEclipseCompiler();
		185	System.clearProperty(NEGATIVEMODELPROCNAME);
		186	File targetFolder = TestUtils.concatPath(BatchTestUtils.getSrcFolderName(), "targets", "inherited");
		187	BatchTestUtils.copyResources("targets/inherited", targetFolder);
		188
		189	// Turn on the NegativeModelProc - without this, it will just return without doing anything
		190	List<String> options = new ArrayList<String>();
		191
		192	// Invoke processing by compiling the targets.model resources
		193	ByteArrayOutputStream errBuffer = new ByteArrayOutputStream();
		194	PrintWriter printWriter = new PrintWriter(errBuffer);
		195	TestDiagnosticListener diagnosticListener = new TestDiagnosticListener(printWriter);
		196	boolean success = BatchTestUtils.compileTreeWithErrors(compiler, options, targetFolder, diagnosticListener);
		197
		198	assertTrue("Compilation should have failed due to expected errors, but it didn't", !success);
		199	assertEquals("Two errors should be reported", 2, diagnosticListener.errorCounter);
		200	}
		201
152	/**	202	/**
153	* Attempt to report errors on various elements.	203	* Attempt to report errors on various elements.
154	* @throws IOException	204	* @throws IOException
Lines 168-174 Link Here
168	boolean success = BatchTestUtils.compileTreeWithErrors(compiler, options, targetFolder, null);	218	boolean success = BatchTestUtils.compileTreeWithErrors(compiler, options, targetFolder, null);
169		219
170	assertTrue("Compilation should have failed due to expected errors, but it didn't", !success);	220	assertTrue("Compilation should have failed due to expected errors, but it didn't", !success);
171
172	// If it succeeded, the processor will have set this property to "succeeded";	221	// If it succeeded, the processor will have set this property to "succeeded";
173	// if not, it will set it to an error value.	222	// if not, it will set it to an error value.
174	String property = System.getProperty(NEGATIVEMODELPROCNAME);	223	String property = System.getProperty(NEGATIVEMODELPROCNAME);

Lines 1-5 Link Here

(-)compiler/org/eclipse/jdt/internal/compiler/lookup/ParameterizedTypeBinding.java (-2 / +6 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2005, 2010 IBM Corporation and others.	2	* Copyright (c) 2005, 2011 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 438-446 Link Here
438	* @see org.eclipse.jdt.internal.compiler.lookup.ReferenceBinding#getAnnotationTagBits()	438	* @see org.eclipse.jdt.internal.compiler.lookup.ReferenceBinding#getAnnotationTagBits()
439	*/	439	*/
440	public long getAnnotationTagBits() {	440	public long getAnnotationTagBits() {
441	return this.type.getAnnotationTagBits();	441	return genericType().getAnnotationTagBits();
442	}	442	}
443		443
		444	public AnnotationBinding[] getAnnotations() {
		445	return genericType().getAnnotations();
		446	}
		447
444	public int getEnclosingInstancesSlotSize() {	448	public int getEnclosingInstancesSlotSize() {
445	return genericType().getEnclosingInstancesSlotSize();	449	return genericType().getEnclosingInstancesSlotSize();
446	}	450	}

Return to bug 328575

Added Link Here

(-)processors/org/eclipse/jdt/compiler/apt/tests/annotations/ArgsConstructor.java (+28 lines)
1	/*******************************************************************************
2	* Copyright (c) 2011 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html
7	*
8	* Contributors:
9	* IBM Corporation - initial API and implementation
10	*******************************************************************************/
11	package org.eclipse.jdt.compiler.apt.tests.annotations;
12
13	import java.lang.annotation.Documented;
14	import java.lang.annotation.Inherited;
15	import java.lang.annotation.Retention;
16	import java.lang.annotation.Target;
17
18	import static java.lang.annotation.ElementType.TYPE;
19	import static java.lang.annotation.RetentionPolicy.SOURCE;
20
21	@Inherited
22	@Documented
23	@Retention(SOURCE)
24	@Target(TYPE)
25	public @interface ArgsConstructor {
26
27	Class<?>[] value();
28	}

Added Link Here

(-)resources/targets/inherited/TestGeneric.java (+22 lines)
1	/*******************************************************************************
2	* Copyright (c) 2011 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html
7	*
8	* Contributors:
9	* IBM Corporation - initial API and implementation
10	*******************************************************************************/
11	package targets.inherited;
12
13	import java.awt.Point;
14
15	import org.eclipse.jdt.compiler.apt.tests.annotations.ArgsConstructor;
16
17	@ArgsConstructor({ Point.class })
18	public class TestGeneric<K extends Point> {
19
20	public TestGeneric(K k) {
21	}
22	}

Added Link Here

(-)resources/targets/inherited/TestNormal.java (+22 lines)
1	/*******************************************************************************
2	* Copyright (c) 2011 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html
7	*
8	* Contributors:
9	* IBM Corporation - initial API and implementation
10	*******************************************************************************/
11	package targets.inherited;
12
13	import java.awt.Point;
14
15	import org.eclipse.jdt.compiler.apt.tests.annotations.ArgsConstructor;
16
17	@ArgsConstructor({ Point.class })
18	public class TestNormal {
19
20	public TestNormal(Point p) {
21	}
22	}

Added Link Here

(-)resources/targets/inherited/TestPoint.java (+17 lines)
1	/*******************************************************************************
2	* Copyright (c) 2011 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html
7	*
8	* Contributors:
9	* IBM Corporation - initial API and implementation
10	*******************************************************************************/
11	package targets.inherited;
12
13	import java.awt.Point;
14
15	public class TestPoint extends Point {
16
17	}