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:24 UTC
[isis] 03/06: ISIS-1976: rename ObjectAdapter.getObject() ->
getPojo()
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);
}