ignite-555 Renamed IgniteCacheEntryEventFilter -> CacheEntryEventSerializableFilter. Also added jdk8 examples testsuit.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/44f667a4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/44f667a4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/44f667a4 Branch: refs/heads/ignite-release-test-no-mod Commit: 44f667a4e012c0068db89212a27461ad2aaecf7e Parents: 37c14ba Author: avinogradov <avinogra...@gridgain.com> Authored: Mon Mar 23 13:28:05 2015 +0300 Committer: avinogradov <avinogra...@gridgain.com> Committed: Mon Mar 23 13:28:28 2015 +0300 ---------------------------------------------------------------------- .../datagrid/CacheContinuousQueryExample.java | 2 +- .../java8/IgniteExamplesJ8SelfTestSuite.java | 43 ------ .../BasicExamplesMultiNodeSelfTest.java | 28 ++++ .../java8/examples/BasicExamplesSelfTest.java | 83 +++++++++++ .../CacheExamplesMultiNodeSelfTest.java | 38 +++++ .../java8/examples/CacheExamplesSelfTest.java | 141 +++++++++++++++++++ .../examples/CheckpointExamplesSelfTest.java | 45 ++++++ .../examples/ClusterGroupExampleSelfTest.java | 39 +++++ .../ContinuationExamplesMultiNodeSelfTest.java | 28 ++++ .../examples/ContinuationExamplesSelfTest.java | 33 +++++ ...ntinuousMapperExamplesMultiNodeSelfTest.java | 28 ++++ .../ContinuousMapperExamplesSelfTest.java | 33 +++++ .../DeploymentExamplesMultiNodeSelfTest.java | 30 ++++ .../examples/DeploymentExamplesSelfTest.java | 33 +++++ .../EventsExamplesMultiNodeSelfTest.java | 28 ++++ .../java8/examples/EventsExamplesSelfTest.java | 33 +++++ ...ibernateL2CacheExampleMultiNodeSelfTest.java | 29 ++++ .../HibernateL2CacheExampleSelfTest.java | 33 +++++ .../java8/examples/IgfsExamplesSelfTest.java | 51 +++++++ .../examples/LifecycleExamplesSelfTest.java | 33 +++++ .../MemcacheRestExamplesMultiNodeSelfTest.java | 31 ++++ .../examples/MemcacheRestExamplesSelfTest.java | 41 ++++++ .../examples/MessagingExamplesSelfTest.java | 53 +++++++ .../MonteCarloExamplesMultiNodeSelfTest.java | 28 ++++ .../examples/MonteCarloExamplesSelfTest.java | 74 ++++++++++ .../examples/SpringBeanExamplesSelfTest.java | 33 +++++ .../examples/TaskExamplesMultiNodeSelfTest.java | 28 ++++ .../java8/examples/TaskExamplesSelfTest.java | 40 ++++++ .../IgniteExamplesJ8SelfTestSuite.java | 73 ++++++++++ .../CacheEntryEventSerializableFilter.java | 28 ++++ .../cache/IgniteCacheEntryEventFilter.java | 28 ---- .../ignite/cache/query/ContinuousQuery.java | 6 +- .../ignite/events/CacheQueryExecutedEvent.java | 7 +- .../ignite/events/CacheQueryReadEvent.java | 6 +- .../CacheDataStructuresManager.java | 2 +- .../CacheContinuousQueryFilterEx.java | 2 +- .../continuous/CacheContinuousQueryHandler.java | 6 +- .../continuous/CacheContinuousQueryManager.java | 12 +- .../IgniteCacheEntryListenerAbstractTest.java | 12 +- ...ridCacheContinuousQueryAbstractSelfTest.java | 6 +- .../GridContinuousOperationsLoadTest.java | 2 +- 41 files changed, 1226 insertions(+), 103 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/44f667a4/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 c12077e..34014c8 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 @@ -82,7 +82,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 IgniteCacheEntryEventFilter<Integer, String>() { + qry.setRemoteFilter(new CacheEntryEventSerializableFilter<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/44f667a4/examples/src/test/java8/org/apache/ignite/examples/java8/IgniteExamplesJ8SelfTestSuite.java ---------------------------------------------------------------------- diff --git a/examples/src/test/java8/org/apache/ignite/examples/java8/IgniteExamplesJ8SelfTestSuite.java b/examples/src/test/java8/org/apache/ignite/examples/java8/IgniteExamplesJ8SelfTestSuite.java deleted file mode 100644 index 9c8e790..0000000 --- a/examples/src/test/java8/org/apache/ignite/examples/java8/IgniteExamplesJ8SelfTestSuite.java +++ /dev/null @@ -1,43 +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.ignite.testsuites; - -import junit.framework.*; -import org.apache.ignite.testframework.*; - -import static org.apache.ignite.IgniteSystemProperties.*; - -/** - * Examples test suite. - * <p> - * Contains only Spring ignite examples tests. - */ -public class IgniteExamplesJ8SelfTestSuite extends TestSuite { - /** - * @return Suite. - * @throws Exception If failed. - */ - public static TestSuite suite() throws Exception { - System.setProperty(IGNITE_OVERRIDE_MCAST_GRP, - GridTestUtils.getNextMulticastGroup(IgniteExamplesJ8SelfTestSuite.class)); - - TestSuite suite = new TestSuite("Ignite Examples Test Suite"); - - return suite; - } -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/44f667a4/examples/src/test/java8/org/apache/ignite/java8/examples/BasicExamplesMultiNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/examples/src/test/java8/org/apache/ignite/java8/examples/BasicExamplesMultiNodeSelfTest.java b/examples/src/test/java8/org/apache/ignite/java8/examples/BasicExamplesMultiNodeSelfTest.java new file mode 100644 index 0000000..bf9c3fb --- /dev/null +++ b/examples/src/test/java8/org/apache/ignite/java8/examples/BasicExamplesMultiNodeSelfTest.java @@ -0,0 +1,28 @@ +/* + * 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.java8.examples; + +/** + * Closure examples multi-node self test. + */ +public class BasicExamplesMultiNodeSelfTest extends BasicExamplesSelfTest { + /** {@inheritDoc} */ + @Override protected void beforeTest() throws Exception { + startRemoteNodes(); + } +} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/44f667a4/examples/src/test/java8/org/apache/ignite/java8/examples/BasicExamplesSelfTest.java ---------------------------------------------------------------------- diff --git a/examples/src/test/java8/org/apache/ignite/java8/examples/BasicExamplesSelfTest.java b/examples/src/test/java8/org/apache/ignite/java8/examples/BasicExamplesSelfTest.java new file mode 100644 index 0000000..aa35b5a --- /dev/null +++ b/examples/src/test/java8/org/apache/ignite/java8/examples/BasicExamplesSelfTest.java @@ -0,0 +1,83 @@ +/* + * 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.java8.examples; + +import org.apache.ignite.examples.java8.computegrid.*; +import org.apache.ignite.examples.java8.datastructures.*; +import org.apache.ignite.testframework.junits.common.*; + +/** + * Closure examples self test. + */ +public class BasicExamplesSelfTest extends GridAbstractExamplesTest { + /** + * @throws Exception If failed. + */ + public void testBroadcastExample() throws Exception { + ComputeBroadcastExample.main(EMPTY_ARGS); + } + + /** + * @throws Exception If failed. + */ + public void testCallableExample() throws Exception { + ComputeCallableExample.main(EMPTY_ARGS); + } + + /** + * @throws Exception If failed. + */ + public void testClosureExample() throws Exception { + ComputeClosureExample.main(EMPTY_ARGS); + } + + /** + * @throws Exception If failed. + */ + public void testExecutorExample() throws Exception { + IgniteExecutorServiceExample.main(EMPTY_ARGS); + } + +// /** +// * @throws Exception If failed. +// */ +// public void testReducerExample() throws Exception { +// ComputeReducerExample.main(EMPTY_ARGS); +// } + + /** + * @throws Exception If failed. + */ + public void testRunnableExample() throws Exception { + ComputeRunnableExample.main(EMPTY_ARGS); + } + +// /** +// * @throws Exception If failed. +// */ +// public void testTaskMapExample() throws Exception { +// ComputeTaskMapExample.main(EMPTY_ARGS); +// } +// +// /** +// * @throws Exception If failed. +// */ +// public void testTaskSplitExample() throws Exception { +// ComputeTaskSplitExample.main(EMPTY_ARGS); +// } +} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/44f667a4/examples/src/test/java8/org/apache/ignite/java8/examples/CacheExamplesMultiNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/examples/src/test/java8/org/apache/ignite/java8/examples/CacheExamplesMultiNodeSelfTest.java b/examples/src/test/java8/org/apache/ignite/java8/examples/CacheExamplesMultiNodeSelfTest.java new file mode 100644 index 0000000..a1d9bcd --- /dev/null +++ b/examples/src/test/java8/org/apache/ignite/java8/examples/CacheExamplesMultiNodeSelfTest.java @@ -0,0 +1,38 @@ +/* + * 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.java8.examples; + +/** + * Cache examples multi-node self test. + */ +public class CacheExamplesMultiNodeSelfTest extends CacheExamplesSelfTest { + /** {@inheritDoc} */ + @Override protected String defaultConfig() { + return "examples/config/example-ignite.xml"; + } + + /** {@inheritDoc} */ + @Override protected void beforeTest() throws Exception { + startRemoteNodes(); + } + + /** {@inheritDoc} */ + @Override protected long getTestTimeout() { + return 10 * 60 * 1000; + } +} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/44f667a4/examples/src/test/java8/org/apache/ignite/java8/examples/CacheExamplesSelfTest.java ---------------------------------------------------------------------- diff --git a/examples/src/test/java8/org/apache/ignite/java8/examples/CacheExamplesSelfTest.java b/examples/src/test/java8/org/apache/ignite/java8/examples/CacheExamplesSelfTest.java new file mode 100644 index 0000000..d7eaf01 --- /dev/null +++ b/examples/src/test/java8/org/apache/ignite/java8/examples/CacheExamplesSelfTest.java @@ -0,0 +1,141 @@ +/* + * 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.java8.examples; + +import org.apache.ignite.examples.java8.datagrid.*; +//import org.apache.ignite.examples.java8.datagrid.starschema.*; +//import org.apache.ignite.examples.java8.datagrid.store.dummy.*; +//import org.apache.ignite.examples.java8.datastructures.*; +import org.apache.ignite.testframework.junits.common.*; + +/** + * Cache examples self test. + */ +public class CacheExamplesSelfTest extends GridAbstractExamplesTest { + /** + * @throws Exception If failed. + */ + public void testCacheAffinityExample() throws Exception { + CacheAffinityExample.main(EMPTY_ARGS); + } + +// /** +// * @throws Exception If failed. +// */ +// public void testCacheAtomicLongExample() throws Exception { +// IgniteAtomicLongExample.main(EMPTY_ARGS); +// } +// +// /** +// * @throws Exception If failed. +// */ +// public void testCacheAtomicReferenceExample() throws Exception { +// IgniteAtomicReferenceExample.main(EMPTY_ARGS); +// } +// +// /** +// * @throws Exception If failed. +// */ +// public void testCacheAtomicSequenceExample() throws Exception { +// IgniteAtomicSequenceExample.main(EMPTY_ARGS); +// } +// +// /** +// * @throws Exception If failed. +// */ +// public void testCacheAtomicStampedExample() throws Exception { +// IgniteAtomicStampedExample.main(EMPTY_ARGS); +// } +// +// /** +// * @throws Exception If failed. +// */ +// public void testCacheCountDownLatchExample() throws Exception { +// IgniteCountDownLatchExample.main(EMPTY_ARGS); +// } +// +// /** +// * @throws Exception If failed. +// */ +// public void testCacheQueueExample() throws Exception { +// IgniteQueueExample.main(EMPTY_ARGS); +// } +// +// /** +// * @throws Exception If failed. +// */ +// public void testCacheSetExample() throws Exception { +// IgniteSetExample.main(EMPTY_ARGS); +// } +// +// /** +// * @throws Exception If failed. +// */ +// public void testCacheDummyStoreExample() throws Exception { +// CacheDummyStoreExample.main(EMPTY_ARGS); +// } +// +// /** +// * @throws Exception If failed. +// */ +// public void testCacheQueryExample() throws Exception { +// CacheQueryExample.main(EMPTY_ARGS); +// } + + /** + * @throws Exception If failed. + */ + public void testCacheApiExample() throws Exception { + CacheApiExample.main(EMPTY_ARGS); + } + +// /** +// * @throws Exception If failed. +// */ +// public void testCacheTransactionExample() throws Exception { +// CacheTransactionExample.main(EMPTY_ARGS); +// } +// +// /** +// * @throws Exception If failed. +// */ +// public void testCacheDataStreamerExample() throws Exception { +// CacheDataStreamerExample.main(EMPTY_ARGS); +// } +// +// /** +// * @throws Exception If failed. +// */ +// public void testCachePutGetExample() throws Exception { +// CachePutGetExample.main(EMPTY_ARGS); +// } +// +// /** +// * @throws Exception If failed. +// */ +// public void testSnowflakeSchemaExample() throws Exception { +// CacheStarSchemaExample.main(EMPTY_ARGS); +// } +// +// /** +// * @throws Exception If failed. +// */ +// public void testCacheContinuousQueryExample() throws Exception { +// CacheContinuousQueryExample.main(EMPTY_ARGS); +// } +} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/44f667a4/examples/src/test/java8/org/apache/ignite/java8/examples/CheckpointExamplesSelfTest.java ---------------------------------------------------------------------- diff --git a/examples/src/test/java8/org/apache/ignite/java8/examples/CheckpointExamplesSelfTest.java b/examples/src/test/java8/org/apache/ignite/java8/examples/CheckpointExamplesSelfTest.java new file mode 100644 index 0000000..3a02a1c --- /dev/null +++ b/examples/src/test/java8/org/apache/ignite/java8/examples/CheckpointExamplesSelfTest.java @@ -0,0 +1,45 @@ +/* + * 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.java8.examples; + +//import org.apache.ignite.examples.java8.computegrid.failover.*; +import org.apache.ignite.testframework.junits.common.*; + +/** + * Checkpoint examples self test. + */ +public class CheckpointExamplesSelfTest extends GridAbstractExamplesTest { + /** + * Starts remote nodes before each test. + * + * Note: using beforeTestsStarted() to start nodes only once won't work. + * + * @throws Exception If remote nodes start failed. + */ +// @Override protected void beforeTest() throws Exception { +// for (int i = 0; i < RMT_NODES_CNT; i++) +// startGrid("node-" + i, ComputeFailoverNodeStartup.configuration()); +// } +// +// /** +// * @throws Exception If failed. +// */ +// public void testCheckpointExample() throws Exception { +// ComputeFailoverExample.main(EMPTY_ARGS); +// } +} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/44f667a4/examples/src/test/java8/org/apache/ignite/java8/examples/ClusterGroupExampleSelfTest.java ---------------------------------------------------------------------- diff --git a/examples/src/test/java8/org/apache/ignite/java8/examples/ClusterGroupExampleSelfTest.java b/examples/src/test/java8/org/apache/ignite/java8/examples/ClusterGroupExampleSelfTest.java new file mode 100644 index 0000000..191ec93 --- /dev/null +++ b/examples/src/test/java8/org/apache/ignite/java8/examples/ClusterGroupExampleSelfTest.java @@ -0,0 +1,39 @@ +/* + * 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.java8.examples; + +//import org.apache.ignite.examples.java8.computegrid.cluster.*; +import org.apache.ignite.testframework.junits.common.*; + +/** + * + */ +public class ClusterGroupExampleSelfTest extends GridAbstractExamplesTest { + /** {@inheritDoc} */ + @Override protected void beforeTest() throws Exception { + // Start up a node. + startGrid("ignite-cluster-groups-example", DFLT_CFG); + } + +// /** +// * @throws Exception If failed. +// */ +// public void testComputeClusterGroupsExample() throws Exception { +// ClusterGroupExample.main(EMPTY_ARGS); +// } +} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/44f667a4/examples/src/test/java8/org/apache/ignite/java8/examples/ContinuationExamplesMultiNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/examples/src/test/java8/org/apache/ignite/java8/examples/ContinuationExamplesMultiNodeSelfTest.java b/examples/src/test/java8/org/apache/ignite/java8/examples/ContinuationExamplesMultiNodeSelfTest.java new file mode 100644 index 0000000..d93ee13 --- /dev/null +++ b/examples/src/test/java8/org/apache/ignite/java8/examples/ContinuationExamplesMultiNodeSelfTest.java @@ -0,0 +1,28 @@ +/* + * 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.java8.examples; + +/** + * Continuation example multi-node self test. + */ +public class ContinuationExamplesMultiNodeSelfTest extends ContinuationExamplesSelfTest { + /** {@inheritDoc} */ + @Override protected void beforeTest() throws Exception { + startRemoteNodes(); + } +} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/44f667a4/examples/src/test/java8/org/apache/ignite/java8/examples/ContinuationExamplesSelfTest.java ---------------------------------------------------------------------- diff --git a/examples/src/test/java8/org/apache/ignite/java8/examples/ContinuationExamplesSelfTest.java b/examples/src/test/java8/org/apache/ignite/java8/examples/ContinuationExamplesSelfTest.java new file mode 100644 index 0000000..a3a12fc --- /dev/null +++ b/examples/src/test/java8/org/apache/ignite/java8/examples/ContinuationExamplesSelfTest.java @@ -0,0 +1,33 @@ +/* + * 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.java8.examples; + +//import org.apache.ignite.examples.java8.computegrid.*; +import org.apache.ignite.testframework.junits.common.*; + +/** + * Continuation example self test. + */ +public class ContinuationExamplesSelfTest extends GridAbstractExamplesTest { + /** + * @throws Exception If failed. + */ +// public void testContinuationExample() throws Exception { +// ComputeFibonacciContinuationExample.main(EMPTY_ARGS); +// } +} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/44f667a4/examples/src/test/java8/org/apache/ignite/java8/examples/ContinuousMapperExamplesMultiNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/examples/src/test/java8/org/apache/ignite/java8/examples/ContinuousMapperExamplesMultiNodeSelfTest.java b/examples/src/test/java8/org/apache/ignite/java8/examples/ContinuousMapperExamplesMultiNodeSelfTest.java new file mode 100644 index 0000000..aff4c5f --- /dev/null +++ b/examples/src/test/java8/org/apache/ignite/java8/examples/ContinuousMapperExamplesMultiNodeSelfTest.java @@ -0,0 +1,28 @@ +/* + * 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.java8.examples; + +/** + * ContinuousMapperExample multi-node self test. + */ +public class ContinuousMapperExamplesMultiNodeSelfTest extends ContinuationExamplesSelfTest { + /** {@inheritDoc} */ + @Override protected void beforeTest() throws Exception { + startRemoteNodes(); + } +} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/44f667a4/examples/src/test/java8/org/apache/ignite/java8/examples/ContinuousMapperExamplesSelfTest.java ---------------------------------------------------------------------- diff --git a/examples/src/test/java8/org/apache/ignite/java8/examples/ContinuousMapperExamplesSelfTest.java b/examples/src/test/java8/org/apache/ignite/java8/examples/ContinuousMapperExamplesSelfTest.java new file mode 100644 index 0000000..585da36 --- /dev/null +++ b/examples/src/test/java8/org/apache/ignite/java8/examples/ContinuousMapperExamplesSelfTest.java @@ -0,0 +1,33 @@ +/* + * 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.java8.examples; + +//import org.apache.ignite.examples.java8.computegrid.*; +import org.apache.ignite.testframework.junits.common.*; + +/** + * ContinuousMapperExample self test. + */ +public class ContinuousMapperExamplesSelfTest extends GridAbstractExamplesTest { + /** + * @throws Exception If failed. + */ +// public void testContinuousMapperExample() throws Exception { +// ComputeContinuousMapperExample.main(EMPTY_ARGS); +// } +} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/44f667a4/examples/src/test/java8/org/apache/ignite/java8/examples/DeploymentExamplesMultiNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/examples/src/test/java8/org/apache/ignite/java8/examples/DeploymentExamplesMultiNodeSelfTest.java b/examples/src/test/java8/org/apache/ignite/java8/examples/DeploymentExamplesMultiNodeSelfTest.java new file mode 100644 index 0000000..8ad6714 --- /dev/null +++ b/examples/src/test/java8/org/apache/ignite/java8/examples/DeploymentExamplesMultiNodeSelfTest.java @@ -0,0 +1,30 @@ +/* + * 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.java8.examples; + +/** + * Deployment examples multi-node self test. + */ +public class DeploymentExamplesMultiNodeSelfTest extends DeploymentExamplesSelfTest { + /** {@inheritDoc} */ +// @Override public void testDeploymentExample() throws Exception { +// startRemoteNodes(); +// +// super.testDeploymentExample(); +// } +} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/44f667a4/examples/src/test/java8/org/apache/ignite/java8/examples/DeploymentExamplesSelfTest.java ---------------------------------------------------------------------- diff --git a/examples/src/test/java8/org/apache/ignite/java8/examples/DeploymentExamplesSelfTest.java b/examples/src/test/java8/org/apache/ignite/java8/examples/DeploymentExamplesSelfTest.java new file mode 100644 index 0000000..4db095b --- /dev/null +++ b/examples/src/test/java8/org/apache/ignite/java8/examples/DeploymentExamplesSelfTest.java @@ -0,0 +1,33 @@ +/* + * 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.java8.examples; + +//import org.apache.ignite.examples.java8.misc.deployment.*; +import org.apache.ignite.testframework.junits.common.*; + +/** + * Deployment examples self test. + */ +public class DeploymentExamplesSelfTest extends GridAbstractExamplesTest { + /** + * @throws Exception If failed. + */ +// public void testDeploymentExample() throws Exception { +// DeploymentExample.main(EMPTY_ARGS); +// } +} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/44f667a4/examples/src/test/java8/org/apache/ignite/java8/examples/EventsExamplesMultiNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/examples/src/test/java8/org/apache/ignite/java8/examples/EventsExamplesMultiNodeSelfTest.java b/examples/src/test/java8/org/apache/ignite/java8/examples/EventsExamplesMultiNodeSelfTest.java new file mode 100644 index 0000000..ab37197 --- /dev/null +++ b/examples/src/test/java8/org/apache/ignite/java8/examples/EventsExamplesMultiNodeSelfTest.java @@ -0,0 +1,28 @@ +/* + * 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.java8.examples; + +/** + * Events examples multi-node self test. + */ +public class EventsExamplesMultiNodeSelfTest extends EventsExamplesSelfTest { + /** {@inheritDoc} */ + @Override protected void beforeTest() throws Exception { + startRemoteNodes(); + } +} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/44f667a4/examples/src/test/java8/org/apache/ignite/java8/examples/EventsExamplesSelfTest.java ---------------------------------------------------------------------- diff --git a/examples/src/test/java8/org/apache/ignite/java8/examples/EventsExamplesSelfTest.java b/examples/src/test/java8/org/apache/ignite/java8/examples/EventsExamplesSelfTest.java new file mode 100644 index 0000000..f0a42ca --- /dev/null +++ b/examples/src/test/java8/org/apache/ignite/java8/examples/EventsExamplesSelfTest.java @@ -0,0 +1,33 @@ +/* + * 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.java8.examples; + +import org.apache.ignite.examples.java8.events.*; +import org.apache.ignite.testframework.junits.common.*; + +/** + * Events examples self test. + */ +public class EventsExamplesSelfTest extends GridAbstractExamplesTest { + /** + * @throws Exception If failed. + */ + public void testEventsExample() throws Exception { + EventsExample.main(EMPTY_ARGS); + } +} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/44f667a4/examples/src/test/java8/org/apache/ignite/java8/examples/HibernateL2CacheExampleMultiNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/examples/src/test/java8/org/apache/ignite/java8/examples/HibernateL2CacheExampleMultiNodeSelfTest.java b/examples/src/test/java8/org/apache/ignite/java8/examples/HibernateL2CacheExampleMultiNodeSelfTest.java new file mode 100644 index 0000000..edfba3d --- /dev/null +++ b/examples/src/test/java8/org/apache/ignite/java8/examples/HibernateL2CacheExampleMultiNodeSelfTest.java @@ -0,0 +1,29 @@ +/* + * 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.java8.examples; + +/** + * Multi-node test for {@link org.apache.ignite.examples.java8.datagrid.hibernate.HibernateL2CacheExample}. + */ +public class HibernateL2CacheExampleMultiNodeSelfTest extends HibernateL2CacheExampleSelfTest { + /** {@inheritDoc} */ + @Override protected void beforeTest() throws Exception { + for (int i = 0; i < RMT_NODES_CNT; i++) + startGrid("node-" + i, "examples/config/example-ignite.xml"); + } +} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/44f667a4/examples/src/test/java8/org/apache/ignite/java8/examples/HibernateL2CacheExampleSelfTest.java ---------------------------------------------------------------------- diff --git a/examples/src/test/java8/org/apache/ignite/java8/examples/HibernateL2CacheExampleSelfTest.java b/examples/src/test/java8/org/apache/ignite/java8/examples/HibernateL2CacheExampleSelfTest.java new file mode 100644 index 0000000..a09b91a --- /dev/null +++ b/examples/src/test/java8/org/apache/ignite/java8/examples/HibernateL2CacheExampleSelfTest.java @@ -0,0 +1,33 @@ +/* + * 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.java8.examples; + +//import org.apache.ignite.examples.java8.datagrid.hibernate.*; +import org.apache.ignite.testframework.junits.common.*; + +/** + * Tests the {@link org.apache.ignite.examples.java8.datagrid.hibernate.HibernateL2CacheExample}. + */ +public class HibernateL2CacheExampleSelfTest extends GridAbstractExamplesTest { + /** + * @throws Exception If failed. + */ +// public void testHibernateL2CacheExample() throws Exception { +// HibernateL2CacheExample.main(EMPTY_ARGS); +// } +} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/44f667a4/examples/src/test/java8/org/apache/ignite/java8/examples/IgfsExamplesSelfTest.java ---------------------------------------------------------------------- diff --git a/examples/src/test/java8/org/apache/ignite/java8/examples/IgfsExamplesSelfTest.java b/examples/src/test/java8/org/apache/ignite/java8/examples/IgfsExamplesSelfTest.java new file mode 100644 index 0000000..8f3a446 --- /dev/null +++ b/examples/src/test/java8/org/apache/ignite/java8/examples/IgfsExamplesSelfTest.java @@ -0,0 +1,51 @@ +/* + * 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.java8.examples; + +//import org.apache.ignite.examples.java8.igfs.*; +//import org.apache.ignite.internal.util.typedef.internal.*; +import org.apache.ignite.testframework.junits.common.*; + +/** + * IGFS examples self test. + */ +public class IgfsExamplesSelfTest extends GridAbstractExamplesTest { + /** IGFS config with shared memory IPC. */ + private static final String IGFS_SHMEM_CFG = "modules/core/src/test/config/igfs-shmem.xml"; + + /** IGFS config with loopback IPC. */ + private static final String IGFS_LOOPBACK_CFG = "modules/core/src/test/config/igfs-loopback.xml"; + + /** + * @throws Exception If failed. + */ +// public void testIgniteFsApiExample() throws Exception { +// String configPath = U.isWindows() ? IGFS_LOOPBACK_CFG : IGFS_SHMEM_CFG; +// +// try { +// startGrid("test1", configPath); +// startGrid("test2", configPath); +// startGrid("test3", configPath); +// +// IgfsExample.main(EMPTY_ARGS); +// } +// finally { +// stopAllGrids(); +// } +// } +} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/44f667a4/examples/src/test/java8/org/apache/ignite/java8/examples/LifecycleExamplesSelfTest.java ---------------------------------------------------------------------- diff --git a/examples/src/test/java8/org/apache/ignite/java8/examples/LifecycleExamplesSelfTest.java b/examples/src/test/java8/org/apache/ignite/java8/examples/LifecycleExamplesSelfTest.java new file mode 100644 index 0000000..9fd316c --- /dev/null +++ b/examples/src/test/java8/org/apache/ignite/java8/examples/LifecycleExamplesSelfTest.java @@ -0,0 +1,33 @@ +/* + * 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.java8.examples; + +//import org.apache.ignite.examples.java8.misc.lifecycle.*; +import org.apache.ignite.testframework.junits.common.*; + +/** + * LifecycleExample self test. + */ +public class LifecycleExamplesSelfTest extends GridAbstractExamplesTest { + /** + * @throws Exception If failed. + */ +// public void testLifecycleExample() throws Exception { +// LifecycleExample.main(EMPTY_ARGS); +// } +} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/44f667a4/examples/src/test/java8/org/apache/ignite/java8/examples/MemcacheRestExamplesMultiNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/examples/src/test/java8/org/apache/ignite/java8/examples/MemcacheRestExamplesMultiNodeSelfTest.java b/examples/src/test/java8/org/apache/ignite/java8/examples/MemcacheRestExamplesMultiNodeSelfTest.java new file mode 100644 index 0000000..8fb6299 --- /dev/null +++ b/examples/src/test/java8/org/apache/ignite/java8/examples/MemcacheRestExamplesMultiNodeSelfTest.java @@ -0,0 +1,31 @@ +/* + * 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.java8.examples; + +//import org.apache.ignite.examples.java8.misc.client.memcache.*; + +/** + * MemcacheRestExample multi-node self test. + */ +public class MemcacheRestExamplesMultiNodeSelfTest extends MemcacheRestExamplesSelfTest { + /** {@inheritDoc} */ +// @Override protected void beforeTest() throws Exception { +// for (int i = 0; i < RMT_NODES_CNT; i++) +// startGrid("memcache-rest-examples-" + i, MemcacheRestExampleNodeStartup.configuration()); +// } +} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/44f667a4/examples/src/test/java8/org/apache/ignite/java8/examples/MemcacheRestExamplesSelfTest.java ---------------------------------------------------------------------- diff --git a/examples/src/test/java8/org/apache/ignite/java8/examples/MemcacheRestExamplesSelfTest.java b/examples/src/test/java8/org/apache/ignite/java8/examples/MemcacheRestExamplesSelfTest.java new file mode 100644 index 0000000..721a21e --- /dev/null +++ b/examples/src/test/java8/org/apache/ignite/java8/examples/MemcacheRestExamplesSelfTest.java @@ -0,0 +1,41 @@ +/* + * 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.java8.examples; + +//import org.apache.ignite.examples.java8.misc.client.memcache.*; +import org.apache.ignite.testframework.junits.common.*; + +/** + * MemcacheRestExample self test. + */ +public class MemcacheRestExamplesSelfTest extends GridAbstractExamplesTest { +// /** +// * @throws Exception If failed. +// */ +// @Override protected void beforeTest() throws Exception { +// // Start up a cluster node. +// startGrid("memcache-rest-examples", MemcacheRestExampleNodeStartup.configuration()); +// } +// +// /** +// * @throws Exception If failed. +// */ +// public void testMemcacheRestExample() throws Exception { +// MemcacheRestExample.main(EMPTY_ARGS); +// } +} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/44f667a4/examples/src/test/java8/org/apache/ignite/java8/examples/MessagingExamplesSelfTest.java ---------------------------------------------------------------------- diff --git a/examples/src/test/java8/org/apache/ignite/java8/examples/MessagingExamplesSelfTest.java b/examples/src/test/java8/org/apache/ignite/java8/examples/MessagingExamplesSelfTest.java new file mode 100644 index 0000000..1a3940d --- /dev/null +++ b/examples/src/test/java8/org/apache/ignite/java8/examples/MessagingExamplesSelfTest.java @@ -0,0 +1,53 @@ +/* + * 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.java8.examples; + +import org.apache.ignite.examples.java8.messaging.*; +import org.apache.ignite.testframework.junits.common.*; + +/** + * Messaging examples self test. + */ +public class MessagingExamplesSelfTest extends GridAbstractExamplesTest { + /** {@inheritDoc} */ + @Override protected void beforeTest() throws Exception { + startGrid("companion", DFLT_CFG); + } + + /** + * @throws Exception If failed. + */ + public void testMessagingExample() throws Exception { + MessagingExample.main(EMPTY_ARGS); + } + + /** + * TODO IGNITE-533 + * @throws Exception If failed. + */ + public void _testMessagingPingPongExample() throws Exception { + MessagingPingPongExample.main(EMPTY_ARGS); + } + +// /** +// * @throws Exception If failed. +// */ +// public void testMessagingPingPongListenActorExample() throws Exception { +// MessagingPingPongListenActorExample.main(EMPTY_ARGS); +// } +} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/44f667a4/examples/src/test/java8/org/apache/ignite/java8/examples/MonteCarloExamplesMultiNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/examples/src/test/java8/org/apache/ignite/java8/examples/MonteCarloExamplesMultiNodeSelfTest.java b/examples/src/test/java8/org/apache/ignite/java8/examples/MonteCarloExamplesMultiNodeSelfTest.java new file mode 100644 index 0000000..2808a46 --- /dev/null +++ b/examples/src/test/java8/org/apache/ignite/java8/examples/MonteCarloExamplesMultiNodeSelfTest.java @@ -0,0 +1,28 @@ +/* + * 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.java8.examples; + +/** + * PrimeExample multi-node self test. + */ +public class MonteCarloExamplesMultiNodeSelfTest extends MonteCarloExamplesSelfTest { + /** {@inheritDoc} */ + @Override protected void beforeTest() throws Exception { + startRemoteNodes(); + } +} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/44f667a4/examples/src/test/java8/org/apache/ignite/java8/examples/MonteCarloExamplesSelfTest.java ---------------------------------------------------------------------- diff --git a/examples/src/test/java8/org/apache/ignite/java8/examples/MonteCarloExamplesSelfTest.java b/examples/src/test/java8/org/apache/ignite/java8/examples/MonteCarloExamplesSelfTest.java new file mode 100644 index 0000000..40b1197 --- /dev/null +++ b/examples/src/test/java8/org/apache/ignite/java8/examples/MonteCarloExamplesSelfTest.java @@ -0,0 +1,74 @@ +/* + * 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.java8.examples; + +//import org.apache.ignite.examples.java8.computegrid.montecarlo.*; +import org.apache.ignite.testframework.junits.common.*; + +/** + * Ignite examples self test. Excludes Ignite Spring tests. + * + * <h1 class="header">AOP Configuration</h1> + * In order for this test to execute, any of the following + * AOP configurations must be provided. + * <h2 class="header">Jboss AOP</h2> + * The following configuration needs to be applied to enable JBoss byte code + * weaving. Note that Ignite is not shipped with JBoss and necessary + * libraries will have to be downloaded separately (they come standard + * if you have JBoss installed already): + * <ul> + * <li> + * The following JVM configuration must be present: + * <ul> + * <li>{@code -javaagent:[path to jboss-aop-jdk50-4.x.x.jar]}</li> + * <li>{@code -Djboss.aop.class.path=[path to ignite.jar]}</li> + * <li>{@code -Djboss.aop.exclude=org,com -Djboss.aop.include=org.apache.ignite.examples}</li> + * </ul> + * </li> + * <li> + * The following JARs should be in a classpath: + * <ul> + * <li>{@code javassist-3.x.x.jar}</li> + * <li>{@code jboss-aop-jdk50-4.x.x.jar}</li> + * <li>{@code jboss-aspect-library-jdk50-4.x.x.jar}</li> + * <li>{@code jboss-common-4.x.x.jar}</li> + * <li>{@code trove-1.0.2.jar}</li> + * </ul> + * </li> + * </ul> + * <p> + * <h2 class="header">AspectJ AOP</h2> + * The following configuration needs to be applied to enable AspectJ byte code + * weaving. + * <ul> + * <li> + * JVM configuration should include: + * {@code -javaagent:${IGNITE_HOME}/libs/aspectjweaver-1.7.2.jar} + * </li> + * <li> + * Classpath should contain the {@code ${IGNITE_HOME}/modules/tests/config/aop/aspectj} folder. + * </li> + */ +public class MonteCarloExamplesSelfTest extends GridAbstractExamplesTest { + /** + * @throws Exception If failed. + */ +// public void testCreditRiskExample() throws Exception { +// CreditRiskExample.main(EMPTY_ARGS); +// } +} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/44f667a4/examples/src/test/java8/org/apache/ignite/java8/examples/SpringBeanExamplesSelfTest.java ---------------------------------------------------------------------- diff --git a/examples/src/test/java8/org/apache/ignite/java8/examples/SpringBeanExamplesSelfTest.java b/examples/src/test/java8/org/apache/ignite/java8/examples/SpringBeanExamplesSelfTest.java new file mode 100644 index 0000000..2f3c5d3 --- /dev/null +++ b/examples/src/test/java8/org/apache/ignite/java8/examples/SpringBeanExamplesSelfTest.java @@ -0,0 +1,33 @@ +/* + * 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.java8.examples; + +//import org.apache.ignite.examples.java8.misc.springbean.*; +import org.apache.ignite.testframework.junits.common.*; + +/** + * Spring bean examples self test. + */ +public class SpringBeanExamplesSelfTest extends GridAbstractExamplesTest { + /** + * @throws Exception If failed. + */ +// public void testSpringBeanHelloWorldExample() throws Exception { +// SpringBeanExample.main(EMPTY_ARGS); +// } +} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/44f667a4/examples/src/test/java8/org/apache/ignite/java8/examples/TaskExamplesMultiNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/examples/src/test/java8/org/apache/ignite/java8/examples/TaskExamplesMultiNodeSelfTest.java b/examples/src/test/java8/org/apache/ignite/java8/examples/TaskExamplesMultiNodeSelfTest.java new file mode 100644 index 0000000..9f29c5a --- /dev/null +++ b/examples/src/test/java8/org/apache/ignite/java8/examples/TaskExamplesMultiNodeSelfTest.java @@ -0,0 +1,28 @@ +/* + * 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.java8.examples; + +/** + * Hello world examples multi-node self test. + */ +public class TaskExamplesMultiNodeSelfTest extends TaskExamplesSelfTest { + /** {@inheritDoc} */ + @Override protected void beforeTest() throws Exception { + startRemoteNodes(); + } +} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/44f667a4/examples/src/test/java8/org/apache/ignite/java8/examples/TaskExamplesSelfTest.java ---------------------------------------------------------------------- diff --git a/examples/src/test/java8/org/apache/ignite/java8/examples/TaskExamplesSelfTest.java b/examples/src/test/java8/org/apache/ignite/java8/examples/TaskExamplesSelfTest.java new file mode 100644 index 0000000..271bfde --- /dev/null +++ b/examples/src/test/java8/org/apache/ignite/java8/examples/TaskExamplesSelfTest.java @@ -0,0 +1,40 @@ +/* + * 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.java8.examples; + +//import org.apache.ignite.examples.java8.computegrid.*; +import org.apache.ignite.testframework.junits.common.*; + +/** + * Hello world examples self test. + */ +public class TaskExamplesSelfTest extends GridAbstractExamplesTest { +// /** +// * @throws Exception If failed. +// */ +// public void testTaskSplitExample() throws Exception { +// ComputeTaskSplitExample.main(EMPTY_ARGS); +// } +// +// /** +// * @throws Exception If failed. +// */ +// public void testTaskMapExample() throws Exception { +// ComputeTaskMapExample.main(EMPTY_ARGS); +// } +} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/44f667a4/examples/src/test/java8/org/apache/ignite/java8/testsuites/IgniteExamplesJ8SelfTestSuite.java ---------------------------------------------------------------------- diff --git a/examples/src/test/java8/org/apache/ignite/java8/testsuites/IgniteExamplesJ8SelfTestSuite.java b/examples/src/test/java8/org/apache/ignite/java8/testsuites/IgniteExamplesJ8SelfTestSuite.java new file mode 100644 index 0000000..bd4597f --- /dev/null +++ b/examples/src/test/java8/org/apache/ignite/java8/testsuites/IgniteExamplesJ8SelfTestSuite.java @@ -0,0 +1,73 @@ +/* + * 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.java8.testsuites; + +import junit.framework.*; +import org.apache.ignite.java8.examples.*; +import org.apache.ignite.testframework.*; + +import static org.apache.ignite.IgniteSystemProperties.*; + +/** + * Examples test suite. + * <p> + * Contains only Spring ignite examples tests. + */ +public class IgniteExamplesJ8SelfTestSuite extends TestSuite { + /** + * @return Suite. + * @throws Exception If failed. + */ + public static TestSuite suite() throws Exception { + System.setProperty(IGNITE_OVERRIDE_MCAST_GRP, + GridTestUtils.getNextMulticastGroup(IgniteExamplesJ8SelfTestSuite.class)); + + TestSuite suite = new TestSuite("Ignite Examples Test Suite"); + + suite.addTest(new TestSuite(CacheExamplesSelfTest.class)); + suite.addTest(new TestSuite(BasicExamplesSelfTest.class)); +// suite.addTest(new TestSuite(ContinuationExamplesSelfTest.class)); +// suite.addTest(new TestSuite(ContinuousMapperExamplesSelfTest.class)); +// suite.addTest(new TestSuite(DeploymentExamplesSelfTest.class)); + suite.addTest(new TestSuite(EventsExamplesSelfTest.class)); +// suite.addTest(new TestSuite(LifecycleExamplesSelfTest.class)); + suite.addTest(new TestSuite(MessagingExamplesSelfTest.class)); +// suite.addTest(new TestSuite(MemcacheRestExamplesSelfTest.class)); +// suite.addTest(new TestSuite(MonteCarloExamplesSelfTest.class)); +// suite.addTest(new TestSuite(TaskExamplesSelfTest.class)); +// suite.addTest(new TestSuite(SpringBeanExamplesSelfTest.class)); +// suite.addTest(new TestSuite(IgfsExamplesSelfTest.class)); +// suite.addTest(new TestSuite(CheckpointExamplesSelfTest.class)); +// suite.addTest(new TestSuite(HibernateL2CacheExampleSelfTest.class)); +// suite.addTest(new TestSuite(ClusterGroupExampleSelfTest.class)); + + // Multi-node. + suite.addTest(new TestSuite(CacheExamplesMultiNodeSelfTest.class)); + suite.addTest(new TestSuite(BasicExamplesMultiNodeSelfTest.class)); +// suite.addTest(new TestSuite(ContinuationExamplesMultiNodeSelfTest.class)); +// suite.addTest(new TestSuite(ContinuousMapperExamplesMultiNodeSelfTest.class)); +// suite.addTest(new TestSuite(DeploymentExamplesMultiNodeSelfTest.class)); + suite.addTest(new TestSuite(EventsExamplesMultiNodeSelfTest.class)); +// suite.addTest(new TestSuite(TaskExamplesMultiNodeSelfTest.class)); +// suite.addTest(new TestSuite(MemcacheRestExamplesMultiNodeSelfTest.class)); +// suite.addTest(new TestSuite(MonteCarloExamplesMultiNodeSelfTest.class)); +// suite.addTest(new TestSuite(HibernateL2CacheExampleMultiNodeSelfTest.class)); + + return suite; + } +} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/44f667a4/modules/core/src/main/java/org/apache/ignite/cache/CacheEntryEventSerializableFilter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/CacheEntryEventSerializableFilter.java b/modules/core/src/main/java/org/apache/ignite/cache/CacheEntryEventSerializableFilter.java new file mode 100644 index 0000000..f7c6bfb --- /dev/null +++ b/modules/core/src/main/java/org/apache/ignite/cache/CacheEntryEventSerializableFilter.java @@ -0,0 +1,28 @@ +/* + * 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 CacheEntryEventSerializableFilter<K, V> extends CacheEntryEventFilter<K, V>, Serializable { + // No-op. +} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/44f667a4/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 deleted file mode 100644 index d36a3fb..0000000 --- a/modules/core/src/main/java/org/apache/ignite/cache/IgniteCacheEntryEventFilter.java +++ /dev/null @@ -1,28 +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.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 { - // No-op. -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/44f667a4/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 4246f4f..8ffb8cb 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 @@ -118,7 +118,7 @@ public final class ContinuousQuery<K, V> extends Query<Cache.Entry<K, V>> { private CacheEntryUpdatedListener<K, V> locLsnr; /** Remote filter. */ - private IgniteCacheEntryEventFilter<K, V> rmtFilter; + private CacheEntryEventSerializableFilter<K, V> rmtFilter; /** Time interval. */ private long timeInterval = DFLT_TIME_INTERVAL; @@ -198,7 +198,7 @@ public final class ContinuousQuery<K, V> extends Query<Cache.Entry<K, V>> { * @param rmtFilter Key-value filter. * @return {@code this} for chaining. */ - public ContinuousQuery<K, V> setRemoteFilter(IgniteCacheEntryEventFilter<K, V> rmtFilter) { + public ContinuousQuery<K, V> setRemoteFilter(CacheEntryEventSerializableFilter<K, V> rmtFilter) { this.rmtFilter = rmtFilter; return this; @@ -209,7 +209,7 @@ public final class ContinuousQuery<K, V> extends Query<Cache.Entry<K, V>> { * * @return Remote filter. */ - public IgniteCacheEntryEventFilter<K, V> getRemoteFilter() { + public CacheEntryEventSerializableFilter<K, V> getRemoteFilter() { return rmtFilter; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/44f667a4/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 799ad91..04f83c2 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 @@ -25,7 +25,6 @@ import org.apache.ignite.internal.util.tostring.*; import org.apache.ignite.internal.util.typedef.internal.*; import org.jetbrains.annotations.*; -import javax.cache.event.*; import java.util.*; /** @@ -85,7 +84,7 @@ public class CacheQueryExecutedEvent<K, V> extends EventAdapter { /** Continuous query filter. */ @GridToStringInclude - private final IgniteCacheEntryEventFilter<K, V> contQryFilter; + private final CacheEntryEventSerializableFilter<K, V> contQryFilter; /** Query arguments. */ @GridToStringInclude @@ -118,7 +117,7 @@ public class CacheQueryExecutedEvent<K, V> extends EventAdapter { @Nullable String clsName, @Nullable String clause, @Nullable IgniteBiPredicate<K, V> scanQryFilter, - @Nullable IgniteCacheEntryEventFilter<K, V> contQryFilter, + @Nullable CacheEntryEventSerializableFilter<K, V> contQryFilter, @Nullable Object[] args, @Nullable UUID subjId, @Nullable String taskName) { @@ -195,7 +194,7 @@ public class CacheQueryExecutedEvent<K, V> extends EventAdapter { * * @return Continuous query filter. */ - @Nullable public IgniteCacheEntryEventFilter<K, V> continuousQueryFilter() { + @Nullable public CacheEntryEventSerializableFilter<K, V> continuousQueryFilter() { return contQryFilter; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/44f667a4/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 4920443..a399d8a 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 @@ -84,7 +84,7 @@ public class CacheQueryReadEvent<K, V> extends EventAdapter { /** Continuous query filter. */ @GridToStringInclude - private final IgniteCacheEntryEventFilter<K, V> contQryFilter; + private final CacheEntryEventSerializableFilter<K, V> contQryFilter; /** Query arguments. */ @GridToStringInclude @@ -135,7 +135,7 @@ public class CacheQueryReadEvent<K, V> extends EventAdapter { @Nullable String clsName, @Nullable String clause, @Nullable IgniteBiPredicate<K, V> scanQryFilter, - @Nullable IgniteCacheEntryEventFilter<K, V> contQryFilter, + @Nullable CacheEntryEventSerializableFilter<K, V> contQryFilter, @Nullable Object[] args, @Nullable UUID subjId, @Nullable String taskName, @@ -220,7 +220,7 @@ public class CacheQueryReadEvent<K, V> extends EventAdapter { * * @return Continuous query filter. */ - @Nullable public IgniteCacheEntryEventFilter<K, V> continuousQueryFilter() { + @Nullable public CacheEntryEventSerializableFilter<K, V> continuousQueryFilter() { return contQryFilter; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/44f667a4/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 620be5a..2de56b5 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 @@ -532,7 +532,7 @@ public class CacheDataStructuresManager extends GridCacheManagerAdapter { /** * Predicate for queue continuous query. */ - private static class QueueHeaderPredicate<K, V> implements IgniteCacheEntryEventFilter<K, V>, + private static class QueueHeaderPredicate<K, V> implements CacheEntryEventSerializableFilter<K, V>, Externalizable { /** */ private static final long serialVersionUID = 0L; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/44f667a4/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 3f2ff15..de7953a 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 @@ -23,7 +23,7 @@ import org.apache.ignite.cache.*; /** * Extended continuous query filter. */ -public interface CacheContinuousQueryFilterEx<K, V> extends IgniteCacheEntryEventFilter<K, V> { +public interface CacheContinuousQueryFilterEx<K, V> extends CacheEntryEventSerializableFilter<K, V> { /** * Callback for query unregister event. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/44f667a4/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 79a9047..1e81910 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 @@ -54,7 +54,7 @@ class CacheContinuousQueryHandler<K, V> implements GridContinuousHandler { private transient CacheEntryUpdatedListener<K, V> locLsnr; /** Remote filter. */ - private IgniteCacheEntryEventFilter<K, V> rmtFilter; + private CacheEntryEventSerializableFilter<K, V> rmtFilter; /** Deployable object for filter. */ private DeployableObject rmtFilterDep; @@ -106,7 +106,7 @@ class CacheContinuousQueryHandler<K, V> implements GridContinuousHandler { String cacheName, Object topic, CacheEntryUpdatedListener<K, V> locLsnr, - IgniteCacheEntryEventFilter<K, V> rmtFilter, + CacheEntryEventSerializableFilter<K, V> rmtFilter, boolean internal, boolean notifyExisting, boolean oldValRequired, @@ -425,7 +425,7 @@ class CacheContinuousQueryHandler<K, V> implements GridContinuousHandler { if (b) rmtFilterDep = (DeployableObject)in.readObject(); else - rmtFilter = (IgniteCacheEntryEventFilter<K, V>)in.readObject(); + rmtFilter = (CacheEntryEventSerializableFilter<K, V>)in.readObject(); internal = in.readBoolean(); notifyExisting = in.readBoolean(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/44f667a4/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 d751b5a..eff845d 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 @@ -250,7 +250,7 @@ public class CacheContinuousQueryManager extends GridCacheManagerAdapter { * @return Continuous routine ID. * @throws IgniteCheckedException In case of error. */ - public UUID executeQuery(CacheEntryUpdatedListener locLsnr, IgniteCacheEntryEventFilter rmtFilter, + public UUID executeQuery(CacheEntryUpdatedListener locLsnr, CacheEntryEventSerializableFilter rmtFilter, int bufSize, long timeInterval, boolean autoUnsubscribe, ClusterGroup grp) throws IgniteCheckedException { return executeQuery0( locLsnr, @@ -275,7 +275,7 @@ public class CacheContinuousQueryManager extends GridCacheManagerAdapter { * @throws IgniteCheckedException In case of error. */ public UUID executeInternalQuery(CacheEntryUpdatedListener<?, ?> locLsnr, - IgniteCacheEntryEventFilter rmtFilter, + CacheEntryEventSerializableFilter rmtFilter, boolean loc, boolean notifyExisting) throws IgniteCheckedException @@ -357,7 +357,7 @@ public class CacheContinuousQueryManager extends GridCacheManagerAdapter { * @return Continuous routine ID. * @throws IgniteCheckedException In case of error. */ - private UUID executeQuery0(CacheEntryUpdatedListener locLsnr, final IgniteCacheEntryEventFilter rmtFilter, + private UUID executeQuery0(CacheEntryUpdatedListener locLsnr, final CacheEntryEventSerializableFilter 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); @@ -579,7 +579,7 @@ public class CacheContinuousQueryManager extends GridCacheManagerAdapter { throw new IgniteCheckedException("Cache entry event filter must implement java.io.Serializable: " + fltr); } - IgniteCacheEntryEventFilter rmtFilter = new JCacheQueryRemoteFilter(fltr, types); + CacheEntryEventSerializableFilter rmtFilter = new JCacheQueryRemoteFilter(fltr, types); routineId = executeQuery0( locLsnr, @@ -692,7 +692,7 @@ public class CacheContinuousQueryManager extends GridCacheManagerAdapter { /** */ - private static class JCacheQueryRemoteFilter implements IgniteCacheEntryEventFilter, Externalizable { + private static class JCacheQueryRemoteFilter implements CacheEntryEventSerializableFilter, Externalizable { /** */ private static final long serialVersionUID = 0L; @@ -745,7 +745,7 @@ public class CacheContinuousQueryManager extends GridCacheManagerAdapter { /** {@inheritDoc} */ @SuppressWarnings("unchecked") @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException { - impl = (IgniteCacheEntryEventFilter)in.readObject(); + impl = (CacheEntryEventSerializableFilter)in.readObject(); types = in.readByte(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/44f667a4/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 7c0d8ac..c6038ed 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 @@ -123,8 +123,8 @@ public abstract class IgniteCacheEntryListenerAbstractTest extends IgniteCacheAb return new CreateUpdateRemoveExpireListener(); } }, - new Factory<IgniteCacheEntryEventFilter<? super Integer, ? super Integer>>() { - @Override public IgniteCacheEntryEventFilter<? super Integer, ? super Integer> create() { + new Factory<CacheEntryEventSerializableFilter<? super Integer, ? super Integer>>() { + @Override public CacheEntryEventSerializableFilter<? super Integer, ? super Integer> create() { return new ExceptionFilter(); } }, @@ -952,9 +952,9 @@ public abstract class IgniteCacheEntryListenerAbstractTest extends IgniteCacheAb /** * */ - private static class TestFilterFactory implements Factory<IgniteCacheEntryEventFilter<Integer, Integer>> { + private static class TestFilterFactory implements Factory<CacheEntryEventSerializableFilter<Integer, Integer>> { /** {@inheritDoc} */ - @Override public IgniteCacheEntryEventFilter<Integer, Integer> create() { + @Override public CacheEntryEventSerializableFilter<Integer, Integer> create() { return new TestFilter(); } } @@ -1002,7 +1002,7 @@ public abstract class IgniteCacheEntryListenerAbstractTest extends IgniteCacheAb /** * */ - private static class TestFilter implements IgniteCacheEntryEventFilter<Integer, Integer> { + private static class TestFilter implements CacheEntryEventSerializableFilter<Integer, Integer> { /** {@inheritDoc} */ @Override public boolean evaluate(CacheEntryEvent<? extends Integer, ? extends Integer> evt) { assert evt != null; @@ -1079,7 +1079,7 @@ public abstract class IgniteCacheEntryListenerAbstractTest extends IgniteCacheAb /** * */ - private static class ExceptionFilter implements IgniteCacheEntryEventFilter<Integer, Integer> { + private static class ExceptionFilter implements CacheEntryEventSerializableFilter<Integer, Integer> { /** {@inheritDoc} */ @Override public boolean evaluate(CacheEntryEvent<? extends Integer, ? extends Integer> evt) { throw new RuntimeException("Test filter error.");
