http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/aop/src/test/java/org/apache/ignite/gridify/GridifySetToSetTarget.java ---------------------------------------------------------------------- diff --git a/modules/aop/src/test/java/org/apache/ignite/gridify/GridifySetToSetTarget.java b/modules/aop/src/test/java/org/apache/ignite/gridify/GridifySetToSetTarget.java index ede07f9..17a8c7a 100644 --- a/modules/aop/src/test/java/org/apache/ignite/gridify/GridifySetToSetTarget.java +++ b/modules/aop/src/test/java/org/apache/ignite/gridify/GridifySetToSetTarget.java @@ -17,10 +17,17 @@ package org.apache.ignite.gridify; -import org.apache.ignite.compute.gridify.*; - -import java.io.*; -import java.util.*; +import java.io.IOException; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; +import java.io.Serializable; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Enumeration; +import java.util.Iterator; +import java.util.List; +import org.apache.ignite.compute.gridify.GridifySetToSet; /** * Test set-to-set target. @@ -369,4 +376,4 @@ public class GridifySetToSetTarget implements GridifySetToSetTargetInterface, Se out.defaultWriteObject(); } } -} +} \ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/aop/src/test/java/org/apache/ignite/gridify/GridifySetToSetTargetInterface.java ---------------------------------------------------------------------- diff --git a/modules/aop/src/test/java/org/apache/ignite/gridify/GridifySetToSetTargetInterface.java b/modules/aop/src/test/java/org/apache/ignite/gridify/GridifySetToSetTargetInterface.java index 82e1da0..592169c 100644 --- a/modules/aop/src/test/java/org/apache/ignite/gridify/GridifySetToSetTargetInterface.java +++ b/modules/aop/src/test/java/org/apache/ignite/gridify/GridifySetToSetTargetInterface.java @@ -17,9 +17,12 @@ package org.apache.ignite.gridify; -import org.apache.ignite.compute.gridify.*; - -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Enumeration; +import java.util.Iterator; +import java.util.List; +import org.apache.ignite.compute.gridify.GridifySetToSet; /** * Test set-to-set target interface. @@ -106,4 +109,4 @@ public interface GridifySetToSetTargetInterface { */ @GridifySetToSet(gridName = "GridifySetToSetTarget", threshold = 2, splitSize = 2) public Enumeration<Long> findPrimesWithEnumeration(Enumeration<Long> input); -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/aop/src/test/java/org/apache/ignite/gridify/GridifySetToValueTarget.java ---------------------------------------------------------------------- diff --git a/modules/aop/src/test/java/org/apache/ignite/gridify/GridifySetToValueTarget.java b/modules/aop/src/test/java/org/apache/ignite/gridify/GridifySetToValueTarget.java index 59fdddc..16138f2 100644 --- a/modules/aop/src/test/java/org/apache/ignite/gridify/GridifySetToValueTarget.java +++ b/modules/aop/src/test/java/org/apache/ignite/gridify/GridifySetToValueTarget.java @@ -17,10 +17,14 @@ package org.apache.ignite.gridify; -import org.apache.ignite.compute.gridify.*; - -import java.io.*; -import java.util.*; +import java.io.Serializable; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.Enumeration; +import java.util.Iterator; +import java.util.List; +import org.apache.ignite.compute.gridify.GridifySetToValue; /** * Test set-to-value target. @@ -196,4 +200,4 @@ public class GridifySetToValueTarget implements GridifySetToValueTargetInterface return maximum; } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/aop/src/test/java/org/apache/ignite/gridify/GridifySetToValueTargetInterface.java ---------------------------------------------------------------------- diff --git a/modules/aop/src/test/java/org/apache/ignite/gridify/GridifySetToValueTargetInterface.java b/modules/aop/src/test/java/org/apache/ignite/gridify/GridifySetToValueTargetInterface.java index 5250e7f..9d22104 100644 --- a/modules/aop/src/test/java/org/apache/ignite/gridify/GridifySetToValueTargetInterface.java +++ b/modules/aop/src/test/java/org/apache/ignite/gridify/GridifySetToValueTargetInterface.java @@ -17,9 +17,11 @@ package org.apache.ignite.gridify; -import org.apache.ignite.compute.gridify.*; - -import java.util.*; +import java.util.Collection; +import java.util.Enumeration; +import java.util.Iterator; +import java.util.List; +import org.apache.ignite.compute.gridify.GridifySetToValue; /** * Test set-to-value target interface. @@ -97,4 +99,4 @@ public interface GridifySetToValueTargetInterface { */ @GridifySetToValue(gridName = "GridifySetToValueTarget", threshold = 2, splitSize = 2) public long findMaximumInEnumeration(Enumeration<Long> input); -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/aop/src/test/java/org/apache/ignite/gridify/GridifySetToXXXNonSpringAopSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/aop/src/test/java/org/apache/ignite/gridify/GridifySetToXXXNonSpringAopSelfTest.java b/modules/aop/src/test/java/org/apache/ignite/gridify/GridifySetToXXXNonSpringAopSelfTest.java index 237c91e..2ebd272 100644 --- a/modules/aop/src/test/java/org/apache/ignite/gridify/GridifySetToXXXNonSpringAopSelfTest.java +++ b/modules/aop/src/test/java/org/apache/ignite/gridify/GridifySetToXXXNonSpringAopSelfTest.java @@ -17,9 +17,14 @@ package org.apache.ignite.gridify; -import org.apache.ignite.testframework.junits.common.*; - -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Enumeration; +import java.util.Iterator; +import java.util.List; +import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; +import org.apache.ignite.testframework.junits.common.GridCommonTest; /** * To run this test with JBoss AOP make sure of the following: @@ -201,4 +206,4 @@ public class GridifySetToXXXNonSpringAopSelfTest extends GridCommonAbstractTest return iter.next(); } } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/aop/src/test/java/org/apache/ignite/gridify/GridifySetToXXXSpringAopSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/aop/src/test/java/org/apache/ignite/gridify/GridifySetToXXXSpringAopSelfTest.java b/modules/aop/src/test/java/org/apache/ignite/gridify/GridifySetToXXXSpringAopSelfTest.java index e4e2c69..1dd499a 100644 --- a/modules/aop/src/test/java/org/apache/ignite/gridify/GridifySetToXXXSpringAopSelfTest.java +++ b/modules/aop/src/test/java/org/apache/ignite/gridify/GridifySetToXXXSpringAopSelfTest.java @@ -17,10 +17,15 @@ package org.apache.ignite.gridify; -import org.apache.ignite.compute.gridify.aop.spring.*; -import org.apache.ignite.testframework.junits.common.*; - -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Enumeration; +import java.util.Iterator; +import java.util.List; +import org.apache.ignite.compute.gridify.aop.spring.GridifySpringEnhancer; +import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; +import org.apache.ignite.testframework.junits.common.GridCommonTest; /** * To run this test with JBoss AOP make sure of the following: @@ -202,4 +207,4 @@ public class GridifySetToXXXSpringAopSelfTest extends GridCommonAbstractTest { return iter.next(); } } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/aop/src/test/java/org/apache/ignite/gridify/NonSpringAopSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/aop/src/test/java/org/apache/ignite/gridify/NonSpringAopSelfTest.java b/modules/aop/src/test/java/org/apache/ignite/gridify/NonSpringAopSelfTest.java index d429e06..faadb53 100644 --- a/modules/aop/src/test/java/org/apache/ignite/gridify/NonSpringAopSelfTest.java +++ b/modules/aop/src/test/java/org/apache/ignite/gridify/NonSpringAopSelfTest.java @@ -17,7 +17,7 @@ package org.apache.ignite.gridify; -import org.apache.ignite.testframework.junits.common.*; +import org.apache.ignite.testframework.junits.common.GridCommonTest; /** * To run this test with JBoss AOP make sure of the following: @@ -54,4 +54,4 @@ public class NonSpringAopSelfTest extends AbstractAopTest { @Override public String getTestGridName() { return "TestAopTarget"; } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/aop/src/test/java/org/apache/ignite/gridify/SpringAopSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/aop/src/test/java/org/apache/ignite/gridify/SpringAopSelfTest.java b/modules/aop/src/test/java/org/apache/ignite/gridify/SpringAopSelfTest.java index 8f34950..9a4d969 100644 --- a/modules/aop/src/test/java/org/apache/ignite/gridify/SpringAopSelfTest.java +++ b/modules/aop/src/test/java/org/apache/ignite/gridify/SpringAopSelfTest.java @@ -17,8 +17,8 @@ package org.apache.ignite.gridify; -import org.apache.ignite.compute.gridify.aop.spring.*; -import org.apache.ignite.testframework.junits.common.*; +import org.apache.ignite.compute.gridify.aop.spring.GridifySpringEnhancer; +import org.apache.ignite.testframework.junits.common.GridCommonTest; /** * Spring AOP test. @@ -49,4 +49,4 @@ public class SpringAopSelfTest extends AbstractAopTest { return res; } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/aop/src/test/java/org/apache/ignite/gridify/TestAopTarget.java ---------------------------------------------------------------------- diff --git a/modules/aop/src/test/java/org/apache/ignite/gridify/TestAopTarget.java b/modules/aop/src/test/java/org/apache/ignite/gridify/TestAopTarget.java index 5058626..c58d9f5 100644 --- a/modules/aop/src/test/java/org/apache/ignite/gridify/TestAopTarget.java +++ b/modules/aop/src/test/java/org/apache/ignite/gridify/TestAopTarget.java @@ -17,10 +17,10 @@ package org.apache.ignite.gridify; -import org.apache.ignite.compute.gridify.*; - -import java.io.*; -import java.util.*; +import java.io.IOException; +import java.io.InputStream; +import java.util.Properties; +import org.apache.ignite.compute.gridify.Gridify; /** * AOP test. @@ -135,4 +135,4 @@ public class TestAopTarget implements TestAopTargetInterface { throw new TestGridifyException("Failed to test load properties file.", e); } } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/aop/src/test/java/org/apache/ignite/gridify/TestAopTargetInterface.java ---------------------------------------------------------------------- diff --git a/modules/aop/src/test/java/org/apache/ignite/gridify/TestAopTargetInterface.java b/modules/aop/src/test/java/org/apache/ignite/gridify/TestAopTargetInterface.java index 686466c..d32c1bf 100644 --- a/modules/aop/src/test/java/org/apache/ignite/gridify/TestAopTargetInterface.java +++ b/modules/aop/src/test/java/org/apache/ignite/gridify/TestAopTargetInterface.java @@ -17,9 +17,8 @@ package org.apache.ignite.gridify; -import org.apache.ignite.compute.gridify.*; - -import java.io.*; +import java.io.Serializable; +import org.apache.ignite.compute.gridify.Gridify; /** * Test AOP target interface. @@ -84,4 +83,4 @@ public interface TestAopTargetInterface extends Serializable { */ @Gridify(gridName="TestAopTargetInterface", taskName = TestGridifyTask.TASK_NAME) public int gridifyNonDefaultNameResource(String arg) throws TestGridifyException; -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/aop/src/test/java/org/apache/ignite/gridify/TestGridifyException.java ---------------------------------------------------------------------- diff --git a/modules/aop/src/test/java/org/apache/ignite/gridify/TestGridifyException.java b/modules/aop/src/test/java/org/apache/ignite/gridify/TestGridifyException.java index aa340b6..ae57a41 100644 --- a/modules/aop/src/test/java/org/apache/ignite/gridify/TestGridifyException.java +++ b/modules/aop/src/test/java/org/apache/ignite/gridify/TestGridifyException.java @@ -35,4 +35,4 @@ public class TestGridifyException extends Exception { public TestGridifyException(String msg, Throwable cause) { super(msg, cause); } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/aop/src/test/java/org/apache/ignite/gridify/TestGridifyJob.java ---------------------------------------------------------------------- diff --git a/modules/aop/src/test/java/org/apache/ignite/gridify/TestGridifyJob.java b/modules/aop/src/test/java/org/apache/ignite/gridify/TestGridifyJob.java index 41f5025..f2cce5e 100644 --- a/modules/aop/src/test/java/org/apache/ignite/gridify/TestGridifyJob.java +++ b/modules/aop/src/test/java/org/apache/ignite/gridify/TestGridifyJob.java @@ -17,11 +17,10 @@ package org.apache.ignite.gridify; -import org.apache.ignite.*; -import org.apache.ignite.compute.*; -import org.apache.ignite.resources.*; - -import java.io.*; +import java.io.Serializable; +import org.apache.ignite.IgniteLogger; +import org.apache.ignite.compute.ComputeJobAdapter; +import org.apache.ignite.resources.LoggerResource; /** * Test gridify job. @@ -64,4 +63,4 @@ public class TestGridifyJob extends ComputeJobAdapter { // Never reached. return null; } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/aop/src/test/java/org/apache/ignite/gridify/TestGridifyTask.java ---------------------------------------------------------------------- diff --git a/modules/aop/src/test/java/org/apache/ignite/gridify/TestGridifyTask.java b/modules/aop/src/test/java/org/apache/ignite/gridify/TestGridifyTask.java index fc0af80..ede4d18 100644 --- a/modules/aop/src/test/java/org/apache/ignite/gridify/TestGridifyTask.java +++ b/modules/aop/src/test/java/org/apache/ignite/gridify/TestGridifyTask.java @@ -17,10 +17,14 @@ package org.apache.ignite.gridify; -import org.apache.ignite.compute.*; -import org.apache.ignite.compute.gridify.*; - -import java.util.*; +import java.util.Collection; +import java.util.Collections; +import java.util.List; +import org.apache.ignite.compute.ComputeJob; +import org.apache.ignite.compute.ComputeJobResult; +import org.apache.ignite.compute.ComputeTaskName; +import org.apache.ignite.compute.ComputeTaskSplitAdapter; +import org.apache.ignite.compute.gridify.GridifyArgument; /** * Test gridify task. @@ -43,4 +47,4 @@ public class TestGridifyTask extends ComputeTaskSplitAdapter<GridifyArgument, Ob return results.get(0).getData(); } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/aop/src/test/java/org/apache/ignite/gridify/hierarchy/GridifyHierarchyTest.java ---------------------------------------------------------------------- diff --git a/modules/aop/src/test/java/org/apache/ignite/gridify/hierarchy/GridifyHierarchyTest.java b/modules/aop/src/test/java/org/apache/ignite/gridify/hierarchy/GridifyHierarchyTest.java index 51b1135..a33482e 100644 --- a/modules/aop/src/test/java/org/apache/ignite/gridify/hierarchy/GridifyHierarchyTest.java +++ b/modules/aop/src/test/java/org/apache/ignite/gridify/hierarchy/GridifyHierarchyTest.java @@ -17,7 +17,7 @@ package org.apache.ignite.gridify.hierarchy; -import org.apache.ignite.testframework.junits.common.*; +import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; /** * Gridify hierarchy test. @@ -48,4 +48,4 @@ public class GridifyHierarchyTest extends GridCommonAbstractTest { @Override public String getTestGridName() { return "GridifyHierarchyTest"; } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/aop/src/test/java/org/apache/ignite/gridify/hierarchy/SuperTarget.java ---------------------------------------------------------------------- diff --git a/modules/aop/src/test/java/org/apache/ignite/gridify/hierarchy/SuperTarget.java b/modules/aop/src/test/java/org/apache/ignite/gridify/hierarchy/SuperTarget.java index c2ba1b0..f2e2663 100644 --- a/modules/aop/src/test/java/org/apache/ignite/gridify/hierarchy/SuperTarget.java +++ b/modules/aop/src/test/java/org/apache/ignite/gridify/hierarchy/SuperTarget.java @@ -17,7 +17,7 @@ package org.apache.ignite.gridify.hierarchy; -import org.apache.ignite.compute.gridify.*; +import org.apache.ignite.compute.gridify.Gridify; /** * Target base class. @@ -50,4 +50,4 @@ public abstract class SuperTarget { return "SuperTarget.methodC()"; } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/aop/src/test/java/org/apache/ignite/gridify/hierarchy/Target.java ---------------------------------------------------------------------- diff --git a/modules/aop/src/test/java/org/apache/ignite/gridify/hierarchy/Target.java b/modules/aop/src/test/java/org/apache/ignite/gridify/hierarchy/Target.java index 42e7872..f73f1e9 100644 --- a/modules/aop/src/test/java/org/apache/ignite/gridify/hierarchy/Target.java +++ b/modules/aop/src/test/java/org/apache/ignite/gridify/hierarchy/Target.java @@ -42,4 +42,4 @@ public class Target extends SuperTarget { return res; } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/aop/src/test/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerAopTest.java ---------------------------------------------------------------------- diff --git a/modules/aop/src/test/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerAopTest.java b/modules/aop/src/test/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerAopTest.java index 0ae80de..7985fb2 100644 --- a/modules/aop/src/test/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerAopTest.java +++ b/modules/aop/src/test/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerAopTest.java @@ -17,16 +17,16 @@ package org.apache.ignite.marshaller.optimized; -import org.apache.ignite.compute.gridify.*; -import org.apache.ignite.configuration.*; -import org.apache.ignite.events.*; -import org.apache.ignite.internal.util.typedef.*; -import org.apache.ignite.lang.*; -import org.apache.ignite.testframework.junits.common.*; +import java.util.concurrent.atomic.AtomicInteger; +import org.apache.ignite.compute.gridify.Gridify; +import org.apache.ignite.configuration.IgniteConfiguration; +import org.apache.ignite.events.Event; +import org.apache.ignite.internal.util.typedef.G; +import org.apache.ignite.internal.util.typedef.X; +import org.apache.ignite.lang.IgnitePredicate; +import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; -import java.util.concurrent.atomic.*; - -import static org.apache.ignite.events.EventType.*; +import static org.apache.ignite.events.EventType.EVT_TASK_FINISHED; /** * Test use GridOptimizedMarshaller and AspectJ AOP. @@ -101,4 +101,4 @@ public class OptimizedMarshallerAopTest extends GridCommonAbstractTest { private void gridify1() { X.println("Executes on grid"); } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/aop/src/test/java/org/apache/ignite/p2p/P2PGridifySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/aop/src/test/java/org/apache/ignite/p2p/P2PGridifySelfTest.java b/modules/aop/src/test/java/org/apache/ignite/p2p/P2PGridifySelfTest.java index 8bee327..3a22dde 100644 --- a/modules/aop/src/test/java/org/apache/ignite/p2p/P2PGridifySelfTest.java +++ b/modules/aop/src/test/java/org/apache/ignite/p2p/P2PGridifySelfTest.java @@ -17,15 +17,17 @@ package org.apache.ignite.p2p; -import org.apache.ignite.*; -import org.apache.ignite.compute.*; -import org.apache.ignite.compute.gridify.*; -import org.apache.ignite.configuration.*; -import org.apache.ignite.testframework.*; -import org.apache.ignite.testframework.junits.common.*; - -import java.io.*; -import java.util.*; +import java.io.IOException; +import java.io.InputStream; +import java.util.Collections; +import org.apache.ignite.Ignite; +import org.apache.ignite.compute.ComputeTask; +import org.apache.ignite.compute.gridify.Gridify; +import org.apache.ignite.configuration.DeploymentMode; +import org.apache.ignite.configuration.IgniteConfiguration; +import org.apache.ignite.testframework.GridTestClassLoader; +import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; +import org.apache.ignite.testframework.junits.common.GridCommonTest; /** * @@ -238,4 +240,4 @@ public class P2PGridifySelfTest extends GridCommonAbstractTest { public void testResourceSharedMode() throws Exception { processTestGridifyResource(DeploymentMode.SHARED); } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/aop/src/test/java/org/apache/ignite/testsuites/IgniteAopSelfTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/aop/src/test/java/org/apache/ignite/testsuites/IgniteAopSelfTestSuite.java b/modules/aop/src/test/java/org/apache/ignite/testsuites/IgniteAopSelfTestSuite.java index 5c2ab54..7c2d3ea 100644 --- a/modules/aop/src/test/java/org/apache/ignite/testsuites/IgniteAopSelfTestSuite.java +++ b/modules/aop/src/test/java/org/apache/ignite/testsuites/IgniteAopSelfTestSuite.java @@ -17,12 +17,16 @@ package org.apache.ignite.testsuites; -import junit.framework.*; -import org.apache.ignite.gridify.*; -import org.apache.ignite.testframework.*; -import org.test.gridify.*; +import junit.framework.TestSuite; +import org.apache.ignite.gridify.BasicAopSelfTest; +import org.apache.ignite.gridify.GridifySetToXXXNonSpringAopSelfTest; +import org.apache.ignite.gridify.GridifySetToXXXSpringAopSelfTest; +import org.apache.ignite.gridify.NonSpringAopSelfTest; +import org.apache.ignite.gridify.SpringAopSelfTest; +import org.apache.ignite.testframework.GridTestUtils; +import org.test.gridify.ExternalNonSpringAopSelfTest; -import static org.apache.ignite.IgniteSystemProperties.*; +import static org.apache.ignite.IgniteSystemProperties.IGNITE_OVERRIDE_MCAST_GRP; /** * AOP test suite. @@ -49,4 +53,4 @@ public class IgniteAopSelfTestSuite extends TestSuite { return suite; } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/aop/src/test/java/org/apache/loadtests/direct/singlesplit/SingleSplitTestJobTarget.java ---------------------------------------------------------------------- diff --git a/modules/aop/src/test/java/org/apache/loadtests/direct/singlesplit/SingleSplitTestJobTarget.java b/modules/aop/src/test/java/org/apache/loadtests/direct/singlesplit/SingleSplitTestJobTarget.java index 1bdcd49..cf8e23c 100644 --- a/modules/aop/src/test/java/org/apache/loadtests/direct/singlesplit/SingleSplitTestJobTarget.java +++ b/modules/aop/src/test/java/org/apache/loadtests/direct/singlesplit/SingleSplitTestJobTarget.java @@ -17,9 +17,9 @@ package org.apache.loadtests.direct.singlesplit; -import org.apache.ignite.compute.*; -import org.apache.ignite.compute.gridify.*; -import org.apache.loadtests.gridify.*; +import org.apache.ignite.compute.ComputeTaskSession; +import org.apache.ignite.compute.gridify.Gridify; +import org.apache.loadtests.gridify.GridifyLoadTestTask; /** * Single split test job target. @@ -41,4 +41,4 @@ public class SingleSplitTestJobTarget { return 1; } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/aop/src/test/java/org/apache/loadtests/direct/singlesplit/SingleSplitTestTask.java ---------------------------------------------------------------------- diff --git a/modules/aop/src/test/java/org/apache/loadtests/direct/singlesplit/SingleSplitTestTask.java b/modules/aop/src/test/java/org/apache/loadtests/direct/singlesplit/SingleSplitTestTask.java index 0c55204..d6fa18f 100644 --- a/modules/aop/src/test/java/org/apache/loadtests/direct/singlesplit/SingleSplitTestTask.java +++ b/modules/aop/src/test/java/org/apache/loadtests/direct/singlesplit/SingleSplitTestTask.java @@ -17,11 +17,21 @@ package org.apache.loadtests.direct.singlesplit; -import org.apache.ignite.cluster.*; -import org.apache.ignite.compute.*; -import org.apache.ignite.resources.*; - -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.UUID; +import org.apache.ignite.cluster.ClusterNode; +import org.apache.ignite.compute.ComputeJob; +import org.apache.ignite.compute.ComputeJobAdapter; +import org.apache.ignite.compute.ComputeJobResult; +import org.apache.ignite.compute.ComputeLoadBalancer; +import org.apache.ignite.compute.ComputeTaskAdapter; +import org.apache.ignite.compute.ComputeTaskSession; +import org.apache.ignite.resources.LoadBalancerResource; +import org.apache.ignite.resources.TaskSessionResource; /** * Single split test task. @@ -90,4 +100,4 @@ public class SingleSplitTestTask extends ComputeTaskAdapter<Integer, Integer> { return retVal; } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/aop/src/test/java/org/apache/loadtests/direct/singlesplit/SingleSplitsLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/aop/src/test/java/org/apache/loadtests/direct/singlesplit/SingleSplitsLoadTest.java b/modules/aop/src/test/java/org/apache/loadtests/direct/singlesplit/SingleSplitsLoadTest.java index ec9d8b1..dc9760d 100644 --- a/modules/aop/src/test/java/org/apache/loadtests/direct/singlesplit/SingleSplitsLoadTest.java +++ b/modules/aop/src/test/java/org/apache/loadtests/direct/singlesplit/SingleSplitsLoadTest.java @@ -17,18 +17,21 @@ package org.apache.loadtests.direct.singlesplit; -import org.apache.ignite.*; -import org.apache.ignite.compute.*; -import org.apache.ignite.configuration.*; -import org.apache.ignite.internal.util.typedef.*; -import org.apache.ignite.loadtest.*; -import org.apache.ignite.logger.log4j.*; -import org.apache.ignite.spi.communication.tcp.*; -import org.apache.ignite.spi.discovery.tcp.*; -import org.apache.ignite.testframework.*; -import org.apache.ignite.testframework.config.*; -import org.apache.ignite.testframework.junits.common.*; -import org.apache.log4j.*; +import org.apache.ignite.Ignite; +import org.apache.ignite.IgniteCompute; +import org.apache.ignite.IgniteException; +import org.apache.ignite.compute.ComputeTaskFuture; +import org.apache.ignite.configuration.IgniteConfiguration; +import org.apache.ignite.internal.util.typedef.G; +import org.apache.ignite.loadtest.GridLoadTestStatistics; +import org.apache.ignite.logger.log4j.Log4JLogger; +import org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi; +import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; +import org.apache.ignite.testframework.GridTestUtils; +import org.apache.ignite.testframework.config.GridTestProperties; +import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; +import org.apache.ignite.testframework.junits.common.GridCommonTest; +import org.apache.log4j.Level; /** * Single split load test. @@ -128,4 +131,4 @@ public class SingleSplitsLoadTest extends GridCommonAbstractTest { info("Final test statistics: " + stats); } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/aop/src/test/java/org/apache/loadtests/gridify/GridifyLoadTestJobTarget.java ---------------------------------------------------------------------- diff --git a/modules/aop/src/test/java/org/apache/loadtests/gridify/GridifyLoadTestJobTarget.java b/modules/aop/src/test/java/org/apache/loadtests/gridify/GridifyLoadTestJobTarget.java index dcafd5c..9cfe7ec 100644 --- a/modules/aop/src/test/java/org/apache/loadtests/gridify/GridifyLoadTestJobTarget.java +++ b/modules/aop/src/test/java/org/apache/loadtests/gridify/GridifyLoadTestJobTarget.java @@ -17,7 +17,7 @@ package org.apache.loadtests.gridify; -import org.apache.ignite.compute.gridify.*; +import org.apache.ignite.compute.gridify.Gridify; /** * Gridify load test job target. @@ -34,4 +34,4 @@ public class GridifyLoadTestJobTarget { return 1; } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/aop/src/test/java/org/apache/loadtests/gridify/GridifyLoadTestTask.java ---------------------------------------------------------------------- diff --git a/modules/aop/src/test/java/org/apache/loadtests/gridify/GridifyLoadTestTask.java b/modules/aop/src/test/java/org/apache/loadtests/gridify/GridifyLoadTestTask.java index 4c11e9f..d4a1a3f 100644 --- a/modules/aop/src/test/java/org/apache/loadtests/gridify/GridifyLoadTestTask.java +++ b/modules/aop/src/test/java/org/apache/loadtests/gridify/GridifyLoadTestTask.java @@ -17,12 +17,16 @@ package org.apache.loadtests.gridify; -import org.apache.ignite.*; -import org.apache.ignite.compute.*; -import org.apache.ignite.compute.gridify.*; - -import java.io.*; -import java.util.*; +import java.io.Serializable; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import org.apache.ignite.IgniteException; +import org.apache.ignite.compute.ComputeJob; +import org.apache.ignite.compute.ComputeJobAdapter; +import org.apache.ignite.compute.ComputeJobResult; +import org.apache.ignite.compute.ComputeTaskSplitAdapter; +import org.apache.ignite.compute.gridify.GridifyArgument; /** * Gridify load test task. @@ -67,4 +71,4 @@ public class GridifyLoadTestTask extends ComputeTaskSplitAdapter<GridifyArgument return retVal; } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/aop/src/test/java/org/apache/loadtests/gridify/GridifySingleSplitLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/aop/src/test/java/org/apache/loadtests/gridify/GridifySingleSplitLoadTest.java b/modules/aop/src/test/java/org/apache/loadtests/gridify/GridifySingleSplitLoadTest.java index dcaf6bd..317a43d 100644 --- a/modules/aop/src/test/java/org/apache/loadtests/gridify/GridifySingleSplitLoadTest.java +++ b/modules/aop/src/test/java/org/apache/loadtests/gridify/GridifySingleSplitLoadTest.java @@ -17,21 +17,20 @@ package org.apache.loadtests.gridify; -import org.apache.ignite.*; -import org.apache.ignite.configuration.*; -import org.apache.ignite.internal.util.typedef.*; -import org.apache.ignite.loadtest.*; -import org.apache.ignite.logger.log4j.*; -import org.apache.ignite.spi.communication.*; -import org.apache.ignite.spi.communication.tcp.*; -import org.apache.ignite.spi.discovery.*; -import org.apache.ignite.spi.discovery.tcp.*; -import org.apache.ignite.testframework.*; -import org.apache.ignite.testframework.config.*; -import org.apache.ignite.testframework.junits.common.*; -import org.apache.log4j.*; - -import java.util.concurrent.*; +import org.apache.ignite.Ignite; +import org.apache.ignite.configuration.IgniteConfiguration; +import org.apache.ignite.internal.util.typedef.G; +import org.apache.ignite.loadtest.GridLoadTestStatistics; +import org.apache.ignite.logger.log4j.Log4JLogger; +import org.apache.ignite.spi.communication.CommunicationSpi; +import org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi; +import org.apache.ignite.spi.discovery.DiscoverySpi; +import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; +import org.apache.ignite.testframework.GridTestUtils; +import org.apache.ignite.testframework.config.GridTestProperties; +import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; +import org.apache.ignite.testframework.junits.common.GridCommonTest; +import org.apache.log4j.Level; /** * Gridify single split load test. @@ -153,4 +152,4 @@ public class GridifySingleSplitLoadTest extends GridCommonAbstractTest { return num == 1 ? 1 : num * factorial(num - 1); } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/aop/src/test/java/org/test/gridify/ExternalAopTarget.java ---------------------------------------------------------------------- diff --git a/modules/aop/src/test/java/org/test/gridify/ExternalAopTarget.java b/modules/aop/src/test/java/org/test/gridify/ExternalAopTarget.java index c2d0f30..b3d17a5 100644 --- a/modules/aop/src/test/java/org/test/gridify/ExternalAopTarget.java +++ b/modules/aop/src/test/java/org/test/gridify/ExternalAopTarget.java @@ -17,10 +17,10 @@ package org.test.gridify; -import org.apache.ignite.compute.gridify.*; - -import java.io.*; -import java.util.*; +import java.io.IOException; +import java.io.InputStream; +import java.util.Properties; +import org.apache.ignite.compute.gridify.Gridify; /** * AOP target. @@ -131,4 +131,4 @@ public class ExternalAopTarget { throw new ExternalGridifyException("Failed to test load properties file.", e); } } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/aop/src/test/java/org/test/gridify/ExternalGridifyException.java ---------------------------------------------------------------------- diff --git a/modules/aop/src/test/java/org/test/gridify/ExternalGridifyException.java b/modules/aop/src/test/java/org/test/gridify/ExternalGridifyException.java index d6954c6..34a2fb3 100644 --- a/modules/aop/src/test/java/org/test/gridify/ExternalGridifyException.java +++ b/modules/aop/src/test/java/org/test/gridify/ExternalGridifyException.java @@ -35,4 +35,4 @@ public class ExternalGridifyException extends Exception { public ExternalGridifyException(String msg, Throwable cause) { super(msg, cause); } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/aop/src/test/java/org/test/gridify/ExternalGridifyTask.java ---------------------------------------------------------------------- diff --git a/modules/aop/src/test/java/org/test/gridify/ExternalGridifyTask.java b/modules/aop/src/test/java/org/test/gridify/ExternalGridifyTask.java index 31e95ba..ff067db 100644 --- a/modules/aop/src/test/java/org/test/gridify/ExternalGridifyTask.java +++ b/modules/aop/src/test/java/org/test/gridify/ExternalGridifyTask.java @@ -17,13 +17,17 @@ package org.test.gridify; -import org.apache.ignite.*; -import org.apache.ignite.compute.*; -import org.apache.ignite.compute.gridify.*; -import org.apache.ignite.resources.*; - -import java.io.*; -import java.util.*; +import java.io.Serializable; +import java.util.Collection; +import java.util.Collections; +import java.util.List; +import org.apache.ignite.IgniteLogger; +import org.apache.ignite.compute.ComputeJob; +import org.apache.ignite.compute.ComputeJobAdapter; +import org.apache.ignite.compute.ComputeJobResult; +import org.apache.ignite.compute.ComputeTaskSplitAdapter; +import org.apache.ignite.compute.gridify.GridifyArgument; +import org.apache.ignite.resources.LoggerResource; /** * External gridify task. @@ -76,4 +80,4 @@ public class ExternalGridifyTask extends ComputeTaskSplitAdapter<GridifyArgument return results.get(0).getData(); } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/aop/src/test/java/org/test/gridify/ExternalNonSpringAopSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/aop/src/test/java/org/test/gridify/ExternalNonSpringAopSelfTest.java b/modules/aop/src/test/java/org/test/gridify/ExternalNonSpringAopSelfTest.java index 56a63c8..998ddac 100644 --- a/modules/aop/src/test/java/org/test/gridify/ExternalNonSpringAopSelfTest.java +++ b/modules/aop/src/test/java/org/test/gridify/ExternalNonSpringAopSelfTest.java @@ -17,12 +17,15 @@ package org.test.gridify; -import org.apache.ignite.configuration.*; -import org.apache.ignite.gridify.*; -import org.apache.ignite.internal.util.typedef.*; -import org.apache.ignite.spi.deployment.local.*; -import org.apache.ignite.spi.discovery.tcp.*; -import org.apache.ignite.testframework.junits.common.*; +import org.apache.ignite.configuration.DeploymentMode; +import org.apache.ignite.configuration.IgniteConfiguration; +import org.apache.ignite.gridify.TestGridifyException; +import org.apache.ignite.gridify.TestGridifyTask; +import org.apache.ignite.internal.util.typedef.G; +import org.apache.ignite.spi.deployment.local.LocalDeploymentSpi; +import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; +import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; +import org.apache.ignite.testframework.junits.common.GridCommonTest; /** * To run this test with JBoss AOP make sure of the following: @@ -536,4 +539,4 @@ public class ExternalNonSpringAopSelfTest extends GridCommonAbstractTest { @Override public String getTestGridName() { return "ExternalAopTarget"; } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/aws/src/main/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointData.java ---------------------------------------------------------------------- diff --git a/modules/aws/src/main/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointData.java b/modules/aws/src/main/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointData.java index 9b18615..3cee121 100644 --- a/modules/aws/src/main/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointData.java +++ b/modules/aws/src/main/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointData.java @@ -17,9 +17,10 @@ package org.apache.ignite.spi.checkpoint.s3; -import org.apache.ignite.internal.util.typedef.internal.*; - -import java.io.*; +import java.io.IOException; +import java.io.InputStream; +import org.apache.ignite.internal.util.typedef.internal.S; +import org.apache.ignite.internal.util.typedef.internal.U; /** * Wrapper of all checkpoint that are saved to the S3. It @@ -142,4 +143,4 @@ class S3CheckpointData { @Override public String toString() { return S.toString(S3CheckpointData.class, this); } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/aws/src/main/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpi.java ---------------------------------------------------------------------- diff --git a/modules/aws/src/main/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpi.java b/modules/aws/src/main/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpi.java index c5a428a..ed72d14 100644 --- a/modules/aws/src/main/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpi.java +++ b/modules/aws/src/main/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpi.java @@ -17,23 +17,45 @@ package org.apache.ignite.spi.checkpoint.s3; -import com.amazonaws.*; -import com.amazonaws.auth.*; -import com.amazonaws.services.s3.*; -import com.amazonaws.services.s3.model.*; -import org.apache.ignite.*; -import org.apache.ignite.internal.*; -import org.apache.ignite.internal.util.*; -import org.apache.ignite.internal.util.tostring.*; -import org.apache.ignite.internal.util.typedef.*; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.apache.ignite.resources.*; -import org.apache.ignite.spi.*; -import org.apache.ignite.spi.checkpoint.*; -import org.jetbrains.annotations.*; - -import java.io.*; -import java.util.*; +import com.amazonaws.AmazonClientException; +import com.amazonaws.AmazonServiceException; +import com.amazonaws.ClientConfiguration; +import com.amazonaws.auth.AWSCredentials; +import com.amazonaws.services.s3.AmazonS3; +import com.amazonaws.services.s3.AmazonS3Client; +import com.amazonaws.services.s3.model.ObjectListing; +import com.amazonaws.services.s3.model.ObjectMetadata; +import com.amazonaws.services.s3.model.S3Object; +import com.amazonaws.services.s3.model.S3ObjectSummary; +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.util.Arrays; +import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.Map; +import org.apache.ignite.Ignite; +import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.IgniteLogger; +import org.apache.ignite.internal.IgniteInterruptedCheckedException; +import org.apache.ignite.internal.util.IgniteUtils; +import org.apache.ignite.internal.util.tostring.GridToStringExclude; +import org.apache.ignite.internal.util.typedef.F; +import org.apache.ignite.internal.util.typedef.internal.S; +import org.apache.ignite.internal.util.typedef.internal.U; +import org.apache.ignite.resources.IgniteInstanceResource; +import org.apache.ignite.resources.LoggerResource; +import org.apache.ignite.spi.IgniteSpiAdapter; +import org.apache.ignite.spi.IgniteSpiConfiguration; +import org.apache.ignite.spi.IgniteSpiException; +import org.apache.ignite.spi.IgniteSpiMultipleInstancesSupport; +import org.apache.ignite.spi.IgniteSpiThread; +import org.apache.ignite.spi.checkpoint.CheckpointListener; +import org.apache.ignite.spi.checkpoint.CheckpointSpi; +import org.jetbrains.annotations.Nullable; /** * This class defines Amazon S3-based implementation for checkpoint SPI. @@ -680,4 +702,4 @@ public class S3CheckpointSpi extends IgniteSpiAdapter implements CheckpointSpi, return S.toString(S3TimeoutWorker.class, this); } } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/aws/src/main/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpiMBean.java ---------------------------------------------------------------------- diff --git a/modules/aws/src/main/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpiMBean.java b/modules/aws/src/main/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpiMBean.java index 528e60f..5c7c8a5d 100644 --- a/modules/aws/src/main/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpiMBean.java +++ b/modules/aws/src/main/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpiMBean.java @@ -17,8 +17,8 @@ package org.apache.ignite.spi.checkpoint.s3; -import org.apache.ignite.mxbean.*; -import org.apache.ignite.spi.*; +import org.apache.ignite.mxbean.MXBeanDescription; +import org.apache.ignite.spi.IgniteSpiManagementMBean; /** * Management bean for {@link S3CheckpointSpi}. @@ -56,4 +56,4 @@ public interface S3CheckpointSpiMBean extends IgniteSpiManagementMBean { */ @MXBeanDescription("HTTP proxy user name.") public String getProxyUsername(); -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/aws/src/main/java/org/apache/ignite/spi/checkpoint/s3/S3TimeData.java ---------------------------------------------------------------------- diff --git a/modules/aws/src/main/java/org/apache/ignite/spi/checkpoint/s3/S3TimeData.java b/modules/aws/src/main/java/org/apache/ignite/spi/checkpoint/s3/S3TimeData.java index 8d9ae43..1a0a437 100644 --- a/modules/aws/src/main/java/org/apache/ignite/spi/checkpoint/s3/S3TimeData.java +++ b/modules/aws/src/main/java/org/apache/ignite/spi/checkpoint/s3/S3TimeData.java @@ -17,7 +17,7 @@ package org.apache.ignite.spi.checkpoint.s3; -import org.apache.ignite.internal.util.typedef.internal.*; +import org.apache.ignite.internal.util.typedef.internal.S; /** * Helper class that keeps checkpoint expiration date inside to track and delete @@ -76,4 +76,4 @@ class S3TimeData { @Override public String toString() { return S.toString(S3TimeData.class, this); } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/aws/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/s3/TcpDiscoveryS3IpFinder.java ---------------------------------------------------------------------- diff --git a/modules/aws/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/s3/TcpDiscoveryS3IpFinder.java b/modules/aws/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/s3/TcpDiscoveryS3IpFinder.java index 78f4ad1..86e4eb2 100644 --- a/modules/aws/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/s3/TcpDiscoveryS3IpFinder.java +++ b/modules/aws/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/s3/TcpDiscoveryS3IpFinder.java @@ -17,24 +17,32 @@ package org.apache.ignite.spi.discovery.tcp.ipfinder.s3; -import com.amazonaws.*; -import com.amazonaws.auth.*; -import com.amazonaws.services.s3.*; -import com.amazonaws.services.s3.model.*; -import org.apache.ignite.*; -import org.apache.ignite.internal.*; -import org.apache.ignite.internal.util.tostring.*; -import org.apache.ignite.internal.util.typedef.*; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.apache.ignite.resources.*; -import org.apache.ignite.spi.*; -import org.apache.ignite.spi.discovery.tcp.ipfinder.*; - -import java.io.*; -import java.net.*; -import java.util.*; -import java.util.concurrent.*; -import java.util.concurrent.atomic.*; +import com.amazonaws.AmazonClientException; +import com.amazonaws.ClientConfiguration; +import com.amazonaws.auth.AWSCredentials; +import com.amazonaws.services.s3.AmazonS3; +import com.amazonaws.services.s3.AmazonS3Client; +import com.amazonaws.services.s3.model.ObjectListing; +import com.amazonaws.services.s3.model.ObjectMetadata; +import com.amazonaws.services.s3.model.S3ObjectSummary; +import java.io.ByteArrayInputStream; +import java.net.InetSocketAddress; +import java.util.Collection; +import java.util.LinkedList; +import java.util.StringTokenizer; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.atomic.AtomicBoolean; +import org.apache.ignite.IgniteLogger; +import org.apache.ignite.internal.IgniteInterruptedCheckedException; +import org.apache.ignite.internal.util.tostring.GridToStringExclude; +import org.apache.ignite.internal.util.typedef.F; +import org.apache.ignite.internal.util.typedef.internal.S; +import org.apache.ignite.internal.util.typedef.internal.SB; +import org.apache.ignite.internal.util.typedef.internal.U; +import org.apache.ignite.resources.LoggerResource; +import org.apache.ignite.spi.IgniteSpiConfiguration; +import org.apache.ignite.spi.IgniteSpiException; +import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinderAdapter; /** * AWS S3-based IP finder. @@ -317,4 +325,4 @@ public class TcpDiscoveryS3IpFinder extends TcpDiscoveryIpFinderAdapter { @Override public String toString() { return S.toString(TcpDiscoveryS3IpFinder.class, this, "super", super.toString()); } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointManagerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointManagerSelfTest.java b/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointManagerSelfTest.java index b01ba81..db09e33 100644 --- a/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointManagerSelfTest.java +++ b/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointManagerSelfTest.java @@ -17,10 +17,11 @@ package org.apache.ignite.spi.checkpoint.s3; -import com.amazonaws.auth.*; -import org.apache.ignite.configuration.*; -import org.apache.ignite.internal.managers.checkpoint.*; -import org.apache.ignite.testsuites.*; +import com.amazonaws.auth.AWSCredentials; +import com.amazonaws.auth.BasicAWSCredentials; +import org.apache.ignite.configuration.IgniteConfiguration; +import org.apache.ignite.internal.managers.checkpoint.GridCheckpointManagerAbstractSelfTest; +import org.apache.ignite.testsuites.IgniteS3TestSuite; /** * Checkpoint manager test using {@link S3CheckpointSpi}. @@ -63,4 +64,4 @@ public class S3CheckpointManagerSelfTest extends GridCheckpointManagerAbstractSe doMultiNodeTest("s3"); } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpiConfigSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpiConfigSelfTest.java b/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpiConfigSelfTest.java index c942d63..727845b 100644 --- a/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpiConfigSelfTest.java +++ b/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpiConfigSelfTest.java @@ -17,7 +17,8 @@ package org.apache.ignite.spi.checkpoint.s3; -import org.apache.ignite.testframework.junits.spi.*; +import org.apache.ignite.testframework.junits.spi.GridSpiAbstractConfigTest; +import org.apache.ignite.testframework.junits.spi.GridSpiTest; /** * Grid S3 checkpoint SPI config self test. @@ -30,4 +31,4 @@ public class S3CheckpointSpiConfigSelfTest extends GridSpiAbstractConfigTest<S3C public void testNegativeConfig() throws Exception { checkNegativeSpiProperty(new S3CheckpointSpi(), "awsCredentials", null); } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpiSelfTest.java b/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpiSelfTest.java index 5894678..11e5bad 100644 --- a/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpiSelfTest.java +++ b/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpiSelfTest.java @@ -17,18 +17,24 @@ package org.apache.ignite.spi.checkpoint.s3; -import com.amazonaws.*; -import com.amazonaws.auth.*; -import com.amazonaws.services.s3.*; -import com.amazonaws.services.s3.model.*; -import org.apache.ignite.*; -import org.apache.ignite.internal.*; -import org.apache.ignite.internal.util.lang.*; -import org.apache.ignite.spi.*; -import org.apache.ignite.spi.checkpoint.*; -import org.apache.ignite.testframework.*; -import org.apache.ignite.testframework.junits.spi.*; -import org.apache.ignite.testsuites.*; +import com.amazonaws.AmazonClientException; +import com.amazonaws.auth.AWSCredentials; +import com.amazonaws.auth.BasicAWSCredentials; +import com.amazonaws.services.s3.AmazonS3; +import com.amazonaws.services.s3.AmazonS3Client; +import com.amazonaws.services.s3.model.ObjectListing; +import com.amazonaws.services.s3.model.S3ObjectSummary; +import org.apache.ignite.GridTestIoUtils; +import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.internal.IgniteInterruptedCheckedException; +import org.apache.ignite.internal.util.lang.GridAbsClosure; +import org.apache.ignite.internal.util.lang.GridAbsClosureX; +import org.apache.ignite.spi.IgniteSpiException; +import org.apache.ignite.spi.checkpoint.GridCheckpointTestState; +import org.apache.ignite.testframework.GridTestUtils; +import org.apache.ignite.testframework.junits.spi.GridSpiAbstractTest; +import org.apache.ignite.testframework.junits.spi.GridSpiTest; +import org.apache.ignite.testsuites.IgniteS3TestSuite; /** * Grid S3 checkpoint SPI self test. @@ -212,4 +218,4 @@ public class S3CheckpointSpiSelfTest extends GridSpiAbstractTest<S3CheckpointSpi private void assertWithRetries(GridAbsClosureX assertion) throws IgniteInterruptedCheckedException { GridTestUtils.retryAssert(log, 6, 5000, assertion); } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpiStartStopSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpiStartStopSelfTest.java b/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpiStartStopSelfTest.java index 34f25ad..3995b09 100644 --- a/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpiStartStopSelfTest.java +++ b/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpiStartStopSelfTest.java @@ -17,10 +17,11 @@ package org.apache.ignite.spi.checkpoint.s3; -import com.amazonaws.auth.*; -import org.apache.ignite.spi.*; -import org.apache.ignite.testframework.junits.spi.*; -import org.apache.ignite.testsuites.*; +import com.amazonaws.auth.AWSCredentials; +import com.amazonaws.auth.BasicAWSCredentials; +import org.apache.ignite.spi.GridSpiStartStopAbstractTest; +import org.apache.ignite.testframework.junits.spi.GridSpiTest; +import org.apache.ignite.testsuites.IgniteS3TestSuite; /** * Grid S3 checkpoint SPI start stop self test. @@ -38,4 +39,4 @@ public class S3CheckpointSpiStartStopSelfTest extends GridSpiStartStopAbstractTe super.spiConfigure(spi); } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3SessionCheckpointSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3SessionCheckpointSelfTest.java b/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3SessionCheckpointSelfTest.java index c683cb3..e5dd074 100644 --- a/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3SessionCheckpointSelfTest.java +++ b/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3SessionCheckpointSelfTest.java @@ -17,10 +17,12 @@ package org.apache.ignite.spi.checkpoint.s3; -import com.amazonaws.auth.*; -import org.apache.ignite.configuration.*; -import org.apache.ignite.session.*; -import org.apache.ignite.testsuites.*; +import com.amazonaws.auth.AWSCredentials; +import com.amazonaws.auth.BasicAWSCredentials; +import org.apache.ignite.configuration.IgniteConfiguration; +import org.apache.ignite.session.GridSessionCheckpointAbstractSelfTest; +import org.apache.ignite.session.GridSessionCheckpointSelfTest; +import org.apache.ignite.testsuites.IgniteS3TestSuite; /** * Grid session checkpoint self test using {@link S3CheckpointSpi}. @@ -47,4 +49,4 @@ public class S3SessionCheckpointSelfTest extends GridSessionCheckpointAbstractSe checkCheckpoints(cfg); } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/aws/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/s3/TcpDiscoveryS3IpFinderSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/aws/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/s3/TcpDiscoveryS3IpFinderSelfTest.java b/modules/aws/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/s3/TcpDiscoveryS3IpFinderSelfTest.java index 8a7b528..73e8e55 100644 --- a/modules/aws/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/s3/TcpDiscoveryS3IpFinderSelfTest.java +++ b/modules/aws/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/s3/TcpDiscoveryS3IpFinderSelfTest.java @@ -17,13 +17,13 @@ package org.apache.ignite.spi.discovery.tcp.ipfinder.s3; -import com.amazonaws.auth.*; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.apache.ignite.spi.discovery.tcp.ipfinder.*; -import org.apache.ignite.testsuites.*; - -import java.net.*; -import java.util.*; +import com.amazonaws.auth.BasicAWSCredentials; +import java.net.InetAddress; +import java.net.InetSocketAddress; +import java.util.Collection; +import org.apache.ignite.internal.util.typedef.internal.U; +import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinderAbstractSelfTest; +import org.apache.ignite.testsuites.IgniteS3TestSuite; /** * TcpDiscoveryS3IpFinder test. @@ -69,4 +69,4 @@ public class TcpDiscoveryS3IpFinderSelfTest return finder; } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/aws/src/test/java/org/apache/ignite/testsuites/IgniteS3TestSuite.java ---------------------------------------------------------------------- diff --git a/modules/aws/src/test/java/org/apache/ignite/testsuites/IgniteS3TestSuite.java b/modules/aws/src/test/java/org/apache/ignite/testsuites/IgniteS3TestSuite.java index f286289..5c4ba97 100644 --- a/modules/aws/src/test/java/org/apache/ignite/testsuites/IgniteS3TestSuite.java +++ b/modules/aws/src/test/java/org/apache/ignite/testsuites/IgniteS3TestSuite.java @@ -17,9 +17,13 @@ package org.apache.ignite.testsuites; -import junit.framework.*; -import org.apache.ignite.spi.checkpoint.s3.*; -import org.apache.ignite.spi.discovery.tcp.ipfinder.s3.*; +import junit.framework.TestSuite; +import org.apache.ignite.spi.checkpoint.s3.S3CheckpointManagerSelfTest; +import org.apache.ignite.spi.checkpoint.s3.S3CheckpointSpiConfigSelfTest; +import org.apache.ignite.spi.checkpoint.s3.S3CheckpointSpiSelfTest; +import org.apache.ignite.spi.checkpoint.s3.S3CheckpointSpiStartStopSelfTest; +import org.apache.ignite.spi.checkpoint.s3.S3SessionCheckpointSelfTest; +import org.apache.ignite.spi.discovery.tcp.ipfinder.s3.TcpDiscoveryS3IpFinderSelfTest; /** * S3 integration tests. @@ -66,4 +70,4 @@ public class IgniteS3TestSuite extends TestSuite { return key; } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/clients/src/test/java/org/apache/ignite/internal/TaskEventSubjectIdSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/TaskEventSubjectIdSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/TaskEventSubjectIdSelfTest.java index 89a2e78..dea326c 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/TaskEventSubjectIdSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/TaskEventSubjectIdSelfTest.java @@ -17,21 +17,42 @@ package org.apache.ignite.internal; -import org.apache.ignite.*; -import org.apache.ignite.compute.*; -import org.apache.ignite.configuration.*; -import org.apache.ignite.events.*; -import org.apache.ignite.internal.client.*; -import org.apache.ignite.lang.*; -import org.apache.ignite.testframework.*; -import org.apache.ignite.testframework.junits.common.*; -import org.jetbrains.annotations.*; - -import java.util.*; -import java.util.concurrent.*; - -import static java.util.concurrent.TimeUnit.*; -import static org.apache.ignite.events.EventType.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.Iterator; +import java.util.List; +import java.util.UUID; +import java.util.concurrent.Callable; +import java.util.concurrent.CountDownLatch; +import org.apache.ignite.Ignite; +import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.IgniteException; +import org.apache.ignite.compute.ComputeJob; +import org.apache.ignite.compute.ComputeJobAdapter; +import org.apache.ignite.compute.ComputeJobResult; +import org.apache.ignite.compute.ComputeTaskSplitAdapter; +import org.apache.ignite.compute.ComputeTaskTimeoutException; +import org.apache.ignite.configuration.ConnectorConfiguration; +import org.apache.ignite.configuration.IgniteConfiguration; +import org.apache.ignite.events.Event; +import org.apache.ignite.events.TaskEvent; +import org.apache.ignite.internal.client.GridClient; +import org.apache.ignite.internal.client.GridClientConfiguration; +import org.apache.ignite.internal.client.GridClientFactory; +import org.apache.ignite.lang.IgnitePredicate; +import org.apache.ignite.lang.IgniteRunnable; +import org.apache.ignite.testframework.GridTestUtils; +import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; +import org.jetbrains.annotations.Nullable; + +import static java.util.concurrent.TimeUnit.MILLISECONDS; +import static org.apache.ignite.events.EventType.EVTS_TASK_EXECUTION; +import static org.apache.ignite.events.EventType.EVT_TASK_FAILED; +import static org.apache.ignite.events.EventType.EVT_TASK_FINISHED; +import static org.apache.ignite.events.EventType.EVT_TASK_REDUCED; +import static org.apache.ignite.events.EventType.EVT_TASK_STARTED; +import static org.apache.ignite.events.EventType.EVT_TASK_TIMEDOUT; /** * Tests for security subject ID in task events. @@ -389,4 +410,4 @@ public class TaskEventSubjectIdSelfTest extends GridCommonAbstractTest { return null; } } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientAbstractMultiThreadedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientAbstractMultiThreadedSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientAbstractMultiThreadedSelfTest.java index f1898df..9dd4d83 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientAbstractMultiThreadedSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientAbstractMultiThreadedSelfTest.java @@ -17,29 +17,43 @@ package org.apache.ignite.internal.client; -import org.apache.ignite.*; -import org.apache.ignite.cache.affinity.rendezvous.*; -import org.apache.ignite.compute.*; -import org.apache.ignite.configuration.*; -import org.apache.ignite.internal.*; -import org.apache.ignite.internal.client.balancer.*; -import org.apache.ignite.internal.client.ssl.*; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.apache.ignite.lang.*; -import org.apache.ignite.resources.*; -import org.apache.ignite.spi.discovery.tcp.*; -import org.apache.ignite.spi.discovery.tcp.ipfinder.*; -import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; -import org.apache.ignite.testframework.junits.common.*; -import org.jetbrains.annotations.*; - -import java.util.*; -import java.util.concurrent.*; -import java.util.concurrent.atomic.*; - -import static org.apache.ignite.cache.CacheAtomicityMode.*; -import static org.apache.ignite.cache.CacheMode.*; -import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.concurrent.ConcurrentLinkedQueue; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.concurrent.atomic.AtomicLong; +import java.util.concurrent.atomic.AtomicReference; +import org.apache.ignite.Ignite; +import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction; +import org.apache.ignite.compute.ComputeJob; +import org.apache.ignite.compute.ComputeJobAdapter; +import org.apache.ignite.compute.ComputeJobResult; +import org.apache.ignite.compute.ComputeTaskSplitAdapter; +import org.apache.ignite.configuration.CacheConfiguration; +import org.apache.ignite.configuration.ConnectorConfiguration; +import org.apache.ignite.configuration.IgniteConfiguration; +import org.apache.ignite.internal.IgniteInternalFuture; +import org.apache.ignite.internal.client.balancer.GridClientRoundRobinBalancer; +import org.apache.ignite.internal.client.ssl.GridSslContextFactory; +import org.apache.ignite.internal.util.typedef.internal.U; +import org.apache.ignite.lang.IgniteBiTuple; +import org.apache.ignite.resources.IgniteInstanceResource; +import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; +import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; +import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; +import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; +import org.jetbrains.annotations.Nullable; + +import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL; +import static org.apache.ignite.cache.CacheMode.LOCAL; +import static org.apache.ignite.cache.CacheMode.PARTITIONED; +import static org.apache.ignite.cache.CacheMode.REPLICATED; +import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC; /** * @@ -384,4 +398,4 @@ public abstract class ClientAbstractMultiThreadedSelfTest extends GridCommonAbst return locNodeId; } } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientDefaultCacheSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientDefaultCacheSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientDefaultCacheSelfTest.java index c8a92b5..f910b7d 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientDefaultCacheSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientDefaultCacheSelfTest.java @@ -17,19 +17,26 @@ package org.apache.ignite.internal.client; -import org.apache.ignite.cache.*; -import org.apache.ignite.configuration.*; -import org.apache.ignite.spi.discovery.tcp.*; -import org.apache.ignite.spi.discovery.tcp.ipfinder.*; -import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; -import org.apache.ignite.testframework.junits.common.*; - -import java.io.*; -import java.net.*; -import java.nio.charset.*; -import java.util.*; - -import static org.apache.ignite.IgniteSystemProperties.*; +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStreamReader; +import java.net.URL; +import java.net.URLConnection; +import java.nio.charset.StandardCharsets; +import java.util.ArrayList; +import java.util.Collection; +import java.util.UUID; +import org.apache.ignite.cache.CacheAtomicityMode; +import org.apache.ignite.cache.CacheMode; +import org.apache.ignite.configuration.CacheConfiguration; +import org.apache.ignite.configuration.ConnectorConfiguration; +import org.apache.ignite.configuration.IgniteConfiguration; +import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; +import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; +import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; +import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; + +import static org.apache.ignite.IgniteSystemProperties.IGNITE_JETTY_PORT; /** * Tests that client is able to connect to a grid with only default cache enabled. @@ -169,4 +176,4 @@ public class ClientDefaultCacheSelfTest extends GridCommonAbstractTest { "\"sessionToken\":\"\",\"successStatus\":0}", sendHttp("cmd=get&cacheName=" + LOCAL_CACHE + "&key=a")); } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientGetAffinityTask.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientGetAffinityTask.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientGetAffinityTask.java index b748cbd..94367d1 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientGetAffinityTask.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientGetAffinityTask.java @@ -17,15 +17,16 @@ package org.apache.ignite.internal.client; -import org.apache.ignite.*; -import org.apache.ignite.cluster.*; -import org.apache.ignite.compute.*; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.apache.ignite.resources.*; +import java.util.List; +import org.apache.ignite.Ignite; +import org.apache.ignite.cluster.ClusterNode; +import org.apache.ignite.compute.ComputeJobResult; +import org.apache.ignite.compute.ComputeJobResultPolicy; +import org.apache.ignite.internal.util.typedef.internal.A; +import org.apache.ignite.resources.IgniteInstanceResource; -import java.util.*; - -import static org.apache.ignite.compute.ComputeJobResultPolicy.*; +import static org.apache.ignite.compute.ComputeJobResultPolicy.FAILOVER; +import static org.apache.ignite.compute.ComputeJobResultPolicy.WAIT; /** * Get affinity for task argument. @@ -61,4 +62,4 @@ public class ClientGetAffinityTask extends TaskSingleJobSplitAdapter<String, Int return WAIT; } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientHttpTask.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientHttpTask.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientHttpTask.java index 9599e05..9604c29 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientHttpTask.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientHttpTask.java @@ -17,12 +17,19 @@ package org.apache.ignite.internal.client; -import net.sf.json.*; -import org.apache.ignite.compute.*; +import java.util.Collection; +import java.util.List; +import net.sf.json.JSON; +import net.sf.json.JSONArray; +import net.sf.json.JSONSerializer; +import net.sf.json.JsonConfig; +import org.apache.ignite.compute.ComputeJob; +import org.apache.ignite.compute.ComputeJobResult; +import org.apache.ignite.compute.ComputeJobResultPolicy; +import org.apache.ignite.compute.ComputeTaskSplitAdapter; -import java.util.*; - -import static org.apache.ignite.compute.ComputeJobResultPolicy.*; +import static org.apache.ignite.compute.ComputeJobResultPolicy.FAILOVER; +import static org.apache.ignite.compute.ComputeJobResultPolicy.WAIT; /** * Test task summarizes length of all strings in the arguments list. @@ -55,4 +62,4 @@ public class ClientHttpTask extends ComputeTaskSplitAdapter<String, Integer> { return WAIT; } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientNodeStartup.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientNodeStartup.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientNodeStartup.java index 83f1537..9bacfc0 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientNodeStartup.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientNodeStartup.java @@ -17,9 +17,10 @@ package org.apache.ignite.internal.client; -import org.apache.ignite.*; -import org.apache.ignite.internal.util.typedef.*; -import org.apache.ignite.internal.util.typedef.internal.*; +import org.apache.ignite.Ignite; +import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.internal.util.typedef.G; +import org.apache.ignite.internal.util.typedef.internal.U; /** * Starts up one grid node (server) with pre-defined ports and tasks to test client-server interactions. @@ -54,4 +55,4 @@ public class ClientNodeStartup { U.sleep(Long.MAX_VALUE); } } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientReconnectionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientReconnectionSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientReconnectionSelfTest.java index d1c764e..92c8e76 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientReconnectionSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientReconnectionSelfTest.java @@ -17,13 +17,13 @@ package org.apache.ignite.internal.client; -import org.apache.ignite.*; -import org.apache.ignite.internal.client.impl.connection.*; -import org.apache.ignite.internal.util.typedef.*; -import org.apache.ignite.testframework.junits.common.*; - -import java.nio.channels.*; -import java.util.*; +import java.nio.channels.ClosedChannelException; +import java.util.ArrayList; +import java.util.Collection; +import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.internal.client.impl.connection.GridClientConnectionResetException; +import org.apache.ignite.internal.util.typedef.X; +import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; /** * @@ -235,4 +235,4 @@ public class ClientReconnectionSelfTest extends GridCommonAbstractTest { return srv; } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientSslNodeStartup.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientSslNodeStartup.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientSslNodeStartup.java index 9387311..420b0b9 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientSslNodeStartup.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientSslNodeStartup.java @@ -17,9 +17,10 @@ package org.apache.ignite.internal.client; -import org.apache.ignite.*; -import org.apache.ignite.internal.util.typedef.*; -import org.apache.ignite.internal.util.typedef.internal.*; +import org.apache.ignite.Ignite; +import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.internal.util.typedef.G; +import org.apache.ignite.internal.util.typedef.internal.U; /** * Starts up one grid node (server) with pre-defined ports and tasks to test client-server interactions. @@ -56,4 +57,4 @@ public class ClientSslNodeStartup { U.sleep(Long.MAX_VALUE); } } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientStartNodeTask.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientStartNodeTask.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientStartNodeTask.java index 1822790..4d0a355 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientStartNodeTask.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientStartNodeTask.java @@ -17,19 +17,29 @@ package org.apache.ignite.internal.client; -import org.apache.ignite.*; -import org.apache.ignite.compute.*; -import org.apache.ignite.configuration.*; -import org.apache.ignite.internal.util.typedef.*; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.apache.ignite.resources.*; -import org.springframework.beans.factory.*; -import org.springframework.context.support.*; - -import java.net.*; -import java.util.*; - -import static org.apache.ignite.compute.ComputeJobResultPolicy.*; +import java.net.URL; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.UUID; +import org.apache.ignite.Ignite; +import org.apache.ignite.IgniteCompute; +import org.apache.ignite.IgniteLogger; +import org.apache.ignite.compute.ComputeJobResult; +import org.apache.ignite.compute.ComputeJobResultPolicy; +import org.apache.ignite.compute.ComputeTaskFuture; +import org.apache.ignite.configuration.IgniteConfiguration; +import org.apache.ignite.internal.util.typedef.G; +import org.apache.ignite.internal.util.typedef.internal.U; +import org.apache.ignite.resources.IgniteInstanceResource; +import org.apache.ignite.resources.LoggerResource; +import org.springframework.beans.factory.BeanFactory; +import org.springframework.context.support.FileSystemXmlApplicationContext; + +import static org.apache.ignite.compute.ComputeJobResultPolicy.FAILOVER; +import static org.apache.ignite.compute.ComputeJobResultPolicy.WAIT; /** * Start node task, applicable arguments: @@ -175,4 +185,4 @@ public class ClientStartNodeTask extends TaskSingleJobSplitAdapter<String, Integ parent.log().info(">>> Available grids: " + gridNames); } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientStopNodeTask.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientStopNodeTask.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientStopNodeTask.java index 9e3b42a..b648a43 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientStopNodeTask.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientStopNodeTask.java @@ -17,14 +17,22 @@ package org.apache.ignite.internal.client; -import org.apache.ignite.*; -import org.apache.ignite.compute.*; -import org.apache.ignite.internal.util.typedef.*; -import org.apache.ignite.resources.*; - -import java.util.*; - -import static org.apache.ignite.compute.ComputeJobResultPolicy.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import org.apache.ignite.Ignite; +import org.apache.ignite.IgniteLogger; +import org.apache.ignite.compute.ComputeJob; +import org.apache.ignite.compute.ComputeJobAdapter; +import org.apache.ignite.compute.ComputeJobResult; +import org.apache.ignite.compute.ComputeJobResultPolicy; +import org.apache.ignite.compute.ComputeTaskSplitAdapter; +import org.apache.ignite.internal.util.typedef.G; +import org.apache.ignite.resources.IgniteInstanceResource; +import org.apache.ignite.resources.LoggerResource; + +import static org.apache.ignite.compute.ComputeJobResultPolicy.FAILOVER; +import static org.apache.ignite.compute.ComputeJobResultPolicy.WAIT; /** * Stop node task, applicable arguments: @@ -124,4 +132,4 @@ public class ClientStopNodeTask extends ComputeTaskSplitAdapter<String, Integer> return 0; } } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientStringLengthTask.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientStringLengthTask.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientStringLengthTask.java index 2aa0a4f..43db6fd 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientStringLengthTask.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientStringLengthTask.java @@ -17,11 +17,17 @@ package org.apache.ignite.internal.client; -import org.apache.ignite.compute.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import org.apache.ignite.compute.ComputeJob; +import org.apache.ignite.compute.ComputeJobAdapter; +import org.apache.ignite.compute.ComputeJobResult; +import org.apache.ignite.compute.ComputeJobResultPolicy; +import org.apache.ignite.compute.ComputeTaskSplitAdapter; -import java.util.*; - -import static org.apache.ignite.compute.ComputeJobResultPolicy.*; +import static org.apache.ignite.compute.ComputeJobResultPolicy.FAILOVER; +import static org.apache.ignite.compute.ComputeJobResultPolicy.WAIT; /** * Test task calculate length of the string passed in the argument. @@ -68,4 +74,4 @@ public class ClientStringLengthTask extends ComputeTaskSplitAdapter<String, Inte return WAIT; } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientTcpMultiThreadedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientTcpMultiThreadedSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientTcpMultiThreadedSelfTest.java index 74f9a8e..70b1ce8 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientTcpMultiThreadedSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientTcpMultiThreadedSelfTest.java @@ -17,7 +17,7 @@ package org.apache.ignite.internal.client; -import org.apache.ignite.internal.client.ssl.*; +import org.apache.ignite.internal.client.ssl.GridSslContextFactory; /** * Runs multi-threaded tests on tcp binary protocol (ssl is disabled). @@ -42,4 +42,4 @@ public class ClientTcpMultiThreadedSelfTest extends ClientAbstractMultiThreadedS @Override protected GridSslContextFactory sslContextFactory() { return null; } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientTcpSslAuthenticationSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientTcpSslAuthenticationSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientTcpSslAuthenticationSelfTest.java index 438b943..9dc5042 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientTcpSslAuthenticationSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientTcpSslAuthenticationSelfTest.java @@ -17,19 +17,21 @@ package org.apache.ignite.internal.client; -import org.apache.ignite.configuration.*; -import org.apache.ignite.internal.client.balancer.*; -import org.apache.ignite.internal.client.impl.*; -import org.apache.ignite.internal.client.ssl.*; -import org.apache.ignite.internal.util.typedef.*; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.apache.ignite.testframework.*; -import org.apache.ignite.testframework.junits.common.*; - -import javax.net.ssl.*; -import java.security.cert.*; -import java.util.*; -import java.util.concurrent.atomic.*; +import java.security.cert.CertificateException; +import java.security.cert.X509Certificate; +import java.util.Arrays; +import java.util.concurrent.atomic.AtomicInteger; +import javax.net.ssl.X509TrustManager; +import org.apache.ignite.configuration.ConnectorConfiguration; +import org.apache.ignite.configuration.IgniteConfiguration; +import org.apache.ignite.internal.client.balancer.GridClientRoundRobinBalancer; +import org.apache.ignite.internal.client.impl.GridClientImpl; +import org.apache.ignite.internal.client.ssl.GridSslBasicContextFactory; +import org.apache.ignite.internal.util.typedef.G; +import org.apache.ignite.internal.util.typedef.X; +import org.apache.ignite.internal.util.typedef.internal.U; +import org.apache.ignite.testframework.GridTestUtils; +import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; /** * Tests @@ -262,4 +264,4 @@ public class ClientTcpSslAuthenticationSelfTest extends GridCommonAbstractTest { srvCheckCallCnt.set(0); } } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientTcpSslMultiThreadedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientTcpSslMultiThreadedSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientTcpSslMultiThreadedSelfTest.java index 4131bf0..7504e9c 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientTcpSslMultiThreadedSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientTcpSslMultiThreadedSelfTest.java @@ -17,8 +17,8 @@ package org.apache.ignite.internal.client; -import org.apache.ignite.internal.client.ssl.*; -import org.apache.ignite.testframework.*; +import org.apache.ignite.internal.client.ssl.GridSslContextFactory; +import org.apache.ignite.testframework.GridTestUtils; /** * Runs multithreaded tests for client over tcp binary protocol with ssl enabled. @@ -43,4 +43,4 @@ public class ClientTcpSslMultiThreadedSelfTest extends ClientAbstractMultiThread @Override protected GridSslContextFactory sslContextFactory() { return GridTestUtils.sslContextFactory(); } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientTcpTask.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientTcpTask.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientTcpTask.java index caf6e87..8458c0e 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientTcpTask.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientTcpTask.java @@ -17,11 +17,17 @@ package org.apache.ignite.internal.client; -import org.apache.ignite.compute.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import org.apache.ignite.compute.ComputeJob; +import org.apache.ignite.compute.ComputeJobAdapter; +import org.apache.ignite.compute.ComputeJobResult; +import org.apache.ignite.compute.ComputeJobResultPolicy; +import org.apache.ignite.compute.ComputeTaskSplitAdapter; -import java.util.*; - -import static org.apache.ignite.compute.ComputeJobResultPolicy.*; +import static org.apache.ignite.compute.ComputeJobResultPolicy.FAILOVER; +import static org.apache.ignite.compute.ComputeJobResultPolicy.WAIT; /** * Test task summarizes length of all strings in the arguments list. @@ -68,4 +74,4 @@ public class ClientTcpTask extends ComputeTaskSplitAdapter<List<Object>, Integer return WAIT; } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/90e9555c/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientTcpTaskExecutionAfterTopologyRestartSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientTcpTaskExecutionAfterTopologyRestartSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientTcpTaskExecutionAfterTopologyRestartSelfTest.java index 5fc6b06..62d8f63 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientTcpTaskExecutionAfterTopologyRestartSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientTcpTaskExecutionAfterTopologyRestartSelfTest.java @@ -17,10 +17,10 @@ package org.apache.ignite.internal.client; -import org.apache.ignite.configuration.*; -import org.apache.ignite.testframework.junits.common.*; - -import java.util.*; +import java.util.Collections; +import org.apache.ignite.configuration.ConnectorConfiguration; +import org.apache.ignite.configuration.IgniteConfiguration; +import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; /** * Ensures @@ -72,4 +72,4 @@ public class ClientTcpTaskExecutionAfterTopologyRestartSelfTest extends GridComm cli.compute().execute(ClientTcpTask.class.getName(), Collections.singletonList("arg")); } -} +} \ No newline at end of file
