Progress

Author: dstepanov

data-hibernate-jpa/src/main/java/io/micronaut/data/hibernate/jakarta/data/HibernateJakartaDataPersistExceptionConverter.java

@@ -22,7 +22,9 @@
 import jakarta.data.exceptions.EntityExistsException;
 import jakarta.data.exceptions.OptimisticLockingFailureException;
 import jakarta.inject.Singleton;
+import jakarta.persistence.OptimisticLockException;
 import jakarta.persistence.PersistenceException;
+import org.hibernate.StaleStateException;
 import org.hibernate.exception.ConstraintViolationException;
 
 /**
@@ -41,6 +43,9 @@ public Exception convert(Exception exception) {
         if (exception instanceof ConstraintViolationException) {
             throw new EntityExistsException(exception.getMessage(), exception);
         }
+        if (exception instanceof StaleStateException || exception instanceof OptimisticLockException) {
+            throw new EntityExistsException(exception.getMessage(), exception);
+        }
         if (exception instanceof PersistenceException) {
             return new DataException(exception.getMessage(), exception);
         }

data-hibernate-jpa/src/main/java/io/micronaut/data/hibernate/operations/HibernateJpaOperations.java

@@ -51,6 +51,7 @@
 import io.micronaut.data.model.runtime.QueryParameterBinding;
 import io.micronaut.data.model.runtime.RuntimeEntityRegistry;
 import io.micronaut.data.model.runtime.RuntimePersistentEntity;
+import io.micronaut.data.model.runtime.RuntimePersistentProperty;
 import io.micronaut.data.model.runtime.StoredQuery;
 import io.micronaut.data.model.runtime.UpdateBatchOperation;
 import io.micronaut.data.model.runtime.UpdateOperation;
@@ -410,11 +411,17 @@ public <T> T persist(@NonNull InsertOperation<T> operation) {
                 return executeUpdate(operation, session, storedQuery);
             }
             T entity = operation.getEntity();
-//            if (persistOrMergeOnSave) {
-//                entity = session.merge(entity);
-//            } else {
+            if (persistOrMergeOnSave) {
+                RuntimePersistentEntity<T> persistentEntity = getEntity(operation.getRootEntity());
+                RuntimePersistentProperty<T> identity = persistentEntity.getIdentity();
+                if (identity != null && identity.getProperty().get(entity) == null) {
+                    session.persist(entity);
+                } else {
+                    entity = session.merge(entity);
+                }
+            } else {
                 session.persist(entity);
-//            }
+            }
             flushIfNecessary(session, operation.getAnnotationMetadata());
             return entity;
         });

data-hibernate-jpa/src/test/groovy/io/micronaut/data/hibernate/jakarta_data/entity/EntityTests.java

@@ -59,6 +59,8 @@
  * can run against a provider that supports any Entity type.
  */
 //@Property(name = "jpa.default.properties.hibernate.show_sql", value = "true")
+@Property(name = "jpa.default.properties.uniqueResultOnFindOne", value = "true")
+@Property(name = "jpa.default.properties.persistOrMergeOnSave", value = "true")
 @H2DBProperties
 @MicronautTest(transactional = false)
 public class EntityTests {
@@ -148,7 +150,6 @@ public void testBasicRepository() {
         assertEquals(60L, numbers.findById(60L).orElseThrow().getId());
     }
 
-    @Disabled // Pending feature
     @Test
     public void testBasicRepositoryBuiltInMethods() {
 
@@ -250,7 +251,6 @@ public void testBasicRepositoryBuiltInMethods() {
         assertEquals(0, boxes.findAll().count());
     }
 
-    @Disabled // Pending feature
     @Test
     public void testBasicRepositoryMethods() {
 

data-hibernate-jpa/src/test/groovy/io/micronaut/data/hibernate/jakarta_data/persistence/PersistenceEntityTests.java

@@ -7,8 +7,6 @@
 import jakarta.data.Sort;
 import jakarta.data.exceptions.EntityExistsException;
 import jakarta.data.exceptions.OptimisticLockingFailureException;
-import jakarta.data.repository.Find;
-import jakarta.data.repository.OrderBy;
 import jakarta.inject.Inject;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
@@ -31,6 +29,8 @@
  * Execute tests with a Persistence specific entity with a repository that requires read and writes (AKA not read-only)
  */
 //@Property(name = "jpa.default.properties.hibernate.show_sql", value = "true")
+@Property(name = "jpa.default.properties.uniqueResultOnFindOne", value = "true")
+@Property(name = "jpa.default.properties.persistOrMergeOnSave", value = "true")
 @H2DBProperties
 @MicronautTest(transactional = false)
 public class PersistenceEntityTests {

jakarta-data-tck/support/src/main/java/io/micronaut/validation/tck/TckDeployableContainer.java

@@ -144,7 +144,8 @@ public ProtocolMetaData deploy(Archive<?> archive) {
 
             ApplicationContext applicationContext = ApplicationContext.builder()
                 .properties(Map.of(
-                    "jpa.default.properties.uniqueResultOnFindOne", "true"
+                    "jpa.default.properties.uniqueResultOnFindOne", "true",
+                    "jpa.default.properties.persistOrMergeOnSave", "true"
                 ))
                 .classLoader(classLoader)
                 .build()