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/26 19:46:06 UTC
[isis] 01/04: ISIS-1976: remove deprecated BookmarkService methods
that don't take a FieldResetPolicy argument
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 a1fdfa45fddd0a8bcf9781a222d5e63a7fdb903d
Author: Andi Huber <ah...@apache.org>
AuthorDate: Wed Sep 26 20:35:11 2018 +0200
ISIS-1976: remove deprecated BookmarkService methods that don't take a
FieldResetPolicy argument
Task-Url: https://issues.apache.org/jira/browse/ISIS-1976
---
.../services/bookmark/BookmarkHolder_lookup.java | 3 ++-
.../services/bookmark/BookmarkHolder_object.java | 3 ++-
.../applib/services/bookmark/BookmarkService.java | 22 -------------------
.../bookmarks/BookmarkServiceInternalDefault.java | 25 +---------------------
.../PersistenceSessionServiceInternal.java | 14 ------------
.../PersistenceSessionServiceInternalNoop.java | 5 -----
.../background/CommandExecutorServiceDefault.java | 3 ++-
.../PersistenceSessionServiceInternalDefault.java | 11 ----------
8 files changed, 7 insertions(+), 79 deletions(-)
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/bookmark/BookmarkHolder_lookup.java b/core/applib/src/main/java/org/apache/isis/applib/services/bookmark/BookmarkHolder_lookup.java
index a1e2bd6..447bd6a 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/bookmark/BookmarkHolder_lookup.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/bookmark/BookmarkHolder_lookup.java
@@ -24,6 +24,7 @@ import org.apache.isis.applib.annotation.ActionLayout;
import org.apache.isis.applib.annotation.Contributed;
import org.apache.isis.applib.annotation.Mixin;
import org.apache.isis.applib.annotation.SemanticsOf;
+import org.apache.isis.applib.services.bookmark.BookmarkService.FieldResetPolicy;
@Mixin(method = "act")
public class BookmarkHolder_lookup {
@@ -45,7 +46,7 @@ public class BookmarkHolder_lookup {
cssClassFa = "fa-bookmark"
)
public Object act() {
- return bookmarkService.lookup(bookmarkHolder);
+ return bookmarkService.lookup(bookmarkHolder, FieldResetPolicy.RESET);
}
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/bookmark/BookmarkHolder_object.java b/core/applib/src/main/java/org/apache/isis/applib/services/bookmark/BookmarkHolder_object.java
index 0d58834..8cab173 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/bookmark/BookmarkHolder_object.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/bookmark/BookmarkHolder_object.java
@@ -24,6 +24,7 @@ import org.apache.isis.applib.annotation.ActionLayout;
import org.apache.isis.applib.annotation.Contributed;
import org.apache.isis.applib.annotation.Mixin;
import org.apache.isis.applib.annotation.SemanticsOf;
+import org.apache.isis.applib.services.bookmark.BookmarkService.FieldResetPolicy;
@Mixin(method = "prop")
public class BookmarkHolder_object {
@@ -44,7 +45,7 @@ public class BookmarkHolder_object {
contributed = Contributed.AS_ASSOCIATION
)
public Object prop() {
- return bookmarkService.lookup(bookmarkHolder);
+ return bookmarkService.lookup(bookmarkHolder, FieldResetPolicy.RESET);
}
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/bookmark/BookmarkService.java b/core/applib/src/main/java/org/apache/isis/applib/services/bookmark/BookmarkService.java
index fa026ca..8650a42 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/bookmark/BookmarkService.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/bookmark/BookmarkService.java
@@ -19,7 +19,6 @@
package org.apache.isis.applib.services.bookmark;
import org.apache.isis.applib.annotation.Programmatic;
-import org.apache.isis.commons.internal.memento._Mementos.SerializingAdapter;
/**
* This service enables a serializable "bookmark" to be created for an entity.
@@ -32,27 +31,6 @@ import org.apache.isis.commons.internal.memento._Mementos.SerializingAdapter;
*/
public interface BookmarkService {
- /**
- * @deprecated - use {@link BookmarkService#lookup(BookmarkHolder, BookmarkService.FieldResetPolicy)} instead.
- */
- @Deprecated
- @Programmatic
- Object lookup(BookmarkHolder bookmarkHolder);
-
- /**
- * @deprecated - use {@link BookmarkService#lookup(Bookmark, BookmarkService.FieldResetPolicy)} instead.
- */
- @Deprecated
- @Programmatic
- Object lookup(Bookmark bookmark);
-
- /**
- * @deprecated - use {@link BookmarkService#lookup(Bookmark, BookmarkService.FieldResetPolicy, Class)} instead.
- */
- @Deprecated
- @Programmatic
- <T> T lookup(Bookmark bookmark, Class<T> cls);
-
@Programmatic
Bookmark bookmarkFor(Object domainObject);
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/bookmarks/BookmarkServiceInternalDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/bookmarks/BookmarkServiceInternalDefault.java
index 42d6095..f7e12f3 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/bookmarks/BookmarkServiceInternalDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/bookmarks/BookmarkServiceInternalDefault.java
@@ -68,13 +68,6 @@ public class BookmarkServiceInternalDefault implements BookmarkService, Serializ
return bookmark != null? lookup(bookmark, fieldResetPolicy): null;
}
- @Programmatic
- @Override
- public Object lookup(final BookmarkHolder bookmarkHolder) {
- return lookup(bookmarkHolder, FieldResetPolicy.RESET);
- }
-
-
private Object lookupInternal(
final Bookmark bookmark,
final FieldResetPolicy fieldResetPolicy) {
@@ -105,15 +98,6 @@ public class BookmarkServiceInternalDefault implements BookmarkService, Serializ
return lookupInternal(bookmark, fieldResetPolicy);
}
-
-
- @Programmatic
- @Override
- public Object lookup(final Bookmark bookmark) {
- return lookup(bookmark, FieldResetPolicy.RESET);
- }
-
-
@SuppressWarnings("unchecked")
@Programmatic
@Override
@@ -126,13 +110,6 @@ public class BookmarkServiceInternalDefault implements BookmarkService, Serializ
@Programmatic
@Override
- public <T> T lookup(final Bookmark bookmark, Class<T> cls) {
- return (T) lookup(bookmark, FieldResetPolicy.RESET, cls);
- }
-
-
- @Programmatic
- @Override
public Bookmark bookmarkFor(final Object domainObject) {
if(domainObject == null) {
return null;
@@ -184,7 +161,7 @@ public class BookmarkServiceInternalDefault implements BookmarkService, Serializ
if(Bookmark.class.isAssignableFrom(value.getClass())) {
final Bookmark valueBookmark = (Bookmark) value;
- return _Casts.uncheckedCast(lookup(valueBookmark));
+ return _Casts.uncheckedCast(lookup(valueBookmark, FieldResetPolicy.RESET));
}
return _Casts.uncheckedCast(value);
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/persistsession/PersistenceSessionServiceInternal.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/persistsession/PersistenceSessionServiceInternal.java
index 65509a9..11b2c98 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/persistsession/PersistenceSessionServiceInternal.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/persistsession/PersistenceSessionServiceInternal.java
@@ -62,18 +62,6 @@ public interface PersistenceSessionServiceInternal extends ObjectAdapterProvider
* Provided by <tt>PersistenceSession</tt> when used by framework.
*
* <p>
- * Called by <tt>DomainObjectContainerDefault</tt>.
- *
- * @deprecated - left over from manual object resolving.
- */
- @Deprecated
- @Programmatic
- void resolve(Object parent, Object field);
-
- /**
- * Provided by <tt>PersistenceSession</tt> when used by framework.
- *
- * <p>
* Called by <tt>BookmarkServicesDefault</tt>.
* @return
*/
@@ -86,8 +74,6 @@ public interface PersistenceSessionServiceInternal extends ObjectAdapterProvider
@Programmatic
Bookmark bookmarkFor(Class<?> cls, String identifier);
-
-
// -- beginTran, flush, commit, currentTransaction
@Programmatic
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/persistsession/PersistenceSessionServiceInternalNoop.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/persistsession/PersistenceSessionServiceInternalNoop.java
index 3bc7c55..2d1abe8 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/persistsession/PersistenceSessionServiceInternalNoop.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/persistsession/PersistenceSessionServiceInternalNoop.java
@@ -73,11 +73,6 @@ public class PersistenceSessionServiceInternalNoop implements PersistenceSession
}
@Override
- public void resolve(final Object parent, final Object field) {
- throw new UnsupportedOperationException("Not supported by this implementation of PersistenceSessionServiceInternal");
- }
-
- @Override
public void resolve(final Object parent) {
throw new UnsupportedOperationException("Not supported by this implementation of PersistenceSessionServiceInternal");
}
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/background/CommandExecutorServiceDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/background/CommandExecutorServiceDefault.java
index f9a24bd..cf1ae4b 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/background/CommandExecutorServiceDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/background/CommandExecutorServiceDefault.java
@@ -30,6 +30,7 @@ import org.apache.isis.applib.annotation.NatureOfService;
import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.applib.services.bookmark.Bookmark;
import org.apache.isis.applib.services.bookmark.BookmarkService;
+import org.apache.isis.applib.services.bookmark.BookmarkService.FieldResetPolicy;
import org.apache.isis.applib.services.clock.ClockService;
import org.apache.isis.applib.services.command.Command;
import org.apache.isis.applib.services.command.CommandContext;
@@ -202,7 +203,7 @@ public class CommandExecutorServiceDefault implements CommandExecutorService {
for (OidDto targetOidDto : targetOidDtos) {
final Bookmark bookmark = Bookmark.from(targetOidDto);
- final Object targetObject = bookmarkService.lookup(bookmark);
+ final Object targetObject = bookmarkService.lookup(bookmark, FieldResetPolicy.RESET);
final ObjectAdapter targetAdapter = adapterFor(targetObject);
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 5c0800c..2004846 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
@@ -141,17 +141,6 @@ public class PersistenceSessionServiceInternalDefault implements PersistenceSess
getPersistenceSession().refreshRootInTransaction(parent);
}
- /**
- * @deprecated - left over from manual object resolving.
- */
- @Deprecated
- @Override
- public void resolve(final Object parent, final Object field) {
- if (field == null) {
- resolve(parent);
- }
- }
-
@Override
public void beginTran() {
beginTran(null);