Updates based on feedback

KyleAure · KyleAure · commit 8d14a792d4a2 · 2023-10-26T15:24:46.000-05:00
diff --git a/dev/com.ibm.ws.ras.instrument/src/com/ibm/ws/ras/instrument/internal/main/LibertyRuntimeTransformer.java b/dev/com.ibm.ws.ras.instrument/src/com/ibm/ws/ras/instrument/internal/main/LibertyRuntimeTransformer.java
@@ -202,7 +202,7 @@ private static boolean isTransformPossible(byte[] bytes) {
         if (isJDK8WithHotReplaceBug)
             return classFileVersion <= Opcodes.V1_7;
         else
-            return classFileVersion <= Opcodes.V17;
+            return classFileVersion <= Opcodes.V22;
     }
 
     /**
diff --git a/dev/com.ibm.ws.ras.instrument_test/test/com/ibm/example/bytecode/HelloWorldJava11.java b/dev/com.ibm.ws.ras.instrument_test/test/com/ibm/example/bytecode/HelloWorldJava11.java
@@ -1,3 +1,15 @@
+/*******************************************************************************
+ * Copyright (c) 2023 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-2.0/
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
 package com.ibm.example.bytecode;
 
 public class HelloWorldJava11 {
diff --git a/dev/com.ibm.ws.ras.instrument_test/test/com/ibm/example/bytecode/HelloWorldJava17.java b/dev/com.ibm.ws.ras.instrument_test/test/com/ibm/example/bytecode/HelloWorldJava17.java
@@ -1,3 +1,15 @@
+/*******************************************************************************
+ * Copyright (c) 2023 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-2.0/
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
 package com.ibm.example.bytecode;
 
 public class HelloWorldJava17 {
diff --git a/dev/com.ibm.ws.ras.instrument_test/test/com/ibm/example/bytecode/HelloWorldJava21.java b/dev/com.ibm.ws.ras.instrument_test/test/com/ibm/example/bytecode/HelloWorldJava21.java
@@ -1,3 +1,15 @@
+/*******************************************************************************
+ * Copyright (c) 2023 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-2.0/
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
 package com.ibm.example.bytecode;
 
 public class HelloWorldJava21 {
diff --git a/dev/com.ibm.ws.ras.instrument_test/test/com/ibm/example/bytecode/HelloWorldJava6.java b/dev/com.ibm.ws.ras.instrument_test/test/com/ibm/example/bytecode/HelloWorldJava6.java
@@ -1,3 +1,15 @@
+/*******************************************************************************
+ * Copyright (c) 2023 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-2.0/
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
 package com.ibm.example.bytecode;
 
 public class HelloWorldJava6 {
diff --git a/dev/com.ibm.ws.ras.instrument_test/test/com/ibm/example/bytecode/HelloWorldJava7.java b/dev/com.ibm.ws.ras.instrument_test/test/com/ibm/example/bytecode/HelloWorldJava7.java
@@ -1,3 +1,15 @@
+/*******************************************************************************
+ * Copyright (c) 2023 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-2.0/
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
 package com.ibm.example.bytecode;
 
 public class HelloWorldJava7 {
diff --git a/dev/com.ibm.ws.ras.instrument_test/test/com/ibm/example/bytecode/HelloWorldJava7StaticInit.java b/dev/com.ibm.ws.ras.instrument_test/test/com/ibm/example/bytecode/HelloWorldJava7StaticInit.java
@@ -1,3 +1,15 @@
+/*******************************************************************************
+ * Copyright (c) 2023 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-2.0/
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
 package com.ibm.example.bytecode;
 
 public class HelloWorldJava7StaticInit {
diff --git a/dev/com.ibm.ws.ras.instrument_test/test/com/ibm/example/bytecode/HelloWorldJava8.java b/dev/com.ibm.ws.ras.instrument_test/test/com/ibm/example/bytecode/HelloWorldJava8.java
@@ -1,3 +1,15 @@
+/*******************************************************************************
+ * Copyright (c) 2023 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-2.0/
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
 package com.ibm.example.bytecode;
 
 public class HelloWorldJava8 {
diff --git a/dev/com.ibm.ws.ras.instrument_test/test/com/ibm/example/bytecode/HelloWorldJava8Lambdas.java b/dev/com.ibm.ws.ras.instrument_test/test/com/ibm/example/bytecode/HelloWorldJava8Lambdas.java
@@ -1,3 +1,15 @@
+/*******************************************************************************
+ * Copyright (c) 2023 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-2.0/
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
 package com.ibm.example.bytecode;
 
 import java.util.concurrent.Callable;
diff --git a/dev/com.ibm.ws.ras.instrument_test/test/com/ibm/example/bytecode/HelloWorldJava8StaticInit.java b/dev/com.ibm.ws.ras.instrument_test/test/com/ibm/example/bytecode/HelloWorldJava8StaticInit.java
@@ -1,3 +1,15 @@
+/*******************************************************************************
+ * Copyright (c) 2023 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-2.0/
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
 package com.ibm.example.bytecode;
 
 public class HelloWorldJava8StaticInit {
diff --git a/dev/com.ibm.ws.ras.instrument_test/test/com/ibm/example/bytecode/HelloWorldJava8StaticLambdas.java b/dev/com.ibm.ws.ras.instrument_test/test/com/ibm/example/bytecode/HelloWorldJava8StaticLambdas.java
@@ -1,3 +1,15 @@
+/*******************************************************************************
+ * Copyright (c) 2023 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-2.0/
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
 package com.ibm.example.bytecode;
 
 import java.util.concurrent.Callable;
diff --git a/dev/com.ibm.ws.ras.instrument_test/test/com/ibm/example/bytecode/README.md b/dev/com.ibm.ws.ras.instrument_test/test/com/ibm/example/bytecode/README.md
@@ -1,8 +1,7 @@
 ## Source files
 
-The classes compiled in this package are not meant to be used for testing.
-Instead, they are placeholder .java files that we need to manually compile at different java levels.
-The compiled classes will then be put into the `test data` directory.
+The classes in this directory are the source files for the .class files located in the `test data` directory.
+If you are adding a new class to this directory you need to manually compile it at the java level it was written to be tested against.
 
 ### Generate new class files
 
diff --git a/dev/com.ibm.ws.ras.instrument_test/test/com/ibm/ws/ras/RasTransformTest.java b/dev/com.ibm.ws.ras.instrument_test/test/com/ibm/ws/ras/RasTransformTest.java
@@ -39,6 +39,7 @@
 
 import com.ibm.ws.ras.instrument.internal.main.LibertyRuntimeTransformer;
 
+//TODO add tests that make sure classes are instrumented with trace.
 @SuppressWarnings("deprecation")
 public class RasTransformTest extends LibertyRuntimeTransformer {
 	
@@ -71,7 +72,7 @@ public static void setup() {
         majorCodeMap.put("19", 63);
         majorCodeMap.put("20", 64);
         majorCodeMap.put("21", 65);
-        majorCodeMap.put("22", 65);
+        majorCodeMap.put("22", 66);
 	}
 	
 	/**
@@ -388,9 +389,8 @@ public void testJava17Basic() {
 		
 	}
 	
-	//FIXME - This test is currently failing because isTransformPossible returns false
 	//TODO expand this test to actually test Java 21 features https://openjdk.org/jeps/441
-	//@Test 
+	@Test 
 	public void testJava21Basic() {
 		assumeTrue(Integer.parseInt(System.getProperty("java.specification.version")) >= 21);
 		String classPath = "test/test data/com/ibm/example/bytecode/HelloWorldJava21.class";

Original file line number	Diff line number	Diff line change
`@@ -202,7 +202,7 @@ private static boolean isTransformPossible(byte[] bytes) {`
`202`	`202`	`if (isJDK8WithHotReplaceBug)`
`203`	`203`	`return classFileVersion <= Opcodes.V1_7;`
`204`	`204`	`else`
`205`		`- return classFileVersion <= Opcodes.V17;`
	`205`	`+ return classFileVersion <= Opcodes.V22;`
`206`	`206`	`}`
`207`	`207`
`208`	`208`	`/**`