You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by rm...@apache.org on 2020/09/16 08:32:11 UTC
[openjpa] branch master updated: dropping java < 8 asm test since
we require java >= 8
This is an automated email from the ASF dual-hosted git repository.
rmannibucau pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openjpa.git
The following commit(s) were added to refs/heads/master by this push:
new 1862e2b dropping java < 8 asm test since we require java >= 8
1862e2b is described below
commit 1862e2bad507949caed81cecb9155360b9731220
Author: Romain Manni-Bucau <rm...@gmail.com>
AuthorDate: Wed Sep 16 10:32:04 2020 +0200
dropping java < 8 asm test since we require java >= 8
---
.../org/apache/openjpa/enhance/AsmAdaptor.java | 6 ------
.../openjpa/enhance/PCClassFileTransformer.java | 23 +---------------------
.../org/apache/openjpa/enhance/TestAsmAdaptor.java | 4 ----
3 files changed, 1 insertion(+), 32 deletions(-)
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/AsmAdaptor.java b/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/AsmAdaptor.java
index 6bb26d9..4c8b3a4 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/AsmAdaptor.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/AsmAdaptor.java
@@ -43,7 +43,6 @@ import serp.bytecode.BCClass;
* Serp.
*/
public final class AsmAdaptor {
- private static final boolean USE_ASM = System.getProperty("java.version").compareTo("1.6") > 0;
private static final int Java7_MajorVersion = 51;
@SuppressWarnings("deprecation")
@@ -117,11 +116,6 @@ public final class AsmAdaptor {
return cw.toByteArray();
}
- public static boolean use()
- {
- return USE_ASM;
- }
-
public static boolean isEnhanced(final byte[] b)
{
if (b == null)
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/PCClassFileTransformer.java b/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/PCClassFileTransformer.java
index d67fb48..d5f35ae 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/PCClassFileTransformer.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/PCClassFileTransformer.java
@@ -35,7 +35,6 @@ import org.apache.openjpa.util.GeneralException;
import serp.bytecode.BCClass;
import serp.bytecode.Project;
-import serp.bytecode.lowlevel.ConstantPoolTable;
/**
@@ -227,26 +226,6 @@ public class PCClassFileTransformer
* {@link PersistenceCapable}.
*/
private static boolean isEnhanced(byte[] b) {
- if (AsmAdaptor.use())
- {
- return AsmAdaptor.isEnhanced(b);
- }
-
- ConstantPoolTable table = new ConstantPoolTable(b);
- int idx = table.getEndIndex();
-
- idx += 6; // skip access, cls, super
- int ifaces = table.readUnsignedShort(idx);
- int clsEntry, utfEntry;
- String name;
- for (int i = 0; i < ifaces; i++) {
- idx += 2;
- clsEntry = table.readUnsignedShort(idx);
- utfEntry = table.readUnsignedShort(table.get(clsEntry));
- name = table.readString(table.get(utfEntry));
- if ("org/apache/openjpa/enhance/PersistenceCapable".equals(name))
- return true;
- }
- return false;
+ return AsmAdaptor.isEnhanced(b);
}
}
diff --git a/openjpa-kernel/src/test/java/org/apache/openjpa/enhance/TestAsmAdaptor.java b/openjpa-kernel/src/test/java/org/apache/openjpa/enhance/TestAsmAdaptor.java
index d64c7f8..970b981 100644
--- a/openjpa-kernel/src/test/java/org/apache/openjpa/enhance/TestAsmAdaptor.java
+++ b/openjpa-kernel/src/test/java/org/apache/openjpa/enhance/TestAsmAdaptor.java
@@ -33,10 +33,6 @@ public class TestAsmAdaptor
@Test
public void isEnhanced()
{
- if (!AsmAdaptor.use())
- {
- return;
- }
assertTrue(AsmAdaptor.isEnhanced(bytes(Enhanced.class)));
assertTrue(AsmAdaptor.isEnhanced(bytes(TransitivelyEnhanced.class)));
assertFalse(AsmAdaptor.isEnhanced(bytes(NotEnhanced.class)));