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 2021/12/19 14:32:21 UTC
[isis] branch master updated: ISIS-2921: remove (now) superfluous guards
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 21cc311 ISIS-2921: remove (now) superfluous guards
21cc311 is described below
commit 21cc31174a2674ee0afeff83b21a0e2b004a58c2
Author: Andi Huber <ah...@apache.org>
AuthorDate: Sun Dec 19 15:32:14 2021 +0100
ISIS-2921: remove (now) superfluous guards
---
.../org/apache/isis/core/metamodel/spec/ManagedObject.java | 11 -----------
.../org/apache/isis/core/metamodel/spec/ManagedObjects.java | 4 ----
.../apache/isis/core/metamodel/spec/PackedManagedObject.java | 8 --------
.../specloader/specimpl/ObjectActionParameterAbstract.java | 3 ---
4 files changed, 26 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ManagedObject.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ManagedObject.java
index 1ff48d2..3c66aff 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ManagedObject.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ManagedObject.java
@@ -35,7 +35,6 @@ import org.apache.isis.core.metamodel.context.MetaModelContext;
import org.apache.isis.core.metamodel.facets.object.icon.ObjectIcon;
import org.apache.isis.core.metamodel.facets.object.title.TitleRenderRequest;
import org.apache.isis.core.metamodel.objectmanager.ObjectManager;
-import org.apache.isis.core.metamodel.spec.ManagedObjects.EntityUtil;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import lombok.AccessLevel;
@@ -213,17 +212,7 @@ public interface ManagedObject {
? SimpleManagedObject.of(specification, pojo)
: specification.getMetaModelContext().getObjectManager().adapt(pojo);
- //TODO[ISIS-2921] experimental
- if(adapter.getSpecification().isEntity()
- && !adapter.isBookmarkMemoized()) {
- if(EntityUtil.isAttached(adapter)) {
- System.err.printf("attached but not bookmarked %s%n", adapter.getPojo());
- //adapter.getBookmark(); // ensure, this instance's bookmark is memoized
- }
- }
-
return adapter;
-
}
/**
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ManagedObjects.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ManagedObjects.java
index 87e4867..b312869 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ManagedObjects.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ManagedObjects.java
@@ -712,10 +712,6 @@ public final class ManagedObjects {
if(state.isPersistable()) {
_Assert.assertEquals(EntityState.PERSISTABLE_ATTACHED, state,
()->String.format("detached entity %s", adapter));
- //TODO[ISIS-2921] experimental
- if(!adapter.isBookmarkMemoized()) {
- adapter.getBookmark();
- }
}
return adapter;
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/PackedManagedObject.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/PackedManagedObject.java
index 72159dc..2377970 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/PackedManagedObject.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/PackedManagedObject.java
@@ -27,10 +27,8 @@ import org.apache.isis.applib.services.bookmark.Bookmark;
import org.apache.isis.commons.collections.Can;
import org.apache.isis.commons.internal.base._Lazy;
import org.apache.isis.commons.internal.exceptions._Exceptions;
-import org.apache.isis.core.metamodel.spec.ManagedObjects.EntityUtil;
import lombok.RequiredArgsConstructor;
-import lombok.val;
@RequiredArgsConstructor
public final class PackedManagedObject implements ManagedObject {
@@ -41,12 +39,6 @@ public final class PackedManagedObject implements ManagedObject {
public static ManagedObject pack(
final ObjectSpecification elementSpec,
final Can<ManagedObject> nonScalar) {
-
- //TODO[ISIS-2921] experimental
- for(val e : nonScalar) {
- EntityUtil.assertAttachedWhenEntity(e);
- }
-
return new PackedManagedObject(elementSpec, nonScalar);
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstract.java
index 8d09947..e829fc8 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstract.java
@@ -49,7 +49,6 @@ import org.apache.isis.core.metamodel.interactions.InteractionUtils;
import org.apache.isis.core.metamodel.interactions.managed.ParameterNegotiationModel;
import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.metamodel.spec.ManagedObjects;
-import org.apache.isis.core.metamodel.spec.ManagedObjects.EntityUtil;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
import org.apache.isis.core.metamodel.spec.feature.ObjectActionParameter;
@@ -251,8 +250,6 @@ implements
.map(obj->ManagedObjects.emptyToDefault(paramSpec, !isOptional(), obj));
// pack up
val packed = ManagedObjects.pack(paramSpec, nonScalarDefaults);
- //TODO[ISIS-2921] experimental
- EntityUtil.assertAttachedWhenEntity(packed);
return packed;
}