CAUSEWAY-3859: Java record refactoring (part 53)

apache · Feb 26, 2025 · f4660d0 · f4660d0
1 parent 4063fb4
commit f4660d0
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 56 deletions.
diff --git a/viewers/wicket/model/src/main/java/module-info.java b/viewers/wicket/model/src/main/java/module-info.java
@@ -17,22 +17,22 @@
  *  under the License.
  */
 module org.apache.causeway.viewer.wicket.model {
-    exports org.apache.causeway.viewer.wicket.model.value;
-    exports org.apache.causeway.viewer.wicket.model.models.interaction.prop;
-    exports org.apache.causeway.viewer.wicket.model.modelhelpers;
+    exports org.apache.causeway.viewer.wicket.model;
+    exports org.apache.causeway.viewer.wicket.model.causeway;
     exports org.apache.causeway.viewer.wicket.model.hints;
     exports org.apache.causeway.viewer.wicket.model.itemreuse;
-    exports org.apache.causeway.viewer.wicket.model.models;
-    exports org.apache.causeway.viewer.wicket.model;
     exports org.apache.causeway.viewer.wicket.model.links;
+    exports org.apache.causeway.viewer.wicket.model.mementos;
+    exports org.apache.causeway.viewer.wicket.model.models.coll;
     exports org.apache.causeway.viewer.wicket.model.models.interaction.act;
+    exports org.apache.causeway.viewer.wicket.model.models.interaction.prop;
     exports org.apache.causeway.viewer.wicket.model.models.interaction;
+    exports org.apache.causeway.viewer.wicket.model.models;
     exports org.apache.causeway.viewer.wicket.model.tableoption;
-    exports org.apache.causeway.viewer.wicket.model.util;
-    exports org.apache.causeway.viewer.wicket.model.mementos;
-    exports org.apache.causeway.viewer.wicket.model.models.coll;
-    exports org.apache.causeway.viewer.wicket.model.causeway;
     exports org.apache.causeway.viewer.wicket.model.timetaken;
+    exports org.apache.causeway.viewer.wicket.model.util;
+    exports org.apache.causeway.viewer.wicket.model.value;
+    exports org.apache.causeway.viewer.wicket.model.whereAmI;
 
     requires jakarta.activation;
     requires static lombok;

diff --git a/...n/java/org/apache/causeway/viewer/wicket/model/links/ActionLinkUiComponentFactoryWkt.java b/...n/java/org/apache/causeway/viewer/wicket/model/links/ActionLinkUiComponentFactoryWkt.java
diff --git a/...ket/model/models/ChainingObjectModel.java → ...cket/model/models/ProposedValueModel.java b/...ket/model/models/ChainingObjectModel.java → ...cket/model/models/ProposedValueModel.java
@@ -27,15 +27,15 @@
 /**
  * Wraps a {@link UiAttributeWkt} to act as an {@link ObjectAdapterModel}.
  */
-public record ChainingObjectModel(
+public record ProposedValueModel(
     /**
      * chaining idiom: the {@link UiAttributeWkt} we are chained to
      */
     UiAttributeWkt attributeModel)
 implements ObjectAdapterModel {
 
-    public static ChainingObjectModel chain(final UiAttributeWkt attributeModel) {
-        return new ChainingObjectModel(attributeModel);
+    public static ProposedValueModel chain(final UiAttributeWkt attributeModel) {
+        return new ProposedValueModel(attributeModel);
     }
 
     /**

diff --git a/...et/model/modelhelpers/WhereAmIHelper.java → ...iewer/wicket/model/whereAmI/WhereAmI.java b/...et/model/modelhelpers/WhereAmIHelper.java → ...iewer/wicket/model/whereAmI/WhereAmI.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.causeway.viewer.wicket.model.modelhelpers;
+package org.apache.causeway.viewer.wicket.model.whereAmI;
 
 import java.util.LinkedList;
 import java.util.List;
@@ -28,13 +28,13 @@
 /**
  * @since 2.0
  */
-public record WhereAmIHelper(
+public record WhereAmI(
         /** immutable start node of the navigable parent chain */
         UiObjectWkt startOfChain,
         List<Object> reversedChainOfParents,
         boolean isWhereAmIEnabled) {
 
-    public static WhereAmIHelper of(final UiObjectWkt startOfChain) {
+    public static WhereAmI of(final UiObjectWkt startOfChain) {
         var mmc = startOfChain.getMetaModelContext();
         var settings = mmc.getConfiguration().getViewer().getWicket().getBreadcrumbs();
         var isWhereAmIEnabled = settings.isEnabled();
@@ -49,7 +49,7 @@ public static WhereAmIHelper of(final UiObjectWkt startOfChain) {
             .streamParentChainOf(startNode, maxChainLength)
             .forEach(reversedChainOfParents::addFirst);
 
-        return new WhereAmIHelper(startOfChain, reversedChainOfParents, isWhereAmIEnabled);
+        return new WhereAmI(startOfChain, reversedChainOfParents, isWhereAmIEnabled);
     }
 
     /**

diff --git a/...causeway/viewer/wicket/ui/components/object/icontitle/ObjectIconAndTitlePanelFactory.java b/...causeway/viewer/wicket/ui/components/object/icontitle/ObjectIconAndTitlePanelFactory.java
@@ -24,7 +24,7 @@
 import org.apache.causeway.commons.internal.exceptions._Exceptions;
 import org.apache.causeway.core.metamodel.spec.ObjectSpecification;
 import org.apache.causeway.viewer.commons.model.components.UiComponentType;
-import org.apache.causeway.viewer.wicket.model.models.ChainingObjectModel;
+import org.apache.causeway.viewer.wicket.model.models.ProposedValueModel;
 import org.apache.causeway.viewer.wicket.model.models.ObjectAdapterModel;
 import org.apache.causeway.viewer.wicket.model.models.UiAttributeWkt;
 import org.apache.causeway.viewer.wicket.ui.ComponentFactory;
@@ -34,7 +34,7 @@
  * {@link ComponentFactory} for {@link ObjectIconAndTitlePanel}.
  *
  * @implNote Knows how to deal with {@link ObjectAdapterModel}. And for
- * {@link UiAttributeWkt} we have an adapter {@link ChainingObjectModel}
+ * {@link UiAttributeWkt} we have an adapter {@link ProposedValueModel}
  * that implements {@link ObjectAdapterModel}, such that it can also deal
  * with {@link UiAttributeWkt}.
  *
@@ -87,7 +87,7 @@ public Component createComponent(final String id, final IModel<?> model) {
         } else if (model instanceof UiAttributeWkt) {
             var attributeModel = (UiAttributeWkt) model;
             // effectively acts as an adapter from UiAttribute to ObjectAdapterModel
-            objectAdapterModel = ChainingObjectModel.chain(attributeModel);
+            objectAdapterModel = ProposedValueModel.chain(attributeModel);
         } else {
             throw _Exceptions.unexpectedCodeReach();
         }

diff --git a/...ket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/obj/DomainObjectPage.java b/...ket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/obj/DomainObjectPage.java
@@ -44,9 +44,9 @@
 import org.apache.causeway.core.metamodel.util.Facets;
 import org.apache.causeway.viewer.commons.model.components.UiComponentType;
 import org.apache.causeway.viewer.wicket.model.hints.UiHintContainer;
-import org.apache.causeway.viewer.wicket.model.modelhelpers.WhereAmIHelper;
 import org.apache.causeway.viewer.wicket.model.models.UiObjectWkt;
 import org.apache.causeway.viewer.wicket.model.util.PageParameterUtils;
+import org.apache.causeway.viewer.wicket.model.whereAmI.WhereAmI;
 import org.apache.causeway.viewer.wicket.ui.components.object.icontitle.ObjectIconAndTitlePanelFactory;
 import org.apache.causeway.viewer.wicket.ui.pages.PageAbstract;
 import org.apache.causeway.viewer.wicket.ui.util.Wkt;
@@ -163,7 +163,7 @@ private void buildPage() {
 
         themeDiv.addOrReplace(domainObjectContainer);
 
-        addWhereAmIIfShown(domainObjectContainer, WhereAmIHelper.of(model));
+        addWhereAmIIfShown(domainObjectContainer, WhereAmI.of(model));
 
         // bookmarks and breadcrumbs
         bookmarkPageIfShown(model);
@@ -183,7 +183,7 @@ private void buildPage() {
 
     protected void addWhereAmIIfShown(
             final WebMarkupContainer domainObjectContainer,
-            final WhereAmIHelper whereAmIModel) {
+            final WhereAmI whereAmIModel) {
 
         var whereAmIContainer = new WebMarkupContainer(ID_WHEREAMI_CONTAINER);
         domainObjectContainer.addOrReplace(whereAmIContainer);