This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/causeway.git
The following commit(s) were added to refs/heads/main by this push:
new f4660d05aa3 CAUSEWAY-3859: Java record refactoring (part 53)
f4660d05aa3 is described below
commit f4660d05aa32fc0576ae89d31baf6672062e7682
Author: Andi Huber <[email protected]>
AuthorDate: Wed Feb 26 13:40:52 2025 +0100
CAUSEWAY-3859: Java record refactoring (part 53)
---
.../wicket/model/src/main/java/module-info.java | 18 ++++++------
.../links/ActionLinkUiComponentFactoryWkt.java | 34 ----------------------
...ingObjectModel.java => ProposedValueModel.java} | 6 ++--
.../WhereAmIHelper.java => whereAmI/WhereAmI.java} | 8 ++---
.../icontitle/ObjectIconAndTitlePanelFactory.java | 6 ++--
.../wicket/ui/pages/obj/DomainObjectPage.java | 6 ++--
6 files changed, 22 insertions(+), 56 deletions(-)
diff --git a/viewers/wicket/model/src/main/java/module-info.java
b/viewers/wicket/model/src/main/java/module-info.java
index 843c3b1e60d..2ef1cb749fd 100644
--- 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/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/links/ActionLinkUiComponentFactoryWkt.java
b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/links/ActionLinkUiComponentFactoryWkt.java
deleted file mode 100644
index 6957c17050a..00000000000
---
a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/links/ActionLinkUiComponentFactoryWkt.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.causeway.viewer.wicket.model.links;
-
-import java.io.Serializable;
-
-import org.apache.wicket.ajax.markup.html.AjaxLink;
-
-import org.apache.causeway.core.metamodel.object.ManagedObject;
-import org.apache.causeway.viewer.wicket.model.models.ActionModel;
-
-import org.jspecify.annotations.NonNull;
-
-@Deprecated
-public interface ActionLinkUiComponentFactoryWkt
-extends Serializable {
- AjaxLink<ManagedObject> newActionLinkUiComponent(@NonNull ActionModel
actionModel);
-}
diff --git
a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/ChainingObjectModel.java
b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/ProposedValueModel.java
similarity index 93%
rename from
viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/ChainingObjectModel.java
rename to
viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/ProposedValueModel.java
index 9fe882224c6..eaaa4df0188 100644
---
a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/ChainingObjectModel.java
+++
b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/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/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/modelhelpers/WhereAmIHelper.java
b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/whereAmI/WhereAmI.java
similarity index 91%
rename from
viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/modelhelpers/WhereAmIHelper.java
rename to
viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/whereAmI/WhereAmI.java
index e35e7696151..555fc84e847 100644
---
a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/modelhelpers/WhereAmIHelper.java
+++
b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/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/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/object/icontitle/ObjectIconAndTitlePanelFactory.java
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/object/icontitle/ObjectIconAndTitlePanelFactory.java
index c124de3542c..854b710953d 100644
---
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/object/icontitle/ObjectIconAndTitlePanelFactory.java
+++
b/viewers/wicket/ui/src/main/java/org/apache/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/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/obj/DomainObjectPage.java
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/obj/DomainObjectPage.java
index 7802146841b..3aede83c711 100644
---
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/obj/DomainObjectPage.java
+++
b/viewers/wicket/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);
