http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java index fdcfc7f..130aa06 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java @@ -19,15 +19,14 @@ package org.gridgain.grid.kernal.processors.cache.query.continuous; import org.apache.ignite.*; import org.apache.ignite.cache.*; +import org.apache.ignite.cache.*; +import org.apache.ignite.cache.query.*; import org.apache.ignite.cache.store.*; import org.apache.ignite.cluster.*; import org.apache.ignite.configuration.*; import org.apache.ignite.events.*; import org.apache.ignite.lang.*; import org.apache.ignite.marshaller.optimized.*; -import org.gridgain.grid.cache.*; -import org.gridgain.grid.cache.query.*; -import org.gridgain.grid.cache.query.GridCacheContinuousQueryEntry; import org.gridgain.grid.kernal.*; import org.gridgain.grid.kernal.processors.continuous.*; import org.apache.ignite.spi.discovery.tcp.*; @@ -49,12 +48,11 @@ import java.util.concurrent.*; import java.util.concurrent.atomic.*; import static java.util.concurrent.TimeUnit.*; -import static org.gridgain.grid.cache.GridCacheAtomicityMode.*; -import static org.gridgain.grid.cache.GridCacheDistributionMode.*; -import static org.gridgain.grid.cache.GridCacheMode.*; -import static org.gridgain.grid.cache.GridCachePreloadMode.*; -import static org.gridgain.grid.cache.GridCacheWriteSynchronizationMode.*; -import static org.gridgain.grid.cache.query.GridCacheQueryType.*; +import static org.apache.ignite.cache.GridCacheAtomicityMode.*; +import static org.apache.ignite.cache.GridCacheDistributionMode.*; +import static org.apache.ignite.cache.GridCacheMode.*; +import static org.apache.ignite.cache.GridCachePreloadMode.*; +import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; import static org.apache.ignite.events.IgniteEventType.*; /**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryAtomicNearEnabledSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryAtomicNearEnabledSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryAtomicNearEnabledSelfTest.java index b4e1fe4..06cd52f 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryAtomicNearEnabledSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryAtomicNearEnabledSelfTest.java @@ -17,9 +17,9 @@ package org.gridgain.grid.kernal.processors.cache.query.continuous; -import org.gridgain.grid.cache.*; +import org.apache.ignite.cache.*; -import static org.gridgain.grid.cache.GridCacheDistributionMode.*; +import static org.apache.ignite.cache.GridCacheDistributionMode.*; /** * Tests for atomic cache with near cache enabled. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryAtomicSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryAtomicSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryAtomicSelfTest.java index 1f90a71..6886270 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryAtomicSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryAtomicSelfTest.java @@ -17,10 +17,10 @@ package org.gridgain.grid.kernal.processors.cache.query.continuous; -import org.gridgain.grid.cache.*; +import org.apache.ignite.cache.*; -import static org.gridgain.grid.cache.GridCacheAtomicityMode.*; -import static org.gridgain.grid.cache.GridCacheDistributionMode.*; +import static org.apache.ignite.cache.GridCacheAtomicityMode.*; +import static org.apache.ignite.cache.GridCacheDistributionMode.*; /** * Continuous queries tests for atomic cache. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryLocalAtomicSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryLocalAtomicSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryLocalAtomicSelfTest.java index d7e53d1..18d5b5b 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryLocalAtomicSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryLocalAtomicSelfTest.java @@ -17,9 +17,9 @@ package org.gridgain.grid.kernal.processors.cache.query.continuous; -import org.gridgain.grid.cache.*; +import org.apache.ignite.cache.*; -import static org.gridgain.grid.cache.GridCacheAtomicityMode.*; +import static org.apache.ignite.cache.GridCacheAtomicityMode.*; /** * Continuous queries tests for local cache in atomic mode. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryLocalSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryLocalSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryLocalSelfTest.java index ba47199..0f637e5 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryLocalSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryLocalSelfTest.java @@ -17,9 +17,9 @@ package org.gridgain.grid.kernal.processors.cache.query.continuous; -import org.gridgain.grid.cache.*; +import org.apache.ignite.cache.*; -import static org.gridgain.grid.cache.GridCacheMode.*; +import static org.apache.ignite.cache.GridCacheMode.*; /** * Continuous queries tests for local cache. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryPartitionedOnlySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryPartitionedOnlySelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryPartitionedOnlySelfTest.java index 27de46b..a7f23da 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryPartitionedOnlySelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryPartitionedOnlySelfTest.java @@ -17,10 +17,10 @@ package org.gridgain.grid.kernal.processors.cache.query.continuous; -import org.gridgain.grid.cache.*; +import org.apache.ignite.cache.*; -import static org.gridgain.grid.cache.GridCacheMode.*; -import static org.gridgain.grid.cache.GridCacheDistributionMode.*; +import static org.apache.ignite.cache.GridCacheMode.*; +import static org.apache.ignite.cache.GridCacheDistributionMode.*; /** * Continuous queries tests for partitioned cache. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryPartitionedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryPartitionedSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryPartitionedSelfTest.java index f70a297..8d9c0b7 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryPartitionedSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryPartitionedSelfTest.java @@ -17,9 +17,9 @@ package org.gridgain.grid.kernal.processors.cache.query.continuous; -import org.gridgain.grid.cache.*; +import org.apache.ignite.cache.*; -import static org.gridgain.grid.cache.GridCacheMode.*; +import static org.apache.ignite.cache.GridCacheMode.*; /** * Continuous queries tests for partitioned cache. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryReplicatedAtomicSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryReplicatedAtomicSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryReplicatedAtomicSelfTest.java index 4167cdb..3878b57 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryReplicatedAtomicSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryReplicatedAtomicSelfTest.java @@ -17,9 +17,9 @@ package org.gridgain.grid.kernal.processors.cache.query.continuous; -import org.gridgain.grid.cache.*; +import org.apache.ignite.cache.*; -import static org.gridgain.grid.cache.GridCacheAtomicityMode.*; +import static org.apache.ignite.cache.GridCacheAtomicityMode.*; /** * Continuous queries tests for replicated atomic cache. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryReplicatedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryReplicatedSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryReplicatedSelfTest.java index 735e8ef..18e106f 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryReplicatedSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryReplicatedSelfTest.java @@ -17,8 +17,8 @@ package org.gridgain.grid.kernal.processors.cache.query.continuous; -import org.gridgain.grid.cache.*; -import org.gridgain.grid.cache.query.*; +import org.apache.ignite.cache.*; +import org.apache.ignite.cache.query.*; import org.gridgain.grid.util.typedef.*; import java.util.*; @@ -26,7 +26,7 @@ import java.util.concurrent.*; import java.util.concurrent.atomic.*; import static java.util.concurrent.TimeUnit.*; -import static org.gridgain.grid.cache.GridCacheMode.*; +import static org.apache.ignite.cache.GridCacheMode.*; /** * Continuous queries tests for replicated cache. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/reducefields/GridCacheAbstractReduceFieldsQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/reducefields/GridCacheAbstractReduceFieldsQuerySelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/reducefields/GridCacheAbstractReduceFieldsQuerySelfTest.java index 15efd48..a8593ef 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/reducefields/GridCacheAbstractReduceFieldsQuerySelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/reducefields/GridCacheAbstractReduceFieldsQuerySelfTest.java @@ -18,12 +18,12 @@ package org.gridgain.grid.kernal.processors.cache.query.reducefields; import org.apache.ignite.cache.*; +import org.apache.ignite.cache.*; +import org.apache.ignite.cache.affinity.*; +import org.apache.ignite.cache.query.*; import org.apache.ignite.configuration.*; import org.apache.ignite.lang.*; import org.apache.ignite.marshaller.optimized.*; -import org.gridgain.grid.cache.*; -import org.gridgain.grid.cache.affinity.*; -import org.gridgain.grid.cache.query.*; import org.apache.ignite.spi.discovery.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; @@ -35,11 +35,11 @@ import org.jetbrains.annotations.*; import java.io.*; import java.util.*; -import static org.gridgain.grid.cache.GridCacheAtomicityMode.*; -import static org.gridgain.grid.cache.GridCacheDistributionMode.*; -import static org.gridgain.grid.cache.GridCacheMode.*; -import static org.gridgain.grid.cache.GridCachePreloadMode.*; -import static org.gridgain.grid.cache.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.GridCacheAtomicityMode.*; +import static org.apache.ignite.cache.GridCacheDistributionMode.*; +import static org.apache.ignite.cache.GridCacheMode.*; +import static org.apache.ignite.cache.GridCachePreloadMode.*; +import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; /** * Tests for reduce fields queries. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/reducefields/GridCacheReduceFieldsQueryAtomicSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/reducefields/GridCacheReduceFieldsQueryAtomicSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/reducefields/GridCacheReduceFieldsQueryAtomicSelfTest.java index eda80b7..a691dcb 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/reducefields/GridCacheReduceFieldsQueryAtomicSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/reducefields/GridCacheReduceFieldsQueryAtomicSelfTest.java @@ -17,10 +17,10 @@ package org.gridgain.grid.kernal.processors.cache.query.reducefields; -import org.gridgain.grid.cache.*; +import org.apache.ignite.cache.*; -import static org.gridgain.grid.cache.GridCacheAtomicityMode.*; -import static org.gridgain.grid.cache.GridCacheDistributionMode.*; +import static org.apache.ignite.cache.GridCacheAtomicityMode.*; +import static org.apache.ignite.cache.GridCacheDistributionMode.*; /** * Reduce fields queries tests for partitioned cache. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/reducefields/GridCacheReduceFieldsQueryLocalSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/reducefields/GridCacheReduceFieldsQueryLocalSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/reducefields/GridCacheReduceFieldsQueryLocalSelfTest.java index 0870a76..746ecbb 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/reducefields/GridCacheReduceFieldsQueryLocalSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/reducefields/GridCacheReduceFieldsQueryLocalSelfTest.java @@ -17,9 +17,9 @@ package org.gridgain.grid.kernal.processors.cache.query.reducefields; -import org.gridgain.grid.cache.*; +import org.apache.ignite.cache.*; -import static org.gridgain.grid.cache.GridCacheMode.*; +import static org.apache.ignite.cache.GridCacheMode.*; /** * Reduce fields queries tests for local cache. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/reducefields/GridCacheReduceFieldsQueryPartitionedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/reducefields/GridCacheReduceFieldsQueryPartitionedSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/reducefields/GridCacheReduceFieldsQueryPartitionedSelfTest.java index b702ac1..d758ddc 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/reducefields/GridCacheReduceFieldsQueryPartitionedSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/reducefields/GridCacheReduceFieldsQueryPartitionedSelfTest.java @@ -17,13 +17,13 @@ package org.gridgain.grid.kernal.processors.cache.query.reducefields; +import org.apache.ignite.cache.*; +import org.apache.ignite.cache.query.*; import org.apache.ignite.lang.*; -import org.gridgain.grid.cache.*; -import org.gridgain.grid.cache.query.*; import java.util.*; -import static org.gridgain.grid.cache.GridCacheMode.*; +import static org.apache.ignite.cache.GridCacheMode.*; /** * Reduce fields queries tests for partitioned cache. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/reducefields/GridCacheReduceFieldsQueryReplicatedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/reducefields/GridCacheReduceFieldsQueryReplicatedSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/reducefields/GridCacheReduceFieldsQueryReplicatedSelfTest.java index 31f29b3..32f1a8b 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/reducefields/GridCacheReduceFieldsQueryReplicatedSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/reducefields/GridCacheReduceFieldsQueryReplicatedSelfTest.java @@ -17,9 +17,9 @@ package org.gridgain.grid.kernal.processors.cache.query.reducefields; -import org.gridgain.grid.cache.*; +import org.apache.ignite.cache.*; -import static org.gridgain.grid.cache.GridCacheMode.*; +import static org.apache.ignite.cache.GridCacheMode.*; /** * Reduce fields queries tests for replicated cache. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/core/src/test/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoaderImplSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoaderImplSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoaderImplSelfTest.java index e0a8ab5..ad6b5a7 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoaderImplSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoaderImplSelfTest.java @@ -19,13 +19,13 @@ package org.gridgain.grid.kernal.processors.dataload; import org.apache.ignite.*; import org.apache.ignite.cache.*; +import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.apache.ignite.marshaller.*; import org.apache.ignite.marshaller.optimized.*; 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.gridgain.grid.cache.*; import org.gridgain.grid.util.typedef.*; import org.gridgain.grid.util.typedef.internal.*; import org.gridgain.testframework.junits.common.*; @@ -34,8 +34,8 @@ import java.io.*; import java.util.*; import java.util.concurrent.*; -import static org.gridgain.grid.cache.GridCacheMode.*; -import static org.gridgain.grid.cache.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.GridCacheMode.*; +import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; /** * Tests for {@code GridDataLoaderImpl}. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/core/src/test/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoaderPerformanceTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoaderPerformanceTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoaderPerformanceTest.java index 2dfbae3..7610709 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoaderPerformanceTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoaderPerformanceTest.java @@ -30,9 +30,9 @@ import org.jdk8.backport.*; import java.util.concurrent.*; import static org.apache.ignite.events.IgniteEventType.*; -import static org.gridgain.grid.cache.GridCacheMode.*; -import static org.gridgain.grid.cache.GridCacheDistributionMode.*; -import static org.gridgain.grid.cache.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.GridCacheMode.*; +import static org.apache.ignite.cache.GridCacheDistributionMode.*; +import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; /** * Data loader performance test. Compares group lock data loader to traditional lock. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/core/src/test/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoaderProcessorSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoaderProcessorSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoaderProcessorSelfTest.java index 9d415c0..ce85709 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoaderProcessorSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoaderProcessorSelfTest.java @@ -19,13 +19,13 @@ package org.gridgain.grid.kernal.processors.dataload; import org.apache.ignite.*; import org.apache.ignite.cache.*; +import org.apache.ignite.cache.*; +import org.apache.ignite.cache.eviction.fifo.*; import org.apache.ignite.cache.store.*; import org.apache.ignite.configuration.*; import org.apache.ignite.events.*; import org.apache.ignite.lang.*; import org.apache.ignite.marshaller.optimized.*; -import org.gridgain.grid.cache.*; -import org.gridgain.grid.cache.eviction.fifo.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; @@ -40,10 +40,10 @@ import java.util.concurrent.*; import java.util.concurrent.atomic.*; import static java.util.concurrent.TimeUnit.*; -import static org.gridgain.grid.cache.GridCacheAtomicityMode.*; -import static org.gridgain.grid.cache.GridCacheDistributionMode.*; -import static org.gridgain.grid.cache.GridCacheMode.*; -import static org.gridgain.grid.cache.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.GridCacheAtomicityMode.*; +import static org.apache.ignite.cache.GridCacheDistributionMode.*; +import static org.apache.ignite.cache.GridCacheMode.*; +import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; import static org.apache.ignite.events.IgniteEventType.*; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridCacheGgfsPerBlockLruEvictionPolicySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridCacheGgfsPerBlockLruEvictionPolicySelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridCacheGgfsPerBlockLruEvictionPolicySelfTest.java index 0a8d621..4dce80d 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridCacheGgfsPerBlockLruEvictionPolicySelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridCacheGgfsPerBlockLruEvictionPolicySelfTest.java @@ -19,11 +19,11 @@ package org.gridgain.grid.kernal.processors.ggfs; import org.apache.ignite.*; import org.apache.ignite.cache.*; +import org.apache.ignite.cache.*; +import org.apache.ignite.cache.eviction.ggfs.*; import org.apache.ignite.configuration.*; import org.apache.ignite.fs.*; import org.gridgain.grid.*; -import org.gridgain.grid.cache.*; -import org.gridgain.grid.cache.eviction.ggfs.*; import org.gridgain.grid.kernal.processors.cache.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; @@ -35,8 +35,8 @@ import org.gridgain.testframework.*; import java.util.*; import java.util.concurrent.*; -import static org.gridgain.grid.cache.GridCacheAtomicityMode.*; -import static org.gridgain.grid.cache.GridCacheMode.*; +import static org.apache.ignite.cache.GridCacheAtomicityMode.*; +import static org.apache.ignite.cache.GridCacheMode.*; import static org.apache.ignite.fs.IgniteFsMode.*; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsAbstractSelfTest.java index 2a9378d..e64fadf 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsAbstractSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsAbstractSelfTest.java @@ -23,7 +23,6 @@ import org.apache.ignite.configuration.*; import org.apache.ignite.fs.*; import org.apache.ignite.lang.*; import org.gridgain.grid.*; -import org.gridgain.grid.cache.*; import org.gridgain.grid.kernal.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; @@ -39,9 +38,9 @@ import java.util.*; import java.util.concurrent.*; import java.util.concurrent.atomic.*; -import static org.gridgain.grid.cache.GridCacheAtomicityMode.*; -import static org.gridgain.grid.cache.GridCacheMemoryMode.*; -import static org.gridgain.grid.cache.GridCacheMode.*; +import static org.apache.ignite.cache.GridCacheAtomicityMode.*; +import static org.apache.ignite.cache.GridCacheMemoryMode.*; +import static org.apache.ignite.cache.GridCacheMode.*; import static org.apache.ignite.IgniteFs.*; import static org.apache.ignite.fs.IgniteFsMode.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsCacheSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsCacheSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsCacheSelfTest.java index 3385805..db0f51f 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsCacheSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsCacheSelfTest.java @@ -19,17 +19,17 @@ package org.gridgain.grid.kernal.processors.ggfs; import org.apache.ignite.*; import org.apache.ignite.cache.*; +import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.apache.ignite.fs.*; -import org.gridgain.grid.cache.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; import org.gridgain.testframework.*; import java.util.concurrent.*; -import static org.gridgain.grid.cache.GridCacheAtomicityMode.*; -import static org.gridgain.grid.cache.GridCacheMode.*; +import static org.apache.ignite.cache.GridCacheAtomicityMode.*; +import static org.apache.ignite.cache.GridCacheMode.*; /** * Tests ensuring that GGFS data and meta caches are not "visible" through public API. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsDataManagerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsDataManagerSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsDataManagerSelfTest.java index 4d0e847..341f446 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsDataManagerSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsDataManagerSelfTest.java @@ -18,11 +18,11 @@ package org.gridgain.grid.kernal.processors.ggfs; import org.apache.ignite.cache.*; +import org.apache.ignite.cache.*; import org.apache.ignite.cluster.*; import org.apache.ignite.configuration.*; import org.apache.ignite.fs.*; import org.apache.ignite.lang.*; -import org.gridgain.grid.cache.*; import org.gridgain.grid.kernal.processors.cache.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; @@ -38,8 +38,8 @@ import java.security.*; import java.util.*; import java.util.concurrent.*; -import static org.gridgain.grid.cache.GridCacheAtomicityMode.*; -import static org.gridgain.grid.cache.GridCacheMode.*; +import static org.apache.ignite.cache.GridCacheAtomicityMode.*; +import static org.apache.ignite.cache.GridCacheMode.*; import static org.gridgain.testframework.GridTestUtils.*; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsDualAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsDualAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsDualAbstractSelfTest.java index 04cbc58..235ed29 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsDualAbstractSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsDualAbstractSelfTest.java @@ -18,8 +18,8 @@ package org.gridgain.grid.kernal.processors.ggfs; import org.apache.ignite.*; +import org.apache.ignite.cache.*; import org.apache.ignite.fs.*; -import org.gridgain.grid.cache.*; import org.gridgain.grid.util.lang.*; import org.gridgain.grid.util.typedef.internal.*; import org.gridgain.testframework.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsMetaManagerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsMetaManagerSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsMetaManagerSelfTest.java index c1f844a..df5a6f0 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsMetaManagerSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsMetaManagerSelfTest.java @@ -31,10 +31,10 @@ import org.jetbrains.annotations.*; import java.util.*; import java.util.concurrent.*; -import static org.gridgain.grid.cache.GridCacheAtomicityMode.*; -import static org.gridgain.grid.cache.GridCacheDistributionMode.*; -import static org.gridgain.grid.cache.GridCacheMode.*; -import static org.gridgain.grid.cache.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.GridCacheAtomicityMode.*; +import static org.apache.ignite.cache.GridCacheDistributionMode.*; +import static org.apache.ignite.cache.GridCacheMode.*; +import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; import static org.gridgain.grid.kernal.processors.ggfs.GridGgfsFileInfo.*; import static org.gridgain.testframework.GridTestUtils.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsMetricsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsMetricsSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsMetricsSelfTest.java index 4fb0ead..fef08fd 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsMetricsSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsMetricsSelfTest.java @@ -19,9 +19,9 @@ package org.gridgain.grid.kernal.processors.ggfs; import org.apache.ignite.*; import org.apache.ignite.cache.*; +import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.apache.ignite.fs.*; -import org.gridgain.grid.cache.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; @@ -30,8 +30,8 @@ import org.gridgain.grid.util.typedef.internal.U; import java.util.*; -import static org.gridgain.grid.cache.GridCacheAtomicityMode.*; -import static org.gridgain.grid.cache.GridCacheMode.*; +import static org.apache.ignite.cache.GridCacheAtomicityMode.*; +import static org.apache.ignite.cache.GridCacheMode.*; import static org.apache.ignite.fs.IgniteFsMode.*; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsModesSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsModesSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsModesSelfTest.java index e0f6349..eea04b5 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsModesSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsModesSelfTest.java @@ -19,12 +19,12 @@ package org.gridgain.grid.kernal.processors.ggfs; import org.apache.ignite.*; import org.apache.ignite.cache.*; +import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.apache.ignite.fs.*; import org.apache.ignite.lang.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; -import org.gridgain.grid.cache.*; import org.gridgain.grid.kernal.*; import org.gridgain.grid.util.typedef.*; import org.gridgain.grid.util.typedef.internal.*; @@ -32,8 +32,8 @@ import org.gridgain.grid.util.typedef.internal.*; import java.util.*; import static org.apache.ignite.fs.IgniteFsMode.*; -import static org.gridgain.grid.cache.GridCacheAtomicityMode.*; -import static org.gridgain.grid.cache.GridCacheMode.*; +import static org.apache.ignite.cache.GridCacheAtomicityMode.*; +import static org.apache.ignite.cache.GridCacheMode.*; /** * GGFS modes self test. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsPrimaryOffheapTieredSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsPrimaryOffheapTieredSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsPrimaryOffheapTieredSelfTest.java index 0ec3f3f..50b2d93 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsPrimaryOffheapTieredSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsPrimaryOffheapTieredSelfTest.java @@ -18,7 +18,7 @@ package org.gridgain.grid.kernal.processors.ggfs; import static org.apache.ignite.fs.IgniteFsMode.*; -import static org.gridgain.grid.cache.GridCacheMemoryMode.*; +import static org.apache.ignite.cache.GridCacheMemoryMode.*; /** * Tests for PRIMARY mode and OFFHEAP_TIERED memory. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsPrimaryOffheapValuesSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsPrimaryOffheapValuesSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsPrimaryOffheapValuesSelfTest.java index 0dfc65a..6039637 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsPrimaryOffheapValuesSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsPrimaryOffheapValuesSelfTest.java @@ -18,7 +18,7 @@ package org.gridgain.grid.kernal.processors.ggfs; import static org.apache.ignite.fs.IgniteFsMode.*; -import static org.gridgain.grid.cache.GridCacheMemoryMode.*; +import static org.apache.ignite.cache.GridCacheMemoryMode.*; /** * Tests for PRIMARY mode and OFFHEAP_VALUES memory. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsProcessorSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsProcessorSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsProcessorSelfTest.java index 211d7b4..7f993ab 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsProcessorSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsProcessorSelfTest.java @@ -20,10 +20,10 @@ package org.gridgain.grid.kernal.processors.ggfs; import org.apache.commons.io.*; import org.apache.ignite.*; import org.apache.ignite.cache.*; +import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.apache.ignite.fs.*; import org.apache.ignite.lang.*; -import org.gridgain.grid.cache.*; import org.gridgain.grid.kernal.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; @@ -39,8 +39,8 @@ import java.util.concurrent.*; import java.util.concurrent.atomic.*; import static java.nio.charset.StandardCharsets.*; -import static org.gridgain.grid.cache.GridCacheAtomicityMode.*; -import static org.gridgain.grid.cache.GridCacheMode.*; +import static org.apache.ignite.cache.GridCacheAtomicityMode.*; +import static org.apache.ignite.cache.GridCacheMode.*; /** * Tests for {@link GridGgfsProcessor}. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsProcessorValidationSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsProcessorValidationSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsProcessorValidationSelfTest.java index ae4bfc8..c2c49f8 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsProcessorValidationSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsProcessorValidationSelfTest.java @@ -31,8 +31,8 @@ import java.lang.reflect.*; import java.util.*; import static org.apache.ignite.fs.IgniteFsMode.*; -import static org.gridgain.grid.cache.GridCacheAtomicityMode.*; -import static org.gridgain.grid.cache.GridCacheMode.*; +import static org.apache.ignite.cache.GridCacheAtomicityMode.*; +import static org.apache.ignite.cache.GridCacheMode.*; /** * Tests for node validation logic in {@link GridGgfsProcessor}. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsServerManagerIpcEndpointRegistrationAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsServerManagerIpcEndpointRegistrationAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsServerManagerIpcEndpointRegistrationAbstractSelfTest.java index 18b92c0..3d93aa8 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsServerManagerIpcEndpointRegistrationAbstractSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsServerManagerIpcEndpointRegistrationAbstractSelfTest.java @@ -19,12 +19,12 @@ package org.gridgain.grid.kernal.processors.ggfs; import org.apache.ignite.*; import org.apache.ignite.cache.*; +import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.apache.ignite.fs.*; 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.gridgain.grid.cache.*; import org.gridgain.grid.kernal.*; import org.gridgain.grid.kernal.processors.port.*; import org.gridgain.grid.util.ipc.loopback.*; @@ -37,7 +37,7 @@ import java.util.*; import java.util.concurrent.atomic.*; import static org.apache.ignite.fs.IgniteFsConfiguration.*; -import static org.gridgain.grid.cache.GridCacheAtomicityMode.*; +import static org.apache.ignite.cache.GridCacheAtomicityMode.*; /** * Base test class for {@link GridGgfsServer} checking IPC endpoint registrations. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsSizeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsSizeSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsSizeSelfTest.java index 0853660..4c9c3f3 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsSizeSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsSizeSelfTest.java @@ -19,13 +19,13 @@ package org.gridgain.grid.kernal.processors.ggfs; import org.apache.ignite.*; import org.apache.ignite.cache.*; +import org.apache.ignite.cache.*; import org.apache.ignite.cluster.*; import org.apache.ignite.configuration.*; import org.apache.ignite.events.*; import org.apache.ignite.fs.*; import org.apache.ignite.lang.*; import org.apache.ignite.transactions.*; -import org.gridgain.grid.cache.*; import org.gridgain.grid.kernal.*; import org.gridgain.grid.kernal.processors.cache.*; import org.apache.ignite.spi.discovery.tcp.*; @@ -41,10 +41,10 @@ import java.util.*; import java.util.concurrent.*; import java.util.concurrent.atomic.*; -import static org.gridgain.grid.cache.GridCacheAtomicityMode.*; -import static org.gridgain.grid.cache.GridCacheDistributionMode.*; -import static org.gridgain.grid.cache.GridCacheMode.*; -import static org.gridgain.grid.cache.GridCachePreloadMode.*; +import static org.apache.ignite.cache.GridCacheAtomicityMode.*; +import static org.apache.ignite.cache.GridCacheDistributionMode.*; +import static org.apache.ignite.cache.GridCacheMode.*; +import static org.apache.ignite.cache.GridCachePreloadMode.*; import static org.apache.ignite.transactions.IgniteTxConcurrency.*; import static org.apache.ignite.transactions.IgniteTxIsolation.*; import static org.apache.ignite.events.IgniteEventType.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsStreamsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsStreamsSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsStreamsSelfTest.java index 3e5edeb..59aa349 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsStreamsSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsStreamsSelfTest.java @@ -19,10 +19,10 @@ package org.gridgain.grid.kernal.processors.ggfs; import org.apache.ignite.*; import org.apache.ignite.cache.*; +import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.apache.ignite.fs.*; import org.apache.ignite.lang.*; -import org.gridgain.grid.cache.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; @@ -36,8 +36,8 @@ import java.util.*; import java.util.concurrent.*; import java.util.concurrent.atomic.*; -import static org.gridgain.grid.cache.GridCacheAtomicityMode.*; -import static org.gridgain.grid.cache.GridCacheMode.*; +import static org.apache.ignite.cache.GridCacheAtomicityMode.*; +import static org.apache.ignite.cache.GridCacheMode.*; import static org.gridgain.testframework.GridTestUtils.*; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsTaskSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsTaskSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsTaskSelfTest.java index 142baf0..567c54b 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsTaskSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsTaskSelfTest.java @@ -26,7 +26,6 @@ import org.apache.ignite.fs.mapreduce.*; import org.apache.ignite.fs.mapreduce.records.*; import org.apache.ignite.lang.*; import org.apache.ignite.resources.*; -import org.gridgain.grid.cache.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; @@ -36,10 +35,10 @@ import org.gridgain.grid.util.typedef.internal.*; import java.io.*; import java.util.*; -import static org.gridgain.grid.cache.GridCacheAtomicityMode.*; -import static org.gridgain.grid.cache.GridCacheDistributionMode.*; -import static org.gridgain.grid.cache.GridCacheMode.*; -import static org.gridgain.grid.cache.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.GridCacheAtomicityMode.*; +import static org.apache.ignite.cache.GridCacheDistributionMode.*; +import static org.apache.ignite.cache.GridCacheMode.*; +import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; import static org.apache.ignite.fs.IgniteFsMode.*; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/split/GridGgfsAbstractRecordResolverSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/split/GridGgfsAbstractRecordResolverSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/split/GridGgfsAbstractRecordResolverSelfTest.java index eec1ed6..75416af 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/split/GridGgfsAbstractRecordResolverSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/split/GridGgfsAbstractRecordResolverSelfTest.java @@ -30,10 +30,10 @@ import org.gridgain.testframework.junits.common.*; import java.util.*; -import static org.gridgain.grid.cache.GridCacheAtomicityMode.*; -import static org.gridgain.grid.cache.GridCacheDistributionMode.*; -import static org.gridgain.grid.cache.GridCacheMode.*; -import static org.gridgain.grid.cache.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.GridCacheAtomicityMode.*; +import static org.apache.ignite.cache.GridCacheDistributionMode.*; +import static org.apache.ignite.cache.GridCacheMode.*; +import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; import static org.apache.ignite.fs.IgniteFsMode.*; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/core/src/test/java/org/gridgain/grid/kernal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java index e134486..42c3922 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java @@ -23,7 +23,6 @@ import org.apache.ignite.configuration.*; import org.apache.ignite.lang.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; -import org.gridgain.grid.cache.*; import org.gridgain.grid.kernal.*; import org.gridgain.grid.kernal.processors.cache.*; import org.gridgain.grid.kernal.processors.rest.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/core/src/test/java/org/gridgain/grid/kernal/processors/service/GridServiceProcessorAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/service/GridServiceProcessorAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/service/GridServiceProcessorAbstractSelfTest.java index c08b0b3..7e69f70 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/service/GridServiceProcessorAbstractSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/service/GridServiceProcessorAbstractSelfTest.java @@ -19,12 +19,12 @@ package org.gridgain.grid.kernal.processors.service; import org.apache.ignite.*; import org.apache.ignite.cache.*; +import org.apache.ignite.cache.*; import org.apache.ignite.cluster.*; import org.apache.ignite.configuration.*; import org.apache.ignite.lang.*; import org.apache.ignite.managed.*; import org.apache.ignite.resources.*; -import org.gridgain.grid.cache.*; import org.gridgain.grid.kernal.processors.affinity.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/core/src/test/java/org/gridgain/grid/lang/GridFuncSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/lang/GridFuncSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/lang/GridFuncSelfTest.java index f79d336..109cb2d 100644 --- a/modules/core/src/test/java/org/gridgain/grid/lang/GridFuncSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/lang/GridFuncSelfTest.java @@ -20,11 +20,11 @@ package org.gridgain.grid.lang; import junit.framework.*; import org.apache.ignite.*; import org.apache.ignite.cache.*; +import org.apache.ignite.cache.*; import org.apache.ignite.cluster.*; import org.apache.ignite.configuration.*; import org.apache.ignite.events.*; import org.apache.ignite.lang.*; -import org.gridgain.grid.cache.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; import org.gridgain.grid.util.typedef.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/core/src/test/java/org/gridgain/grid/marshaller/GridMarshallerAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/marshaller/GridMarshallerAbstractTest.java b/modules/core/src/test/java/org/gridgain/grid/marshaller/GridMarshallerAbstractTest.java index 88c1221..77e5235 100644 --- a/modules/core/src/test/java/org/gridgain/grid/marshaller/GridMarshallerAbstractTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/marshaller/GridMarshallerAbstractTest.java @@ -19,6 +19,9 @@ package org.gridgain.grid.marshaller; import org.apache.ignite.*; import org.apache.ignite.cache.*; +import org.apache.ignite.cache.*; +import org.apache.ignite.cache.affinity.*; +import org.apache.ignite.cache.datastructures.*; import org.apache.ignite.cluster.*; import org.apache.ignite.compute.*; import org.apache.ignite.configuration.*; @@ -29,9 +32,6 @@ import org.apache.ignite.marshaller.optimized.*; import org.apache.ignite.product.*; import org.apache.ignite.streamer.*; import org.apache.ignite.streamer.window.*; -import org.gridgain.grid.cache.*; -import org.gridgain.grid.cache.affinity.*; -import org.gridgain.grid.cache.datastructures.*; import org.gridgain.grid.kernal.*; import org.gridgain.grid.kernal.executor.*; import org.gridgain.grid.kernal.processors.cache.*; @@ -50,7 +50,7 @@ import java.io.*; import java.util.*; import java.util.concurrent.*; -import static org.gridgain.grid.cache.GridCacheAtomicityMode.*; +import static org.apache.ignite.cache.GridCacheAtomicityMode.*; import static org.apache.ignite.events.IgniteEventType.*; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PContinuousDeploymentSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PContinuousDeploymentSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PContinuousDeploymentSelfTest.java index 2046fb3..ff33540 100644 --- a/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PContinuousDeploymentSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PContinuousDeploymentSelfTest.java @@ -26,9 +26,9 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; import org.gridgain.testframework.junits.common.*; import static org.apache.ignite.configuration.IgniteDeploymentMode.*; -import static org.gridgain.grid.cache.GridCacheMode.*; -import static org.gridgain.grid.cache.GridCachePreloadMode.*; -import static org.gridgain.grid.cache.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.GridCacheMode.*; +import static org.apache.ignite.cache.GridCachePreloadMode.*; +import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; /** * Tests for continuous deployment with cache and changing topology. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/core/src/test/java/org/gridgain/grid/util/ipc/shmem/GridIpcSharedMemoryNodeStartup.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/util/ipc/shmem/GridIpcSharedMemoryNodeStartup.java b/modules/core/src/test/java/org/gridgain/grid/util/ipc/shmem/GridIpcSharedMemoryNodeStartup.java index 16177e9..0a9033c 100644 --- a/modules/core/src/test/java/org/gridgain/grid/util/ipc/shmem/GridIpcSharedMemoryNodeStartup.java +++ b/modules/core/src/test/java/org/gridgain/grid/util/ipc/shmem/GridIpcSharedMemoryNodeStartup.java @@ -28,9 +28,9 @@ import org.gridgain.grid.util.typedef.*; import java.util.*; import static org.apache.ignite.events.IgniteEventType.*; -import static org.gridgain.grid.cache.GridCacheMode.*; -import static org.gridgain.grid.cache.GridCacheDistributionMode.*; -import static org.gridgain.grid.cache.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.GridCacheMode.*; +import static org.apache.ignite.cache.GridCacheDistributionMode.*; +import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; /** * http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/core/src/test/java/org/gridgain/grid/util/offheap/GridOffHeapPartitionedMapAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/util/offheap/GridOffHeapPartitionedMapAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/util/offheap/GridOffHeapPartitionedMapAbstractSelfTest.java index 43c38fa..24eb162 100644 --- a/modules/core/src/test/java/org/gridgain/grid/util/offheap/GridOffHeapPartitionedMapAbstractSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/util/offheap/GridOffHeapPartitionedMapAbstractSelfTest.java @@ -18,9 +18,9 @@ package org.gridgain.grid.util.offheap; import org.apache.ignite.*; +import org.apache.ignite.cache.affinity.*; +import org.apache.ignite.cache.affinity.consistenthash.*; import org.apache.ignite.lang.*; -import org.gridgain.grid.cache.affinity.*; -import org.gridgain.grid.cache.affinity.consistenthash.*; import org.gridgain.grid.util.lang.*; import org.gridgain.testframework.junits.common.*; import org.jdk8.backport.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/core/src/test/java/org/gridgain/grid/util/offheap/GridOffHeapPartitionedMapPerformanceAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/util/offheap/GridOffHeapPartitionedMapPerformanceAbstractTest.java b/modules/core/src/test/java/org/gridgain/grid/util/offheap/GridOffHeapPartitionedMapPerformanceAbstractTest.java index d969dda..30249ca 100644 --- a/modules/core/src/test/java/org/gridgain/grid/util/offheap/GridOffHeapPartitionedMapPerformanceAbstractTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/util/offheap/GridOffHeapPartitionedMapPerformanceAbstractTest.java @@ -17,9 +17,9 @@ package org.gridgain.grid.util.offheap; +import org.apache.ignite.cache.affinity.*; +import org.apache.ignite.cache.affinity.consistenthash.*; import org.apache.ignite.lang.*; -import org.gridgain.grid.cache.affinity.*; -import org.gridgain.grid.cache.affinity.consistenthash.*; import org.gridgain.grid.util.typedef.*; import org.gridgain.grid.util.typedef.internal.*; import org.gridgain.testframework.junits.common.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/core/src/test/java/org/gridgain/grid/util/offheap/unsafe/GridUnsafePartitionedMapPerformanceTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/util/offheap/unsafe/GridUnsafePartitionedMapPerformanceTest.java b/modules/core/src/test/java/org/gridgain/grid/util/offheap/unsafe/GridUnsafePartitionedMapPerformanceTest.java index 6d4990b..efb7dfb 100644 --- a/modules/core/src/test/java/org/gridgain/grid/util/offheap/unsafe/GridUnsafePartitionedMapPerformanceTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/util/offheap/unsafe/GridUnsafePartitionedMapPerformanceTest.java @@ -17,7 +17,7 @@ package org.gridgain.grid.util.offheap.unsafe; -import org.gridgain.grid.cache.affinity.consistenthash.*; +import org.apache.ignite.cache.affinity.consistenthash.*; import org.gridgain.grid.util.offheap.*; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/core/src/test/java/org/gridgain/loadtests/GridCacheMultiNodeLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/loadtests/GridCacheMultiNodeLoadTest.java b/modules/core/src/test/java/org/gridgain/loadtests/GridCacheMultiNodeLoadTest.java index 27134c2..020f7de 100644 --- a/modules/core/src/test/java/org/gridgain/loadtests/GridCacheMultiNodeLoadTest.java +++ b/modules/core/src/test/java/org/gridgain/loadtests/GridCacheMultiNodeLoadTest.java @@ -19,17 +19,17 @@ package org.gridgain.loadtests; import org.apache.ignite.*; import org.apache.ignite.cache.*; +import org.apache.ignite.cache.eviction.lru.*; import org.apache.ignite.configuration.*; -import org.gridgain.grid.cache.eviction.lru.*; 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.gridgain.testframework.junits.common.*; -import static org.gridgain.grid.cache.GridCacheMode.*; -import static org.gridgain.grid.cache.GridCacheDistributionMode.*; -import static org.gridgain.grid.cache.GridCachePreloadMode.*; -import static org.gridgain.grid.cache.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.GridCacheMode.*; +import static org.apache.ignite.cache.GridCacheDistributionMode.*; +import static org.apache.ignite.cache.GridCachePreloadMode.*; +import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; /** * Multi-node cache test. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheAbstractLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheAbstractLoadTest.java b/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheAbstractLoadTest.java index e96cb82..cf89c3e 100644 --- a/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheAbstractLoadTest.java +++ b/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheAbstractLoadTest.java @@ -18,12 +18,12 @@ package org.gridgain.loadtests.cache; import org.apache.ignite.*; +import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.apache.ignite.lang.*; import org.apache.ignite.transactions.*; import org.apache.log4j.*; import org.apache.log4j.varia.*; -import org.gridgain.grid.cache.*; import org.gridgain.grid.util.typedef.*; import org.gridgain.grid.util.typedef.internal.*; import org.gridgain.testframework.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheAffinityTransactionsOffHeapTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheAffinityTransactionsOffHeapTest.java b/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheAffinityTransactionsOffHeapTest.java index 848a666..01b7bd8 100644 --- a/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheAffinityTransactionsOffHeapTest.java +++ b/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheAffinityTransactionsOffHeapTest.java @@ -19,10 +19,10 @@ package org.gridgain.loadtests.cache; import org.apache.ignite.*; import org.apache.ignite.cache.*; +import org.apache.ignite.cache.*; +import org.apache.ignite.cache.affinity.*; import org.apache.ignite.configuration.*; import org.apache.ignite.transactions.*; -import org.gridgain.grid.cache.*; -import org.gridgain.grid.cache.affinity.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; @@ -30,12 +30,12 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; import java.io.*; import java.util.*; -import static org.gridgain.grid.cache.GridCacheAtomicityMode.*; -import static org.gridgain.grid.cache.GridCacheMemoryMode.*; -import static org.gridgain.grid.cache.GridCacheMode.*; +import static org.apache.ignite.cache.GridCacheAtomicityMode.*; +import static org.apache.ignite.cache.GridCacheMemoryMode.*; +import static org.apache.ignite.cache.GridCacheMode.*; import static org.apache.ignite.transactions.IgniteTxConcurrency.*; import static org.apache.ignite.transactions.IgniteTxIsolation.*; -import static org.gridgain.grid.cache.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; /** */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheBenchmark.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheBenchmark.java b/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheBenchmark.java index 0176cc9..d32cb05 100644 --- a/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheBenchmark.java +++ b/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheBenchmark.java @@ -18,7 +18,7 @@ package org.gridgain.loadtests.cache; import org.apache.ignite.*; -import org.gridgain.grid.cache.*; +import org.apache.ignite.cache.*; import org.gridgain.grid.util.typedef.*; import org.gridgain.testframework.*; import org.jetbrains.annotations.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheDataStructuresLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheDataStructuresLoadTest.java b/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheDataStructuresLoadTest.java index 6742ec4..a3da7ee 100644 --- a/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheDataStructuresLoadTest.java +++ b/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheDataStructuresLoadTest.java @@ -18,9 +18,8 @@ package org.gridgain.loadtests.cache; import org.apache.ignite.*; -import org.gridgain.grid.*; -import org.gridgain.grid.cache.*; -import org.gridgain.grid.cache.datastructures.*; +import org.apache.ignite.cache.*; +import org.apache.ignite.cache.datastructures.*; import org.gridgain.grid.util.typedef.*; import java.util.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheGroupLockComparisonTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheGroupLockComparisonTest.java b/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheGroupLockComparisonTest.java index ae76fa1..7ee865a 100644 --- a/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheGroupLockComparisonTest.java +++ b/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheGroupLockComparisonTest.java @@ -18,9 +18,9 @@ package org.gridgain.loadtests.cache; import org.apache.ignite.*; +import org.apache.ignite.cache.*; +import org.apache.ignite.cache.affinity.*; import org.apache.ignite.transactions.*; -import org.gridgain.grid.cache.*; -import org.gridgain.grid.cache.affinity.*; import org.gridgain.grid.util.typedef.*; import org.gridgain.testframework.*; import org.jetbrains.annotations.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheLoadTest.java b/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheLoadTest.java index ed37ce9..ff74f40 100644 --- a/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheLoadTest.java +++ b/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheLoadTest.java @@ -18,8 +18,7 @@ package org.gridgain.loadtests.cache; import org.apache.ignite.*; -import org.gridgain.grid.*; -import org.gridgain.grid.cache.*; +import org.apache.ignite.cache.*; import org.gridgain.grid.util.typedef.*; import org.gridgain.testframework.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCachePutRemoveLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCachePutRemoveLoadTest.java b/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCachePutRemoveLoadTest.java index a46e717..0a2e876 100644 --- a/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCachePutRemoveLoadTest.java +++ b/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCachePutRemoveLoadTest.java @@ -20,9 +20,9 @@ package org.gridgain.loadtests.cache; import com.beust.jcommander.*; import org.apache.ignite.*; import org.apache.ignite.cache.*; +import org.apache.ignite.cache.*; +import org.apache.ignite.cache.eviction.lru.*; import org.apache.ignite.configuration.*; -import org.gridgain.grid.cache.*; -import org.gridgain.grid.cache.eviction.lru.*; import org.gridgain.grid.kernal.*; import org.gridgain.grid.util.typedef.*; import org.gridgain.grid.util.typedef.internal.*; @@ -32,9 +32,9 @@ import java.util.*; import java.util.concurrent.*; import java.util.concurrent.atomic.*; -import static org.gridgain.grid.cache.GridCacheAtomicityMode.*; -import static org.gridgain.grid.cache.GridCacheMemoryMode.*; -import static org.gridgain.grid.cache.GridCacheDistributionMode.*; +import static org.apache.ignite.cache.GridCacheAtomicityMode.*; +import static org.apache.ignite.cache.GridCacheMemoryMode.*; +import static org.apache.ignite.cache.GridCacheDistributionMode.*; /** * The benchmark that performs put and remove operations on the cache to identify memory leaks. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheSingleNodeLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheSingleNodeLoadTest.java b/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheSingleNodeLoadTest.java index d0ec833..d55c054 100644 --- a/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheSingleNodeLoadTest.java +++ b/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheSingleNodeLoadTest.java @@ -18,10 +18,9 @@ package org.gridgain.loadtests.cache; import org.apache.ignite.cache.*; +import org.apache.ignite.cache.eviction.lru.*; import org.apache.ignite.configuration.*; import org.apache.ignite.thread.*; -import org.gridgain.grid.cache.*; -import org.gridgain.grid.cache.eviction.lru.*; import org.apache.ignite.spi.collision.fifoqueue.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; @@ -34,8 +33,8 @@ import java.util.*; import java.util.concurrent.*; import java.util.concurrent.atomic.*; -import static org.gridgain.grid.cache.GridCacheMode.*; -import static org.gridgain.grid.cache.GridCacheDistributionMode.*; +import static org.apache.ignite.cache.GridCacheMode.*; +import static org.apache.ignite.cache.GridCacheDistributionMode.*; /** */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheSwapLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheSwapLoadTest.java b/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheSwapLoadTest.java index 1282d76..c332ec4 100644 --- a/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheSwapLoadTest.java +++ b/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheSwapLoadTest.java @@ -18,10 +18,9 @@ package org.gridgain.loadtests.cache; import org.apache.ignite.*; +import org.apache.ignite.cache.*; import org.apache.ignite.events.*; import org.apache.ignite.lang.*; -import org.gridgain.grid.*; -import org.gridgain.grid.cache.*; import org.gridgain.grid.util.typedef.*; import org.gridgain.testframework.*; import org.jetbrains.annotations.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheWriteBehindStoreLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheWriteBehindStoreLoadTest.java b/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheWriteBehindStoreLoadTest.java index 88ddf99..28673d4 100644 --- a/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheWriteBehindStoreLoadTest.java +++ b/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheWriteBehindStoreLoadTest.java @@ -19,12 +19,12 @@ package org.gridgain.loadtests.cache; import org.apache.ignite.*; import org.apache.ignite.cache.*; +import org.apache.ignite.cache.*; import org.apache.ignite.cache.store.*; import org.apache.ignite.configuration.*; import org.apache.ignite.lang.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; -import org.gridgain.grid.cache.*; import org.gridgain.grid.util.typedef.internal.*; import org.gridgain.testframework.junits.common.*; @@ -33,7 +33,7 @@ import javax.cache.configuration.*; import java.util.*; import java.util.concurrent.atomic.*; -import static org.gridgain.grid.cache.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; /** * Basic store test. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/core/src/test/java/org/gridgain/loadtests/capacity/GridCapacityLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/loadtests/capacity/GridCapacityLoadTest.java b/modules/core/src/test/java/org/gridgain/loadtests/capacity/GridCapacityLoadTest.java index 092994d..c3fd591 100644 --- a/modules/core/src/test/java/org/gridgain/loadtests/capacity/GridCapacityLoadTest.java +++ b/modules/core/src/test/java/org/gridgain/loadtests/capacity/GridCapacityLoadTest.java @@ -18,8 +18,8 @@ package org.gridgain.loadtests.capacity; import org.apache.ignite.*; +import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; -import org.gridgain.grid.cache.*; import org.gridgain.grid.util.typedef.*; import org.springframework.context.support.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/core/src/test/java/org/gridgain/loadtests/capacity/spring-capacity-cache.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/loadtests/capacity/spring-capacity-cache.xml b/modules/core/src/test/java/org/gridgain/loadtests/capacity/spring-capacity-cache.xml index f1e249d..1b9bf75 100644 --- a/modules/core/src/test/java/org/gridgain/loadtests/capacity/spring-capacity-cache.xml +++ b/modules/core/src/test/java/org/gridgain/loadtests/capacity/spring-capacity-cache.xml @@ -77,7 +77,7 @@ sets the number of backups to 0 to ensure maximum capacity.. --> <property name="affinity"> - <bean class="org.gridgain.grid.cache.affinity.consistenthash.GridCacheConsistentHashAffinityFunction"> + <bean class="org.apache.ignite.cache.affinity.consistenthash.GridCacheConsistentHashAffinityFunction"> <property name="keyBackups" value="0"/> <!-- No backups. --> </bean> </property> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/core/src/test/java/org/gridgain/loadtests/colocation/GridTestCacheStore.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/loadtests/colocation/GridTestCacheStore.java b/modules/core/src/test/java/org/gridgain/loadtests/colocation/GridTestCacheStore.java index 3733874..94fd931 100644 --- a/modules/core/src/test/java/org/gridgain/loadtests/colocation/GridTestCacheStore.java +++ b/modules/core/src/test/java/org/gridgain/loadtests/colocation/GridTestCacheStore.java @@ -18,11 +18,10 @@ package org.gridgain.loadtests.colocation; import org.apache.ignite.*; +import org.apache.ignite.cache.*; import org.apache.ignite.cache.store.*; import org.apache.ignite.lang.*; import org.apache.ignite.resources.*; -import org.apache.ignite.transactions.*; -import org.gridgain.grid.cache.*; import org.jdk8.backport.*; import javax.cache.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/core/src/test/java/org/gridgain/loadtests/colocation/GridTestKey.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/loadtests/colocation/GridTestKey.java b/modules/core/src/test/java/org/gridgain/loadtests/colocation/GridTestKey.java index 9f56fbd..38cbad5 100644 --- a/modules/core/src/test/java/org/gridgain/loadtests/colocation/GridTestKey.java +++ b/modules/core/src/test/java/org/gridgain/loadtests/colocation/GridTestKey.java @@ -17,7 +17,7 @@ package org.gridgain.loadtests.colocation; -import org.gridgain.grid.cache.affinity.*; +import org.apache.ignite.cache.affinity.*; import java.io.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/core/src/test/java/org/gridgain/loadtests/colocation/GridTestLifecycleBean.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/loadtests/colocation/GridTestLifecycleBean.java b/modules/core/src/test/java/org/gridgain/loadtests/colocation/GridTestLifecycleBean.java index 551d950..e2bae1a 100644 --- a/modules/core/src/test/java/org/gridgain/loadtests/colocation/GridTestLifecycleBean.java +++ b/modules/core/src/test/java/org/gridgain/loadtests/colocation/GridTestLifecycleBean.java @@ -18,10 +18,9 @@ package org.gridgain.loadtests.colocation; import org.apache.ignite.*; +import org.apache.ignite.cache.*; import org.apache.ignite.lifecycle.*; import org.apache.ignite.resources.*; -import org.gridgain.grid.*; -import org.gridgain.grid.cache.*; /** * Lifecycle bean. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/core/src/test/java/org/gridgain/loadtests/colocation/GridTestMain.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/loadtests/colocation/GridTestMain.java b/modules/core/src/test/java/org/gridgain/loadtests/colocation/GridTestMain.java index 4423692..2581684 100644 --- a/modules/core/src/test/java/org/gridgain/loadtests/colocation/GridTestMain.java +++ b/modules/core/src/test/java/org/gridgain/loadtests/colocation/GridTestMain.java @@ -18,11 +18,10 @@ package org.gridgain.loadtests.colocation; import org.apache.ignite.*; +import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.apache.ignite.lang.*; import org.apache.ignite.thread.*; -import org.gridgain.grid.*; -import org.gridgain.grid.cache.*; import org.gridgain.grid.util.typedef.*; import org.springframework.beans.factory.*; import org.springframework.context.support.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/core/src/test/java/org/gridgain/loadtests/colocation/spring-colocation.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/loadtests/colocation/spring-colocation.xml b/modules/core/src/test/java/org/gridgain/loadtests/colocation/spring-colocation.xml index 0eb6c5a..0278dfa 100644 --- a/modules/core/src/test/java/org/gridgain/loadtests/colocation/spring-colocation.xml +++ b/modules/core/src/test/java/org/gridgain/loadtests/colocation/spring-colocation.xml @@ -127,7 +127,7 @@ sets the number of backups to 1 (which is default). --> <property name="affinity"> - <bean class="org.gridgain.grid.cache.affinity.consistenthash.GridCacheConsistentHashAffinityFunction"> + <bean class="org.apache.ignite.cache.affinity.consistenthash.GridCacheConsistentHashAffinityFunction"> <property name="keyBackups" value="0"/> <!-- Disable backups. --> </bean> </property> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/core/src/test/java/org/gridgain/loadtests/continuous/GridContinuousOperationsLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/loadtests/continuous/GridContinuousOperationsLoadTest.java b/modules/core/src/test/java/org/gridgain/loadtests/continuous/GridContinuousOperationsLoadTest.java index d738ce9..93facb6 100644 --- a/modules/core/src/test/java/org/gridgain/loadtests/continuous/GridContinuousOperationsLoadTest.java +++ b/modules/core/src/test/java/org/gridgain/loadtests/continuous/GridContinuousOperationsLoadTest.java @@ -18,11 +18,11 @@ package org.gridgain.loadtests.continuous; import org.apache.ignite.*; +import org.apache.ignite.cache.*; +import org.apache.ignite.cache.query.*; import org.apache.ignite.events.*; import org.apache.ignite.lang.*; import org.gridgain.grid.*; -import org.gridgain.grid.cache.*; -import org.gridgain.grid.cache.query.*; import org.gridgain.grid.kernal.processors.cache.*; import org.gridgain.grid.kernal.processors.cache.query.continuous.*; import org.gridgain.grid.util.typedef.*; @@ -40,7 +40,7 @@ import static org.gridgain.testframework.GridLoadTestUtils.*; import static org.gridgain.testframework.GridTestUtils.*; /** - * Load test for {@link GridCacheContinuousQuery}. + * Load test for {@link org.apache.ignite.cache.query.GridCacheContinuousQuery}. */ public class GridContinuousOperationsLoadTest { /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/core/src/test/java/org/gridgain/loadtests/datastructures/GridCachePartitionedAtomicLongLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/loadtests/datastructures/GridCachePartitionedAtomicLongLoadTest.java b/modules/core/src/test/java/org/gridgain/loadtests/datastructures/GridCachePartitionedAtomicLongLoadTest.java index aaea04a..1b5fb7e 100644 --- a/modules/core/src/test/java/org/gridgain/loadtests/datastructures/GridCachePartitionedAtomicLongLoadTest.java +++ b/modules/core/src/test/java/org/gridgain/loadtests/datastructures/GridCachePartitionedAtomicLongLoadTest.java @@ -19,12 +19,11 @@ package org.gridgain.loadtests.datastructures; import org.apache.ignite.*; import org.apache.ignite.cache.*; +import org.apache.ignite.cache.affinity.consistenthash.*; +import org.apache.ignite.cache.datastructures.*; +import org.apache.ignite.cache.eviction.lru.*; import org.apache.ignite.configuration.*; import org.apache.ignite.transactions.*; -import org.gridgain.grid.cache.*; -import org.gridgain.grid.cache.affinity.consistenthash.*; -import org.gridgain.grid.cache.datastructures.*; -import org.gridgain.grid.cache.eviction.lru.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; @@ -35,7 +34,7 @@ import java.util.concurrent.atomic.*; import static org.apache.ignite.transactions.IgniteTxConcurrency.PESSIMISTIC; import static org.apache.ignite.transactions.IgniteTxIsolation.*; -import static org.gridgain.grid.cache.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; /** * Load test for atomic long. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/core/src/test/java/org/gridgain/loadtests/dsi/GridDsiPerfJob.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/loadtests/dsi/GridDsiPerfJob.java b/modules/core/src/test/java/org/gridgain/loadtests/dsi/GridDsiPerfJob.java index eedd3db..e50e023 100644 --- a/modules/core/src/test/java/org/gridgain/loadtests/dsi/GridDsiPerfJob.java +++ b/modules/core/src/test/java/org/gridgain/loadtests/dsi/GridDsiPerfJob.java @@ -18,13 +18,13 @@ package org.gridgain.loadtests.dsi; import org.apache.ignite.*; +import org.apache.ignite.cache.*; +import org.apache.ignite.cache.affinity.*; +import org.apache.ignite.cache.datastructures.*; import org.apache.ignite.cluster.*; import org.apache.ignite.compute.*; import org.apache.ignite.resources.*; import org.apache.ignite.transactions.*; -import org.gridgain.grid.cache.*; -import org.gridgain.grid.cache.affinity.*; -import org.gridgain.grid.cache.datastructures.*; import org.gridgain.grid.kernal.*; import org.gridgain.grid.kernal.processors.cache.distributed.dht.*; import org.gridgain.grid.kernal.processors.cache.distributed.near.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/core/src/test/java/org/gridgain/loadtests/dsi/GridDsiRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/loadtests/dsi/GridDsiRequest.java b/modules/core/src/test/java/org/gridgain/loadtests/dsi/GridDsiRequest.java index 92bc7bb..d3d191a 100644 --- a/modules/core/src/test/java/org/gridgain/loadtests/dsi/GridDsiRequest.java +++ b/modules/core/src/test/java/org/gridgain/loadtests/dsi/GridDsiRequest.java @@ -17,7 +17,7 @@ package org.gridgain.loadtests.dsi; -import org.gridgain.grid.cache.affinity.*; +import org.apache.ignite.cache.affinity.*; import java.io.*;
