CAUSEWAY-3859: Java record refactoring (part 46)

apache · Feb 25, 2025 · 852475c · 852475c
1 parent d27bc33
commit 852475c
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 57 deletions.
diff --git a/viewers/wicket/ui/src/main/java/module-info.java b/viewers/wicket/ui/src/main/java/module-info.java
@@ -18,7 +18,6 @@
  */
 module org.apache.causeway.viewer.wicket.ui {
     exports org.apache.causeway.viewer.wicket.ui;
-    exports org.apache.causeway.viewer.wicket.ui.actionresponse;
     exports org.apache.causeway.viewer.wicket.ui.app.logout;
     exports org.apache.causeway.viewer.wicket.ui.app.registry;
     exports org.apache.causeway.viewer.wicket.ui.components;
@@ -86,6 +85,7 @@
     exports org.apache.causeway.viewer.wicket.ui.components.widgets.themepicker;
     exports org.apache.causeway.viewer.wicket.ui.components.widgets.zclip;
     exports org.apache.causeway.viewer.wicket.ui.errors;
+    exports org.apache.causeway.viewer.wicket.ui.exec;
     exports org.apache.causeway.viewer.wicket.ui.pages;
     exports org.apache.causeway.viewer.wicket.ui.pages.about;
     exports org.apache.causeway.viewer.wicket.ui.pages.accmngt.password_reset;

diff --git a/...main/java/org/apache/causeway/viewer/wicket/ui/actionresponse/ExecutionResultHandler.java b/...main/java/org/apache/causeway/viewer/wicket/ui/actionresponse/ExecutionResultHandler.java
diff --git a/...pache/causeway/viewer/wicket/ui/components/attributes/AttributePanelWithInlinePrompt.java b/...pache/causeway/viewer/wicket/ui/components/attributes/AttributePanelWithInlinePrompt.java
@@ -26,7 +26,7 @@
 import org.apache.wicket.markup.html.basic.Label;
 import org.apache.wicket.markup.html.form.FormComponent;
 import org.apache.wicket.markup.repeater.RepeatingView;
-
+import org.jspecify.annotations.NonNull;
 import org.jspecify.annotations.Nullable;
 
 import org.apache.causeway.applib.services.placeholder.PlaceholderRenderService.PlaceholderLiteral;
@@ -40,13 +40,12 @@
 import org.apache.causeway.viewer.wicket.ui.components.attributes.AttributeFragmentFactory.FieldFrame;
 import org.apache.causeway.viewer.wicket.ui.components.attributes.AttributeFragmentFactory.PromptFragment;
 import org.apache.causeway.viewer.wicket.ui.components.widgets.actionlink.ActionLink;
-import org.apache.causeway.viewer.wicket.ui.panels.FormExecutorDefault;
+import org.apache.causeway.viewer.wicket.ui.exec.FormExecutorDefault;
 import org.apache.causeway.viewer.wicket.ui.util.Wkt;
 import org.apache.causeway.viewer.wicket.ui.util.WktTooltips;
 
 import lombok.AccessLevel;
 import lombok.Getter;
-import org.jspecify.annotations.NonNull;
 
 import de.agilecoders.wicket.extensions.markup.html.bootstrap.form.fileinput.BootstrapFileInputField;
 

diff --git a/...n/java/org/apache/causeway/viewer/wicket/ui/components/widgets/actionlink/ActionLink.java b/...n/java/org/apache/causeway/viewer/wicket/ui/components/widgets/actionlink/ActionLink.java
@@ -25,6 +25,7 @@
 import org.apache.wicket.extensions.ajax.markup.html.IndicatingAjaxLink;
 import org.apache.wicket.markup.ComponentTag;
 import org.apache.wicket.request.cycle.RequestCycle;
+import org.jspecify.annotations.NonNull;
 
 import org.apache.causeway.commons.internal.assertions._Assert;
 import org.apache.causeway.commons.internal.debug._Probe;
@@ -45,15 +46,13 @@
 import org.apache.causeway.viewer.wicket.ui.app.registry.HasComponentFactoryRegistry;
 import org.apache.causeway.viewer.wicket.ui.components.attributes.AttributeFragmentFactory.FrameFragment;
 import org.apache.causeway.viewer.wicket.ui.components.layout.bs.BSGridPanelFactory;
+import org.apache.causeway.viewer.wicket.ui.exec.FormExecutorDefault;
 import org.apache.causeway.viewer.wicket.ui.pages.obj.DomainObjectPage;
-import org.apache.causeway.viewer.wicket.ui.panels.FormExecutorDefault;
 import org.apache.causeway.viewer.wicket.ui.panels.PanelUtil;
 import org.apache.causeway.viewer.wicket.ui.util.Wkt;
 
 import static org.apache.causeway.commons.internal.base._Casts.castTo;
 
-import org.jspecify.annotations.NonNull;
-
 /**
  *
  * @implNote <pre>

diff --git a/...ctionresponse/DownloadHandlerFactory.java → ...icket/ui/exec/DownloadHandlerFactory.java b/...ctionresponse/DownloadHandlerFactory.java → ...icket/ui/exec/DownloadHandlerFactory.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.causeway.viewer.wicket.ui.actionresponse;
+package org.apache.causeway.viewer.wicket.ui.exec;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;

diff --git a/...wicket/ui/panels/FormExecutorDefault.java → ...r/wicket/ui/exec/FormExecutorDefault.java b/...wicket/ui/panels/FormExecutorDefault.java → ...r/wicket/ui/exec/FormExecutorDefault.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.causeway.viewer.wicket.ui.panels;
+package org.apache.causeway.viewer.wicket.ui.exec;
 
 import java.util.Optional;
 
@@ -34,7 +34,6 @@
 import org.apache.causeway.viewer.wicket.model.models.FormExecutorContext;
 import org.apache.causeway.viewer.wicket.model.models.HasCommonContext;
 import org.apache.causeway.viewer.wicket.model.models.PropertyModel;
-import org.apache.causeway.viewer.wicket.ui.actionresponse.ExecutionResultHandler;
 
 import lombok.extern.log4j.Log4j2;
 
@@ -109,8 +108,14 @@ public FormExecutionOutcome executeAndProcessResults(
                 return FormExecutionOutcome.SUCCESS_IN_NESTED_CONTEXT_SO_STAY_ON_PAGE;
             }
 
-            new ExecutionResultHandler(actionOrPropertyModel)
-                .handle(ajaxTarget, resultAdapter);
+            // triggers ManagedObject.getBookmarkRefreshed()
+            var mediator = actionOrPropertyModel.fold(
+                    act->Mediator.determineAndInterpretResult(act, ajaxTarget, resultAdapter),
+                    prop->Mediator.toDomainObjectPage(resultAdapter));
+
+            // redirect using associated strategy
+            // on property edit, triggers SQL update (on JPA)
+            mediator.handle();
 
             return FormExecutionOutcome.SUCCESS_AND_REDIRECED_TO_RESULT_PAGE; // success (valid args), allow redirect
 

diff --git a/...er/wicket/ui/actionresponse/Mediator.java → ...seway/viewer/wicket/ui/exec/Mediator.java b/...er/wicket/ui/actionresponse/Mediator.java → ...seway/viewer/wicket/ui/exec/Mediator.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.causeway.viewer.wicket.ui.actionresponse;
+package org.apache.causeway.viewer.wicket.ui.exec;
 
 import java.time.Duration;
 

diff --git a/...et/ui/actionresponse/MediatorFactory.java → ...iewer/wicket/ui/exec/MediatorFactory.java b/...et/ui/actionresponse/MediatorFactory.java → ...iewer/wicket/ui/exec/MediatorFactory.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.causeway.viewer.wicket.ui.actionresponse;
+package org.apache.causeway.viewer.wicket.ui.exec;
 
 import java.net.URL;
 
@@ -45,7 +45,7 @@
 import org.apache.causeway.viewer.wicket.model.models.ValueModel;
 import org.apache.causeway.viewer.wicket.model.models.VoidModel;
 import org.apache.causeway.viewer.wicket.model.models.coll.CollectionModelStandalone;
-import org.apache.causeway.viewer.wicket.ui.actionresponse.Mediator.ExecutionResultHandlingStrategy;
+import org.apache.causeway.viewer.wicket.ui.exec.Mediator.ExecutionResultHandlingStrategy;
 import org.apache.causeway.viewer.wicket.ui.pages.PageClassRegistry;
 import org.apache.causeway.viewer.wicket.ui.pages.standalonecollection.StandaloneCollectionPage;
 import org.apache.causeway.viewer.wicket.ui.pages.value.ValuePage;

diff --git a/...i/actionresponse/PageRedirectRequest.java → ...r/wicket/ui/exec/PageRedirectRequest.java b/...i/actionresponse/PageRedirectRequest.java → ...r/wicket/ui/exec/PageRedirectRequest.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.causeway.viewer.wicket.ui.actionresponse;
+package org.apache.causeway.viewer.wicket.ui.exec;
 
 import org.apache.wicket.core.request.handler.BookmarkablePageRequestHandler;
 import org.apache.wicket.core.request.handler.PageProvider;

diff --git a/...cket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/panels/PromptFormAbstract.java b/...cket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/panels/PromptFormAbstract.java
@@ -43,6 +43,7 @@
 import org.apache.causeway.viewer.wicket.model.models.PropertyModel;
 import org.apache.causeway.viewer.wicket.ui.components.attributes.AttributeModelChangeListener;
 import org.apache.causeway.viewer.wicket.ui.components.attributes.AttributePanel;
+import org.apache.causeway.viewer.wicket.ui.exec.FormExecutorDefault;
 import org.apache.causeway.viewer.wicket.ui.pages.PageAbstract;
 import org.apache.causeway.viewer.wicket.ui.pages.obj.DomainObjectPage;
 import org.apache.causeway.viewer.wicket.ui.util.Wkt;