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:09 UTC
[isis] 04/04: ISIS-1976: remove deprecated MetaModelServce.sortOf
methods not having the Mode 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 9283f47adf2491e70da1c042f31011038f1ad591
Author: Andi Huber <ah...@apache.org>
AuthorDate: Wed Sep 26 21:43:01 2018 +0200
ISIS-1976: remove deprecated MetaModelServce.sortOf methods not having
the Mode argument
Task-Url: https://issues.apache.org/jira/browse/ISIS-1976
---
.../isis/applib/services/metamodel/MetaModelService.java | 14 --------------
.../ActionInvocationFacetForDomainEventAbstract.java | 3 ++-
.../services/metamodel/MetaModelServiceDefault.java | 13 -------------
3 files changed, 2 insertions(+), 28 deletions(-)
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/metamodel/MetaModelService.java b/core/applib/src/main/java/org/apache/isis/applib/services/metamodel/MetaModelService.java
index b4213ee..5c7494a 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/metamodel/MetaModelService.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/metamodel/MetaModelService.java
@@ -62,20 +62,6 @@ public interface MetaModelService {
@Programmatic
List<DomainMember> export();
- /**
- * @deprecated - use {@link #sortOf(Class, MetaModelService.Mode)}
- */
- @Deprecated
- @Programmatic
- Sort sortOf(Class<?> domainType);
-
- /**
- * @deprecated - use {@link #sortOf(Bookmark, MetaModelService.Mode)}
- */
- @Deprecated
- @Programmatic
- Sort sortOf(Bookmark bookmark);
-
@Programmatic
Sort sortOf(Class<?> domainType, Mode mode);
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 bd8d99d..97c268e 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
@@ -49,6 +49,7 @@ import org.apache.isis.applib.services.command.spi.CommandService;
import org.apache.isis.applib.services.iactn.Interaction;
import org.apache.isis.applib.services.iactn.InteractionContext;
import org.apache.isis.applib.services.metamodel.MetaModelService;
+import org.apache.isis.applib.services.metamodel.MetaModelService.Mode;
import org.apache.isis.applib.services.queryresultscache.QueryResultsCache;
import org.apache.isis.applib.services.repository.RepositoryService;
import org.apache.isis.applib.services.xactn.TransactionService;
@@ -440,7 +441,7 @@ implements ImperativeFacet {
}
final Class<?> domainType = resultAdapter.getSpecification().getCorrespondingClass();
- final MetaModelService.Sort sort = getMetaModelService().sortOf(domainType);
+ final MetaModelService.Sort sort = getMetaModelService().sortOf(domainType, Mode.STRICT);
switch (sort) {
case JDO_ENTITY:
final Object domainObject = resultAdapter.getObject();
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/metamodel/MetaModelServiceDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/metamodel/MetaModelServiceDefault.java
index 7025a0b..a295174 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/metamodel/MetaModelServiceDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/metamodel/MetaModelServiceDefault.java
@@ -177,17 +177,9 @@ public class MetaModelServiceDefault implements MetaModelService {
return className.startsWith("java") || className.startsWith("org.joda");
}
-
-
// //////////////////////////////////////
@Override
- public Sort sortOf(final Class<?> domainType) {
- return sortOf(domainType, Mode.STRICT);
- }
-
-
- @Override
public Sort sortOf(
final Class<?> domainType, final Mode mode) {
if(domainType == null) {
@@ -224,11 +216,6 @@ public class MetaModelServiceDefault implements MetaModelService {
}
@Override
- public Sort sortOf(final Bookmark bookmark) {
- return sortOf(bookmark, Mode.STRICT);
- }
-
- @Override
public Sort sortOf(final Bookmark bookmark, final Mode mode) {
if(bookmark == null) {
return null;