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/30 04:18:21 UTC
[isis] branch v2 updated (8cffeff -> 4d98c3d)
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a change to branch v2
in repository https://gitbox.apache.org/repos/asf/isis.git.
from 8cffeff ISIS-1976: cleaning up, removing lines that were commented out
new 9072e52 ISIS-1976: remove InstanceAbstract
new 2d1a08e ISIS-1976: remove Instance
new 0b7afc6 ISIS-1976: rename ObjectAdapter.getObject() -> getPojo()
new 53cb555 ISIS-1976: move ObjectAdapter.getIconName() up the hierarchy
new 08471fe ISIS-1976: remove ObjectAdapter.Functions, also rename some OA Utilities
new 4d98c3d ISIS-1976: remove MutableProposedHolder
The 6 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../metamodel/adapter/MutableProposedHolder.java | 60 ---------------
.../isis/core/metamodel/adapter/ObjectAdapter.java | 85 +++++-----------------
.../core/metamodel/facets/CollectionUtils.java | 2 +-
.../core/metamodel/facets/DomainEventHelper.java | 12 +--
...ctionInvocationFacetForDomainEventAbstract.java | 16 ++--
.../CollectionAccessorFacetViaAccessor.java | 2 +-
...ectionAddToFacetForDomainEventFromAbstract.java | 2 +-
.../modify/CollectionDomainEventFacetAbstract.java | 2 +-
...nRemoveFromFacetForDomainEventFromAbstract.java | 2 +-
.../javautilcollection/JavaArrayFacet.java | 2 +-
.../javautilcollection/JavaCollectionFacet.java | 2 +-
.../modify/CollectionAddToFacetViaAccessor.java | 2 +-
.../CollectionRemoveFromFacetViaAccessor.java | 2 +-
.../choices/ChoicesFacetFromBoundedAbstract.java | 2 +-
...ObjectLayoutAnnotationUsingCssClassUiEvent.java | 2 +-
...mainObjectLayoutAnnotationUsingIconUiEvent.java | 2 +-
...ainObjectLayoutAnnotationUsingTitleUiEvent.java | 2 +-
.../encoder/EncodableFacetUsingEncoderDecoder.java | 2 +-
.../facets/object/mixin/MixinFacetAbstract.java | 2 +-
.../parser/ParseableFacetUsingParser.java | 4 +-
...etOnCollectionDerivedFromRecreatableObject.java | 2 +-
...acetOnPropertyDerivedFromRecreatableObject.java | 2 +-
.../annotation/TitleFacetViaTitleAnnotation.java | 2 +-
.../title/methods/TitleFacetViaToStringMethod.java | 2 +-
.../object/title/parser/TitleFacetUsingParser.java | 4 +-
...cationFromMustSatisfyAnnotationOnTypeFacet.java | 2 +-
.../mandatory/MandatoryFacetAbstract.java | 4 +-
.../objectvalue/maxlen/MaxLengthFacetAbstract.java | 2 +-
.../MustSatisfySpecificationFacetAbstract.java | 2 +-
.../ActionParameterAutoCompleteFacetViaMethod.java | 2 +-
.../method/ActionChoicesFacetViaMethod.java | 2 +-
.../ActionParameterChoicesFacetViaMethod.java | 2 +-
.../method/PropertyAutoCompleteFacetMethod.java | 3 +-
.../modify/PropertyDomainEventFacetAbstract.java | 2 +-
...tySetterOrClearFacetForDomainEventAbstract.java | 6 +-
.../ValueSemanticsProviderAbstractTemporal.java | 2 +-
.../BooleanValueSemanticsProviderAbstract.java | 2 +-
.../bytes/ByteValueSemanticsProviderAbstract.java | 2 +-
.../chars/CharValueSemanticsProviderAbstract.java | 2 +-
.../value/color/ColorValueSemanticsProvider.java | 2 +-
.../Jdk8LocalDateValueSemanticsProvider.java | 2 +-
.../JodaLocalDateValueSemanticsProvider.java | 2 +-
.../Jdk8LocalDateTimeValueSemanticsProvider.java | 2 +-
.../JodaLocalDateTimeValueSemanticsProvider.java | 2 +-
.../DoubleValueSemanticsProviderAbstract.java | 2 +-
.../FloatValueSemanticsProviderAbstract.java | 2 +-
.../value/image/ImageValueSemanticsProvider.java | 2 +-
.../JavaAwtImageValueSemanticsProvider.java | 2 +-
.../integer/IntValueSemanticsProviderAbstract.java | 2 +-
.../LocalResourcePathValueSemanticsProvider.java | 2 +-
.../longs/LongValueSemanticsProviderAbstract.java | 2 +-
.../value/markup/MarkupValueSemanticsProvider.java | 2 +-
.../value/money/MoneyValueSemanticsProvider.java | 4 +-
.../password/PasswordValueSemanticsProvider.java | 4 +-
.../PercentageValueSemanticsProvider.java | 2 +-
.../ShortValueSemanticsProviderAbstract.java | 2 +-
.../value/string/StringValueSemanticsProvider.java | 2 +-
.../value/url/URLValueSemanticsProvider.java | 2 +-
.../value/uuid/UUIDValueSemanticsProvider.java | 2 +-
.../interactions/ActionArgValidityContext.java | 4 +-
.../interactions/ActionUsabilityContext.java | 4 +-
.../interactions/ActionValidityContext.java | 4 +-
.../interactions/ActionVisibilityContext.java | 4 +-
.../interactions/CollectionAccessContext.java | 4 +-
.../interactions/CollectionAddToContext.java | 2 +-
.../interactions/CollectionRemoveFromContext.java | 4 +-
.../interactions/CollectionUsabilityContext.java | 2 +-
.../interactions/CollectionVisibilityContext.java | 4 +-
.../metamodel/interactions/ObjectTitleContext.java | 4 +-
.../interactions/ObjectValidityContext.java | 4 +-
.../interactions/ObjectVisibilityContext.java | 4 +-
.../metamodel/interactions/ParseValueContext.java | 6 +-
.../interactions/PropertyAccessContext.java | 4 +-
.../interactions/PropertyModifyContext.java | 4 +-
.../interactions/PropertyUsabilityContext.java | 4 +-
.../interactions/PropertyVisibilityContext.java | 4 +-
...arameterChoicesFacetFromParentedCollection.java | 2 +-
.../factory/FactoryServiceInternalDefault.java | 2 +-
.../RepositoryServiceInternalDefault.java | 2 +-
.../apache/isis/core/metamodel/spec/Instance.java | 39 ----------
.../isis/core/metamodel/spec/InstanceAbstract.java | 63 ----------------
.../isis/core/metamodel/spec/ManagedObject.java | 25 ++++---
.../specimpl/ObjectActionParameterAbstract.java | 30 ++++----
.../specloader/specimpl/ObjectMemberAbstract.java | 2 +-
.../specimpl/dflt/ObjectSpecificationDefault.java | 2 +-
.../CollectionFacetOnStandaloneList.java | 2 +-
.../ObjectSpecificationOnStandaloneList.java | 2 +-
.../isis/core/runtime/snapshot/XmlSnapshot.java | 4 +-
.../metamodel/facets/ObjectAdapterUtilsTest.java | 12 +--
.../collections/JavaCollectionFacetTest.java | 2 +-
.../ident/cssclass/CssClassFacetMethodTest.java | 2 +-
.../CssClassFacetMethodWithProblemTest.java | 2 +-
.../object/ident/icon/IconFacetMethodTest.java | 2 +-
.../ident/title/TitleFacetViaMethodTest.java | 2 +-
.../TitleAnnotationFacetFactoryTest.java | 4 +-
.../TitleFacetViaTitleAnnotationTest.java | 4 +-
.../navparent/NavigableParentFacetMethodTest.java | 4 +-
...SpecificationValidatingInteractionMoreTest.java | 4 +-
...isfySpecificationValidatingInteractionTest.java | 2 +-
.../ValueSemanticsProviderAbstractTestCase.java | 2 +-
...sistenceQueryFindUsingApplibQueryProcessor.java | 2 +-
.../adapterfactory/pojo/PojoAdapterTest.java | 2 +-
.../WrapperFactoryDefaultTest_wrappedObject.java | 6 +-
...FactoryDefaultTest_wrappedObject_transient.java | 4 +-
...sistenceQueryFindUsingApplibQueryProcessor.java | 2 +-
.../adapterfactory/pojo/PojoAdapterTest.java | 2 +-
.../WrapperFactoryDefaultTest_wrappedObject.java | 6 +-
...FactoryDefaultTest_wrappedObject_transient.java | 4 +-
.../isis/core/runtime/memento/StandaloneData.java | 2 +-
.../runtime/persistence/adapter/PojoAdapter.java | 50 +++----------
.../services/changes/AdapterAndProperty.java | 2 +-
.../command/CommandDtoServiceInternalDefault.java | 4 +-
.../homepage/HomePageProviderServiceDefault.java | 2 +-
.../ixn/InteractionDtoServiceInternalDefault.java | 4 +-
.../PersistenceSessionServiceInternalDefault.java | 4 +-
.../adaptermanager/ObjectAdapterContext.java | 4 +-
...ObjectAdapterContext_LifecycleEventSupport.java | 3 +-
.../ObjectAdapterContext_ObjectCreation.java | 2 +-
.../ObjectAdapterContext_ServiceLookup.java | 2 +-
.../adaptermanager/ObjectAdapterLegacy.java | 2 +-
.../DelegatingInvocationHandlerDefault.java | 2 +-
.../handlers/DomainObjectInvocationHandler.java | 6 +-
.../commands/DataNucleusCreateObjectCommand.java | 2 +-
.../commands/DataNucleusDeleteObjectCommand.java | 2 +-
.../domainobjects/DomainObjectReprRenderer.java | 2 +-
.../domainobjects/DomainServiceLinkTo.java | 2 +-
.../rendering/domainobjects/JsonValueEncoder.java | 4 +-
.../conneg/ContentNegotiationServiceAbstract.java | 2 +-
...entNegotiationServiceForRestfulObjectsV1_0.java | 2 +-
.../JsonValueEncoderTest_appendValueAndFormat.java | 2 +-
.../JsonValueEncoderTest_asObject.java | 14 ++--
.../server/resources/ObjectActionArgHelper.java | 2 +-
.../server/resources/ResourceAbstract.java | 2 +-
.../restfulobjects/server/util/OidUtils.java | 2 +-
.../model/mementos/ObjectAdapterMemento.java | 10 +--
.../viewer/wicket/model/models/ActionModel.java | 2 +-
.../wicket/model/models/EntityCollectionModel.java | 4 +-
.../viewer/wicket/model/models/ScalarModel.java | 6 +-
.../models/whereami/WhereAmIModelDefault.java | 2 +-
.../actionresponse/ActionResultResponseType.java | 12 +--
.../CollectionContentsAsAjaxTablePanel.java | 2 +-
.../CollectionContentsSortableDataProvider.java | 4 +-
.../summary/CollectionContentsAsSummary.java | 2 +-
.../ScalarPanelTextFieldDatePickerAbstract.java | 2 +-
.../scalars/ScalarPanelTextFieldNumeric.java | 2 +-
.../ui/components/scalars/TextFieldValueModel.java | 2 +-
.../isisapplib/IsisBlobOrClobPanelAbstract.java | 4 +-
.../components/scalars/markup/MarkupComponent.java | 4 +-
.../scalars/markup/MarkupPanelFactories.java | 4 +-
.../components/scalars/primitive/BooleanPanel.java | 4 +-
.../components/tree/IsisToWicketTreeAdapter.java | 8 +-
.../ui/components/tree/TreePanelFactories.java | 4 +-
.../ui/components/unknown/UnknownModelPanel.java | 2 +-
.../widgets/linkandlabel/ActionLink.java | 4 +-
.../linkandlabel/ActionLinkFactoryAbstract.java | 2 +-
.../ObjectAdapterMementoProviderAbstract.java | 2 +-
156 files changed, 297 insertions(+), 527 deletions(-)
delete mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/MutableProposedHolder.java
delete mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/Instance.java
delete mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/InstanceAbstract.java
[isis] 06/06: ISIS-1976: remove MutableProposedHolder
Posted by ah...@apache.org.
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 4d98c3d7e0fcb748e38d19d6e0ce2caee96369e9
Author: Andi Huber <ah...@apache.org>
AuthorDate: Sun Sep 30 06:12:24 2018 +0200
ISIS-1976: remove MutableProposedHolder
Task-Url: https://issues.apache.org/jira/browse/ISIS-1976
---
.../metamodel/adapter/MutableProposedHolder.java | 61 ----------------------
.../specimpl/ObjectActionParameterAbstract.java | 26 ++++-----
2 files changed, 14 insertions(+), 73 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/MutableProposedHolder.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/MutableProposedHolder.java
deleted file mode 100644
index 9aa7b05..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/MutableProposedHolder.java
+++ /dev/null
@@ -1,61 +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.isis.core.metamodel.adapter;
-
-import javax.enterprise.inject.Instance;
-
-import org.apache.isis.core.metamodel.interactions.ProposedHolder;
-import org.apache.isis.core.metamodel.spec.Specification;
-
-/**
- * Mix-in for {@link ManagedObject} implementations, where can hold a proposed new
- * value different from the underlying value.
- *
- * <p>
- * TODO: same concept as {@link ProposedHolder}, so should try to combine.
- */
-public interface MutableProposedHolder {
-
- /**
- * The proposed (pending) value, if applicable.
- *
- * <p>
- * See {@link Specification#createInstanceProposalEvent(Instance)} for an
- * indication as to whether the state will be populated, and what its type
- * will be.
- *
- * @return
- */
- Object getProposed();
-
- /**
- * Sets the proposed (pending) value, if applicable.
- *
- * <p>
- * <p>
- * See {@link Specification#createInstanceProposalEvent(Instance)} for an
- * indication as to whether the proposed state should be populated, and what
- * its type will be.
- *
- * @return
- */
- public void setProposed(Object value);
-
-}
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 544abf9..481f749 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
@@ -27,10 +27,10 @@ import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.query.Query;
import org.apache.isis.applib.query.QueryFindAllInstances;
import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.commons.internal.exceptions._Exceptions;
import org.apache.isis.core.commons.lang.ClassExtensions;
import org.apache.isis.core.commons.lang.ListExtensions;
import org.apache.isis.core.commons.lang.StringExtensions;
-import org.apache.isis.core.metamodel.adapter.MutableProposedHolder;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.ObjectAdapterProvider;
import org.apache.isis.core.metamodel.consent.Allow;
@@ -92,17 +92,19 @@ public abstract class ObjectActionParameterAbstract implements ObjectActionParam
*/
@Override
public ObjectAdapter get(final ObjectAdapter owner, final InteractionInitiatedBy interactionInitiatedBy) {
- final MutableProposedHolder proposedHolder = getProposedHolder(owner);
- final Object proposed = proposedHolder.getProposed();
- return getObjectAdapterProvider().adapterFor(proposed);
- }
-
- protected MutableProposedHolder getProposedHolder(final ObjectAdapter owner) {
- if (!(owner instanceof MutableProposedHolder)) {
- throw new IllegalArgumentException("Instance should implement MutableProposedHolder");
- }
- return (MutableProposedHolder) owner;
- }
+ throw _Exceptions.unexpectedCodeReach();
+ //FIXME[ISIS-1976] marked for removal (must be dead code, since MutableProposedHolder has no implementation)
+// final MutableProposedHolder proposedHolder = getProposedHolder(owner);
+// final Object proposed = proposedHolder.getProposed();
+// return getObjectAdapterProvider().adapterFor(proposed);
+ }
+
+// protected MutableProposedHolder getProposedHolder(final ObjectAdapter owner) {
+// if (!(owner instanceof MutableProposedHolder)) {
+// throw new IllegalArgumentException("Instance should implement MutableProposedHolder");
+// }
+// return (MutableProposedHolder) owner;
+// }
/**
* Parameter number, 0-based.
[isis] 05/06: ISIS-1976: remove ObjectAdapter.Functions,
also rename some OA Utilities
Posted by ah...@apache.org.
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 08471fe94051d324697fc0cb1244a571f794300f
Author: Andi Huber <ah...@apache.org>
AuthorDate: Sun Sep 30 05:55:43 2018 +0200
ISIS-1976: remove ObjectAdapter.Functions, also rename some OA Utilities
Task-Url: https://issues.apache.org/jira/browse/ISIS-1976
---
.../isis/core/metamodel/adapter/ObjectAdapter.java | 43 ++++++++--------------
.../core/metamodel/facets/DomainEventHelper.java | 10 ++---
...ctionInvocationFacetForDomainEventAbstract.java | 8 ++--
.../CollectionAccessorFacetViaAccessor.java | 2 +-
...ectionAddToFacetForDomainEventFromAbstract.java | 2 +-
...nRemoveFromFacetForDomainEventFromAbstract.java | 2 +-
.../modify/CollectionAddToFacetViaAccessor.java | 2 +-
.../CollectionRemoveFromFacetViaAccessor.java | 2 +-
.../choices/ChoicesFacetFromBoundedAbstract.java | 2 +-
.../parser/ParseableFacetUsingParser.java | 4 +-
.../mandatory/MandatoryFacetAbstract.java | 4 +-
.../objectvalue/maxlen/MaxLengthFacetAbstract.java | 2 +-
.../ActionParameterAutoCompleteFacetViaMethod.java | 2 +-
.../method/ActionChoicesFacetViaMethod.java | 2 +-
.../ActionParameterChoicesFacetViaMethod.java | 2 +-
.../method/PropertyAutoCompleteFacetMethod.java | 3 +-
...tySetterOrClearFacetForDomainEventAbstract.java | 6 +--
.../interactions/ActionArgValidityContext.java | 4 +-
.../interactions/ActionUsabilityContext.java | 4 +-
.../interactions/ActionValidityContext.java | 4 +-
.../interactions/ActionVisibilityContext.java | 4 +-
.../interactions/CollectionAccessContext.java | 4 +-
.../interactions/CollectionAddToContext.java | 2 +-
.../interactions/CollectionRemoveFromContext.java | 4 +-
.../interactions/CollectionVisibilityContext.java | 4 +-
.../metamodel/interactions/ObjectTitleContext.java | 4 +-
.../interactions/ObjectValidityContext.java | 4 +-
.../interactions/ObjectVisibilityContext.java | 4 +-
.../metamodel/interactions/ParseValueContext.java | 6 +--
.../interactions/PropertyAccessContext.java | 4 +-
.../interactions/PropertyModifyContext.java | 4 +-
.../interactions/PropertyUsabilityContext.java | 4 +-
.../interactions/PropertyVisibilityContext.java | 4 +-
...arameterChoicesFacetFromParentedCollection.java | 2 +-
.../RepositoryServiceInternalDefault.java | 2 +-
.../metamodel/facets/ObjectAdapterUtilsTest.java | 10 ++---
...sistenceQueryFindUsingApplibQueryProcessor.java | 2 +-
...sistenceQueryFindUsingApplibQueryProcessor.java | 2 +-
.../command/CommandDtoServiceInternalDefault.java | 2 +-
.../handlers/DomainObjectInvocationHandler.java | 6 +--
.../summary/CollectionContentsAsSummary.java | 2 +-
41 files changed, 90 insertions(+), 100 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ObjectAdapter.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ObjectAdapter.java
index b8581c2..74cc47a 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ObjectAdapter.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ObjectAdapter.java
@@ -22,7 +22,6 @@ package org.apache.isis.core.metamodel.adapter;
import java.lang.reflect.Method;
import java.util.Collection;
import java.util.List;
-import java.util.function.Function;
import java.util.stream.Collectors;
import java.util.stream.Stream;
@@ -107,47 +106,47 @@ public interface ObjectAdapter extends ManagedObject {
private Util() {}
- public static Object unwrap(final ManagedObject adapter) {
+ public static Object unwrapPojo(final ManagedObject adapter) {
return adapter != null ? adapter.getPojo() : null;
}
- public static Object[] unwrap(final ManagedObject[] adapters) {
+ public static Object[] unwrapPojoArray(final ManagedObject[] adapters) {
if (adapters == null) {
return null;
}
final Object[] unwrappedObjects = new Object[adapters.length];
int i = 0;
for (final ManagedObject adapter : adapters) {
- unwrappedObjects[i++] = unwrap(adapter);
+ unwrappedObjects[i++] = unwrapPojo(adapter);
}
return unwrappedObjects;
}
- public static List<Object> unwrap(final List<? extends ManagedObject> adapters) {
+ public static List<Object> unwrapPojoList(final List<? extends ManagedObject> adapters) {
List<Object> objects = _Lists.newArrayList();
for (ManagedObject adapter : adapters) {
- objects.add(unwrap(adapter));
+ objects.add(unwrapPojo(adapter));
}
return objects;
}
@SuppressWarnings("unchecked")
- public static <T> List<T> unwrapT(final List<? extends ManagedObject> adapters) {
- return (List<T>) unwrap(adapters);
+ public static <T> List<T> unwrapTypedPojoList(final List<? extends ManagedObject> adapters) {
+ return (List<T>) unwrapPojoList(adapters);
}
- public static String unwrapAsString(final ManagedObject adapter) {
- final Object obj = unwrap(adapter);
+ public static String unwrapPojoStringElse(final ManagedObject adapter, String orElse) {
+ final Object obj = unwrapPojo(adapter);
if (obj == null) {
return null;
}
if (!(obj instanceof String)) {
- return null;
+ return orElse;
}
return (String) obj;
}
- public static String titleString(final ObjectAdapter adapter) {
+ public static String titleString(final ManagedObject adapter) {
return adapter != null ? adapter.titleString(null) : "";
}
@@ -281,23 +280,23 @@ public interface ObjectAdapter extends ManagedObject {
}
public static void invokeAll(final Collection<Method> methods, final ManagedObject adapter) {
- MethodUtil.invoke(methods, Util.unwrap(adapter));
+ MethodUtil.invoke(methods, Util.unwrapPojo(adapter));
}
public static Object invoke(final Method method, final ManagedObject adapter) {
- return MethodExtensions.invoke(method, Util.unwrap(adapter));
+ return MethodExtensions.invoke(method, Util.unwrapPojo(adapter));
}
public static Object invoke(final Method method, final ManagedObject adapter, final Object arg0) {
- return MethodExtensions.invoke(method, Util.unwrap(adapter), new Object[] {arg0});
+ return MethodExtensions.invoke(method, Util.unwrapPojo(adapter), new Object[] {arg0});
}
public static Object invoke(final Method method, final ManagedObject adapter, final ManagedObject arg0Adapter) {
- return invoke(method, adapter, Util.unwrap(arg0Adapter));
+ return invoke(method, adapter, Util.unwrapPojo(arg0Adapter));
}
public static Object invoke(final Method method, final ManagedObject adapter, final ManagedObject[] argumentAdapters) {
- return MethodExtensions.invoke(method, Util.unwrap(adapter), Util.unwrap(argumentAdapters));
+ return MethodExtensions.invoke(method, Util.unwrapPojo(adapter), Util.unwrapPojoArray(argumentAdapters));
}
public static Object invokeC(final Method method, final ManagedObject adapter,
@@ -362,15 +361,5 @@ public interface ObjectAdapter extends ManagedObject {
}
- public static class Functions {
-
- private Functions(){}
-
- public static Function<ObjectAdapter, Object> getObject() {
- return Util::unwrap;
- }
-
- }
-
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/DomainEventHelper.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/DomainEventHelper.java
index cfc90d1..5d3dd9d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/DomainEventHelper.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/DomainEventHelper.java
@@ -72,8 +72,8 @@ public class DomainEventHelper {
event = existingEvent;
} else {
// all other phases, create a new event
- final Object source = ObjectAdapter.Util.unwrap(targetAdapter);
- final Object[] arguments = ObjectAdapter.Util.unwrap(argumentAdapters);
+ final Object source = ObjectAdapter.Util.unwrapPojo(targetAdapter);
+ final Object[] arguments = ObjectAdapter.Util.unwrapPojoArray(argumentAdapters);
final Identifier identifier = identified.getIdentifier();
event = newActionDomainEvent(eventType, identifier, source, arguments);
@@ -105,7 +105,7 @@ public class DomainEventHelper {
event.setEventPhase(phase);
if(phase.isExecuted()) {
- event.setReturnValue(ObjectAdapter.Util.unwrap(resultAdapter));
+ event.setReturnValue(ObjectAdapter.Util.unwrapPojo(resultAdapter));
}
getEventBusService().post(event);
@@ -183,7 +183,7 @@ public class DomainEventHelper {
try {
final PropertyDomainEvent<?, ?> event;
- final Object source = ObjectAdapter.Util.unwrap(targetAdapter);
+ final Object source = ObjectAdapter.Util.unwrapPojo(targetAdapter);
final Identifier identifier = identified.getIdentifier();
if(existingEvent != null && phase.isExecuted()) {
@@ -277,7 +277,7 @@ public class DomainEventHelper {
event = existingEvent;
} else {
// all other phases, create a new event
- final Object source = ObjectAdapter.Util.unwrap(targetAdapter);
+ final Object source = ObjectAdapter.Util.unwrapPojo(targetAdapter);
final Identifier identifier = identified.getIdentifier();
event = newCollectionDomainEvent(eventType, phase, identifier, source, of, reference);
}
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 fdf6a62..a855d4e 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
@@ -200,10 +200,10 @@ implements ImperativeFacet {
// otherwise, go ahead and execute action in the 'foreground'
final ObjectAdapter mixinElseRegularAdapter = mixedInAdapter != null ? mixedInAdapter : targetAdapter;
- final Object mixinElseRegularPojo = ObjectAdapter.Util.unwrap(mixinElseRegularAdapter);
+ final Object mixinElseRegularPojo = ObjectAdapter.Util.unwrapPojo(mixinElseRegularAdapter);
final List<ObjectAdapter> argumentAdapterList = Arrays.asList(argumentAdapters);
- final List<Object> argumentPojos = ObjectAdapter.Util.unwrap(argumentAdapterList);
+ final List<Object> argumentPojos = ObjectAdapter.Util.unwrapPojoList(argumentAdapterList);
final String targetMember = targetNameFor(owningAction, mixedInAdapter);
final String targetClass = CommandUtil.targetClassNameFor(mixinElseRegularAdapter);
@@ -264,7 +264,7 @@ implements ImperativeFacet {
command,
resultAdapterPossiblyCloned);
- return ObjectAdapter.Util.unwrap(resultAdapterPossiblyCloned);
+ return ObjectAdapter.Util.unwrapPojo(resultAdapterPossiblyCloned);
} catch (Exception e) {
@@ -495,7 +495,7 @@ implements ImperativeFacet {
final Object visibleObjects =
CollectionUtils.copyOf(
stream(visibleAdapters)
- .map(ObjectAdapter.Functions.getObject())
+ .map(ObjectAdapter.Util::unwrapPojo)
.collect(Collectors.toList()),
method.getReturnType());
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/accessor/CollectionAccessorFacetViaAccessor.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/accessor/CollectionAccessorFacetViaAccessor.java
index 8d08253..6b8dc5e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/accessor/CollectionAccessorFacetViaAccessor.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/accessor/CollectionAccessorFacetViaAccessor.java
@@ -90,7 +90,7 @@ implements ImperativeFacet {
interactionInitiatedBy);
final Object visibleObjects =
CollectionUtils.copyOf(
- _Lists.map(visibleAdapters, ObjectAdapter.Functions.getObject()),
+ _Lists.map(visibleAdapters, ObjectAdapter.Util::unwrapPojo),
method.getReturnType());
if (visibleObjects != null) {
return visibleObjects;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/modify/CollectionAddToFacetForDomainEventFromAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/modify/CollectionAddToFacetForDomainEventFromAbstract.java
index 979375d..4a32bb6 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/modify/CollectionAddToFacetForDomainEventFromAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/modify/CollectionAddToFacetForDomainEventFromAbstract.java
@@ -70,7 +70,7 @@ implements CollectionAddToFacet {
return;
}
- final Object referencedObject = ObjectAdapter.Util.unwrap(referencedObjectAdapter);
+ final Object referencedObject = ObjectAdapter.Util.unwrapPojo(referencedObjectAdapter);
// get hold of underlying collection
final Object collection = getterFacet.getProperty(targetAdapter, interactionInitiatedBy);
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/modify/CollectionRemoveFromFacetForDomainEventFromAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/modify/CollectionRemoveFromFacetForDomainEventFromAbstract.java
index b2f0ca9..9d5a9eb 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/modify/CollectionRemoveFromFacetForDomainEventFromAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/modify/CollectionRemoveFromFacetForDomainEventFromAbstract.java
@@ -72,7 +72,7 @@ implements CollectionRemoveFromFacet {
}
- final Object referencedObject = ObjectAdapter.Util.unwrap(referencedObjectAdapter);
+ final Object referencedObject = ObjectAdapter.Util.unwrapPojo(referencedObjectAdapter);
// get hold of underlying collection
// passing null through for authenticationSession/deploymentType means to avoid any visibility filtering.
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/modify/CollectionAddToFacetViaAccessor.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/modify/CollectionAddToFacetViaAccessor.java
index 02fec5c..3da13ff 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/modify/CollectionAddToFacetViaAccessor.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/modify/CollectionAddToFacetViaAccessor.java
@@ -59,7 +59,7 @@ public class CollectionAddToFacetViaAccessor extends CollectionAddToFacetAbstrac
final InteractionInitiatedBy interactionInitiatedBy) {
@SuppressWarnings("unchecked")
final Collection<? super Object> collection = (Collection<? super Object>) ObjectAdapter.InvokeUtils.invoke(method, owningAdapter);
- final Object elementPojo = ObjectAdapter.Util.unwrap(elementAdapter);
+ final Object elementPojo = ObjectAdapter.Util.unwrapPojo(elementAdapter);
collection.add(elementPojo);
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/modify/CollectionRemoveFromFacetViaAccessor.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/modify/CollectionRemoveFromFacetViaAccessor.java
index bb6be42..fbadf83 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/modify/CollectionRemoveFromFacetViaAccessor.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/modify/CollectionRemoveFromFacetViaAccessor.java
@@ -61,7 +61,7 @@ public class CollectionRemoveFromFacetViaAccessor extends CollectionRemoveFromFa
final InteractionInitiatedBy interactionInitiatedBy) {
@SuppressWarnings("unchecked")
final Collection<? super Object> collection = (Collection<? super Object>) ObjectAdapter.InvokeUtils.invoke(method, owningAdapter);
- collection.remove(ObjectAdapter.Util.unwrap(elementAdapter));
+ collection.remove(ObjectAdapter.Util.unwrapPojo(elementAdapter));
}
@Override
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/choices/ChoicesFacetFromBoundedAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/choices/ChoicesFacetFromBoundedAbstract.java
index 9811847..75ac3dc 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/choices/ChoicesFacetFromBoundedAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/choices/ChoicesFacetFromBoundedAbstract.java
@@ -133,7 +133,7 @@ implements ChoicesFacet, DisablingInteractionAdvisor, ValidatingInteractionAdvis
ObjectAdapter.Util.visibleAdapters(allInstancesAdapter, interactionInitiatedBy);
return _NullSafe.stream(adapters)
- .map(ObjectAdapter.Functions.getObject()) // pojos
+ .map(ObjectAdapter.Util::unwrapPojo)
.collect(_Arrays.toArray(Object.class, _NullSafe.size(adapters)));
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/parseable/parser/ParseableFacetUsingParser.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/parseable/parser/ParseableFacetUsingParser.java
index ef7030c..3ff760b 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/parseable/parser/ParseableFacetUsingParser.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/parseable/parser/ParseableFacetUsingParser.java
@@ -86,7 +86,7 @@ public class ParseableFacetUsingParser extends FacetAbstract implements Parseabl
validate(parseValueContext);
}
- final Object context = ObjectAdapter.Util.unwrap(contextAdapter);
+ final Object context = ObjectAdapter.Util.unwrapPojo(contextAdapter);
getDependencyInjector().injectServicesInto(parser);
@@ -127,7 +127,7 @@ public class ParseableFacetUsingParser extends FacetAbstract implements Parseabl
@Override
@SuppressWarnings({ "unchecked", "rawtypes" })
public String parseableTitle(final ObjectAdapter contextAdapter) {
- final Object pojo = ObjectAdapter.Util.unwrap(contextAdapter);
+ final Object pojo = ObjectAdapter.Util.unwrapPojo(contextAdapter);
getDependencyInjector().injectServicesInto(parser);
return ((Parser)parser).parseableTitleOf(pojo);
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/mandatory/MandatoryFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/mandatory/MandatoryFacetAbstract.java
index 4a19fb5..6d1dadc 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/mandatory/MandatoryFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/mandatory/MandatoryFacetAbstract.java
@@ -59,12 +59,12 @@ public abstract class MandatoryFacetAbstract extends MarkerFacetAbstract impleme
@Override
public final boolean isRequiredButNull(final ManagedObject adapter) {
if(!isInvertedSemantics()) {
- final Object object = ObjectAdapter.Util.unwrap(adapter);
+ final Object object = ObjectAdapter.Util.unwrapPojo(adapter);
if (object == null) {
return true;
}
// special case string handling.
- final String str = ObjectAdapter.Util.unwrapAsString(adapter);
+ final String str = ObjectAdapter.Util.unwrapPojoStringElse(adapter, null);
return str != null && str.length() == 0;
} else {
return false;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/maxlen/MaxLengthFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/maxlen/MaxLengthFacetAbstract.java
index 2708ed3..7c2ee35 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/maxlen/MaxLengthFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/maxlen/MaxLengthFacetAbstract.java
@@ -44,7 +44,7 @@ public abstract class MaxLengthFacetAbstract extends SingleIntValueFacetAbstract
*/
@Override
public boolean exceeds(final ManagedObject adapter) {
- final String str = ObjectAdapter.Util.unwrapAsString(adapter);
+ final String str = ObjectAdapter.Util.unwrapPojoStringElse(adapter, null);
if (str == null) {
return false;
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/autocomplete/method/ActionParameterAutoCompleteFacetViaMethod.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/autocomplete/method/ActionParameterAutoCompleteFacetViaMethod.java
index 8376362..a9accca 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/autocomplete/method/ActionParameterAutoCompleteFacetViaMethod.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/autocomplete/method/ActionParameterAutoCompleteFacetViaMethod.java
@@ -98,7 +98,7 @@ public class ActionParameterAutoCompleteFacetViaMethod extends ActionParameterAu
collectionAdapter,
interactionInitiatedBy);
final List<Object> visibleObjects =
- _Lists.map(visibleAdapters, ObjectAdapter.Functions.getObject());
+ _Lists.map(visibleAdapters, ObjectAdapter.Util::unwrapPojo);
final ObjectSpecification parameterSpec = getSpecification(parameterType);
return CollectionUtils.getCollectionAsObjectArray(visibleObjects, parameterSpec, getObjectAdapterProvider());
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/choices/method/ActionChoicesFacetViaMethod.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/choices/method/ActionChoicesFacetViaMethod.java
index b3ae7fc..cd16e85 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/choices/method/ActionChoicesFacetViaMethod.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/choices/method/ActionChoicesFacetViaMethod.java
@@ -117,7 +117,7 @@ public class ActionChoicesFacetViaMethod extends ActionChoicesFacetAbstract impl
collectionAdapter,
interactionInitiatedBy);
final List<Object> filteredObjects =
- _Lists.map(visibleAdapters, ObjectAdapter.Functions.getObject());
+ _Lists.map(visibleAdapters, ObjectAdapter.Util::unwrapPojo);
final ObjectSpecification parameterSpec = getSpecification(parameterType);
return CollectionUtils.getCollectionAsObjectArray(filteredObjects, parameterSpec, getObjectAdapterProvider());
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/choices/methodnum/ActionParameterChoicesFacetViaMethod.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/choices/methodnum/ActionParameterChoicesFacetViaMethod.java
index b351cc9..4115c94 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/choices/methodnum/ActionParameterChoicesFacetViaMethod.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/choices/methodnum/ActionParameterChoicesFacetViaMethod.java
@@ -90,7 +90,7 @@ public class ActionParameterChoicesFacetViaMethod extends ActionParameterChoices
objectAdapter,
interactionInitiatedBy);
final List<Object> visibleObjects =
- _Lists.map(visibleAdapters, ObjectAdapter.Functions.getObject());
+ _Lists.map(visibleAdapters, ObjectAdapter.Util::unwrapPojo);
final ObjectSpecification parameterSpec = getSpecification(parameterType);
return CollectionUtils.getCollectionAsObjectArray(visibleObjects, parameterSpec, getObjectAdapterProvider());
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/autocomplete/method/PropertyAutoCompleteFacetMethod.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/autocomplete/method/PropertyAutoCompleteFacetMethod.java
index 88e65a8..c63bf47 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/autocomplete/method/PropertyAutoCompleteFacetMethod.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/autocomplete/method/PropertyAutoCompleteFacetMethod.java
@@ -28,6 +28,7 @@ import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.commons.authentication.AuthenticationSessionProvider;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.ObjectAdapterProvider;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter.Util;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
@@ -111,7 +112,7 @@ public class PropertyAutoCompleteFacetMethod extends PropertyAutoCompleteFacetAb
collectionAdapter,
interactionInitiatedBy);
final List<Object> filteredObjects =
- _Lists.map(visibleAdapters, ObjectAdapter.Functions.getObject());
+ _Lists.map(visibleAdapters, ObjectAdapter.Util::unwrapPojo);
final ObjectSpecification propertySpec = getSpecification(propertyType);
return CollectionUtils.getCollectionAsObjectArray(filteredObjects, propertySpec, getObjectAdapterProvider());
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/modify/PropertySetterOrClearFacetForDomainEventAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/modify/PropertySetterOrClearFacetForDomainEventAbstract.java
index 4ff4c54..27c7027 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/modify/PropertySetterOrClearFacetForDomainEventAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/modify/PropertySetterOrClearFacetForDomainEventAbstract.java
@@ -200,8 +200,8 @@ extends SingleValueFacetAbstract<Class<? extends PropertyDomainEvent<?,?>>> {
} else {
- final Object target = ObjectAdapter.Util.unwrap(targetAdapter);
- final Object argValue = ObjectAdapter.Util.unwrap(newValueAdapter);
+ final Object target = ObjectAdapter.Util.unwrapPojo(targetAdapter);
+ final Object argValue = ObjectAdapter.Util.unwrapPojo(newValueAdapter);
final String targetMember = CommandUtil.targetMemberNameFor(owningProperty);
final String targetClass = CommandUtil.targetClassNameFor(targetAdapter);
@@ -233,7 +233,7 @@ extends SingleValueFacetAbstract<Class<? extends PropertyDomainEvent<?,?>>> {
// ... post the executing event
final Object oldValue = getterFacet.getProperty(targetAdapter, interactionInitiatedBy);
- final Object newValue = ObjectAdapter.Util.unwrap(newValueAdapter);
+ final Object newValue = ObjectAdapter.Util.unwrapPojo(newValueAdapter);
final PropertyDomainEvent<?, ?> event =
domainEventHelper.postEventForProperty(
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionArgValidityContext.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionArgValidityContext.java
index dff5dd7..198facd 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionArgValidityContext.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionArgValidityContext.java
@@ -19,7 +19,7 @@
package org.apache.isis.core.metamodel.interactions;
-import static org.apache.isis.core.metamodel.adapter.ObjectAdapter.Util.unwrap;
+import static org.apache.isis.core.metamodel.adapter.ObjectAdapter.Util.unwrapPojo;
import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.services.wrapper.events.ActionArgumentEvent;
@@ -74,7 +74,7 @@ public class ActionArgValidityContext extends ValidityContext<ActionArgumentEven
@Override
public ActionArgumentEvent createInteractionEvent() {
- return new ActionArgumentEvent(unwrap(getTarget()), getIdentifier(), unwrap(getArgs()), getPosition());
+ return new ActionArgumentEvent(unwrapPojo(getTarget()), getIdentifier(), ObjectAdapter.Util.unwrapPojoArray(getArgs()), getPosition());
}
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionUsabilityContext.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionUsabilityContext.java
index 81c2cf2..4e6fe13 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionUsabilityContext.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionUsabilityContext.java
@@ -19,7 +19,7 @@
package org.apache.isis.core.metamodel.interactions;
-import static org.apache.isis.core.metamodel.adapter.ObjectAdapter.Util.unwrap;
+import static org.apache.isis.core.metamodel.adapter.ObjectAdapter.Util.unwrapPojo;
import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.annotation.Where;
@@ -54,7 +54,7 @@ public class ActionUsabilityContext extends UsabilityContext<ActionUsabilityEven
@Override
public ActionUsabilityEvent createInteractionEvent() {
- return new ActionUsabilityEvent(unwrap(getTarget()), getIdentifier());
+ return new ActionUsabilityEvent(unwrapPojo(getTarget()), getIdentifier());
}
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionValidityContext.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionValidityContext.java
index 217ed73..9015b34 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionValidityContext.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionValidityContext.java
@@ -19,7 +19,7 @@
package org.apache.isis.core.metamodel.interactions;
-import static org.apache.isis.core.metamodel.adapter.ObjectAdapter.Util.unwrap;
+import static org.apache.isis.core.metamodel.adapter.ObjectAdapter.Util.unwrapPojo;
import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.services.wrapper.events.ActionInvocationEvent;
@@ -59,7 +59,7 @@ public class ActionValidityContext extends ValidityContext<ActionInvocationEvent
@Override
public ActionInvocationEvent createInteractionEvent() {
- return new ActionInvocationEvent(unwrap(getTarget()), getIdentifier(), unwrap(getArgs()));
+ return new ActionInvocationEvent(unwrapPojo(getTarget()), getIdentifier(), ObjectAdapter.Util.unwrapPojoArray(getArgs()));
}
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionVisibilityContext.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionVisibilityContext.java
index 59b4aa1..eab8c82 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionVisibilityContext.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionVisibilityContext.java
@@ -19,7 +19,7 @@
package org.apache.isis.core.metamodel.interactions;
-import static org.apache.isis.core.metamodel.adapter.ObjectAdapter.Util.unwrap;
+import static org.apache.isis.core.metamodel.adapter.ObjectAdapter.Util.unwrapPojo;
import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.annotation.Where;
@@ -54,7 +54,7 @@ public class ActionVisibilityContext extends VisibilityContext<ActionVisibilityE
@Override
public ActionVisibilityEvent createInteractionEvent() {
- return new ActionVisibilityEvent(unwrap(getTarget()), getIdentifier());
+ return new ActionVisibilityEvent(unwrapPojo(getTarget()), getIdentifier());
}
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionAccessContext.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionAccessContext.java
index 1d64405..0d76135 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionAccessContext.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionAccessContext.java
@@ -19,7 +19,7 @@
package org.apache.isis.core.metamodel.interactions;
-import static org.apache.isis.core.metamodel.adapter.ObjectAdapter.Util.unwrap;
+import static org.apache.isis.core.metamodel.adapter.ObjectAdapter.Util.unwrapPojo;
import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.services.wrapper.events.CollectionAccessEvent;
@@ -42,7 +42,7 @@ public class CollectionAccessContext extends AccessContext<CollectionAccessEvent
@Override
public CollectionAccessEvent createInteractionEvent() {
- return new CollectionAccessEvent(unwrap(getTarget()), getIdentifier());
+ return new CollectionAccessEvent(unwrapPojo(getTarget()), getIdentifier());
}
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionAddToContext.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionAddToContext.java
index 841f6d7..09b486c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionAddToContext.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionAddToContext.java
@@ -50,7 +50,7 @@ public class CollectionAddToContext extends ValidityContext<CollectionAddToEvent
@Override
public CollectionAddToEvent createInteractionEvent() {
- return new CollectionAddToEvent(ObjectAdapter.Util.unwrap(getTarget()), getIdentifier(), ObjectAdapter.Util.unwrap(getProposed()));
+ return new CollectionAddToEvent(ObjectAdapter.Util.unwrapPojo(getTarget()), getIdentifier(), ObjectAdapter.Util.unwrapPojo(getProposed()));
}
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionRemoveFromContext.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionRemoveFromContext.java
index 4c84979..645781b 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionRemoveFromContext.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionRemoveFromContext.java
@@ -19,7 +19,7 @@
package org.apache.isis.core.metamodel.interactions;
-import static org.apache.isis.core.metamodel.adapter.ObjectAdapter.Util.unwrap;
+import static org.apache.isis.core.metamodel.adapter.ObjectAdapter.Util.unwrapPojo;
import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.services.wrapper.events.CollectionRemoveFromEvent;
@@ -52,7 +52,7 @@ public class CollectionRemoveFromContext extends ValidityContext<CollectionRemov
@Override
public CollectionRemoveFromEvent createInteractionEvent() {
- return new CollectionRemoveFromEvent(unwrap(getTarget()), getIdentifier(), unwrap(getProposed()));
+ return new CollectionRemoveFromEvent(unwrapPojo(getTarget()), getIdentifier(), unwrapPojo(getProposed()));
}
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionVisibilityContext.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionVisibilityContext.java
index 33d2084..6bf1db9 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionVisibilityContext.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionVisibilityContext.java
@@ -19,7 +19,7 @@
package org.apache.isis.core.metamodel.interactions;
-import static org.apache.isis.core.metamodel.adapter.ObjectAdapter.Util.unwrap;
+import static org.apache.isis.core.metamodel.adapter.ObjectAdapter.Util.unwrapPojo;
import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.annotation.Where;
@@ -44,7 +44,7 @@ public class CollectionVisibilityContext extends VisibilityContext<CollectionVis
@Override
public CollectionVisibilityEvent createInteractionEvent() {
- return new CollectionVisibilityEvent(unwrap(getTarget()), getIdentifier());
+ return new CollectionVisibilityEvent(unwrapPojo(getTarget()), getIdentifier());
}
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ObjectTitleContext.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ObjectTitleContext.java
index f917e54..bb7ccea 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ObjectTitleContext.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ObjectTitleContext.java
@@ -19,7 +19,7 @@
package org.apache.isis.core.metamodel.interactions;
-import static org.apache.isis.core.metamodel.adapter.ObjectAdapter.Util.unwrap;
+import static org.apache.isis.core.metamodel.adapter.ObjectAdapter.Util.unwrapPojo;
import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.services.wrapper.events.ObjectTitleEvent;
@@ -46,7 +46,7 @@ public class ObjectTitleContext extends AccessContext<ObjectTitleEvent> {
@Override
public ObjectTitleEvent createInteractionEvent() {
- return new ObjectTitleEvent(unwrap(getTarget()), getIdentifier(), getTitle());
+ return new ObjectTitleEvent(unwrapPojo(getTarget()), getIdentifier(), getTitle());
}
private String getTitle() {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ObjectValidityContext.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ObjectValidityContext.java
index 75aed21..17f6812 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ObjectValidityContext.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ObjectValidityContext.java
@@ -19,7 +19,7 @@
package org.apache.isis.core.metamodel.interactions;
-import static org.apache.isis.core.metamodel.adapter.ObjectAdapter.Util.unwrap;
+import static org.apache.isis.core.metamodel.adapter.ObjectAdapter.Util.unwrapPojo;
import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.services.wrapper.events.ObjectValidityEvent;
@@ -42,7 +42,7 @@ public class ObjectValidityContext extends ValidityContext<ObjectValidityEvent>
@Override
public ObjectValidityEvent createInteractionEvent() {
- return new ObjectValidityEvent(unwrap(getTarget()), getIdentifier());
+ return new ObjectValidityEvent(unwrapPojo(getTarget()), getIdentifier());
}
@Override
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ObjectVisibilityContext.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ObjectVisibilityContext.java
index e3a73da..e2dcfe8 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ObjectVisibilityContext.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ObjectVisibilityContext.java
@@ -19,7 +19,7 @@
package org.apache.isis.core.metamodel.interactions;
-import static org.apache.isis.core.metamodel.adapter.ObjectAdapter.Util.unwrap;
+import static org.apache.isis.core.metamodel.adapter.ObjectAdapter.Util.unwrapPojo;
import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.annotation.Where;
@@ -45,7 +45,7 @@ public class ObjectVisibilityContext extends VisibilityContext<ObjectVisibilityE
@Override
public ObjectVisibilityEvent createInteractionEvent() {
- return new ObjectVisibilityEvent(unwrap(getTarget()), getIdentifier());
+ return new ObjectVisibilityEvent(unwrapPojo(getTarget()), getIdentifier());
}
@Override
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ParseValueContext.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ParseValueContext.java
index 92ab38b..7767bc6 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ParseValueContext.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ParseValueContext.java
@@ -19,7 +19,7 @@
package org.apache.isis.core.metamodel.interactions;
-import static org.apache.isis.core.metamodel.adapter.ObjectAdapter.Util.unwrap;
+import static org.apache.isis.core.metamodel.adapter.ObjectAdapter.Util.unwrapPojo;
import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.services.wrapper.events.ParseValueEvent;
@@ -51,8 +51,8 @@ public class ParseValueContext extends ValidityContext<ParseValueEvent> implemen
@Override
public ParseValueEvent createInteractionEvent() {
- final String proposedPojo = (String) unwrap(getProposed());
- return new ParseValueEvent(unwrap(getTarget()), getIdentifier(), proposedPojo);
+ final String proposedPojo = (String) unwrapPojo(getProposed());
+ return new ParseValueEvent(unwrapPojo(getTarget()), getIdentifier(), proposedPojo);
}
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/PropertyAccessContext.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/PropertyAccessContext.java
index a07e78f..cbc6b84 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/PropertyAccessContext.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/PropertyAccessContext.java
@@ -19,7 +19,7 @@
package org.apache.isis.core.metamodel.interactions;
-import static org.apache.isis.core.metamodel.adapter.ObjectAdapter.Util.unwrap;
+import static org.apache.isis.core.metamodel.adapter.ObjectAdapter.Util.unwrapPojo;
import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.services.wrapper.events.PropertyAccessEvent;
@@ -54,7 +54,7 @@ public class PropertyAccessContext extends AccessContext<PropertyAccessEvent> {
@Override
public PropertyAccessEvent createInteractionEvent() {
- return new PropertyAccessEvent(unwrap(getTarget()), getIdentifier(), unwrap(getValue()));
+ return new PropertyAccessEvent(unwrapPojo(getTarget()), getIdentifier(), unwrapPojo(getValue()));
}
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/PropertyModifyContext.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/PropertyModifyContext.java
index a49ed82..93facde 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/PropertyModifyContext.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/PropertyModifyContext.java
@@ -19,7 +19,7 @@
package org.apache.isis.core.metamodel.interactions;
-import static org.apache.isis.core.metamodel.adapter.ObjectAdapter.Util.unwrap;
+import static org.apache.isis.core.metamodel.adapter.ObjectAdapter.Util.unwrapPojo;
import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.services.wrapper.events.PropertyModifyEvent;
@@ -55,7 +55,7 @@ public class PropertyModifyContext extends ValidityContext<PropertyModifyEvent>
@Override
public PropertyModifyEvent createInteractionEvent() {
- return new PropertyModifyEvent(unwrap(getTarget()), getIdentifier(), unwrap(getProposed()));
+ return new PropertyModifyEvent(unwrapPojo(getTarget()), getIdentifier(), unwrapPojo(getProposed()));
}
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/PropertyUsabilityContext.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/PropertyUsabilityContext.java
index d719b8d..914ca9a 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/PropertyUsabilityContext.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/PropertyUsabilityContext.java
@@ -19,7 +19,7 @@
package org.apache.isis.core.metamodel.interactions;
-import static org.apache.isis.core.metamodel.adapter.ObjectAdapter.Util.unwrap;
+import static org.apache.isis.core.metamodel.adapter.ObjectAdapter.Util.unwrapPojo;
import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.annotation.Where;
@@ -44,7 +44,7 @@ public class PropertyUsabilityContext extends UsabilityContext<PropertyUsability
@Override
public PropertyUsabilityEvent createInteractionEvent() {
- return new PropertyUsabilityEvent(unwrap(getTarget()), getIdentifier());
+ return new PropertyUsabilityEvent(unwrapPojo(getTarget()), getIdentifier());
}
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/PropertyVisibilityContext.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/PropertyVisibilityContext.java
index 1536400..3ec4667 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/PropertyVisibilityContext.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/PropertyVisibilityContext.java
@@ -19,7 +19,7 @@
package org.apache.isis.core.metamodel.interactions;
-import static org.apache.isis.core.metamodel.adapter.ObjectAdapter.Util.unwrap;
+import static org.apache.isis.core.metamodel.adapter.ObjectAdapter.Util.unwrapPojo;
import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.annotation.Where;
@@ -44,7 +44,7 @@ public class PropertyVisibilityContext extends VisibilityContext<PropertyVisibil
@Override
public PropertyVisibilityEvent createInteractionEvent() {
- return new PropertyVisibilityEvent(unwrap(getTarget()), getIdentifier());
+ return new PropertyVisibilityEvent(unwrapPojo(getTarget()), getIdentifier());
}
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/param/ActionParameterChoicesFacetFromParentedCollection.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/param/ActionParameterChoicesFacetFromParentedCollection.java
index 58ec6b4..c220c50 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/param/ActionParameterChoicesFacetFromParentedCollection.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/param/ActionParameterChoicesFacetFromParentedCollection.java
@@ -56,7 +56,7 @@ public class ActionParameterChoicesFacetFromParentedCollection extends ActionPar
final ObjectAdapter parentAdapter = determineParentAdapter(target);
final ObjectAdapter objectAdapter = otma.get(parentAdapter, interactionInitiatedBy);
final List<ObjectAdapter> objectAdapters = CollectionFacet.Utils.toAdapterList(objectAdapter);
- return ObjectAdapter.Util.unwrap(objectAdapters.toArray(new ObjectAdapter[0]));
+ return ObjectAdapter.Util.unwrapPojoArray(objectAdapters.toArray(new ObjectAdapter[0]));
}
/**
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/repository/RepositoryServiceInternalDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/repository/RepositoryServiceInternalDefault.java
index aa513f1..e1eeebf 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/repository/RepositoryServiceInternalDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/repository/RepositoryServiceInternalDefault.java
@@ -168,7 +168,7 @@ public class RepositoryServiceInternalDefault implements RepositoryService {
<T> List<T> submitQuery(final Query<T> query) {
final List<ObjectAdapter> allMatching = persistenceSessionServiceInternal.allMatchingQuery(query);
- return ObjectAdapter.Util.unwrapT(allMatching);
+ return ObjectAdapter.Util.unwrapTypedPojoList(allMatching);
}
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/ObjectAdapterUtilsTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/ObjectAdapterUtilsTest.java
index 4f49ed3..d8d5914 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/ObjectAdapterUtilsTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/ObjectAdapterUtilsTest.java
@@ -43,33 +43,33 @@ public class ObjectAdapterUtilsTest {
@Test
public void testUnwrapObjectWhenNull() {
- assertNull(ObjectAdapter.Util.unwrap((ObjectAdapter)null));
+ assertNull(ObjectAdapter.Util.unwrapPojo((ObjectAdapter)null));
}
@Test
public void testUnwrapObjectWhenNotNull() {
underlyingDomainObject = new Object();
expectAdapterWillReturn(underlyingDomainObject);
- assertEquals(underlyingDomainObject, ObjectAdapter.Util.unwrap(mockObjectAdapter));
+ assertEquals(underlyingDomainObject, ObjectAdapter.Util.unwrapPojo(mockObjectAdapter));
}
@Test
public void testUnwrapStringWhenNull() {
- assertNull(ObjectAdapter.Util.unwrapAsString(null));
+ assertNull(ObjectAdapter.Util.unwrapPojoStringElse(null, null));
}
@Test
public void testUnwrapStringWhenNotNullButNotString() {
underlyingDomainObject = new Object();
expectAdapterWillReturn(underlyingDomainObject);
- assertNull(ObjectAdapter.Util.unwrapAsString(mockObjectAdapter));
+ assertNull(ObjectAdapter.Util.unwrapPojoStringElse(mockObjectAdapter, null));
}
@Test
public void testUnwrapStringWhenNotNullAndString() {
underlyingDomainObject = "huzzah";
expectAdapterWillReturn(underlyingDomainObject);
- assertEquals("huzzah", ObjectAdapter.Util.unwrapAsString(mockObjectAdapter));
+ assertEquals("huzzah", ObjectAdapter.Util.unwrapPojoStringElse(mockObjectAdapter, null));
}
private void expectAdapterWillReturn(final Object domainObject) {
diff --git a/core/plugins/jdo-datanucleus-4/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/queries/PersistenceQueryFindUsingApplibQueryProcessor.java b/core/plugins/jdo-datanucleus-4/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/queries/PersistenceQueryFindUsingApplibQueryProcessor.java
index ad5ec30..37bc877 100644
--- a/core/plugins/jdo-datanucleus-4/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/queries/PersistenceQueryFindUsingApplibQueryProcessor.java
+++ b/core/plugins/jdo-datanucleus-4/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/queries/PersistenceQueryFindUsingApplibQueryProcessor.java
@@ -138,7 +138,7 @@ public class PersistenceQueryFindUsingApplibQueryProcessor extends PersistenceQu
final Map<String, Object> argumentsByParameterName = Maps.newHashMap();
for (final String parameterName : argumentAdaptersByParameterName.keySet()) {
final ObjectAdapter argumentAdapter = argumentAdaptersByParameterName.get(parameterName);
- final Object argument = ObjectAdapter.Util.unwrap(argumentAdapter);
+ final Object argument = ObjectAdapter.Util.unwrapPojo(argumentAdapter);
argumentsByParameterName.put(parameterName, argument);
}
return argumentsByParameterName;
diff --git a/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/queries/PersistenceQueryFindUsingApplibQueryProcessor.java b/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/queries/PersistenceQueryFindUsingApplibQueryProcessor.java
index ee6e314..e8a1c66 100644
--- a/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/queries/PersistenceQueryFindUsingApplibQueryProcessor.java
+++ b/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/queries/PersistenceQueryFindUsingApplibQueryProcessor.java
@@ -139,7 +139,7 @@ public class PersistenceQueryFindUsingApplibQueryProcessor extends PersistenceQu
final Map<String, Object> argumentsByParameterName = Maps.newHashMap();
for (final String parameterName : argumentAdaptersByParameterName.keySet()) {
final ObjectAdapter argumentAdapter = argumentAdaptersByParameterName.get(parameterName);
- final Object argument = ObjectAdapter.Util.unwrap(argumentAdapter);
+ final Object argument = ObjectAdapter.Util.unwrapPojo(argumentAdapter);
argumentsByParameterName.put(parameterName, argument);
}
return argumentsByParameterName;
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/command/CommandDtoServiceInternalDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/command/CommandDtoServiceInternalDefault.java
index c087eaa..3bf00e4 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/command/CommandDtoServiceInternalDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/command/CommandDtoServiceInternalDefault.java
@@ -169,7 +169,7 @@ public class CommandDtoServiceInternalDefault implements CommandDtoServiceIntern
final Class<?> valueType = valueSpec.getCorrespondingClass();
final ValueWithTypeDto newValue = CommonDtoUtils.newValueWithTypeDto(
- valueType, ObjectAdapter.Util.unwrap(valueAdapter), bookmarkService);
+ valueType, ObjectAdapter.Util.unwrapPojo(valueAdapter), bookmarkService);
propertyDto.setNewValue(newValue);
}
diff --git a/core/runtime/src/main/java/org/apache/isis/core/wrapper/handlers/DomainObjectInvocationHandler.java b/core/runtime/src/main/java/org/apache/isis/core/wrapper/handlers/DomainObjectInvocationHandler.java
index 4d39e41..8666ded 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/wrapper/handlers/DomainObjectInvocationHandler.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/wrapper/handlers/DomainObjectInvocationHandler.java
@@ -425,7 +425,7 @@ public class DomainObjectInvocationHandler<T> extends DelegatingInvocationHandle
final InteractionInitiatedBy interactionInitiatedBy = getInteractionInitiatedBy();
final ObjectAdapter currentReferencedAdapter = property.get(targetAdapter, interactionInitiatedBy);
- final Object currentReferencedObj = ObjectAdapter.Util.unwrap(currentReferencedAdapter);
+ final Object currentReferencedObj = ObjectAdapter.Util.unwrapPojo(currentReferencedAdapter);
final PropertyAccessEvent ev = new PropertyAccessEvent(getDelegate(), property.getIdentifier(), currentReferencedObj);
notifyListeners(ev);
@@ -493,7 +493,7 @@ public class DomainObjectInvocationHandler<T> extends DelegatingInvocationHandle
final InteractionInitiatedBy interactionInitiatedBy = getInteractionInitiatedBy();
final ObjectAdapter currentReferencedAdapter = collection.get(targetAdapter, interactionInitiatedBy);
- final Object currentReferencedObj = ObjectAdapter.Util.unwrap(currentReferencedAdapter);
+ final Object currentReferencedObj = ObjectAdapter.Util.unwrapPojo(currentReferencedAdapter);
final CollectionAccessEvent ev = new CollectionAccessEvent(getDelegate(), collection.getIdentifier());
@@ -668,7 +668,7 @@ public class DomainObjectInvocationHandler<T> extends DelegatingInvocationHandle
targetAdapter, mixedInAdapter, argAdapters,
interactionInitiatedBy);
- return ObjectAdapter.Util.unwrap(returnedAdapter);
+ return ObjectAdapter.Util.unwrapPojo(returnedAdapter);
}
return null;
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/summary/CollectionContentsAsSummary.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/summary/CollectionContentsAsSummary.java
index eba1b45..654136a 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/summary/CollectionContentsAsSummary.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/summary/CollectionContentsAsSummary.java
@@ -134,7 +134,7 @@ public class CollectionContentsAsSummary extends PanelAbstract<EntityCollectionM
values.add(null);
continue;
}
- final Object valueObj = ObjectAdapter.Util.unwrap(valueAdapter);
+ final Object valueObj = ObjectAdapter.Util.unwrapPojo(valueAdapter);
if (valueObj == null) {
values.add(null);
continue;
[isis] 03/06: ISIS-1976: rename ObjectAdapter.getObject() ->
getPojo()
Posted by ah...@apache.org.
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 0b7afc6eb8cc0c7d48691eed9697be9f0d930963
Author: Andi Huber <ah...@apache.org>
AuthorDate: Sun Sep 30 05:03:43 2018 +0200
ISIS-1976: rename ObjectAdapter.getObject() -> getPojo()
Task-Url: https://issues.apache.org/jira/browse/ISIS-1976
---
.../apache/isis/core/metamodel/adapter/ObjectAdapter.java | 8 ++++----
.../apache/isis/core/metamodel/facets/CollectionUtils.java | 2 +-
.../isis/core/metamodel/facets/DomainEventHelper.java | 2 +-
.../ActionInvocationFacetForDomainEventAbstract.java | 8 ++++----
.../modify/CollectionDomainEventFacetAbstract.java | 2 +-
.../collections/javautilcollection/JavaArrayFacet.java | 2 +-
.../javautilcollection/JavaCollectionFacet.java | 2 +-
...iaDomainObjectLayoutAnnotationUsingCssClassUiEvent.java | 2 +-
...cetViaDomainObjectLayoutAnnotationUsingIconUiEvent.java | 2 +-
...etViaDomainObjectLayoutAnnotationUsingTitleUiEvent.java | 2 +-
.../encoder/EncodableFacetUsingEncoderDecoder.java | 2 +-
.../metamodel/facets/object/mixin/MixinFacetAbstract.java | 2 +-
...abledFacetOnCollectionDerivedFromRecreatableObject.java | 2 +-
...isabledFacetOnPropertyDerivedFromRecreatableObject.java | 2 +-
.../title/annotation/TitleFacetViaTitleAnnotation.java | 2 +-
.../object/title/methods/TitleFacetViaToStringMethod.java | 2 +-
.../facets/object/title/parser/TitleFacetUsingParser.java | 4 ++--
...ySpecificationFromMustSatisfyAnnotationOnTypeFacet.java | 2 +-
.../MustSatisfySpecificationFacetAbstract.java | 2 +-
.../property/modify/PropertyDomainEventFacetAbstract.java | 2 +-
.../value/ValueSemanticsProviderAbstractTemporal.java | 2 +-
.../booleans/BooleanValueSemanticsProviderAbstract.java | 2 +-
.../value/bytes/ByteValueSemanticsProviderAbstract.java | 2 +-
.../value/chars/CharValueSemanticsProviderAbstract.java | 2 +-
.../facets/value/color/ColorValueSemanticsProvider.java | 2 +-
.../datejdk8local/Jdk8LocalDateValueSemanticsProvider.java | 2 +-
.../datejodalocal/JodaLocalDateValueSemanticsProvider.java | 2 +-
.../Jdk8LocalDateTimeValueSemanticsProvider.java | 2 +-
.../JodaLocalDateTimeValueSemanticsProvider.java | 2 +-
.../doubles/DoubleValueSemanticsProviderAbstract.java | 2 +-
.../value/floats/FloatValueSemanticsProviderAbstract.java | 2 +-
.../facets/value/image/ImageValueSemanticsProvider.java | 2 +-
.../value/imageawt/JavaAwtImageValueSemanticsProvider.java | 2 +-
.../value/integer/IntValueSemanticsProviderAbstract.java | 2 +-
.../LocalResourcePathValueSemanticsProvider.java | 2 +-
.../value/longs/LongValueSemanticsProviderAbstract.java | 2 +-
.../facets/value/markup/MarkupValueSemanticsProvider.java | 2 +-
.../facets/value/money/MoneyValueSemanticsProvider.java | 4 ++--
.../value/password/PasswordValueSemanticsProvider.java | 4 ++--
.../value/percentage/PercentageValueSemanticsProvider.java | 2 +-
.../shortint/ShortValueSemanticsProviderAbstract.java | 2 +-
.../facets/value/string/StringValueSemanticsProvider.java | 2 +-
.../facets/value/url/URLValueSemanticsProvider.java | 2 +-
.../facets/value/uuid/UUIDValueSemanticsProvider.java | 2 +-
.../metamodel/interactions/CollectionUsabilityContext.java | 2 +-
.../services/factory/FactoryServiceInternalDefault.java | 2 +-
.../org/apache/isis/core/metamodel/spec/ManagedObject.java | 6 ------
.../specloader/specimpl/ObjectMemberAbstract.java | 2 +-
.../specimpl/dflt/ObjectSpecificationDefault.java | 2 +-
.../standalonelist/CollectionFacetOnStandaloneList.java | 2 +-
.../ObjectSpecificationOnStandaloneList.java | 2 +-
.../org/apache/isis/core/runtime/snapshot/XmlSnapshot.java | 4 ++--
.../isis/core/metamodel/facets/ObjectAdapterUtilsTest.java | 2 +-
.../facets/collections/JavaCollectionFacetTest.java | 2 +-
.../object/ident/cssclass/CssClassFacetMethodTest.java | 2 +-
.../ident/cssclass/CssClassFacetMethodWithProblemTest.java | 2 +-
.../facets/object/ident/icon/IconFacetMethodTest.java | 2 +-
.../facets/object/ident/title/TitleFacetViaMethodTest.java | 2 +-
.../title/annotation/TitleAnnotationFacetFactoryTest.java | 4 ++--
.../title/annotation/TitleFacetViaTitleAnnotationTest.java | 4 ++--
.../object/navparent/NavigableParentFacetMethodTest.java | 4 ++--
...tSatisfySpecificationValidatingInteractionMoreTest.java | 4 ++--
.../MustSatisfySpecificationValidatingInteractionTest.java | 2 +-
.../value/ValueSemanticsProviderAbstractTestCase.java | 2 +-
.../persistence/adapterfactory/pojo/PojoAdapterTest.java | 2 +-
.../wrapper/WrapperFactoryDefaultTest_wrappedObject.java | 6 +++---
.../WrapperFactoryDefaultTest_wrappedObject_transient.java | 4 ++--
.../persistence/adapterfactory/pojo/PojoAdapterTest.java | 2 +-
.../wrapper/WrapperFactoryDefaultTest_wrappedObject.java | 6 +++---
.../WrapperFactoryDefaultTest_wrappedObject_transient.java | 4 ++--
.../apache/isis/core/runtime/memento/StandaloneData.java | 2 +-
.../isis/core/runtime/persistence/adapter/PojoAdapter.java | 11 ++---------
.../core/runtime/services/changes/AdapterAndProperty.java | 2 +-
.../services/command/CommandDtoServiceInternalDefault.java | 2 +-
.../services/homepage/HomePageProviderServiceDefault.java | 2 +-
.../services/ixn/InteractionDtoServiceInternalDefault.java | 4 ++--
.../PersistenceSessionServiceInternalDefault.java | 4 ++--
.../persistence/adaptermanager/ObjectAdapterContext.java | 4 ++--
.../ObjectAdapterContext_LifecycleEventSupport.java | 2 +-
.../ObjectAdapterContext_ObjectCreation.java | 2 +-
.../adaptermanager/ObjectAdapterContext_ServiceLookup.java | 2 +-
.../persistence/adaptermanager/ObjectAdapterLegacy.java | 2 +-
.../handlers/DelegatingInvocationHandlerDefault.java | 2 +-
.../commands/DataNucleusCreateObjectCommand.java | 2 +-
.../commands/DataNucleusDeleteObjectCommand.java | 2 +-
.../rendering/domainobjects/DomainObjectReprRenderer.java | 2 +-
.../rendering/domainobjects/DomainServiceLinkTo.java | 2 +-
.../rendering/domainobjects/JsonValueEncoder.java | 4 ++--
.../service/conneg/ContentNegotiationServiceAbstract.java | 2 +-
.../ContentNegotiationServiceForRestfulObjectsV1_0.java | 2 +-
.../JsonValueEncoderTest_appendValueAndFormat.java | 2 +-
.../domainobjects/JsonValueEncoderTest_asObject.java | 14 +++++++-------
.../server/resources/ObjectActionArgHelper.java | 2 +-
.../restfulobjects/server/resources/ResourceAbstract.java | 2 +-
.../isis/viewer/restfulobjects/server/util/OidUtils.java | 2 +-
.../viewer/wicket/model/mementos/ObjectAdapterMemento.java | 10 +++++-----
.../isis/viewer/wicket/model/models/ActionModel.java | 2 +-
.../viewer/wicket/model/models/EntityCollectionModel.java | 4 ++--
.../isis/viewer/wicket/model/models/ScalarModel.java | 6 +++---
.../wicket/model/models/whereami/WhereAmIModelDefault.java | 2 +-
.../wicket/ui/actionresponse/ActionResultResponseType.java | 12 ++++++------
.../ajaxtable/CollectionContentsAsAjaxTablePanel.java | 2 +-
.../ajaxtable/CollectionContentsSortableDataProvider.java | 4 ++--
.../scalars/ScalarPanelTextFieldDatePickerAbstract.java | 2 +-
.../ui/components/scalars/ScalarPanelTextFieldNumeric.java | 2 +-
.../wicket/ui/components/scalars/TextFieldValueModel.java | 2 +-
.../scalars/isisapplib/IsisBlobOrClobPanelAbstract.java | 4 ++--
.../ui/components/scalars/markup/MarkupComponent.java | 4 ++--
.../ui/components/scalars/markup/MarkupPanelFactories.java | 4 ++--
.../ui/components/scalars/primitive/BooleanPanel.java | 4 ++--
.../wicket/ui/components/tree/IsisToWicketTreeAdapter.java | 8 ++++----
.../wicket/ui/components/tree/TreePanelFactories.java | 4 ++--
.../wicket/ui/components/unknown/UnknownModelPanel.java | 2 +-
.../ui/components/widgets/linkandlabel/ActionLink.java | 4 ++--
.../widgets/linkandlabel/ActionLinkFactoryAbstract.java | 2 +-
.../providers/ObjectAdapterMementoProviderAbstract.java | 2 +-
116 files changed, 168 insertions(+), 181 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ObjectAdapter.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ObjectAdapter.java
index 4f22653..fcbd15e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ObjectAdapter.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ObjectAdapter.java
@@ -117,7 +117,7 @@ public interface ObjectAdapter extends ManagedObject {
private Util() {}
public static Object unwrap(final ManagedObject adapter) {
- return adapter != null ? adapter.getObject() : null;
+ return adapter != null ? adapter.getPojo() : null;
}
public static Object[] unwrap(final ManagedObject[] adapters) {
@@ -161,7 +161,7 @@ public interface ObjectAdapter extends ManagedObject {
}
public static boolean exists(final ManagedObject adapter) {
- return adapter != null && adapter.getObject() != null;
+ return adapter != null && adapter.getPojo() != null;
}
public static boolean wrappedEqual(final ManagedObject adapter1, final ManagedObject adapter2) {
@@ -176,7 +176,7 @@ public interface ObjectAdapter extends ManagedObject {
if (!defined1 && !defined2) {
return true;
} // both null
- return adapter1.getObject().equals(adapter2.getObject());
+ return adapter1.getPojo().equals(adapter2.getPojo());
}
public static boolean nullSafeEquals(final Object obj1, final Object obj2) {
@@ -192,7 +192,7 @@ public interface ObjectAdapter extends ManagedObject {
if (obj1 instanceof ManagedObject && obj2 instanceof ManagedObject) {
final ManagedObject adapterObj1 = (ManagedObject) obj1;
final ManagedObject adapterObj2 = (ManagedObject) obj2;
- return nullSafeEquals(adapterObj1.getObject(), adapterObj2.getObject());
+ return nullSafeEquals(adapterObj1.getPojo(), adapterObj2.getPojo());
}
return false;
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/CollectionUtils.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/CollectionUtils.java
index 4b73390..5473184 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/CollectionUtils.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/CollectionUtils.java
@@ -59,7 +59,7 @@ public final class CollectionUtils {
CollectionFacet.Utils.streamAdapters(collection);
return objectAdapters
- .map(nextElement->nextElement != null? nextElement.getObject(): null)
+ .map(nextElement->nextElement != null? nextElement.getPojo(): null)
.collect(_Arrays.toArray(Object.class, facet.size(collection)));
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/DomainEventHelper.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/DomainEventHelper.java
index 32ae65f..cfc90d1 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/DomainEventHelper.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/DomainEventHelper.java
@@ -79,7 +79,7 @@ public class DomainEventHelper {
// copy over if have
if(mixedInAdapter != null ) {
- event.setMixedIn(mixedInAdapter.getObject());
+ event.setMixedIn(mixedInAdapter.getPojo());
}
if(objectAction != null) {
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 94fe83d..fdf6a62 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
@@ -417,7 +417,7 @@ implements ImperativeFacet {
}
final ViewModelFacet viewModelFacet = adapter.getSpecification().getFacet(ViewModelFacet.class);
- final Object clone = viewModelFacet.clone(adapter.getObject());
+ final Object clone = viewModelFacet.clone(adapter.getPojo());
final ObjectAdapter clonedAdapter = getObjectAdapterProvider().adapterFor(clone);
return clonedAdapter;
@@ -437,7 +437,7 @@ implements ImperativeFacet {
final MetaModelService.Sort sort = getMetaModelService().sortOf(domainType, Mode.STRICT);
switch (sort) {
case JDO_ENTITY:
- final Object domainObject = resultAdapter.getObject();
+ final Object domainObject = resultAdapter.getPojo();
// ensure that any still-to-be-persisted adapters get persisted to DB.
if(!getRepositoryService().isPersistent(domainObject)) {
getTransactionService().flushTransaction();
@@ -483,7 +483,7 @@ implements ImperativeFacet {
return resultAdapter;
}
- final Object result = resultAdapter.getObject();
+ final Object result = resultAdapter.getPojo();
if(result instanceof Collection || result.getClass().isArray()) {
@@ -531,7 +531,7 @@ implements ImperativeFacet {
}
private static Object unwrap(final ObjectAdapter adapter) {
- return adapter == null ? null : adapter.getObject();
+ return adapter == null ? null : adapter.getPojo();
}
@Override
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/modify/CollectionDomainEventFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/modify/CollectionDomainEventFacetAbstract.java
index 28a7ca3..b430213 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/modify/CollectionDomainEventFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/modify/CollectionDomainEventFacetAbstract.java
@@ -98,7 +98,7 @@ public abstract class CollectionDomainEventFacetAbstract extends SingleClassValu
public String invalidates(final ValidityContext<? extends ValidityEvent> ic) {
final ProposedHolder catc = (ProposedHolder) ic;
- final Object proposed = catc.getProposed().getObject();
+ final Object proposed = catc.getProposed().getPojo();
final CollectionDomainEvent.Of of =
ic instanceof CollectionAddToContext
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/javautilcollection/JavaArrayFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/javautilcollection/JavaArrayFacet.java
index 5ad4ca3..dcee031 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/javautilcollection/JavaArrayFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/javautilcollection/JavaArrayFacet.java
@@ -76,7 +76,7 @@ public class JavaArrayFacet extends CollectionFacetAbstract {
// -- HELPER
private Object[] pojoArray(final ManagedObject arrayAdapter) {
- return (Object[]) arrayAdapter.getObject();
+ return (Object[]) arrayAdapter.getPojo();
}
// /////////////////////////////////////////////////////
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/javautilcollection/JavaCollectionFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/javautilcollection/JavaCollectionFacet.java
index f4b8abf..51de333 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/javautilcollection/JavaCollectionFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/javautilcollection/JavaCollectionFacet.java
@@ -72,7 +72,7 @@ public class JavaCollectionFacet extends CollectionFacetAbstract {
*/
@SuppressWarnings("unchecked")
private Collection<? super Object> pojoCollection(final ManagedObject collectionAdapter) {
- return (Collection<? super Object>) collectionAdapter.getObject();
+ return (Collection<? super Object>) collectionAdapter.getPojo();
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/CssClassFacetViaDomainObjectLayoutAnnotationUsingCssClassUiEvent.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/CssClassFacetViaDomainObjectLayoutAnnotationUsingCssClassUiEvent.java
index a9de856..25bc567 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/CssClassFacetViaDomainObjectLayoutAnnotationUsingCssClassUiEvent.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/CssClassFacetViaDomainObjectLayoutAnnotationUsingCssClassUiEvent.java
@@ -98,7 +98,7 @@ CssClassFacet {
}
private CssClassUiEvent<Object> newCssClassUiEvent(final ManagedObject owningAdapter) {
- final Object domainObject = owningAdapter.getObject();
+ final Object domainObject = owningAdapter.getPojo();
return newCssClassUiEventForPojo(domainObject);
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/IconFacetViaDomainObjectLayoutAnnotationUsingIconUiEvent.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/IconFacetViaDomainObjectLayoutAnnotationUsingIconUiEvent.java
index 4443184..9a347af 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/IconFacetViaDomainObjectLayoutAnnotationUsingIconUiEvent.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/IconFacetViaDomainObjectLayoutAnnotationUsingIconUiEvent.java
@@ -98,7 +98,7 @@ public class IconFacetViaDomainObjectLayoutAnnotationUsingIconUiEvent extends Ic
}
private IconUiEvent<Object> newIconUiEvent(final ManagedObject owningAdapter) {
- final Object domainObject = owningAdapter.getObject();
+ final Object domainObject = owningAdapter.getPojo();
return newIconUiEventForPojo(domainObject);
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/TitleFacetViaDomainObjectLayoutAnnotationUsingTitleUiEvent.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/TitleFacetViaDomainObjectLayoutAnnotationUsingTitleUiEvent.java
index bcc2902..39e8533 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/TitleFacetViaDomainObjectLayoutAnnotationUsingTitleUiEvent.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/TitleFacetViaDomainObjectLayoutAnnotationUsingTitleUiEvent.java
@@ -113,7 +113,7 @@ public class TitleFacetViaDomainObjectLayoutAnnotationUsingTitleUiEvent extends
}
private TitleUiEvent<Object> newTitleUiEvent(final ManagedObject owningAdapter) {
- final Object domainObject = owningAdapter.getObject();
+ final Object domainObject = owningAdapter.getPojo();
return newTitleUiEvent(domainObject);
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/encodeable/encoder/EncodableFacetUsingEncoderDecoder.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/encodeable/encoder/EncodableFacetUsingEncoderDecoder.java
index e399e82..91deedf 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/encodeable/encoder/EncodableFacetUsingEncoderDecoder.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/encodeable/encoder/EncodableFacetUsingEncoderDecoder.java
@@ -66,7 +66,7 @@ public class EncodableFacetUsingEncoderDecoder extends FacetAbstract implements
@Override
public String toEncodedString(final ObjectAdapter adapter) {
getDependencyInjector().injectServicesInto(encoderDecoder);
- return adapter == null ? ENCODED_NULL: encode(encoderDecoder, adapter.getObject());
+ return adapter == null ? ENCODED_NULL: encode(encoderDecoder, adapter.getPojo());
}
private static <T> String encode(final EncoderDecoder<T> encoderDecoder, final Object pojo) {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/mixin/MixinFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/mixin/MixinFacetAbstract.java
index b4d541e..5cd934e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/mixin/MixinFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/mixin/MixinFacetAbstract.java
@@ -92,7 +92,7 @@ public abstract class MixinFacetAbstract extends SingleValueFacetAbstract<String
@Override
public ObjectAdapter mixedIn(ObjectAdapter mixinAdapter, final Policy policy) {
- final Object mixin = mixinAdapter.getObject();
+ final Object mixin = mixinAdapter.getPojo();
final Field[] declaredFields = mixinType.getDeclaredFields();
for (final Field declaredField : declaredFields) {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/DisabledFacetOnCollectionDerivedFromRecreatableObject.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/DisabledFacetOnCollectionDerivedFromRecreatableObject.java
index 62b4181..6b1e5fc 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/DisabledFacetOnCollectionDerivedFromRecreatableObject.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/DisabledFacetOnCollectionDerivedFromRecreatableObject.java
@@ -38,7 +38,7 @@ public class DisabledFacetOnCollectionDerivedFromRecreatableObject extends Disab
@Override
public String disabledReason(final ManagedObject target) {
final ViewModelFacet facet = target.getSpecification().getFacet(ViewModelFacet.class);
- final Object targetObject = target.getObject();
+ final Object targetObject = target.getPojo();
final boolean cloneable = facet.isCloneable(targetObject);
return !cloneable ? "Non-cloneable view models are read-only" : null;
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/DisabledFacetOnPropertyDerivedFromRecreatableObject.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/DisabledFacetOnPropertyDerivedFromRecreatableObject.java
index 41b9a94..f3e67ad 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/DisabledFacetOnPropertyDerivedFromRecreatableObject.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/DisabledFacetOnPropertyDerivedFromRecreatableObject.java
@@ -39,7 +39,7 @@ public class DisabledFacetOnPropertyDerivedFromRecreatableObject extends Disable
@Override
public String disabledReason(final ManagedObject target) {
final ViewModelFacet facet = target.getSpecification().getFacet(ViewModelFacet.class);
- final boolean cloneable = facet.isCloneable(target.getObject());
+ final boolean cloneable = facet.isCloneable(target.getPojo());
if (!cloneable) {
return "Non-cloneable view models are read-only";
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/title/annotation/TitleFacetViaTitleAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/title/annotation/TitleFacetViaTitleAnnotation.java
index 8e96f69..e43b56d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/title/annotation/TitleFacetViaTitleAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/title/annotation/TitleFacetViaTitleAnnotation.java
@@ -112,7 +112,7 @@ public class TitleFacetViaTitleAnnotation extends TitleFacetAbstract {
try {
for (final TitleComponent component : this.components) {
- final Object titlePart = component.getTitleEvaluator().value(targetAdapter.getObject());
+ final Object titlePart = component.getTitleEvaluator().value(targetAdapter.getPojo());
if (titlePart == null) {
continue;
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/title/methods/TitleFacetViaToStringMethod.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/title/methods/TitleFacetViaToStringMethod.java
index d055d41..91178dc 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/title/methods/TitleFacetViaToStringMethod.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/title/methods/TitleFacetViaToStringMethod.java
@@ -53,7 +53,7 @@ public class TitleFacetViaToStringMethod extends TitleFacetAbstract implements I
@Override
public String title(final ManagedObject object) {
- return object.getObject().toString();
+ return object.getPojo().toString();
}
@Override
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/title/parser/TitleFacetUsingParser.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/title/parser/TitleFacetUsingParser.java
index a928dd8..238342e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/title/parser/TitleFacetUsingParser.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/title/parser/TitleFacetUsingParser.java
@@ -48,7 +48,7 @@ public class TitleFacetUsingParser extends FacetAbstract implements TitleFacet {
if (adapter == null) {
return null;
}
- final Object object = adapter.getObject();
+ final Object object = adapter.getPojo();
if (object == null) {
return null;
}
@@ -68,7 +68,7 @@ public class TitleFacetUsingParser extends FacetAbstract implements TitleFacet {
if (adapter == null) {
return null;
}
- final Object object = adapter.getObject();
+ final Object object = adapter.getPojo();
if (object == null) {
return null;
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/validating/mustsatisfyspec/MustSatisfySpecificationFromMustSatisfyAnnotationOnTypeFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/validating/mustsatisfyspec/MustSatisfySpecificationFromMustSatisfyAnnotationOnTypeFacet.java
index db70eaa..c5b7396 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/validating/mustsatisfyspec/MustSatisfySpecificationFromMustSatisfyAnnotationOnTypeFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/validating/mustsatisfyspec/MustSatisfySpecificationFromMustSatisfyAnnotationOnTypeFacet.java
@@ -70,7 +70,7 @@ public class MustSatisfySpecificationFromMustSatisfyAnnotationOnTypeFacet extend
}
final ProposedHolder proposedHolder = (ProposedHolder) validityContext;
final ManagedObject targetNO = proposedHolder.getProposed();
- final Object targetObject = targetNO.getObject();
+ final Object targetObject = targetNO.getPojo();
return specificationEvaluator.evaluation()
.evaluate(specifications, targetObject)
.getReason();
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/mustsatisfyspec/MustSatisfySpecificationFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/mustsatisfyspec/MustSatisfySpecificationFacetAbstract.java
index 68a3871..76c300d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/mustsatisfyspec/MustSatisfySpecificationFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/mustsatisfyspec/MustSatisfySpecificationFacetAbstract.java
@@ -82,7 +82,7 @@ public abstract class MustSatisfySpecificationFacetAbstract extends FacetAbstrac
if(proposedAdapter == null) {
return null;
}
- final Object proposedObject = proposedAdapter.getObject();
+ final Object proposedObject = proposedAdapter.getPojo();
return specificationEvaluator.evaluation()
.evaluate(specifications, proposedObject)
.getReason();
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/modify/PropertyDomainEventFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/modify/PropertyDomainEventFacetAbstract.java
index 0b513e4..4c42856 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/modify/PropertyDomainEventFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/modify/PropertyDomainEventFacetAbstract.java
@@ -125,7 +125,7 @@ extends SingleClassValueFacetAbstract implements PropertyDomainEventFacet {
private static Object proposedFrom(ValidityContext<? extends ValidityEvent> ic) {
final ProposedHolder ph = (ProposedHolder) ic;
final ManagedObject proposedAdapter = ph.getProposed();
- return proposedAdapter != null? proposedAdapter.getObject(): null;
+ return proposedAdapter != null? proposedAdapter.getPojo(): null;
}
private Class<?> eventType() {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/ValueSemanticsProviderAbstractTemporal.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/ValueSemanticsProviderAbstractTemporal.java
index 20dc35f..4f8934e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/ValueSemanticsProviderAbstractTemporal.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/ValueSemanticsProviderAbstractTemporal.java
@@ -322,7 +322,7 @@ public abstract class ValueSemanticsProviderAbstractTemporal<T> extends ValueSem
@Override
public final Date dateValue(final ObjectAdapter object) {
- return object == null ? null : dateValue(object.getObject());
+ return object == null ? null : dateValue(object.getPojo());
}
@Override
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/booleans/BooleanValueSemanticsProviderAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/booleans/BooleanValueSemanticsProviderAbstract.java
index c0b7bde..083e235 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/booleans/BooleanValueSemanticsProviderAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/booleans/BooleanValueSemanticsProviderAbstract.java
@@ -114,7 +114,7 @@ public abstract class BooleanValueSemanticsProviderAbstract extends ValueSemanti
if (!ObjectAdapter.Util.exists(adapter)) {
return false;
}
- final Object object = adapter.getObject();
+ final Object object = adapter.getPojo();
final Boolean objectAsBoolean = (Boolean) object;
return objectAsBoolean.booleanValue();
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/bytes/ByteValueSemanticsProviderAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/bytes/ByteValueSemanticsProviderAbstract.java
index c33f02a..3e9eca9 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/bytes/ByteValueSemanticsProviderAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/bytes/ByteValueSemanticsProviderAbstract.java
@@ -90,7 +90,7 @@ public abstract class ByteValueSemanticsProviderAbstract extends ValueSemanticsP
@Override
public Byte byteValue(final ObjectAdapter object) {
- return (Byte) object.getObject();
+ return (Byte) object.getPojo();
}
@Override
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/chars/CharValueSemanticsProviderAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/chars/CharValueSemanticsProviderAbstract.java
index ce23f46..8251eef 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/chars/CharValueSemanticsProviderAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/chars/CharValueSemanticsProviderAbstract.java
@@ -86,7 +86,7 @@ public abstract class CharValueSemanticsProviderAbstract extends ValueSemanticsP
@Override
public Character charValue(final ObjectAdapter object) {
- return object == null ? null : (Character) object.getObject();
+ return object == null ? null : (Character) object.getPojo();
}
@Override
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/color/ColorValueSemanticsProvider.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/color/ColorValueSemanticsProvider.java
index 332205e..a6ca704 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/color/ColorValueSemanticsProvider.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/color/ColorValueSemanticsProvider.java
@@ -108,7 +108,7 @@ public class ColorValueSemanticsProvider extends ValueSemanticsProviderAndFacetA
if (object == null) {
return 0;
}
- final Color color = (Color) object.getObject();
+ final Color color = (Color) object.getPojo();
return color.intValue();
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/datejdk8local/Jdk8LocalDateValueSemanticsProvider.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/datejdk8local/Jdk8LocalDateValueSemanticsProvider.java
index 60f1b64..a2377b8 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/datejdk8local/Jdk8LocalDateValueSemanticsProvider.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/datejdk8local/Jdk8LocalDateValueSemanticsProvider.java
@@ -254,7 +254,7 @@ public class Jdk8LocalDateValueSemanticsProvider extends ValueSemanticsProviderA
@Override
public final LocalDate dateValue(final ObjectAdapter object) {
- return (LocalDate) (object == null ? null : object.getObject());
+ return (LocalDate) (object == null ? null : object.getPojo());
}
@Override
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/datejodalocal/JodaLocalDateValueSemanticsProvider.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/datejodalocal/JodaLocalDateValueSemanticsProvider.java
index 59b694c..60fcc6d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/datejodalocal/JodaLocalDateValueSemanticsProvider.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/datejodalocal/JodaLocalDateValueSemanticsProvider.java
@@ -255,7 +255,7 @@ public class JodaLocalDateValueSemanticsProvider extends ValueSemanticsProviderA
@Override
public final LocalDate dateValue(final ObjectAdapter object) {
- return (LocalDate) (object == null ? null : object.getObject());
+ return (LocalDate) (object == null ? null : object.getPojo());
}
@Override
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/datetimejdk8local/Jdk8LocalDateTimeValueSemanticsProvider.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/datetimejdk8local/Jdk8LocalDateTimeValueSemanticsProvider.java
index 8eb73d7..854c23f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/datetimejdk8local/Jdk8LocalDateTimeValueSemanticsProvider.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/datetimejdk8local/Jdk8LocalDateTimeValueSemanticsProvider.java
@@ -256,7 +256,7 @@ public class Jdk8LocalDateTimeValueSemanticsProvider extends ValueSemanticsProvi
@Override
public final LocalDateTime dateValue(final ObjectAdapter object) {
- return (LocalDateTime) (object == null ? null : object.getObject());
+ return (LocalDateTime) (object == null ? null : object.getPojo());
}
@Override
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/datetimejodalocal/JodaLocalDateTimeValueSemanticsProvider.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/datetimejodalocal/JodaLocalDateTimeValueSemanticsProvider.java
index ce9c732..0c1b19d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/datetimejodalocal/JodaLocalDateTimeValueSemanticsProvider.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/datetimejodalocal/JodaLocalDateTimeValueSemanticsProvider.java
@@ -256,7 +256,7 @@ public class JodaLocalDateTimeValueSemanticsProvider extends ValueSemanticsProvi
@Override
public final LocalDateTime dateValue(final ObjectAdapter object) {
- return (LocalDateTime) (object == null ? null : object.getObject());
+ return (LocalDateTime) (object == null ? null : object.getPojo());
}
@Override
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/doubles/DoubleValueSemanticsProviderAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/doubles/DoubleValueSemanticsProviderAbstract.java
index e2e90d7..ddac228 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/doubles/DoubleValueSemanticsProviderAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/doubles/DoubleValueSemanticsProviderAbstract.java
@@ -95,7 +95,7 @@ public abstract class DoubleValueSemanticsProviderAbstract extends ValueSemantic
@Override
public Double doubleValue(final ObjectAdapter object) {
- return (Double) (object == null ? null : object.getObject());
+ return (Double) (object == null ? null : object.getPojo());
}
@Override
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/floats/FloatValueSemanticsProviderAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/floats/FloatValueSemanticsProviderAbstract.java
index 7479898..537c4f2 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/floats/FloatValueSemanticsProviderAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/floats/FloatValueSemanticsProviderAbstract.java
@@ -91,7 +91,7 @@ public class FloatValueSemanticsProviderAbstract extends ValueSemanticsProviderA
@Override
public Float floatValue(final ObjectAdapter object) {
- return object == null ? null : (Float) object.getObject();
+ return object == null ? null : (Float) object.getPojo();
}
@Override
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/image/ImageValueSemanticsProvider.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/image/ImageValueSemanticsProvider.java
index e682a71..37594de 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/image/ImageValueSemanticsProvider.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/image/ImageValueSemanticsProvider.java
@@ -38,7 +38,7 @@ public class ImageValueSemanticsProvider extends ImageValueSemanticsProviderAbst
}
private Image image(final ObjectAdapter object) {
- return (Image) object.getObject();
+ return (Image) object.getPojo();
}
@Override
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/imageawt/JavaAwtImageValueSemanticsProvider.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/imageawt/JavaAwtImageValueSemanticsProvider.java
index 0b6591d..6da021e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/imageawt/JavaAwtImageValueSemanticsProvider.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/imageawt/JavaAwtImageValueSemanticsProvider.java
@@ -38,7 +38,7 @@ public class JavaAwtImageValueSemanticsProvider extends ImageValueSemanticsProvi
}
private Image image(final ObjectAdapter object) {
- return (Image) object.getObject();
+ return (Image) object.getPojo();
}
@Override
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/integer/IntValueSemanticsProviderAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/integer/IntValueSemanticsProviderAbstract.java
index 094fed3..93013f9 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/integer/IntValueSemanticsProviderAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/integer/IntValueSemanticsProviderAbstract.java
@@ -91,7 +91,7 @@ public abstract class IntValueSemanticsProviderAbstract extends ValueSemanticsPr
@Override
public Integer integerValue(final ObjectAdapter object) {
- return (Integer) (object == null ? null : object.getObject());
+ return (Integer) (object == null ? null : object.getPojo());
}
@Override
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/localrespath/LocalResourcePathValueSemanticsProvider.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/localrespath/LocalResourcePathValueSemanticsProvider.java
index 889f9e3..17a75a2 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/localrespath/LocalResourcePathValueSemanticsProvider.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/localrespath/LocalResourcePathValueSemanticsProvider.java
@@ -113,7 +113,7 @@ extends ValueSemanticsProviderAndFacetAbstract<LocalResourcePath> implements Loc
@Override
public LocalResourcePath localResourcePathValue(final ObjectAdapter object) {
- return object == null ? null : (LocalResourcePath) object.getObject();
+ return object == null ? null : (LocalResourcePath) object.getPojo();
}
@Override
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/longs/LongValueSemanticsProviderAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/longs/LongValueSemanticsProviderAbstract.java
index e54ef27..8152a6e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/longs/LongValueSemanticsProviderAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/longs/LongValueSemanticsProviderAbstract.java
@@ -91,7 +91,7 @@ public abstract class LongValueSemanticsProviderAbstract extends ValueSemanticsP
@Override
public Long longValue(final ObjectAdapter object) {
- return (Long) (object == null ? null : object.getObject());
+ return (Long) (object == null ? null : object.getPojo());
}
@Override
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/markup/MarkupValueSemanticsProvider.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/markup/MarkupValueSemanticsProvider.java
index fb9bc70..510cc5b 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/markup/MarkupValueSemanticsProvider.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/markup/MarkupValueSemanticsProvider.java
@@ -78,7 +78,7 @@ public class MarkupValueSemanticsProvider extends ValueSemanticsProviderAndFacet
if (object == null) {
return "";
}
- final Markup markup = (Markup) object.getObject();
+ final Markup markup = (Markup) object.getPojo();
return markup.asString();
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/money/MoneyValueSemanticsProvider.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/money/MoneyValueSemanticsProvider.java
index 7ad7a2f..4908feb 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/money/MoneyValueSemanticsProvider.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/money/MoneyValueSemanticsProvider.java
@@ -193,7 +193,7 @@ public class MoneyValueSemanticsProvider extends ValueSemanticsProviderAndFacetA
@Override
public float getAmount(final ObjectAdapter object) {
- final Money money = (Money) object.getObject();
+ final Money money = (Money) object.getPojo();
if (money == null) {
return 0.0f;
} else {
@@ -203,7 +203,7 @@ public class MoneyValueSemanticsProvider extends ValueSemanticsProviderAndFacetA
@Override
public String getCurrencyCode(final ObjectAdapter object) {
- final Money money = (Money) object.getObject();
+ final Money money = (Money) object.getPojo();
if (money == null) {
return "";
} else {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/password/PasswordValueSemanticsProvider.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/password/PasswordValueSemanticsProvider.java
index 6a83ce7..b8c4410 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/password/PasswordValueSemanticsProvider.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/password/PasswordValueSemanticsProvider.java
@@ -90,7 +90,7 @@ PasswordValueFacet {
@Override
public boolean checkPassword(final ObjectAdapter object, final String password) {
- return password(object.getObject()).checkPassword(password);
+ return password(object.getPojo()).checkPassword(password);
}
@Override
@@ -105,7 +105,7 @@ PasswordValueFacet {
private Password password(final Object object) {
if (object instanceof ObjectAdapter) {
- return (Password) ((ObjectAdapter) object).getObject();
+ return (Password) ((ObjectAdapter) object).getPojo();
} else {
return (Password) object;
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/percentage/PercentageValueSemanticsProvider.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/percentage/PercentageValueSemanticsProvider.java
index a057a50..acb1a8c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/percentage/PercentageValueSemanticsProvider.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/percentage/PercentageValueSemanticsProvider.java
@@ -124,7 +124,7 @@ public class PercentageValueSemanticsProvider extends ValueSemanticsProviderAndF
@Override
public Float floatValue(final ObjectAdapter object) {
- final Percentage per = (Percentage) object.getObject();
+ final Percentage per = (Percentage) object.getPojo();
return new Float(per.floatValue());
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/shortint/ShortValueSemanticsProviderAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/shortint/ShortValueSemanticsProviderAbstract.java
index 8a650d2..3fec1b4 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/shortint/ShortValueSemanticsProviderAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/shortint/ShortValueSemanticsProviderAbstract.java
@@ -96,7 +96,7 @@ public class ShortValueSemanticsProviderAbstract extends ValueSemanticsProviderA
@Override
public Short shortValue(final ObjectAdapter object) {
- return (Short) (object == null ? null : object.getObject());
+ return (Short) (object == null ? null : object.getPojo());
}
// /////// toString ///////
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/string/StringValueSemanticsProvider.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/string/StringValueSemanticsProvider.java
index 94924fb..d3375fb 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/string/StringValueSemanticsProvider.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/string/StringValueSemanticsProvider.java
@@ -109,7 +109,7 @@ public class StringValueSemanticsProvider extends ValueSemanticsProviderAndFacet
@Override
public String stringValue(final ObjectAdapter object) {
- return object == null ? "" : (String) object.getObject();
+ return object == null ? "" : (String) object.getPojo();
}
@Override
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/url/URLValueSemanticsProvider.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/url/URLValueSemanticsProvider.java
index 671ffb0..a252417 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/url/URLValueSemanticsProvider.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/url/URLValueSemanticsProvider.java
@@ -111,7 +111,7 @@ public class URLValueSemanticsProvider extends ValueSemanticsProviderAndFacetAbs
@Override
public java.net.URL urlValue(final ObjectAdapter object) {
- return object == null ? null : (java.net.URL) object.getObject();
+ return object == null ? null : (java.net.URL) object.getPojo();
}
@Override
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/uuid/UUIDValueSemanticsProvider.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/uuid/UUIDValueSemanticsProvider.java
index 07f7b9a..79321a3 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/uuid/UUIDValueSemanticsProvider.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/uuid/UUIDValueSemanticsProvider.java
@@ -95,7 +95,7 @@ public class UUIDValueSemanticsProvider extends ValueSemanticsProviderAndFacetAb
@Override
public UUID uuidValue(final ObjectAdapter object) {
- return object == null ? null : (UUID) object.getObject();
+ return object == null ? null : (UUID) object.getPojo();
}
@Override
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionUsabilityContext.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionUsabilityContext.java
index 3991509..9127a88 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionUsabilityContext.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionUsabilityContext.java
@@ -42,7 +42,7 @@ public class CollectionUsabilityContext extends UsabilityContext<CollectionUsabi
@Override
public CollectionUsabilityEvent createInteractionEvent() {
- return new CollectionUsabilityEvent(getTarget().getObject(), getIdentifier());
+ return new CollectionUsabilityEvent(getTarget().getPojo(), getIdentifier());
}
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/factory/FactoryServiceInternalDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/factory/FactoryServiceInternalDefault.java
index 609e2b5..4caf25a 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/factory/FactoryServiceInternalDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/factory/FactoryServiceInternalDefault.java
@@ -48,7 +48,7 @@ public class FactoryServiceInternalDefault implements FactoryService {
public <T> T instantiate(final Class<T> domainClass) {
final ObjectSpecification spec = specificationLoader.loadSpecification(domainClass);
final ObjectAdapter adapter = doCreateTransientInstance(spec);
- return (T) adapter.getObject();
+ return (T) adapter.getPojo();
}
/**
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 b194dda..101c21c 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
@@ -123,12 +123,6 @@ public interface ManagedObject {
return getSpecification().getElementSpecification();
}
- // -- GLUE CODE
-
- default Object getObject() {
- return getPojo();
- }
-
// -- FACTORIES
public static ManagedObject of(
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectMemberAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectMemberAbstract.java
index 3d93238..fe9c992 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectMemberAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectMemberAbstract.java
@@ -332,7 +332,7 @@ public abstract class ObjectMemberAbstract implements ObjectMember {
final ManagedObject mixedInAdapter) {
final ObjectSpecification objectSpecification = getSpecificationLoader().loadSpecification(mixinType);
final MixinFacet mixinFacet = objectSpecification.getFacet(MixinFacet.class);
- final Object mixinPojo = mixinFacet.instantiate(mixedInAdapter.getObject());
+ final Object mixinPojo = mixinFacet.instantiate(mixedInAdapter.getPojo());
return getObjectAdapterProvider().adapterFor(mixinPojo);
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/dflt/ObjectSpecificationDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/dflt/ObjectSpecificationDefault.java
index c328763..1583fa6 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/dflt/ObjectSpecificationDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/dflt/ObjectSpecificationDefault.java
@@ -259,7 +259,7 @@ public class ObjectSpecificationDefault extends ObjectSpecificationAbstract impl
if(facet == null) {
return false;
}
- final Object pojo = targetAdapter.getObject();
+ final Object pojo = targetAdapter.getPojo();
return facet.isCloneable(pojo);
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/standalonelist/CollectionFacetOnStandaloneList.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/standalonelist/CollectionFacetOnStandaloneList.java
index 4828b16..b5ffdd5 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/standalonelist/CollectionFacetOnStandaloneList.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/standalonelist/CollectionFacetOnStandaloneList.java
@@ -66,7 +66,7 @@ public class CollectionFacetOnStandaloneList extends CollectionFacetAbstract {
// -- HELPER
private List<ManagedObject> collection(final ManagedObject wrappedObjectList) {
- return (FreeStandingList) wrappedObjectList.getObject();
+ return (FreeStandingList) wrappedObjectList.getPojo();
}
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/standalonelist/ObjectSpecificationOnStandaloneList.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/standalonelist/ObjectSpecificationOnStandaloneList.java
index eb4ef8b..bd2ed25 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/standalonelist/ObjectSpecificationOnStandaloneList.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/standalonelist/ObjectSpecificationOnStandaloneList.java
@@ -123,7 +123,7 @@ public class ObjectSpecificationOnStandaloneList extends ObjectSpecificationAbst
@Override
public String getTitle(ManagedObject contextAdapterIfAny, ManagedObject targetAdapter) {
- return ((FreeStandingList) targetAdapter.getObject()).titleString();
+ return ((FreeStandingList) targetAdapter.getPojo()).titleString();
}
@Override
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/runtime/snapshot/XmlSnapshot.java b/core/metamodel/src/main/java/org/apache/isis/core/runtime/snapshot/XmlSnapshot.java
index 7a877f0..f9117e4 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/runtime/snapshot/XmlSnapshot.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/runtime/snapshot/XmlSnapshot.java
@@ -159,7 +159,7 @@ public class XmlSnapshot implements Snapshot {
throw new IsisException(e);
}
- for (final String path : getPathsFor(rootAdapter.getObject())) {
+ for (final String path : getPathsFor(rootAdapter.getPojo())) {
include(path);
}
@@ -829,7 +829,7 @@ public class XmlSnapshot implements Snapshot {
private final Map<ObjectAdapter, String> viewModelFakeOids = _Maps.newHashMap();
private String oidAsString(final ObjectAdapter adapter) {
- if(adapter.getObject() instanceof ViewModel) {
+ if(adapter.getPojo() instanceof ViewModel) {
// return a fake oid for view models;
// a snapshot may be being used to create the memento/OID
String fakeOid = viewModelFakeOids.get(adapter);
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/ObjectAdapterUtilsTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/ObjectAdapterUtilsTest.java
index 6d28620..4f49ed3 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/ObjectAdapterUtilsTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/ObjectAdapterUtilsTest.java
@@ -75,7 +75,7 @@ public class ObjectAdapterUtilsTest {
private void expectAdapterWillReturn(final Object domainObject) {
context.checking(new Expectations() {
{
- allowing(mockObjectAdapter).getObject();
+ allowing(mockObjectAdapter).getPojo();
will(returnValue(domainObject));
}
});
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/collections/JavaCollectionFacetTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/collections/JavaCollectionFacetTest.java
index 9300746..99629ff 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/collections/JavaCollectionFacetTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/collections/JavaCollectionFacetTest.java
@@ -72,7 +72,7 @@ public class JavaCollectionFacetTest {
public void firstElementForEmptyCollectionIsNull() {
context.checking(new Expectations() {
{
- oneOf(mockCollection).getObject();
+ oneOf(mockCollection).getPojo();
will(returnValue(mockWrappedCollection));
oneOf(mockWrappedCollection).stream();
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/cssclass/CssClassFacetMethodTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/cssclass/CssClassFacetMethodTest.java
index 65de148..7714eda 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/cssclass/CssClassFacetMethodTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/cssclass/CssClassFacetMethodTest.java
@@ -64,7 +64,7 @@ public class CssClassFacetMethodTest {
mockery.checking(new Expectations() {
{
- allowing(mockOwningAdapter).getObject();
+ allowing(mockOwningAdapter).getPojo();
will(returnValue(pojo));
}
});
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/cssclass/CssClassFacetMethodWithProblemTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/cssclass/CssClassFacetMethodWithProblemTest.java
index 47d2d8d..4e08267 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/cssclass/CssClassFacetMethodWithProblemTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/cssclass/CssClassFacetMethodWithProblemTest.java
@@ -62,7 +62,7 @@ public class CssClassFacetMethodWithProblemTest {
mockery.checking(new Expectations() {
{
- allowing(mockOwningAdapter).getObject();
+ allowing(mockOwningAdapter).getPojo();
will(returnValue(pojo));
}
});
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/icon/IconFacetMethodTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/icon/IconFacetMethodTest.java
index 69e6249..b5e99ee 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/icon/IconFacetMethodTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/icon/IconFacetMethodTest.java
@@ -62,7 +62,7 @@ public class IconFacetMethodTest {
mockery.checking(new Expectations() {
{
- allowing(mockOwningAdapter).getObject();
+ allowing(mockOwningAdapter).getPojo();
will(returnValue(pojo));
}
});
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/title/TitleFacetViaMethodTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/title/TitleFacetViaMethodTest.java
index 5cee089..d588d77 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/title/TitleFacetViaMethodTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/title/TitleFacetViaMethodTest.java
@@ -64,7 +64,7 @@ public class TitleFacetViaMethodTest {
mockery.checking(new Expectations() {
{
- allowing(mockOwningAdapter).getObject();
+ allowing(mockOwningAdapter).getPojo();
will(returnValue(pojo));
}
});
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/title/annotation/TitleAnnotationFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/title/annotation/TitleAnnotationFacetFactoryTest.java
index 0889ac0..afecb54 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/title/annotation/TitleAnnotationFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/title/annotation/TitleAnnotationFacetFactoryTest.java
@@ -170,7 +170,7 @@ public class TitleAnnotationFacetFactoryTest extends AbstractFacetFactoryJUnit4T
context.checking(new Expectations() {
{
- allowing(mockObjectAdapter).getObject();
+ allowing(mockObjectAdapter).getPojo();
will(returnValue(customer));
}
});
@@ -246,7 +246,7 @@ public class TitleAnnotationFacetFactoryTest extends AbstractFacetFactoryJUnit4T
context.checking(new Expectations() {
{
- allowing(mockObjectAdapter).getObject();
+ allowing(mockObjectAdapter).getPojo();
will(returnValue(customer));
}
});
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/title/annotation/TitleFacetViaTitleAnnotationTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/title/annotation/TitleFacetViaTitleAnnotationTest.java
index 4e7f31e..7c6cbc5 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/title/annotation/TitleFacetViaTitleAnnotationTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/title/annotation/TitleFacetViaTitleAnnotationTest.java
@@ -97,7 +97,7 @@ public class TitleFacetViaTitleAnnotationTest {
final Sequence sequence = context.sequence("in-title-element-order");
context.checking(new Expectations() {
{
- allowing(mockObjectAdapter).getObject();
+ allowing(mockObjectAdapter).getPojo();
will(returnValue(normalPojo));
allowing(mockAdapterManager).adapterFor("Normal");
@@ -126,7 +126,7 @@ public class TitleFacetViaTitleAnnotationTest {
final DomainObjectWithProblemInItsAnnotatedTitleMethod screwedPojo = new DomainObjectWithProblemInItsAnnotatedTitleMethod();
context.checking(new Expectations() {
{
- allowing(mockObjectAdapter).getObject();
+ allowing(mockObjectAdapter).getPojo();
will(returnValue(screwedPojo));
}
});
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/navparent/NavigableParentFacetMethodTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/navparent/NavigableParentFacetMethodTest.java
index 70a1dce..5098e8e 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/navparent/NavigableParentFacetMethodTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/navparent/NavigableParentFacetMethodTest.java
@@ -63,7 +63,7 @@ public class NavigableParentFacetMethodTest {
mockery.checking(new Expectations() {
{
- allowing(mockOwningAdapter).getObject();
+ allowing(mockOwningAdapter).getPojo();
will(returnValue(pojo));
}
});
@@ -76,7 +76,7 @@ public class NavigableParentFacetMethodTest {
@Test
public void testNavigableParentThrowsException() {
- final Object parent = facet.navigableParent(mockOwningAdapter.getObject());
+ final Object parent = facet.navigableParent(mockOwningAdapter.getPojo());
assertThat(parent, is(nullValue()));
}
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/propparam/specification/MustSatisfySpecificationValidatingInteractionMoreTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/propparam/specification/MustSatisfySpecificationValidatingInteractionMoreTest.java
index 0f0f741..e72903b 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/propparam/specification/MustSatisfySpecificationValidatingInteractionMoreTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/propparam/specification/MustSatisfySpecificationValidatingInteractionMoreTest.java
@@ -113,7 +113,7 @@ public class MustSatisfySpecificationValidatingInteractionMoreTest {
oneOf(mockContext).getProposed();
will(returnValue(mockProposedObjectAdapter));
- oneOf(mockProposedObjectAdapter).getObject();
+ oneOf(mockProposedObjectAdapter).getPojo();
will(returnValue("This starts with an upper case letter and so is okay"));
}
});
@@ -129,7 +129,7 @@ public class MustSatisfySpecificationValidatingInteractionMoreTest {
oneOf(mockContext).getProposed();
will(returnValue(mockProposedObjectAdapter));
- oneOf(mockProposedObjectAdapter).getObject();
+ oneOf(mockProposedObjectAdapter).getPojo();
will(returnValue("this starts with an lower case letter and so is not okay"));
}
});
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/propparam/specification/MustSatisfySpecificationValidatingInteractionTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/propparam/specification/MustSatisfySpecificationValidatingInteractionTest.java
index 93216ad..bb658d2 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/propparam/specification/MustSatisfySpecificationValidatingInteractionTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/propparam/specification/MustSatisfySpecificationValidatingInteractionTest.java
@@ -101,7 +101,7 @@ public class MustSatisfySpecificationValidatingInteractionTest {
oneOf(mockContext).getProposed();
will(returnValue(mockProposedObjectAdapter));
- oneOf(mockProposedObjectAdapter).getObject();
+ oneOf(mockProposedObjectAdapter).getPojo();
will(returnValue(mockProposedObject));
}
});
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ValueSemanticsProviderAbstractTestCase.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ValueSemanticsProviderAbstractTestCase.java
index df614fd..c2f682b 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ValueSemanticsProviderAbstractTestCase.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ValueSemanticsProviderAbstractTestCase.java
@@ -119,7 +119,7 @@ public abstract class ValueSemanticsProviderAbstractTestCase {
protected void allowMockAdapterToReturn(final Object pojo) {
context.checking(new Expectations() {
{
- allowing(mockAdapter).getObject();
+ allowing(mockAdapter).getPojo();
will(returnValue(pojo));
}
});
diff --git a/core/plugins/jdo-datanucleus-4/src/test/java/org/apache/isis/core/runtime/persistence/adapterfactory/pojo/PojoAdapterTest.java b/core/plugins/jdo-datanucleus-4/src/test/java/org/apache/isis/core/runtime/persistence/adapterfactory/pojo/PojoAdapterTest.java
index c7b381a..ff4c0af 100644
--- a/core/plugins/jdo-datanucleus-4/src/test/java/org/apache/isis/core/runtime/persistence/adapterfactory/pojo/PojoAdapterTest.java
+++ b/core/plugins/jdo-datanucleus-4/src/test/java/org/apache/isis/core/runtime/persistence/adapterfactory/pojo/PojoAdapterTest.java
@@ -98,7 +98,7 @@ public class PojoAdapterTest {
@Test
public void getObject_initially() {
- assertEquals(domainObject, adapter.getObject());
+ assertEquals(domainObject, adapter.getPojo());
}
@Test
diff --git a/core/plugins/jdo-datanucleus-4/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest_wrappedObject.java b/core/plugins/jdo-datanucleus-4/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest_wrappedObject.java
index 7b20492..ed51dc2 100644
--- a/core/plugins/jdo-datanucleus-4/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest_wrappedObject.java
+++ b/core/plugins/jdo-datanucleus-4/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest_wrappedObject.java
@@ -272,7 +272,7 @@ public class WrapperFactoryDefaultTest_wrappedObject {
allowing(mockEmployeeSpec).getMember(employeeClearNameMethod);
will(returnValue(employeeNameMember));
- allowing(mockEmployeeAdapter).getObject();
+ allowing(mockEmployeeAdapter).getPojo();
will(returnValue(employeeDO));
allowing(mockEmployeeAdapter).representsPersistent();
@@ -461,7 +461,7 @@ public class WrapperFactoryDefaultTest_wrappedObject {
allowing(mockAdapterManager).adapterFor("Smith");
will(returnValue(mockAdapterForStringSmith));
- allowing(mockAdapterForStringSmith).getObject();
+ allowing(mockAdapterForStringSmith).getPojo();
will(returnValue("Smith"));
}
});
@@ -473,7 +473,7 @@ public class WrapperFactoryDefaultTest_wrappedObject {
allowing(mockAdapterManager).adapterFor("Jones");
will(returnValue(mockAdapterForStringJones));
- allowing(mockAdapterForStringJones).getObject();
+ allowing(mockAdapterForStringJones).getPojo();
will(returnValue("Jones"));
allowing(mockAdapterForStringJones).isTransient();
diff --git a/core/plugins/jdo-datanucleus-4/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest_wrappedObject_transient.java b/core/plugins/jdo-datanucleus-4/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest_wrappedObject_transient.java
index 88eb751..bc02bc9 100644
--- a/core/plugins/jdo-datanucleus-4/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest_wrappedObject_transient.java
+++ b/core/plugins/jdo-datanucleus-4/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest_wrappedObject_transient.java
@@ -169,10 +169,10 @@ public class WrapperFactoryDefaultTest_wrappedObject_transient {
allowing(mockEmployeeAdapter).getSpecification();
will(returnValue(mockEmployeeSpec));
- allowing(mockEmployeeAdapter).getObject();
+ allowing(mockEmployeeAdapter).getPojo();
will(returnValue(employeeDO));
- allowing(mockPasswordAdapter).getObject();
+ allowing(mockPasswordAdapter).getPojo();
will(returnValue(passwordValue));
allowing(mockPasswordMember).getIdentifier();
diff --git a/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/core/runtime/persistence/adapterfactory/pojo/PojoAdapterTest.java b/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/core/runtime/persistence/adapterfactory/pojo/PojoAdapterTest.java
index a76a6cf..a91a83f 100644
--- a/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/core/runtime/persistence/adapterfactory/pojo/PojoAdapterTest.java
+++ b/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/core/runtime/persistence/adapterfactory/pojo/PojoAdapterTest.java
@@ -103,7 +103,7 @@ public class PojoAdapterTest {
@Test
public void getObject_initially() {
- assertEquals(domainObject, adapter.getObject());
+ assertEquals(domainObject, adapter.getPojo());
}
@Test
diff --git a/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest_wrappedObject.java b/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest_wrappedObject.java
index e453008..772f3c6 100644
--- a/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest_wrappedObject.java
+++ b/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest_wrappedObject.java
@@ -272,7 +272,7 @@ public class WrapperFactoryDefaultTest_wrappedObject {
allowing(mockEmployeeSpec).getMember(employeeClearNameMethod);
will(returnValue(employeeNameMember));
- allowing(mockEmployeeAdapter).getObject();
+ allowing(mockEmployeeAdapter).getPojo();
will(returnValue(employeeDO));
allowing(mockEmployeeAdapter).representsPersistent();
@@ -461,7 +461,7 @@ public class WrapperFactoryDefaultTest_wrappedObject {
allowing(mockAdapterManager).adapterFor("Smith");
will(returnValue(mockAdapterForStringSmith));
- allowing(mockAdapterForStringSmith).getObject();
+ allowing(mockAdapterForStringSmith).getPojo();
will(returnValue("Smith"));
}
});
@@ -473,7 +473,7 @@ public class WrapperFactoryDefaultTest_wrappedObject {
allowing(mockAdapterManager).adapterFor("Jones");
will(returnValue(mockAdapterForStringJones));
- allowing(mockAdapterForStringJones).getObject();
+ allowing(mockAdapterForStringJones).getPojo();
will(returnValue("Jones"));
allowing(mockAdapterForStringJones).isTransient();
diff --git a/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest_wrappedObject_transient.java b/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest_wrappedObject_transient.java
index b370b5f..7b6e369 100644
--- a/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest_wrappedObject_transient.java
+++ b/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest_wrappedObject_transient.java
@@ -170,10 +170,10 @@ public class WrapperFactoryDefaultTest_wrappedObject_transient {
allowing(mockEmployeeAdapter).getSpecification();
will(returnValue(mockEmployeeSpec));
- allowing(mockEmployeeAdapter).getObject();
+ allowing(mockEmployeeAdapter).getPojo();
will(returnValue(employeeDO));
- allowing(mockPasswordAdapter).getObject();
+ allowing(mockPasswordAdapter).getPojo();
will(returnValue(passwordValue));
allowing(mockPasswordMember).getIdentifier();
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/StandaloneData.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/StandaloneData.java
index d560cbc..f488c29 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/StandaloneData.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/StandaloneData.java
@@ -67,7 +67,7 @@ public class StandaloneData extends Data {
public StandaloneData(final ObjectAdapter adapter) {
super(null, adapter.getSpecification().getFullIdentifier());
- final Object object = adapter.getObject();
+ final Object object = adapter.getPojo();
if (object instanceof Serializable) {
this.objectAsSerializable = (Serializable) object;
initialized();
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adapter/PojoAdapter.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adapter/PojoAdapter.java
index f1400a2..9b87fdc 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adapter/PojoAdapter.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adapter/PojoAdapter.java
@@ -101,24 +101,17 @@ public final class PojoAdapter implements ObjectAdapter {
}
private ObjectSpecification loadSpecification() {
- final Class<?> aClass = getObject().getClass();
+ final Class<?> aClass = getPojo().getClass();
final ObjectSpecification specification = specificationLoader.loadSpecification(aClass);
return specification;
}
- // -- getObject, replacePojo
- @Override
- public Object getObject() {
- return pojo;
- }
-
// -- getOid
@Override
public Oid getOid() {
return oid;
}
-
// -- isTransient, representsPersistent, isDestroyed
@Override
@@ -240,7 +233,7 @@ public final class PojoAdapter implements ObjectAdapter {
}
str.setAddComma();
if (!objectSpecification.isMemoized()) {
- str.append("class", getObject().getClass().getName());
+ str.append("class", getPojo().getClass().getName());
} else {
str.append("specification", getSpecification().getShortIdentifier());
}
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/changes/AdapterAndProperty.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/changes/AdapterAndProperty.java
index 9c4f5f7..44d4608 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/changes/AdapterAndProperty.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/changes/AdapterAndProperty.java
@@ -101,7 +101,7 @@ public class AdapterAndProperty {
Object getPropertyValue() {
ObjectAdapter referencedAdapter = property.get(objectAdapter, InteractionInitiatedBy.FRAMEWORK);
- return referencedAdapter == null ? null : referencedAdapter.getObject();
+ return referencedAdapter == null ? null : referencedAdapter.getPojo();
}
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/command/CommandDtoServiceInternalDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/command/CommandDtoServiceInternalDefault.java
index b9beb9b..c087eaa 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/command/CommandDtoServiceInternalDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/command/CommandDtoServiceInternalDefault.java
@@ -142,7 +142,7 @@ public class CommandDtoServiceInternalDefault implements CommandDtoServiceIntern
final String parameterName = actionParameter.getName();
final Class<?> paramType = actionParameter.getSpecification().getCorrespondingClass();
final ObjectAdapter argAdapter = argAdapters[paramNum];
- final Object arg = argAdapter != null? argAdapter.getObject(): null;
+ final Object arg = argAdapter != null? argAdapter.getPojo(): null;
final ParamsDto parameters = CommandDtoUtils.parametersFor(actionDto);
final List<ParamDto> parameterList = parameters.getParameter();
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/homepage/HomePageProviderServiceDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/homepage/HomePageProviderServiceDefault.java
index 047dede..082d03b 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/homepage/HomePageProviderServiceDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/homepage/HomePageProviderServiceDefault.java
@@ -103,7 +103,7 @@ public class HomePageProviderServiceDefault implements HomePageProviderService {
InteractionInitiatedBy.USER,
WHERE_FOR_ACTION_INVOCATION);
- return objectAdapter != null ? objectAdapter.getObject(): null;
+ return objectAdapter != null ? objectAdapter.getPojo(): null;
}
// REVIEW: should provide this rendering context, rather than hardcoding.
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/ixn/InteractionDtoServiceInternalDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/ixn/InteractionDtoServiceInternalDefault.java
index b7d3217..85a6bee 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/ixn/InteractionDtoServiceInternalDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/ixn/InteractionDtoServiceInternalDefault.java
@@ -60,7 +60,7 @@ public class InteractionDtoServiceInternalDefault implements InteractionDtoServi
final Interaction interaction = interactionContext.getInteraction();
final int nextEventSequence = interaction.next(Interaction.Sequence.INTERACTION.id());
- final Object targetPojo = targetAdapter.getObject();
+ final Object targetPojo = targetAdapter.getPojo();
final Bookmark targetBookmark = bookmarkService.bookmarkFor(targetPojo);
final String actionIdentifier = objectAction.getIdentifier().toClassAndNameIdentityString();
@@ -106,7 +106,7 @@ public class InteractionDtoServiceInternalDefault implements InteractionDtoServi
final int nextEventSequence = interaction.next(Interaction.Sequence.INTERACTION.id());
- final Object targetPojo = targetAdapter.getObject();
+ final Object targetPojo = targetAdapter.getPojo();
final Bookmark targetBookmark = bookmarkService.bookmarkFor(targetPojo);
final String propertyIdentifier = property.getIdentifier().toClassAndNameIdentityString();
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/persistsession/PersistenceSessionServiceInternalDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/persistsession/PersistenceSessionServiceInternalDefault.java
index 2004846..4c6f2a1 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/persistsession/PersistenceSessionServiceInternalDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/persistsession/PersistenceSessionServiceInternalDefault.java
@@ -94,7 +94,7 @@ public class PersistenceSessionServiceInternalDefault implements PersistenceSess
if(rootOid.isViewModel()) {
final ObjectAdapter adapter = ps.adapterFor(rootOid, ConcurrencyChecking.NO_CHECK);
- final Object pojo = mapIfPresentElse(adapter, ObjectAdapter::getObject, null);
+ final Object pojo = mapIfPresentElse(adapter, ObjectAdapter::getPojo, null);
return pojo;
@@ -106,7 +106,7 @@ public class PersistenceSessionServiceInternalDefault implements PersistenceSess
} else {
final ObjectAdapter adapter = ps.adapterFor(rootOid, ConcurrencyChecking.NO_CHECK);
- final Object pojo = mapIfPresentElse(adapter, ObjectAdapter::getObject, null);
+ final Object pojo = mapIfPresentElse(adapter, ObjectAdapter::getPojo, null);
acceptIfPresent(pojo, ps::refreshRootInTransaction);
return pojo;
}
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/adaptermanager/ObjectAdapterContext.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/adaptermanager/ObjectAdapterContext.java
index 9563ffc..5c01669 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/adaptermanager/ObjectAdapterContext.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/adaptermanager/ObjectAdapterContext.java
@@ -207,7 +207,7 @@ final public class ObjectAdapterContext {
if(adapter.isValue()) {
return adapter; // guard against value objects
}
- final Object pojo = adapter.getObject();
+ final Object pojo = adapter.getPojo();
servicesInjector.injectServicesInto(pojo);
return adapter;
}
@@ -273,7 +273,7 @@ final public class ObjectAdapterContext {
*/
public void asPersistent(final ObjectAdapter rootAdapter, PersistenceSession session) {
- final RootOid persistentOid = createPersistentOrViewModelOid(rootAdapter.getObject());
+ final RootOid persistentOid = createPersistentOrViewModelOid(rootAdapter.getPojo());
Objects.requireNonNull(persistentOid);
Assert.assertFalse("expected to not be a parented collection", rootAdapter.isParentedCollection());
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/adaptermanager/ObjectAdapterContext_LifecycleEventSupport.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/adaptermanager/ObjectAdapterContext_LifecycleEventSupport.java
index 78bd833..43a35b9 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/adaptermanager/ObjectAdapterContext_LifecycleEventSupport.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/adaptermanager/ObjectAdapterContext_LifecycleEventSupport.java
@@ -66,7 +66,7 @@ class ObjectAdapterContext_LifecycleEventSupport {
if(facet != null) {
final Class<? extends AbstractLifecycleEvent<?>> eventType = facet.getEventType();
final Object instance = InstanceUtil.createInstance(eventType);
- final Object pojo = adapter.getObject();
+ final Object pojo = adapter.getPojo();
postEvent((AbstractLifecycleEvent) instance, pojo);
}
}
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/adaptermanager/ObjectAdapterContext_ObjectCreation.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/adaptermanager/ObjectAdapterContext_ObjectCreation.java
index e6b63a9..047c2c3 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/adaptermanager/ObjectAdapterContext_ObjectCreation.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/adaptermanager/ObjectAdapterContext_ObjectCreation.java
@@ -119,7 +119,7 @@ class ObjectAdapterContext_ObjectCreation {
fields
.forEach(field->field.toDefault(adapter));
- final Object pojo = adapter.getObject();
+ final Object pojo = adapter.getPojo();
servicesInjector.injectServicesInto(pojo);
CallbackFacet.Util.callCallback(adapter, CreatedCallbackFacet.class);
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/adaptermanager/ObjectAdapterContext_ServiceLookup.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/adaptermanager/ObjectAdapterContext_ServiceLookup.java
index 22d612a..b08657d 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/adaptermanager/ObjectAdapterContext_ServiceLookup.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/adaptermanager/ObjectAdapterContext_ServiceLookup.java
@@ -96,7 +96,7 @@ class ObjectAdapterContext_ServiceLookup {
.map(objectAdapterContext.getObjectAdapterProvider()::adapterFor)
.forEach(serviceAdapter->{
Assert.assertFalse("expected to not be 'transient'", serviceAdapter.getOid().isTransient());
- lookupResource.servicesById.put((RootOid)serviceAdapter.getOid() , serviceAdapter.getObject());
+ lookupResource.servicesById.put((RootOid)serviceAdapter.getOid() , serviceAdapter.getPojo());
});
objectAdapterContext.printContextInfo("took (µs) "+watch.stop().getMicros());
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/adaptermanager/ObjectAdapterLegacy.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/adaptermanager/ObjectAdapterLegacy.java
index 37b0b0c..b7f40ca 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/adaptermanager/ObjectAdapterLegacy.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/adaptermanager/ObjectAdapterLegacy.java
@@ -58,7 +58,7 @@ public class ObjectAdapterLegacy {
// converting from adapter and back means we handle both
// collections of references and of values
final ObjectAdapter objectAdapter = adapterFor(valueOrOidDto);
- Object pojo = objectAdapter != null ? objectAdapter.getObject() : null;
+ Object pojo = objectAdapter != null ? objectAdapter.getPojo() : null;
pojoList.add(pojo);
}
return adapterFor(pojoList);
diff --git a/core/runtime/src/main/java/org/apache/isis/core/wrapper/handlers/DelegatingInvocationHandlerDefault.java b/core/runtime/src/main/java/org/apache/isis/core/wrapper/handlers/DelegatingInvocationHandlerDefault.java
index 9d23a36..f9f33c5 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/wrapper/handlers/DelegatingInvocationHandlerDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/wrapper/handlers/DelegatingInvocationHandlerDefault.java
@@ -77,7 +77,7 @@ public class DelegatingInvocationHandlerDefault<T> implements DelegatingInvocati
}
protected void resolveIfRequired(final ObjectAdapter targetAdapter) {
- resolveIfRequired(targetAdapter.getObject());
+ resolveIfRequired(targetAdapter.getPojo());
}
protected void resolveIfRequired(final Object domainObject) {
diff --git a/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/commands/DataNucleusCreateObjectCommand.java b/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/commands/DataNucleusCreateObjectCommand.java
index de622c4..0d8ac52 100644
--- a/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/commands/DataNucleusCreateObjectCommand.java
+++ b/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/commands/DataNucleusCreateObjectCommand.java
@@ -49,7 +49,7 @@ public class DataNucleusCreateObjectCommand extends AbstractDataNucleusObjectCom
// lifecycle callback, so in essence there's nothing to be done.
return;
}
- final Object domainObject = adapter.getObject();
+ final Object domainObject = adapter.getPojo();
getPersistenceManager().makePersistent(domainObject);
}
diff --git a/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/commands/DataNucleusDeleteObjectCommand.java b/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/commands/DataNucleusDeleteObjectCommand.java
index 0b1453c..34bda37 100644
--- a/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/commands/DataNucleusDeleteObjectCommand.java
+++ b/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/commands/DataNucleusDeleteObjectCommand.java
@@ -40,7 +40,7 @@ public class DataNucleusDeleteObjectCommand extends AbstractDataNucleusObjectCom
if (LOG.isDebugEnabled()) {
LOG.debug("destroy object - executing command for {}", onAdapter());
}
- getPersistenceManager().deletePersistent(onAdapter().getObject());
+ getPersistenceManager().deletePersistent(onAdapter().getPojo());
}
@Override
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/DomainObjectReprRenderer.java b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/DomainObjectReprRenderer.java
index f3fb68e..60b02d1 100644
--- a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/DomainObjectReprRenderer.java
+++ b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/DomainObjectReprRenderer.java
@@ -163,7 +163,7 @@ public class DomainObjectReprRenderer extends ReprRendererAbstract<DomainObjectR
// serviceId or instance Id
if (isService) {
- representation.mapPut("serviceId", ServiceUtil.id(objectAdapter.getObject()));
+ representation.mapPut("serviceId", ServiceUtil.id(objectAdapter.getPojo()));
} else {
final String domainType = getDomainType();
final String instanceId = getInstanceId();
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/DomainServiceLinkTo.java b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/DomainServiceLinkTo.java
index 03e8cb7..58412c8 100644
--- a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/DomainServiceLinkTo.java
+++ b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/DomainServiceLinkTo.java
@@ -27,7 +27,7 @@ public class DomainServiceLinkTo extends DomainObjectLinkTo {
@Override
public ObjectAdapterLinkTo with(final ObjectAdapter objectAdapter) {
- serviceId = ServiceUtil.id(objectAdapter.getObject());
+ serviceId = ServiceUtil.id(objectAdapter.getPojo());
return super.with(objectAdapter);
}
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoder.java b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoder.java
index 42db859..cc2830b 100644
--- a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoder.java
+++ b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoder.java
@@ -90,7 +90,7 @@ public final class JsonValueEncoder {
}
public Object asObject(ObjectAdapter objectAdapter, String format) {
- return objectAdapter.getObject();
+ return objectAdapter.getPojo();
}
}
@@ -824,7 +824,7 @@ public final class JsonValueEncoder {
}
private static Object unwrapAsObjectElseNullNode(ObjectAdapter objectAdapter) {
- return objectAdapter != null? objectAdapter.getObject(): NullNode.getInstance();
+ return objectAdapter != null? objectAdapter.getPojo(): NullNode.getInstance();
}
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceAbstract.java b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceAbstract.java
index 70edfec..3bdf38b 100644
--- a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceAbstract.java
+++ b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceAbstract.java
@@ -97,7 +97,7 @@ public abstract class ContentNegotiationServiceAbstract implements ContentNegoti
* Potential hook to allow a domain object to be mapped.
*/
protected Object objectOf(final ObjectAdapter objectAdapter) {
- return objectAdapter.getObject();
+ return objectAdapter.getPojo();
}
protected Object returnedObjectOf(final ObjectAndActionInvocation objectAndActionInvocation) {
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceForRestfulObjectsV1_0.java b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceForRestfulObjectsV1_0.java
index 40f240f..21ad5a6 100644
--- a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceForRestfulObjectsV1_0.java
+++ b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceForRestfulObjectsV1_0.java
@@ -286,7 +286,7 @@ public class ContentNegotiationServiceForRestfulObjectsV1_0 implements ContentNe
final DomainObjectList list = new DomainObjectList(title, elementSpec.getSpecId().asString(), actionOwningType, actionId, actionArguments);
for (final ObjectAdapter adapter : collectionAdapters) {
- list.getObjects().add(adapter.getObject());
+ list.getObjects().add(adapter.getPojo());
}
return list;
}
diff --git a/core/viewer-restfulobjects-rendering/src/test/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoderTest_appendValueAndFormat.java b/core/viewer-restfulobjects-rendering/src/test/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoderTest_appendValueAndFormat.java
index c9da18f..862cde7 100644
--- a/core/viewer-restfulobjects-rendering/src/test/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoderTest_appendValueAndFormat.java
+++ b/core/viewer-restfulobjects-rendering/src/test/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoderTest_appendValueAndFormat.java
@@ -409,7 +409,7 @@ public class JsonValueEncoderTest_appendValueAndFormat {
private void allowingObjectAdapterToReturn(final Object pojo) {
context.checking(new Expectations() {
{
- oneOf(mockObjectAdapter).getObject();
+ oneOf(mockObjectAdapter).getPojo();
will(returnValue(pojo));
}
});
diff --git a/core/viewer-restfulobjects-rendering/src/test/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoderTest_asObject.java b/core/viewer-restfulobjects-rendering/src/test/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoderTest_asObject.java
index 6b3aa98..7f47f6f 100644
--- a/core/viewer-restfulobjects-rendering/src/test/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoderTest_asObject.java
+++ b/core/viewer-restfulobjects-rendering/src/test/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoderTest_asObject.java
@@ -97,7 +97,7 @@ public class JsonValueEncoderTest_asObject {
never(mockEncodableFacet);
context.checking(new Expectations() {
{
- oneOf(mockObjectAdapter).getObject();
+ oneOf(mockObjectAdapter).getPojo();
will(returnValue(true));
}
});
@@ -120,7 +120,7 @@ public class JsonValueEncoderTest_asObject {
never(mockEncodableFacet);
context.checking(new Expectations() {
{
- oneOf(mockObjectAdapter).getObject();
+ oneOf(mockObjectAdapter).getPojo();
will(returnValue(123));
}
});
@@ -143,7 +143,7 @@ public class JsonValueEncoderTest_asObject {
never(mockEncodableFacet);
context.checking(new Expectations() {
{
- oneOf(mockObjectAdapter).getObject();
+ oneOf(mockObjectAdapter).getPojo();
will(returnValue(123456789L));
}
});
@@ -166,7 +166,7 @@ public class JsonValueEncoderTest_asObject {
never(mockEncodableFacet);
context.checking(new Expectations() {
{
- oneOf(mockObjectAdapter).getObject();
+ oneOf(mockObjectAdapter).getPojo();
will(returnValue(12345.6789));
}
});
@@ -182,7 +182,7 @@ public class JsonValueEncoderTest_asObject {
context.checking(new Expectations() {
{
- oneOf(mockObjectAdapter).getObject();
+ oneOf(mockObjectAdapter).getPojo();
will(returnValue(value));
}
});
@@ -198,7 +198,7 @@ public class JsonValueEncoderTest_asObject {
context.checking(new Expectations() {
{
- oneOf(mockObjectAdapter).getObject();
+ oneOf(mockObjectAdapter).getPojo();
will(returnValue(value));
}
});
@@ -211,7 +211,7 @@ public class JsonValueEncoderTest_asObject {
allowingObjectSpecHas(EncodableFacet.class, mockEncodableFacet);
context.checking(new Expectations() {
{
- oneOf(mockObjectAdapter).getObject();
+ oneOf(mockObjectAdapter).getPojo();
will(returnValue("encodedString"));
}
});
diff --git a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/ObjectActionArgHelper.java b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/ObjectActionArgHelper.java
index 3453ed4..c146ab8 100644
--- a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/ObjectActionArgHelper.java
+++ b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/ObjectActionArgHelper.java
@@ -64,7 +64,7 @@ public class ObjectActionArgHelper {
// validate individual arg
final ObjectActionParameter parameter = parameters.get(i);
- final Object argPojo = argAdapter!=null?argAdapter.getObject():null;
+ final Object argPojo = argAdapter!=null?argAdapter.getPojo():null;
final String reasonNotValid = parameter.isValid(objectAdapter, argPojo, InteractionInitiatedBy.USER
);
if (reasonNotValid != null) {
diff --git a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/ResourceAbstract.java b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/ResourceAbstract.java
index 086ce4a..d651be5 100644
--- a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/ResourceAbstract.java
+++ b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/ResourceAbstract.java
@@ -155,7 +155,7 @@ public abstract class ResourceAbstract {
protected ObjectAdapter getServiceAdapter(final String serviceId) {
final List<ObjectAdapter> serviceAdapters = getPersistenceSession().getServices();
for (final ObjectAdapter serviceAdapter : serviceAdapters) {
- final Object servicePojo = serviceAdapter.getObject();
+ final Object servicePojo = serviceAdapter.getPojo();
final String id = ServiceUtil.id(servicePojo);
if (serviceId.equals(id)) {
return serviceAdapter;
diff --git a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/util/OidUtils.java b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/util/OidUtils.java
index 4a8ae7a..9b6aba2 100644
--- a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/util/OidUtils.java
+++ b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/util/OidUtils.java
@@ -88,7 +88,7 @@ public final class OidUtils {
final ObjectAdapter adapter = persistenceSession
.adapterFor(fixedRootOid, ConcurrencyChecking.NO_CHECK);
- final Object pojo = mapIfPresentElse(adapter, ObjectAdapter::getObject, null);
+ final Object pojo = mapIfPresentElse(adapter, ObjectAdapter::getPojo, null);
return pojo;
} catch(final ObjectNotFoundException | PojoRecreationException ex) {
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/ObjectAdapterMemento.java b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/ObjectAdapterMemento.java
index e2fbb01..66c315b 100644
--- a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/ObjectAdapterMemento.java
+++ b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/ObjectAdapterMemento.java
@@ -55,7 +55,7 @@ public class ObjectAdapterMemento implements Serializable {
if (adapter == null) {
return null;
}
- final Object object = adapter.getObject();
+ final Object object = adapter.getPojo();
if(object == null) {
return null;
}
@@ -371,7 +371,7 @@ public class ObjectAdapterMemento implements Serializable {
private Bookmark bookmark;
/**
- * Only populated for {@link ObjectAdapter#getObject() domain object}s that implement {@link HintStore.HintIdProvider}.
+ * Only populated for {@link ObjectAdapter#getPojo() domain object}s that implement {@link HintStore.HintIdProvider}.
*/
private String hintId;
@@ -437,8 +437,8 @@ public class ObjectAdapterMemento implements Serializable {
persistentOidStr = oid.enString();
bookmark = oid.asBookmark();
- if(adapter.getObject() instanceof HintStore.HintIdProvider) {
- HintStore.HintIdProvider provider = (HintStore.HintIdProvider) adapter.getObject();
+ if(adapter.getPojo() instanceof HintStore.HintIdProvider) {
+ HintStore.HintIdProvider provider = (HintStore.HintIdProvider) adapter.getPojo();
this.hintId = provider.hintId();
}
type = Type.PERSISTENT;
@@ -612,7 +612,7 @@ public class ObjectAdapterMemento implements Serializable {
if(objectAdapter == null) {
return null;
}
- return objectAdapter.getObject();
+ return objectAdapter.getPojo();
};
}
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionModel.java b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionModel.java
index c202609..437773b 100644
--- a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionModel.java
+++ b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionModel.java
@@ -462,7 +462,7 @@ public class ActionModel extends BookmarkableModel<ObjectAdapter> implements For
WHERE_FOR_ACTION_INVOCATION);
final List<RoutingService> routingServices = getServicesInjector().lookupServices(RoutingService.class);
- final Object result = resultAdapter != null ? resultAdapter.getObject() : null;
+ final Object result = resultAdapter != null ? resultAdapter.getPojo() : null;
for (RoutingService routingService : routingServices) {
final boolean canRoute = routingService.canRoute(result);
if(canRoute) {
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityCollectionModel.java b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityCollectionModel.java
index 594e3ca..17c0fba 100644
--- a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityCollectionModel.java
+++ b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityCollectionModel.java
@@ -189,7 +189,7 @@ UiHintContainer {
if(collectionAsAdapter==null) {
return Collections.emptyList();
}
- final Iterable<Object> objects = (Iterable<Object>) collectionAsAdapter.getObject();
+ final Iterable<Object> objects = (Iterable<Object>) collectionAsAdapter.getPojo();
return stream(objects).collect(Collectors.toList());
}
@@ -479,7 +479,7 @@ UiHintContainer {
}
private static Iterable<Object> asIterable(final ObjectAdapter resultAdapter) {
- return _Casts.uncheckedCast(resultAdapter.getObject());
+ return _Casts.uncheckedCast(resultAdapter.getPojo());
}
private static Stream<Object> streamElementsOf(final ObjectAdapter resultAdapter) {
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModel.java b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModel.java
index 895ecec..c9be66a 100644
--- a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModel.java
+++ b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModel.java
@@ -382,7 +382,7 @@ public class ScalarModel extends EntityModel implements LinksProvider, FormExecu
scalarModel.getSpecificationLoader());
try {
final ObjectAdapter parentAdapter = scalarModel.getParentEntityModel().load();
- final String invalidReasonIfAny = parameter.isValid(parentAdapter, proposedAdapter.getObject(),
+ final String invalidReasonIfAny = parameter.isValid(parentAdapter, proposedAdapter.getPojo(),
InteractionInitiatedBy.USER
);
return invalidReasonIfAny;
@@ -810,7 +810,7 @@ public class ScalarModel extends EntityModel implements LinksProvider, FormExecu
return;
}
- final Object pojo = adapter.getObject();
+ final Object pojo = adapter.getPojo();
if(pojo == null) {
super.setObject(null);
return;
@@ -1073,7 +1073,7 @@ public class ScalarModel extends EntityModel implements LinksProvider, FormExecu
final ViewModelFacet recreatableObjectFacet = adapter.getSpecification().getFacet(ViewModelFacet.class);
if(recreatableObjectFacet != null) {
- final Object viewModel = adapter.getObject();
+ final Object viewModel = adapter.getPojo();
final boolean cloneable = recreatableObjectFacet.isCloneable(viewModel);
if(cloneable) {
final Object newViewModel = recreatableObjectFacet.clone(viewModel);
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/whereami/WhereAmIModelDefault.java b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/whereami/WhereAmIModelDefault.java
index 32605f2..5f19987 100644
--- a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/whereami/WhereAmIModelDefault.java
+++ b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/whereami/WhereAmIModelDefault.java
@@ -48,7 +48,7 @@ class WhereAmIModelDefault implements WhereAmIModel {
overrideFromConfigIfNew(startOfChain.getPersistenceSession().getConfiguration());
final ObjectAdapter adapter = startOfChain.getObject();
- final Object startNode = adapter.getObject();
+ final Object startNode = adapter.getPojo();
ParentChain.of(IsisContext.getSessionFactory().getSpecificationLoader()::loadSpecification)
.streamParentChainOf(startNode, maxChainLength)
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 00ce1ec..b28b3e1 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
@@ -78,7 +78,7 @@ public enum ActionResultResponseType {
VALUE_CLOB {
@Override
public ActionResultResponse interpretResult(final ActionModel model, final AjaxRequestTarget target, final ObjectAdapter resultAdapter) {
- final Object value = resultAdapter.getObject();
+ final Object value = resultAdapter.getPojo();
IRequestHandler handler = ActionModel.downloadHandler(value);
return ActionResultResponse.withHandler(handler);
}
@@ -86,7 +86,7 @@ public enum ActionResultResponseType {
VALUE_BLOB {
@Override
public ActionResultResponse interpretResult(final ActionModel model, final AjaxRequestTarget target, final ObjectAdapter resultAdapter) {
- final Object value = resultAdapter.getObject();
+ final Object value = resultAdapter.getPojo();
IRequestHandler handler = ActionModel.downloadHandler(value);
return ActionResultResponse.withHandler(handler);
}
@@ -94,7 +94,7 @@ public enum ActionResultResponseType {
VALUE_URL_AJAX {
@Override
public ActionResultResponse interpretResult(final ActionModel model, final AjaxRequestTarget target, final ObjectAdapter resultAdapter) {
- final URL url = (URL)resultAdapter.getObject();
+ final URL url = (URL)resultAdapter.getPojo();
return ActionResultResponse.openUrlInBrowser(target, url);
}
@@ -103,7 +103,7 @@ public enum ActionResultResponseType {
@Override
public ActionResultResponse interpretResult(final ActionModel model, final AjaxRequestTarget target, final ObjectAdapter resultAdapter) {
// open URL server-side redirect
- final Object value = resultAdapter.getObject();
+ final Object value = resultAdapter.getPojo();
IRequestHandler handler = ActionModel.redirectHandler(value);
return ActionResultResponse.withHandler(handler);
}
@@ -187,7 +187,7 @@ public enum ActionResultResponseType {
if (resultSpec.isNotCollection()) {
if (resultSpec.getFacet(ValueFacet.class) != null) {
- final Object value = resultAdapter.getObject();
+ final Object value = resultAdapter.getPojo();
if(value instanceof Clob) {
return ActionResultResponseType.VALUE_CLOB;
}
@@ -215,7 +215,7 @@ public enum ActionResultResponseType {
@SuppressWarnings("unchecked")
private static List<Object> asList(final ObjectAdapter resultAdapter) {
- final Collection<Object> coll = (Collection<Object>) resultAdapter.getObject();
+ final Collection<Object> coll = (Collection<Object>) resultAdapter.getPojo();
return coll instanceof List
? (List<Object>)coll
: _Lists.<Object>newArrayList(coll);
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java
index e505dcc..5eb2d94 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java
@@ -238,7 +238,7 @@ extends PanelAbstract<EntityCollectionModel> implements CollectionCountProvider
if(parentObjectAdapterMemento != null) {
final ObjectAdapter parentObjectAdapter = parentObjectAdapterMemento
.getObjectAdapter(ConcurrencyChecking.NO_CHECK, getPersistenceSession(), getSpecificationLoader());
- final Object parent = parentObjectAdapter.getObject();
+ final Object parent = parentObjectAdapter.getPojo();
final String collectionId = getModel().getCollectionMemento().getId();
return tableColumnOrderService.orderParented(parent, collectionId, collectionType, propertyIds);
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsSortableDataProvider.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsSortableDataProvider.java
index 221543d..d0c9b0e 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsSortableDataProvider.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsSortableDataProvider.java
@@ -175,8 +175,8 @@ public class CollectionContentsSortableDataProvider extends SortableDataProvider
private static Ordering<ObjectAdapter> ORDERING_BY_NATURAL = new Ordering<ObjectAdapter>(){
@Override
public int compare(final ObjectAdapter p, final ObjectAdapter q) {
- final Object pPojo = p.getObject();
- final Object qPojo = q.getObject();
+ final Object pPojo = p.getPojo();
+ final Object qPojo = q.getPojo();
if(!(pPojo instanceof Comparable) || !(qPojo instanceof Comparable)) {
return 0;
}
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldDatePickerAbstract.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldDatePickerAbstract.java
index 8006cc5..eab9bb2 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldDatePickerAbstract.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldDatePickerAbstract.java
@@ -105,7 +105,7 @@ public abstract class ScalarPanelTextFieldDatePickerAbstract<T extends Serializa
return new Model<String>() {
@Override public String getObject() {
ObjectAdapter object = scalarModel.getObject();
- final T value = object != null ? (T) object.getObject() : null;
+ final T value = object != null ? (T) object.getPojo() : null;
final String str =
value != null
? converter.convertToString(value, getLocaleProvider().getLocale())
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldNumeric.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldNumeric.java
index 81945a5..8363432 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldNumeric.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldNumeric.java
@@ -74,7 +74,7 @@ public abstract class ScalarPanelTextFieldNumeric<T extends Serializable> extend
return new Model<String>(){
@Override public String getObject() {
ObjectAdapter object = scalarModel.getObject();
- final T value = object != null ? (T) object.getObject() : null;
+ final T value = object != null ? (T) object.getPojo() : null;
final String str =
value != null
? converter.convertToString(value, getLocaleProvider().getLocale())
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/TextFieldValueModel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/TextFieldValueModel.java
index dcc6d60..4db0201 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/TextFieldValueModel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/TextFieldValueModel.java
@@ -55,7 +55,7 @@ public class TextFieldValueModel<T extends Serializable> extends Model<T> {
@SuppressWarnings("unchecked")
private T asT(final ObjectAdapter objectAdapter) {
- return (T) (objectAdapter != null? objectAdapter.getObject(): null);
+ return (T) (objectAdapter != null? objectAdapter.getPojo(): null);
}
@Override
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisBlobOrClobPanelAbstract.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisBlobOrClobPanelAbstract.java
index 7845039..9df561f 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisBlobOrClobPanelAbstract.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisBlobOrClobPanelAbstract.java
@@ -149,7 +149,7 @@ public abstract class IsisBlobOrClobPanelAbstract<T extends NamedWithMimeType> e
return null;
}
- final Object object = adapter.getObject();
+ final Object object = adapter.getPojo();
if(!(object instanceof Blob)) {
return null;
}
@@ -242,7 +242,7 @@ public abstract class IsisBlobOrClobPanelAbstract<T extends NamedWithMimeType> e
@SuppressWarnings("unchecked")
private T getBlobOrClob(final ScalarModel model) {
ObjectAdapter adapter = model.getObject();
- return adapter != null? (T) adapter.getObject(): null;
+ return adapter != null? (T) adapter.getPojo(): null;
}
public IsisBlobOrClobPanelAbstract(String id, ScalarModel scalarModel) {
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/markup/MarkupComponent.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/markup/MarkupComponent.java
index d276bd7..f3b4bfa 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/markup/MarkupComponent.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/markup/MarkupComponent.java
@@ -58,10 +58,10 @@ public class MarkupComponent extends WebComponent {
final ObjectAdapter objAdapter = (ObjectAdapter) modelObject;
- if(objAdapter.getObject()==null)
+ if(objAdapter.getPojo()==null)
return fallback;
- final Object value = objAdapter.getObject();
+ final Object value = objAdapter.getPojo();
if(!(value instanceof Markup))
return fallback;
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/markup/MarkupPanelFactories.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/markup/MarkupPanelFactories.java
index 3cbe479..bb67606 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/markup/MarkupPanelFactories.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/markup/MarkupPanelFactories.java
@@ -77,10 +77,10 @@ public class MarkupPanelFactories {
return ApplicationAdvice.DOES_NOT_APPLY;
final ValueModel valueModel = (ValueModel) model;
final ObjectAdapter adapter = valueModel.getObject();
- if(adapter==null || adapter.getObject()==null)
+ if(adapter==null || adapter.getPojo()==null)
return ApplicationAdvice.DOES_NOT_APPLY;
- return appliesIf( adapter.getObject() instanceof Markup );
+ return appliesIf( adapter.getPojo() instanceof Markup );
}
@Override
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.java
index ea73152..ef7ccbd 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.java
@@ -116,7 +116,7 @@ public class BooleanPanel extends ScalarPanelAbstract2 {
@Override public String getObject() {
final ScalarModel model = getModel();
final ObjectAdapter adapter = model.getObject();
- final Boolean bool = adapter != null ? (Boolean) adapter.getObject() : null;
+ final Boolean bool = adapter != null ? (Boolean) adapter.getPojo() : null;
return bool == null? "(not set)" : bool ? "Yes" : "No";
}
};
@@ -133,7 +133,7 @@ public class BooleanPanel extends ScalarPanelAbstract2 {
public Boolean getObject() {
final ScalarModel model = getModel();
final ObjectAdapter adapter = model.getObject();
- return adapter != null? (Boolean) adapter.getObject(): null;
+ return adapter != null? (Boolean) adapter.getPojo(): null;
}
@Override
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/IsisToWicketTreeAdapter.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/IsisToWicketTreeAdapter.java
index 11342f3..80f9a9b 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/IsisToWicketTreeAdapter.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/IsisToWicketTreeAdapter.java
@@ -269,7 +269,7 @@ class IsisToWicketTreeAdapter {
private Object unwrap(TreeModel model) {
Objects.requireNonNull(model);
- return model.getObject().getObject();
+ return model.getObject().getPojo();
}
private PersistenceSession persistenceSession() {
@@ -338,7 +338,7 @@ class IsisToWicketTreeAdapter {
@SuppressWarnings({ "rawtypes", "unchecked" })
private static ITreeProvider<TreeModel> toITreeProvider(ModelAbstract<ObjectAdapter> model) {
- final TreeNode treeNode = (TreeNode) model.getObject().getObject();
+ final TreeNode treeNode = (TreeNode) model.getObject().getPojo();
final Class<? extends TreeAdapter> treeAdapterClass = treeNode.getTreeAdapterClass();
final TreeModelTreeAdapter wrappingTreeAdapter = new TreeModelTreeAdapter(treeAdapterClass);
@@ -384,7 +384,7 @@ class IsisToWicketTreeAdapter {
String.format("Tree creation: could not recreate TreeModel from Oid: '%s'", id));
}
- final Object pojo = objAdapter.getObject();
+ final Object pojo = objAdapter.getPojo();
if(pojo==null) {
throw new NoSuchElementException(
String.format("Tree creation: could not recreate Pojo from Oid: '%s'", id));
@@ -424,7 +424,7 @@ class IsisToWicketTreeAdapter {
*/
@SuppressWarnings({ "rawtypes" })
private static TreeExpansionModel toIModelRepresentingCollapseExpandState(ModelAbstract<ObjectAdapter> model) {
- final TreeNode treeNode = (TreeNode) model.getObject().getObject();
+ final TreeNode treeNode = (TreeNode) model.getObject().getPojo();
final TreeState treeState = treeNode.getTreeState();
return TreeExpansionModel.of(treeState.getExpandedNodePaths());
}
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/TreePanelFactories.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/TreePanelFactories.java
index d9936b4..6707f97 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/TreePanelFactories.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/TreePanelFactories.java
@@ -83,11 +83,11 @@ public class TreePanelFactories {
final ValueModel valueModel = (ValueModel) model;
final ObjectAdapter adapter = valueModel.getObject();
- if(adapter==null || adapter.getObject()==null) {
+ if(adapter==null || adapter.getPojo()==null) {
return ApplicationAdvice.DOES_NOT_APPLY;
}
- return appliesIf( adapter.getObject() instanceof org.apache.isis.applib.tree.TreeNode );
+ return appliesIf( adapter.getPojo() instanceof org.apache.isis.applib.tree.TreeNode );
}
@Override
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/unknown/UnknownModelPanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/unknown/UnknownModelPanel.java
index 92d49ab..c37c17c 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/unknown/UnknownModelPanel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/unknown/UnknownModelPanel.java
@@ -59,7 +59,7 @@ public class UnknownModelPanel extends PanelAbstract<IModel<?>> {
if(objectAdapter != null) {
if(objectAdapter.getOid().isValue()) {
//FIXME[ISIS-1976] should be properly intercepted by another Panel and not fall through to the unknowns
- buf.append("FIXME[ISIS-1976] VALUE '" + objectAdapter.getObject()+"'");
+ buf.append("FIXME[ISIS-1976] VALUE '" + objectAdapter.getPojo()+"'");
} else {
buf.append("??? objectAdapter oid: " + objectAdapter.getOid());
}
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/linkandlabel/ActionLink.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/linkandlabel/ActionLink.java
index be3cf31..7f789f3 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/linkandlabel/ActionLink.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/linkandlabel/ActionLink.java
@@ -220,7 +220,7 @@ public abstract class ActionLink extends AjaxLink<ObjectAdapter> implements IAja
@Override
protected IRequestHandler getRequestHandler() {
ObjectAdapter resultAdapter = actionModel.execute();
- final Object value = resultAdapter.getObject();
+ final Object value = resultAdapter.getPojo();
return ActionModel.redirectHandler(value);
}
};
@@ -239,7 +239,7 @@ public abstract class ActionLink extends AjaxLink<ObjectAdapter> implements IAja
@Override
protected IRequestHandler getRequestHandler() {
final ObjectAdapter resultAdapter = actionModel.execute();
- final Object value = resultAdapter!=null ? resultAdapter.getObject() : null;
+ final Object value = resultAdapter!=null ? resultAdapter.getPojo() : null;
final IRequestHandler handler = ActionModel.downloadHandler(value);
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/linkandlabel/ActionLinkFactoryAbstract.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/linkandlabel/ActionLinkFactoryAbstract.java
index a214066..4d4c72d 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/linkandlabel/ActionLinkFactoryAbstract.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/linkandlabel/ActionLinkFactoryAbstract.java
@@ -111,7 +111,7 @@ public abstract class ActionLinkFactoryAbstract implements ActionLinkFactory {
final ObjectAdapter objectAdapter = input.getObjectAdapter(
ConcurrencyChecking.NO_CHECK,
persistenceSession, specificationLoader);
- return objectAdapter != null ? objectAdapter.getObject() : null;
+ return objectAdapter != null ? objectAdapter.getPojo() : null;
})
.filter(_NullSafe::isPresent)
);
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderAbstract.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderAbstract.java
index 0f8068c..bd45c7e 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderAbstract.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderAbstract.java
@@ -65,7 +65,7 @@ public abstract class ObjectAdapterMementoProviderAbstract extends ChoiceProvide
ConcurrencyChecking.NO_CHECK, getPersistenceSession(), getSpecificationLoader());
final IConverter<Object> converter = findConverter(objectAdapter);
return converter != null
- ? converter.convertToString(objectAdapter.getObject(), getLocale())
+ ? converter.convertToString(objectAdapter.getPojo(), getLocale())
: objectAdapter.titleString(null);
}
[isis] 02/06: ISIS-1976: remove Instance
Posted by ah...@apache.org.
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 2d1a08ea2fd1144978dcec674b80221340fa2875
Author: Andi Huber <ah...@apache.org>
AuthorDate: Sun Sep 30 04:57:01 2018 +0200
ISIS-1976: remove Instance
Task-Url: https://issues.apache.org/jira/browse/ISIS-1976
---
.../metamodel/adapter/MutableProposedHolder.java | 5 +--
.../isis/core/metamodel/adapter/ObjectAdapter.java | 25 --------------
.../apache/isis/core/metamodel/spec/Instance.java | 39 ----------------------
.../isis/core/metamodel/spec/ManagedObject.java | 6 ++--
.../specimpl/ObjectActionParameterAbstract.java | 4 +--
.../runtime/persistence/adapter/PojoAdapter.java | 12 -------
...ObjectAdapterContext_LifecycleEventSupport.java | 1 -
7 files changed, 7 insertions(+), 85 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/MutableProposedHolder.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/MutableProposedHolder.java
index 631ce3e..9aa7b05 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/MutableProposedHolder.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/MutableProposedHolder.java
@@ -19,12 +19,13 @@
package org.apache.isis.core.metamodel.adapter;
+import javax.enterprise.inject.Instance;
+
import org.apache.isis.core.metamodel.interactions.ProposedHolder;
-import org.apache.isis.core.metamodel.spec.Instance;
import org.apache.isis.core.metamodel.spec.Specification;
/**
- * Mix-in for {@link Instance} implementations, where can hold a proposed new
+ * Mix-in for {@link ManagedObject} implementations, where can hold a proposed new
* value different from the underlying value.
*
* <p>
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ObjectAdapter.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ObjectAdapter.java
index 71e4acc..4f22653 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ObjectAdapter.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ObjectAdapter.java
@@ -43,10 +43,8 @@ import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;
import org.apache.isis.core.metamodel.interactions.InteractionUtils;
import org.apache.isis.core.metamodel.interactions.ObjectVisibilityContext;
import org.apache.isis.core.metamodel.interactions.VisibilityContext;
-import org.apache.isis.core.metamodel.spec.Instance;
import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.core.metamodel.spec.Specification;
/**
* Adapters to domain objects, where the application is written in terms of
@@ -56,29 +54,6 @@ import org.apache.isis.core.metamodel.spec.Specification;
public interface ObjectAdapter extends ManagedObject {
/**
- * Return an {@link Instance} of the specified {@link Specification} with
- * respect to this {@link ObjectAdapter}.
- *
- * <p>
- * If called with {@link ObjectSpecification}, then just returns
- * <tt>this</tt>). If called for other subinterfaces, then should provide an
- * appropriate {@link Instance} implementation.
- *
- * <p>
- * Designed to be called in a double-dispatch design from
- * {@link Specification#getInstance(ObjectAdapter)}.
- *
- * <p>
- * Note: this method will throw an {@link UnsupportedOperationException}
- * unless the extended <tt>PojoAdapterXFactory</tt> is configured. (That is,
- * only <tt>PojoAdapterX</tt> provides support for this; the regular
- * <tt>PojoAdapter</tt> does not currently.
- *
- * @return
- */
- Instance getInstance(Specification specification);
-
- /**
* Returns the name of an icon to use if this object is to be displayed
* graphically.
*
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/Instance.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/Instance.java
deleted file mode 100644
index 0ee73c7..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/Instance.java
+++ /dev/null
@@ -1,39 +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.isis.core.metamodel.spec;
-
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-
-/**
- * Represents an instance of some element of the meta-model.
- *
- * <p>
- * Currently the only sub-interface is {@link ObjectAdapter}. However, the
- * intention is for associations, actions and action parameters to also inherit
- * from this interface.
- */
-public interface Instance {
-
- /**
- * Returns the specification that details the structure of this instance.
- */
- Specification getSpecification();
-
-}
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 f824e3e..b194dda 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
@@ -29,13 +29,11 @@ import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;
* Represents an instance of some element of the meta-model managed by the framework.
*
*/
-public interface ManagedObject extends Instance {
+public interface ManagedObject {
/**
- * Returns the specification that details the structure (meta-model) of this object.<br>
- * Note: Refines {@link Instance#getSpecification()}.
+ * Returns the specification that details the structure (meta-model) of this object.
*/
- @Override
ObjectSpecification getSpecification();
/**
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 5cd5cae..544abf9 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
@@ -55,7 +55,7 @@ import org.apache.isis.core.metamodel.interactions.InteractionUtils;
import org.apache.isis.core.metamodel.interactions.ValidityContext;
import org.apache.isis.core.metamodel.services.persistsession.PersistenceSessionServiceInternal;
import org.apache.isis.core.metamodel.spec.DomainModelException;
-import org.apache.isis.core.metamodel.spec.Instance;
+import org.apache.isis.core.metamodel.spec.ManagedObject;
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;
@@ -86,7 +86,7 @@ public abstract class ObjectActionParameterAbstract implements ObjectActionParam
/**
- * Gets the proposed value of the {@link Instance} (downcast as a
+ * Gets the proposed value of the {@link ManagedObject} (downcast as a
* {@link MutableProposedHolder}, wrapping the proposed value into a
* {@link ObjectAdapter}.
*/
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adapter/PojoAdapter.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adapter/PojoAdapter.java
index 1cd3690..f1400a2 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adapter/PojoAdapter.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adapter/PojoAdapter.java
@@ -35,9 +35,7 @@ import org.apache.isis.core.metamodel.adapter.oid.ParentedOid;
import org.apache.isis.core.metamodel.adapter.oid.RootOid;
import org.apache.isis.core.metamodel.adapter.version.ConcurrencyException;
import org.apache.isis.core.metamodel.adapter.version.Version;
-import org.apache.isis.core.metamodel.spec.Instance;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.core.metamodel.spec.Specification;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
@@ -273,16 +271,6 @@ public final class PojoAdapter implements ObjectAdapter {
public String getIconName() {
return getSpecification().getIconName(this);
}
-
- // -- getInstance (unsupported for this impl)
-
- /**
- * Not supported by this implementation.
- */
- @Override
- public Instance getInstance(final Specification specification) {
- throw new UnsupportedOperationException();
- }
}
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/adaptermanager/ObjectAdapterContext_LifecycleEventSupport.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/adaptermanager/ObjectAdapterContext_LifecycleEventSupport.java
index 0ac50f6..78bd833 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/adaptermanager/ObjectAdapterContext_LifecycleEventSupport.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/adaptermanager/ObjectAdapterContext_LifecycleEventSupport.java
@@ -26,7 +26,6 @@ import org.apache.isis.applib.services.eventbus.EventBusService;
import org.apache.isis.core.commons.factory.InstanceUtil;
import org.apache.isis.core.metamodel.facets.object.callbacks.LifecycleEventFacet;
import org.apache.isis.core.metamodel.services.ServicesInjector;
-import org.apache.isis.core.metamodel.spec.Instance;
import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
[isis] 01/06: ISIS-1976: remove InstanceAbstract
Posted by ah...@apache.org.
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 9072e5208cf1b4f0a832553dce8afc02ee664391
Author: Andi Huber <ah...@apache.org>
AuthorDate: Sun Sep 30 04:47:42 2018 +0200
ISIS-1976: remove InstanceAbstract
Task-Url: https://issues.apache.org/jira/browse/ISIS-1976
---
.../isis/core/metamodel/spec/InstanceAbstract.java | 63 ----------------------
.../runtime/persistence/adapter/PojoAdapter.java | 13 ++---
2 files changed, 7 insertions(+), 69 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/InstanceAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/InstanceAbstract.java
deleted file mode 100644
index 3d8a875..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/InstanceAbstract.java
+++ /dev/null
@@ -1,63 +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.isis.core.metamodel.spec;
-
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-
-public abstract class InstanceAbstract implements Instance {
-
- private Specification specification;
-
- protected InstanceAbstract() {
- this(null, null);
- }
-
- protected InstanceAbstract(final ObjectAdapter owner) {
- this(owner, null);
- }
-
- protected InstanceAbstract(final ObjectAdapter owner, final Specification specification) {
- this.specification = specification;
- }
-
- @Override
- public Specification getSpecification() {
- if (specification == null) {
- specification = loadSpecification();
- }
- return specification;
- }
-
- /**
- * Allows the specification to be lazily loaded.
- */
- protected Specification loadSpecification() {
- return null;
- }
-
- /**
- * Allows subclasses to get specification without necessarily triggering
- * {@link #loadSpecification() loading} if not yet known.
- */
- protected final Specification getSpecificationNoLoad() {
- return specification;
- }
-
-}
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adapter/PojoAdapter.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adapter/PojoAdapter.java
index 8bcf6e7..1cd3690 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adapter/PojoAdapter.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adapter/PojoAdapter.java
@@ -24,6 +24,7 @@ import static org.apache.isis.commons.internal.base._With.requires;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.apache.isis.commons.internal.base._Lazy;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.commons.exceptions.IsisException;
import org.apache.isis.core.commons.util.ToString;
@@ -35,13 +36,12 @@ import org.apache.isis.core.metamodel.adapter.oid.RootOid;
import org.apache.isis.core.metamodel.adapter.version.ConcurrencyException;
import org.apache.isis.core.metamodel.adapter.version.Version;
import org.apache.isis.core.metamodel.spec.Instance;
-import org.apache.isis.core.metamodel.spec.InstanceAbstract;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.Specification;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
-public final class PojoAdapter extends InstanceAbstract implements ObjectAdapter {
+public final class PojoAdapter implements ObjectAdapter {
private final static Logger LOG = LoggerFactory.getLogger(PojoAdapter.class);
@@ -91,17 +91,18 @@ public final class PojoAdapter extends InstanceAbstract implements ObjectAdapter
}
// -- getSpecification
+
+ final _Lazy<ObjectSpecification> objectSpecification = _Lazy.of(this::loadSpecification);
/**
* Downcasts {@link #getSpecification()}.
*/
@Override
public ObjectSpecification getSpecification() {
- return (ObjectSpecification) super.getSpecification();
+ return objectSpecification.get();
}
- @Override
- protected ObjectSpecification loadSpecification() {
+ private ObjectSpecification loadSpecification() {
final Class<?> aClass = getObject().getClass();
final ObjectSpecification specification = specificationLoader.loadSpecification(aClass);
return specification;
@@ -240,7 +241,7 @@ public final class PojoAdapter extends InstanceAbstract implements ObjectAdapter
str.append(":-");
}
str.setAddComma();
- if (getSpecificationNoLoad() == null) {
+ if (!objectSpecification.isMemoized()) {
str.append("class", getObject().getClass().getName());
} else {
str.append("specification", getSpecification().getShortIdentifier());
[isis] 04/06: ISIS-1976: move ObjectAdapter.getIconName() up the
hierarchy
Posted by ah...@apache.org.
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 53cb555c802f3bb09a04354ffae08d5e60b3478d
Author: Andi Huber <ah...@apache.org>
AuthorDate: Sun Sep 30 05:11:47 2018 +0200
ISIS-1976: move ObjectAdapter.getIconName() up the hierarchy
Task-Url: https://issues.apache.org/jira/browse/ISIS-1976
---
.../isis/core/metamodel/adapter/ObjectAdapter.java | 9 ---------
.../apache/isis/core/metamodel/spec/ManagedObject.java | 17 ++++++++++++++++-
.../core/runtime/persistence/adapter/PojoAdapter.java | 14 --------------
3 files changed, 16 insertions(+), 24 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ObjectAdapter.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ObjectAdapter.java
index fcbd15e..b8581c2 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ObjectAdapter.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ObjectAdapter.java
@@ -54,15 +54,6 @@ import org.apache.isis.core.metamodel.spec.ObjectSpecification;
public interface ObjectAdapter extends ManagedObject {
/**
- * Returns the name of an icon to use if this object is to be displayed
- * graphically.
- *
- * <p>
- * May return <code>null</code> if no icon is specified.
- */
- String getIconName();
-
- /**
* Checks the version of this adapter to make sure that it does not differ
* from the specified version.
*
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 101c21c..1409ff9 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
@@ -111,7 +111,7 @@ public interface ManagedObject {
}
- // -- COLLECTION SUPPORT
+ // -- SHORTCUT - ELEMENT SPECIFICATION
/**
* Used only for (standalone or parented) collections.
@@ -123,6 +123,21 @@ public interface ManagedObject {
return getSpecification().getElementSpecification();
}
+ // -- SHORTCUT - ICON NAME
+
+ /**
+ * Returns the name of an icon to use if this object is to be displayed
+ * graphically.
+ * <p>
+ * May return <code>null</code> if no icon is specified.
+ * @deprecated use {@link ObjectSpecification#getIconName(ManagedObject))} instead,
+ * (proposed for removal, to keep the API slim)
+ */
+ @Deprecated
+ default public String getIconName() {
+ return getSpecification().getIconName(this);
+ }
+
// -- FACTORIES
public static ManagedObject of(
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adapter/PojoAdapter.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adapter/PojoAdapter.java
index 9b87fdc..180e4de 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adapter/PojoAdapter.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adapter/PojoAdapter.java
@@ -92,9 +92,6 @@ public final class PojoAdapter implements ObjectAdapter {
final _Lazy<ObjectSpecification> objectSpecification = _Lazy.of(this::loadSpecification);
- /**
- * Downcasts {@link #getSpecification()}.
- */
@Override
public ObjectSpecification getSpecification() {
return objectSpecification.get();
@@ -255,15 +252,4 @@ public final class PojoAdapter implements ObjectAdapter {
return "S"; // standalone adapter (value)
}
- // -- iconName
-
- /**
- * Returns the name of the icon to use to represent this object.
- */
- @Override
- public String getIconName() {
- return getSpecification().getIconName(this);
- }
-
-
}