http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedHitsAndMissesSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedHitsAndMissesSelfTest.java b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedHitsAndMissesSelfTest.java index b8a4de5..bb94f67 100644 --- a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedHitsAndMissesSelfTest.java +++ b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedHitsAndMissesSelfTest.java @@ -19,6 +19,8 @@ package org.gridgain.grid.kernal.processors.cache.distributed.near; import org.apache.ignite.*; import org.apache.ignite.cache.*; +import org.apache.ignite.cache.*; +import org.apache.ignite.cache.query.*; import org.apache.ignite.configuration.*; import org.apache.ignite.dataload.*; import org.apache.ignite.marshaller.optimized.*; @@ -26,16 +28,14 @@ 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.transactions.*; -import org.gridgain.grid.cache.*; -import org.gridgain.grid.cache.query.*; import org.gridgain.testframework.junits.common.*; import javax.cache.processor.*; import java.util.*; -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.GridCacheDistributionMode.*; +import static org.apache.ignite.cache.GridCacheMode.*; +import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; /** * Test for issue GG-3997 Total Hits and Misses display wrong value for in-memory database.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedQuerySelfTest.java b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedQuerySelfTest.java index 536ef8d..478d949 100644 --- a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedQuerySelfTest.java @@ -18,8 +18,8 @@ package org.gridgain.grid.kernal.processors.cache.distributed.near; import org.apache.ignite.*; -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.kernal.processors.cache.*; import org.gridgain.grid.util.lang.*; import org.gridgain.grid.util.typedef.*; @@ -27,7 +27,7 @@ import org.jetbrains.annotations.*; import java.util.*; -import static org.gridgain.grid.cache.GridCacheMode.*; +import static org.apache.ignite.cache.GridCacheMode.*; /** * Tests for partitioned cache queries. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheQueryNodeRestartSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheQueryNodeRestartSelfTest.java b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheQueryNodeRestartSelfTest.java index 6a702cd..62708d2 100644 --- a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheQueryNodeRestartSelfTest.java +++ b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheQueryNodeRestartSelfTest.java @@ -19,14 +19,14 @@ package org.gridgain.grid.kernal.processors.cache.distributed.near; import org.apache.ignite.*; import org.apache.ignite.cache.*; +import org.apache.ignite.cache.*; +import org.apache.ignite.cache.query.*; import org.apache.ignite.configuration.*; import org.apache.ignite.events.*; import org.apache.ignite.lang.*; 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.cache.query.*; import org.gridgain.grid.kernal.processors.cache.*; import org.gridgain.grid.util.typedef.*; import org.gridgain.grid.util.typedef.internal.*; @@ -35,9 +35,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.GridCacheDistributionMode.*; -import static org.gridgain.grid.cache.GridCacheMode.*; +import static org.apache.ignite.cache.GridCacheAtomicityMode.*; +import static org.apache.ignite.cache.GridCacheDistributionMode.*; +import static org.apache.ignite.cache.GridCacheMode.*; /** * Test for distributed queries with node restarts. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedFieldsQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedFieldsQuerySelfTest.java b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedFieldsQuerySelfTest.java index be59dce..49725d1 100644 --- a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedFieldsQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedFieldsQuerySelfTest.java @@ -18,12 +18,11 @@ package org.gridgain.grid.kernal.processors.cache.distributed.replicated; import org.apache.ignite.*; +import org.apache.ignite.cache.*; +import org.apache.ignite.cache.query.*; import org.apache.ignite.cluster.*; 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.*; import org.gridgain.grid.kernal.processors.cache.*; import org.gridgain.grid.kernal.processors.query.*; @@ -36,7 +35,7 @@ import java.util.*; import java.util.concurrent.*; import static org.apache.ignite.events.IgniteEventType.*; -import static org.gridgain.grid.cache.GridCacheMode.*; +import static org.apache.ignite.cache.GridCacheMode.*; /** * Tests for fields queries. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedQuerySelfTest.java b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedQuerySelfTest.java index 33a843f..0f1cdb7 100644 --- a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedQuerySelfTest.java @@ -18,12 +18,12 @@ package org.gridgain.grid.kernal.processors.cache.distributed.replicated; import org.apache.ignite.*; +import org.apache.ignite.cache.*; +import org.apache.ignite.cache.query.*; import org.apache.ignite.cluster.*; import org.apache.ignite.events.*; import org.apache.ignite.lang.*; import org.apache.ignite.transactions.*; -import org.gridgain.grid.cache.*; -import org.gridgain.grid.cache.query.*; import org.gridgain.grid.kernal.*; import org.gridgain.grid.kernal.processors.cache.*; import org.gridgain.grid.kernal.processors.cache.query.*; @@ -43,7 +43,7 @@ import java.util.concurrent.*; import java.util.concurrent.atomic.*; import static org.apache.ignite.events.IgniteEventType.*; -import static org.gridgain.grid.cache.GridCacheMode.*; +import static org.apache.ignite.cache.GridCacheMode.*; /** * Tests replicated query. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalAtomicQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalAtomicQuerySelfTest.java b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalAtomicQuerySelfTest.java index 2f84f1a..80cf9a1 100644 --- a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalAtomicQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalAtomicQuerySelfTest.java @@ -17,9 +17,9 @@ package org.gridgain.grid.kernal.processors.cache.local; -import org.gridgain.grid.cache.*; +import org.apache.ignite.cache.*; -import static org.gridgain.grid.cache.GridCacheAtomicityMode.*; +import static org.apache.ignite.cache.GridCacheAtomicityMode.*; /** * Tests query for local cache in atomic mode. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalFieldsQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalFieldsQuerySelfTest.java b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalFieldsQuerySelfTest.java index 60ba9ff..a40170c 100644 --- a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalFieldsQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalFieldsQuerySelfTest.java @@ -17,10 +17,10 @@ package org.gridgain.grid.kernal.processors.cache.local; -import org.gridgain.grid.cache.*; +import org.apache.ignite.cache.*; import org.gridgain.grid.kernal.processors.cache.*; -import static org.gridgain.grid.cache.GridCacheMode.*; +import static org.apache.ignite.cache.GridCacheMode.*; /** * Tests for fields queries. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalQuerySelfTest.java b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalQuerySelfTest.java index bf4e389..0ead357 100644 --- a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalQuerySelfTest.java @@ -17,15 +17,14 @@ package org.gridgain.grid.kernal.processors.cache.local; +import org.apache.ignite.cache.*; +import org.apache.ignite.cache.query.*; 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 java.util.*; -import static org.gridgain.grid.cache.GridCacheMode.*; +import static org.apache.ignite.cache.GridCacheMode.*; /** * Tests local query. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/query/h2/GridH2IndexRebuildTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/query/h2/GridH2IndexRebuildTest.java b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/query/h2/GridH2IndexRebuildTest.java index b685438..17311cb 100644 --- a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/query/h2/GridH2IndexRebuildTest.java +++ b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/query/h2/GridH2IndexRebuildTest.java @@ -17,11 +17,11 @@ package org.gridgain.grid.kernal.processors.query.h2; +import org.apache.ignite.cache.*; +import org.apache.ignite.cache.query.*; import org.apache.ignite.configuration.*; 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.query.*; import org.gridgain.grid.util.typedef.internal.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/query/h2/GridH2IndexingGeoSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/query/h2/GridH2IndexingGeoSelfTest.java b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/query/h2/GridH2IndexingGeoSelfTest.java index 941788a..020b200 100644 --- a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/query/h2/GridH2IndexingGeoSelfTest.java +++ b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/query/h2/GridH2IndexingGeoSelfTest.java @@ -19,9 +19,9 @@ package org.gridgain.grid.kernal.processors.query.h2; import com.vividsolutions.jts.geom.*; import com.vividsolutions.jts.io.*; +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 org.gridgain.grid.kernal.processors.cache.*; import org.gridgain.grid.util.typedef.*; import org.gridgain.grid.util.typedef.internal.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/indexing/src/test/java/org/gridgain/loadtests/h2indexing/GridTestEntity.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/gridgain/loadtests/h2indexing/GridTestEntity.java b/modules/indexing/src/test/java/org/gridgain/loadtests/h2indexing/GridTestEntity.java index 3014bd7..2e826ef 100644 --- a/modules/indexing/src/test/java/org/gridgain/loadtests/h2indexing/GridTestEntity.java +++ b/modules/indexing/src/test/java/org/gridgain/loadtests/h2indexing/GridTestEntity.java @@ -17,7 +17,7 @@ package org.gridgain.loadtests.h2indexing; -import org.gridgain.grid.cache.query.*; +import org.apache.ignite.cache.query.*; import java.util.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/jta/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheJtaConfigurationValidationSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/jta/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheJtaConfigurationValidationSelfTest.java b/modules/jta/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheJtaConfigurationValidationSelfTest.java index a6d09d3..f72c3bd 100644 --- a/modules/jta/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheJtaConfigurationValidationSelfTest.java +++ b/modules/jta/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheJtaConfigurationValidationSelfTest.java @@ -28,7 +28,7 @@ import org.jetbrains.annotations.*; import javax.transaction.*; import java.util.concurrent.*; -import static org.gridgain.grid.cache.GridCacheAtomicityMode.*; +import static org.apache.ignite.cache.GridCacheAtomicityMode.*; /** * Configuration validation test. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/jta/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheJtaSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/jta/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheJtaSelfTest.java b/modules/jta/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheJtaSelfTest.java index 81e6961..e1c1a71 100644 --- a/modules/jta/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheJtaSelfTest.java +++ b/modules/jta/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheJtaSelfTest.java @@ -21,13 +21,12 @@ import org.apache.ignite.*; import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.apache.ignite.transactions.*; -import org.gridgain.grid.cache.*; import org.gridgain.grid.cache.jta.*; import org.objectweb.jotm.*; import javax.transaction.*; -import static org.gridgain.grid.cache.GridCacheMode.*; +import static org.apache.ignite.cache.GridCacheMode.*; import static org.apache.ignite.transactions.IgniteTxState.*; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/jta/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheReplicatedJtaSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/jta/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheReplicatedJtaSelfTest.java b/modules/jta/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheReplicatedJtaSelfTest.java index 3c971e4..108c740 100644 --- a/modules/jta/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheReplicatedJtaSelfTest.java +++ b/modules/jta/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheReplicatedJtaSelfTest.java @@ -17,9 +17,9 @@ package org.gridgain.grid.kernal.processors.cache; -import org.gridgain.grid.cache.*; +import org.apache.ignite.cache.*; -import static org.gridgain.grid.cache.GridCacheMode.*; +import static org.apache.ignite.cache.GridCacheMode.*; /** * JTA integration test using REPLICATED cache. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/jta/src/test/java/org/gridgain/grid/kernal/processors/cache/GridTmLookupLifecycleAwareSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/jta/src/test/java/org/gridgain/grid/kernal/processors/cache/GridTmLookupLifecycleAwareSelfTest.java b/modules/jta/src/test/java/org/gridgain/grid/kernal/processors/cache/GridTmLookupLifecycleAwareSelfTest.java index 503aa2d..2001117 100644 --- a/modules/jta/src/test/java/org/gridgain/grid/kernal/processors/cache/GridTmLookupLifecycleAwareSelfTest.java +++ b/modules/jta/src/test/java/org/gridgain/grid/kernal/processors/cache/GridTmLookupLifecycleAwareSelfTest.java @@ -19,8 +19,8 @@ package org.gridgain.grid.kernal.processors.cache; import org.apache.ignite.*; import org.apache.ignite.cache.*; +import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; -import org.gridgain.grid.cache.*; import org.gridgain.grid.cache.jta.GridCacheTmLookup; import org.gridgain.grid.kernal.*; import org.apache.ignite.spi.discovery.tcp.*; @@ -29,8 +29,8 @@ import org.jetbrains.annotations.*; import javax.transaction.*; -import static org.gridgain.grid.cache.GridCacheDistributionMode.*; -import static org.gridgain.grid.cache.GridCacheMode.*; +import static org.apache.ignite.cache.GridCacheDistributionMode.*; +import static org.apache.ignite.cache.GridCacheMode.*; /** * Test for {@link org.apache.ignite.lifecycle.LifecycleAware} support for {@link GridCacheTmLookup}. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/scalar/src/main/scala/org/gridgain/scalar/ScalarConversions.scala ---------------------------------------------------------------------- diff --git a/modules/scalar/src/main/scala/org/gridgain/scalar/ScalarConversions.scala b/modules/scalar/src/main/scala/org/gridgain/scalar/ScalarConversions.scala index 79ea88a..06031fb 100644 --- a/modules/scalar/src/main/scala/org/gridgain/scalar/ScalarConversions.scala +++ b/modules/scalar/src/main/scala/org/gridgain/scalar/ScalarConversions.scala @@ -18,6 +18,7 @@ package org.gridgain.scalar import org.apache.ignite.Ignite +import org.apache.ignite.cache.{GridCacheEntry, GridCache, GridCacheProjection} import org.apache.ignite.cluster.ClusterGroup import org.apache.ignite.compute.ComputeJob import org.apache.ignite.lang._ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/scalar/src/main/scala/org/gridgain/scalar/pimps/ScalarCachePimp.scala ---------------------------------------------------------------------- diff --git a/modules/scalar/src/main/scala/org/gridgain/scalar/pimps/ScalarCachePimp.scala b/modules/scalar/src/main/scala/org/gridgain/scalar/pimps/ScalarCachePimp.scala index 2338980..a6c5b38 100644 --- a/modules/scalar/src/main/scala/org/gridgain/scalar/pimps/ScalarCachePimp.scala +++ b/modules/scalar/src/main/scala/org/gridgain/scalar/pimps/ScalarCachePimp.scala @@ -17,6 +17,7 @@ package org.gridgain.scalar.pimps +import org.apache.ignite.cache.GridCache import org.gridgain.grid.cache._ /** @@ -66,4 +67,4 @@ object ScalarCachePimp { pimp } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/scalar/src/main/scala/org/gridgain/scalar/pimps/ScalarCacheProjectionPimp.scala ---------------------------------------------------------------------- diff --git a/modules/scalar/src/main/scala/org/gridgain/scalar/pimps/ScalarCacheProjectionPimp.scala b/modules/scalar/src/main/scala/org/gridgain/scalar/pimps/ScalarCacheProjectionPimp.scala index 8439321..ee18ef5 100644 --- a/modules/scalar/src/main/scala/org/gridgain/scalar/pimps/ScalarCacheProjectionPimp.scala +++ b/modules/scalar/src/main/scala/org/gridgain/scalar/pimps/ScalarCacheProjectionPimp.scala @@ -17,6 +17,7 @@ package org.gridgain.scalar.pimps +import org.apache.ignite.cache.{GridCacheEntry, GridCacheProjection} import org.apache.ignite.cluster.ClusterGroup import org.apache.ignite.lang.{IgnitePredicate, IgniteReducer, IgniteClosure, IgniteBiTuple} @@ -164,7 +165,7 @@ class ScalarCacheProjectionPimp[@specialized K, @specialized V] extends PimpedTy * @param p Filter to check prior to getting the value. Note that filter check * together with getting the value is an atomic operation. * @return Value for the given key. - * @see `org.gridgain.grid.cache.GridCacheProjection.get(...)` + * @see `GridCacheProjection.get(...)` */ def opt(k: K, p: EntryPred = null): Option[V] = Option(value.projection(p).get(k)) @@ -178,7 +179,7 @@ class ScalarCacheProjectionPimp[@specialized K, @specialized V] extends PimpedTy * @param p Key-value predicate for this projection. If `null`, then the * same projection is returned. * @return Projection for given key-value predicate. - * @see `org.gridgain.grid.cache.GridCacheProjection.projection(...)` + * @see `GridCacheProjection.projection(...)` */ def viewByKv(@Nullable p: ((K, V) => Boolean)): GridCacheProjection[K, V] = if (p == null) @@ -195,7 +196,7 @@ class ScalarCacheProjectionPimp[@specialized K, @specialized V] extends PimpedTy * same projection is returned. If cache operation receives its own filter, then filters * will be `anded`. * @return Projection based on given filter. - * @see `org.gridgain.grid.cache.GridCacheProjection.projection(...)` + * @see `GridCacheProjection.projection(...)` */ def viewByEntry(@Nullable p: EntryPred): GridCacheProjection[K, V] = if (p == null) @@ -216,7 +217,7 @@ class ScalarCacheProjectionPimp[@specialized K, @specialized V] extends PimpedTy * @param k Key type. * @param v Value type. * @return Cache projection for given key and value types. - * @see `org.gridgain.grid.cache.GridCacheProjection.projection(...)` + * @see `GridCacheProjection.projection(...)` */ def viewByType[A, B](k: Class[A], v: Class[B]): GridCacheProjection[A, B] = { assert(k != null && v != null) @@ -279,7 +280,7 @@ class ScalarCacheProjectionPimp[@specialized K, @specialized V] extends PimpedTy * @param p Optional filter to check prior to putting value in cache. Note * that filter check is atomic with put operation. * @return `True` if value was stored in cache, `false` otherwise. - * @see `org.gridgain.grid.cache.GridCacheProjection#putx(...)` + * @see `GridCacheProjection#putx(...)` */ def putx$(kv: (K, V), @Nullable p: EntryPred*): Boolean = value.putx(kv._1, kv._2, unwrap(p): _*) @@ -306,7 +307,7 @@ class ScalarCacheProjectionPimp[@specialized K, @specialized V] extends PimpedTy * @return Previous value associated with specified key, or `null` * if entry did not pass the filter, or if there was no mapping for the key in swap * or in persistent storage. - * @see `org.gridgain.grid.cache.GridCacheProjection#put(...)` + * @see `GridCacheProjection#put(...)` */ def put$(kv: (K, V), @Nullable p: EntryPred*): V = value.put(kv._1, kv._2, unwrap(p): _*) @@ -331,7 +332,7 @@ class ScalarCacheProjectionPimp[@specialized K, @specialized V] extends PimpedTy * @param p Optional filter to check prior to putting value in cache. Note * that filter check is atomic with put operation. * @return Previous value associated with specified key as an option. - * @see `org.gridgain.grid.cache.GridCacheProjection#put(...)` + * @see `GridCacheProjection#put(...)` */ def putOpt$(kv: (K, V), @Nullable p: EntryPred*): Option[V] = Option(value.put(kv._1, kv._2, unwrap(p): _*)) @@ -343,7 +344,7 @@ class ScalarCacheProjectionPimp[@specialized K, @specialized V] extends PimpedTy * @param p Optional filter to check prior to putting value in cache. Note * that filter check is atomic with put operation. * @return `True` if value was stored in cache, `false` otherwise. - * @see `org.gridgain.grid.cache.GridCacheProjection#putx(...)` + * @see `GridCacheProjection#putx(...)` */ def +=(kv: (K, V), @Nullable p: EntryPred*): Boolean = putx$(kv, p: _*) @@ -365,7 +366,7 @@ class ScalarCacheProjectionPimp[@specialized K, @specialized V] extends PimpedTy * @param kv1 Key-value pair to store in cache. * @param kv2 Key-value pair to store in cache. * @param kvs Optional key-value pairs to store in cache. - * @see `org.gridgain.grid.cache.GridCacheProjection#putAll(...)` + * @see `GridCacheProjection#putAll(...)` */ def putAll$(kv1: (K, V), kv2: (K, V), @Nullable kvs: (K, V)*) { var m = mutable.Map.empty[K, V] @@ -393,7 +394,7 @@ class ScalarCacheProjectionPimp[@specialized K, @specialized V] extends PimpedTy * `GridCacheFlag#LOCAL`, `GridCacheFlag#READ`. * * @param kvs Key-value pairs to store in cache. If `null` this function is no-op. - * @see `org.gridgain.grid.cache.GridCacheProjection#putAll(...)` + * @see `GridCacheProjection#putAll(...)` */ def putAll$(@Nullable kvs: Seq[(K, V)]) { if (kvs != null) @@ -415,7 +416,7 @@ class ScalarCacheProjectionPimp[@specialized K, @specialized V] extends PimpedTy * `GridCacheFlag#LOCAL`, `GridCacheFlag#READ`. * * @param ks Sequence of additional keys to remove. If `null` - this function is no-op. - * @see `org.gridgain.grid.cache.GridCacheProjection#removeAll(...)` + * @see `GridCacheProjection#removeAll(...)` */ def removeAll$(@Nullable ks: Seq[K]) { if (ks != null) @@ -428,7 +429,7 @@ class ScalarCacheProjectionPimp[@specialized K, @specialized V] extends PimpedTy * @param kv1 Key-value pair to store in cache. * @param kv2 Key-value pair to store in cache. * @param kvs Optional key-value pairs to store in cache. - * @see `org.gridgain.grid.cache.GridCacheProjection#putAll(...)` + * @see `GridCacheProjection#putAll(...)` */ def +=(kv1: (K, V), kv2: (K, V), @Nullable kvs: (K, V)*) { putAll$(kv1, kv2, kvs: _*) @@ -464,7 +465,7 @@ class ScalarCacheProjectionPimp[@specialized K, @specialized V] extends PimpedTy * that filter is checked atomically together with remove operation. * @return Previous value associated with specified key, or `null` * if there was no value for this key. - * @see `org.gridgain.grid.cache.GridCacheProjection#remove(...)` + * @see `GridCacheProjection#remove(...)` */ def remove$(k: K, @Nullable p: EntryPred*): V = value.remove(k, unwrap(p): _*) @@ -498,7 +499,7 @@ class ScalarCacheProjectionPimp[@specialized K, @specialized V] extends PimpedTy * @param p Optional filters to check prior to removing value form cache. Note * that filter is checked atomically together with remove operation. * @return Previous value associated with specified key as an option. - * @see `org.gridgain.grid.cache.GridCacheProjection#remove(...)` + * @see `GridCacheProjection#remove(...)` */ def removeOpt$(k: K, @Nullable p: EntryPred*): Option[V] = Option(value.remove(k, unwrap(p): _*)) @@ -511,7 +512,7 @@ class ScalarCacheProjectionPimp[@specialized K, @specialized V] extends PimpedTy * that filter is checked atomically together with remove operation. * @return Previous value associated with specified key, or `null` * if there was no value for this key. - * @see `org.gridgain.grid.cache.GridCacheProjection#remove(...)` + * @see `GridCacheProjection#remove(...)` */ def -=(k: K, @Nullable p: EntryPred*): V = remove$(k, p: _*) @@ -533,7 +534,7 @@ class ScalarCacheProjectionPimp[@specialized K, @specialized V] extends PimpedTy * @param k1 1st key to remove. * @param k2 2nd key to remove. * @param ks Optional sequence of additional keys to remove. - * @see `org.gridgain.grid.cache.GridCacheProjection#removeAll(...)` + * @see `GridCacheProjection#removeAll(...)` */ def removeAll$(k1: K, k2: K, @Nullable ks: K*) { val s = new mutable.ArrayBuffer[K](2 + (if (ks == null) 0 else ks.length)) @@ -553,7 +554,7 @@ class ScalarCacheProjectionPimp[@specialized K, @specialized V] extends PimpedTy * @param k1 1st key to remove. * @param k2 2nd key to remove. * @param ks Optional sequence of additional keys to remove. - * @see `org.gridgain.grid.cache.GridCacheProjection#removeAll(...)` + * @see `GridCacheProjection#removeAll(...)` */ def -=(k1: K, k2: K, @Nullable ks: K*) { removeAll$(k1, k2, ks: _*) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/scalar/src/main/scala/org/gridgain/scalar/scalar.scala ---------------------------------------------------------------------- diff --git a/modules/scalar/src/main/scala/org/gridgain/scalar/scalar.scala b/modules/scalar/src/main/scala/org/gridgain/scalar/scalar.scala index e87393b..b8fb9d1 100644 --- a/modules/scalar/src/main/scala/org/gridgain/scalar/scalar.scala +++ b/modules/scalar/src/main/scala/org/gridgain/scalar/scalar.scala @@ -18,6 +18,8 @@ package org.gridgain.scalar import java.net.URL +import org.apache.ignite.cache.GridCache +import org.apache.ignite.cache.query.{GridCacheQuerySqlField, GridCacheQueryTextField} import org.apache.ignite.{IgniteState, IgniteDataLoader, Ignition, Ignite} import org.apache.ignite.cluster.ClusterNode import org.apache.ignite.configuration.IgniteConfiguration http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/scalar/src/test/scala/org/gridgain/scalar/tests/ScalarCacheQueriesSpec.scala ---------------------------------------------------------------------- diff --git a/modules/scalar/src/test/scala/org/gridgain/scalar/tests/ScalarCacheQueriesSpec.scala b/modules/scalar/src/test/scala/org/gridgain/scalar/tests/ScalarCacheQueriesSpec.scala index a73974d..08d3b7d 100644 --- a/modules/scalar/src/test/scala/org/gridgain/scalar/tests/ScalarCacheQueriesSpec.scala +++ b/modules/scalar/src/test/scala/org/gridgain/scalar/tests/ScalarCacheQueriesSpec.scala @@ -17,6 +17,7 @@ package org.gridgain.scalar.tests +import org.apache.ignite.cache.GridCache import org.apache.ignite.cluster.ClusterNode import org.gridgain.scalar._ import scalar._ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/spring/src/main/java/org/gridgain/grid/GridSpringBean.java ---------------------------------------------------------------------- diff --git a/modules/spring/src/main/java/org/gridgain/grid/GridSpringBean.java b/modules/spring/src/main/java/org/gridgain/grid/GridSpringBean.java index b1700c3..be0108a 100644 --- a/modules/spring/src/main/java/org/gridgain/grid/GridSpringBean.java +++ b/modules/spring/src/main/java/org/gridgain/grid/GridSpringBean.java @@ -18,11 +18,11 @@ package org.gridgain.grid; import org.apache.ignite.*; +import org.apache.ignite.cache.*; import org.apache.ignite.cluster.*; import org.apache.ignite.configuration.*; import org.apache.ignite.plugin.*; import org.apache.ignite.product.*; -import org.gridgain.grid.cache.*; import org.apache.ignite.hadoop.*; import org.apache.ignite.plugin.security.*; import org.gridgain.grid.util.lang.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/spring/src/main/java/org/gridgain/grid/cache/spring/GridSpringCache.java ---------------------------------------------------------------------- diff --git a/modules/spring/src/main/java/org/gridgain/grid/cache/spring/GridSpringCache.java b/modules/spring/src/main/java/org/gridgain/grid/cache/spring/GridSpringCache.java index 74baf53..596d69a 100644 --- a/modules/spring/src/main/java/org/gridgain/grid/cache/spring/GridSpringCache.java +++ b/modules/spring/src/main/java/org/gridgain/grid/cache/spring/GridSpringCache.java @@ -18,8 +18,8 @@ package org.gridgain.grid.cache.spring; import org.apache.ignite.*; +import org.apache.ignite.cache.*; import org.apache.ignite.lang.*; -import org.gridgain.grid.cache.*; import org.gridgain.grid.util.typedef.*; import org.springframework.cache.*; import org.springframework.cache.support.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/spring/src/main/java/org/gridgain/grid/cache/spring/GridSpringCacheManager.java ---------------------------------------------------------------------- diff --git a/modules/spring/src/main/java/org/gridgain/grid/cache/spring/GridSpringCacheManager.java b/modules/spring/src/main/java/org/gridgain/grid/cache/spring/GridSpringCacheManager.java index 0ab73f9..76d545b 100644 --- a/modules/spring/src/main/java/org/gridgain/grid/cache/spring/GridSpringCacheManager.java +++ b/modules/spring/src/main/java/org/gridgain/grid/cache/spring/GridSpringCacheManager.java @@ -18,9 +18,9 @@ package org.gridgain.grid.cache.spring; import org.apache.ignite.*; +import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.apache.ignite.lang.*; -import org.gridgain.grid.cache.*; import org.gridgain.grid.util.typedef.*; import org.springframework.beans.factory.*; import org.springframework.cache.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/spring/src/main/java/org/gridgain/grid/cache/spring/GridSpringDynamicCacheManager.java ---------------------------------------------------------------------- diff --git a/modules/spring/src/main/java/org/gridgain/grid/cache/spring/GridSpringDynamicCacheManager.java b/modules/spring/src/main/java/org/gridgain/grid/cache/spring/GridSpringDynamicCacheManager.java index 1cfed51..0600633 100644 --- a/modules/spring/src/main/java/org/gridgain/grid/cache/spring/GridSpringDynamicCacheManager.java +++ b/modules/spring/src/main/java/org/gridgain/grid/cache/spring/GridSpringDynamicCacheManager.java @@ -18,8 +18,8 @@ package org.gridgain.grid.cache.spring; import org.apache.ignite.*; +import org.apache.ignite.cache.*; import org.apache.ignite.lang.*; -import org.gridgain.grid.cache.*; import org.gridgain.grid.kernal.*; import org.gridgain.grid.kernal.processors.cache.*; import org.gridgain.grid.util.tostring.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/spring/src/test/java/org/gridgain/grid/cache/spring/GridSpringCacheManagerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/spring/src/test/java/org/gridgain/grid/cache/spring/GridSpringCacheManagerSelfTest.java b/modules/spring/src/test/java/org/gridgain/grid/cache/spring/GridSpringCacheManagerSelfTest.java index a550f9b..edf1a6f 100644 --- a/modules/spring/src/test/java/org/gridgain/grid/cache/spring/GridSpringCacheManagerSelfTest.java +++ b/modules/spring/src/test/java/org/gridgain/grid/cache/spring/GridSpringCacheManagerSelfTest.java @@ -22,7 +22,6 @@ 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.gridgain.grid.cache.*; import org.gridgain.testframework.junits.common.*; import org.springframework.beans.factory.*; import org.springframework.context.support.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/spring/src/test/java/org/gridgain/grid/cache/spring/GridSpringDynamicCacheManagerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/spring/src/test/java/org/gridgain/grid/cache/spring/GridSpringDynamicCacheManagerSelfTest.java b/modules/spring/src/test/java/org/gridgain/grid/cache/spring/GridSpringDynamicCacheManagerSelfTest.java index 37046a5..4368c93 100644 --- a/modules/spring/src/test/java/org/gridgain/grid/cache/spring/GridSpringDynamicCacheManagerSelfTest.java +++ b/modules/spring/src/test/java/org/gridgain/grid/cache/spring/GridSpringDynamicCacheManagerSelfTest.java @@ -18,11 +18,11 @@ package org.gridgain.grid.cache.spring; import org.apache.ignite.cache.*; +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.gridgain.grid.cache.*; import org.gridgain.testframework.junits.common.*; import org.springframework.beans.factory.*; import org.springframework.cache.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/spring/src/test/java/org/gridgain/grid/p2p/GridP2PUserVersionChangeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/spring/src/test/java/org/gridgain/grid/p2p/GridP2PUserVersionChangeSelfTest.java b/modules/spring/src/test/java/org/gridgain/grid/p2p/GridP2PUserVersionChangeSelfTest.java index 2211805..3995cea 100644 --- a/modules/spring/src/test/java/org/gridgain/grid/p2p/GridP2PUserVersionChangeSelfTest.java +++ b/modules/spring/src/test/java/org/gridgain/grid/p2p/GridP2PUserVersionChangeSelfTest.java @@ -22,7 +22,6 @@ import org.apache.ignite.cache.*; 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.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/visor-console/src/test/scala/org/gridgain/visor/commands/cache/VisorCacheClearCommandSpec.scala ---------------------------------------------------------------------- diff --git a/modules/visor-console/src/test/scala/org/gridgain/visor/commands/cache/VisorCacheClearCommandSpec.scala b/modules/visor-console/src/test/scala/org/gridgain/visor/commands/cache/VisorCacheClearCommandSpec.scala index 2db7db9..6e0b52c 100644 --- a/modules/visor-console/src/test/scala/org/gridgain/visor/commands/cache/VisorCacheClearCommandSpec.scala +++ b/modules/visor-console/src/test/scala/org/gridgain/visor/commands/cache/VisorCacheClearCommandSpec.scala @@ -18,8 +18,9 @@ package org.gridgain.visor.commands.cache import org.apache.ignite.cache.CacheConfiguration -import org.gridgain.grid.cache.GridCacheAtomicityMode._ -import org.gridgain.grid.cache.GridCacheMode._ +import org.apache.ignite.cache.{GridCacheMode, GridCacheAtomicityMode} +import GridCacheAtomicityMode._ +import GridCacheMode._ import org.gridgain.grid.cache._ import org.apache.ignite.Ignition http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/visor-console/src/test/scala/org/gridgain/visor/commands/cache/VisorCacheCommandSpec.scala ---------------------------------------------------------------------- diff --git a/modules/visor-console/src/test/scala/org/gridgain/visor/commands/cache/VisorCacheCommandSpec.scala b/modules/visor-console/src/test/scala/org/gridgain/visor/commands/cache/VisorCacheCommandSpec.scala index 8fb962a..35e9405 100644 --- a/modules/visor-console/src/test/scala/org/gridgain/visor/commands/cache/VisorCacheCommandSpec.scala +++ b/modules/visor-console/src/test/scala/org/gridgain/visor/commands/cache/VisorCacheCommandSpec.scala @@ -17,9 +17,8 @@ package org.gridgain.visor.commands.cache -import org.gridgain.grid.cache.query.GridCacheQuerySqlField - import org.apache.ignite.Ignition +import org.apache.ignite.cache.query.GridCacheQuerySqlField import org.scalatest._ import org.gridgain.visor._ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/visor-console/src/test/scala/org/gridgain/visor/commands/cache/VisorCacheCompactCommandSpec.scala ---------------------------------------------------------------------- diff --git a/modules/visor-console/src/test/scala/org/gridgain/visor/commands/cache/VisorCacheCompactCommandSpec.scala b/modules/visor-console/src/test/scala/org/gridgain/visor/commands/cache/VisorCacheCompactCommandSpec.scala index aeece94..0305529 100644 --- a/modules/visor-console/src/test/scala/org/gridgain/visor/commands/cache/VisorCacheCompactCommandSpec.scala +++ b/modules/visor-console/src/test/scala/org/gridgain/visor/commands/cache/VisorCacheCompactCommandSpec.scala @@ -18,7 +18,8 @@ package org.gridgain.visor.commands.cache import org.apache.ignite.cache.CacheConfiguration -import org.gridgain.grid.cache.GridCacheMode._ +import org.apache.ignite.cache.GridCacheMode +import GridCacheMode._ import org.gridgain.grid.cache._ import org.apache.ignite.Ignition http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/visor-console/src/test/scala/org/gridgain/visor/commands/cswap/VisorCacheSwapCommandSpec.scala ---------------------------------------------------------------------- diff --git a/modules/visor-console/src/test/scala/org/gridgain/visor/commands/cswap/VisorCacheSwapCommandSpec.scala b/modules/visor-console/src/test/scala/org/gridgain/visor/commands/cswap/VisorCacheSwapCommandSpec.scala index 72c0e12..ec24c01 100644 --- a/modules/visor-console/src/test/scala/org/gridgain/visor/commands/cswap/VisorCacheSwapCommandSpec.scala +++ b/modules/visor-console/src/test/scala/org/gridgain/visor/commands/cswap/VisorCacheSwapCommandSpec.scala @@ -18,9 +18,9 @@ package org.gridgain.visor.commands.cswap import org.apache.ignite.cache.CacheConfiguration -import org.gridgain.grid.cache.GridCacheMode import org.apache.ignite.Ignition +import org.apache.ignite.cache.GridCacheMode import org.apache.ignite.configuration.IgniteConfiguration import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/web/src/main/java/org/gridgain/grid/cache/websession/GridWebSessionFilter.java ---------------------------------------------------------------------- diff --git a/modules/web/src/main/java/org/gridgain/grid/cache/websession/GridWebSessionFilter.java b/modules/web/src/main/java/org/gridgain/grid/cache/websession/GridWebSessionFilter.java index bf34324..9c32e7d 100644 --- a/modules/web/src/main/java/org/gridgain/grid/cache/websession/GridWebSessionFilter.java +++ b/modules/web/src/main/java/org/gridgain/grid/cache/websession/GridWebSessionFilter.java @@ -21,7 +21,6 @@ import org.apache.ignite.*; import org.apache.ignite.cache.*; import org.apache.ignite.lang.*; import org.apache.ignite.transactions.*; -import org.gridgain.grid.cache.*; import org.gridgain.grid.startup.servlet.*; import org.gridgain.grid.util.typedef.*; import org.gridgain.grid.util.typedef.internal.*; @@ -34,11 +33,11 @@ import java.io.*; import java.util.*; import static java.util.concurrent.TimeUnit.*; -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.transactions.IgniteTxConcurrency.*; import static org.apache.ignite.transactions.IgniteTxIsolation.*; -import static org.gridgain.grid.cache.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; /** * Filter for web sessions caching. @@ -130,13 +129,13 @@ import static org.gridgain.grid.cache.GridCacheWriteSynchronizationMode.*; * parameter; if you specify both, the servlet context parameter will be ignored. * <h1 class="header">Web sessions caching and concurrent requests</h1> * If your web application can accept concurrent request for one session, - * consider using {@link GridCacheAtomicityMode#TRANSACTIONAL} cache - * instead of {@link GridCacheAtomicityMode#ATOMIC}. In this case each request + * consider using {@link org.apache.ignite.cache.GridCacheAtomicityMode#TRANSACTIONAL} cache + * instead of {@link org.apache.ignite.cache.GridCacheAtomicityMode#ATOMIC}. In this case each request * be processed inside pessimistic transaction which will guarantee that all * updates will be applied in correct order. This is important, for example, * if you get some attribute from the session, update its value and set new - * value back to the session. In case of {@link GridCacheAtomicityMode#ATOMIC} - * cache concurrent requests can get equal value, but {@link GridCacheAtomicityMode#TRANSACTIONAL} + * value back to the session. In case of {@link org.apache.ignite.cache.GridCacheAtomicityMode#ATOMIC} + * cache concurrent requests can get equal value, but {@link org.apache.ignite.cache.GridCacheAtomicityMode#TRANSACTIONAL} * cache will always process such updates one after another. */ public class GridWebSessionFilter implements Filter { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/web/src/test/java/org/gridgain/grid/kernal/websession/GridWebSessionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/web/src/test/java/org/gridgain/grid/kernal/websession/GridWebSessionSelfTest.java b/modules/web/src/test/java/org/gridgain/grid/kernal/websession/GridWebSessionSelfTest.java index 25f31a1..4132a0a 100644 --- a/modules/web/src/test/java/org/gridgain/grid/kernal/websession/GridWebSessionSelfTest.java +++ b/modules/web/src/test/java/org/gridgain/grid/kernal/websession/GridWebSessionSelfTest.java @@ -17,11 +17,11 @@ package org.gridgain.grid.kernal.websession; +import org.apache.ignite.cache.*; import org.apache.ignite.lang.*; import org.eclipse.jetty.server.*; import org.eclipse.jetty.servlet.*; import org.eclipse.jetty.webapp.*; -import org.gridgain.grid.cache.*; import org.gridgain.grid.util.typedef.*; import org.gridgain.grid.util.typedef.internal.*; import org.gridgain.testframework.*;
