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:47 UTC
[isis] 23/38: ISIS-1742: renames Facet.Filters to Facet.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 5731d22ce4b45ffabc4c356272c2debd6fb9c802
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Mon Oct 16 10:29:32 2017 +0100
ISIS-1742: renames Facet.Filters to Facet.Predicates
---
.../apache/isis/core/metamodel/facetapi/Facet.java | 6 +++--
.../metamodel/interactions/InteractionUtils.java | 6 ++---
.../core/metamodel/spec/feature/ObjectAction.java | 12 +++++-----
.../metamodel/facetapi/FacetPredicatesTest.java | 28 +++++++++++-----------
4 files changed, 27 insertions(+), 25 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/Facet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/Facet.java
index d32aa49..adc9472 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/Facet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/Facet.java
@@ -96,9 +96,11 @@ public interface Facet {
*/
public boolean alwaysReplace();
- public static final class Filters {
- private Filters() {
+
+ public static final class Predicates {
+
+ private Predicates() {
}
/**
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/InteractionUtils.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/InteractionUtils.java
index 105fb32..c1be6aa 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/InteractionUtils.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/InteractionUtils.java
@@ -33,7 +33,7 @@ public final class InteractionUtils {
public static InteractionResult isVisibleResult(final FacetHolder facetHolder, final VisibilityContext<?> context) {
final InteractionResult result = new InteractionResult(context.createInteractionEvent());
- final List<Facet> facets = facetHolder.getFacets(Facet.Filters.isA(HidingInteractionAdvisor.class));
+ final List<Facet> facets = facetHolder.getFacets(Facet.Predicates.isA(HidingInteractionAdvisor.class));
for (final Facet facet : facets) {
final HidingInteractionAdvisor advisor = (HidingInteractionAdvisor) facet;
result.advise(advisor.hides(context), advisor);
@@ -43,7 +43,7 @@ public final class InteractionUtils {
public static InteractionResult isUsableResult(final FacetHolder facetHolder, final UsabilityContext<?> context) {
final InteractionResult result = new InteractionResult(context.createInteractionEvent());
- final List<Facet> facets = facetHolder.getFacets(Facet.Filters.isA(DisablingInteractionAdvisor.class));
+ final List<Facet> facets = facetHolder.getFacets(Facet.Predicates.isA(DisablingInteractionAdvisor.class));
for (final Facet facet : facets) {
final DisablingInteractionAdvisor advisor = (DisablingInteractionAdvisor) facet;
final String disables = advisor.disables(context);
@@ -54,7 +54,7 @@ public final class InteractionUtils {
public static InteractionResult isValidResult(final FacetHolder facetHolder, final ValidityContext<?> context) {
final InteractionResult result = new InteractionResult(context.createInteractionEvent());
- final List<Facet> facets = facetHolder.getFacets(Facet.Filters.isA(ValidatingInteractionAdvisor.class));
+ final List<Facet> facets = facetHolder.getFacets(Facet.Predicates.isA(ValidatingInteractionAdvisor.class));
for (final Facet facet : facets) {
final ValidatingInteractionAdvisor advisor = (ValidatingInteractionAdvisor) facet;
result.advise(advisor.invalidates(context), advisor);
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 26b904a..20d928b 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,9 +303,9 @@ public interface ObjectAction extends ObjectMember {
@SuppressWarnings({ "unchecked", "deprecation" })
Predicate<ObjectAction> predicate = com.google.common.base.Predicates
- .and(Predicates.memberOrderNotAssociationOf(adapterSpec),
- Predicates.dynamicallyVisible(adapter, InteractionInitiatedBy.USER, Where.ANYWHERE),
- Predicates.notBulkOnly(), Predicates.excludeWizardActions(adapterSpec));
+ .and(ObjectAction.Predicates.memberOrderNotAssociationOf(adapterSpec),
+ ObjectAction.Predicates.dynamicallyVisible(adapter, InteractionInitiatedBy.USER, Where.ANYWHERE),
+ ObjectAction.Predicates.notBulkOnly(), ObjectAction.Predicates.excludeWizardActions(adapterSpec));
final List<ObjectAction> userActions = adapterSpec.getObjectActions(actionType, Contributed.INCLUDED,
predicate);
@@ -343,8 +343,8 @@ public interface ObjectAction extends ObjectMember {
@SuppressWarnings({ "unchecked", "deprecation" })
Predicate<ObjectAction> predicate = com.google.common.base.Predicates
- .and(Predicates.memberOrderOf(association), Predicates.notBulkOnly(),
- Predicates.excludeWizardActions(objectSpecification));
+ .and(ObjectAction.Predicates.memberOrderOf(association), ObjectAction.Predicates.notBulkOnly(),
+ ObjectAction.Predicates.excludeWizardActions(objectSpecification));
final List<ObjectAction> userActions = objectSpecification.getObjectActions(type, Contributed.INCLUDED,
predicate);
@@ -452,7 +452,7 @@ public interface ObjectAction extends ObjectMember {
return new Predicate<ObjectAction>() {
@Override
public boolean apply(final ObjectAction objectAction) {
- final List<Facet> validatingFacets = objectAction.getFacets(Facet.Filters
+ final List<Facet> validatingFacets = objectAction.getFacets(Facet.Predicates
.isA(ValidatingInteractionAdvisor.class));
return validatingFacets.isEmpty();
}
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facetapi/FacetPredicatesTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facetapi/FacetPredicatesTest.java
index f8f9b8d..f627481 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facetapi/FacetPredicatesTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facetapi/FacetPredicatesTest.java
@@ -76,80 +76,80 @@ public class FacetPredicatesTest extends TestCase {
}
public void testIsAWhenIs() {
- final Predicate<Facet> predicate = Facet.Filters.isA(FooFacet.class);
+ final Predicate<Facet> predicate = Facet.Predicates.isA(FooFacet.class);
assertTrue(predicate.apply(fooFacet));
}
public void testIsAWhenIsNot() {
- final Predicate<Facet> predicate = Facet.Filters.isA(FooFacet.class);
+ final Predicate<Facet> predicate = Facet.Predicates.isA(FooFacet.class);
assertFalse(predicate.apply(barFacet));
}
public void testIsAWhenIsSubclass() {
- final Predicate<Facet> predicate = Facet.Filters.isA(FooFacet.class);
+ final Predicate<Facet> predicate = Facet.Predicates.isA(FooFacet.class);
assertTrue(predicate.apply(fooSubFacet));
}
public void testIsAWhenIsNotBecauseASuperclass() {
- final Predicate<Facet> predicate = Facet.Filters.isA(FooFacet.class);
+ final Predicate<Facet> predicate = Facet.Predicates.isA(FooFacet.class);
assertFalse(predicate.apply(fooSuperFacet));
}
public void testAndTrueTrue() {
final Predicate<Facet> and = com.google.common.base.Predicates
- .and(Facet.Filters.ANY, Facet.Filters.ANY );
+ .and(Facet.Predicates.ANY, Facet.Predicates.ANY );
assertTrue(and.apply(fooFacet));
}
public void testAndTrueFalse() {
final Predicate<Facet> and = com.google.common.base.Predicates
- .and(Facet.Filters.ANY, Facet.Filters.NONE );
+ .and(Facet.Predicates.ANY, Facet.Predicates.NONE );
assertFalse(and.apply(fooFacet));
}
public void testAndFalseTrue() {
final Predicate<Facet> and = com.google.common.base.Predicates
- .and(Facet.Filters.NONE, Facet.Filters.ANY );
+ .and(Facet.Predicates.NONE, Facet.Predicates.ANY );
assertFalse(and.apply(fooFacet));
}
public void testAndFalseFalse() {
final Predicate<Facet> and = com.google.common.base.Predicates
- .and(Facet.Filters.NONE, Facet.Filters.NONE );
+ .and(Facet.Predicates.NONE, Facet.Predicates.NONE );
assertFalse(and.apply(fooFacet));
}
public void testOrTrueTrue() {
final Predicate<Facet> or = com.google.common.base.Predicates
- .or(Facet.Filters.ANY, Facet.Filters.ANY );
+ .or(Facet.Predicates.ANY, Facet.Predicates.ANY );
assertTrue(or.apply(fooFacet));
}
public void testOrTrueFalse() {
final Predicate<Facet> or = com.google.common.base.Predicates
- .or(Facet.Filters.ANY, Facet.Filters.NONE );
+ .or(Facet.Predicates.ANY, Facet.Predicates.NONE );
assertTrue(or.apply(fooFacet));
}
public void testorFalseTrue() {
final Predicate<Facet> or = com.google.common.base.Predicates
- .or(Facet.Filters.NONE, Facet.Filters.ANY );
+ .or(Facet.Predicates.NONE, Facet.Predicates.ANY );
assertTrue(or.apply(fooFacet));
}
public void testOrFalseFalse() {
final Predicate<Facet> or = com.google.common.base.Predicates
- .and(Facet.Filters.NONE, Facet.Filters.NONE );
+ .and(Facet.Predicates.NONE, Facet.Predicates.NONE );
assertFalse(or.apply(fooFacet));
}
public void testNotTrue() {
- final Predicate<Facet> not = com.google.common.base.Predicates.not(Facet.Filters.ANY);
+ final Predicate<Facet> not = com.google.common.base.Predicates.not(Facet.Predicates.ANY);
assertFalse(not.apply(fooFacet));
}
public void testNotFalse() {
- final Predicate<Facet> not = com.google.common.base.Predicates.not(Facet.Filters.NONE);
+ final Predicate<Facet> not = com.google.common.base.Predicates.not(Facet.Predicates.NONE);
assertTrue(not.apply(fooFacet));
}
--
To stop receiving notification emails like this one, please contact
"commits@isis.apache.org" <co...@isis.apache.org>.