You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2017/10/16 10:44:39 UTC
[isis] 15/38: ISIS-1742: moves ObjectAssociation.Filters methods
etc to ObjectAssociation.Predicates
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch dev/2.0.0/ISIS-1742-remove-deprecations
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 27918c3cd973ec1de72e6edba73e81c60dd11499
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Mon Oct 16 09:27:22 2017 +0100
ISIS-1742: moves ObjectAssociation.Filters methods etc to ObjectAssociation.Predicates
---
.../annotprop/MemberGroupLayoutFacetFactory.java | 4 +-
.../impl/ObjectValidPropertiesFacetImpl.java | 2 +-
.../ApplicationFeatureRepositoryDefault.java | 4 +-
.../services/grid/GridSystemServiceAbstract.java | 4 +-
.../metamodel/MetaModelServiceDefault.java | 4 +-
.../metamodel/services/swagger/internal/Util.java | 4 +-
.../metamodel/spec/feature/ObjectAssociation.java | 91 ++++++++++------------
.../specimpl/ObjectSpecificationAbstract.java | 4 +-
...DerivedFromJdoColumnAnnotationFacetFactory.java | 2 +-
...ndatoryFromJdoColumnAnnotationFacetFactory.java | 2 +-
...DerivedFromJdoColumnAnnotationFacetFactory.java | 2 +-
.../ApplicationFeatureRepositoryDefaultTest.java | 4 +-
.../testspec/ObjectSpecificationStub.java | 4 +-
.../changes/ChangedObjectsServiceInternal.java | 6 +-
.../resources/ObjectAdapterUpdateHelper.java | 2 +-
.../wicket/model/models/BookmarkTreeNode.java | 2 +-
.../CollectionContentsAsAjaxTablePanel.java | 2 +-
17 files changed, 68 insertions(+), 75 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/membergroups/annotprop/MemberGroupLayoutFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/membergroups/annotprop/MemberGroupLayoutFacetFactory.java
index 7177fce..0b46def 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/membergroups/annotprop/MemberGroupLayoutFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/membergroups/annotprop/MemberGroupLayoutFacetFactory.java
@@ -112,8 +112,8 @@ public class MemberGroupLayoutFacetFactory extends FacetFactoryAbstract implemen
private int numCollectionsOf(ObjectSpecification objectSpec) {
List<ObjectAssociation> objectCollections = objectSpec.getAssociations(
Contributed.EXCLUDED, com.google.common.base.Predicates.and(
- ObjectAssociation.Filters.staticallyVisible(Where.OBJECT_FORMS),
- ObjectAssociation.Filters.COLLECTIONS )
+ ObjectAssociation.Predicates.staticallyVisible(Where.OBJECT_FORMS),
+ ObjectAssociation.Predicates.COLLECTIONS )
);
return objectCollections.size();
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/objectvalidprops/impl/ObjectValidPropertiesFacetImpl.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/objectvalidprops/impl/ObjectValidPropertiesFacetImpl.java
index 764a84d..86d48d3 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/objectvalidprops/impl/ObjectValidPropertiesFacetImpl.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/objectvalidprops/impl/ObjectValidPropertiesFacetImpl.java
@@ -46,7 +46,7 @@ public class ObjectValidPropertiesFacetImpl extends ObjectValidPropertiesFacetAb
final ObjectValidityContext context) {
final StringBuilder buf = new StringBuilder();
final ObjectAdapter adapter = context.getTarget();
- for (final ObjectAssociation property : adapter.getSpecification().getAssociations(Contributed.EXCLUDED, ObjectAssociation.Filters.PROPERTIES)) {
+ for (final ObjectAssociation property : adapter.getSpecification().getAssociations(Contributed.EXCLUDED, ObjectAssociation.Predicates.PROPERTIES)) {
// ignore hidden properties
if (property.isVisible(adapter, context.getInitiatedBy(), where).isVetoed()) {
continue;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureRepositoryDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureRepositoryDefault.java
index 158c033..5c323e6 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureRepositoryDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureRepositoryDefault.java
@@ -134,8 +134,8 @@ public class ApplicationFeatureRepositoryDefault implements ApplicationFeatureRe
return;
}
- final List<ObjectAssociation> properties = spec.getAssociations(Contributed.INCLUDED, ObjectAssociation.Filters.PROPERTIES);
- final List<ObjectAssociation> collections = spec.getAssociations(Contributed.INCLUDED, ObjectAssociation.Filters.COLLECTIONS);
+ final List<ObjectAssociation> properties = spec.getAssociations(Contributed.INCLUDED, ObjectAssociation.Predicates.PROPERTIES);
+ final List<ObjectAssociation> collections = spec.getAssociations(Contributed.INCLUDED, ObjectAssociation.Predicates.COLLECTIONS);
final List<ObjectAction> actions = spec.getObjectActions(Contributed.INCLUDED);
if (properties.isEmpty() && collections.isEmpty() && actions.isEmpty()) {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridSystemServiceAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridSystemServiceAbstract.java
index c4baf66..1f52d55 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridSystemServiceAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridSystemServiceAbstract.java
@@ -359,11 +359,11 @@ public abstract class GridSystemServiceAbstract<G extends Grid> implements GridS
protected static List<OneToOneAssociation> getOneToOneAssociations(final ObjectSpecification objectSpec) {
- List associations = objectSpec.getAssociations(Contributed.INCLUDED, ObjectAssociation.Filters.PROPERTIES);
+ List associations = objectSpec.getAssociations(Contributed.INCLUDED, ObjectAssociation.Predicates.PROPERTIES);
return associations;
}
protected static List<OneToManyAssociation> getOneToManyAssociations(final ObjectSpecification objectSpec) {
- List associations = objectSpec.getAssociations(Contributed.INCLUDED, ObjectAssociation.Filters.COLLECTIONS);
+ List associations = objectSpec.getAssociations(Contributed.INCLUDED, ObjectAssociation.Predicates.COLLECTIONS);
return associations;
}
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 44b342a..66b9a4a 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
@@ -100,7 +100,7 @@ public class MetaModelServiceDefault implements MetaModelService3 {
if (exclude(spec)) {
continue;
}
- final List<ObjectAssociation> properties = spec.getAssociations(Contributed.EXCLUDED, ObjectAssociation.Filters.PROPERTIES);
+ final List<ObjectAssociation> properties = spec.getAssociations(Contributed.EXCLUDED, ObjectAssociation.Predicates.PROPERTIES);
for (final ObjectAssociation property : properties) {
final OneToOneAssociation otoa = (OneToOneAssociation) property;
if (exclude(otoa)) {
@@ -108,7 +108,7 @@ public class MetaModelServiceDefault implements MetaModelService3 {
}
rows.add(new DomainMemberDefault(spec, otoa));
}
- final List<ObjectAssociation> associations = spec.getAssociations(Contributed.EXCLUDED, ObjectAssociation.Filters.COLLECTIONS);
+ final List<ObjectAssociation> associations = spec.getAssociations(Contributed.EXCLUDED, ObjectAssociation.Predicates.COLLECTIONS);
for (final ObjectAssociation collection : associations) {
final OneToManyAssociation otma = (OneToManyAssociation) collection;
if (exclude(otma)) {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/swagger/internal/Util.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/swagger/internal/Util.java
index 544d66b..97a7b24 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/swagger/internal/Util.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/swagger/internal/Util.java
@@ -104,13 +104,13 @@ public final class Util {
static List<OneToOneAssociation> propertiesOf(
final ObjectSpecification objectSpecification,
final SwaggerService.Visibility visibility) {
- return associationsOf(objectSpecification, ObjectAssociation.Filters.PROPERTIES, visibility);
+ return associationsOf(objectSpecification, ObjectAssociation.Predicates.PROPERTIES, visibility);
}
static List<OneToManyAssociation> collectionsOf(
final ObjectSpecification objectSpecification,
final SwaggerService.Visibility visibility) {
- return associationsOf(objectSpecification, ObjectAssociation.Filters.COLLECTIONS, visibility);
+ return associationsOf(objectSpecification, ObjectAssociation.Predicates.COLLECTIONS, visibility);
}
static <T extends ObjectAssociation> List<T> associationsOf(
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAssociation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAssociation.java
index a6f15e4..bf50085 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAssociation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAssociation.java
@@ -156,44 +156,10 @@ public interface ObjectAssociation extends ObjectMember, CurrentHolder {
// //////////////////////////////////////////////////////
public static class Predicates {
- private Predicates(){}
-
- public static com.google.common.base.Predicate being(final Contributed contributed) {
- return new com.google.common.base.Predicate<ObjectAssociation>(){
- @Override
- public boolean apply(final ObjectAssociation t) {
- return contributed.isIncluded() ||
- !(t instanceof ContributeeMember);
- }
- };
- }
-
-
-
- public static final com.google.common.base.Predicate enabled(
- final ObjectAdapter adapter,
- final InteractionInitiatedBy interactionInitiatedBy,
- final Where where) {
- return Predicates.enabled(adapter,
- interactionInitiatedBy, where
- );
- }
-
- }
-
- // //////////////////////////////////////////////////////
- // Filters
- // //////////////////////////////////////////////////////
-
- public static class Filters {
-
- private Filters() {
- }
-
/**
* Filters only fields that are for properties (ie 1:1 associations)
*
- * @deprecated -use {@link com.google.common.base.Predicate equivalent}
+ * @deprecated -use {@link Predicate equivalent}
*/
@Deprecated
public final static Predicate<ObjectAssociation> PROPERTIES = new Predicate<ObjectAssociation>() {
@@ -202,25 +168,23 @@ public interface ObjectAssociation extends ObjectMember, CurrentHolder {
return association.isOneToOneAssociation();
}
};
-
/**
* Filters only fields that are for reference properties (ie 1:1 associations)
*
- * @deprecated -use {@link com.google.common.base.Predicate equivalent}
+ * @deprecated -use {@link Predicate equivalent}
*/
@Deprecated
public final static Predicate<ObjectAssociation> REFERENCE_PROPERTIES = new Predicate<ObjectAssociation>() {
@Override
public boolean apply(final ObjectAssociation association) {
- return association.isOneToOneAssociation() &&
+ return association.isOneToOneAssociation() &&
!association.getSpecification().containsDoOpFacet(ValueFacet.class);
}
};
-
/**
* Filters only fields that are for properties (ie 1:1 associations)
*
- * @deprecated -use {@link com.google.common.base.Predicate equivalent}
+ * @deprecated -use {@link Predicate equivalent}
*/
@Deprecated
public final static Predicate<ObjectAssociation> WHERE_VISIBLE_IN_COLLECTION_TABLE = new Predicate<ObjectAssociation>() {
@@ -230,11 +194,10 @@ public interface ObjectAssociation extends ObjectMember, CurrentHolder {
return hiddenFacet == null || !hiddenFacet.where().inParentedTable();
}
};
-
/**
* Filters only fields that are for properties (ie 1:1 associations)
*
- * @deprecated -use {@link com.google.common.base.Predicate equivalent}
+ * @deprecated -use {@link Predicate equivalent}
*/
@Deprecated
public final static Predicate<ObjectAssociation> WHERE_VISIBLE_IN_STANDALONE_TABLE = new Predicate<ObjectAssociation>() {
@@ -244,11 +207,10 @@ public interface ObjectAssociation extends ObjectMember, CurrentHolder {
return hiddenFacet == null || !hiddenFacet.where().inStandaloneTable();
}
};
-
/**
* Returns all fields (that is, filters out nothing).
*
- * @deprecated -use {@link com.google.common.base.Predicate equivalent}
+ * @deprecated -use {@link Predicate equivalent}
*/
@Deprecated
public final static Predicate<ObjectAssociation> ALL = new Predicate<ObjectAssociation>() {
@@ -257,11 +219,10 @@ public interface ObjectAssociation extends ObjectMember, CurrentHolder {
return true;
}
};
-
/**
* Filters only fields that are for collections (ie 1:m associations)
*
- * @deprecated -use {@link com.google.common.base.Predicate equivalent}
+ * @deprecated -use {@link Predicate equivalent}
*/
@Deprecated
public final static Predicate<ObjectAssociation> COLLECTIONS = new Predicate<ObjectAssociation>() {
@@ -270,12 +231,11 @@ public interface ObjectAssociation extends ObjectMember, CurrentHolder {
return property.isOneToManyAssociation();
}
};
-
/**
* Filters only properties that are visible statically, ie have not been
* unconditionally hidden at compile time.
*
- * @deprecated -use {@link com.google.common.base.Predicate equivalent}
+ * @deprecated -use {@link Predicate equivalent}
*/
@Deprecated
public static final Predicate<ObjectAssociation> VISIBLE_AT_LEAST_SOMETIMES = new Predicate<ObjectAssociation>() {
@@ -286,6 +246,29 @@ public interface ObjectAssociation extends ObjectMember, CurrentHolder {
}
};
+ private Predicates(){}
+
+ public static com.google.common.base.Predicate being(final Contributed contributed) {
+ return new com.google.common.base.Predicate<ObjectAssociation>(){
+ @Override
+ public boolean apply(final ObjectAssociation t) {
+ return contributed.isIncluded() ||
+ !(t instanceof ContributeeMember);
+ }
+ };
+ }
+
+
+
+ public static final com.google.common.base.Predicate enabled(
+ final ObjectAdapter adapter,
+ final InteractionInitiatedBy interactionInitiatedBy,
+ final Where where) {
+ return Predicates.enabled(adapter,
+ interactionInitiatedBy, where
+ );
+ }
+
public static final Predicate<ObjectAssociation> staticallyVisible(final Where where) {
return new Predicate<ObjectAssociation>() {
@Override
@@ -307,7 +290,7 @@ public interface ObjectAssociation extends ObjectMember, CurrentHolder {
}
/**
- * @deprecated -use {@link com.google.common.base.Predicate equivalent}
+ * @deprecated -use {@link Predicate equivalent}
*/
@Deprecated
public static Predicate<ObjectAssociation> dynamicallyVisible(
@@ -322,6 +305,16 @@ public interface ObjectAssociation extends ObjectMember, CurrentHolder {
}
};
}
+ }
+
+ // //////////////////////////////////////////////////////
+ // Filters
+ // //////////////////////////////////////////////////////
+
+ public static class Filters {
+
+ private Filters() {
+ }
/**
* @deprecated -use {@link com.google.common.base.Predicate equivalent}
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 0ed5e4f..21dcac5 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
@@ -717,14 +717,14 @@ public abstract class ObjectSpecificationAbstract extends FacetHolderImpl implem
@SuppressWarnings({ "rawtypes", "unchecked" })
@Override
public List<OneToOneAssociation> getProperties(Contributed contributed) {
- final List list = getAssociations(contributed, ObjectAssociation.Filters.PROPERTIES);
+ final List list = getAssociations(contributed, ObjectAssociation.Predicates.PROPERTIES);
return list;
}
@Override
@SuppressWarnings({ "unchecked", "rawtypes" })
public List<OneToManyAssociation> getCollections(Contributed contributed) {
- final List list = getAssociations(contributed, ObjectAssociation.Filters.COLLECTIONS);
+ final List list = getAssociations(contributed, ObjectAssociation.Predicates.COLLECTIONS);
return list;
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/prop/column/BigDecimalDerivedFromJdoColumnAnnotationFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/prop/column/BigDecimalDerivedFromJdoColumnAnnotationFacetFactory.java
index 3ac2c15..33190a8 100644
--- a/core/metamodel/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/prop/column/BigDecimalDerivedFromJdoColumnAnnotationFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/prop/column/BigDecimalDerivedFromJdoColumnAnnotationFacetFactory.java
@@ -124,7 +124,7 @@ public class BigDecimalDerivedFromJdoColumnAnnotationFacetFactory extends FacetF
return;
}
- final List<ObjectAssociation> associations = objectSpec.getAssociations(Contributed.EXCLUDED, ObjectAssociation.Filters.PROPERTIES);
+ final List<ObjectAssociation> associations = objectSpec.getAssociations(Contributed.EXCLUDED, ObjectAssociation.Predicates.PROPERTIES);
for (ObjectAssociation association : associations) {
// skip checks if annotated with JDO @NotPersistent
diff --git a/core/metamodel/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/prop/column/MandatoryFromJdoColumnAnnotationFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/prop/column/MandatoryFromJdoColumnAnnotationFacetFactory.java
index 9799c7b..0ecbe73 100644
--- a/core/metamodel/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/prop/column/MandatoryFromJdoColumnAnnotationFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/prop/column/MandatoryFromJdoColumnAnnotationFacetFactory.java
@@ -133,7 +133,7 @@ public class MandatoryFromJdoColumnAnnotationFacetFactory extends FacetFactoryAb
return;
}
- final List<ObjectAssociation> associations = objectSpec.getAssociations(Contributed.EXCLUDED, ObjectAssociation.Filters.PROPERTIES);
+ final List<ObjectAssociation> associations = objectSpec.getAssociations(Contributed.EXCLUDED, ObjectAssociation.Predicates.PROPERTIES);
for (ObjectAssociation association : associations) {
// skip checks if annotated with JDO @NotPersistent
diff --git a/core/metamodel/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/prop/column/MaxLengthDerivedFromJdoColumnAnnotationFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/prop/column/MaxLengthDerivedFromJdoColumnAnnotationFacetFactory.java
index ddce1f0..d261e88 100644
--- a/core/metamodel/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/prop/column/MaxLengthDerivedFromJdoColumnAnnotationFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/prop/column/MaxLengthDerivedFromJdoColumnAnnotationFacetFactory.java
@@ -107,7 +107,7 @@ public class MaxLengthDerivedFromJdoColumnAnnotationFacetFactory extends FacetFa
return;
}
- final List<ObjectAssociation> associations = objectSpec.getAssociations(Contributed.EXCLUDED, ObjectAssociation.Filters.PROPERTIES);
+ final List<ObjectAssociation> associations = objectSpec.getAssociations(Contributed.EXCLUDED, ObjectAssociation.Predicates.PROPERTIES);
for (ObjectAssociation association : associations) {
// skip checks if annotated with JDO @NotPersistent
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureRepositoryDefaultTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureRepositoryDefaultTest.java
index d09c5e2..e81b08f 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureRepositoryDefaultTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureRepositoryDefaultTest.java
@@ -123,10 +123,10 @@ public class ApplicationFeatureRepositoryDefaultTest {
allowing(mockSpec).getFullIdentifier();
will(returnValue(Bar.class.getName()));
- allowing(mockSpec).getAssociations(with(Contributed.INCLUDED), with(ObjectAssociation.Filters.PROPERTIES));
+ allowing(mockSpec).getAssociations(with(Contributed.INCLUDED), with(ObjectAssociation.Predicates.PROPERTIES));
will(returnValue(properties));
- allowing(mockSpec).getAssociations(with(Contributed.INCLUDED), with(ObjectAssociation.Filters.COLLECTIONS));
+ allowing(mockSpec).getAssociations(with(Contributed.INCLUDED), with(ObjectAssociation.Predicates.COLLECTIONS));
will(returnValue(collections));
allowing(mockSpec).getFacet(HiddenFacet.class);
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 77a6505..dc767b3 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
@@ -131,7 +131,7 @@ public class ObjectSpecificationStub extends FacetHolderImpl implements ObjectSp
@SuppressWarnings("unchecked")
public List<OneToOneAssociation> getProperties(final Contributed contributed) {
@SuppressWarnings("rawtypes")
- final List list = getAssociations(Contributed.EXCLUDED, ObjectAssociation.Filters.PROPERTIES);
+ final List list = getAssociations(Contributed.EXCLUDED, ObjectAssociation.Predicates.PROPERTIES);
return new ArrayList<OneToOneAssociation>(list);
}
@@ -139,7 +139,7 @@ public class ObjectSpecificationStub extends FacetHolderImpl implements ObjectSp
@SuppressWarnings("unchecked")
public List<OneToManyAssociation> getCollections(final Contributed contributed) {
@SuppressWarnings("rawtypes")
- final List list = getAssociations(Contributed.EXCLUDED, ObjectAssociation.Filters.COLLECTIONS);
+ final List list = getAssociations(Contributed.EXCLUDED, ObjectAssociation.Predicates.COLLECTIONS);
return new ArrayList<>(list);
}
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/changes/ChangedObjectsServiceInternal.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/changes/ChangedObjectsServiceInternal.java
index 2a82ea3..b917f98 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/changes/ChangedObjectsServiceInternal.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/changes/ChangedObjectsServiceInternal.java
@@ -94,7 +94,7 @@ public class ChangedObjectsServiceInternal implements WithTransactionScope {
enlistForPublishing(adapter, PublishingChangeKind.CREATE);
- for (ObjectAssociation property : adapter.getSpecification().getAssociations(Contributed.EXCLUDED, ObjectAssociation.Filters.PROPERTIES)) {
+ for (ObjectAssociation property : adapter.getSpecification().getAssociations(Contributed.EXCLUDED, ObjectAssociation.Predicates.PROPERTIES)) {
final AdapterAndProperty aap = AdapterAndProperty.of(adapter, property);
if(property.isNotPersisted()) {
continue;
@@ -128,7 +128,7 @@ public class ChangedObjectsServiceInternal implements WithTransactionScope {
enlistForPublishing(adapter, PublishingChangeKind.UPDATE);
- for (ObjectAssociation property : adapter.getSpecification().getAssociations(Contributed.EXCLUDED, ObjectAssociation.Filters.PROPERTIES)) {
+ for (ObjectAssociation property : adapter.getSpecification().getAssociations(Contributed.EXCLUDED, ObjectAssociation.Predicates.PROPERTIES)) {
final AdapterAndProperty aap = AdapterAndProperty.of(adapter, property);
if(property.isNotPersisted()) {
continue;
@@ -165,7 +165,7 @@ public class ChangedObjectsServiceInternal implements WithTransactionScope {
return;
}
- for (ObjectAssociation property : adapter.getSpecification().getAssociations(Contributed.EXCLUDED, ObjectAssociation.Filters.PROPERTIES)) {
+ for (ObjectAssociation property : adapter.getSpecification().getAssociations(Contributed.EXCLUDED, ObjectAssociation.Predicates.PROPERTIES)) {
final AdapterAndProperty aap = AdapterAndProperty.of(adapter, property);
if(property.isNotPersisted()) {
continue;
diff --git a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/ObjectAdapterUpdateHelper.java b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/ObjectAdapterUpdateHelper.java
index 0548ce4..acfb370 100644
--- a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/ObjectAdapterUpdateHelper.java
+++ b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/ObjectAdapterUpdateHelper.java
@@ -61,7 +61,7 @@ public class ObjectAdapterUpdateHelper {
final Intent intent) {
final ObjectSpecification objectSpec = objectAdapter.getSpecification();
- final List<ObjectAssociation> properties = objectSpec.getAssociations(Contributed.EXCLUDED, ObjectAssociation.Filters.PROPERTIES);
+ final List<ObjectAssociation> properties = objectSpec.getAssociations(Contributed.EXCLUDED, ObjectAssociation.Predicates.PROPERTIES);
boolean allOk = true;
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkTreeNode.java b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkTreeNode.java
index 0188fa6..102a664 100644
--- a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkTreeNode.java
+++ b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkTreeNode.java
@@ -202,7 +202,7 @@ public class BookmarkTreeNode implements Serializable {
if(candidateBookmarkableModel instanceof EntityModel) {
EntityModel entityModel = (EntityModel) candidateBookmarkableModel;
final ObjectAdapter candidateAdapter = entityModel.getObject();
- final List<ObjectAssociation> properties = candidateAdapter.getSpecification().getAssociations(Contributed.EXCLUDED, ObjectAssociation.Filters.REFERENCE_PROPERTIES);
+ final List<ObjectAssociation> properties = candidateAdapter.getSpecification().getAssociations(Contributed.EXCLUDED, ObjectAssociation.Predicates.REFERENCE_PROPERTIES);
for (ObjectAssociation objectAssoc : properties) {
final ObjectAdapter possibleParentAdapter = objectAssoc.get(candidateAdapter, InteractionInitiatedBy.USER);
if(possibleParentAdapter == null) {
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java
index af55f98..5188ca6 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java
@@ -182,7 +182,7 @@ public class CollectionContentsAsAjaxTablePanel
@SuppressWarnings("unchecked")
final Predicate<ObjectAssociation> predicate = com.google.common.base.Predicates
- .and(ObjectAssociation.Filters.PROPERTIES, new Predicate<ObjectAssociation>() {
+ .and(ObjectAssociation.Predicates.PROPERTIES, new Predicate<ObjectAssociation>() {
@Override
public boolean apply(final ObjectAssociation association) {
final List<Facet> facets = association.getFacets(new Predicate<Facet>() {
--
To stop receiving notification emails like this one, please contact
"commits@isis.apache.org" <co...@isis.apache.org>.