From 67d30def6927f86149529dc77d2b96cb2d6cf02f Mon Sep 17 00:00:00 2001 From: Otavio Santana Date: Thu, 13 Dec 2018 08:50:56 -0200 Subject: [PATCH 1/3] Adds getModuleId method as a fallback when getJarLocation is null at CmpJpaConversion --- .../java/org/apache/openejb/config/CmpJpaConversion.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) 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 2965abe4e9c..069d0d09a21 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 @@ -76,6 +76,8 @@ import java.util.HashSet; import java.util.List; import java.util.Map; +import java.util.Objects; +import java.util.Optional; import java.util.Properties; import java.util.Set; import java.util.TreeMap; @@ -266,10 +268,12 @@ private PersistenceUnit findCmpPersistenceUnit(final AppModule appModule) { private String getPersistenceModuleId(final AppModule appModule) { if (appModule.getModuleId() != null) { - return appModule.getJarLocation(); + + return Optional.ofNullable(appModule.getJarLocation()).orElse(appModule.getModuleId()); } for (final EjbModule ejbModule : appModule.getEjbModules()) { - return ejbModule.getJarLocation(); + //return ejbModule.getJarLocation(); + return Optional.ofNullable(appModule.getJarLocation()).orElse(appModule.getModuleId()); } throw new IllegalStateException("Comp must be in an ejb module, this one has none: " + appModule); } From 4859fa8ae37690a8004a72139e44c208b0a6242d Mon Sep 17 00:00:00 2001 From: Otavio Santana Date: Thu, 13 Dec 2018 08:51:54 -0200 Subject: [PATCH 2/3] fixes imports --- .../main/java/org/apache/openejb/config/CmpJpaConversion.java | 1 - 1 file changed, 1 deletion(-) 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 069d0d09a21..9796120cb50 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 @@ -76,7 +76,6 @@ import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Objects; import java.util.Optional; import java.util.Properties; import java.util.Set; From e26828c7e13d116cbda41b777be07750c4b3ecfb Mon Sep 17 00:00:00 2001 From: Otavio Santana Date: Thu, 13 Dec 2018 08:53:01 -0200 Subject: [PATCH 3/3] fixes lines at CmpJpaConversion --- .../main/java/org/apache/openejb/config/CmpJpaConversion.java | 2 -- 1 file changed, 2 deletions(-) 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 9796120cb50..dd5ae82119e 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 @@ -267,11 +267,9 @@ private PersistenceUnit findCmpPersistenceUnit(final AppModule appModule) { private String getPersistenceModuleId(final AppModule appModule) { if (appModule.getModuleId() != null) { - return Optional.ofNullable(appModule.getJarLocation()).orElse(appModule.getModuleId()); } for (final EjbModule ejbModule : appModule.getEjbModules()) { - //return ejbModule.getJarLocation(); return Optional.ofNullable(appModule.getJarLocation()).orElse(appModule.getModuleId()); } throw new IllegalStateException("Comp must be in an ejb module, this one has none: " + appModule);