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 cd7cf1ad2e6 CAUSEWAY-3859: Java record refactoring (part 49)
cd7cf1ad2e6 is described below
commit cd7cf1ad2e68768bd6e2af4684a65c1d914100fa
Author: Andi Huber <[email protected]>
AuthorDate: Wed Feb 26 10:40:04 2025 +0100
CAUSEWAY-3859: Java record refactoring (part 49)
---
.../wicket/model/models/DelegatingModel.java | 71 ----------------------
...lWithMultiChoice.java => MultiChoiceModel.java} | 7 ++-
...ithSingleChoice.java => SingleChoiceModel.java} | 7 ++-
.../models/interaction/prop/UiPropertyWkt.java | 45 ++++++++------
.../ui/components/widgets/select2/Select2.java | 8 +--
5 files changed, 43 insertions(+), 95 deletions(-)
diff --git
a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/DelegatingModel.java
b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/DelegatingModel.java
deleted file mode 100644
index 15fb80c9385..00000000000
---
a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/DelegatingModel.java
+++ /dev/null
@@ -1,71 +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.models;
-
-import org.apache.wicket.model.IModel;
-
-//TODO[causeway-viewer-wicket-model-CAUSEWAY-3859] intermediate refactoring
helper, perhaps remove later
-public class DelegatingModel<T> implements IModel<T> {
- private static final long serialVersionUID = 1L;
-
- private IModel<T> delegate;
-
- public DelegatingModel(final IModel<T> modelObject) {
- this.delegate = modelObject;
- }
-
- @Override
- public final void detach() {
- if(delegate!=null) delegate.detach();
- }
-
- @Override
- public final void setObject(final T object) {
- delegate.setObject(object);
- }
-
- @Override
- public final T getObject() {
- return delegate!=null
- ? delegate.getObject()
- : null;
- }
-
- public final IModel<?> getChainedModel() {
- return delegate;
- }
-
- @Override
- public String toString() {
- return new StringBuilder("Model:classname=[")
- .append(getClass().getName()).append(']')
- .append(":nestedModel=[").append(delegate).append(']')
- .toString();
- }
-
- public final Object getInnermostModelOrObject() {
- Object object = delegate;
- while (object instanceof IModel) {
- Object tmp = ((IModel<?>)object).getObject();
- if (tmp == object) break;
- object = tmp;
- }
- return object;
- }
-}
diff --git
a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/AttributeModelWithMultiChoice.java
b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/MultiChoiceModel.java
similarity index 95%
rename from
viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/AttributeModelWithMultiChoice.java
rename to
viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/MultiChoiceModel.java
index e0143674fef..3a4beec5ebf 100644
---
a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/AttributeModelWithMultiChoice.java
+++
b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/MultiChoiceModel.java
@@ -36,7 +36,7 @@
* with the parent {@link UiAttributeWkt}, allowing also for pending values.
*/
@Log4j2
-public record AttributeModelWithMultiChoice(
+public record MultiChoiceModel(
/**
* chaining idiom: the {@link UiAttributeWkt} we are chained to
*/
@@ -69,4 +69,9 @@ public void setObject(final ArrayList<ObjectMemento>
unpackedMemento) {
pendingValue().getValue().setValue(getObjectManager().demementify(packedMemento));
}
+ @Override
+ public void detach() {
+ attributeModel.detach();
+ }
+
}
diff --git
a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/AttributeModelWithSingleChoice.java
b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/SingleChoiceModel.java
similarity index 93%
rename from
viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/AttributeModelWithSingleChoice.java
rename to
viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/SingleChoiceModel.java
index 19f2d0407c2..04173a063cc 100644
---
a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/AttributeModelWithSingleChoice.java
+++
b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/SingleChoiceModel.java
@@ -29,7 +29,7 @@
* with the parent {@link UiAttributeWkt}.
*/
//@Log4j2
-public record AttributeModelWithSingleChoice(
+public record SingleChoiceModel(
/**
* chaining idiom: the {@link UiAttributeWkt} we are chained to
*/
@@ -49,4 +49,9 @@ public void setObject(final ObjectMemento memento) {
getObjectManager().demementify(memento));
}
+ @Override
+ public void detach() {
+ attributeModel.detach();
+ }
+
}
diff --git
a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/interaction/prop/UiPropertyWkt.java
b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/interaction/prop/UiPropertyWkt.java
index ab9bd351d1e..d836c629ce2 100644
---
a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/interaction/prop/UiPropertyWkt.java
+++
b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/interaction/prop/UiPropertyWkt.java
@@ -19,6 +19,7 @@
package org.apache.causeway.viewer.wicket.model.models.interaction.prop;
import org.apache.wicket.model.ChainingModel;
+import org.apache.wicket.model.IModel;
import org.apache.causeway.core.metamodel.context.HasMetaModelContext;
import
org.apache.causeway.core.metamodel.interactions.managed.PropertyInteraction;
@@ -28,7 +29,6 @@
import org.apache.causeway.viewer.commons.model.attrib.UiProperty;
import org.apache.causeway.viewer.commons.model.object.HasUiParentObject;
import org.apache.causeway.viewer.commons.model.object.UiObject;
-import org.apache.causeway.viewer.wicket.model.models.DelegatingModel;
/**
* <i>Property Interaction</i> model bound to its owner {@link
PropertyInteractionWkt}.
@@ -36,46 +36,55 @@
* @see PropertyInteractionWkt
* @see ChainingModel
*/
-public final class UiPropertyWkt
-extends DelegatingModel<PropertyInteraction>
+public record UiPropertyWkt(
+ PropertyInteractionWkt delegate)
implements
+ IModel<PropertyInteraction>,
HasMetaModelContext,
HasUiParentObject<UiObject>,
UiProperty {
- private static final long serialVersionUID = 1L;
-
- UiPropertyWkt(
- final PropertyInteractionWkt model) {
- super(model);
- }
-
- public final PropertyInteraction propertyInteraction() {
- return getObject();
+ public PropertyInteraction propertyInteraction() {
+ return delegate.getObject();
}
- public final PropertyInteractionWkt propertyInteractionModel() {
- return (PropertyInteractionWkt) getChainedModel();
+ public PropertyInteractionWkt propertyInteractionModel() {
+ return delegate;
}
@Override
- public final UiObject getParentUiModel() {
+ public UiObject getParentUiModel() {
return ()->getOwner();
}
@Override
- public final ManagedObject getOwner() {
+ public ManagedObject getOwner() {
return propertyInteraction().getManagedProperty().get().getOwner();
}
@Override
- public final OneToOneAssociation getMetaModel() {
+ public OneToOneAssociation getMetaModel() {
return propertyInteraction().getManagedProperty().get().getMetaModel();
}
@Override
- public final PropertyNegotiationModel getPendingPropertyModel() {
+ public PropertyNegotiationModel getPendingPropertyModel() {
return propertyInteractionModel().propertyNegotiationModel();
}
+ @Override
+ public void detach() {
+ delegate.detach();
+ }
+
+ @Override
+ public void setObject(final PropertyInteraction object) {
+ delegate.setObject(object);
+ }
+
+ @Override
+ public PropertyInteraction getObject() {
+ return propertyInteraction();
+ }
+
}
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/select2/Select2.java
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/select2/Select2.java
index 68274d4c2a6..3897393e417 100644
---
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/select2/Select2.java
+++
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/select2/Select2.java
@@ -29,8 +29,8 @@
import org.apache.causeway.core.metamodel.object.ManagedObject;
import org.apache.causeway.core.metamodel.objectmanager.memento.ObjectMemento;
import org.apache.causeway.core.metamodel.util.Facets;
-import
org.apache.causeway.viewer.wicket.model.models.AttributeModelWithMultiChoice;
-import
org.apache.causeway.viewer.wicket.model.models.AttributeModelWithSingleChoice;
+import org.apache.causeway.viewer.wicket.model.models.MultiChoiceModel;
+import org.apache.causeway.viewer.wicket.model.models.SingleChoiceModel;
import org.apache.causeway.viewer.wicket.model.models.UiAttributeWkt;
import
org.apache.causeway.viewer.wicket.ui.components.attributes.AttributeModelChangeDispatcher;
@@ -43,11 +43,11 @@ static Select2 create(
var choiceProvider = new ChoiceProvider(attributeModel);
var select2 = attributeModel.isSingular()
? new SingleChoice(id,
- new
AttributeModelWithSingleChoice(attributeModel),
+ new SingleChoiceModel(attributeModel),
attributeModel,
choiceProvider)
: new MultiChoice(id,
- _Casts.uncheckedCast(new
AttributeModelWithMultiChoice(attributeModel)),
+ _Casts.uncheckedCast(new
MultiChoiceModel(attributeModel)),
attributeModel,
choiceProvider);
var component = select2.component();
