You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2021/04/15 15:50:22 UTC
[isis] 02/02: ISIS-2569: rename 'rootOid' -> 'oid'
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 25c2fa2a44a8a5176b818c60919e679a781622a7
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu Apr 15 17:50:03 2021 +0200
ISIS-2569: rename 'rootOid' -> 'oid'
---
.../isis/core/metamodel/adapter/oid/Oid.java | 2 +-
.../isis/core/metamodel/spec/ManagedObject.java | 22 ++++++++--------
.../isis/core/metamodel/spec/ManagedObjects.java | 4 +--
.../adapter/oid/OidMarshallerTest_marshall.java | 4 +--
.../oid/OidMarshallerTest_roundtripping.java | 4 +--
.../adapter/oid/OidMarshallerTest_unmarshal.java | 30 +++++++++++-----------
.../core/runtime/context/IsisAppCommonContext.java | 4 +--
.../core/runtime/memento/ObjectMementoService.java | 2 +-
.../executor/MemberExecutorServiceDefault.java | 4 +--
.../DelegatingInvocationHandlerDefault.java | 4 +--
.../ui/component/EventProviderAbstract.java | 6 ++---
.../metamodel/facets/entity/JdoEntityFacet.java | 12 ++++-----
.../restfulobjects/rendering/IResourceContext.java | 4 +--
.../domainobjects/DomainObjectReprRenderer.java | 12 ++++-----
.../viewer/resources/ResourceAbstract.java | 4 +--
.../viewer/wicket/model/models/EntityModel.java | 4 +--
.../wicket/model/models/PageParameterUtil.java | 8 +++---
.../components/tree/IsisToWicketTreeAdapter.java | 4 +--
.../widgets/breadcrumbs/BreadcrumbModel.java | 14 +++++-----
.../ObjectAdapterMementoProviderAbstract.java | 4 +--
.../integration/ConverterForObjectAdapter.java | 6 ++---
.../ConverterForObjectAdapterMemento.java | 4 +--
.../mementos/ObjectMementoServiceWicket.java | 6 ++---
.../viewer/services/mementos/ObjectMementoWkt.java | 28 ++++++++++----------
24 files changed, 98 insertions(+), 98 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/Oid.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/Oid.java
index 919a63d..346f3dc 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/Oid.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/Oid.java
@@ -88,7 +88,7 @@ public interface Oid extends Serializable {
// -- MARSHALLING
public static interface Marshaller {
- String marshal(Oid rootOid);
+ String marshal(Oid oid);
String joinAsOid(String logicalTypeName, String instanceId);
}
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 afe3e45..4d0f14e 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
@@ -137,12 +137,12 @@ public interface ManagedObject {
}
/**
- * Optimized for cases, when the pojo's specification and rootOid are already available.
+ * Optimized for cases, when the pojo's specification and oid are already available.
*/
public static ManagedObject identified(
@NonNull ObjectSpecification specification,
@NonNull Object pojo,
- @NonNull Oid rootOid) {
+ @NonNull Oid oid) {
if(!specification.getCorrespondingClass().isAssignableFrom(pojo.getClass())) {
throw _Exceptions.illegalArgument(
@@ -153,7 +153,7 @@ public interface ManagedObject {
specification.getCorrespondingClass(), pojo.getClass(), pojo.toString());
}
ManagedObjects.assertPojoNotManaged(pojo);
- return SimpleManagedObject.identified(specification, pojo, rootOid);
+ return SimpleManagedObject.identified(specification, pojo, oid);
}
/**
@@ -193,9 +193,9 @@ public interface ManagedObject {
public static ManagedObject identified(
@NonNull final ObjectSpecification spec,
@Nullable final Object pojo,
- @NonNull final Oid rootOid) {
+ @NonNull final Oid oid) {
val managedObject = SimpleManagedObject.of(spec, pojo);
- managedObject.rootOidLazy.set(Optional.of(rootOid));
+ managedObject.oidLazy.set(Optional.of(oid));
return managedObject;
}
@@ -204,16 +204,16 @@ public interface ManagedObject {
@Override
public Optional<Oid> getRootOid() {
- return rootOidLazy.get();
+ return oidLazy.get();
}
// -- LAZY ID HANDLING
- private final _Lazy<Optional<Oid>> rootOidLazy =
+ private final _Lazy<Optional<Oid>> oidLazy =
_Lazy.threadSafe(()->ManagedObjectInternalUtil.identify(this));
@Override
public boolean isRootOidMemoized() {
- return rootOidLazy.isMemoized();
+ return oidLazy.isMemoized();
}
}
@@ -229,16 +229,16 @@ public interface ManagedObject {
@Override
public Optional<Oid> getRootOid() {
- return rootOidLazy.get();
+ return oidLazy.get();
}
// -- LAZY ID HANDLING
- private final _Lazy<Optional<Oid>> rootOidLazy =
+ private final _Lazy<Optional<Oid>> oidLazy =
_Lazy.threadSafe(()->ManagedObjectInternalUtil.identify(this));
@Override
public boolean isRootOidMemoized() {
- return rootOidLazy.isMemoized();
+ return oidLazy.isMemoized();
}
private final _Lazy<ObjectSpecification> specification = _Lazy.threadSafe(this::loadSpec);
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ManagedObjects.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ManagedObjects.java
index e9c33ff..c95781d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ManagedObjects.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ManagedObjects.java
@@ -168,7 +168,7 @@ public final class ManagedObjects {
@Nullable ManagedObject managedObject,
@NonNull final String separator) {
return identify(managedObject)
- .map(rootOid->rootOid.getLogicalTypeName() + separator + rootOid.getIdentifier());
+ .map(oid->oid.getLogicalTypeName() + separator + oid.getIdentifier());
}
public static String stringifyElseFail(
@@ -485,7 +485,7 @@ public final class ManagedObjects {
return managedObject;
}
- // identification (on JDO) fails, when detached object, where rootOid was not previously memoized
+ // identification (on JDO) fails, when detached object, where oid was not previously memoized
if(EntityUtil.getPersistenceStandard(managedObject)
.map(PersistenceStandard::isJdo)
.orElse(false)
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/OidMarshallerTest_marshall.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/OidMarshallerTest_marshall.java
index da68964..0896bc4 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/OidMarshallerTest_marshall.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/OidMarshallerTest_marshall.java
@@ -34,14 +34,14 @@ public class OidMarshallerTest_marshall {
}
@Test
- public void rootOid() {
+ public void oid() {
final String marshal = oidMarshaller.marshal(Oid.root(LogicalTypeTestFactory.cus(), "123"));
assertThat(marshal, equalTo("CUS:123"));
}
//deprecated
// @Test
-// public void rootOid_transient() {
+// public void oid_transient() {
// final String marshal = oidMarshaller.marshal(Oid.Factory.transientOf(ObjectSpecId.of("CUS"), "123"));
// assertThat(marshal, equalTo("!CUS:123"));
// }
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/OidMarshallerTest_roundtripping.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/OidMarshallerTest_roundtripping.java
index 752a9cd..547d349 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/OidMarshallerTest_roundtripping.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/OidMarshallerTest_roundtripping.java
@@ -29,7 +29,7 @@ import lombok.val;
public class OidMarshallerTest_roundtripping {
@Test
- public void rootOid() {
+ public void oid() {
val oid = Oid.root(LogicalTypeTestFactory.cus(), "123");
final String enString = oid.enString();
@@ -38,7 +38,7 @@ public class OidMarshallerTest_roundtripping {
}
@Test
- public void rootOid_withLegacyVersionIgnored() {
+ public void oid_withLegacyVersionIgnored() {
val oid = Oid.root(LogicalTypeTestFactory.cus(), "123");
final String enString = oid.enString();
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/OidMarshallerTest_unmarshal.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/OidMarshallerTest_unmarshal.java
index c17fb76..cbabf43 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/OidMarshallerTest_unmarshal.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/OidMarshallerTest_unmarshal.java
@@ -66,24 +66,24 @@ public class OidMarshallerTest_unmarshal {
public void persistentRoot() {
final String oidStr = "CUS:123";
- final Oid rootOid = oidMarshaller.unmarshal(oidStr, Oid.class);
- assertThat(rootOid.getLogicalTypeName(), is("CUS"));
- assertThat(rootOid.getIdentifier(), is("123"));
-
final Oid oid = oidMarshaller.unmarshal(oidStr, Oid.class);
- assertThat(oid, equalTo((Oid)rootOid));
+ assertThat(oid.getLogicalTypeName(), is("CUS"));
+ assertThat(oid.getIdentifier(), is("123"));
+
+ final Oid oid2 = oidMarshaller.unmarshal(oidStr, Oid.class);
+ assertThat(oid, equalTo(oid2));
}
@Test
public void persistentRootWithFullyQualifiedSpecId() {
final String oidStr = "com.planchase.ClassName:8";
- final Oid rootOid = oidMarshaller.unmarshal(oidStr, Oid.class);
- assertThat(rootOid.getLogicalTypeName(), is("com.planchase.ClassName"));
- assertThat(rootOid.getIdentifier(), is("8"));
-
final Oid oid = oidMarshaller.unmarshal(oidStr, Oid.class);
- assertThat(oid, equalTo((Oid)rootOid));
+ assertThat(oid.getLogicalTypeName(), is("com.planchase.ClassName"));
+ assertThat(oid.getIdentifier(), is("8"));
+
+ final Oid oid2 = oidMarshaller.unmarshal(oidStr, Oid.class);
+ assertThat(oid, equalTo(oid2));
}
// we simply ignore this since 2.0.0
@@ -99,12 +99,12 @@ public class OidMarshallerTest_unmarshal {
public void transientRoot() {
final String oidStr = "!CUS:123";
- final Oid rootOid = oidMarshaller.unmarshal(oidStr, Oid.class);
- assertThat(rootOid.getLogicalTypeName(), is("CUS"));
- assertThat(rootOid.getIdentifier(), is("123"));
-
final Oid oid = oidMarshaller.unmarshal(oidStr, Oid.class);
- assertThat(oid, equalTo((Oid)rootOid));
+ assertThat(oid.getLogicalTypeName(), is("CUS"));
+ assertThat(oid.getIdentifier(), is("123"));
+
+ final Oid oid2 = oidMarshaller.unmarshal(oidStr, Oid.class);
+ assertThat(oid, equalTo(oid2));
}
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/context/IsisAppCommonContext.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/context/IsisAppCommonContext.java
index c9c14d8..a91ca53 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/context/IsisAppCommonContext.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/context/IsisAppCommonContext.java
@@ -108,8 +108,8 @@ public class IsisAppCommonContext implements HasMetaModelContext {
return getMementoService().mementoForParameter(adapter);
}
- public ObjectMemento mementoFor(Oid rootOid) {
- return getMementoService().mementoForRootOid(rootOid);
+ public ObjectMemento mementoFor(Oid oid) {
+ return getMementoService().mementoForRootOid(oid);
}
public ManagedObject reconstructObject(ObjectMemento memento) {
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/ObjectMementoService.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/ObjectMementoService.java
index 7bfc2b5..8e4a6fc 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/ObjectMementoService.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/ObjectMementoService.java
@@ -29,7 +29,7 @@ import lombok.NonNull;
*/
public interface ObjectMementoService {
- ObjectMemento mementoForRootOid(Oid rootOid);
+ ObjectMemento mementoForRootOid(Oid oid);
ObjectMemento mementoForObject(ManagedObject adapter);
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/executor/MemberExecutorServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/executor/MemberExecutorServiceDefault.java
index a4f6fb2..4634fe3 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/executor/MemberExecutorServiceDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/executor/MemberExecutorServiceDefault.java
@@ -266,8 +266,8 @@ implements MemberExecutorService {
getTransactionService().flushTransaction();
}
if(entityState.isAttached()) {
- resultAdapter.getRootOid().ifPresent(rootOid->{
- val bookmark = rootOid.asBookmark();
+ resultAdapter.getRootOid().ifPresent(oid->{
+ val bookmark = oid.asBookmark();
command.updater().setResult(Result.success(bookmark));
});
} else {
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/handlers/DelegatingInvocationHandlerDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/handlers/DelegatingInvocationHandlerDefault.java
index fe2332b..ce71237 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/handlers/DelegatingInvocationHandlerDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/handlers/DelegatingInvocationHandlerDefault.java
@@ -89,9 +89,9 @@ public class DelegatingInvocationHandlerDefault<T> implements DelegatingInvocati
return;
}
- val rootOid = objectManager.identifyObject(adapter);
+ val oid = objectManager.identifyObject(adapter);
- val loadRequest = ObjectLoader.Request.of(adapter.getSpecification(), rootOid.getIdentifier());
+ val loadRequest = ObjectLoader.Request.of(adapter.getSpecification(), oid.getIdentifier());
objectManager.loadObject(loadRequest);
}
diff --git a/extensions/vw/fullcalendar/ui/src/main/java/org/apache/isis/extensions/fullcalendar/ui/component/EventProviderAbstract.java b/extensions/vw/fullcalendar/ui/src/main/java/org/apache/isis/extensions/fullcalendar/ui/component/EventProviderAbstract.java
index f60677f..61a3046 100644
--- a/extensions/vw/fullcalendar/ui/src/main/java/org/apache/isis/extensions/fullcalendar/ui/component/EventProviderAbstract.java
+++ b/extensions/vw/fullcalendar/ui/src/main/java/org/apache/isis/extensions/fullcalendar/ui/component/EventProviderAbstract.java
@@ -103,10 +103,10 @@ public abstract class EventProviderAbstract implements EventProvider {
val dereferencedManagedObject =
ManagedObject.lazy(commonContext.getSpecificationLoader(), dereferencedObject);
- val rootOid = ManagedObjects.identify(dereferencedManagedObject).orElse(null);
- if(rootOid!=null) {
+ val oid = ManagedObjects.identify(dereferencedManagedObject).orElse(null);
+ if(oid!=null) {
- final String oidStr = rootOid.enString();
+ final String oidStr = oid.enString();
event.setId(oidStr + "-" + calendarName);
event.setClassName("fullCalendar2-event-" + calendarName);
diff --git a/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/metamodel/facets/entity/JdoEntityFacet.java b/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/metamodel/facets/entity/JdoEntityFacet.java
index 88e8b21..da92d37 100644
--- a/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/metamodel/facets/entity/JdoEntityFacet.java
+++ b/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/metamodel/facets/entity/JdoEntityFacet.java
@@ -126,13 +126,13 @@ implements EntityFacet {
_Assert.assertTrue(entitySpec.isEntity());
- val rootOid = Oid.root(entitySpec.getLogicalType(), identifier);
+ val oid = Oid.root(entitySpec.getLogicalType(), identifier);
- log.debug("fetchEntity; rootOid={}", rootOid);
+ log.debug("fetchEntity; oid={}", oid);
Object entityPojo;
try {
- val primaryKey = JdoObjectIdSerializer.toJdoObjectId(entitySpec, rootOid);
+ val primaryKey = JdoObjectIdSerializer.toJdoObjectId(entitySpec, oid);
val persistenceManager = getPersistenceManager();
val entityClass = entitySpec.getCorrespondingClass();
val fetchPlan = persistenceManager.getFetchPlan();
@@ -144,7 +144,7 @@ implements EntityFacet {
val recognition = exceptionRecognizerService.recognize(e);
if(recognition.isPresent()) {
if(recognition.get().getCategory() == Category.NOT_FOUND) {
- throw new ObjectNotFoundException(""+rootOid, e);
+ throw new ObjectNotFoundException(""+oid, e);
}
}
@@ -152,13 +152,13 @@ implements EntityFacet {
}
if (entityPojo == null) {
- throw new ObjectNotFoundException(""+rootOid);
+ throw new ObjectNotFoundException(""+oid);
}
val actualEntitySpec = getSpecificationLoader().specForTypeElseFail(entityPojo.getClass());
getServiceInjector().injectServicesInto(entityPojo); // might be redundant
//TODO integrate with entity change tracking
- return ManagedObject.identified(actualEntitySpec, entityPojo, rootOid);
+ return ManagedObject.identified(actualEntitySpec, entityPojo, oid);
}
@Override
diff --git a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/IResourceContext.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/IResourceContext.java
index e0d7219..1a84993 100644
--- a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/IResourceContext.java
+++ b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/IResourceContext.java
@@ -108,8 +108,8 @@ public interface IResourceContext {
default Optional<ManagedObject> getObjectAdapterForOidFromHref(String oidFromHref) {
String oidStrUnencoded = UrlDecoderUtils.urlDecode(oidFromHref);
- val rootOid = Oid.deString(oidStrUnencoded);
- return rootOid.loadObject(getMetaModelContext());
+ val oid = Oid.deString(oidStrUnencoded);
+ return oid.loadObject(getMetaModelContext());
}
}
diff --git a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/DomainObjectReprRenderer.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/DomainObjectReprRenderer.java
index fe5d2d1..92b9e34 100644
--- a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/DomainObjectReprRenderer.java
+++ b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/DomainObjectReprRenderer.java
@@ -170,15 +170,15 @@ public class DomainObjectReprRenderer extends ReprRendererAbstract<DomainObjectR
if (!(mode.isArgs())) {
- val rootOidIfAny = objectAdapter.getRootOid();
+ val oidIfAny = objectAdapter.getRootOid();
// self, extensions.oid
if (ManagedObjects.isIdentifiable(objectAdapter)) {
if (includesSelf) {
addLinkToSelf();
}
- rootOidIfAny.ifPresent(rootOid->{
- val oidStr = rootOid.enString();
+ oidIfAny.ifPresent(oid->{
+ val oidStr = oid.enString();
getExtensions().mapPut("oid", oidStr);
});
}
@@ -191,11 +191,11 @@ public class DomainObjectReprRenderer extends ReprRendererAbstract<DomainObjectR
if (isService) {
representation.mapPut("serviceId", ServiceUtil.idOfAdapter(objectAdapter));
} else {
- rootOidIfAny.ifPresent(rootOid->{
- Optional.ofNullable(rootOid.getLogicalTypeName())
+ oidIfAny.ifPresent(oid->{
+ Optional.ofNullable(oid.getLogicalTypeName())
.ifPresent(domainType->
representation.mapPut("domainType", domainType));
- representation.mapPut("instanceId", rootOid.getIdentifier());
+ representation.mapPut("instanceId", oid.getIdentifier());
});
}
}
diff --git a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/ResourceAbstract.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/ResourceAbstract.java
index b1e8333..62e0263 100644
--- a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/ResourceAbstract.java
+++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/ResourceAbstract.java
@@ -126,9 +126,9 @@ public abstract class ResourceAbstract {
protected ManagedObject getObjectAdapterElseThrowNotFound(String domainType, final String instanceIdEncoded) {
final String instanceIdUnencoded = UrlDecoderUtils.urlDecode(instanceIdEncoded);
final String oidStrUnencoded = Oid.marshaller().joinAsOid(domainType, instanceIdUnencoded);
- val rootOid = Oid.deString(oidStrUnencoded);
+ val oid = Oid.deString(oidStrUnencoded);
- return rootOid
+ return oid
.loadObject(metaModelContext)
.orElseThrow(()->RestfulObjectsApplicationException
.createWithMessage(HttpStatusCode.NOT_FOUND,
diff --git a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityModel.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityModel.java
index ad2f916..63947ef 100644
--- a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityModel.java
+++ b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityModel.java
@@ -80,7 +80,7 @@ implements HasRenderingHints, ObjectAdapterModel, UiHintContainer, ObjectUiModel
IsisAppCommonContext commonContext,
PageParameters pageParameters) {
- return ofMemento(commonContext, commonContext.mementoFor(rootOidFrom(pageParameters)));
+ return ofMemento(commonContext, commonContext.mementoFor(oidFrom(pageParameters)));
}
public static EntityModel ofAdapter(
@@ -148,7 +148,7 @@ implements HasRenderingHints, ObjectAdapterModel, UiHintContainer, ObjectUiModel
return PageParameterNames.OBJECT_OID.getStringFrom(pageParameters);
}
- private static Oid rootOidFrom(final PageParameters pageParameters) {
+ private static Oid oidFrom(final PageParameters pageParameters) {
return Oid.unmarshaller().unmarshal(oidStr(pageParameters), Oid.class);
}
diff --git a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/PageParameterUtil.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/PageParameterUtil.java
index a15bbe9..5f5f60a 100644
--- a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/PageParameterUtil.java
+++ b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/PageParameterUtil.java
@@ -193,8 +193,8 @@ public class PageParameterUtil {
IsisAppCommonContext commonContext,
PageParameters pageParameters) {
- val rootOid = oidFor(pageParameters);
- val memento = commonContext.mementoFor(rootOid);
+ val oid = oidFor(pageParameters);
+ val memento = commonContext.mementoFor(oid);
return EntityModel.ofMemento(commonContext, memento);
}
@@ -232,8 +232,8 @@ public class PageParameterUtil {
}
try {
- val rootOid = Oid.deStringEncoded(encoded);
- return rootOid.loadObject(mmc).orElse(null);
+ val oid = Oid.deStringEncoded(encoded);
+ return oid.loadObject(mmc).orElse(null);
} catch (final Exception e) {
return null;
}
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/IsisToWicketTreeAdapter.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/IsisToWicketTreeAdapter.java
index 4a22ef1..652fb15 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/IsisToWicketTreeAdapter.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/IsisToWicketTreeAdapter.java
@@ -414,8 +414,8 @@ class IsisToWicketTreeAdapter {
@Override
protected TreeModel load() {
- val rootOid = id;
- val objAdapter = rootOid.loadObject(commonContext.getMetaModelContext())
+ val oid = id;
+ val objAdapter = oid.loadObject(commonContext.getMetaModelContext())
.orElseThrow(()->new NoSuchElementException(
String.format("Tree creation: could not recreate TreeModel from Oid: '%s'", id)));
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbModel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbModel.java
index 26b16fc..af59403 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbModel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbModel.java
@@ -148,10 +148,10 @@ public class BreadcrumbModel implements Serializable {
}
- void remove(final String rootOid) {
- Bookmark existingBookmark = bookmarkByOidStr.get(rootOid);
+ void remove(final String oid) {
+ Bookmark existingBookmark = bookmarkByOidStr.get(oid);
if(existingBookmark != null) {
- remove(rootOid, existingBookmark);
+ remove(oid, existingBookmark);
}
}
@@ -168,13 +168,13 @@ public class BreadcrumbModel implements Serializable {
}
protected EntityModel toEntityModel(final Bookmark bookmark) {
- val rootOid = Oid.forBookmark(bookmark);
- val objectAdapterMemento = commonContext.mementoFor(rootOid);
+ val oid = Oid.forBookmark(bookmark);
+ val objectAdapterMemento = commonContext.mementoFor(oid);
return EntityModel.ofMemento(commonContext, objectAdapterMemento);
}
- private void remove(final String rootOid, final Bookmark bookmark) {
- bookmarkByOidStr.remove(rootOid);
+ private void remove(final String oid, final Bookmark bookmark) {
+ bookmarkByOidStr.remove(oid);
oidStrByBookmark.remove(bookmark);
list.remove(bookmark);
}
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderAbstract.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderAbstract.java
index 6195868..f487dbf 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderAbstract.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderAbstract.java
@@ -178,8 +178,8 @@ extends ChoiceProvider<ObjectMemento> {
if(NULL_PLACEHOLDER.equals(id)) {
return null;
}
- val rootOid = Oid.deString(id);
- return getCommonContext().mementoFor(rootOid);
+ val oid = Oid.deString(id);
+ return getCommonContext().mementoFor(oid);
}
diff --git a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/ConverterForObjectAdapter.java b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/ConverterForObjectAdapter.java
index e8c4054..f922234 100644
--- a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/ConverterForObjectAdapter.java
+++ b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/ConverterForObjectAdapter.java
@@ -49,12 +49,12 @@ public class ConverterForObjectAdapter implements IConverter<ManagedObject> {
*/
@Override
public ManagedObject convertToObject(final String value, final Locale locale) {
- val rootOid = Oid.deStringEncoded(value);
+ val oid = Oid.deStringEncoded(value);
val spec = objectManager.getMetaModelContext()
.getSpecificationLoader()
- .specForLogicalTypeNameElseFail(rootOid.getLogicalTypeName());
+ .specForLogicalTypeNameElseFail(oid.getLogicalTypeName());
- val objectLoadRequest = ObjectLoader.Request.of(spec, rootOid.getIdentifier());
+ val objectLoadRequest = ObjectLoader.Request.of(spec, oid.getIdentifier());
return objectManager.loadObject(objectLoadRequest);
}
diff --git a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/ConverterForObjectAdapterMemento.java b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/ConverterForObjectAdapterMemento.java
index b956fb7..b3ec42d 100644
--- a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/ConverterForObjectAdapterMemento.java
+++ b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/ConverterForObjectAdapterMemento.java
@@ -53,8 +53,8 @@ public class ConverterForObjectAdapterMemento implements IConverter<ObjectMement
if (_Strings.isNullOrEmpty(value)) {
return null;
}
- val rootOid = Oid.deStringEncoded(value);
- return commonContext.mementoFor(rootOid);
+ val oid = Oid.deStringEncoded(value);
+ return commonContext.mementoFor(oid);
}
/**
diff --git a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/mementos/ObjectMementoServiceWicket.java b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/mementos/ObjectMementoServiceWicket.java
index 3cdf78b..3b1e37f 100644
--- a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/mementos/ObjectMementoServiceWicket.java
+++ b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/mementos/ObjectMementoServiceWicket.java
@@ -68,9 +68,9 @@ public class ObjectMementoServiceWicket implements ObjectMementoService {
@Inject private ObjectManager objectManager;
@Override
- public ObjectMemento mementoForRootOid(@NonNull Oid rootOid) {
-// _Probe.errOut("mementoForRootOid %s", rootOid);
- val mementoAdapter = ObjectMementoWkt.createPersistent(rootOid, specificationLoader);
+ public ObjectMemento mementoForRootOid(@NonNull Oid oid) {
+// _Probe.errOut("mementoForRootOid %s", oid);
+ val mementoAdapter = ObjectMementoWkt.createPersistent(oid, specificationLoader);
return ObjectMementoAdapter.of(mementoAdapter);
}
diff --git a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/mementos/ObjectMementoWkt.java b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/mementos/ObjectMementoWkt.java
index 810acf7..343e010 100644
--- a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/mementos/ObjectMementoWkt.java
+++ b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/mementos/ObjectMementoWkt.java
@@ -71,10 +71,10 @@ final class ObjectMementoWkt implements HasLogicalType, Serializable {
* Factory method
*/
static ObjectMementoWkt createPersistent(
- Oid rootOid,
+ Oid oid,
SpecificationLoader specificationLoader) {
- return new ObjectMementoWkt(rootOid, specificationLoader);
+ return new ObjectMementoWkt(oid, specificationLoader);
}
private enum Cardinality {
@@ -230,11 +230,11 @@ final class ObjectMementoWkt implements HasLogicalType, Serializable {
"need an id to lookup an object, got logical-type %s", memento.logicalType);
}
- Oid rootOid = Oid.unmarshaller().unmarshal(memento.persistentOidStr, Oid.class);
+ Oid oid = Oid.unmarshaller().unmarshal(memento.persistentOidStr, Oid.class);
try {
- log.debug("lookup by rootOid [{}]", rootOid);
- return rootOid.loadObject(mmc).orElse(null);
+ log.debug("lookup by oid [{}]", oid);
+ return oid.loadObject(mmc).orElse(null);
} finally {
// possibly out-dated insight ...
@@ -243,7 +243,7 @@ final class ObjectMementoWkt implements HasLogicalType, Serializable {
// we copy this updated oid string into our memento so that, if we retry,
// we will succeed second time around
- memento.persistentOidStr = rootOid.enString();
+ memento.persistentOidStr = oid.enString();
}
}
@@ -401,10 +401,10 @@ final class ObjectMementoWkt implements HasLogicalType, Serializable {
this.logicalType = logicalType;
}
- private ObjectMementoWkt(Oid rootOid, SpecificationLoader specificationLoader) {
+ private ObjectMementoWkt(Oid oid, SpecificationLoader specificationLoader) {
// -- // TODO[2112] do we ever need to create ENCODEABLE here?
- val logicalTypeName = rootOid.getLogicalTypeName();
+ val logicalTypeName = oid.getLogicalTypeName();
val spec = specificationLoader.specForLogicalTypeName(logicalTypeName)
.orElseThrow(()->_Exceptions.unrecoverableFormatted(
"cannot recreate spec from logicalTypeName %s", logicalTypeName));
@@ -413,15 +413,15 @@ final class ObjectMementoWkt implements HasLogicalType, Serializable {
this.logicalType = spec.getLogicalType();
if(spec.isEncodeable()) {
- this.encodableValue = rootOid.getIdentifier();
+ this.encodableValue = oid.getIdentifier();
this.recreateStrategy = RecreateStrategy.ENCODEABLE;
return;
}
- this.persistentOidStr = rootOid.enString();
+ this.persistentOidStr = oid.enString();
requires(persistentOidStr, "persistentOidStr");
- this.bookmark = rootOid.asBookmark();
+ this.bookmark = oid.asBookmark();
this.recreateStrategy = RecreateStrategy.LOOKUP;
}
@@ -445,9 +445,9 @@ final class ObjectMementoWkt implements HasLogicalType, Serializable {
val spec = adapter.getSpecification();
if(spec.isIdentifiable() || spec.isParented() ) {
- val rootOid = ManagedObjects.identifyElseFail(adapter);
- persistentOidStr = rootOid.enString();
- bookmark = rootOid.asBookmark();
+ val oid = ManagedObjects.identifyElseFail(adapter);
+ persistentOidStr = oid.enString();
+ bookmark = oid.asBookmark();
if(adapter.getPojo() instanceof HintIdProvider) {
HintIdProvider provider = (HintIdProvider) adapter.getPojo();
this.hintId = provider.hintId();