You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2022/01/10 08:02:11 UTC
[isis] branch master updated: ISIS-2856: more deprecations removed
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new 00baa88 ISIS-2856: more deprecations removed
00baa88 is described below
commit 00baa88cf082d604bff99115d6339c418434d64a
Author: Andi Huber <ah...@apache.org>
AuthorDate: Mon Jan 10 09:02:04 2022 +0100
ISIS-2856: more deprecations removed
---
.../core/metamodel/interactions/managed/ManagedValue.java | 9 ---------
.../util/interaction/DomainObjectTesterFactory.java | 14 ++++++++++----
2 files changed, 10 insertions(+), 13 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/ManagedValue.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/ManagedValue.java
index ae5cf21..b4eca98 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/ManagedValue.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/ManagedValue.java
@@ -49,13 +49,4 @@ public interface ManagedValue {
valueHolder.setValue(newValue);
}
- /**
- * Requires specified objects, that is ManagedObjects require an ObjectSpecification.
- * @deprecated does not preserve memoized bookmarks; use for testing only!
- */
- @Deprecated
- default void updatePojo(final UnaryOperator<Object> updater) {
- update(v->ManagedObject.of(v.getSpecification(), updater.apply(v.getPojo())));
- }
-
}
diff --git a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/util/interaction/DomainObjectTesterFactory.java b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/util/interaction/DomainObjectTesterFactory.java
index 615b7bf..0acf7f0 100644
--- a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/util/interaction/DomainObjectTesterFactory.java
+++ b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/util/interaction/DomainObjectTesterFactory.java
@@ -62,6 +62,7 @@ import org.apache.isis.core.metamodel.interactions.managed.ManagedAction;
import org.apache.isis.core.metamodel.interactions.managed.ManagedCollection;
import org.apache.isis.core.metamodel.interactions.managed.ManagedMember;
import org.apache.isis.core.metamodel.interactions.managed.ManagedProperty;
+import org.apache.isis.core.metamodel.interactions.managed.ManagedValue;
import org.apache.isis.core.metamodel.interactions.managed.ParameterNegotiationModel;
import org.apache.isis.core.metamodel.interactions.managed.PropertyInteraction;
import org.apache.isis.core.metamodel.interactions.managed.nonscalar.DataTableModel;
@@ -304,7 +305,7 @@ public class DomainObjectTesterFactory {
.forEach(param->{
pojoReplacers
.get(param.getParamNr())
- .ifPresent(param::updatePojo);
+ .ifPresent(replacer->updatePojo(param, replacer));
});
//pendingArgs.validateParameterSetForParameters();
@@ -336,7 +337,7 @@ public class DomainObjectTesterFactory {
.forEach(param->{
pojoVector
.get(param.getParamNr())
- .ifPresent(pojo->param.updatePojo(__->pojo));
+ .ifPresent(pojo->updatePojo(param, __->pojo));
});
//pendingArgs.validateParameterSetForParameters();
@@ -370,7 +371,7 @@ public class DomainObjectTesterFactory {
.forEach(param->{
pojoReplacers
.get(param.getParamNr())
- .ifPresent(param::updatePojo);
+ .ifPresent(replacer->updatePojo(param, replacer));
});
// spawns its own transactional boundary, or reuses an existing one if available
@@ -437,7 +438,7 @@ public class DomainObjectTesterFactory {
.forEach(param->{
pojoReplacers
.get(param.getParamNr())
- .ifPresent(param::updatePojo);
+ .ifPresent(replacer->updatePojo(param, replacer));
});
//pendingArgs.validateParameterSetForParameters();
@@ -458,6 +459,11 @@ public class DomainObjectTesterFactory {
// -- HELPER
+ @SuppressWarnings("unchecked")
+ static void updatePojo(final ManagedValue managedValue, final UnaryOperator replacer) {
+ managedValue.update(v->ManagedObject.of(v.getSpecification(), replacer.apply(v.getPojo())));
+ }
+
@SneakyThrows
private ParameterNegotiationModel startParameterNegotiation(final boolean checkRules) {