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 2018/09/29 17:49:44 UTC
[isis] 03/03: ISIS-1976: cleaning up FIXME markers
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch v2
in repository https://gitbox.apache.org/repos/asf/isis.git
commit cc497036ed0df60f5e03498e1d817d01a8af3489
Author: Andi Huber <ah...@apache.org>
AuthorDate: Sat Sep 29 19:49:29 2018 +0200
ISIS-1976: cleaning up FIXME markers
Task-Url: https://issues.apache.org/jira/browse/ISIS-1976
---
.../ActionInvocationFacetForDomainEventAbstract.java | 19 -------------------
.../ObjectAdapterContext_Factories.java | 10 ----------
.../ObjectAdapterContext_ObjectAdapterProvider.java | 7 -------
.../ui/actionresponse/ActionResultResponseType.java | 15 ---------------
4 files changed, 51 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/ActionInvocationFacetForDomainEventAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/ActionInvocationFacetForDomainEventAbstract.java
index 51b48ec..94fe83d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/ActionInvocationFacetForDomainEventAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/ActionInvocationFacetForDomainEventAbstract.java
@@ -56,11 +56,9 @@ import org.apache.isis.applib.services.xactn.TransactionService;
import org.apache.isis.applib.services.xactn.TransactionState;
import org.apache.isis.commons.internal.base._Casts;
import org.apache.isis.commons.internal.base._Strings;
-import org.apache.isis.commons.internal.base._With;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.commons.authentication.AuthenticationSessionProvider;
import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.commons.ensure.Assert;
import org.apache.isis.core.commons.exceptions.IsisException;
import org.apache.isis.core.commons.lang.ArrayExtensions;
import org.apache.isis.core.commons.lang.MethodInvocationPreprocessor;
@@ -73,7 +71,6 @@ import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.CollectionUtils;
import org.apache.isis.core.metamodel.facets.DomainEventHelper;
import org.apache.isis.core.metamodel.facets.ImperativeFacet;
-import org.apache.isis.core.metamodel.facets.actcoll.typeof.TypeOfFacet;
import org.apache.isis.core.metamodel.facets.actions.publish.PublishedActionFacet;
import org.apache.isis.core.metamodel.facets.actions.semantics.ActionSemanticsFacet;
import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;
@@ -82,7 +79,6 @@ import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.metamodel.services.ixn.InteractionDtoServiceInternal;
import org.apache.isis.core.metamodel.services.persistsession.PersistenceSessionServiceInternal;
import org.apache.isis.core.metamodel.services.publishing.PublishingServiceInternal;
-import org.apache.isis.core.metamodel.spec.ElementSpecificationProvider;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.Contributed;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
@@ -424,21 +420,6 @@ implements ImperativeFacet {
final Object clone = viewModelFacet.clone(adapter.getObject());
final ObjectAdapter clonedAdapter = getObjectAdapterProvider().adapterFor(clone);
- {
- //FIXME[ISIS-1976] marked for removal
-
- // copy over TypeOfFacet if required
- final TypeOfFacet typeOfFacet = getFacetHolder().getFacet(TypeOfFacet.class);
- ObjectSpecification expected = _With.mapIfPresentElse(
- ElementSpecificationProvider.of(typeOfFacet),
- provider->provider.getElementType(),
- null
- );
- ObjectSpecification actual = clonedAdapter.getSpecification().getElementSpecification();
- Assert.assertEquals("expected same", expected, actual);
-
- //clonedAdapter.getSpecification().setElementSpecificationProvider(ElementSpecificationProvider.of(typeOfFacet));
- }
return clonedAdapter;
}
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/adaptermanager/ObjectAdapterContext_Factories.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/adaptermanager/ObjectAdapterContext_Factories.java
index 482a0a9..7566ee3 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/adaptermanager/ObjectAdapterContext_Factories.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/adaptermanager/ObjectAdapterContext_Factories.java
@@ -77,16 +77,6 @@ class ObjectAdapterContext_Factories implements ObjectAdapterFactories {
// persistence of collection follows the parent
final ParentedOid collectionOid = Oid.Factory.parentedOfOneToMany(parentOid, otma);
final ObjectAdapter collectionAdapter = createCollectionAdapter(pojo, collectionOid);
-
- //FIXME[ISIS-1976] marked for removal
- // we copy over the type onto the adapter itself
- // [not sure why this is really needed, surely we have enough info in
- // the adapter
- // to look this up on the fly?]
-// final TypeOfFacet facet = otma.getFacet(TypeOfFacet.class);
-// collectionAdapter.getSpecification()
-// .setElementSpecificationProvider(ElementSpecificationProvider.of(facet));
-
return collectionAdapter;
}
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/adaptermanager/ObjectAdapterContext_ObjectAdapterProvider.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/adaptermanager/ObjectAdapterContext_ObjectAdapterProvider.java
index 1900064..50505bf 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/adaptermanager/ObjectAdapterContext_ObjectAdapterProvider.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/adaptermanager/ObjectAdapterContext_ObjectAdapterProvider.java
@@ -109,13 +109,6 @@ class ObjectAdapterContext_ObjectAdapterProvider implements ObjectAdapterProvide
@Override
public ManagedObject disposableAdapterForViewModel(final Object viewModelPojo) {
return ManagedObject.of(()->specificationLoader.loadSpecification(viewModelPojo.getClass()), viewModelPojo);
-//FIXME[ISIS-1976] -marked for removal
-// final ObjectSpecification objectSpecification =
-// specificationLoader.loadSpecification(viewModelPojo.getClass());
-// final ObjectSpecId objectSpecId = objectSpecification.getSpecId();
-// final RootOid newRootOid = Oid.Factory.persistentOf(objectSpecId, UUID.randomUUID().toString());
-// final ObjectAdapter createdAdapter = objectAdapterContext.createRootOrAggregatedAdapter(newRootOid, viewModelPojo);
-// return createdAdapter;
}
@Override
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/actionresponse/ActionResultResponseType.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/actionresponse/ActionResultResponseType.java
index dd7ebd5..00ce1ec 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/actionresponse/ActionResultResponseType.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/actionresponse/ActionResultResponseType.java
@@ -27,7 +27,6 @@ import org.apache.wicket.request.IRequestHandler;
import org.apache.isis.applib.value.Blob;
import org.apache.isis.applib.value.Clob;
import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.commons.internal.exceptions._Exceptions;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.concurrency.ConcurrencyChecking;
import org.apache.isis.core.metamodel.adapter.version.ConcurrencyException;
@@ -60,20 +59,6 @@ public enum ActionResultResponseType {
COLLECTION {
@Override
public ActionResultResponse interpretResult(final ActionModel actionModel, final AjaxRequestTarget target, final ObjectAdapter resultAdapter) {
- if(resultAdapter.getElementSpecification() == null) {
-
- //FIXME[ISIS-1976] marked for removal
- _Exceptions.throwUnexpectedCodeReach();
-
-// final TypeOfFacet typeOfFacet = actionModel.getActionMemento()
-// .getAction(IsisContext.getSessionFactory().getSpecificationLoader())
-// .getFacet(TypeOfFacet.class);
-// if (typeOfFacet != null) {
-// resultAdapter.getSpecification()
-// .setElementSpecificationProvider(ElementSpecificationProvider.of(typeOfFacet));
-// }
- }
-
final EntityCollectionModel collectionModel = EntityCollectionModel.createStandalone(resultAdapter, actionModel.getIsisSessionFactory());
// take a copy of the actionModel, because the original can get mutated (specifically: its arguments cleared)
final ActionModel actionModelCopy = actionModel.copy();