Add Java23 support

The huge change with adopting Java23 is that 1.1 > 1.7 Java are now considered unsupported
by Eclipse JDT, so the many thousands of tests we have that were specifying java versions
lower than 1.8 were all failing with an unsupported version error. All those tests have
had their versions bumped to 1.8.

That is why this commit includes so many changes. For
example where we were specifying 1.5 - which was the case for many many generics/annotations
tests, that is now 1.8. Also, some tests have been deleted because they make no sense now
(verifying expected errors on Java 1.4 for example, errors that just can’t happen with
minimum Java level 1.8).

The biggest impact to tests was when bumping above 1.4 compliance suddenly
there were 100s of adviceDidNotMatch messages. Some of these messages were actual indications
of bad expectations in the test but many of them were just to-be-expected and were fixed
either via an -Xlint:ignore option in the test spec or a SuppressAjWarnings in the test
source.

One or two tests actually revealed real bugs that just didn’t surface with lower
level java versions specified.

A bare minimum of real Java 23 tests have been added just
to get this sanity tested and committed. More would ideally be added.

Other notable changes due to Eclipse JDT changes:

org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/*.java
Changes in here because there are now more validations on the code generator methods we were
calling. Now you can’t start manipulating variables without having declared them as proper
local variables, so those extra calls to define them have been added.


org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom
With needing to bump up the java versions, these classes had to be brought up to date with
AST.JLS20 rather than only supporting versions 2/3. This was mostly copying patterns for
the Eclipse classes.



Author: aclement

ajde.core/src/main/java/org/aspectj/ajde/core/JavaOptions.java

@@ -28,6 +28,8 @@ public final class JavaOptions {
 	public static final String VERSION_14 = CompilerOptions.VERSION_1_4;
 	public static final String VERSION_15 = CompilerOptions.VERSION_1_5;
 	public static final String VERSION_16 = CompilerOptions.VERSION_1_6;
+	public static final String VERSION_17 = CompilerOptions.VERSION_1_7;
+	public static final String VERSION_18 = CompilerOptions.VERSION_1_8;
 
 	// by default will use the platform default encoding
 	public static final String CHARACTER_ENCODING = CompilerOptions.OPTION_Encoding;

ajde.core/src/test/java/org/aspectj/ajde/core/TestCompilerConfiguration.java

@@ -77,8 +77,8 @@ public Set<File> getInpath() {
 	public Map<String, String> getJavaOptionsMap() {
 		if (javaOptions == null) {
 			javaOptions = new Hashtable<>();
-			javaOptions.put(JavaOptions.COMPLIANCE_LEVEL, JavaOptions.VERSION_13);
-			javaOptions.put(JavaOptions.SOURCE_COMPATIBILITY_LEVEL, JavaOptions.VERSION_13);
+			javaOptions.put(JavaOptions.COMPLIANCE_LEVEL, JavaOptions.VERSION_18);
+			javaOptions.put(JavaOptions.SOURCE_COMPATIBILITY_LEVEL, JavaOptions.VERSION_18);
 		}
 		return javaOptions;
 	}

ajde.core/src/test/java/org/aspectj/ajde/core/tests/ShowWeaveMessagesTest.java

@@ -166,8 +166,8 @@ public void testWeaveMessagesDeclareAnnotation() {
 		if (debugTests)
 			System.out.println("\ntestWeaveMessagesDeclareAnnotation: Building with Six.lst");
 		compilerConfig.setProjectSourceFiles(getSourceFileList(six));
-		setRunIn15Mode();
-		compilerConfig.setNonStandardOptions("-showWeaveInfo -1.5");
+		setRunIn18Mode();
+		compilerConfig.setNonStandardOptions("-showWeaveInfo -1.8");
 		doBuild();
 		assertTrue("Expected no compiler errors but found " + handler.getErrors(), handler.getErrors().isEmpty());
 		verifyWeavingMessages("declare.annotation", true);
@@ -182,7 +182,7 @@ public void testWeaveMessagesDeclareAnnotationWeaveInfoOff() {
 			System.out.println("\ntestWeaveMessagesDeclareAnnotation: Building with Seven.lst");
 		compilerConfig.setProjectSourceFiles(getSourceFileList(seven));
 		compilerConfig.setNonStandardOptions("");
-		setRunIn15Mode();
+		setRunIn18Mode();
 		doBuild();
 		assertTrue("Expected no compiler errors but found " + handler.getErrors(), handler.getErrors().isEmpty());
 		verifyWeavingMessages("declare.annotationNoWeaveInfo", true);
@@ -423,11 +423,11 @@ private void saveWeaveMessages(File f) {
 		}
 	}
 
-	private void setRunIn15Mode() {
+	private void setRunIn18Mode() {
 		Map<String, String> m = new Hashtable<>();
-		m.put(JavaOptions.COMPLIANCE_LEVEL, JavaOptions.VERSION_15);
-		m.put(JavaOptions.SOURCE_COMPATIBILITY_LEVEL, JavaOptions.VERSION_15);
-		m.put(JavaOptions.TARGET_COMPATIBILITY_LEVEL, JavaOptions.VERSION_15);
+		m.put(JavaOptions.COMPLIANCE_LEVEL, JavaOptions.VERSION_18);
+		m.put(JavaOptions.SOURCE_COMPATIBILITY_LEVEL, JavaOptions.VERSION_18);
+		m.put(JavaOptions.TARGET_COMPATIBILITY_LEVEL, JavaOptions.VERSION_18);
 		compilerConfig.setJavaOptions(m);
 	}
 

ajde/src/main/java/org/aspectj/ajde/ui/swing/BrowserViewManager.java

@@ -48,7 +48,7 @@ public class BrowserViewManager {
     private final GlobalViewProperties INHERITANCE_VIEW_PROPERTIES;
 
     public BrowserViewManager() {
-		java.util.List views = new ArrayList();
+		java.util.List<GlobalStructureView> views = new ArrayList<>();
 		views.add(DECLARATION_VIEW);
 		views.add(CROSSCUTTING_VIEW);
 		views.add(INHERITANCE_VIEW);

ajde/src/test/java/org/aspectj/ajde/ui/utils/TestCompilerConfiguration.java

@@ -37,13 +37,13 @@ public class TestCompilerConfiguration implements ICompilerConfiguration {
 
 	private String projectPath;
 
-	private Set aspectpath;
-	private Set inpath;
+	private Set<File> aspectpath;
+	private Set<File> inpath;
 	private String outjar;
 	private Map<String,String> javaOptions;
 	private String nonStandardOptions;
-	private List projectSourceFiles = new ArrayList();
-	private Map sourcePathResources;
+	private List<String> projectSourceFiles = new ArrayList<>();
+	private Map<String,File> sourcePathResources;
 
 	private String srcDirName = "src";
 
@@ -56,11 +56,11 @@ public TestCompilerConfiguration(String projectPath) {
 	public void configurationRead() {
 	}
 
-	public List getProjectXmlConfigFiles() {
-		return Collections.EMPTY_LIST;
+	public List<String> getProjectXmlConfigFiles() {
+		return Collections.emptyList();
 	}
 
-	public Set getAspectPath() {
+	public Set<File> getAspectPath() {
 		return aspectpath;
 	}
 
@@ -73,15 +73,15 @@ public String getClasspath() {
 		return cp;
 	}
 
-	public Set getInpath() {
+	public Set<File> getInpath() {
 		return inpath;
 	}
 
 	public Map<String,String> getJavaOptionsMap() {
 		if (javaOptions == null) {
 			javaOptions = new Hashtable<>();
-			javaOptions.put(JavaOptions.COMPLIANCE_LEVEL, JavaOptions.VERSION_13);
-			javaOptions.put(JavaOptions.SOURCE_COMPATIBILITY_LEVEL, JavaOptions.VERSION_13);
+			javaOptions.put(JavaOptions.COMPLIANCE_LEVEL, JavaOptions.VERSION_18);
+			javaOptions.put(JavaOptions.SOURCE_COMPATIBILITY_LEVEL, JavaOptions.VERSION_18);
 		}
 		return javaOptions;
 	}
@@ -101,17 +101,17 @@ public IOutputLocationManager getOutputLocationManager() {
 		return outputLoc;
 	}
 
-	public List getProjectSourceFiles() {
+	public List<String> getProjectSourceFiles() {
 		return projectSourceFiles;
 	}
 
-	public List getProjectSourceFilesChanged() {
+	public List<File> getProjectSourceFilesChanged() {
 		return null;
 	}
 
-	public Map getSourcePathResources() {
+	public Map<String,File> getSourcePathResources() {
 		if (sourcePathResources == null) {
-			sourcePathResources = new HashMap();
+			sourcePathResources = new HashMap<>();
 
 			/* Allow the user to override the testProjectPath by using sourceRoots */
 			File[] srcBase = new File[] { new File(projectPath + File.separator + srcDirName) };
@@ -127,39 +127,38 @@ public boolean accept(File pathname) {
 				for (File fromResource : fromResources) {
 					String normPath = FileUtil.normalizedPath(fromResource, file);
 					sourcePathResources.put(normPath, fromResource);
-
 				}
 			}
 		}
 		return sourcePathResources;
 	}
 
 	// -------------------- setter methods useful for testing ---------------
-	public void setAspectPath(Set aspectPath) {
+	public void setAspectPath(Set<File> aspectPath) {
 		this.aspectpath = aspectPath;
 	}
 
-	public void setInpath(Set inpath) {
+	public void setInpath(Set<File> inpath) {
 		this.inpath = inpath;
 	}
 
 	public void setOutjar(String outjar) {
 		this.outjar = outjar;
 	}
 
-	public void setJavaOptions(Map javaOptions) {
+	public void setJavaOptions(Map<String,String> javaOptions) {
 		this.javaOptions = javaOptions;
 	}
 
 	public void setNonStandardOptions(String options) {
 		this.nonStandardOptions = options;
 	}
 
-	public void setProjectSourceFiles(List projectSourceFiles) {
+	public void setProjectSourceFiles(List<String> projectSourceFiles) {
 		this.projectSourceFiles = projectSourceFiles;
 	}
 
-	public void setSourcePathResources(Map sourcePathResources) {
+	public void setSourcePathResources(Map<String,File> sourcePathResources) {
 		this.sourcePathResources = sourcePathResources;
 	}
 
@@ -171,7 +170,7 @@ public int getConfigurationChanges() {
 		return ICompilerConfiguration.EVERYTHING;
 	}
 
-	public List getClasspathElementsWithModifiedContents() {
+	public List<String> getClasspathElementsWithModifiedContents() {
 		return null;
 	}
 

ajdoc/src/test/java/org/aspectj/tools/ajdoc/BugTest.java

@@ -37,7 +37,7 @@ public void testPr148906_1() {
 		initialiseProject("pr148906");
 		File[] files = {new File(getAbsoluteProjectDir() + "/AdviceDidNotMatch.aj")};
 		String[] ajOptions = {new String("-Xlint:error")};
-		runAjdoc(files,"1.5",ajOptions);
+		runAjdoc(files,"1.8",ajOptions);
 		assertTrue("expected ajc to fail but it did not", Main.hasAborted());
 		assertEquals("expected ajc to fail with an adviceDidNotMatch error but it" +
 				" failed instead with " + Main.getErrors()[0].getMessage(),
@@ -53,7 +53,7 @@ public void testPr148906_2() {
 		initialiseProject("pr148906");
 		File[] files = {new File(getAbsoluteProjectDir() + "/AdviceDidNotMatch.aj")};
 		String[] ajOptions = {new String("-Xlintfile"), new String(getAbsoluteProjectDir() + File.separator + "Xlint.properties")};
-		runAjdoc(files,"1.5",ajOptions);
+		runAjdoc(files,"1.8",ajOptions);
 		assertTrue("expected ajc to fail but it did not", Main.hasAborted());
 		assertEquals("expected ajc to fail with an adviceDidNotMatch error but it" +
 				" failed instead with " + Main.getErrors()[0].getMessage(),

lib/aspectj/lib/aspectjrt.jar

@@ -35,6 +35,7 @@
 import org.aspectj.bridge.Version;
 import org.aspectj.org.eclipse.jdt.core.compiler.CategorizedProblem;
 import org.aspectj.org.eclipse.jdt.internal.compiler.apt.dispatch.AptProblem;
+import org.aspectj.org.eclipse.jdt.internal.compiler.batch.CompilationUnit;
 import org.aspectj.org.eclipse.jdt.internal.compiler.batch.FileSystem;
 import org.aspectj.org.eclipse.jdt.internal.compiler.batch.Main;
 import org.aspectj.org.eclipse.jdt.internal.compiler.classfmt.ClassFileConstants;
@@ -166,7 +167,8 @@ public AjBuildConfig populateBuildConfig(AjBuildConfig buildConfig, String[] arg
 			super.configure(javaArgList.toArray(new String[0]));
 
 			if (parser.getModuleInfoArgument() != null) {
-				IModule moduleDesc = super.getModuleDesc(parser.getModuleInfoArgument());
+				IModule moduleDesc = super.getModuleDesc(parser.getModuleInfoArgument(),
+						() -> new CompilationUnit(null, parser.getModuleInfoArgument(), null));
 				buildConfig.setModuleDesc(moduleDesc);
 			}
 
@@ -382,7 +384,7 @@ public ArrayList<FileSystem.Classpath> handleClasspath(ArrayList<String> classpa
 	 * If the classpath is not set, we use the environment's java.class.path, but remove the aspectjtools.jar entry from that list
 	 * in order to prevent wierd bootstrap issues (refer to bug#39959).
 	 */
-	public List getClasspath(AjcConfigParser parser) {
+	public List<String> getClasspath(AjcConfigParser parser) {
 		List<String> ret = new ArrayList<>();
 
 		// if (parser.bootclasspath == null) {
@@ -904,14 +906,38 @@ private int indexOf(Iterable<Arg> args, String arg) {
 
 	}
 
-	@Override
-	public boolean checkVMVersion(long minimalSupportedVersion) {
-		return super.checkVMVersion(minimalSupportedVersion);
-	}
+//	@Override
+//	public boolean checkVMVersion(long minimalSupportedVersion) {
+//		return super.checkVMVersion(minimalSupportedVersion);
+//	}
 
 	@Override
 	public void initRootModules(LookupEnvironment environment, FileSystem fileSystem) {
 		super.initRootModules(environment, fileSystem);
 	}
+	
+	// Around Java23, looks like JDT has removed this and is just assuming 'modern' Java. 
+	// This is what they had in org.eclipse.jdt.internal.compiler.batch.Main.checkVMVersion()
+	public boolean checkVMVersion(long minimalSupportedVersion) {
+        // the format of this property is supposed to be xx.x where x are digits.
+        String classFileVersion = System.getProperty("java.class.version"); //$NON-NLS-1$
+        if (classFileVersion == null) { 
+                // by default we don't support a class file version we cannot recognize
+                return false;
+        }                       
+        int index = classFileVersion.indexOf('.');
+        if (index == -1) {
+                // by default we don't support a class file version we cannot recognize
+                return false;   
+        }               
+        int majorVersion;
+        try {
+                majorVersion = Integer.parseInt(classFileVersion.substring(0, index));
+        } catch (NumberFormatException e) {
+                // by default we don't support a class file version we cannot recognize
+                return false;
+        }               
+        return ClassFileConstants.getComplianceLevelForJavaVersion(majorVersion) >=minimalSupportedVersion;
+	}  
 
 }