Attachment #209012 for bug #365437




/*******************************************************************************
 * Copyright (c) 2000, 2012 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

	// Static initializer to specify tests subset using TESTS_* static variables
	// All specified tests which do not belong to the class are skipped...
	static {
//		TESTS_NAMES = new String[] { "testBug365437" };
//		TESTS_NUMBERS = new int[] { 297 };
//		TESTS_RANGE = new int[] { 294, -1 };
	}

		"Bla cannot be resolved to a type\n" +
		"----------\n");
}
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=365437
public void testBug365437a() {
	Map customOptions = getCompilerOptions();
	customOptions.put(CompilerOptions.OPTION_ReportUnusedPrivateMember, CompilerOptions.ERROR);
	String exclusionAnnotations = 
			"p1.PreDestroy," +
			"p1.PostConstruct";
	customOptions.put(CompilerOptions.OPTION_AnnotationsToExemptUnusedMethods, exclusionAnnotations);
	String testFiles [] = new String[] {
			"p/A.java",
			"package p;\n" +
			"import p1.*;\n" +
			"public class A {\n" +
			"	@p1.PreDestroy\n" +
			"	private void foo1(){}\n" +
			"	@PreDestroy\n" +
			"	private void foo2(){}\n" +
			"	@p1.PostConstruct\n" +
			"	private void foo1a(){}\n" +
			"	@PostConstruct\n" +
			"	private void foo2a(){}\n" +
			"	private void foo3(){}" +
			"}\n",
			"p1/PreDestroy.java",
			"package p1;\n" +
			"public @interface PreDestroy{}",
			"p1/PostConstruct.java",
			"package p1;\n" +
			"public @interface PostConstruct{}"
			};
	String expectedErrorString = 
			"----------\n" + 
			"1. ERROR in p\\A.java (at line 12)\n" + 
			"	private void foo3(){}}\n" + 
			"	             ^^^^^^\n" + 
			"The method foo3() from the type A is never used locally\n" + 
			"----------\n";
	runNegativeTest(
			true,
			testFiles,
			null, 
			customOptions,
			expectedErrorString,
			JavacTestOptions.Excuse.EclipseWarningConfiguredAsError);
}
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=365437
public void testBug365437b() {
	Map customOptions = getCompilerOptions();
	customOptions.put(CompilerOptions.OPTION_ReportUnusedPrivateMember, CompilerOptions.ERROR);
	String exclusionAnnotations = 
			"javax.annotation.PreDestroy," +
			"javax.annotation.Resource";
	customOptions.put(CompilerOptions.OPTION_AnnotationsToExemptUnusedMethods, exclusionAnnotations);
	String testFiles [] = new String[] {
			"A.java",
			"import javax.annotation.*;\n" +
			"public class A {\n" +
			"	@javax.annotation.PreDestroy\n" +
			"	private void foo1(){}\n" +
			"	@PreDestroy\n" +
			"	private void foo2(){}\n" +
			"	@javax.annotation.Resource\n" +
			"	private void foo1a(){}\n" +
			"	@Resource\n" +
			"	private void foo2a(){}\n" +
			"	@javax.annotation.PostConstruct\n" +
			"	private void foo3(){}\n" +
			"	@javax.annotation.PostConstruct\n" +
			"	@Resource\n" +
			"	private void foo3a(){}" +
			"}\n"
			};
	String expectedErrorString = 
			"----------\n" + 
			"1. ERROR in A.java (at line 12)\n" + 
			"	private void foo3(){}\n" + 
			"	             ^^^^^^\n" + 
			"The method foo3() from the type A is never used locally\n" + 
			"----------\n";
	runNegativeTest(
			true,
			testFiles,
			null, 
			customOptions,
			expectedErrorString,
			JavacTestOptions.Excuse.EclipseWarningConfiguredAsError);
}
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=365437
// test defaults
public void testBug365437c() {
	Map customOptions = getCompilerOptions();
	customOptions.put(CompilerOptions.OPTION_ReportUnusedPrivateMember, CompilerOptions.ERROR);
	String testFiles [] = new String[] {
			"A.java",
			"import javax.annotation.*;\n" +
			"public class A {\n" +
			"	@javax.annotation.PreDestroy\n" +
			"	private void foo1(){}\n" +
			"	@PreDestroy\n" +
			"	private void foo2(){}\n" +
			"	@javax.annotation.Resource\n" +
			"	private void foo1a(){}\n" +
			"	@Resource\n" +
			"	private void foo2a(){}\n" +
			"	@javax.annotation.PostConstruct\n" +
			"	private void foo3(){}\n" +
			"	@javax.annotation.PostConstruct\n" +
			"	@Resource\n" +
			"	private void foo3a(){}" +
			"}\n"
			};
	String expectedErrorString = 
			"----------\n" + 
			"1. ERROR in A.java (at line 8)\n" + 
			"	private void foo1a(){}\n" + 
			"	             ^^^^^^^\n" + 
			"The method foo1a() from the type A is never used locally\n" + 
			"----------\n" + 
			"2. ERROR in A.java (at line 10)\n" + 
			"	private void foo2a(){}\n" + 
			"	             ^^^^^^^\n" + 
			"The method foo2a() from the type A is never used locally\n" + 
			"----------\n";
	runNegativeTest(
			true,
			testFiles,
			null, 
			customOptions,
			expectedErrorString,
			JavacTestOptions.Excuse.EclipseWarningConfiguredAsError);
}
}




/*******************************************************************************
 * Copyright (c) 2000, 2012 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

	private static final Main MAIN = new Main(null/*outWriter*/, null/*errWriter*/, false/*systemExit*/, null/*options*/, null/*progress*/);

	static {
//		TESTS_NAMES = new String[] { "test311_warn_options" };
//		TESTS_NUMBERS = new int[] { 306 };
//		TESTS_RANGE = new int[] { 298, -1 };
	}

        "      allDeprecation       deprecation including inside deprecated code\n" + 
        "      allJavadoc           invalid or missing javadoc\n" + 
        "      allOver-ann          all missing @Override annotations\n" + 
        "      all-static-method    all method can be declared as static warnings\n" + 
        "      assertIdentifier   + ''assert'' used as identifier\n" + 
        "      boxing               autoboxing conversion\n" + 
        "      charConcat         + char[] in String concat\n" + 

        "      syntheticAccess      synthetic access for innerclass\n" + 
        "      tasks(<tags separated by |>) tasks identified by tags inside comments\n" + 
        "      typeHiding         + type parameter hiding another type\n" + 
        "      unavoidableGenericProblems + ignore unavoidable type safety problems\n" + 
        "                                   due to raw APIs\n" + 
        "      unchecked          + unchecked type operation\n" + 
        "      unnecessaryElse      unnecessary else clause\n" + 

        "      unusedLabel        + unused label\n" + 
        "      unusedLocal        + unread local variable\n" + 
        "      unusedPrivate      + unused private member declaration\n" + 
        "      unusedPrivateExempt(<names separated by |>) annotations mark method used\n" + 
        "      unusedThrown         unused declared thrown exception\n" + 
        "      unusedTypeArgs     + unused type arguments for method and constructor\n" + 
        "      uselessTypeCheck     unnecessary cast/instanceof operation\n" + 

			"		<argument value=\"---OUTPUT_DIR_PLACEHOLDER---\"/>\n" + 
			"	</command_line>\n" + 
			"	<options>\n" + 
			"		<option key=\"org.eclipse.jdt.core.compiler.annotation.nonnull\" value=\"org.eclipse.jdt.annotation.NonNull\"/>\n" + 
			"		<option key=\"org.eclipse.jdt.core.compiler.annotation.nonnullbydefault\" value=\"org.eclipse.jdt.annotation.NonNullByDefault\"/>\n" + 
			"		<option key=\"org.eclipse.jdt.core.compiler.annotation.nonnullisdefault\" value=\"disabled\"/>\n" + 
			"		<option key=\"org.eclipse.jdt.core.compiler.annotation.nullable\" value=\"org.eclipse.jdt.annotation.Nullable\"/>\n" + 
			"		<option key=\"org.eclipse.jdt.core.compiler.annotation.nullanalysis\" value=\"disabled\"/>\n" + 
			"		<option key=\"org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode\" value=\"disabled\"/>\n" + 
			"		<option key=\"org.eclipse.jdt.core.compiler.codegen.targetPlatform\" value=\"1.5\"/>\n" + 
			"		<option key=\"org.eclipse.jdt.core.compiler.codegen.unusedLocal\" value=\"optimize out\"/>\n" + 

			"		<option key=\"org.eclipse.jdt.core.compiler.debug.sourceFile\" value=\"generate\"/>\n" + 
			"		<option key=\"org.eclipse.jdt.core.compiler.doc.comment.support\" value=\"disabled\"/>\n" + 
			"		<option key=\"org.eclipse.jdt.core.compiler.generateClassFiles\" value=\"enabled\"/>\n" + 
			"		<option key=\"org.eclipse.jdt.core.compiler.maxProblemPerUnit\" value=\"100\"/>\n" + 
			"		<option key=\"org.eclipse.jdt.core.compiler.problem.annotationSuperInterface\" value=\"warning\"/>\n" + 
			"		<option key=\"org.eclipse.jdt.core.compiler.problem.assertIdentifier\" value=\"warning\"/>\n" + 
			"		<option key=\"org.eclipse.jdt.core.compiler.problem.autoboxing\" value=\"ignore\"/>\n" + 

			"		<option key=\"org.eclipse.jdt.core.compiler.problem.noEffectAssignment\" value=\"warning\"/>\n" + 
			"		<option key=\"org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion\" value=\"warning\"/>\n" + 
			"		<option key=\"org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral\" value=\"ignore\"/>\n" + 
			"		<option key=\"org.eclipse.jdt.core.compiler.problem.nullReference\" value=\"warning\"/>\n" + 
			"		<option key=\"org.eclipse.jdt.core.compiler.problem.nullSpecInsufficientInfo\" value=\"warning\"/>\n" + 
			"		<option key=\"org.eclipse.jdt.core.compiler.problem.nullSpecViolation\" value=\"error\"/>\n" + 
			"		<option key=\"org.eclipse.jdt.core.compiler.problem.overridingMethodWithoutSuperInvocation\" value=\"ignore\"/>\n" + 
			"		<option key=\"org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod\" value=\"warning\"/>\n" + 
			"		<option key=\"org.eclipse.jdt.core.compiler.problem.parameterAssignment\" value=\"ignore\"/>\n" + 
			"		<option key=\"org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment\" value=\"ignore\"/>\n" + 
			"		<option key=\"org.eclipse.jdt.core.compiler.problem.potentialNullReference\" value=\"ignore\"/>\n" + 
			"		<option key=\"org.eclipse.jdt.core.compiler.problem.potentialNullSpecViolation\" value=\"error\"/>\n" + 
			"		<option key=\"org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable\" value=\"ignore\"/>\n" + 
			"		<option key=\"org.eclipse.jdt.core.compiler.problem.rawTypeReference\" value=\"warning\"/>\n" + 
			"		<option key=\"org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation\" value=\"warning\"/>\n" + 
			"		<option key=\"org.eclipse.jdt.core.compiler.problem.redundantNullCheck\" value=\"ignore\"/>\n" + 
			"		<option key=\"org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments\" value=\"ignore\"/>\n" + 
			"		<option key=\"org.eclipse.jdt.core.compiler.problem.redundantSuperinterface\" value=\"ignore\"/>\n" + 

			"		<option key=\"org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation\" value=\"ignore\"/>\n" + 
			"		<option key=\"org.eclipse.jdt.core.compiler.problem.tasks\" value=\"warning\"/>\n" + 
			"		<option key=\"org.eclipse.jdt.core.compiler.problem.typeParameterHiding\" value=\"warning\"/>\n" + 
			"		<option key=\"org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems\" value=\"enabled\"/>\n" + 
			"		<option key=\"org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation\" value=\"warning\"/>\n" + 
			"		<option key=\"org.eclipse.jdt.core.compiler.problem.unclosedCloseable\" value=\"ignore\"/>\n" + 
			"		<option key=\"org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock\" value=\"ignore\"/>\n" + 

			"		<option key=\"org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete\" value=\"disabled\"/>\n" + 
			"		<option key=\"org.eclipse.jdt.core.compiler.problem.unusedPrivateMember\" value=\"warning\"/>\n" + 
			"		<option key=\"org.eclipse.jdt.core.compiler.problem.unusedTypeArgumentsForMethodInvocation\" value=\"warning\"/>\n" + 
			"		<option key=\"org.eclipse.jdt.core.compiler.problem.unusedWarningExcludedTypes\" value=\"\"/>\n" + 
			"		<option key=\"org.eclipse.jdt.core.compiler.problem.unusedWarningToken\" value=\"warning\"/>\n" + 
			"		<option key=\"org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast\" value=\"warning\"/>\n" + 
			"		<option key=\"org.eclipse.jdt.core.compiler.processAnnotations\" value=\"disabled\"/>\n" + 
			"		<option key=\"org.eclipse.jdt.core.compiler.source\" value=\"1.5\"/>\n" + 
			"		<option key=\"org.eclipse.jdt.core.compiler.taskCaseSensitive\" value=\"enabled\"/>\n" + 
			"		<option key=\"org.eclipse.jdt.core.compiler.taskPriorities\" value=\"\"/>\n" + 
			"		<option key=\"org.eclipse.jdt.core.compiler.taskTags\" value=\"\"/>\n" +  
			"	</options>\n" + 
			"	<classpaths>NORMALIZED SECTION</classpaths>\n" + 
			"	<sources>\n" + 

		"1 problem (1 warning)", 
		true);
}

// https://bugs.eclipse.org/bugs/show_bug.cgi?id=365437
// test batch compiler option to specify annotations to exclude private methods
// from unused warning
public void test311_warn_options() {
	String testFiles [] = new String[] {
			"A.java",
			"import javax.annotation.*;\n" +
			"public class A {\n" +
			"	@javax.annotation.PreDestroy\n" +
			"	private void foo1(){}\n" +
			"	@PreDestroy\n" +
			"	private void foo2(){}\n" +
			"	@javax.annotation.Resource\n" +
			"	private void foo1a(){}\n" +
			"	@Resource\n" +
			"	private void foo2a(){}\n" +
			"	@javax.annotation.PostConstruct\n" +
			"	private void foo3(){}\n" +
			"	@javax.annotation.PostConstruct\n" +
			"	@Resource\n" +
			"	private void foo3a(){}" +
			"}\n"
			};
	runConformTest(
			testFiles,
			"\"" + OUTPUT_DIR +  File.separator + "A.java\""
			+ " -sourcepath \"" + OUTPUT_DIR + "\""
			+ " -warn:unusedPrivateExempt(javax.annotation.PreDestroy|javax.annotation.Resource) -1.5 -proc:none -d \"" + OUTPUT_DIR + "\"",
			"",
			"----------\n" + 
			"1. WARNING in ---OUTPUT_DIR_PLACEHOLDER---/A.java (at line 12)\n" + 
			"	private void foo3(){}\n" + 
			"	             ^^^^^^\n" + 
			"The method foo3() from the type A is never used locally\n" + 
			"----------\n" + 
			"1 problem (1 warning)", 
			true);
}
}




/*******************************************************************************
 * Copyright (c) 2000, 2012 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

			} else if (token.equals("unusedPrivate")) { //$NON-NLS-1$
				setSeverity(CompilerOptions.OPTION_ReportUnusedPrivateMember, severity, isEnabling);
				return;
			} else if (token.startsWith("unusedPrivateExempt")) { //$NON-NLS-1$
				String unusedWarningExcludingAnnotations = Util.EMPTY_STRING;
				int start = token.indexOf('(');
				int end = token.indexOf(')');
				if (start >= 0 && end >= 0 && start < end){
					unusedWarningExcludingAnnotations = token.substring(start+1, end).trim();
					unusedWarningExcludingAnnotations = unusedWarningExcludingAnnotations.replace('|',',');
				}
				if (unusedWarningExcludingAnnotations.length() == 0){
					throw new IllegalArgumentException(this.bind("configure.invalidUnusedPrivateExempt", token)); //$NON-NLS-1$
				}
				this.options.put(
					CompilerOptions.OPTION_AnnotationsToExemptUnusedMethods,
					isEnabling ? unusedWarningExcludingAnnotations : Util.EMPTY_STRING);
				
				setSeverity(CompilerOptions.OPTION_ReportUnusedPrivateMember, severity, isEnabling);
				return;
			} else if (token.equals("unusedLabel")) { //$NON-NLS-1$
				setSeverity(CompilerOptions.OPTION_ReportUnusedLabel, severity, isEnabling);
				return;




/*******************************************************************************
 * Copyright (c) 2000, 2012 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

			case TypeIds.T_JavaLangInvokeMethodHandlePolymorphicSignature :
				tagBits |= TagBits.AnnotationPolymorphicSignature;
				break;
			case TypeIds.T_UnusedWarningExclusionAnnotation :
				tagBits |= TagBits.AnnotationToExcludeUnusedWarning;
				break;
			case TypeIds.T_JavaxAnnotationPreDestroy :
				tagBits |= TagBits.AnnotationPreDestroy;
				break;
			case TypeIds.T_ConfiguredAnnotationNullable :
				tagBits |= TagBits.AnnotationNullable;




					currentOffset += 2;
					return readTargetValue(currentOffset);
				}
				if (CharOperation.equals(typeName, ConstantPool.JAVAX_ANNOTATION_PREDESTROY)) {
					this.standardAnnotationTagBits |= TagBits.AnnotationPreDestroy;
					return currentOffset;
				}
				break;
			case 32:
				if (CharOperation.equals(typeName, ConstantPool.JAVA_LANG_ANNOTATION_RETENTION)) {

				}
				if (CharOperation.equals(typeName, ConstantPool.JAVA_LANG_ANNOTATION_INHERITED)) {
					this.standardAnnotationTagBits |= TagBits.AnnotationInherited;
					return currentOffset;
				}
				if (CharOperation.equals(typeName, ConstantPool.JAVAX_ANNOTATION_POSTCONSTRUCT)) {
					this.standardAnnotationTagBits |= TagBits.AnnotationPostConstruct;
					return currentOffset;
				}
				break;

Lines 1-5 Link Here

(-)a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/codegen/ConstantPool.java (-3 / +1 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2011 IBM Corporation and others.	2	* Copyright (c) 2000, 2012 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 248-255 Link Here
248	public static final char[] JAVA_LANG_SAFEVARARGS = "Ljava/lang/SafeVarargs;".toCharArray(); //$NON-NLS-1$	248	public static final char[] JAVA_LANG_SAFEVARARGS = "Ljava/lang/SafeVarargs;".toCharArray(); //$NON-NLS-1$
249	// java 7 java.lang.invoke.MethodHandle.invokeExact(..)/invokeGeneric(..)	249	// java 7 java.lang.invoke.MethodHandle.invokeExact(..)/invokeGeneric(..)
250	public static final char[] JAVA_LANG_INVOKE_METHODHANDLE_POLYMORPHICSIGNATURE = "Ljava/lang/invoke/MethodHandle$PolymorphicSignature;".toCharArray(); //$NON-NLS-1$	250	public static final char[] JAVA_LANG_INVOKE_METHODHANDLE_POLYMORPHICSIGNATURE = "Ljava/lang/invoke/MethodHandle$PolymorphicSignature;".toCharArray(); //$NON-NLS-1$
251	public static final char[] JAVAX_ANNOTATION_POSTCONSTRUCT = "Ljavax/annotation/PostConstruct;".toCharArray(); //$NON-NLS-1$
252	public static final char[] JAVAX_ANNOTATION_PREDESTROY = "Ljavax/annotation/PreDestroy;".toCharArray(); //$NON-NLS-1$
253		251
254	public static final char[] HashCode = "hashCode".toCharArray(); //$NON-NLS-1$	252	public static final char[] HashCode = "hashCode".toCharArray(); //$NON-NLS-1$
255	public static final char[] HashCodeSignature = "()I".toCharArray(); //$NON-NLS-1$;	253	public static final char[] HashCodeSignature = "()I".toCharArray(); //$NON-NLS-1$;

Lines 1-5 Link Here

(-)a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/CompilerOptions.java (-2 / +24 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2011 IBM Corporation and others.	2	* Copyright (c) 2000, 2012 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 157-162 Link Here
157	static final char[][] DEFAULT_NONNULL_ANNOTATION_NAME = CharOperation.splitOn('.', "org.eclipse.jdt.annotation.NonNull".toCharArray()); //$NON-NLS-1$	157	static final char[][] DEFAULT_NONNULL_ANNOTATION_NAME = CharOperation.splitOn('.', "org.eclipse.jdt.annotation.NonNull".toCharArray()); //$NON-NLS-1$
158	static final char[][] DEFAULT_NONNULLBYDEFAULT_ANNOTATION_NAME = CharOperation.splitOn('.', "org.eclipse.jdt.annotation.NonNullByDefault".toCharArray()); //$NON-NLS-1$	158	static final char[][] DEFAULT_NONNULLBYDEFAULT_ANNOTATION_NAME = CharOperation.splitOn('.', "org.eclipse.jdt.annotation.NonNullByDefault".toCharArray()); //$NON-NLS-1$
159	public static final String OPTION_NonNullIsDefault = "org.eclipse.jdt.core.compiler.annotation.nonnullisdefault"; //$NON-NLS-1$	159	public static final String OPTION_NonNullIsDefault = "org.eclipse.jdt.core.compiler.annotation.nonnullisdefault"; //$NON-NLS-1$
		160
		161	public static final String OPTION_AnnotationsToExemptUnusedMethods = "org.eclipse.jdt.core.compiler.problem.annotationsToExemptUnusedPrivateMethods"; //$NON-NLS-1$
160	/**	162	/**
161	* Possible values for configurable options	163	* Possible values for configurable options
162	*/	164	*/
Lines 388-393 Link Here
388	public boolean includeNullInfoFromAsserts;	390	public boolean includeNullInfoFromAsserts;
389	/** Controls whether forced generic type problems get reported */	391	/** Controls whether forced generic type problems get reported */
390	public boolean reportUnavoidableGenericTypeProblems;	392	public boolean reportUnavoidableGenericTypeProblems;
		393	/** Private methods tagged with these annotation types will not be reported as unused */
		394	public char[][] annotationsToExcludeUnusedMethods;
391		395
392	// === Support for Null Annotations: ===	396	// === Support for Null Annotations: ===
393	/** Master switch for null analysis based on annotations: */	397	/** Master switch for null analysis based on annotations: */
Lines 780-786 Link Here
780	OPTION_ReportNullSpecViolation,	784	OPTION_ReportNullSpecViolation,
781	OPTION_ReportPotentialNullSpecViolation,	785	OPTION_ReportPotentialNullSpecViolation,
782	OPTION_ReportNullSpecInsufficientInfo,	786	OPTION_ReportNullSpecInsufficientInfo,
783	OPTION_ReportRedundantNullAnnotation	787	OPTION_ReportRedundantNullAnnotation,
		788	OPTION_AnnotationsToExemptUnusedMethods
784	};	789	};
785	return result;	790	return result;
786	}	791	}
Lines 1072-1077 Link Here
1072	optionsMap.put(OPTION_NullableAnnotationName, String.valueOf(CharOperation.concatWith(this.nullableAnnotationName, '.')));	1077	optionsMap.put(OPTION_NullableAnnotationName, String.valueOf(CharOperation.concatWith(this.nullableAnnotationName, '.')));
1073	optionsMap.put(OPTION_NonNullAnnotationName, String.valueOf(CharOperation.concatWith(this.nonNullAnnotationName, '.')));	1078	optionsMap.put(OPTION_NonNullAnnotationName, String.valueOf(CharOperation.concatWith(this.nonNullAnnotationName, '.')));
1074	optionsMap.put(OPTION_NonNullByDefaultAnnotationName, String.valueOf(CharOperation.concatWith(this.nonNullByDefaultAnnotationName, '.')));	1079	optionsMap.put(OPTION_NonNullByDefaultAnnotationName, String.valueOf(CharOperation.concatWith(this.nonNullByDefaultAnnotationName, '.')));
		1080	optionsMap.put(OPTION_AnnotationsToExemptUnusedMethods, this.annotationsToExcludeUnusedMethods == null ? Util.EMPTY_STRING : new String(CharOperation.concatWith(this.annotationsToExcludeUnusedMethods,',')));
1075	if (this.defaultNonNullness == TagBits.AnnotationNonNull)	1081	if (this.defaultNonNullness == TagBits.AnnotationNonNull)
1076	optionsMap.put(OPTION_NonNullIsDefault, CompilerOptions.ENABLED);	1082	optionsMap.put(OPTION_NonNullIsDefault, CompilerOptions.ENABLED);
1077	else	1083	else
Lines 1232-1237 Link Here
1232	this.nonNullAnnotationName = DEFAULT_NONNULL_ANNOTATION_NAME;	1238	this.nonNullAnnotationName = DEFAULT_NONNULL_ANNOTATION_NAME;
1233	this.nonNullByDefaultAnnotationName = DEFAULT_NONNULLBYDEFAULT_ANNOTATION_NAME;	1239	this.nonNullByDefaultAnnotationName = DEFAULT_NONNULLBYDEFAULT_ANNOTATION_NAME;
1234	this.defaultNonNullness = 0;	1240	this.defaultNonNullness = 0;
		1241
		1242	this.annotationsToExcludeUnusedMethods = new char[][] {
		1243	"javax.annotation.PreDestroy".toCharArray(), //$NON-NLS-1$
		1244	"javax.annotation.PostConstruct".toCharArray() //$NON-NLS-1$
		1245	};
1235	}	1246	}
1236		1247
1237	public void set(Map optionsMap) {	1248	public void set(Map optionsMap) {
Lines 1548-1553 Link Here
1548	this.defaultNonNullness = 0;	1559	this.defaultNonNullness = 0;
1549	}	1560	}
1550	}	1561	}
		1562
		1563	if ((optionValue = optionsMap.get(OPTION_AnnotationsToExemptUnusedMethods)) != null) {
		1564	if (optionValue instanceof String) {
		1565	String stringValue = (String) optionValue;
		1566	if (stringValue.length() == 0) {
		1567	this.annotationsToExcludeUnusedMethods = null;
		1568	} else {
		1569	this.annotationsToExcludeUnusedMethods = CharOperation.splitAndTrimOn(',', stringValue.toCharArray());
		1570	}
		1571	}
		1572	}
1551		1573
1552	// Javadoc options	1574	// Javadoc options
1553	if ((optionValue = optionsMap.get(OPTION_DocCommentSupport)) != null) {	1575	if ((optionValue = optionsMap.get(OPTION_DocCommentSupport)) != null) {




/*******************************************************************************
 * Copyright (c) 2000, 2012 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

		count++;
	if ((annotationTagBits & TagBits.AnnotationSafeVarargs) != 0)
		count++;
	if ((annotationTagBits & TagBits.AnnotationPostConstruct) != 0)
		count++;
	if ((annotationTagBits & TagBits.AnnotationPreDestroy) != 0)
		count++;
	// count must be different from 0

	int index = recordedAnnotations.length;

		result[index++] = buildMarkerAnnotationForMemberType(TypeConstants.JAVA_LANG_INVOKE_METHODHANDLE_$_POLYMORPHICSIGNATURE, env);
	if ((annotationTagBits & TagBits.AnnotationSafeVarargs) != 0)
		result[index++] = buildMarkerAnnotation(TypeConstants.JAVA_LANG_SAFEVARARGS, env);
	if ((annotationTagBits & TagBits.AnnotationPostConstruct) != 0)
		result[index++] = buildMarkerAnnotation(TypeConstants.JAVAX_ANNOTATION_POSTCONSTRUCT, env);
	if ((annotationTagBits & TagBits.AnnotationPreDestroy) != 0)
		result[index++] = buildMarkerAnnotation(TypeConstants.JAVAX_ANNOTATION_PREDESTROY, env);
	return result;
}


Lines 1-5 Link Here

(-)a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/BinaryTypeBinding.java (-2 / +2 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2011 IBM Corporation and others.	2	* Copyright (c) 2000, 2012 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 147-153 Link Here
147	*/	147	*/
148	public BinaryTypeBinding(PackageBinding packageBinding, IBinaryType binaryType, LookupEnvironment environment) {	148	public BinaryTypeBinding(PackageBinding packageBinding, IBinaryType binaryType, LookupEnvironment environment) {
149	this.compoundName = CharOperation.splitOn('/', binaryType.getName());	149	this.compoundName = CharOperation.splitOn('/', binaryType.getName());
150	computeId();	150	computeId(environment);
151		151
152	this.tagBits \|= TagBits.IsBinaryBinding;	152	this.tagBits \|= TagBits.IsBinaryBinding;
153	this.environment = environment;	153	this.environment = environment;

Lines 1-5 Link Here

(-)a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/LookupEnvironment.java (-1 / +5 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2011 IBM Corporation and others.	2	* Copyright (c) 2000, 2012 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 1080-1085 Link Here
1080	return packageBinding.getType0(compoundName[compoundName.length - 1]);	1080	return packageBinding.getType0(compoundName[compoundName.length - 1]);
1081	}	1081	}
1082		1082
		1083	public char[][] getUnusedWarningExclusionAnnotations() {
		1084	return this.globalOptions.annotationsToExcludeUnusedMethods;
		1085	}
		1086
1083	public char[][] getNullableAnnotationName() {	1087	public char[][] getNullableAnnotationName() {
1084	return this.globalOptions.nullableAnnotationName;	1088	return this.globalOptions.nullableAnnotationName;
1085	}	1089	}

Lines 1-5 Link Here

(-)a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/MissingTypeBinding.java (-2 / +2 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2008 IBM Corporation and others.	2	* Copyright (c) 2000, 2012 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 26-32 Link Here
26	*/	26	*/
27	public MissingTypeBinding(PackageBinding packageBinding, char[][] compoundName, LookupEnvironment environment) {	27	public MissingTypeBinding(PackageBinding packageBinding, char[][] compoundName, LookupEnvironment environment) {
28	this.compoundName = compoundName;	28	this.compoundName = compoundName;
29	computeId();	29	computeId(environment);
30	this.tagBits \|= TagBits.IsBinaryBinding \| TagBits.HierarchyHasProblems \| TagBits.HasMissingType;	30	this.tagBits \|= TagBits.IsBinaryBinding \| TagBits.HierarchyHasProblems \| TagBits.HasMissingType;
31	this.environment = environment;	31	this.environment = environment;
32	this.fPackage = packageBinding;	32	this.fPackage = packageBinding;




/*******************************************************************************
 * Copyright (c) 2000, 2012 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

import java.util.Comparator;

import org.eclipse.jdt.core.compiler.CharOperation;
import org.eclipse.jdt.core.compiler.IProblem;
import org.eclipse.jdt.internal.compiler.ast.MethodDeclaration;
import org.eclipse.jdt.internal.compiler.classfmt.ClassFileConstants;
import org.eclipse.jdt.internal.compiler.problem.ProblemSeverities;
import org.eclipse.jdt.internal.compiler.util.SimpleLookupTable;

/*

	return result;
}

public void computeId(LookupEnvironment env) {
	char[][] unusedWarningExclusionAnnotations = env.getUnusedWarningExclusionAnnotations();
	if (env.problemReporter.computeSeverity(IProblem.UnusedPrivateMethod) != ProblemSeverities.Ignore
			&& unusedWarningExclusionAnnotations != null) {
		int len = unusedWarningExclusionAnnotations.length;
		for (int i = 0; i < len; i++) {
			if (CharOperation.equals(CharOperation.concatWith(this.compoundName,'.'), unusedWarningExclusionAnnotations[i]))
				this.id = TypeIds.T_UnusedWarningExclusionAnnotation;
		}
	}
	// try to avoid multiple checks against a package/type name
	switch (this.compoundName.length) {

		case 3 :
			if (!CharOperation.equals(TypeConstants.JAVA, this.compoundName[0]))
					&& !CharOperation.equals(TypeConstants.JAVAX, this.compoundName[0]))
				return;
			
			char[] packageName = this.compoundName[1];
			if (packageName.length == 0) return; // just to be safe
			char[] typeName = this.compoundName[2];
			if (typeName.length == 0) return; // just to be safe
			
			if (CharOperation.equals(TypeConstants.JAVAX, this.compoundName[0])) {
				if (CharOperation.equals(TypeConstants.ANNOTATION, this.compoundName[1])) {
					switch (typeName[0]) {
						case 'P' :
							if (CharOperation.equals(typeName, TypeConstants.JAVAX_ANNOTATION_POSTCONSTRUCT[2]))
								this.id = TypeIds.T_JavaxAnnotationPostConstruct;
							if (CharOperation.equals(typeName, TypeConstants.JAVAX_ANNOTATION_PREDESTROY[2]))
								this.id = TypeIds.T_JavaxAnnotationPreDestroy;
							return;
					}
				}
				return;
			}
			if (!CharOperation.equals(TypeConstants.LANG, this.compoundName[1])) {
				switch (packageName[0]) {
					case 'i' :

Lines 1-5 Link Here

(-)a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/SourceTypeBinding.java (-2 / +2 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2011 IBM Corporation and others.	2	* Copyright (c) 2000, 2012 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 72-78 Link Here
72	this.fields = Binding.UNINITIALIZED_FIELDS;	72	this.fields = Binding.UNINITIALIZED_FIELDS;
73	this.methods = Binding.UNINITIALIZED_METHODS;	73	this.methods = Binding.UNINITIALIZED_METHODS;
74		74
75	computeId();	75	computeId(scope.environment());
76	}	76	}
77		77
78	private void addDefaultAbstractMethods() {	78	private void addDefaultAbstractMethods() {




/*******************************************************************************
 * Copyright (c) 2000, 2012 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

	/** @since 3.7 - java 7 MethodHandle.invokeExact(..)/invokeGeneric(..)*/
	long AnnotationPolymorphicSignature = ASTNode.Bit53L;
	/** @since 3.8 */
	long AnnotationToExcludeUnusedWarning = ASTNode.Bit54L;
	/** @since 3.8 */
	long AnnotationPostConstruct = ASTNode.Bit55L;
	/** @since 3.8 null annotation for MethodBinding or LocalVariableBinding (argument): */
	long AnnotationNullable = ASTNode.Bit56L;
	/** @since 3.8 null annotation for MethodBinding or LocalVariableBinding (argument): */

				| AnnotationSuppressWarnings
				| AnnotationSafeVarargs
				| AnnotationPolymorphicSignature
				| AnnotationToExcludeUnusedWarning
				| AnnotationPreDestroy
				| AnnotationNullable
				| AnnotationNonNull
				| AnnotationNonNullByDefault




/*******************************************************************************
 * Copyright (c) 2000, 2012 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

	char[] SYNTHETIC_ACCESS_METHOD_PREFIX =  "access$".toCharArray(); //$NON-NLS-1$
	char[] SYNTHETIC_ENUM_CONSTANT_INITIALIZATION_METHOD_PREFIX =  " enum constant initialization$".toCharArray(); //$NON-NLS-1$
	char[] SYNTHETIC_STATIC_FACTORY =  "<factory>".toCharArray(); //$NON-NLS-1$
	char[][] JAVAX_ANNOTATION_POSTCONSTRUCT =
			new char[][] {
				JAVAX,
				ANNOTATION,
				"PostConstruct".toCharArray() //$NON-NLS-1$
			};
	char[][] JAVAX_ANNOTATION_PREDESTROY =
			new char[][] {
				JAVAX,
				ANNOTATION,
				"PreDestroy".toCharArray() //$NON-NLS-1$
			};

	// synthetic package-info name
	public static final char[] PACKAGE_INFO_NAME = "package-info".toCharArray(); //$NON-NLS-1$




/*******************************************************************************
 * Copyright (c) 2000, 2012 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

	final int T_JavaLangAutoCloseable = 62;

	// new in 3.8
	final int T_UnusedWarningExclusionAnnotation = 63;

	final int T_JavaxAnnotationPreDestroy = 64;
	
	// new in 3.8 for null annotations:
	final int T_ConfiguredAnnotationNullable = 64;
	final int T_ConfiguredAnnotationNonNull = 65;
	final int T_ConfiguredAnnotationNonNullByDefault = 66;

	final int NoId = Integer.MAX_VALUE;


Lines 1-5 Link Here

(-)a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/problem/ProblemReporter.java (-3 / +4 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2011 IBM Corporation and others.	2	* Copyright (c) 2000, 2012 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 7691-7698 Link Here
7691	&& CharOperation.equals(method.selector, TypeConstants.WRITEREPLACE)) {	7691	&& CharOperation.equals(method.selector, TypeConstants.WRITEREPLACE)) {
7692	return;	7692	return;
7693	}	7693	}
7694	if ((method.tagBits & (TagBits.AnnotationPostConstruct \| TagBits.AnnotationPreDestroy)) != 0) {	7694
7695	// PostConstruct and PreDestroy method are ignored	7695	if ((method.tagBits & TagBits.AnnotationToExcludeUnusedWarning) != 0) {
		7696	// method tagged with annotation that excludes the method from unused warning
7696	return;	7697	return;
7697	}	7698	}
7698	this.handle(	7699	this.handle(




/*******************************************************************************
 * Copyright (c) 2000, 2012 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

	 */
	public static final String COMPILER_PB_UNUSED_PRIVATE_MEMBER = PLUGIN_ID + ".compiler.problem.unusedPrivateMember"; //$NON-NLS-1$
	/**
	 * Compiler option ID: Annotations that exempt a private method from being reported as unused.
	 * <p>When the {@link #COMPILER_PB_UNUSED_PRIVATE_MEMBER} is enabled, the compiler will not report
	 *    private methods that are declared with these annotations, even if the method is otherwise unused.
	 * <dl>
	 * <dt>Option id:</dt><dd><code>"org.eclipse.jdt.core.compiler.problem.annotationsToExemptUnusedPrivateMethods"</code></dd>
	 * <dt>Possible values:</dt><dd>Fully qualified annotation type names</dd>
	 * <dt>Default:</dt><dd><code>javax.annotation.PreDestroy, javax.annotation.PostConstruct</code></dd>
	 * </dl>
	 * @since 3.8
	 * @category CompilerOptionID
	 */
	public static final String COMPILER_ANNOTATIONS_TO_EXEMPT_UNUSED_PRIVATE_METHOD = PLUGIN_ID + ".compiler.problem.annotationsToExemptUnusedPrivateMethods"; //$NON-NLS-1$
	/**
	 * Compiler option ID: Reporting Local Variable Declaration Hiding another Variable.
	 * <p>When enabled, the compiler will issue an error or a warning whenever a local variable
	 *    declaration is hiding some field or local variable (either locally, inherited or defined in enclosing type).




/*******************************************************************************
 * Copyright (c) 2000, 2012 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

	}
	if ((tagBits & TagBits.AnnotationSafeVarargs) != 0) {
		annotations.add(getAnnotation(TypeConstants.JAVA_LANG_SAFEVARARGS));
	}
	if ((tagBits & TagBits.AnnotationPostConstruct) != 0) {
		annotations.add(getAnnotation(TypeConstants.JAVAX_ANNOTATION_POSTCONSTRUCT));
	}
	if ((tagBits & TagBits.AnnotationPreDestroy) != 0) {
		annotations.add(getAnnotation(TypeConstants.JAVAX_ANNOTATION_PREDESTROY));
	}
	// note that JAVA_LANG_SUPPRESSWARNINGS and JAVA_LANG_OVERRIDE cannot appear in binaries
	return (IAnnotation[]) annotations.toArray(new IAnnotation[annotations.size()]);




/*******************************************************************************
 * Copyright (c) 2000, 2012 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

	}
	if ((tagBits & TagBits.AnnotationSafeVarargs) != 0) {
		generateStandardAnnotation(javaElement, TypeConstants.JAVA_LANG_SAFEVARARGS, Annotation.NO_MEMBER_VALUE_PAIRS, newElements);
	}
	if ((tagBits & TagBits.AnnotationPostConstruct) != 0) {
		generateStandardAnnotation(javaElement, TypeConstants.JAVAX_ANNOTATION_POSTCONSTRUCT, Annotation.NO_MEMBER_VALUE_PAIRS, newElements);
	}
	if ((tagBits & TagBits.AnnotationPreDestroy) != 0) {
		generateStandardAnnotation(javaElement, TypeConstants.JAVAX_ANNOTATION_PREDESTROY, Annotation.NO_MEMBER_VALUE_PAIRS, newElements);
	}
	// note that JAVA_LANG_SUPPRESSWARNINGS and JAVA_LANG_OVERRIDE cannot appear in binaries
}




/*******************************************************************************
 * Copyright (c) 2000, 2012 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

		if ((annotationTagBits & TagBits.AnnotationPolymorphicSignature) != 0) {
			char[][] compoundName =
					TypeConstants.JAVA_LANG_INVOKE_METHODHANDLE_$_POLYMORPHICSIGNATURE;
			addAnnotationTypeReference(compoundName[compoundName.length-1]);
		}
		if ((annotationTagBits & TagBits.AnnotationPostConstruct) != 0) {
			char[][] compoundName = TypeConstants.JAVAX_ANNOTATION_POSTCONSTRUCT;
			addAnnotationTypeReference(compoundName[compoundName.length-1]);
		}
		if ((annotationTagBits & TagBits.AnnotationPreDestroy) != 0) {
			char[][] compoundName = TypeConstants.JAVAX_ANNOTATION_PREDESTROY;
			addAnnotationTypeReference(compoundName[compoundName.length-1]);
		}
	}




/*******************************************************************************
 * Copyright (c) 2000, 2012 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

	}
	if ((annotationTagBits & TagBits.AnnotationPolymorphicSignature) != 0) {
		char[][] compoundName = TypeConstants.JAVA_LANG_INVOKE_METHODHANDLE_$_POLYMORPHICSIGNATURE;
		if (checkAnnotationTypeReference(CharOperation.concatWith(compoundName, '.'), pattern)) {
			return true;
		}
	}
	if ((annotationTagBits & TagBits.AnnotationPostConstruct) != 0) {
		char[][] compoundName = TypeConstants.JAVAX_ANNOTATION_POSTCONSTRUCT;
		if (checkAnnotationTypeReference(CharOperation.concatWith(compoundName, '.'), pattern)) {
			return true;
		}
	}
	if ((annotationTagBits & TagBits.AnnotationPreDestroy) != 0) {
		char[][] compoundName = TypeConstants.JAVAX_ANNOTATION_PREDESTROY;
		if (checkAnnotationTypeReference(CharOperation.concatWith(compoundName, '.'), pattern)) {
			return true;
		}

Return to bug 365437

Lines 303-312 Link Here

(-)a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/classfmt/AnnotationInfo.java (-8 lines)
303	currentOffset += 2;	303	currentOffset += 2;
304	return readTargetValue(currentOffset);	304	return readTargetValue(currentOffset);
305	}	305	}
306	if (CharOperation.equals(typeName, ConstantPool.JAVAX_ANNOTATION_PREDESTROY)) {
307	this.standardAnnotationTagBits \|= TagBits.AnnotationPreDestroy;
308	return currentOffset;
309	}
310	break;	306	break;
311	case 32:	307	case 32:
312	if (CharOperation.equals(typeName, ConstantPool.JAVA_LANG_ANNOTATION_RETENTION)) {	308	if (CharOperation.equals(typeName, ConstantPool.JAVA_LANG_ANNOTATION_RETENTION)) {
Lines 315-324 Link Here
315	}	311	}
316	if (CharOperation.equals(typeName, ConstantPool.JAVA_LANG_ANNOTATION_INHERITED)) {	312	if (CharOperation.equals(typeName, ConstantPool.JAVA_LANG_ANNOTATION_INHERITED)) {
317	this.standardAnnotationTagBits \|= TagBits.AnnotationInherited;	313	this.standardAnnotationTagBits \|= TagBits.AnnotationInherited;
318	return currentOffset;
319	}
320	if (CharOperation.equals(typeName, ConstantPool.JAVAX_ANNOTATION_POSTCONSTRUCT)) {
321	this.standardAnnotationTagBits \|= TagBits.AnnotationPostConstruct;
322	return currentOffset;	314	return currentOffset;
323	}	315	}
324	break;	316	break;

Lines 1-5 Link Here

(-)a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/AnnotationTest.java (-2 / +133 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2011 IBM Corporation and others.	2	* Copyright (c) 2000, 2012 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 47-53 Link Here
47	// Static initializer to specify tests subset using TESTS_* static variables	47	// Static initializer to specify tests subset using TESTS_* static variables
48	// All specified tests which do not belong to the class are skipped...	48	// All specified tests which do not belong to the class are skipped...
49	static {	49	static {
50	// TESTS_NAMES = new String[] { "test293" };	50	// TESTS_NAMES = new String[] { "testBug365437" };
51	// TESTS_NUMBERS = new int[] { 297 };	51	// TESTS_NUMBERS = new int[] { 297 };
52	// TESTS_RANGE = new int[] { 294, -1 };	52	// TESTS_RANGE = new int[] { 294, -1 };
53	}	53	}
Lines 10148-10151 Link Here
10148	"Bla cannot be resolved to a type\n" +	10148	"Bla cannot be resolved to a type\n" +
10149	"----------\n");	10149	"----------\n");
10150	}	10150	}
		10151	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=365437
		10152	public void testBug365437a() {
		10153	Map customOptions = getCompilerOptions();
		10154	customOptions.put(CompilerOptions.OPTION_ReportUnusedPrivateMember, CompilerOptions.ERROR);
		10155	String exclusionAnnotations =
		10156	"p1.PreDestroy," +
		10157	"p1.PostConstruct";
		10158	customOptions.put(CompilerOptions.OPTION_AnnotationsToExemptUnusedMethods, exclusionAnnotations);
		10159	String testFiles [] = new String[] {
		10160	"p/A.java",
		10161	"package p;\n" +
		10162	"import p1.*;\n" +
		10163	"public class A {\n" +
		10164	" @p1.PreDestroy\n" +
		10165	" private void foo1(){}\n" +
		10166	" @PreDestroy\n" +
		10167	" private void foo2(){}\n" +
		10168	" @p1.PostConstruct\n" +
		10169	" private void foo1a(){}\n" +
		10170	" @PostConstruct\n" +
		10171	" private void foo2a(){}\n" +
		10172	" private void foo3(){}" +
		10173	"}\n",
		10174	"p1/PreDestroy.java",
		10175	"package p1;\n" +
		10176	"public @interface PreDestroy{}",
		10177	"p1/PostConstruct.java",
		10178	"package p1;\n" +
		10179	"public @interface PostConstruct{}"
		10180	};
		10181	String expectedErrorString =
		10182	"----------\n" +
		10183	"1. ERROR in p\\A.java (at line 12)\n" +
		10184	" private void foo3(){}}\n" +
		10185	" ^^^^^^\n" +
		10186	"The method foo3() from the type A is never used locally\n" +
		10187	"----------\n";
		10188	runNegativeTest(
		10189	true,
		10190	testFiles,
		10191	null,
		10192	customOptions,
		10193	expectedErrorString,
		10194	JavacTestOptions.Excuse.EclipseWarningConfiguredAsError);
		10195	}
		10196	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=365437
		10197	public void testBug365437b() {
		10198	Map customOptions = getCompilerOptions();
		10199	customOptions.put(CompilerOptions.OPTION_ReportUnusedPrivateMember, CompilerOptions.ERROR);
		10200	String exclusionAnnotations =
		10201	"javax.annotation.PreDestroy," +
		10202	"javax.annotation.Resource";
		10203	customOptions.put(CompilerOptions.OPTION_AnnotationsToExemptUnusedMethods, exclusionAnnotations);
		10204	String testFiles [] = new String[] {
		10205	"A.java",
		10206	"import javax.annotation.*;\n" +
		10207	"public class A {\n" +
		10208	" @javax.annotation.PreDestroy\n" +
		10209	" private void foo1(){}\n" +
		10210	" @PreDestroy\n" +
		10211	" private void foo2(){}\n" +
		10212	" @javax.annotation.Resource\n" +
		10213	" private void foo1a(){}\n" +
		10214	" @Resource\n" +
10215	" private void foo2a(){}\n" +
10216	" @javax.annotation.PostConstruct\n" +
10217	" private void foo3(){}\n" +
10218	" @javax.annotation.PostConstruct\n" +
10219	" @Resource\n" +
10220	" private void foo3a(){}" +
10221	"}\n"
10222	};
10223	String expectedErrorString =
10224	"----------\n" +
10225	"1. ERROR in A.java (at line 12)\n" +
10226	" private void foo3(){}\n" +
10227	" ^^^^^^\n" +
10228	"The method foo3() from the type A is never used locally\n" +
10229	"----------\n";
10230	runNegativeTest(
10231	true,
10232	testFiles,
10233	null,
10234	customOptions,
10235	expectedErrorString,
10236	JavacTestOptions.Excuse.EclipseWarningConfiguredAsError);
10237	}
10238	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=365437
10239	// test defaults
10240	public void testBug365437c() {
10241	Map customOptions = getCompilerOptions();
10242	customOptions.put(CompilerOptions.OPTION_ReportUnusedPrivateMember, CompilerOptions.ERROR);
10243	String testFiles [] = new String[] {
10244	"A.java",
10245	"import javax.annotation.*;\n" +
10246	"public class A {\n" +
10247	" @javax.annotation.PreDestroy\n" +
10248	" private void foo1(){}\n" +
10249	" @PreDestroy\n" +
10250	" private void foo2(){}\n" +
10251	" @javax.annotation.Resource\n" +
10252	" private void foo1a(){}\n" +
10253	" @Resource\n" +
10254	" private void foo2a(){}\n" +
10255	" @javax.annotation.PostConstruct\n" +
10256	" private void foo3(){}\n" +
10257	" @javax.annotation.PostConstruct\n" +
10258	" @Resource\n" +
10259	" private void foo3a(){}" +
10260	"}\n"
10261	};
10262	String expectedErrorString =
10263	"----------\n" +
10264	"1. ERROR in A.java (at line 8)\n" +
10265	" private void foo1a(){}\n" +
10266	" ^^^^^^^\n" +
10267	"The method foo1a() from the type A is never used locally\n" +
10268	"----------\n" +
10269	"2. ERROR in A.java (at line 10)\n" +
10270	" private void foo2a(){}\n" +
10271	" ^^^^^^^\n" +
10272	"The method foo2a() from the type A is never used locally\n" +
10273	"----------\n";
10274	runNegativeTest(
10275	true,
10276	testFiles,
10277	null,
10278	customOptions,
10279	expectedErrorString,
10280	JavacTestOptions.Excuse.EclipseWarningConfiguredAsError);
10281	}
10151	}	10282	}

Lines 1-5 Link Here

(-)a/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/Main.java (-1 / +18 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2011 IBM Corporation and others.	2	* Copyright (c) 2000, 2012 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 3535-3540 Link Here
3535	} else if (token.equals("unusedPrivate")) { //$NON-NLS-1$	3535	} else if (token.equals("unusedPrivate")) { //$NON-NLS-1$
3536	setSeverity(CompilerOptions.OPTION_ReportUnusedPrivateMember, severity, isEnabling);	3536	setSeverity(CompilerOptions.OPTION_ReportUnusedPrivateMember, severity, isEnabling);
3537	return;	3537	return;
		3538	} else if (token.startsWith("unusedPrivateExempt")) { //$NON-NLS-1$
		3539	String unusedWarningExcludingAnnotations = Util.EMPTY_STRING;
		3540	int start = token.indexOf('(');
		3541	int end = token.indexOf(')');
		3542	if (start >= 0 && end >= 0 && start < end){
		3543	unusedWarningExcludingAnnotations = token.substring(start+1, end).trim();
		3544	unusedWarningExcludingAnnotations = unusedWarningExcludingAnnotations.replace('\|',',');
		3545	}
		3546	if (unusedWarningExcludingAnnotations.length() == 0){
		3547	throw new IllegalArgumentException(this.bind("configure.invalidUnusedPrivateExempt", token)); //$NON-NLS-1$
		3548	}
		3549	this.options.put(
		3550	CompilerOptions.OPTION_AnnotationsToExemptUnusedMethods,
		3551	isEnabling ? unusedWarningExcludingAnnotations : Util.EMPTY_STRING);
		3552
		3553	setSeverity(CompilerOptions.OPTION_ReportUnusedPrivateMember, severity, isEnabling);
		3554	return;
3538	} else if (token.equals("unusedLabel")) { //$NON-NLS-1$	3555	} else if (token.equals("unusedLabel")) { //$NON-NLS-1$
3539	setSeverity(CompilerOptions.OPTION_ReportUnusedLabel, severity, isEnabling);	3556	setSeverity(CompilerOptions.OPTION_ReportUnusedLabel, severity, isEnabling);
3540	return;	3557	return;

Lines 82-87 Link Here

(-)a/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/messages.properties (+2 lines)
82	configure.unsupportedEncoding = unsupported encoding format: {0}	82	configure.unsupportedEncoding = unsupported encoding format: {0}
83	configure.duplicateDefaultEncoding = duplicate default encoding format specification: {0}	83	configure.duplicateDefaultEncoding = duplicate default encoding format specification: {0}
84	configure.invalidTaskTag ={0} is an invalid task tag	84	configure.invalidTaskTag ={0} is an invalid task tag
		85	configure.invalidUnusedPrivateExempt = fully qualified annotation type names expected
85	configure.incorrectExtDirsEntry = incorrect ext dir entry; {0} must be a directory	86	configure.incorrectExtDirsEntry = incorrect ext dir entry; {0} must be a directory
86	configure.incorrectEndorsedDirsEntry = incorrect endorsed dir entry; {0} must be a directory	87	configure.incorrectEndorsedDirsEntry = incorrect endorsed dir entry; {0} must be a directory
87	configure.duplicateEndorsedDirs = duplicate endorseddirs specification: {0}	88	configure.duplicateEndorsedDirs = duplicate endorseddirs specification: {0}
Lines 340-345 Link Here
340	\ unusedLabel + unused label\n\	341	\ unusedLabel + unused label\n\
341	\ unusedLocal + unread local variable\n\	342	\ unusedLocal + unread local variable\n\
342	\ unusedPrivate + unused private member declaration\n\	343	\ unusedPrivate + unused private member declaration\n\
		344	\ unusedPrivateExempt(<names separated by \|>) annotations mark method used\n\
343	\ unusedThrown unused declared thrown exception\n\	345	\ unusedThrown unused declared thrown exception\n\
344	\ unusedTypeArgs + unused type arguments for method and constructor\n\	346	\ unusedTypeArgs + unused type arguments for method and constructor\n\
345	\ uselessTypeCheck unnecessary cast/instanceof operation\n\	347	\ uselessTypeCheck unnecessary cast/instanceof operation\n\

Lines 1-5 Link Here

(-)a/org.eclipse.jdt.core/model/org/eclipse/jdt/core/JavaCore.java (-1 / +14 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2011 IBM Corporation and others.	2	* Copyright (c) 2000, 2012 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 624-629 Link Here
624	*/	624	*/
625	public static final String COMPILER_PB_UNUSED_PRIVATE_MEMBER = PLUGIN_ID + ".compiler.problem.unusedPrivateMember"; //$NON-NLS-1$	625	public static final String COMPILER_PB_UNUSED_PRIVATE_MEMBER = PLUGIN_ID + ".compiler.problem.unusedPrivateMember"; //$NON-NLS-1$
626	/**	626	/**
		627	* Compiler option ID: Annotations that exempt a private method from being reported as unused.
		628	* <p>When the {@link #COMPILER_PB_UNUSED_PRIVATE_MEMBER} is enabled, the compiler will not report
		629	* private methods that are declared with these annotations, even if the method is otherwise unused.
		630	* <dl>
		631	* <dt>Option id:</dt><dd><code>"org.eclipse.jdt.core.compiler.problem.annotationsToExemptUnusedPrivateMethods"</code></dd>
		632	* <dt>Possible values:</dt><dd>Fully qualified annotation type names</dd>
		633	* <dt>Default:</dt><dd><code>javax.annotation.PreDestroy, javax.annotation.PostConstruct</code></dd>
		634	* </dl>
		635	* @since 3.8
		636	* @category CompilerOptionID
		637	*/
		638	public static final String COMPILER_ANNOTATIONS_TO_EXEMPT_UNUSED_PRIVATE_METHOD = PLUGIN_ID + ".compiler.problem.annotationsToExemptUnusedPrivateMethods"; //$NON-NLS-1$
		639	/**
627	* Compiler option ID: Reporting Local Variable Declaration Hiding another Variable.	640	* Compiler option ID: Reporting Local Variable Declaration Hiding another Variable.
628	* <p>When enabled, the compiler will issue an error or a warning whenever a local variable	641	* <p>When enabled, the compiler will issue an error or a warning whenever a local variable
629	* declaration is hiding some field or local variable (either locally, inherited or defined in enclosing type).	642	* declaration is hiding some field or local variable (either locally, inherited or defined in enclosing type).

Lines 1-5 Link Here

(-)a/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/indexing/BinaryIndexer.java (-9 / +1 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2011 IBM Corporation and others.	2	* Copyright (c) 2000, 2012 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 83-96 Link Here
83	if ((annotationTagBits & TagBits.AnnotationPolymorphicSignature) != 0) {	83	if ((annotationTagBits & TagBits.AnnotationPolymorphicSignature) != 0) {
84	char[][] compoundName =	84	char[][] compoundName =
85	TypeConstants.JAVA_LANG_INVOKE_METHODHANDLE_$_POLYMORPHICSIGNATURE;	85	TypeConstants.JAVA_LANG_INVOKE_METHODHANDLE_$_POLYMORPHICSIGNATURE;
86	addAnnotationTypeReference(compoundName[compoundName.length-1]);
87	}
88	if ((annotationTagBits & TagBits.AnnotationPostConstruct) != 0) {
89	char[][] compoundName = TypeConstants.JAVAX_ANNOTATION_POSTCONSTRUCT;
90	addAnnotationTypeReference(compoundName[compoundName.length-1]);
91	}
92	if ((annotationTagBits & TagBits.AnnotationPreDestroy) != 0) {
93	char[][] compoundName = TypeConstants.JAVAX_ANNOTATION_PREDESTROY;
94	addAnnotationTypeReference(compoundName[compoundName.length-1]);	86	addAnnotationTypeReference(compoundName[compoundName.length-1]);
95	}	87	}
96	}	88	}