You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2020/12/17 12:20:25 UTC

[isis] branch master updated (4e4d4a4 -> 90c1d59)

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

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


    from 4e4d4a4  ISIS-2294: fixes JPA attached/detached detection logic
     new 8236606  ISIS-2294: fixes the JPA entity tests, finally successful
     new 90c1d59  ISIS-2294: move JPA bootstrapping tests to 'stable'

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../isis/core/metamodel/spec/ManagedObjects.java   |  4 +--
 .../repository/RepositoryServiceDefault.java       |  4 +--
 .../handlers/DomainObjectInvocationHandler.java    |  2 +-
 .../isis/testdomain/jpa/entities/JpaInventory.java |  3 +-
 .../isis/testdomain/jpa/JpaBootstrappingTest.java  | 35 +++++++++++++++-------
 .../resources/DomainObjectResourceServerside.java  |  2 +-
 6 files changed, 32 insertions(+), 18 deletions(-)
 rename regressiontests/{incubating => stable}/src/test/java/org/apache/isis/testdomain/jpa/JpaBootstrappingTest.java (87%)


[isis] 02/02: ISIS-2294: move JPA bootstrapping tests to 'stable'

Posted by ah...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit 90c1d59f84673ba01cd8e3e3df347455ab4fcd19
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu Dec 17 13:16:44 2020 +0100

    ISIS-2294: move JPA bootstrapping tests to 'stable'
---
 .../test/java/org/apache/isis/testdomain/jpa/JpaBootstrappingTest.java    | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/jpa/JpaBootstrappingTest.java b/regressiontests/stable/src/test/java/org/apache/isis/testdomain/jpa/JpaBootstrappingTest.java
similarity index 100%
rename from regressiontests/incubating/src/test/java/org/apache/isis/testdomain/jpa/JpaBootstrappingTest.java
rename to regressiontests/stable/src/test/java/org/apache/isis/testdomain/jpa/JpaBootstrappingTest.java


[isis] 01/02: ISIS-2294: fixes the JPA entity tests, finally successful

Posted by ah...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit 8236606f6b2f0e253e45025e91f8322285d1b3da
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu Dec 17 13:11:59 2020 +0100

    ISIS-2294: fixes the JPA entity tests, finally successful
---
 .../isis/core/metamodel/spec/ManagedObjects.java   |  4 +--
 .../repository/RepositoryServiceDefault.java       |  4 +--
 .../handlers/DomainObjectInvocationHandler.java    |  2 +-
 .../isis/testdomain/jpa/JpaBootstrappingTest.java  | 35 +++++++++++++++-------
 .../isis/testdomain/jpa/entities/JpaInventory.java |  3 +-
 .../resources/DomainObjectResourceServerside.java  |  2 +-
 6 files changed, 32 insertions(+), 18 deletions(-)

diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ManagedObjects.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ManagedObjects.java
index d78b64e..876dd93 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ManagedObjects.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ManagedObjects.java
@@ -408,14 +408,14 @@ public final class ManagedObjects {
             return entityFacet.getEntityState(pojo);
         }
         
-        public static void persistInTransaction(ManagedObject managedObject) {
+        public static void persistInCurrentTransaction(ManagedObject managedObject) {
             requiresEntity(managedObject);
             val spec = managedObject.getSpecification();
             val entityFacet = spec.getFacet(EntityFacet.class);
             entityFacet.persist(spec, managedObject.getPojo());
         }
         
-        public static void destroyInTransaction(ManagedObject managedObject) {
+        public static void destroyInCurrentTransaction(ManagedObject managedObject) {
             requiresEntity(managedObject);
             val spec = managedObject.getSpecification();
             val entityFacet = spec.getFacet(EntityFacet.class);
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/repository/RepositoryServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/repository/RepositoryServiceDefault.java
index 960f1fa..20ea274 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/repository/RepositoryServiceDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/repository/RepositoryServiceDefault.java
@@ -101,7 +101,7 @@ public class RepositoryServiceDefault implements RepositoryService {
         if(!EntityUtil.isDetached(adapter)) {
             return domainObject;
         }
-        EntityUtil.persistInTransaction(adapter);
+        EntityUtil.persistInCurrentTransaction(adapter);
         return domainObject;
     }
 
@@ -120,7 +120,7 @@ public class RepositoryServiceDefault implements RepositoryService {
         }
         val adapter = objectManager.adapt(unwrapped(domainObject));
         if(EntityUtil.isAttached(adapter)) {
-            EntityUtil.destroyInTransaction(adapter);   
+            EntityUtil.destroyInCurrentTransaction(adapter);   
         }
     }
 
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/handlers/DomainObjectInvocationHandler.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/handlers/DomainObjectInvocationHandler.java
index c512ecd..bd1ca0b 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/handlers/DomainObjectInvocationHandler.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/handlers/DomainObjectInvocationHandler.java
@@ -328,7 +328,7 @@ extends DelegatingInvocationHandlerDefault<T> {
         val spec = targetAdapter.getSpecification();
         if(spec.isEntity()) {
             return runExecutionTask(()->{
-                EntityUtil.persistInTransaction(targetAdapter);
+                EntityUtil.persistInCurrentTransaction(targetAdapter);
                 return null;
             }); 
         }
diff --git a/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/jpa/JpaBootstrappingTest.java b/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/jpa/JpaBootstrappingTest.java
index 62adda8..a844b14 100644
--- a/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/jpa/JpaBootstrappingTest.java
+++ b/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/jpa/JpaBootstrappingTest.java
@@ -36,16 +36,17 @@ import org.springframework.test.annotation.Rollback;
 import org.springframework.test.context.TestPropertySource;
 import org.springframework.transaction.PlatformTransactionManager;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.DefaultTransactionDefinition;
 
 import static org.junit.Assert.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import org.apache.isis.applib.services.repository.RepositoryService;
 import org.apache.isis.core.config.presets.IsisPresets;
 import org.apache.isis.core.metamodel.facets.object.entity.EntityFacet;
 import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.core.runtime.iactn.InteractionFactory;
 import org.apache.isis.testdomain.conf.Configuration_usingJpa;
 import org.apache.isis.testdomain.jpa.entities.JpaBook;
 import org.apache.isis.testdomain.jpa.entities.JpaInventory;
@@ -61,7 +62,6 @@ import lombok.val;
         )
 @TestPropertySource(IsisPresets.UseLog4j2Test)
 @Transactional @TestMethodOrder(MethodOrderer.OrderAnnotation.class)
-//XXX JPA support is under construction
 class JpaBootstrappingTest extends IsisIntegrationTestAbstract {
 
     @Inject private Optional<PlatformTransactionManager> platformTransactionManager; 
@@ -97,7 +97,7 @@ class JpaBootstrappingTest extends IsisIntegrationTestAbstract {
 
         val inventory = new JpaInventory("Sample Inventory", products);
         repository.persistAndFlush(inventory);
-
+        
         System.out.println("!!! SETUP DONE");
     }
 
@@ -108,16 +108,31 @@ class JpaBootstrappingTest extends IsisIntegrationTestAbstract {
             assertEquals("JpaTransactionManager", ptm.getClass().getSimpleName());
         });
     }
+    
+    @Test @Order(0) 
+    void transactionalAnnotation_shouldBeSupported() {
+        assertTrue(platformTransactionManager.isPresent());
+        platformTransactionManager.ifPresent(ptm->{
+            
+            val txDef = new DefaultTransactionDefinition();
+            txDef.setPropagationBehavior(DefaultTransactionDefinition.PROPAGATION_MANDATORY);
+                    
+            val txStatus = ptm.getTransaction(txDef);
+            
+            assertNotNull(txStatus);
+            assertFalse(txStatus.isCompleted());
+
+        });
+    }
 
-    @Test @Order(1) 
+    @Test @Order(0) 
     void jpaEntities_shouldBeRecognisedAsSuch() {
         val spec = specLoader.loadSpecification(JpaProduct.class);
         assertTrue(spec.isEntity());
         assertNotNull(spec.getFacet(EntityFacet.class));
     }
-
-
-    @Test @Order(2) @Rollback(false) 
+     
+    @Test @Order(1) @Rollback(false) 
     void sampleInventoryShouldBeSetUp() {
 
 
@@ -145,13 +160,11 @@ class JpaBootstrappingTest extends IsisIntegrationTestAbstract {
         assertEquals("Sample Book", product.getName());
 
     }
-
-    @Test @Order(3) @Rollback(false)
+     
+    @Test @Order(2) @Rollback(false) 
     void aSecondRunShouldWorkAsWell() {
         sampleInventoryShouldBeSetUp();
     }
 
 
-
-
 }
diff --git a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/jpa/entities/JpaInventory.java b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/jpa/entities/JpaInventory.java
index b028f59..c1d1115 100644
--- a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/jpa/entities/JpaInventory.java
+++ b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/jpa/entities/JpaInventory.java
@@ -20,6 +20,7 @@ package org.apache.isis.testdomain.jpa.entities;
 
 import java.util.Set;
 
+import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
@@ -69,7 +70,7 @@ public class JpaInventory {
 
     // 1:n relation
     @Property
-    @OneToMany @JoinColumn(nullable = true)
+    @OneToMany(cascade = CascadeType.PERSIST) @JoinColumn(nullable = true)
     private @Getter @Setter Set<JpaProduct> products;
 }
 
diff --git a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/DomainObjectResourceServerside.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/DomainObjectResourceServerside.java
index fd37967..7143373 100644
--- a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/DomainObjectResourceServerside.java
+++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/DomainObjectResourceServerside.java
@@ -137,7 +137,7 @@ public class DomainObjectResourceServerside extends ResourceAbstract implements
             throw RestfulObjectsApplicationException.createWithBody(HttpStatusCode.BAD_REQUEST, objectRepr, validity.getReason());
         }
 
-        EntityUtil.persistInTransaction(adapter);
+        EntityUtil.persistInCurrentTransaction(adapter);
         
         val domainResourceHelper = DomainResourceHelper.ofObjectResource(resourceContext, adapter);