You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by cs...@apache.org on 2015/11/04 10:25:34 UTC
svn commit: r1712517 - in
/aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/weaving/impl:
JPAWeavingHook.java WrappingTransformer.java
Author: cschneider
Date: Wed Nov 4 09:25:33 2015
New Revision: 1712517
URL: http://svn.apache.org/viewvc?rev=1712517&view=rev
Log:
Small refactoring
Modified:
aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/weaving/impl/JPAWeavingHook.java
aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/weaving/impl/WrappingTransformer.java
Modified: aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/weaving/impl/JPAWeavingHook.java
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/weaving/impl/JPAWeavingHook.java?rev=1712517&r1=1712516&r2=1712517&view=diff
==============================================================================
--- aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/weaving/impl/JPAWeavingHook.java (original)
+++ aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/weaving/impl/JPAWeavingHook.java Wed Nov 4 09:25:33 2015
@@ -43,18 +43,18 @@ public class JPAWeavingHook implements W
private static final Logger LOGGER = LoggerFactory.getLogger(JPAWeavingHook.class);
/**
+ * With luck we will only have one persistence unit per bundle, but if we don't we'll need to call them
+ * until one of them does a transform or we run out.
+ */
+ private final Map<Bundle, LinkedHashSet<ClassTransformer>> registeredTransformers = new HashMap<Bundle, LinkedHashSet<ClassTransformer>>();
+
+ /**
* This constructor should not be called directly, the {@link JPAWeavingHookFactory} should be used to
* ensure that Weaving support is available.
*/
JPAWeavingHook() {
}
- /**
- * With luck we will only have one persistence unit per bundle, but if we don't we'll need to call them
- * until one of them does a transform or we run out.
- */
- private final Map<Bundle, LinkedHashSet<ClassTransformer>> registeredTransformers = new HashMap<Bundle, LinkedHashSet<ClassTransformer>>();
-
public void weave(WovenClass wovenClass) {
BundleWiring wiring = wovenClass.getBundleWiring();
Bundle bundle = wiring.getBundle();
@@ -91,7 +91,6 @@ public class JPAWeavingHook implements W
wovenClass.setBytes(result);
wovenClass.getDynamicImports().add("org.eclipse.persistence.*");
wovenClass.getDynamicImports().add("org.apache.openjpa.*");
-
return true;
}
} catch (Throwable t) {
Modified: aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/weaving/impl/WrappingTransformer.java
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/weaving/impl/WrappingTransformer.java?rev=1712517&r1=1712516&r2=1712517&view=diff
==============================================================================
--- aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/weaving/impl/WrappingTransformer.java (original)
+++ aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/weaving/impl/WrappingTransformer.java Wed Nov 4 09:25:33 2015
@@ -37,18 +37,10 @@ class WrappingTransformer implements Cla
private final Collection<String> packageImportsToAdd = new HashSet<String>();
public WrappingTransformer(ClassTransformer delegate, ServiceReference<?> persistenceProvider) {
-
- if (delegate == null)
- throw new NullPointerException("Transformer delegate may not be null");
-
- if (persistenceProvider == null) {
- throw new NullPointerException("PersistenceProvider may not be null");
- }
-
+ validate(delegate, persistenceProvider);
this.delegate = delegate;
Object packages = persistenceProvider.getProperty("org.apache.aries.jpa.container.weaving.packages");
-
if (packages instanceof String[]) {
for (String s : (String[])packages) {
packageImportsToAdd.add(s);
@@ -65,13 +57,22 @@ class WrappingTransformer implements Cla
}
}
+ private void validate(ClassTransformer delegate, ServiceReference<?> persistenceProvider) {
+ if (delegate == null) {
+ throw new NullPointerException("Transformer delegate may not be null");
+ }
+ if (persistenceProvider == null) {
+ throw new NullPointerException("PersistenceProvider may not be null");
+ }
+ }
+
public WrappingTransformer(ClassTransformer transformer) {
delegate = transformer;
}
-
- public byte[] transform(ClassLoader arg0, String arg1, Class<?> arg2, ProtectionDomain arg3, byte[] arg4)
+
+ public byte[] transform(ClassLoader loader, String className, Class<?> classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer)
throws IllegalClassFormatException {
- return delegate.transform(arg0, arg1, arg2, arg3, arg4);
+ return delegate.transform(loader, className, classBeingRedefined, protectionDomain, classfileBuffer);
}
public Collection<String> getPackagesToAdd() {
@@ -83,9 +84,9 @@ class WrappingTransformer implements Cla
}
public boolean equals(Object o) {
- if (o instanceof WrappingTransformer)
+ if (o instanceof WrappingTransformer) {
return delegate == ((WrappingTransformer)o).delegate;
-
+ }
return false;
}