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:33 UTC
[isis] 09/38: ISIS-1742: renames applib.filter.Filters to
applib.filter.Predicates;
inlines the "asPredicate" method, which is now just an identity function
(returns its arg)
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 9da6db5330e75eed7ae756cc9fde71d8cb41326d
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Thu Oct 12 21:44:26 2017 +0100
ISIS-1742: renames applib.filter.Filters to applib.filter.Predicates; inlines the "asPredicate" method, which is now just an identity function (returns its arg)
---
.../filter/{Filters.java => Predicates.java} | 16 +++---------
.../isis/core/metamodel/facetapi/FacetFilters.java | 4 +--
.../isis/core/metamodel/facetapi/FacetUtil.java | 4 ++-
.../core/metamodel/facets/ImperativeFacet.java | 4 +--
.../annotprop/MemberGroupLayoutFacetFactory.java | 5 ++--
.../grid/bootstrap3/GridSystemServiceBS3.java | 4 +--
.../metamodel/services/swagger/internal/Util.java | 4 +--
.../core/metamodel/spec/feature/ObjectAction.java | 21 ++++++++--------
.../metamodel/spec/feature/ObjectAssociation.java | 29 +++++++++++-----------
.../spec/feature/ObjectAssociationContainer.java | 4 +--
.../specimpl/ObjectSpecificationAbstract.java | 16 ++++++------
.../specimpl/dflt/ObjectSpecificationDefault.java | 10 ++++----
...etFiltersTest.java => FacetPredicatesTest.java} | 28 ++++++++++-----------
...ectAssociationPredicatesTest_visibleWhere.java} | 4 +--
.../serviceactions/ServiceActionUtil.java | 5 ++--
.../collection/bulk/BulkActionsHelper.java | 8 +++---
.../CollectionContentsAsAjaxTablePanel.java | 6 ++---
17 files changed, 82 insertions(+), 90 deletions(-)
diff --git a/core/applib/src/main/java/org/apache/isis/applib/filter/Filters.java b/core/applib/src/main/java/org/apache/isis/applib/filter/Predicates.java
similarity index 86%
rename from core/applib/src/main/java/org/apache/isis/applib/filter/Filters.java
rename to core/applib/src/main/java/org/apache/isis/applib/filter/Predicates.java
index f8723d5..c8a4677 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/filter/Filters.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/filter/Predicates.java
@@ -20,15 +20,14 @@
package org.apache.isis.applib.filter;
import com.google.common.base.Predicate;
-import com.google.common.base.Predicates;
/**
- * @deprecated - use {@link com.google.common.base.Predicate} and {@link Predicates} instead.
+ * @deprecated - use {@link com.google.common.base.Predicate} and {@link com.google.common.base.Predicates} instead.
*/
@Deprecated
-public final class Filters {
+public final class Predicates {
- private Filters() {
+ private Predicates() {
}
public static <T> Predicate<T> and(final Predicate<T>... predicates) {
@@ -94,13 +93,4 @@ public final class Filters {
return none();
}
- public static <T> com.google.common.base.Predicate asPredicate(final Predicate<T> predicate) {
- return new com.google.common.base.Predicate<T>() {
- @Override
- public boolean apply(T candidate) {
- return predicate.apply(candidate);
- }
- };
- }
-
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/FacetFilters.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/FacetFilters.java
index bba7c1a..2d6a2e1 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/FacetFilters.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/FacetFilters.java
@@ -20,7 +20,7 @@
package org.apache.isis.core.metamodel.facetapi;
import com.google.common.base.Predicate;
-import org.apache.isis.applib.filter.Filters;
+import org.apache.isis.applib.filter.Predicates;
public final class FacetFilters {
@@ -30,7 +30,7 @@ public final class FacetFilters {
/**
* {@link Predicate <Facet>#accept(Facet) Accepts} everything.
*/
- public static final Predicate<Facet> ANY = Filters.anyOfType(Facet.class);
+ public static final Predicate<Facet> ANY = Predicates.anyOfType(Facet.class);
/**
* {@link Predicate <Facet>#accept(Facet) Accepts} nothing.
*/
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/FacetUtil.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/FacetUtil.java
index b0dbc67..51a6d4f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/FacetUtil.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/FacetUtil.java
@@ -28,6 +28,8 @@ import com.google.common.collect.Lists;
import com.google.common.base.Predicate;
+import org.apache.isis.applib.filter.Predicates;
+
public final class FacetUtil {
private FacetUtil() {
@@ -170,7 +172,7 @@ public final class FacetUtil {
final Facet facet = source.getFacet(facetType);
}
- List<Facet> facets = source.getFacets(org.apache.isis.applib.filter.Filters.<Facet>any());
+ List<Facet> facets = source.getFacets(Predicates.<Facet>any());
for (Facet facet : facets) {
target.addFacet(facet);
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/ImperativeFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/ImperativeFacet.java
index 3747ae1..9b1b417 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/ImperativeFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/ImperativeFacet.java
@@ -25,7 +25,7 @@ import java.util.List;
import com.google.common.collect.Lists;
import com.google.common.base.Predicate;
-import org.apache.isis.applib.filter.Filters;
+import org.apache.isis.applib.filter.Predicates;
import org.apache.isis.applib.services.wrapper.WrapperFactory;
import org.apache.isis.core.commons.lang.ObjectExtensions;
import org.apache.isis.core.metamodel.facetapi.DecoratingFacet;
@@ -139,7 +139,7 @@ public interface ImperativeFacet extends Facet {
}
public static Intent getIntent(final ObjectMember member, final Method method) {
- final List<Facet> allFacets = member.getFacets(Filters.anyOfType(Facet.class));
+ final List<Facet> allFacets = member.getFacets(Predicates.anyOfType(Facet.class));
final List<ImperativeFacet> imperativeFacets = Lists.newArrayList();
for (final Facet facet : allFacets) {
final ImperativeFacet imperativeFacet = ImperativeFacet.Util.getImperativeFacet(facet);
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 cf21a5c..3566092 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
@@ -24,7 +24,7 @@ import java.util.List;
import org.apache.isis.applib.annotation.MemberGroupLayout;
import org.apache.isis.applib.annotation.MemberGroupLayout.ColumnSpans;
import org.apache.isis.applib.annotation.Where;
-import org.apache.isis.applib.filter.Filters;
+import org.apache.isis.applib.filter.Predicates;
import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
@@ -112,7 +112,8 @@ public class MemberGroupLayoutFacetFactory extends FacetFactoryAbstract implemen
@SuppressWarnings("unchecked")
private int numCollectionsOf(ObjectSpecification objectSpec) {
List<ObjectAssociation> objectCollections = objectSpec.getAssociations(
- Contributed.EXCLUDED, Filters.and(ObjectAssociation.Filters.staticallyVisible(Where.OBJECT_FORMS), ObjectAssociation.Filters.COLLECTIONS));
+ Contributed.EXCLUDED, Predicates
+ .and(ObjectAssociation.Filters.staticallyVisible(Where.OBJECT_FORMS), ObjectAssociation.Filters.COLLECTIONS));
return objectCollections.size();
}
};
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/bootstrap3/GridSystemServiceBS3.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/bootstrap3/GridSystemServiceBS3.java
index 6d51b2a..19d6419 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/bootstrap3/GridSystemServiceBS3.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/bootstrap3/GridSystemServiceBS3.java
@@ -27,6 +27,7 @@ import java.util.concurrent.atomic.AtomicReference;
import javax.annotation.Nullable;
import com.google.common.base.Function;
+import com.google.common.base.Predicate;
import com.google.common.base.Predicates;
import com.google.common.base.Strings;
import com.google.common.collect.FluentIterable;
@@ -40,7 +41,6 @@ import org.apache.isis.applib.annotation.DomainService;
import org.apache.isis.applib.annotation.MemberGroupLayout;
import org.apache.isis.applib.annotation.NatureOfService;
import org.apache.isis.applib.annotation.Programmatic;
-import org.apache.isis.applib.filter.Filters;
import org.apache.isis.applib.layout.component.ActionLayoutData;
import org.apache.isis.applib.layout.component.ActionLayoutDataOwner;
import org.apache.isis.applib.layout.component.CollectionLayoutData;
@@ -178,7 +178,7 @@ public class GridSystemServiceBS3 extends GridSystemServiceAbstract<BS3Grid> {
ObjectMember.Util.mapById(
FluentIterable
.from(objectSpec.getObjectActions(Contributed.INCLUDED))
- .filter(Filters.asPredicate(ObjectAction.Filters.notBulkOnly()))
+ .filter((Predicate) ObjectAction.Filters.notBulkOnly())
.toList());
final BS3Grid bs3Grid = (BS3Grid) grid;
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 0cfeb5f..0addfeb 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
@@ -23,7 +23,7 @@ import java.util.Collection;
import java.util.List;
import com.google.common.base.Predicate;
-import org.apache.isis.applib.filter.Filters;
+import org.apache.isis.applib.filter.Predicates;
import org.apache.isis.applib.services.swagger.SwaggerService;
import org.apache.isis.core.metamodel.facets.actcoll.typeof.TypeOfFacet;
import org.apache.isis.core.metamodel.spec.ActionType;
@@ -120,7 +120,7 @@ public final class Util {
final List<ObjectAssociation> list =
objectSpecification.getAssociations(
Contributed.INCLUDED,
- Filters.and(
+ Predicates.and(
associationPredicate,
associationsWith(visibility)
));
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAction.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAction.java
index d5539da..e1066dc5 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAction.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAction.java
@@ -303,7 +303,7 @@ public interface ObjectAction extends ObjectMember {
final ObjectSpecification adapterSpec = adapter.getSpecification();
@SuppressWarnings({ "unchecked", "deprecation" })
- Predicate<ObjectAction> predicate = org.apache.isis.applib.filter.Filters.and(
+ Predicate<ObjectAction> predicate = org.apache.isis.applib.filter.Predicates.and(
Filters.memberOrderNotAssociationOf(adapterSpec),
Filters.dynamicallyVisible(adapter, InteractionInitiatedBy.USER, Where.ANYWHERE),
Filters.notBulkOnly(),
@@ -344,7 +344,7 @@ public interface ObjectAction extends ObjectMember {
final ObjectSpecification objectSpecification = adapter.getSpecification();
@SuppressWarnings({ "unchecked", "deprecation" })
- Predicate<ObjectAction> predicate = org.apache.isis.applib.filter.Filters.and(
+ Predicate<ObjectAction> predicate = org.apache.isis.applib.filter.Predicates.and(
Filters.memberOrderOf(association),
// visibility needs to be determined at point of rendering, by ActionLink itself
// Filters.dynamicallyVisible(adapter, InteractionInitiatedBy.USER, Where.ANYWHERE),
@@ -385,33 +385,32 @@ public interface ObjectAction extends ObjectMember {
final ObjectAdapter target,
final InteractionInitiatedBy interactionInitiatedBy,
final Where where) {
- return org.apache.isis.applib.filter.Filters
- .asPredicate(Filters.dynamicallyVisible(target, interactionInitiatedBy, where));
+ return org.apache.isis.applib.filter.Predicates.dynamicallyVisible(target, interactionInitiatedBy, where);
}
public static com.google.common.base.Predicate withId(final String actionId) {
- return org.apache.isis.applib.filter.Filters.asPredicate(Filters.withId(actionId));
+ return org.apache.isis.applib.filter.Predicates.withId(actionId);
}
public static com.google.common.base.Predicate withNoValidationRules() {
- return org.apache.isis.applib.filter.Filters.asPredicate(Filters.withNoValidationRules());
+ return org.apache.isis.applib.filter.Predicates.withNoValidationRules();
}
public static com.google.common.base.Predicate ofType(final ActionType type) {
- return org.apache.isis.applib.filter.Filters.asPredicate(Filters.ofType(type));
+ return org.apache.isis.applib.filter.Predicates.ofType(type);
}
public static com.google.common.base.Predicate bulk() {
- return org.apache.isis.applib.filter.Filters.asPredicate(Filters.bulk());
+ return org.apache.isis.applib.filter.Predicates.bulk();
}
// UNUSED?
public static com.google.common.base.Predicate notBulkOnly() {
- return org.apache.isis.applib.filter.Filters.asPredicate(Filters.notBulkOnly());
+ return org.apache.isis.applib.filter.Predicates.notBulkOnly();
}
public static com.google.common.base.Predicate memberOrderOf(ObjectAssociation association) {
- return org.apache.isis.applib.filter.Filters.asPredicate(Filters.memberOrderOf(association));
+ return org.apache.isis.applib.filter.Predicates.memberOrderOf(association);
}
}
@@ -527,7 +526,7 @@ public interface ObjectAction extends ObjectMember {
}
public static Predicate<ObjectAction> excludeWizardActions(final ObjectSpecification objectSpecification) {
- return org.apache.isis.applib.filter.Filters.not(wizardActions(objectSpecification));
+ return org.apache.isis.applib.filter.Predicates.not(wizardActions(objectSpecification));
// return wizardActions(objectSpecification);
}
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 7acee4b..fff3932 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
@@ -31,6 +31,7 @@ import com.google.common.collect.Maps;
import org.apache.isis.applib.annotation.Where;
import com.google.common.base.Predicate;
+
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.consent.Consent;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
@@ -172,65 +173,65 @@ public interface ObjectAssociation extends ObjectMember, CurrentHolder {
* Only fields that are for properties (ie 1:1 associations)
*/
public final static com.google.common.base.Predicate PROPERTIES =
- org.apache.isis.applib.filter.Filters.asPredicate(Filters.PROPERTIES);
+ org.apache.isis.applib.filter.Predicates.PROPERTIES;
/**
* Only fields that are for reference properties (ie 1:1 associations)
*/
public final static com.google.common.base.Predicate REFERENCE_PROPERTIES =
- org.apache.isis.applib.filter.Filters.asPredicate(Filters.REFERENCE_PROPERTIES);
+ org.apache.isis.applib.filter.Predicates.REFERENCE_PROPERTIES;
/**
* Only fields that are for properties (ie 1:1 associations)
*/
public final static com.google.common.base.Predicate WHERE_VISIBLE_IN_COLLECTION_TABLE =
- org.apache.isis.applib.filter.Filters.asPredicate(Filters.WHERE_VISIBLE_IN_COLLECTION_TABLE);
+ org.apache.isis.applib.filter.Predicates.WHERE_VISIBLE_IN_COLLECTION_TABLE;
/**
* Only fields that are for properties (ie 1:1 associations)
*/
public final static com.google.common.base.Predicate WHERE_VISIBLE_IN_STANDALONE_TABLE =
- org.apache.isis.applib.filter.Filters.asPredicate(Filters.WHERE_VISIBLE_IN_STANDALONE_TABLE);
+ org.apache.isis.applib.filter.Predicates.WHERE_VISIBLE_IN_STANDALONE_TABLE;
/**
* All fields (that is, excludes out nothing).
*/
public final static com.google.common.base.Predicate ALL =
- org.apache.isis.applib.filter.Filters.asPredicate(Filters.ALL);
+ org.apache.isis.applib.filter.Predicates.ALL;
/**
* Only fields that are for collections (ie 1:m associations)
*/
public final static com.google.common.base.Predicate COLLECTIONS =
- org.apache.isis.applib.filter.Filters.asPredicate(Filters.COLLECTIONS);
+ org.apache.isis.applib.filter.Predicates.COLLECTIONS;
/**
* Only properties that are visible statically, ie have not been
* unconditionally hidden at compile time.
*/
public static final com.google.common.base.Predicate VISIBLE_AT_LEAST_SOMETIMES =
- org.apache.isis.applib.filter.Filters.asPredicate(Filters.VISIBLE_AT_LEAST_SOMETIMES);
+ org.apache.isis.applib.filter.Predicates.VISIBLE_AT_LEAST_SOMETIMES;
public static final com.google.common.base.Predicate staticallyVisible(final Where context) {
- return org.apache.isis.applib.filter.Filters.asPredicate(Filters.staticallyVisible(context));
+ return org.apache.isis.applib.filter.Predicates.staticallyVisible(context);
}
public static final com.google.common.base.Predicate dynamicallyVisible(
final ObjectAdapter target,
final InteractionInitiatedBy interactionInitiatedBy,
final Where where) {
- return org.apache.isis.applib.filter.Filters.asPredicate(Filters.dynamicallyVisible(target,
- interactionInitiatedBy, where
- ));
+ return org.apache.isis.applib.filter.Predicates.dynamicallyVisible(target,
+ interactionInitiatedBy, where
+ );
}
public static final com.google.common.base.Predicate enabled(
final ObjectAdapter adapter,
final InteractionInitiatedBy interactionInitiatedBy,
final Where where) {
- return org.apache.isis.applib.filter.Filters.asPredicate(Filters.enabled(adapter,
- interactionInitiatedBy, where
- ));
+ return org.apache.isis.applib.filter.Predicates.enabled(adapter,
+ interactionInitiatedBy, where
+ );
}
}
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 b0dc748..4a4e318 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
@@ -22,7 +22,7 @@ package org.apache.isis.core.metamodel.spec.feature;
import java.util.List;
import com.google.common.base.Predicate;
-import org.apache.isis.applib.filter.Filters;
+import org.apache.isis.applib.filter.Predicates;
import org.apache.isis.core.metamodel.spec.ObjectSpecificationException;
public interface ObjectAssociationContainer {
@@ -56,7 +56,7 @@ public interface ObjectAssociationContainer {
* unauthorised fields have been removed) use
* <tt>ObjectAssociationFilters#staticallyVisible(...)</tt>
*
- * @see Filters
+ * @see Predicates
*/
List<ObjectAssociation> getAssociations(Contributed contributed, Predicate<ObjectAssociation> predicate);
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 05c1ff3..6e384db 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
@@ -39,7 +39,7 @@ import org.apache.isis.applib.AppManifest;
import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.annotation.Where;
import com.google.common.base.Predicate;
-import org.apache.isis.applib.filter.Filters;
+import org.apache.isis.applib.filter.Predicates;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.commons.exceptions.UnknownTypeException;
import org.apache.isis.core.commons.lang.ClassExtensions;
@@ -709,7 +709,7 @@ public abstract class ObjectSpecificationAbstract extends FacetHolderImpl implem
final List<ObjectAssociation> allAssociations = getAssociations(contributed);
return Lists.newArrayList(
FluentIterable.from(allAssociations)
- .filter(Filters.asPredicate(predicate))
+ .filter((Predicate) predicate)
.toSortedList(ObjectMember.Comparators.byMemberOrderSequence())
);
}
@@ -764,7 +764,7 @@ public abstract class ObjectSpecificationAbstract extends FacetHolderImpl implem
final List<ObjectAction> actions = Lists.newArrayList();
for (final ActionType type : types) {
final Collection<ObjectAction> filterActions =
- Collections2.filter(objectActionsByType.get(type), Filters.asPredicate(predicate));
+ Collections2.filter(objectActionsByType.get(type), (Predicate) predicate);
actions.addAll(filterActions);
}
return Lists.newArrayList(
@@ -776,7 +776,7 @@ public abstract class ObjectSpecificationAbstract extends FacetHolderImpl implem
@Override
public List<ObjectAction> getObjectActions(
final Contributed contributed) {
- return getObjectActions(ActionType.ALL, contributed, Filters.<ObjectAction>any());
+ return getObjectActions(ActionType.ALL, contributed, Predicates.<ObjectAction>any());
}
@Override
@@ -882,7 +882,7 @@ public abstract class ObjectSpecificationAbstract extends FacetHolderImpl implem
private List<ObjectAssociation> createContributeeAssociations(final Object servicePojo) {
final Class<?> serviceClass = servicePojo.getClass();
final ObjectSpecification specification = specificationLoader.loadSpecification(serviceClass);
- final List<ObjectAction> serviceActions = specification.getObjectActions(ActionType.USER, Contributed.INCLUDED, Filters
+ final List<ObjectAction> serviceActions = specification.getObjectActions(ActionType.USER, Contributed.INCLUDED, Predicates
.<ObjectAction>any());
final List<ObjectActionDefault> contributedActions = Lists.newArrayList();
@@ -1006,7 +1006,7 @@ public abstract class ObjectSpecificationAbstract extends FacetHolderImpl implem
}
private List objectActionsOf(final ObjectSpecification specification) {
- return specification.getObjectActions(ActionType.ALL, Contributed.INCLUDED, Filters.<ObjectAction>any());
+ return specification.getObjectActions(ActionType.ALL, Contributed.INCLUDED, Predicates.<ObjectAction>any());
}
private Function<ObjectActionDefault, ObjectAssociation> createMixedInAssociationFunctor(
@@ -1066,7 +1066,7 @@ public abstract class ObjectSpecificationAbstract extends FacetHolderImpl implem
return;
}
final List<ObjectAction> contributeeActions = Lists.newArrayList();
- final List<ObjectAction> serviceActions = specification.getObjectActions(ActionType.ALL, Contributed.INCLUDED, Filters
+ final List<ObjectAction> serviceActions = specification.getObjectActions(ActionType.ALL, Contributed.INCLUDED, Predicates
.<ObjectAction>any());
for (final ObjectAction serviceAction : serviceActions) {
if (isAlwaysHidden(serviceAction)) {
@@ -1158,7 +1158,7 @@ public abstract class ObjectSpecificationAbstract extends FacetHolderImpl implem
}
final List<ObjectAction> actions = Lists.newArrayList();
- final List<ObjectAction> mixinActions = mixinSpec.getObjectActions(ActionType.ALL, Contributed.INCLUDED, Filters
+ final List<ObjectAction> mixinActions = mixinSpec.getObjectActions(ActionType.ALL, Contributed.INCLUDED, Predicates
.<ObjectAction>any());
for (final ObjectAction mixinTypeAction : mixinActions) {
if (isAlwaysHidden(mixinTypeAction)) {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/dflt/ObjectSpecificationDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/dflt/ObjectSpecificationDefault.java
index 0f52465..1fb2d76 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/dflt/ObjectSpecificationDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/dflt/ObjectSpecificationDefault.java
@@ -32,7 +32,7 @@ import org.slf4j.LoggerFactory;
import org.apache.isis.applib.annotation.NatureOfService;
import com.google.common.base.Predicate;
-import org.apache.isis.applib.filter.Filters;
+import org.apache.isis.applib.filter.Predicates;
import org.apache.isis.core.commons.lang.StringExtensions;
import org.apache.isis.core.commons.util.ToString;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
@@ -290,21 +290,21 @@ public class ObjectSpecificationDefault extends ObjectSpecificationAbstract impl
@Override
public ObjectAction getObjectAction(final ActionType type, final String id, final List<ObjectSpecification> parameters) {
final List<ObjectAction> actions =
- getObjectActions(type, Contributed.INCLUDED, Filters.<ObjectAction>any());
+ getObjectActions(type, Contributed.INCLUDED, Predicates.<ObjectAction>any());
return firstAction(actions, id, parameters);
}
@Override
public ObjectAction getObjectAction(final ActionType type, final String id) {
final List<ObjectAction> actions =
- getObjectActions(type, Contributed.INCLUDED, Filters.<ObjectAction>any());
+ getObjectActions(type, Contributed.INCLUDED, Predicates.<ObjectAction>any());
return firstAction(actions, id);
}
@Override
public ObjectAction getObjectAction(final String id) {
final List<ObjectAction> actions =
- getObjectActions(ActionType.ALL, Contributed.INCLUDED, Filters.<ObjectAction>any());
+ getObjectActions(ActionType.ALL, Contributed.INCLUDED, Predicates.<ObjectAction>any());
return firstAction(actions, id);
}
@@ -368,7 +368,7 @@ public class ObjectSpecificationDefault extends ObjectSpecificationAbstract impl
}
private void cataloguePropertiesAndCollections(final Map<Method, ObjectMember> membersByMethod) {
- final Predicate<ObjectAssociation> noop = Filters.anyOfType(ObjectAssociation.class);
+ final Predicate<ObjectAssociation> noop = Predicates.anyOfType(ObjectAssociation.class);
final List<ObjectAssociation> fields = getAssociations(Contributed.EXCLUDED, noop);
for (int i = 0; i < fields.size(); i++) {
final ObjectAssociation field = fields.get(i);
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facetapi/FacetFiltersTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facetapi/FacetPredicatesTest.java
similarity index 79%
rename from core/metamodel/src/test/java/org/apache/isis/core/metamodel/facetapi/FacetFiltersTest.java
rename to core/metamodel/src/test/java/org/apache/isis/core/metamodel/facetapi/FacetPredicatesTest.java
index 925523b..0cc24aa 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facetapi/FacetFiltersTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facetapi/FacetPredicatesTest.java
@@ -22,9 +22,9 @@ package org.apache.isis.core.metamodel.facetapi;
import junit.framework.TestCase;
import com.google.common.base.Predicate;
-import org.apache.isis.applib.filter.Filters;
+import org.apache.isis.applib.filter.Predicates;
-public class FacetFiltersTest extends TestCase {
+public class FacetPredicatesTest extends TestCase {
public class FooSuperFacet extends FacetAbstract {
public FooSuperFacet(final Class<? extends Facet> facetType, final FacetHolder holder) {
@@ -97,62 +97,62 @@ public class FacetFiltersTest extends TestCase {
}
public void testAndTrueTrue() {
- final Predicate<Facet> and = Filters.and(FacetFilters.ANY, FacetFilters.ANY);
+ final Predicate<Facet> and = Predicates.and(FacetFilters.ANY, FacetFilters.ANY);
assertTrue(and.apply(fooFacet));
}
public void testAndTrueFalse() {
- final Predicate<Facet> and = Filters.and(FacetFilters.ANY, FacetFilters.NONE);
+ final Predicate<Facet> and = Predicates.and(FacetFilters.ANY, FacetFilters.NONE);
assertFalse(and.apply(fooFacet));
}
public void testAndFalseTrue() {
- final Predicate<Facet> and = Filters.and(FacetFilters.NONE, FacetFilters.ANY);
+ final Predicate<Facet> and = Predicates.and(FacetFilters.NONE, FacetFilters.ANY);
assertFalse(and.apply(fooFacet));
}
public void testAndFalseFalse() {
- final Predicate<Facet> and = Filters.and(FacetFilters.NONE, FacetFilters.NONE);
+ final Predicate<Facet> and = Predicates.and(FacetFilters.NONE, FacetFilters.NONE);
assertFalse(and.apply(fooFacet));
}
public void testOrTrueTrue() {
- final Predicate<Facet> or = Filters.or(FacetFilters.ANY, FacetFilters.ANY);
+ final Predicate<Facet> or = Predicates.or(FacetFilters.ANY, FacetFilters.ANY);
assertTrue(or.apply(fooFacet));
}
public void testOrTrueFalse() {
- final Predicate<Facet> or = Filters.or(FacetFilters.ANY, FacetFilters.NONE);
+ final Predicate<Facet> or = Predicates.or(FacetFilters.ANY, FacetFilters.NONE);
assertTrue(or.apply(fooFacet));
}
public void testorFalseTrue() {
- final Predicate<Facet> or = Filters.or(FacetFilters.NONE, FacetFilters.ANY);
+ final Predicate<Facet> or = Predicates.or(FacetFilters.NONE, FacetFilters.ANY);
assertTrue(or.apply(fooFacet));
}
public void testOrFalseFalse() {
- final Predicate<Facet> or = Filters.and(FacetFilters.NONE, FacetFilters.NONE);
+ final Predicate<Facet> or = Predicates.and(FacetFilters.NONE, FacetFilters.NONE);
assertFalse(or.apply(fooFacet));
}
public void testNotTrue() {
- final Predicate<Facet> not = Filters.not(FacetFilters.ANY);
+ final Predicate<Facet> not = Predicates.not(FacetFilters.ANY);
assertFalse(not.apply(fooFacet));
}
public void testNotFalse() {
- final Predicate<Facet> not = Filters.not(FacetFilters.NONE);
+ final Predicate<Facet> not = Predicates.not(FacetFilters.NONE);
assertTrue(not.apply(fooFacet));
}
public void testAny() {
- final Predicate<Facet> any = Filters.any();
+ final Predicate<Facet> any = Predicates.any();
assertTrue(any.apply(fooFacet));
}
public void testNone() {
- final Predicate<Facet> none = Filters.none();
+ final Predicate<Facet> none = Predicates.none();
assertFalse(none.apply(fooFacet));
}
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/feature/ObjectAssociationFiltersTest_visibleWhere.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/feature/ObjectAssociationPredicatesTest_visibleWhere.java
similarity index 97%
rename from core/metamodel/src/test/java/org/apache/isis/core/metamodel/feature/ObjectAssociationFiltersTest_visibleWhere.java
rename to core/metamodel/src/test/java/org/apache/isis/core/metamodel/feature/ObjectAssociationPredicatesTest_visibleWhere.java
index 0d9af55..39b5795 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/feature/ObjectAssociationFiltersTest_visibleWhere.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/feature/ObjectAssociationPredicatesTest_visibleWhere.java
@@ -47,7 +47,7 @@ import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
@RunWith(Parameterized.class)
-public class ObjectAssociationFiltersTest_visibleWhere {
+public class ObjectAssociationPredicatesTest_visibleWhere {
@Rule
public JUnitRuleMockery2 context = JUnitRuleMockery2.createFor(Mode.INTERFACES_AND_CLASSES);
@@ -92,7 +92,7 @@ public class ObjectAssociationFiltersTest_visibleWhere {
});
}
- public ObjectAssociationFiltersTest_visibleWhere(
+ public ObjectAssociationPredicatesTest_visibleWhere(
final Where where, final Where context, final boolean visible) {
this.where = where;
this.whereContext = context;
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionUtil.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionUtil.java
index 3f01ece..0789d49 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionUtil.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionUtil.java
@@ -19,13 +19,12 @@
package org.apache.isis.viewer.wicket.ui.components.actionmenu.serviceactions;
-import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Set;
import org.apache.isis.applib.annotation.NatureOfService;
-import org.apache.isis.applib.filter.Filters;
+import org.apache.isis.applib.filter.Predicates;
import org.apache.isis.applib.services.i18n.TranslationService;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
@@ -265,7 +264,7 @@ public final class ServiceActionUtil {
}
for (final ObjectAction objectAction : serviceSpec.getObjectActions(
- actionType, Contributed.INCLUDED, Filters.<ObjectAction>any())) {
+ actionType, Contributed.INCLUDED, Predicates.<ObjectAction>any())) {
// skip if annotated to not be included in repository menu using legacy mechanism
if (objectAction.getFacet(NotInServiceMenuFacet.class) != null) {
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/bulk/BulkActionsHelper.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/bulk/BulkActionsHelper.java
index 723f85b..74f7fad 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/bulk/BulkActionsHelper.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/bulk/BulkActionsHelper.java
@@ -26,7 +26,7 @@ import com.google.common.base.Predicate;
import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
-import org.apache.isis.applib.filter.Filters;
+import org.apache.isis.applib.filter.Predicates;
import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
import org.apache.isis.core.metamodel.spec.ActionType;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
@@ -58,11 +58,11 @@ public class BulkActionsHelper implements Serializable {
final ObjectSpecification typeSpec = model.getTypeOfSpecification();
- List<ObjectAction> objectActions = typeSpec.getObjectActions(ActionType.USER, Contributed.INCLUDED, Filters.<ObjectAction>any());
+ List<ObjectAction> objectActions = typeSpec.getObjectActions(ActionType.USER, Contributed.INCLUDED, Predicates.<ObjectAction>any());
final DeploymentCategory deploymentCategory = isisSessionFactory.getDeploymentCategory();
if ( !deploymentCategory.isProduction()) {
- List<ObjectAction> prototypeActions = typeSpec.getObjectActions(ActionType.PROTOTYPE, Contributed.INCLUDED, Filters.<ObjectAction>any());
+ List<ObjectAction> prototypeActions = typeSpec.getObjectActions(ActionType.PROTOTYPE, Contributed.INCLUDED, Predicates.<ObjectAction>any());
objectActions.addAll(prototypeActions);
}
@@ -73,7 +73,7 @@ public class BulkActionsHelper implements Serializable {
@SuppressWarnings("deprecation")
- private static final Predicate<ObjectAction> BULK = Filters.asPredicate(ObjectAction.Filters.bulk());
+ private static final Predicate<ObjectAction> BULK = ObjectAction.Filters.bulk();
/**
* Protected so can be overridden in testing if required.
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 2a91e25..10030ba 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
@@ -33,7 +33,7 @@ import org.apache.wicket.model.Model;
import org.apache.isis.applib.annotation.Where;
import com.google.common.base.Predicate;
-import org.apache.isis.applib.filter.Filters;
+import org.apache.isis.applib.filter.Predicates;
import org.apache.isis.applib.layout.component.Grid;
import org.apache.isis.applib.services.tablecol.TableColumnOrderService;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
@@ -179,7 +179,7 @@ public class CollectionContentsAsAjaxTablePanel
: null;
@SuppressWarnings("unchecked")
- final Predicate<ObjectAssociation> predicate = Filters.and(
+ final Predicate<ObjectAssociation> predicate = Predicates.and(
ObjectAssociation.Filters.PROPERTIES,
ObjectAssociation.Filters.staticallyVisible(whereContext),
associationDoesNotReferenceParent(parentSpecIfAny));
@@ -234,7 +234,7 @@ public class CollectionContentsAsAjaxTablePanel
static Predicate<ObjectAssociation> associationDoesNotReferenceParent(final ObjectSpecification parentSpec) {
if(parentSpec == null) {
- return Filters.any();
+ return Predicates.any();
}
return new Predicate<ObjectAssociation>() {
@Override
--
To stop receiving notification emails like this one, please contact
"commits@isis.apache.org" <co...@isis.apache.org>.