TAP5-2749: Incorrect behavior of getIfExists in EntityApplicationStat…

…ePersistenceStrategy (#36) * TAP5-2749: fixing incorrect behavior of getIfExists in subclasses of SessionApplicationStatePersistenceStrategy * TAP5-2749: add integration test * TAP5-2749: use existing test aplication instead of creating new one * TAP5-2749: Simplified test. * TAP5-2749: Removed obsolete runTestApp7 task. --------- Co-authored-by: Volker Lamp <vlamp@apache.org>
apache · Apr 23, 2023 · dca4fd0 · dca4fd0
1 parent 9501c0f
commit dca4fd0
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 5 deletions.
diff --git a/...va/org/apache/tapestry5/internal/services/SessionApplicationStatePersistenceStrategy.java b/...va/org/apache/tapestry5/internal/services/SessionApplicationStatePersistenceStrategy.java
@@ -72,11 +72,16 @@ public <T> T getIfExists(Class<T> ssoClass)
 
             Object sso = session.getAttribute(key);
 
-            return sso != null ? (T)sso : null;
+            return transformPersistedValue(sso);
         }
         return null;
     }
 
+    protected <T> T transformPersistedValue(Object value)
+    {
+        return (T) value;
+    }
+
     protected <T> String buildKey(Class<T> ssoClass)
     {
         return PREFIX + ssoClass.getName();

diff --git a/...rg/apache/tapestry5/hibernate/web/internal/EntityApplicationStatePersistenceStrategy.java b/...rg/apache/tapestry5/hibernate/web/internal/EntityApplicationStatePersistenceStrategy.java
@@ -36,6 +36,12 @@ public EntityApplicationStatePersistenceStrategy(Request request, Session hibern
         delegate = new EntityPersistentFieldStrategy(hibernateSession, null);
     }
 
+    @Override
+    protected <T> T transformPersistedValue(Object value)
+    {
+        return value instanceof SessionRestorable ? (T) delegate.convertPersistedToApplicationValue(value) : (T) value;
+    }
+
     @Override
     @SuppressWarnings("unchecked")
     public <T> T get(Class<T> ssoClass, ApplicationStateCreator<T> creator)
@@ -44,7 +50,7 @@ public <T> T get(Class<T> ssoClass, ApplicationStateCreator<T> creator)
 
         if (persistedValue instanceof SessionRestorable)
         {
-            Object restored = delegate.convertPersistedToApplicationValue(persistedValue);
+            Object restored = transformPersistedValue(persistedValue);
 
             // Maybe throw an exception instead?
             if (restored == null)

diff --git a/tapestry-jpa/build.gradle b/tapestry-jpa/build.gradle
@@ -38,4 +38,3 @@ task runTestApp6(type:JavaExec) {
     args "-d", "src/test/app6", "-p", "8080"
     classpath += project.sourceSets.test.runtimeClasspath
 }
-
diff --git a/...ain/java/org/apache/tapestry5/internal/jpa/EntityApplicationStatePersistenceStrategy.java b/...ain/java/org/apache/tapestry5/internal/jpa/EntityApplicationStatePersistenceStrategy.java
@@ -32,6 +32,12 @@ public EntityApplicationStatePersistenceStrategy(final Request request,
         this.entityManagerManager = entityManagerManager;
     }
 
+    @Override
+    protected <T> T transformPersistedValue(Object value)
+    {
+        return value instanceof PersistedEntity ? (T) ((PersistedEntity) value).restore(entityManagerManager) : (T) value;
+    }
+
     @Override
     public <T> T get(final Class<T> ssoClass, final ApplicationStateCreator<T> creator)
     {
@@ -41,7 +47,7 @@ public <T> T get(final Class<T> ssoClass, final ApplicationStateCreator<T> creat
         {
             final PersistedEntity persisted = (PersistedEntity) persistedValue;
 
-            final Object restored = persisted.restore(entityManagerManager);
+            final Object restored = transformPersistedValue(persisted);
 
             // shall we maybe throw an exception instead?
             if (restored == null)

diff --git a/tapestry-jpa/src/test/app6/SSOEntity.tml b/tapestry-jpa/src/test/app6/SSOEntity.tml
@@ -2,9 +2,10 @@
 <body>
 	<p>entity name: <span id="name">${user?.firstName}</span></p>
 	<p>persisted entity class name: <span id="persistedEntityClassName">${persistedEntityClassName}</span></p>
+	<p>userIfExists: <span id="userIfExists">${userIfExists}</span></p>
 	<p><t:eventlink event="persistEntity">persist entity</t:eventlink></p>
 	<p><t:eventlink event="setToNull">set to null</t:eventlink></p>
 	<p><t:eventlink event="setToTransient">set to transient</t:eventlink></p>
 	<p><t:eventlink event="delete">delete</t:eventlink></p>
 </body>
-</html>
+</html>
diff --git a/tapestry-jpa/src/test/java/org/example/app6/pages/SSOEntity.java b/tapestry-jpa/src/test/java/org/example/app6/pages/SSOEntity.java
@@ -20,6 +20,7 @@
 import org.apache.tapestry5.http.services.Request;
 import org.apache.tapestry5.http.services.Session;
 import org.apache.tapestry5.ioc.annotations.Inject;
+import org.apache.tapestry5.services.ApplicationStateManager;
 import org.example.app6.entities.User;
 import org.example.app6.services.UserDAO;
 
@@ -35,6 +36,14 @@ public class SSOEntity
     @Inject
     private Request request;
 
+    @Inject
+    ApplicationStateManager manager;
+
+    public User getUserIfExists()
+    {
+        return manager.getIfExists(User.class);
+    }
+
     void onPersistEntity()
     {
         final User user = new User();