Bug 574347 - Warnings in JDT core after moving BREE to Java 11

Change-Id: I8c19b0c5f591da6faee23221b4dfde0f3e67a2e4
Signed-off-by: Sravan Kumar Lakkimsetti <sravankumarl@in.ibm.com>
Reviewed-on: https://git.eclipse.org/r/c/jdt/eclipse.jdt.core/+/182278
Tested-by: JDT Bot <jdt-bot@eclipse.org>
Reviewed-by: Andrey Loskutov <loskutov@gmx.de>

6 files changed, 7 insertions, 5 deletions

diff --git a/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/JarClassLoader.java b/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/JarClassLoader.java
index b87f723c09..938d40d3eb 100644
--- a/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/JarClassLoader.java
+++ b/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/JarClassLoader.java
@@ -123,7 +123,7 @@ public class JarClassLoader extends ClassLoader {
 		// Define the package if necessary
 		String pkgName = getPackageName(name);
 		if (pkgName != null) {
-			Package pkg = getPackage(pkgName); // note: getDefinedPackage is only available on jdk>=9
+			Package pkg = getDefinedPackage(pkgName); // note: getDefinedPackage is only available on jdk>=9
 			if (pkg == null) {
 				definePackage(pkgName, null, null, null, null, null, null, null);
 			}
diff --git a/org.eclipse.jdt.apt.pluggable.tests/src/org/eclipse/jdt/apt/pluggable/tests/processors/buildertester/Bug510118Processor.java b/org.eclipse.jdt.apt.pluggable.tests/src/org/eclipse/jdt/apt/pluggable/tests/processors/buildertester/Bug510118Processor.java
index 26ddb35855..0855f7cf9f 100644
--- a/org.eclipse.jdt.apt.pluggable.tests/src/org/eclipse/jdt/apt/pluggable/tests/processors/buildertester/Bug510118Processor.java
+++ b/org.eclipse.jdt.apt.pluggable.tests/src/org/eclipse/jdt/apt/pluggable/tests/processors/buildertester/Bug510118Processor.java
@@ -54,6 +54,7 @@ public class Bug510118Processor extends AbstractProcessor {
 	private abstract static class CastingTypeVisitor<T> extends SimpleTypeVisitor6<T, Void> {
 		private final String label;
 
+		@SuppressWarnings("deprecation")
 		CastingTypeVisitor(String label) {
 			this.label = label;
 		}
diff --git a/org.eclipse.jdt.apt.tests/src-resources/notypes/package-info.java b/org.eclipse.jdt.apt.tests/src-resources/notypes/package-info.java
index fb6518e14c..157b30eca9 100644
--- a/org.eclipse.jdt.apt.tests/src-resources/notypes/package-info.java
+++ b/org.eclipse.jdt.apt.tests/src-resources/notypes/package-info.java
@@ -1 +1 @@
-@question.SimpleAnnotation("foo") package notypes;
\ No newline at end of file
+@Deprecated @question.SimpleAnnotation("foo") package notypes;
\ No newline at end of file
diff --git a/org.eclipse.jdt.compiler.tool/src/org/eclipse/jdt/internal/compiler/tool/EclipseFileManager.java b/org.eclipse.jdt.compiler.tool/src/org/eclipse/jdt/internal/compiler/tool/EclipseFileManager.java
index 7d2f8fa933..a4bbecce39 100644
--- a/org.eclipse.jdt.compiler.tool/src/org/eclipse/jdt/internal/compiler/tool/EclipseFileManager.java
+++ b/org.eclipse.jdt.compiler.tool/src/org/eclipse/jdt/internal/compiler/tool/EclipseFileManager.java
@@ -1281,7 +1281,7 @@ public class EclipseFileManager implements StandardJavaFileManager {
 	private Iterable<? extends File> getFiles(final Iterable<? extends Path> paths) {
 		if (paths == null)
 			return null;
-		return () -> new Iterator<File>() {
+		return () -> new Iterator<>() {
 			Iterator<? extends Path> original = paths.iterator();
 			@Override
 			public boolean hasNext() {
@@ -1296,7 +1296,7 @@ public class EclipseFileManager implements StandardJavaFileManager {
 	private Iterable<? extends Path> getPaths(final Iterable<? extends File> files) {
 		if (files == null)
 			return null;
-		return () -> new Iterator<Path>() {
+		return () -> new Iterator<>() {
 			Iterator<? extends File> original = files.iterator();
 			@Override
 			public boolean hasNext() {
diff --git a/org.eclipse.jdt.core.internal.tools/META-INF/MANIFEST.MF b/org.eclipse.jdt.core.internal.tools/META-INF/MANIFEST.MF
index 8f97473898..d508685fd3 100644
--- a/org.eclipse.jdt.core.internal.tools/META-INF/MANIFEST.MF
+++ b/org.eclipse.jdt.core.internal.tools/META-INF/MANIFEST.MF
@@ -6,4 +6,5 @@ Bundle-Version: 1.1.0.qualifier
 Bundle-Vendor: %providerName
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Export-Package: META-INF.services
+Automatic-Module-Name: org.eclipse.jdt.core.internal.tools
 
diff --git a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/nd/indexer/IndexerTest.java b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/nd/indexer/IndexerTest.java
index 0818b3cc9a..72873001be 100644
--- a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/nd/indexer/IndexerTest.java
+++ b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/nd/indexer/IndexerTest.java
@@ -205,7 +205,7 @@ public class IndexerTest extends AbstractJavaModelTests {
 					for (IClassFile nextClass : result) {
 						if (!(nextClass instanceof IOrdinaryClassFile)) continue;
 						SubMonitor classMon = iterationMon.split(1);
-						BinaryTypeDescriptor descriptor = BinaryTypeFactory.createDescriptor((IOrdinaryClassFile) nextClass);
+						BinaryTypeDescriptor descriptor = BinaryTypeFactory.createDescriptor(nextClass);
 						IndexBinaryType indexedBinaryType = (IndexBinaryType)BinaryTypeFactory.readFromIndex(localIndex, descriptor, classMon);
 						ClassFileReader originalBinaryType = BinaryTypeFactory.rawReadType(descriptor, true);