IGNITE-591 Fix imports.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/bb8dcf9c Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/bb8dcf9c Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/bb8dcf9c Branch: refs/heads/ignite-1085 Commit: bb8dcf9ce0290a4016c13184aef9796c7a2d7bde Parents: 5314335 Author: sevdokimov <sergey.evdoki...@jetbrains.com> Authored: Fri Jul 3 11:09:43 2015 +0300 Committer: sevdokimov <sergey.evdoki...@jetbrains.com> Committed: Fri Jul 3 11:09:43 2015 +0300 ---------------------------------------------------------------------- .../hibernate/HibernateL2CacheSelfTest.java | 45 +++++++++----------- .../HibernateL2CacheTransactionalSelfTest.java | 33 +++++++------- .../processors/cache/jta/CacheJtaManager.java | 23 ++++------ .../processors/cache/GridCacheJtaSelfTest.java | 21 ++++----- 4 files changed, 55 insertions(+), 67 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bb8dcf9c/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheSelfTest.java b/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheSelfTest.java index fe34ea8..91d5c26 100644 --- a/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheSelfTest.java +++ b/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheSelfTest.java @@ -17,40 +17,37 @@ package org.apache.ignite.cache.hibernate; -import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction; -import org.apache.ignite.configuration.CacheConfiguration; -import org.apache.ignite.configuration.IgniteConfiguration; -import org.apache.ignite.internal.IgniteKernal; -import org.apache.ignite.internal.processors.cache.IgniteCacheProxy; -import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; -import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; -import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; -import org.apache.ignite.testframework.GridTestUtils; -import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; +import org.apache.ignite.cache.affinity.rendezvous.*; +import org.apache.ignite.configuration.*; +import org.apache.ignite.internal.*; +import org.apache.ignite.internal.processors.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.*; +import org.apache.ignite.testframework.*; +import org.apache.ignite.testframework.junits.common.*; import org.hibernate.*; import org.hibernate.Query; -import org.hibernate.annotations.NaturalId; -import org.hibernate.annotations.NaturalIdCache; -import org.hibernate.cache.spi.GeneralDataRegion; -import org.hibernate.cache.spi.TransactionalDataRegion; +import org.hibernate.annotations.*; +import org.hibernate.cache.spi.*; import org.hibernate.cache.spi.access.AccessType; -import org.hibernate.cfg.Configuration; -import org.hibernate.exception.ConstraintViolationException; -import org.hibernate.service.ServiceRegistryBuilder; -import org.hibernate.stat.NaturalIdCacheStatistics; -import org.hibernate.stat.SecondLevelCacheStatistics; +import org.hibernate.cfg.*; +import org.hibernate.exception.*; +import org.hibernate.service.*; +import org.hibernate.stat.*; import javax.persistence.*; import java.util.*; -import java.util.concurrent.Callable; +import java.util.concurrent.*; -import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC; -import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL; -import static org.apache.ignite.cache.CacheMode.PARTITIONED; -import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC; +import static org.apache.ignite.cache.CacheAtomicityMode.*; +import static org.apache.ignite.cache.CacheMode.*; +import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; import static org.apache.ignite.cache.hibernate.HibernateRegionFactory.*; import static org.hibernate.cfg.Environment.*; +import org.apache.ignite.cache.hibernate.HibernateL2CacheSelfTest.Entity; + /** * * Tests Hibernate L2 cache. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bb8dcf9c/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheTransactionalSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheTransactionalSelfTest.java b/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheTransactionalSelfTest.java index 6f47d3b..efc6f3e 100644 --- a/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheTransactionalSelfTest.java +++ b/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheTransactionalSelfTest.java @@ -17,24 +17,23 @@ package org.apache.ignite.cache.hibernate; -import org.apache.commons.dbcp.managed.BasicManagedDataSource; -import org.apache.ignite.cache.jta.CacheTmLookup; -import org.apache.ignite.configuration.CacheConfiguration; -import org.h2.jdbcx.JdbcDataSource; -import org.hibernate.cache.spi.access.AccessType; -import org.hibernate.engine.transaction.internal.jta.JtaTransactionFactory; +import org.apache.commons.dbcp.managed.*; +import org.apache.ignite.cache.jta.*; +import org.apache.ignite.configuration.*; +import org.h2.jdbcx.*; +import org.hibernate.cache.spi.access.*; +import org.hibernate.engine.transaction.internal.jta.*; import org.hibernate.engine.transaction.spi.TransactionFactory; -import org.hibernate.service.ServiceRegistryBuilder; -import org.hibernate.service.jdbc.connections.internal.DatasourceConnectionProviderImpl; -import org.hibernate.service.jdbc.connections.spi.ConnectionProvider; -import org.hibernate.service.jta.platform.internal.AbstractJtaPlatform; -import org.hibernate.service.jta.platform.spi.JtaPlatform; -import org.jetbrains.annotations.Nullable; -import org.objectweb.jotm.Jotm; - -import javax.transaction.TransactionManager; -import javax.transaction.UserTransaction; -import java.util.Collections; +import org.hibernate.service.*; +import org.hibernate.service.jdbc.connections.internal.*; +import org.hibernate.service.jdbc.connections.spi.*; +import org.hibernate.service.jta.platform.internal.*; +import org.hibernate.service.jta.platform.spi.*; +import org.jetbrains.annotations.*; +import org.objectweb.jotm.*; + +import javax.transaction.*; +import java.util.*; /** * http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bb8dcf9c/modules/jta/src/main/java/org/apache/ignite/internal/processors/cache/jta/CacheJtaManager.java ---------------------------------------------------------------------- diff --git a/modules/jta/src/main/java/org/apache/ignite/internal/processors/cache/jta/CacheJtaManager.java b/modules/jta/src/main/java/org/apache/ignite/internal/processors/cache/jta/CacheJtaManager.java index c5a94bc..2a0d46d 100644 --- a/modules/jta/src/main/java/org/apache/ignite/internal/processors/cache/jta/CacheJtaManager.java +++ b/modules/jta/src/main/java/org/apache/ignite/internal/processors/cache/jta/CacheJtaManager.java @@ -17,20 +17,15 @@ package org.apache.ignite.internal.processors.cache.jta; -import org.apache.ignite.IgniteCheckedException; -import org.apache.ignite.cache.jta.CacheTmLookup; -import org.apache.ignite.configuration.CacheConfiguration; -import org.apache.ignite.configuration.TransactionConfiguration; -import org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx; -import org.jetbrains.annotations.Nullable; - -import javax.transaction.RollbackException; -import javax.transaction.SystemException; -import javax.transaction.Transaction; -import javax.transaction.TransactionManager; -import java.lang.ref.WeakReference; -import java.util.Map; -import java.util.WeakHashMap; +import org.apache.ignite.*; +import org.apache.ignite.cache.jta.*; +import org.apache.ignite.configuration.*; +import org.apache.ignite.internal.processors.cache.transactions.*; +import org.jetbrains.annotations.*; + +import javax.transaction.*; +import java.lang.ref.*; +import java.util.*; /** * Implementation of {@link CacheJtaManagerAdapter}. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bb8dcf9c/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheJtaSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheJtaSelfTest.java b/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheJtaSelfTest.java index 9b8cb15..e1c8a77 100644 --- a/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheJtaSelfTest.java +++ b/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheJtaSelfTest.java @@ -17,21 +17,18 @@ package org.apache.ignite.internal.processors.cache; -import org.apache.ignite.IgniteCache; -import org.apache.ignite.cache.CacheMode; -import org.apache.ignite.cache.jta.CacheTmLookup; -import org.apache.ignite.configuration.CacheConfiguration; -import org.apache.ignite.configuration.IgniteConfiguration; -import org.apache.ignite.internal.IgniteEx; +import org.apache.ignite.*; +import org.apache.ignite.cache.*; +import org.apache.ignite.cache.jta.*; +import org.apache.ignite.configuration.*; +import org.apache.ignite.internal.*; import org.apache.ignite.transactions.Transaction; -import org.objectweb.jotm.Jotm; +import org.objectweb.jotm.*; -import javax.transaction.Status; -import javax.transaction.TransactionManager; -import javax.transaction.UserTransaction; +import javax.transaction.*; -import static org.apache.ignite.cache.CacheMode.PARTITIONED; -import static org.apache.ignite.transactions.TransactionState.ACTIVE; +import static org.apache.ignite.cache.CacheMode.*; +import static org.apache.ignite.transactions.TransactionState.*; /** * Abstract class for cache tests.
