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/16 14:17:58 UTC
[isis] branch master updated: ISIS-2569: some internal renaming
towards 'bookmark'
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new 0bafc74 ISIS-2569: some internal renaming towards 'bookmark'
0bafc74 is described below
commit 0bafc74666a9ca476445bf03c56d71077d4d2962
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri Apr 16 16:17:41 2021 +0200
ISIS-2569: some internal renaming towards 'bookmark'
---
.../core/metamodel/objectmanager/ObjectManager.java | 8 ++++----
.../metamodel/objectmanager/ObjectManagerDefault.java | 6 +++---
.../{ObjectIdentifier.java => ObjectBookmarker.java} | 18 +++++++++---------
...lers.java => ObjectBookmarker_builtinHandlers.java} | 4 ++--
.../apache/isis/core/metamodel/spec/ManagedObject.java | 2 +-
.../core/metamodel/spec/ManagedObjectInternalUtil.java | 2 +-
.../bookmarks/BookmarkServiceDefault.java | 2 +-
.../handlers/DelegatingInvocationHandlerDefault.java | 2 +-
.../metamodel/facets/entity/JdoEntityFacet.java | 2 +-
9 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/objectmanager/ObjectManager.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/objectmanager/ObjectManager.java
index e9d58e0..7386b8b 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/objectmanager/ObjectManager.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/objectmanager/ObjectManager.java
@@ -27,7 +27,7 @@ import org.apache.isis.commons.collections.Can;
import org.apache.isis.core.metamodel.context.MetaModelContext;
import org.apache.isis.core.metamodel.objectmanager.create.ObjectCreator;
import org.apache.isis.core.metamodel.objectmanager.detach.ObjectDetacher;
-import org.apache.isis.core.metamodel.objectmanager.identify.ObjectIdentifier;
+import org.apache.isis.core.metamodel.objectmanager.identify.ObjectBookmarker;
import org.apache.isis.core.metamodel.objectmanager.load.ObjectLoader;
import org.apache.isis.core.metamodel.objectmanager.query.ObjectBulkLoader;
import org.apache.isis.core.metamodel.objectmanager.refresh.ObjectRefresher;
@@ -53,7 +53,7 @@ public interface ObjectManager {
ObjectCreator getObjectCreator();
ObjectLoader getObjectLoader();
ObjectBulkLoader getObjectBulkLoader();
- ObjectIdentifier getObjectIdentifier();
+ ObjectBookmarker getObjectBookmarker();
ObjectRefresher getObjectRefresher();
ObjectDetacher getObjectDetacher();
ObjectSerializer getObjectSerializer();
@@ -84,8 +84,8 @@ public interface ObjectManager {
* Returns an object identifier for the instance.
* @param managedObject
*/
- public default Bookmark identifyObject(ManagedObject managedObject) {
- return getObjectIdentifier().identifyObject(managedObject);
+ public default Bookmark bookmarkObject(ManagedObject managedObject) {
+ return getObjectBookmarker().bookmarkObject(managedObject);
}
/**
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/objectmanager/ObjectManagerDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/objectmanager/ObjectManagerDefault.java
index bc1ee99..1c5d399 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/objectmanager/ObjectManagerDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/objectmanager/ObjectManagerDefault.java
@@ -31,7 +31,7 @@ import org.apache.isis.applib.annotation.OrderPrecedence;
import org.apache.isis.core.metamodel.context.MetaModelContext;
import org.apache.isis.core.metamodel.objectmanager.create.ObjectCreator;
import org.apache.isis.core.metamodel.objectmanager.detach.ObjectDetacher;
-import org.apache.isis.core.metamodel.objectmanager.identify.ObjectIdentifier;
+import org.apache.isis.core.metamodel.objectmanager.identify.ObjectBookmarker;
import org.apache.isis.core.metamodel.objectmanager.load.ObjectLoader;
import org.apache.isis.core.metamodel.objectmanager.query.ObjectBulkLoader;
import org.apache.isis.core.metamodel.objectmanager.refresh.ObjectRefresher;
@@ -57,7 +57,7 @@ public class ObjectManagerDefault implements ObjectManager {
@Getter(onMethod = @__(@Override)) private ObjectLoader objectLoader;
@Getter(onMethod = @__(@Override)) private ObjectBulkLoader objectBulkLoader;
@Getter(onMethod = @__(@Override)) private ObjectCreator objectCreator;
- @Getter(onMethod = @__(@Override)) private ObjectIdentifier objectIdentifier;
+ @Getter(onMethod = @__(@Override)) private ObjectBookmarker objectBookmarker;
@Getter(onMethod = @__(@Override)) private ObjectRefresher objectRefresher;
@Getter(onMethod = @__(@Override)) private ObjectDetacher objectDetacher;
@Getter(onMethod = @__(@Override)) private ObjectSerializer objectSerializer;
@@ -67,7 +67,7 @@ public class ObjectManagerDefault implements ObjectManager {
objectCreator = ObjectCreator.createDefault(metaModelContext);
objectLoader = ObjectLoader.createDefault(metaModelContext);
objectBulkLoader = ObjectBulkLoader.createDefault(metaModelContext);
- objectIdentifier = ObjectIdentifier.createDefault();
+ objectBookmarker = ObjectBookmarker.createDefault();
objectRefresher = ObjectRefresher.createDefault();
objectDetacher = ObjectDetacher.createDefault(metaModelContext);
objectSerializer = ObjectSerializer.createDefault(metaModelContext);
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/objectmanager/identify/ObjectIdentifier.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/objectmanager/identify/ObjectBookmarker.java
similarity index 77%
rename from core/metamodel/src/main/java/org/apache/isis/core/metamodel/objectmanager/identify/ObjectIdentifier.java
rename to core/metamodel/src/main/java/org/apache/isis/core/metamodel/objectmanager/identify/ObjectBookmarker.java
index 18793cd..6bb6da1c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/objectmanager/identify/ObjectIdentifier.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/objectmanager/identify/ObjectBookmarker.java
@@ -30,9 +30,9 @@ import lombok.val;
/**
* @since 2.0
*/
-public interface ObjectIdentifier {
+public interface ObjectBookmarker {
- Bookmark identifyObject(ManagedObject managedObject);
+ Bookmark bookmarkObject(ManagedObject managedObject);
// -- HANDLER
@@ -40,15 +40,15 @@ public interface ObjectIdentifier {
// -- FACTORY
- public static ObjectIdentifier createDefault() {
+ public static ObjectBookmarker createDefault() {
val chainOfHandlers = _Lists.of(
- new ObjectIdentifier_builtinHandlers.GuardAgainstOid(),
- new ObjectIdentifier_builtinHandlers.BookmarkForServices(),
- new ObjectIdentifier_builtinHandlers.BookmarkForValues(),
- new ObjectIdentifier_builtinHandlers.BookmarkForViewModels(),
- new ObjectIdentifier_builtinHandlers.BookmarkForEntities(),
- new ObjectIdentifier_builtinHandlers.BookmarkForOthers());
+ new ObjectBookmarker_builtinHandlers.GuardAgainstOid(),
+ new ObjectBookmarker_builtinHandlers.BookmarkForServices(),
+ new ObjectBookmarker_builtinHandlers.BookmarkForValues(),
+ new ObjectBookmarker_builtinHandlers.BookmarkForViewModels(),
+ new ObjectBookmarker_builtinHandlers.BookmarkForEntities(),
+ new ObjectBookmarker_builtinHandlers.BookmarkForOthers());
val chainOfRespo = ChainOfResponsibility.of(chainOfHandlers);
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/objectmanager/identify/ObjectIdentifier_builtinHandlers.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/objectmanager/identify/ObjectBookmarker_builtinHandlers.java
similarity index 98%
rename from core/metamodel/src/main/java/org/apache/isis/core/metamodel/objectmanager/identify/ObjectIdentifier_builtinHandlers.java
rename to core/metamodel/src/main/java/org/apache/isis/core/metamodel/objectmanager/identify/ObjectBookmarker_builtinHandlers.java
index 367979b..c990f42 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/objectmanager/identify/ObjectIdentifier_builtinHandlers.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/objectmanager/identify/ObjectBookmarker_builtinHandlers.java
@@ -26,12 +26,12 @@ import org.apache.isis.commons.internal.exceptions._Exceptions;
import org.apache.isis.core.metamodel.facets.object.entity.EntityFacet;
import org.apache.isis.core.metamodel.facets.object.value.ValueFacet;
import org.apache.isis.core.metamodel.facets.object.viewmodel.ViewModelFacet;
-import org.apache.isis.core.metamodel.objectmanager.identify.ObjectIdentifier.Handler;
+import org.apache.isis.core.metamodel.objectmanager.identify.ObjectBookmarker.Handler;
import org.apache.isis.core.metamodel.spec.ManagedObject;
import lombok.val;
-class ObjectIdentifier_builtinHandlers {
+class ObjectBookmarker_builtinHandlers {
public static final String SERVICE_IDENTIFIER = "1";
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 89ad3b3..9f9ba3f 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
@@ -139,7 +139,7 @@ public interface ManagedObject {
/**
* Optimized for cases, when the pojo's specification and bookmark are already available.
*/
- public static ManagedObject identified(
+ public static ManagedObject bookmarked(
@NonNull ObjectSpecification specification,
@NonNull Object pojo,
@NonNull Bookmark bookmark) {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ManagedObjectInternalUtil.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ManagedObjectInternalUtil.java
index 0226102..0f3c1f2 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ManagedObjectInternalUtil.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ManagedObjectInternalUtil.java
@@ -70,7 +70,7 @@ final class ManagedObjectInternalUtil {
static Optional<Bookmark> identify(@Nullable ManagedObject adapter) {
return objectManager(adapter)
- .map(objectManager->objectManager.identifyObject(adapter));
+ .map(objectManager->objectManager.bookmarkObject(adapter));
}
// -- TITLE SUPPORT
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/bookmarks/BookmarkServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/bookmarks/BookmarkServiceDefault.java
index 5d73fd9..23caf63 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/bookmarks/BookmarkServiceDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/bookmarks/BookmarkServiceDefault.java
@@ -102,7 +102,7 @@ public class BookmarkServiceDefault implements BookmarkService, SerializingAdapt
return Optional.empty();
}
return Optional.of(
- objectManager.identifyObject(adapter));
+ objectManager.bookmarkObject(adapter));
}
private Object unwrapped(Object domainObject) {
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 ce71237..37716c0 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,7 +89,7 @@ public class DelegatingInvocationHandlerDefault<T> implements DelegatingInvocati
return;
}
- val oid = objectManager.identifyObject(adapter);
+ val oid = objectManager.bookmarkObject(adapter);
val loadRequest = ObjectLoader.Request.of(adapter.getSpecification(), oid.getIdentifier());
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 7d6c721..c7cbbce 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
@@ -158,7 +158,7 @@ implements EntityFacet {
val actualEntitySpec = getSpecificationLoader().specForTypeElseFail(entityPojo.getClass());
getServiceInjector().injectServicesInto(entityPojo); // might be redundant
//TODO integrate with entity change tracking
- return ManagedObject.identified(actualEntitySpec, entityPojo, bookmark);
+ return ManagedObject.bookmarked(actualEntitySpec, entityPojo, bookmark);
}
@Override