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:37 UTC
[isis] 13/38: ISIS-1742: deletes applib.filter.Predicates,
inlines usages
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 fa4d43e6b42d2816a01aa388dd51dcc200a2de49
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Thu Oct 12 21:58:21 2017 +0100
ISIS-1742: deletes applib.filter.Predicates, inlines usages
---
.../org/apache/isis/applib/filter/Predicates.java | 37 ----------------------
.../isis/core/metamodel/facetapi/FacetFilters.java | 3 +-
.../core/metamodel/facets/ImperativeFacet.java | 4 +--
.../annotprop/MemberGroupLayoutFacetFactory.java | 7 ++--
.../metamodel/services/swagger/internal/Util.java | 5 +--
.../core/metamodel/spec/feature/ObjectAction.java | 14 ++++----
.../metamodel/spec/feature/ObjectAssociation.java | 23 +++++++-------
.../spec/feature/ObjectAssociationContainer.java | 2 +-
.../specimpl/dflt/ObjectSpecificationDefault.java | 4 +--
.../metamodel/facetapi/FacetPredicatesTest.java | 20 ++++++------
10 files changed, 40 insertions(+), 79 deletions(-)
diff --git a/core/applib/src/main/java/org/apache/isis/applib/filter/Predicates.java b/core/applib/src/main/java/org/apache/isis/applib/filter/Predicates.java
deleted file mode 100644
index bc124e0..0000000
--- a/core/applib/src/main/java/org/apache/isis/applib/filter/Predicates.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.isis.applib.filter;
-
-import com.google.common.base.Predicate;
-
-/**
- * @deprecated - use {@link com.google.common.base.Predicate} and {@link com.google.common.base.Predicates} instead.
- */
-@Deprecated
-public final class Predicates {
-
- private Predicates() {
- }
-
- public final static <T> Predicate<T> anyOfType(final Class<T> clazz) {
- return com.google.common.base.Predicates.alwaysTrue();
- }
-
-}
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 2d6a2e1..e9c1597 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,6 @@
package org.apache.isis.core.metamodel.facetapi;
import com.google.common.base.Predicate;
-import org.apache.isis.applib.filter.Predicates;
public final class FacetFilters {
@@ -30,7 +29,7 @@ public final class FacetFilters {
/**
* {@link Predicate <Facet>#accept(Facet) Accepts} everything.
*/
- public static final Predicate<Facet> ANY = Predicates.anyOfType(Facet.class);
+ public static final Predicate<Facet> ANY = com.google.common.base.Predicates.alwaysTrue();
/**
* {@link Predicate <Facet>#accept(Facet) Accepts} nothing.
*/
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 9b1b417..9de9160 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.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(Predicates.anyOfType(Facet.class));
+ final List<Facet> allFacets = member.getFacets(com.google.common.base.Predicates.<Facet>alwaysTrue());
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 169de10..1376564 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
@@ -21,8 +21,6 @@ package org.apache.isis.core.metamodel.facets.object.membergroups.annotprop;
import java.util.List;
-import com.google.common.base.Predicate;
-
import org.apache.isis.applib.annotation.MemberGroupLayout;
import org.apache.isis.applib.annotation.MemberGroupLayout.ColumnSpans;
import org.apache.isis.applib.annotation.Where;
@@ -113,9 +111,10 @@ public class MemberGroupLayoutFacetFactory extends FacetFactoryAbstract implemen
@SuppressWarnings("unchecked")
private int numCollectionsOf(ObjectSpecification objectSpec) {
List<ObjectAssociation> objectCollections = objectSpec.getAssociations(
- Contributed.EXCLUDED, com.google.common.base.Predicates.and(new Predicate<ObjectAssociation>[] {
+ Contributed.EXCLUDED, com.google.common.base.Predicates.and(
ObjectAssociation.Filters.staticallyVisible(Where.OBJECT_FORMS),
- ObjectAssociation.Filters.COLLECTIONS }));
+ ObjectAssociation.Filters.COLLECTIONS )
+ );
return objectCollections.size();
}
};
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 b0729b4..544d66b 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
@@ -120,8 +120,9 @@ public final class Util {
final List<ObjectAssociation> list =
objectSpecification.getAssociations(
Contributed.INCLUDED,
- com.google.common.base.Predicates.and(new Predicate<ObjectAssociation>[] { associationPredicate,
- associationsWith(visibility) }));
+ com.google.common.base.Predicates.and(
+ associationPredicate,
+ associationsWith(visibility) ));
return cast(list);
}
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 e3c604c..7c7db4c 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
@@ -381,32 +381,32 @@ public interface ObjectAction extends ObjectMember {
final ObjectAdapter target,
final InteractionInitiatedBy interactionInitiatedBy,
final Where where) {
- return org.apache.isis.applib.filter.Predicates.dynamicallyVisible(target, interactionInitiatedBy, where);
+ return Predicates.dynamicallyVisible(target, interactionInitiatedBy, where);
}
public static com.google.common.base.Predicate withId(final String actionId) {
- return org.apache.isis.applib.filter.Predicates.withId(actionId);
+ return Predicates.withId(actionId);
}
public static com.google.common.base.Predicate withNoValidationRules() {
- return org.apache.isis.applib.filter.Predicates.withNoValidationRules();
+ return Predicates.withNoValidationRules();
}
public static com.google.common.base.Predicate ofType(final ActionType type) {
- return org.apache.isis.applib.filter.Predicates.ofType(type);
+ return Predicates.ofType(type);
}
public static com.google.common.base.Predicate bulk() {
- return org.apache.isis.applib.filter.Predicates.bulk();
+ return Predicates.bulk();
}
// UNUSED?
public static com.google.common.base.Predicate notBulkOnly() {
- return org.apache.isis.applib.filter.Predicates.notBulkOnly();
+ return Predicates.notBulkOnly();
}
public static com.google.common.base.Predicate memberOrderOf(ObjectAssociation association) {
- return org.apache.isis.applib.filter.Predicates.memberOrderOf(association);
+ return Predicates.memberOrderOf(association);
}
}
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 fff3932..ddcee16 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
@@ -25,13 +25,12 @@ import java.util.List;
import java.util.Map;
import com.google.common.base.Function;
+import com.google.common.base.Predicate;
import com.google.common.base.Strings;
import com.google.common.collect.Lists;
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;
@@ -173,54 +172,54 @@ 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.Predicates.PROPERTIES;
+ 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.Predicates.REFERENCE_PROPERTIES;
+ 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.Predicates.WHERE_VISIBLE_IN_COLLECTION_TABLE;
+ 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.Predicates.WHERE_VISIBLE_IN_STANDALONE_TABLE;
+ 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.Predicates.ALL;
+ 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.Predicates.COLLECTIONS;
+ 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.Predicates.VISIBLE_AT_LEAST_SOMETIMES;
+ Predicates.VISIBLE_AT_LEAST_SOMETIMES;
public static final com.google.common.base.Predicate staticallyVisible(final Where context) {
- return org.apache.isis.applib.filter.Predicates.staticallyVisible(context);
+ return 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.Predicates.dynamicallyVisible(target,
+ return Predicates.dynamicallyVisible(target,
interactionInitiatedBy, where
);
}
@@ -229,7 +228,7 @@ public interface ObjectAssociation extends ObjectMember, CurrentHolder {
final ObjectAdapter adapter,
final InteractionInitiatedBy interactionInitiatedBy,
final Where where) {
- return org.apache.isis.applib.filter.Predicates.enabled(adapter,
+ return 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 4a4e318..6a62ebf 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.Predicates;
+
import org.apache.isis.core.metamodel.spec.ObjectSpecificationException;
public interface ObjectAssociationContainer {
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 1644e00..720fdfd 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.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;
@@ -371,7 +371,7 @@ public class ObjectSpecificationDefault extends ObjectSpecificationAbstract impl
}
private void cataloguePropertiesAndCollections(final Map<Method, ObjectMember> membersByMethod) {
- final Predicate<ObjectAssociation> noop = Predicates.anyOfType(ObjectAssociation.class);
+ final Predicate<ObjectAssociation> noop = com.google.common.base.Predicates.alwaysTrue();
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/FacetPredicatesTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facetapi/FacetPredicatesTest.java
index fc0c230..22b8c2f 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
@@ -19,10 +19,10 @@
package org.apache.isis.core.metamodel.facetapi;
-import junit.framework.TestCase;
-
import com.google.common.base.Predicate;
+import junit.framework.TestCase;
+
public class FacetPredicatesTest extends TestCase {
public class FooSuperFacet extends FacetAbstract {
@@ -97,49 +97,49 @@ public class FacetPredicatesTest extends TestCase {
public void testAndTrueTrue() {
final Predicate<Facet> and = com.google.common.base.Predicates
- .and(new Predicate<Facet>[] { FacetFilters.ANY, FacetFilters.ANY });
+ .and(FacetFilters.ANY, FacetFilters.ANY );
assertTrue(and.apply(fooFacet));
}
public void testAndTrueFalse() {
final Predicate<Facet> and = com.google.common.base.Predicates
- .and(new Predicate<Facet>[] { FacetFilters.ANY, FacetFilters.NONE });
+ .and(FacetFilters.ANY, FacetFilters.NONE );
assertFalse(and.apply(fooFacet));
}
public void testAndFalseTrue() {
final Predicate<Facet> and = com.google.common.base.Predicates
- .and(new Predicate<Facet>[] { FacetFilters.NONE, FacetFilters.ANY });
+ .and(FacetFilters.NONE, FacetFilters.ANY );
assertFalse(and.apply(fooFacet));
}
public void testAndFalseFalse() {
final Predicate<Facet> and = com.google.common.base.Predicates
- .and(new Predicate<Facet>[] { FacetFilters.NONE, FacetFilters.NONE });
+ .and(FacetFilters.NONE, FacetFilters.NONE );
assertFalse(and.apply(fooFacet));
}
public void testOrTrueTrue() {
final Predicate<Facet> or = com.google.common.base.Predicates
- .or(new Predicate<Facet>[] { FacetFilters.ANY, FacetFilters.ANY });
+ .or(FacetFilters.ANY, FacetFilters.ANY );
assertTrue(or.apply(fooFacet));
}
public void testOrTrueFalse() {
final Predicate<Facet> or = com.google.common.base.Predicates
- .or(new Predicate<Facet>[] { FacetFilters.ANY, FacetFilters.NONE });
+ .or(FacetFilters.ANY, FacetFilters.NONE );
assertTrue(or.apply(fooFacet));
}
public void testorFalseTrue() {
final Predicate<Facet> or = com.google.common.base.Predicates
- .or(new Predicate<Facet>[] { FacetFilters.NONE, FacetFilters.ANY });
+ .or(FacetFilters.NONE, FacetFilters.ANY );
assertTrue(or.apply(fooFacet));
}
public void testOrFalseFalse() {
final Predicate<Facet> or = com.google.common.base.Predicates
- .and(new Predicate<Facet>[] { FacetFilters.NONE, FacetFilters.NONE });
+ .and(FacetFilters.NONE, FacetFilters.NONE );
assertFalse(or.apply(fooFacet));
}
--
To stop receiving notification emails like this one, please contact
"commits@isis.apache.org" <co...@isis.apache.org>.