You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by jg...@apache.org on 2018/12/19 21:53:49 UTC
[23/26] tomee git commit: fixes to Java 6
fixes to Java 6
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/d141a370
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/d141a370
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/d141a370
Branch: refs/heads/tomee-7.0.x
Commit: d141a3705914df78328057faa78ce7b1962ba9ad
Parents: 68e4acb
Author: Otavio Santana <ot...@gmail.com>
Authored: Mon Dec 17 09:14:35 2018 -0200
Committer: Otavio Santana <ot...@gmail.com>
Committed: Mon Dec 17 09:14:35 2018 -0200
----------------------------------------------------------------------
.../apache/openejb/config/CmpJpaConversion.java | 37 ++++++++++----------
.../openejb/core/LegacyInterfaceTest.java | 7 ++++
2 files changed, 26 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/d141a370/container/openejb-core/src/main/java/org/apache/openejb/config/CmpJpaConversion.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/CmpJpaConversion.java b/container/openejb-core/src/main/java/org/apache/openejb/config/CmpJpaConversion.java
index b45de3e..665f8f6 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/config/CmpJpaConversion.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/config/CmpJpaConversion.java
@@ -89,17 +89,17 @@ public class CmpJpaConversion implements DynamicDeployer {
// A specific set of fields that get marked as transient in the superclass mappings
private static final Set<String> ENHANCED_FIELDS = Collections.unmodifiableSet(new TreeSet<String>(Arrays.asList(
- "pcInheritedFieldCount",
- "pcFieldNames",
- "pcFieldTypes",
- "pcFieldFlags",
- "pcPCSuperclass",
- "pcStateManager",
- "class$Ljava$lang$String",
- "class$Ljava$lang$Integer",
- "class$Lcom$sun$ts$tests$common$ejb$wrappers$CMP11Wrapper",
- "pcDetachedState",
- "serialVersionUID"
+ "pcInheritedFieldCount",
+ "pcFieldNames",
+ "pcFieldTypes",
+ "pcFieldFlags",
+ "pcPCSuperclass",
+ "pcStateManager",
+ "class$Ljava$lang$String",
+ "class$Ljava$lang$Integer",
+ "class$Lcom$sun$ts$tests$common$ejb$wrappers$CMP11Wrapper",
+ "pcDetachedState",
+ "serialVersionUID"
)));
public static EntityMappings readEntityMappings(final String location) {
@@ -143,7 +143,7 @@ public class CmpJpaConversion implements DynamicDeployer {
// todo scan existing persistence module for all entity mappings and don't generate mappings for them
- final Set<String> definedMappedClasses = new HashSet<>();
+ final Set<String> definedMappedClasses = new HashSet<String>();
// check for an existing "cmp" persistence unit, and look at existing mappings
final PersistenceUnit cmpPersistenceUnit = findCmpPersistenceUnit(appModule);
@@ -202,7 +202,7 @@ public class CmpJpaConversion implements DynamicDeployer {
persistenceUnit.getMappingFile().add("META-INF/openejb-cmp-generated-orm.xml");
for (final Entity entity : cmpMappings.getEntity()) {
- if (! persistenceUnit.getClazz().contains(entity.getClazz())) {
+ if (!persistenceUnit.getClazz().contains(entity.getClazz())) {
persistenceUnit.getClazz().add(entity.getClazz());
}
}
@@ -266,10 +266,10 @@ public class CmpJpaConversion implements DynamicDeployer {
private String getPersistenceModuleId(final AppModule appModule) {
if (appModule.getModuleId() != null) {
- return appModule.getJarLocation();
+ return appModule.getJarLocation() == null ? appModule.getModuleId() : appModule.getJarLocation();
}
for (final EjbModule ejbModule : appModule.getEjbModules()) {
- return ejbModule.getJarLocation();
+ return appModule.getJarLocation() == null ? appModule.getModuleId() : appModule.getJarLocation();
}
throw new IllegalStateException("Comp must be in an ejb module, this one has none: " + appModule);
}
@@ -330,12 +330,12 @@ public class CmpJpaConversion implements DynamicDeployer {
// left not found?
if (leftEntity == null) {
throw new OpenEJBException("Role source " + leftEjbName + " defined in relationship role " +
- relation.getEjbRelationName() + "::" + leftRole.getEjbRelationshipRoleName() + " not found");
+ relation.getEjbRelationName() + "::" + leftRole.getEjbRelationshipRoleName() + " not found");
}
// right not found?
if (rightEntity == null) {
throw new OpenEJBException("Role source " + rightEjbName + " defined in relationship role " +
- relation.getEjbRelationName() + "::" + rightRole.getEjbRelationshipRoleName() + " not found");
+ relation.getEjbRelationName() + "::" + rightRole.getEjbRelationshipRoleName() + " not found");
}
final Attributes rightAttributes = rightEntity.getAttributes();
@@ -486,7 +486,8 @@ public class CmpJpaConversion implements DynamicDeployer {
/**
* Generate the CMP mapping data for an individual
* EntityBean.
- * @param ejbModule The module containing the bean.
+ *
+ * @param ejbModule The module containing the bean.
* @param ignoreClasses
* @param entityMappings The accumulated set of entity mappings.
* @param bean The been we're generating the mapping for.
http://git-wip-us.apache.org/repos/asf/tomee/blob/d141a370/container/openejb-core/src/test/java/org/apache/openejb/core/LegacyInterfaceTest.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/test/java/org/apache/openejb/core/LegacyInterfaceTest.java b/container/openejb-core/src/test/java/org/apache/openejb/core/LegacyInterfaceTest.java
index 7e106a9..07eb69c 100644
--- a/container/openejb-core/src/test/java/org/apache/openejb/core/LegacyInterfaceTest.java
+++ b/container/openejb-core/src/test/java/org/apache/openejb/core/LegacyInterfaceTest.java
@@ -34,6 +34,13 @@ import org.apache.openejb.jee.Query;
import org.apache.openejb.jee.QueryMethod;
import org.apache.openejb.jee.SingletonBean;
import org.apache.openejb.jee.TransAttribute;
+import org.apache.openejb.jee.jpa.Attributes;
+import org.apache.openejb.jee.jpa.Basic;
+import org.apache.openejb.jee.jpa.Column;
+import org.apache.openejb.jee.jpa.Entity;
+import org.apache.openejb.jee.jpa.EntityMappings;
+import org.apache.openejb.jee.jpa.Id;
+import org.apache.openejb.jee.jpa.NamedQuery;
import org.junit.AfterClass;
import javax.ejb.CreateException;