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:32 UTC
[isis] 08/38: ISIS-1742: globally replaces imports on
applib.filter.Predicate for guava's equiv, deletes applib.filter.Predicate
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 0df1964be0d9d0223416081dc46324a1b2da747c
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Thu Oct 12 21:40:26 2017 +0100
ISIS-1742: globally replaces imports on applib.filter.Predicate for guava's equiv, deletes applib.filter.Predicate
---
.../org/apache/isis/applib/filter/Filters.java | 1 +
.../org/apache/isis/applib/filter/Predicate.java | 49 ----------------------
.../apache/isis/applib/filter/package-info.java | 31 --------------
.../isis/core/metamodel/facetapi/FacetFilters.java | 2 +-
.../isis/core/metamodel/facetapi/FacetHolder.java | 2 +-
.../core/metamodel/facetapi/FacetHolderImpl.java | 2 +-
.../isis/core/metamodel/facetapi/FacetUtil.java | 2 +-
.../core/metamodel/facets/ImperativeFacet.java | 2 +-
.../facets/members/hidden/HiddenFacetAbstract.java | 2 +-
.../metamodel/services/swagger/internal/Util.java | 2 +-
.../core/metamodel/spec/feature/ObjectAction.java | 2 +-
.../spec/feature/ObjectActionContainer.java | 2 +-
.../spec/feature/ObjectActionParameter.java | 2 +-
.../core/metamodel/spec/feature/ObjectActions.java | 2 +-
.../metamodel/spec/feature/ObjectAssociation.java | 2 +-
.../spec/feature/ObjectAssociationContainer.java | 2 +-
.../spec/feature/ObjectAssociationFilters.java | 2 +-
.../specimpl/ObjectActionContributee.java | 2 +-
.../specloader/specimpl/ObjectActionDefault.java | 2 +-
.../specimpl/ObjectActionParameterAbstract.java | 2 +-
.../specloader/specimpl/ObjectMemberAbstract.java | 2 +-
.../specimpl/ObjectSpecificationAbstract.java | 2 +-
.../specimpl/dflt/ObjectSpecificationDefault.java | 2 +-
.../util/JdoPrimaryKeyPropertyPredicate.java | 2 +-
.../core/metamodel/facetapi/FacetFiltersTest.java | 2 +-
.../ObjectAssociationFiltersTest_visibleWhere.java | 2 +-
...ionParameterAbstractTest_getId_and_getName.java | 2 +-
.../testspec/ObjectSpecificationStub.java | 2 +-
.../datanucleus/metamodel/JdoPropertyUtils.java | 2 +-
.../CollectionContentsAsAjaxTablePanel.java | 2 +-
.../CollectionContentsAsSummaryFactory.java | 2 +-
...FactoryDefaultTest_wrappedObject_transient.java | 2 +-
32 files changed, 30 insertions(+), 109 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/Filters.java
index 1e6103a..f8723d5 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/Filters.java
@@ -19,6 +19,7 @@
package org.apache.isis.applib.filter;
+import com.google.common.base.Predicate;
import com.google.common.base.Predicates;
/**
diff --git a/core/applib/src/main/java/org/apache/isis/applib/filter/Predicate.java b/core/applib/src/main/java/org/apache/isis/applib/filter/Predicate.java
deleted file mode 100644
index 76e86fb..0000000
--- a/core/applib/src/main/java/org/apache/isis/applib/filter/Predicate.java
+++ /dev/null
@@ -1,49 +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;
-
-
-/**
- * For use by repository implementations to allow a set of objects returned by a
- * back-end objectstore to be filtered before being returned to the caller.
- *
- * <p>
- * Note that this is different from the pattern or criteria object accepted by
- * some repositories' <tt>findXxx</tt> methods. Such criteria objects are
- * implementation-specific to the configured objectstore and allow it to return
- * an already-filtered set of rows. (For example, a Hibernate-based ObjectStore
- * would accept a representation of a HQL query; an XML-based objectstore might
- * accept an XPath query, etc.)
- *
- * @deprecated - use {@link com.google.common.base.Predicate} instead.
- */
-@Deprecated
-public interface Predicate<T> {
-
- /**
- * Whether or not the supplied pojo meets this criteria.
- *
- * @param t
- * @return <tt>true</tt> if this pojo is acceptable, <tt>false</tt>
- * otherwise.
- */
- public boolean apply(T t);
-
-}
diff --git a/core/applib/src/main/java/org/apache/isis/applib/filter/package-info.java b/core/applib/src/main/java/org/apache/isis/applib/filter/package-info.java
deleted file mode 100644
index 72a319c..0000000
--- a/core/applib/src/main/java/org/apache/isis/applib/filter/package-info.java
+++ /dev/null
@@ -1,31 +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.
- */
-
-/**
- * This package defines a {@link org.apache.isis.applib.filter.Predicate} interface,
- * useful in particular for writing (naive) repositories but also useful
- * more generally.
- *
- * <p>
- * It also defines a supporting {@link org.apache.isis.applib.filter.Filters utility class}
- * which can be used to combine {@link org.apache.isis.applib.filter.Predicate}s.
- *
- * @deprecated
- */
-package org.apache.isis.applib.filter;
\ No newline at end of file
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 a440918..bba7c1a 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
@@ -19,7 +19,7 @@
package org.apache.isis.core.metamodel.facetapi;
-import org.apache.isis.applib.filter.Predicate;
+import com.google.common.base.Predicate;
import org.apache.isis.applib.filter.Filters;
public final class FacetFilters {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/FacetHolder.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/FacetHolder.java
index f8cd861..f6a8580 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/FacetHolder.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/FacetHolder.java
@@ -21,7 +21,7 @@ package org.apache.isis.core.metamodel.facetapi;
import java.util.List;
-import org.apache.isis.applib.filter.Predicate;
+import com.google.common.base.Predicate;
/**
* Anything in the metamodel (which also includes peers in the reflector) that
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/FacetHolderImpl.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/FacetHolderImpl.java
index 9e8a5b9..07e2711 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/FacetHolderImpl.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/FacetHolderImpl.java
@@ -23,7 +23,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.apache.isis.applib.filter.Predicate;
+import com.google.common.base.Predicate;
/**
* For base subclasses or, more likely, to help write tests.
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 9169c70..b0dbc67 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
@@ -26,7 +26,7 @@ import java.util.Map;
import com.google.common.collect.Lists;
-import org.apache.isis.applib.filter.Predicate;
+import com.google.common.base.Predicate;
public final class FacetUtil {
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 94226f8..3747ae1 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
@@ -24,7 +24,7 @@ import java.util.List;
import com.google.common.collect.Lists;
-import org.apache.isis.applib.filter.Predicate;
+import com.google.common.base.Predicate;
import org.apache.isis.applib.filter.Filters;
import org.apache.isis.applib.services.wrapper.WrapperFactory;
import org.apache.isis.core.commons.lang.ObjectExtensions;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/hidden/HiddenFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/hidden/HiddenFacetAbstract.java
index a1405a5..ab7738f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/hidden/HiddenFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/hidden/HiddenFacetAbstract.java
@@ -20,7 +20,7 @@
package org.apache.isis.core.metamodel.facets.members.hidden;
import org.apache.isis.applib.annotation.Where;
-import org.apache.isis.applib.filter.Predicate;
+import com.google.common.base.Predicate;
import org.apache.isis.applib.services.wrapper.events.VisibilityEvent;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facetapi.Facet;
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 88b97fe..0cfeb5f 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
@@ -22,7 +22,7 @@ import java.util.Arrays;
import java.util.Collection;
import java.util.List;
-import org.apache.isis.applib.filter.Predicate;
+import com.google.common.base.Predicate;
import org.apache.isis.applib.filter.Filters;
import org.apache.isis.applib.services.swagger.SwaggerService;
import org.apache.isis.core.metamodel.facets.actcoll.typeof.TypeOfFacet;
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 8bbf0a7..d5539da 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
@@ -21,6 +21,7 @@ import java.util.Collections;
import java.util.Comparator;
import java.util.List;
+import com.google.common.base.Predicate;
import com.google.common.base.Strings;
import com.google.common.collect.Lists;
@@ -30,7 +31,6 @@ import org.apache.isis.applib.annotation.InvokeOn;
import org.apache.isis.applib.annotation.PromptStyle;
import org.apache.isis.applib.annotation.SemanticsOf;
import org.apache.isis.applib.annotation.Where;
-import org.apache.isis.applib.filter.Predicate;
import org.apache.isis.applib.value.Blob;
import org.apache.isis.applib.value.Clob;
import org.apache.isis.core.commons.lang.StringFunctions;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectActionContainer.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectActionContainer.java
index 702c34a..949f8bd 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectActionContainer.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectActionContainer.java
@@ -22,7 +22,7 @@ package org.apache.isis.core.metamodel.spec.feature;
import java.util.List;
import org.apache.isis.applib.Identifier;
-import org.apache.isis.applib.filter.Predicate;
+import com.google.common.base.Predicate;
import org.apache.isis.core.metamodel.spec.ActionType;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectActionParameter.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectActionParameter.java
index e07471e..476c48c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectActionParameter.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectActionParameter.java
@@ -21,7 +21,7 @@ package org.apache.isis.core.metamodel.spec.feature;
import com.google.common.base.Function;
-import org.apache.isis.applib.filter.Predicate;
+import com.google.common.base.Predicate;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.isis.core.metamodel.facets.all.named.NamedFacet;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectActions.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectActions.java
index 71422c3..0a2463d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectActions.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectActions.java
@@ -19,7 +19,7 @@
package org.apache.isis.core.metamodel.spec.feature;
-import org.apache.isis.applib.filter.Predicate;
+import com.google.common.base.Predicate;
/**
* @deprecated
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 861ff4c..7acee4b 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
@@ -30,7 +30,7 @@ import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import org.apache.isis.applib.annotation.Where;
-import org.apache.isis.applib.filter.Predicate;
+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;
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 f408b2d..b0dc748 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
@@ -21,7 +21,7 @@ package org.apache.isis.core.metamodel.spec.feature;
import java.util.List;
-import org.apache.isis.applib.filter.Predicate;
+import com.google.common.base.Predicate;
import org.apache.isis.applib.filter.Filters;
import org.apache.isis.core.metamodel.spec.ObjectSpecificationException;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAssociationFilters.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAssociationFilters.java
index 385c32e..08cf38f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAssociationFilters.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAssociationFilters.java
@@ -20,7 +20,7 @@
package org.apache.isis.core.metamodel.spec.feature;
import org.apache.isis.applib.annotation.Where;
-import org.apache.isis.applib.filter.Predicate;
+import com.google.common.base.Predicate;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionContributee.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionContributee.java
index d961ce8..090adf6 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionContributee.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionContributee.java
@@ -23,7 +23,7 @@ import com.google.common.collect.Lists;
import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.annotation.Where;
-import org.apache.isis.applib.filter.Predicate;
+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;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionDefault.java
index 90e51cb..bad582f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionDefault.java
@@ -34,7 +34,7 @@ import org.apache.isis.applib.RecoverableException;
import org.apache.isis.applib.annotation.InvokedOn;
import org.apache.isis.applib.annotation.SemanticsOf;
import org.apache.isis.applib.annotation.Where;
-import org.apache.isis.applib.filter.Predicate;
+import com.google.common.base.Predicate;
import org.apache.isis.applib.services.command.Command;
import org.apache.isis.core.commons.exceptions.UnknownTypeException;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstract.java
index 07d350e..7102976 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstract.java
@@ -24,7 +24,7 @@ import java.util.List;
import com.google.common.collect.Lists;
import org.apache.isis.applib.Identifier;
-import org.apache.isis.applib.filter.Predicate;
+import com.google.common.base.Predicate;
import org.apache.isis.applib.query.Query;
import org.apache.isis.applib.query.QueryFindAllInstances;
import org.apache.isis.core.commons.lang.ClassExtensions;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectMemberAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectMemberAbstract.java
index e15c3c4..cd4486e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectMemberAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectMemberAbstract.java
@@ -24,7 +24,7 @@ import java.util.Objects;
import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.annotation.Where;
-import org.apache.isis.applib.filter.Predicate;
+import com.google.common.base.Predicate;
import org.apache.isis.applib.services.bookmark.Bookmark;
import org.apache.isis.applib.services.command.Command;
import org.apache.isis.applib.services.command.CommandContext;
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 6a63133..05c1ff3 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
@@ -38,7 +38,7 @@ import org.slf4j.LoggerFactory;
import org.apache.isis.applib.AppManifest;
import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.annotation.Where;
-import org.apache.isis.applib.filter.Predicate;
+import com.google.common.base.Predicate;
import org.apache.isis.applib.filter.Filters;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.commons.exceptions.UnknownTypeException;
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 216714d..0f52465 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
@@ -31,7 +31,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.isis.applib.annotation.NatureOfService;
-import org.apache.isis.applib.filter.Predicate;
+import com.google.common.base.Predicate;
import org.apache.isis.applib.filter.Filters;
import org.apache.isis.core.commons.lang.StringExtensions;
import org.apache.isis.core.commons.util.ToString;
diff --git a/core/metamodel/src/main/java/org/apache/isis/objectstore/jdo/metamodel/util/JdoPrimaryKeyPropertyPredicate.java b/core/metamodel/src/main/java/org/apache/isis/objectstore/jdo/metamodel/util/JdoPrimaryKeyPropertyPredicate.java
index 6def7a5..6906cc4 100644
--- a/core/metamodel/src/main/java/org/apache/isis/objectstore/jdo/metamodel/util/JdoPrimaryKeyPropertyPredicate.java
+++ b/core/metamodel/src/main/java/org/apache/isis/objectstore/jdo/metamodel/util/JdoPrimaryKeyPropertyPredicate.java
@@ -21,7 +21,7 @@ package org.apache.isis.objectstore.jdo.metamodel.util;
import javax.jdo.annotations.PrimaryKey;
-import org.apache.isis.applib.filter.Predicate;
+import com.google.common.base.Predicate;
import org.apache.isis.core.metamodel.facets.propcoll.accessor.PropertyOrCollectionAccessorFacet;
import org.apache.isis.core.metamodel.facets.properties.update.modify.PropertySetterFacet;
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
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/FacetFiltersTest.java
index 5bb0445..925523b 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/FacetFiltersTest.java
@@ -21,7 +21,7 @@ package org.apache.isis.core.metamodel.facetapi;
import junit.framework.TestCase;
-import org.apache.isis.applib.filter.Predicate;
+import com.google.common.base.Predicate;
import org.apache.isis.applib.filter.Filters;
public class FacetFiltersTest extends TestCase {
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/ObjectAssociationFiltersTest_visibleWhere.java
index 8a847cd..0d9af55 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/ObjectAssociationFiltersTest_visibleWhere.java
@@ -36,7 +36,7 @@ import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
import org.apache.isis.applib.annotation.Where;
-import org.apache.isis.applib.filter.Predicate;
+import com.google.common.base.Predicate;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facets.all.hide.HiddenFacet;
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstractTest_getId_and_getName.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstractTest_getId_and_getName.java
index a8e0a14..c5b46ec 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstractTest_getId_and_getName.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstractTest_getId_and_getName.java
@@ -27,7 +27,7 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.apache.isis.applib.filter.Predicate;
+import com.google.common.base.Predicate;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
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 7b833f9..77a6505 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
@@ -26,7 +26,7 @@ import java.util.List;
import com.google.common.collect.Lists;
import org.apache.isis.applib.Identifier;
-import org.apache.isis.applib.filter.Predicate;
+import com.google.common.base.Predicate;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.commons.config.IsisConfigurationDefault;
import org.apache.isis.core.commons.exceptions.IsisException;
diff --git a/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/metamodel/JdoPropertyUtils.java b/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/metamodel/JdoPropertyUtils.java
index 42016c7..47e51b5 100644
--- a/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/metamodel/JdoPropertyUtils.java
+++ b/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/metamodel/JdoPropertyUtils.java
@@ -23,7 +23,7 @@ import java.util.List;
import javax.jdo.annotations.PrimaryKey;
-import org.apache.isis.applib.filter.Predicate;
+import com.google.common.base.Predicate;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.Contributed;
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
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 05ed22a..2a91e25 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
@@ -32,7 +32,7 @@ import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
import org.apache.wicket.model.Model;
import org.apache.isis.applib.annotation.Where;
-import org.apache.isis.applib.filter.Predicate;
+import com.google.common.base.Predicate;
import org.apache.isis.applib.filter.Filters;
import org.apache.isis.applib.layout.component.Grid;
import org.apache.isis.applib.services.tablecol.TableColumnOrderService;
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/summary/CollectionContentsAsSummaryFactory.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/summary/CollectionContentsAsSummaryFactory.java
index 8b7f3a4..5485c02 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/summary/CollectionContentsAsSummaryFactory.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/summary/CollectionContentsAsSummaryFactory.java
@@ -27,7 +27,7 @@ import org.apache.wicket.model.Model;
import org.apache.wicket.model.ResourceModel;
import org.apache.wicket.request.resource.CssResourceReference;
-import org.apache.isis.applib.filter.Predicate;
+import com.google.common.base.Predicate;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.Contributed;
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
diff --git a/core/wrapper/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest_wrappedObject_transient.java b/core/wrapper/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest_wrappedObject_transient.java
index 11bcc4c..69c84b5 100644
--- a/core/wrapper/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest_wrappedObject_transient.java
+++ b/core/wrapper/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest_wrappedObject_transient.java
@@ -36,7 +36,7 @@ import org.apache.isis.applib.annotation.Where;
import org.apache.isis.applib.services.wrapper.events.PropertyModifyEvent;
import org.apache.isis.applib.services.wrapper.events.PropertyUsabilityEvent;
import org.apache.isis.applib.services.wrapper.events.PropertyVisibilityEvent;
-import org.apache.isis.applib.filter.Predicate;
+import com.google.common.base.Predicate;
import org.apache.isis.applib.services.wrapper.DisabledException;
import org.apache.isis.core.commons.authentication.AuthenticationSessionProvider;
import org.apache.isis.core.commons.config.IsisConfiguration;
--
To stop receiving notification emails like this one, please contact
"commits@isis.apache.org" <co...@isis.apache.org>.