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/08/31 15:31:42 UTC
[isis] 07/09: ISIS-1976: remove deprecated
ObjectAssociationContainer.getAssociations(Predicate)
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 e7cfe6d2e6bc72977d1383ce5488f251c3aa9b53
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri Aug 31 17:12:37 2018 +0200
ISIS-1976: remove deprecated
ObjectAssociationContainer.getAssociations(Predicate)
Task-Url: https://issues.apache.org/jira/browse/ISIS-1976
---
.../apache/isis/core/metamodel/spec/ObjectSpecification.java | 12 ------------
.../metamodel/spec/feature/ObjectAssociationContainer.java | 7 -------
.../specloader/specimpl/ObjectSpecificationAbstract.java | 9 +--------
.../core/metamodel/testspec/ObjectSpecificationStub.java | 6 ------
4 files changed, 1 insertion(+), 33 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectSpecification.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectSpecification.java
index 3931078..82700b3 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectSpecification.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectSpecification.java
@@ -171,18 +171,6 @@ public interface ObjectSpecification extends Specification, ObjectActionContaine
*/
String getHelp();
-// /**
-// * Returns the title string for the specified object.
-// *
-// * <p>
-// * Corresponds to the {@link TitleFacet#title(ObjectAdapter)} ) value} of
-// * {@link TitleFacet}; is not necessarily immutable.
-// *
-// * @deprecated use {@link #getTitle(ObjectAdapter, ObjectAdapter)}
-// */
-// @Deprecated
-// String getTitle(ObjectAdapter adapter);
-
/**
* Returns the title to display of target adapter, rendered within the context
* of some other adapter (if any).
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAssociationContainer.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAssociationContainer.java
index e4ccd0f..cef70f8 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAssociationContainer.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAssociationContainer.java
@@ -43,13 +43,6 @@ public interface ObjectAssociationContainer {
List<ObjectAssociation> getAssociations(Contributed contributed);
/**
- * Returns all {@link ObjectAssociation} ({@link Contributed#INCLUDED including contributed actions})
- * that match the supplied filter.
- */
- @Deprecated
- List<ObjectAssociation> getAssociations(Predicate<ObjectAssociation> predicate);
-
- /**
* Return all {@link ObjectAssociation}s matching the supplied filter.
*
* To get the statically visible fields (where any invisible and
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java
index bbce94c..3821e6c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java
@@ -611,9 +611,8 @@ public abstract class ObjectSpecificationAbstract extends FacetHolderImpl implem
return isAbstract;
}
-
-
// -- Associations
+
@Override
public List<ObjectAssociation> getAssociations(final Contributed contributed) {
// the "contributed.isIncluded()" guard is required because we cannot do this too early;
@@ -708,12 +707,6 @@ public abstract class ObjectSpecificationAbstract extends FacetHolderImpl implem
return null;
}
- @Deprecated
- @Override
- public List<ObjectAssociation> getAssociations(Predicate<ObjectAssociation> predicate) {
- return getAssociations(Contributed.INCLUDED, predicate);
- }
-
@Override
public List<ObjectAssociation> getAssociations(Contributed contributed, final Predicate<ObjectAssociation> predicate) {
final List<ObjectAssociation> allAssociations = getAssociations(contributed);
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/testspec/ObjectSpecificationStub.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/testspec/ObjectSpecificationStub.java
index c5ef9e3..17ae290 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/testspec/ObjectSpecificationStub.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/testspec/ObjectSpecificationStub.java
@@ -135,12 +135,6 @@ public class ObjectSpecificationStub extends FacetHolderImpl implements ObjectSp
return fields;
}
- @Deprecated
- @Override
- public List<ObjectAssociation> getAssociations(final Predicate<ObjectAssociation> predicate) {
- return getAssociations(Contributed.INCLUDED, predicate);
- }
-
@Override
@SuppressWarnings("unchecked")
public List<OneToOneAssociation> getProperties(final Contributed contributed) {