[isis] 01/03: ISIS-2158: move JdoPersistenceLifecycleService -> jdo-common

[ah...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

ahuber pushed a commit to branch v2
in repository https://gitbox.apache.org/repos/asf/isis.git

commit a955ed4c3108660ac3d5f668a9a941523294a4e8
Author: Andi Huber <ah...@apache.org>
AuthorDate: Wed Oct 2 11:22:17 2019 +0200

    ISIS-2158: move JdoPersistenceLifecycleService -> jdo-common
    
    - fixes smoketests with headless config
---
 .../isis/jdo/datanucleus/service}/JdoPersistenceLifecycleService.java | 4 +++-
 .../src/main/java/org/apache/isis/jdo/IsisBootDataNucleus.java        | 2 ++
 .../isis/testdomain/domainmodel/DomainModelTest_usingBadDomain.java   | 4 +++-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/system/persistence/JdoPersistenceLifecycleService.java b/core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/datanucleus/service/JdoPersistenceLifecycleService.java
similarity index 96%
rename from core/runtime/src/main/java/org/apache/isis/runtime/system/persistence/JdoPersistenceLifecycleService.java
rename to core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/datanucleus/service/JdoPersistenceLifecycleService.java
index 0f246f0..9358d5d 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/system/persistence/JdoPersistenceLifecycleService.java
+++ b/core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/datanucleus/service/JdoPersistenceLifecycleService.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.runtime.system.persistence;
+package org.apache.isis.jdo.datanucleus.service;
 
 import javax.annotation.PostConstruct;
 import javax.inject.Singleton;
@@ -31,6 +31,8 @@ import org.apache.isis.config.registry.IsisBeanTypeRegistry;
 import org.apache.isis.runtime.persistence.IsisJdoRuntimePlugin;
 import org.apache.isis.runtime.system.context.session.AppLifecycleEvent;
 import org.apache.isis.runtime.system.context.session.SessionLifecycleEvent;
+import org.apache.isis.runtime.system.persistence.PersistenceSession;
+import org.apache.isis.runtime.system.persistence.PersistenceSessionFactory;
 import org.apache.isis.runtime.system.session.IsisSession;
 import org.apache.isis.runtime.system.session.IsisSessionFactory;
 
diff --git a/core/plugins/jdo/datanucleus-5/src/main/java/org/apache/isis/jdo/IsisBootDataNucleus.java b/core/plugins/jdo/datanucleus-5/src/main/java/org/apache/isis/jdo/IsisBootDataNucleus.java
index 787a7a9..092e6c6 100644
--- a/core/plugins/jdo/datanucleus-5/src/main/java/org/apache/isis/jdo/IsisBootDataNucleus.java
+++ b/core/plugins/jdo/datanucleus-5/src/main/java/org/apache/isis/jdo/IsisBootDataNucleus.java
@@ -30,6 +30,7 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 
 import org.apache.isis.jdo.datanucleus.DataNucleusSettings;
+import org.apache.isis.jdo.datanucleus.service.JdoPersistenceLifecycleService;
 import org.apache.isis.jdo.jdosupport.IsisJdoSupportDN5;
 import org.apache.isis.jdo.jdosupport.mixins.Persistable_datanucleusIdLong;
 import org.apache.isis.jdo.metrics.MetricsServiceDefault;
@@ -38,6 +39,7 @@ import org.apache.isis.jdo.persistence.IsisPlatformTransactionManagerForJdo;
 @Configuration
 @Import({
     DataNucleusSettings.class, // config bean
+    JdoPersistenceLifecycleService.class,
     MetricsServiceDefault.class,
     IsisJdoSupportDN5.class,
     IsisPlatformTransactionManagerForJdo.class,
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingBadDomain.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingBadDomain.java
index a6b1630..4f94e17 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingBadDomain.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingBadDomain.java
@@ -24,6 +24,7 @@ import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.TestPropertySource;
 
+import org.apache.isis.commons.internal.plugins.environment.IsisSystemEnvironmentProvider;
 import org.apache.isis.config.IsisConfiguration;
 import org.apache.isis.config.IsisPresets;
 import org.apache.isis.integtestsupport.validate.ValidateDomainModel;
@@ -61,10 +62,11 @@ import lombok.val;
 class DomainModelTest_usingBadDomain {
     
     @Inject private IsisConfiguration configuration;
+    @Inject private IsisSystemEnvironmentProvider isisSystemEnvironmentProvider;
     
     @Test
     void fullIntrospection_shouldBeEnabledByThisTestClass() {
-        assertTrue(IntrospectionMode.isFullIntrospect(configuration));
+        assertTrue(IntrospectionMode.isFullIntrospect(configuration, isisSystemEnvironmentProvider.isisSystemEnvironment()));
     }
     
     @Test