ignite-454 jdk8 compatibility fixes
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/1c72f34b Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1c72f34b Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1c72f34b Branch: refs/heads/ignite-454 Commit: 1c72f34bcc42bf989dc4fc23f3d6a45785ae92e4 Parents: bbcf98c Author: avinogradov <avinogra...@gridgain.com> Authored: Thu Mar 19 17:55:42 2015 +0300 Committer: avinogradov <avinogra...@gridgain.com> Committed: Thu Mar 19 17:55:42 2015 +0300 ---------------------------------------------------------------------- .../datagrid/CacheContinuousQueryExample.java | 3 ++- .../cache/IgniteCacheEntryEventFilter.java | 27 ++++++++++++++++++++ .../ignite/cache/query/ContinuousQuery.java | 7 ++--- .../ignite/events/CacheQueryExecutedEvent.java | 7 ++--- .../ignite/events/CacheQueryReadEvent.java | 10 +++----- .../CacheDataStructuresManager.java | 2 +- .../CacheContinuousQueryFilterEx.java | 4 +-- .../continuous/CacheContinuousQueryHandler.java | 10 +++----- .../continuous/CacheContinuousQueryManager.java | 18 ++++++------- .../IgniteCacheEntryListenerAbstractTest.java | 13 +++++----- ...ridCacheContinuousQueryAbstractSelfTest.java | 4 +-- .../GridContinuousOperationsLoadTest.java | 3 ++- 12 files changed, 68 insertions(+), 40 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1c72f34b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheContinuousQueryExample.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheContinuousQueryExample.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheContinuousQueryExample.java index d1db86b..dd13769 100644 --- a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheContinuousQueryExample.java +++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheContinuousQueryExample.java @@ -18,6 +18,7 @@ package org.apache.ignite.examples.datagrid; import org.apache.ignite.*; +import org.apache.ignite.cache.*; import org.apache.ignite.cache.query.*; import org.apache.ignite.lang.*; @@ -78,7 +79,7 @@ public class CacheContinuousQueryExample { // This filter will be evaluated remotely on all nodes. // Entry that pass this filter will be sent to the caller. - qry.setRemoteFilter(new CacheEntryEventFilter<Integer, String>() { + qry.setRemoteFilter(new IgniteCacheEntryEventFilter<Integer, String>() { @Override public boolean evaluate(CacheEntryEvent<? extends Integer, ? extends String> e) { return e.getKey() > 10; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1c72f34b/modules/core/src/main/java/org/apache/ignite/cache/IgniteCacheEntryEventFilter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/IgniteCacheEntryEventFilter.java b/modules/core/src/main/java/org/apache/ignite/cache/IgniteCacheEntryEventFilter.java new file mode 100644 index 0000000..67a8f3c --- /dev/null +++ b/modules/core/src/main/java/org/apache/ignite/cache/IgniteCacheEntryEventFilter.java @@ -0,0 +1,27 @@ +/* + * 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.ignite.cache; + +import javax.cache.event.*; +import java.io.*; + +/** + * This filter adds {@link Serializable} interface to {@link javax.cache.event.CacheEntryEventFilter} object. + */ +public interface IgniteCacheEntryEventFilter<K, V> extends CacheEntryEventFilter<K, V>, Serializable { +} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1c72f34b/modules/core/src/main/java/org/apache/ignite/cache/query/ContinuousQuery.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/query/ContinuousQuery.java b/modules/core/src/main/java/org/apache/ignite/cache/query/ContinuousQuery.java index 169c4be..aebe5a4 100644 --- a/modules/core/src/main/java/org/apache/ignite/cache/query/ContinuousQuery.java +++ b/modules/core/src/main/java/org/apache/ignite/cache/query/ContinuousQuery.java @@ -18,6 +18,7 @@ package org.apache.ignite.cache.query; import org.apache.ignite.*; +import org.apache.ignite.cache.*; import javax.cache.event.*; @@ -129,7 +130,7 @@ public final class ContinuousQuery<K, V> extends Query<ContinuousQuery<K,V>> { private CacheEntryUpdatedListener<K, V> locLsnr; /** Remote filter. */ - private CacheEntryEventFilter<K, V> rmtFilter; + private IgniteCacheEntryEventFilter<K, V> rmtFilter; /** Buffer size. */ private int bufSize = DFLT_BUF_SIZE; @@ -205,7 +206,7 @@ public final class ContinuousQuery<K, V> extends Query<ContinuousQuery<K,V>> { * @param rmtFilter Key-value filter. * @return {@code this} for chaining. */ - public ContinuousQuery<K, V> setRemoteFilter(CacheEntryEventFilter<K, V> rmtFilter) { + public ContinuousQuery<K, V> setRemoteFilter(IgniteCacheEntryEventFilter<K, V> rmtFilter) { this.rmtFilter = rmtFilter; return this; @@ -216,7 +217,7 @@ public final class ContinuousQuery<K, V> extends Query<ContinuousQuery<K,V>> { * * @return Remote filter. */ - public CacheEntryEventFilter<K, V> getRemoteFilter() { + public IgniteCacheEntryEventFilter<K, V> getRemoteFilter() { return rmtFilter; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1c72f34b/modules/core/src/main/java/org/apache/ignite/events/CacheQueryExecutedEvent.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/events/CacheQueryExecutedEvent.java b/modules/core/src/main/java/org/apache/ignite/events/CacheQueryExecutedEvent.java index 397ae8c..799ad91 100644 --- a/modules/core/src/main/java/org/apache/ignite/events/CacheQueryExecutedEvent.java +++ b/modules/core/src/main/java/org/apache/ignite/events/CacheQueryExecutedEvent.java @@ -17,6 +17,7 @@ package org.apache.ignite.events; +import org.apache.ignite.cache.*; import org.apache.ignite.cluster.*; import org.apache.ignite.internal.processors.cache.query.*; import org.apache.ignite.lang.*; @@ -84,7 +85,7 @@ public class CacheQueryExecutedEvent<K, V> extends EventAdapter { /** Continuous query filter. */ @GridToStringInclude - private final CacheEntryEventFilter<K, V> contQryFilter; + private final IgniteCacheEntryEventFilter<K, V> contQryFilter; /** Query arguments. */ @GridToStringInclude @@ -117,7 +118,7 @@ public class CacheQueryExecutedEvent<K, V> extends EventAdapter { @Nullable String clsName, @Nullable String clause, @Nullable IgniteBiPredicate<K, V> scanQryFilter, - @Nullable CacheEntryEventFilter<K, V> contQryFilter, + @Nullable IgniteCacheEntryEventFilter<K, V> contQryFilter, @Nullable Object[] args, @Nullable UUID subjId, @Nullable String taskName) { @@ -194,7 +195,7 @@ public class CacheQueryExecutedEvent<K, V> extends EventAdapter { * * @return Continuous query filter. */ - @Nullable public CacheEntryEventFilter<K, V> continuousQueryFilter() { + @Nullable public IgniteCacheEntryEventFilter<K, V> continuousQueryFilter() { return contQryFilter; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1c72f34b/modules/core/src/main/java/org/apache/ignite/events/CacheQueryReadEvent.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/events/CacheQueryReadEvent.java b/modules/core/src/main/java/org/apache/ignite/events/CacheQueryReadEvent.java index a972386..4920443 100644 --- a/modules/core/src/main/java/org/apache/ignite/events/CacheQueryReadEvent.java +++ b/modules/core/src/main/java/org/apache/ignite/events/CacheQueryReadEvent.java @@ -17,16 +17,14 @@ package org.apache.ignite.events; +import org.apache.ignite.cache.*; import org.apache.ignite.cluster.*; import org.apache.ignite.internal.processors.cache.query.*; import org.apache.ignite.lang.*; -import org.apache.ignite.internal.processors.cache.query.*; import org.apache.ignite.internal.util.tostring.*; import org.apache.ignite.internal.util.typedef.internal.*; -import org.apache.ignite.lang.*; import org.jetbrains.annotations.*; -import javax.cache.event.*; import java.util.*; /** @@ -86,7 +84,7 @@ public class CacheQueryReadEvent<K, V> extends EventAdapter { /** Continuous query filter. */ @GridToStringInclude - private final CacheEntryEventFilter<K, V> contQryFilter; + private final IgniteCacheEntryEventFilter<K, V> contQryFilter; /** Query arguments. */ @GridToStringInclude @@ -137,7 +135,7 @@ public class CacheQueryReadEvent<K, V> extends EventAdapter { @Nullable String clsName, @Nullable String clause, @Nullable IgniteBiPredicate<K, V> scanQryFilter, - @Nullable CacheEntryEventFilter<K, V> contQryFilter, + @Nullable IgniteCacheEntryEventFilter<K, V> contQryFilter, @Nullable Object[] args, @Nullable UUID subjId, @Nullable String taskName, @@ -222,7 +220,7 @@ public class CacheQueryReadEvent<K, V> extends EventAdapter { * * @return Continuous query filter. */ - @Nullable public CacheEntryEventFilter<K, V> continuousQueryFilter() { + @Nullable public IgniteCacheEntryEventFilter<K, V> continuousQueryFilter() { return contQryFilter; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1c72f34b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/CacheDataStructuresManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/CacheDataStructuresManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/CacheDataStructuresManager.java index 755ed7d..175b3fd 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/CacheDataStructuresManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/CacheDataStructuresManager.java @@ -531,7 +531,7 @@ public class CacheDataStructuresManager extends GridCacheManagerAdapter { /** * Predicate for queue continuous query. */ - private static class QueueHeaderPredicate<K, V> implements CacheEntryEventFilter<K, V>, + private static class QueueHeaderPredicate<K, V> implements IgniteCacheEntryEventFilter<K, V>, Externalizable { /** */ private static final long serialVersionUID = 0L; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1c72f34b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFilterEx.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFilterEx.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFilterEx.java index 897f481..3f2ff15 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFilterEx.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFilterEx.java @@ -18,12 +18,12 @@ package org.apache.ignite.internal.processors.cache.query.continuous; -import javax.cache.event.*; +import org.apache.ignite.cache.*; /** * Extended continuous query filter. */ -public interface CacheContinuousQueryFilterEx<K, V> extends CacheEntryEventFilter<K, V> { +public interface CacheContinuousQueryFilterEx<K, V> extends IgniteCacheEntryEventFilter<K, V> { /** * Callback for query unregister event. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1c72f34b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryHandler.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryHandler.java index 6269eca..03aa12d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryHandler.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryHandler.java @@ -18,15 +18,13 @@ package org.apache.ignite.internal.processors.cache.query.continuous; import org.apache.ignite.*; +import org.apache.ignite.cache.*; import org.apache.ignite.cluster.*; import org.apache.ignite.events.*; import org.apache.ignite.internal.*; import org.apache.ignite.internal.processors.cache.*; import org.apache.ignite.internal.processors.cache.query.*; -import org.apache.ignite.lang.*; import org.apache.ignite.internal.managers.deployment.*; -import org.apache.ignite.internal.processors.cache.*; -import org.apache.ignite.internal.processors.cache.query.*; import org.apache.ignite.internal.processors.continuous.*; import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.internal.util.typedef.internal.*; @@ -56,7 +54,7 @@ class CacheContinuousQueryHandler<K, V> implements GridContinuousHandler { private transient CacheEntryUpdatedListener<K, V> locLsnr; /** Remote filter. */ - private CacheEntryEventFilter<K, V> rmtFilter; + private IgniteCacheEntryEventFilter<K, V> rmtFilter; /** Deployable object for filter. */ private DeployableObject rmtFilterDep; @@ -108,7 +106,7 @@ class CacheContinuousQueryHandler<K, V> implements GridContinuousHandler { String cacheName, Object topic, CacheEntryUpdatedListener<K, V> locLsnr, - CacheEntryEventFilter<K, V> rmtFilter, + IgniteCacheEntryEventFilter<K, V> rmtFilter, boolean internal, boolean notifyExisting, boolean oldValRequired, @@ -413,7 +411,7 @@ class CacheContinuousQueryHandler<K, V> implements GridContinuousHandler { if (b) rmtFilterDep = (DeployableObject)in.readObject(); else - rmtFilter = (CacheEntryEventFilter<K, V>)in.readObject(); + rmtFilter = (IgniteCacheEntryEventFilter<K, V>)in.readObject(); internal = in.readBoolean(); notifyExisting = in.readBoolean(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1c72f34b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java index acc17cb..8e72790 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java @@ -251,7 +251,7 @@ public class CacheContinuousQueryManager extends GridCacheManagerAdapter { * @return Continuous routine ID. * @throws IgniteCheckedException In case of error. */ - public UUID executeQuery(CacheEntryUpdatedListener locLsnr, CacheEntryEventFilter rmtFilter, + public UUID executeQuery(CacheEntryUpdatedListener locLsnr, IgniteCacheEntryEventFilter rmtFilter, int bufSize, long timeInterval, boolean autoUnsubscribe, ClusterGroup grp) throws IgniteCheckedException { return executeQuery0( locLsnr, @@ -276,7 +276,7 @@ public class CacheContinuousQueryManager extends GridCacheManagerAdapter { * @throws IgniteCheckedException In case of error. */ public UUID executeInternalQuery(CacheEntryUpdatedListener<?, ?> locLsnr, - CacheEntryEventFilter rmtFilter, + IgniteCacheEntryEventFilter rmtFilter, boolean loc, boolean notifyExisting) throws IgniteCheckedException @@ -358,7 +358,7 @@ public class CacheContinuousQueryManager extends GridCacheManagerAdapter { * @return Continuous routine ID. * @throws IgniteCheckedException In case of error. */ - private UUID executeQuery0(CacheEntryUpdatedListener locLsnr, final CacheEntryEventFilter rmtFilter, + private UUID executeQuery0(CacheEntryUpdatedListener locLsnr, final IgniteCacheEntryEventFilter rmtFilter, int bufSize, long timeInterval, boolean autoUnsubscribe, boolean internal, boolean notifyExisting, boolean oldValRequired, boolean sync, boolean ignoreExpired, ClusterGroup grp) throws IgniteCheckedException { cctx.checkSecurity(GridSecurityPermission.CACHE_READ); @@ -575,8 +575,8 @@ public class CacheContinuousQueryManager extends GridCacheManagerAdapter { locLsnrImpl, cctx.kernalContext().cache().jcache(cctx.name())); - CacheEntryEventFilter rmtFilter = new JCacheQueryRemoteFilter( - cfg.getCacheEntryEventFilterFactory() != null ? (CacheEntryEventFilter)cfg.getCacheEntryEventFilterFactory().create() : null, + IgniteCacheEntryEventFilter rmtFilter = new JCacheQueryRemoteFilter( + cfg.getCacheEntryEventFilterFactory() != null ? (IgniteCacheEntryEventFilter)cfg.getCacheEntryEventFilterFactory().create() : null, types); routineId = executeQuery0( @@ -695,12 +695,12 @@ public class CacheContinuousQueryManager extends GridCacheManagerAdapter { /** */ - private static class JCacheQueryRemoteFilter implements CacheEntryEventFilter, Externalizable { + private static class JCacheQueryRemoteFilter implements IgniteCacheEntryEventFilter, Externalizable { /** */ private static final long serialVersionUID = 0L; /** */ - private CacheEntryEventFilter impl; + private IgniteCacheEntryEventFilter impl; /** */ private byte types; @@ -720,7 +720,7 @@ public class CacheContinuousQueryManager extends GridCacheManagerAdapter { * @param impl Filter. * @param types Types. */ - JCacheQueryRemoteFilter(CacheEntryEventFilter impl, byte types) { + JCacheQueryRemoteFilter(IgniteCacheEntryEventFilter impl, byte types) { assert types != 0; this.impl = impl; @@ -748,7 +748,7 @@ public class CacheContinuousQueryManager extends GridCacheManagerAdapter { /** {@inheritDoc} */ @SuppressWarnings("unchecked") @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException { - impl = (CacheEntryEventFilter)in.readObject(); + impl = (IgniteCacheEntryEventFilter)in.readObject(); types = in.readByte(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1c72f34b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerAbstractTest.java index 66892ea..ad0912d 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerAbstractTest.java @@ -18,6 +18,7 @@ package org.apache.ignite.internal.processors.cache; import org.apache.ignite.*; +import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.apache.ignite.internal.*; import org.apache.ignite.internal.processors.continuous.*; @@ -122,8 +123,8 @@ public abstract class IgniteCacheEntryListenerAbstractTest extends IgniteCacheAb return new CreateUpdateRemoveExpireListener(); } }, - new Factory<CacheEntryEventFilter<? super Integer, ? super Integer>>() { - @Override public CacheEntryEventFilter<? super Integer, ? super Integer> create() { + new Factory<IgniteCacheEntryEventFilter<? super Integer, ? super Integer>>() { + @Override public IgniteCacheEntryEventFilter<? super Integer, ? super Integer> create() { return new ExceptionFilter(); } }, @@ -936,9 +937,9 @@ public abstract class IgniteCacheEntryListenerAbstractTest extends IgniteCacheAb /** * */ - static class TestFilterFactory implements Factory<CacheEntryEventFilter<Integer, Integer>> { + static class TestFilterFactory implements Factory<IgniteCacheEntryEventFilter<Integer, Integer>> { /** {@inheritDoc} */ - @Override public CacheEntryEventFilter<Integer, Integer> create() { + @Override public IgniteCacheEntryEventFilter<Integer, Integer> create() { return new TestFilter(); } } @@ -946,7 +947,7 @@ public abstract class IgniteCacheEntryListenerAbstractTest extends IgniteCacheAb /** * */ - static class TestFilter implements CacheEntryEventFilter<Integer, Integer> { + static class TestFilter implements IgniteCacheEntryEventFilter<Integer, Integer> { /** {@inheritDoc} */ @Override public boolean evaluate(CacheEntryEvent<? extends Integer, ? extends Integer> evt) { assert evt != null; @@ -1023,7 +1024,7 @@ public abstract class IgniteCacheEntryListenerAbstractTest extends IgniteCacheAb /** * */ - static class ExceptionFilter implements CacheEntryEventFilter<Integer, Integer> { + static class ExceptionFilter implements IgniteCacheEntryEventFilter<Integer, Integer> { /** {@inheritDoc} */ @Override public boolean evaluate(CacheEntryEvent<? extends Integer, ? extends Integer> evt) { throw new RuntimeException("Test filter error."); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1c72f34b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java index b19a6ca..266083e 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java @@ -344,7 +344,7 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo } }); - qry.setRemoteFilter(new CacheEntryEventFilter<Integer,Integer>() { + qry.setRemoteFilter(new IgniteCacheEntryEventFilter<Integer,Integer>() { @Override public boolean evaluate(CacheEntryEvent<? extends Integer,? extends Integer> evt) { return evt.getKey() > 2; @@ -955,7 +955,7 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo } }); - qry.setRemoteFilter(new CacheEntryEventFilter<Integer, Integer>() { + qry.setRemoteFilter(new IgniteCacheEntryEventFilter<Integer, Integer>() { @Override public boolean evaluate(CacheEntryEvent<? extends Integer, ? extends Integer> evt) { return evt.getValue() >= 50; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1c72f34b/modules/core/src/test/java/org/apache/ignite/loadtests/continuous/GridContinuousOperationsLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/continuous/GridContinuousOperationsLoadTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/continuous/GridContinuousOperationsLoadTest.java index fb0c2d8..e757e20 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/continuous/GridContinuousOperationsLoadTest.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/continuous/GridContinuousOperationsLoadTest.java @@ -18,6 +18,7 @@ package org.apache.ignite.loadtests.continuous; import org.apache.ignite.*; +import org.apache.ignite.cache.*; import org.apache.ignite.cache.query.*; import org.apache.ignite.events.*; import org.apache.ignite.internal.*; @@ -113,7 +114,7 @@ public class GridContinuousOperationsLoadTest { } }); - qry.setRemoteFilter(new CacheEntryEventFilter<Object,Object>() { + qry.setRemoteFilter(new IgniteCacheEntryEventFilter<Object,Object>() { @Override public boolean evaluate(CacheEntryEvent<?,?> evt) { if (filterSleepMs > 0) { try {
