This is an automated email from the ASF dual-hosted git repository.
struberg pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openjpa.git
commit bcb00d890976ac19e7969858aba3ed235ebcfea9
Author: Mark Struberg <strub...@apache.org>
AuthorDate: Mon Jul 17 10:08:39 2023 +0200
OPENJPA-2911 move BytecodeWriter to openjpa-kernel
had no usage in openjpa-lib but introduced dependeny to Serp over there
---
.../apache/openjpa/enhance/ManagedClassSubclasser.java | 2 +-
.../main/java/org/apache/openjpa/enhance/PCEnhancer.java | 15 ++++++---------
.../java/org/apache/openjpa/util/asm}/BytecodeWriter.java | 2 +-
.../openjpa/enhance/TestEnhancementWithMultiplePUs.java | 5 ++---
4 files changed, 10 insertions(+), 14 deletions(-)
diff --git
a/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/ManagedClassSubclasser.java
b/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/ManagedClassSubclasser.java
index 8f6ef99ac..2fc77a346 100644
---
a/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/ManagedClassSubclasser.java
+++
b/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/ManagedClassSubclasser.java
@@ -32,7 +32,7 @@ import java.util.Set;
import org.apache.openjpa.conf.OpenJPAConfiguration;
import org.apache.openjpa.lib.log.Log;
-import org.apache.openjpa.lib.util.BytecodeWriter;
+import org.apache.openjpa.util.asm.BytecodeWriter;
import org.apache.openjpa.lib.util.Files;
import org.apache.openjpa.lib.util.Localizer;
import org.apache.openjpa.lib.util.Localizer.Message;
diff --git
a/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/PCEnhancer.java
b/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/PCEnhancer.java
index 53a0b5f08..0dc51236d 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/PCEnhancer.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/PCEnhancer.java
@@ -62,7 +62,7 @@ import org.apache.openjpa.conf.OpenJPAConfigurationImpl;
import org.apache.openjpa.lib.conf.Configurations;
import org.apache.openjpa.lib.log.Log;
import org.apache.openjpa.lib.meta.ClassArgParser;
-import org.apache.openjpa.lib.util.BytecodeWriter;
+import org.apache.openjpa.util.asm.BytecodeWriter;
import org.apache.openjpa.lib.util.ClassUtil;
import org.apache.openjpa.lib.util.Files;
import org.apache.openjpa.lib.util.J2DoPrivHelper;
@@ -124,16 +124,13 @@ public class PCEnhancer {
public static final int ENHANCER_VERSION;
public static final Type TYPE_OBJECT = Type.getType(Object.class);
- boolean _addVersionInitFlag = true;
-
public static final int ENHANCE_NONE = 0;
public static final int ENHANCE_AWARE = 2 << 0;
public static final int ENHANCE_INTERFACE = 2 << 1;
public static final int ENHANCE_PC = 2 << 2;
public static final String PRE = "pc";
- public static final String ISDETACHEDSTATEDEFINITIVE = PRE
- + "isDetachedStateDefinitive";
+ public static final String ISDETACHEDSTATEDEFINITIVE = PRE +
"isDetachedStateDefinitive";
private static final Class<?> PCTYPE = PersistenceCapable.class;
private static final String SM = PRE + "StateManager";
@@ -149,10 +146,8 @@ public class PCEnhancer {
private static final String VERSION_INIT_STR = PRE + "VersionInit";
- private static final Localizer _loc = Localizer.forPackage
- (PCEnhancer.class);
- private static final String REDEFINED_ATTRIBUTE
- = PCEnhancer.class.getName() + "#redefined-type";
+ private static final Localizer _loc =
Localizer.forPackage(PCEnhancer.class);
+ private static final String REDEFINED_ATTRIBUTE =
PCEnhancer.class.getName() + "#redefined-type";
private static final AuxiliaryEnhancer[] _auxEnhancers;
@@ -200,6 +195,8 @@ public class PCEnhancer {
private BCClass _pc;
private final BCClass _managedType;
private final MetaDataRepository _repos;
+ boolean _addVersionInitFlag = true;
+
/**
* represents the managed type.
diff --git
a/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/BytecodeWriter.java
b/openjpa-kernel/src/main/java/org/apache/openjpa/util/asm/BytecodeWriter.java
similarity index 96%
rename from
openjpa-lib/src/main/java/org/apache/openjpa/lib/util/BytecodeWriter.java
rename to
openjpa-kernel/src/main/java/org/apache/openjpa/util/asm/BytecodeWriter.java
index 02abe1539..c69a72eb4 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/BytecodeWriter.java
+++
b/openjpa-kernel/src/main/java/org/apache/openjpa/util/asm/BytecodeWriter.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openjpa.lib.util;
+package org.apache.openjpa.util.asm;
import java.io.IOException;
diff --git
a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/TestEnhancementWithMultiplePUs.java
b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/TestEnhancementWithMultiplePUs.java
index 875358865..f139069e2 100644
---
a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/TestEnhancementWithMultiplePUs.java
+++
b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/TestEnhancementWithMultiplePUs.java
@@ -27,7 +27,7 @@ import java.util.List;
import org.apache.openjpa.conf.OpenJPAConfiguration;
import org.apache.openjpa.conf.OpenJPAConfigurationImpl;
import org.apache.openjpa.lib.conf.Configurations;
-import org.apache.openjpa.lib.util.BytecodeWriter;
+import org.apache.openjpa.util.asm.BytecodeWriter;
import org.apache.openjpa.lib.util.J2DoPrivHelper;
import org.apache.openjpa.lib.util.Options;
import org.apache.openjpa.meta.MetaDataRepository;
@@ -136,8 +136,7 @@ public class TestEnhancementWithMultiplePUs
@Override
public void write(BCClass type) throws IOException {
- assertTrue(Arrays.asList(type.getInterfaceNames()).contains(
- PersistenceCapable.class.getName()));
+
assertTrue(Arrays.asList(type.getInterfaceNames()).contains(PersistenceCapable.class.getName()));
written.add(type.getName());
}
};
