Allon Mureinik has uploaded a new change for review. Change subject: core: FQCN imports in the utils project ......................................................................
core: FQCN imports in the utils project Replaced the remaining * imports in the utils project with FQCN imports. Change-Id: Ib6a542a6c66cd1284e63a31b0d87381eaf3ed2d6 Signed-off-by: Allon Mureinik <[email protected]> --- M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/linq/LinqUtils.java M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/transaction/TransactionSupport.java M backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ReflectionUtilsFindConstructorTest.java M backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/linq/LinqUtilsTest.java M backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ssh/BasicTest.java M backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ssh/CommandTest.java M backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ssh/ConstraintByteArrayOutputStreamTest.java M backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ssh/PropertiesTest.java M backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ssh/TimeoutTest.java M backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ssh/TransferTest.java 10 files changed, 53 insertions(+), 19 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/91/14791/1 diff --git a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/linq/LinqUtils.java b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/linq/LinqUtils.java index 4afde28..e686cfe 100644 --- a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/linq/LinqUtils.java +++ b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/linq/LinqUtils.java @@ -1,6 +1,11 @@ package org.ovirt.engine.core.utils.linq; -import java.util.*; +import java.util.Collection; +import java.util.Iterator; +import java.util.LinkedHashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; /** * Created by IntelliJ IDEA. User: gmostizk Date: Aug 9, 2009 Time: 3:44:57 PM To change this template use File | diff --git a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/transaction/TransactionSupport.java b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/transaction/TransactionSupport.java index d437695..30e7c4c 100644 --- a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/transaction/TransactionSupport.java +++ b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/transaction/TransactionSupport.java @@ -1,13 +1,21 @@ package org.ovirt.engine.core.utils.transaction; -import org.ovirt.engine.core.utils.ejb.EjbUtils; +import javax.ejb.TransactionRolledbackLocalException; +import javax.transaction.HeuristicMixedException; +import javax.transaction.HeuristicRollbackException; +import javax.transaction.NotSupportedException; +import javax.transaction.RollbackException; +import javax.transaction.Status; +import javax.transaction.Synchronization; +import javax.transaction.SystemException; +import javax.transaction.Transaction; +import javax.transaction.TransactionManager; + +import org.ovirt.engine.core.compat.TransactionScopeOption; import org.ovirt.engine.core.utils.ejb.ContainerManagedResourceType; +import org.ovirt.engine.core.utils.ejb.EjbUtils; import org.ovirt.engine.core.utils.log.Log; import org.ovirt.engine.core.utils.log.LogFactory; -import org.ovirt.engine.core.compat.TransactionScopeOption; - -import javax.transaction.*; -import javax.ejb.TransactionRolledbackLocalException; public class TransactionSupport { diff --git a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ReflectionUtilsFindConstructorTest.java b/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ReflectionUtilsFindConstructorTest.java index 35e43e1..a917f52 100644 --- a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ReflectionUtilsFindConstructorTest.java +++ b/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ReflectionUtilsFindConstructorTest.java @@ -1,6 +1,9 @@ package org.ovirt.engine.core.utils; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; import java.lang.reflect.Constructor; import java.text.MessageFormat; diff --git a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/linq/LinqUtilsTest.java b/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/linq/LinqUtilsTest.java index c39fa60..93e1310 100644 --- a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/linq/LinqUtilsTest.java +++ b/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/linq/LinqUtilsTest.java @@ -1,9 +1,14 @@ package org.ovirt.engine.core.utils.linq; -import org.junit.Test; import static org.junit.Assert.assertEquals; -import java.util.*; +import java.util.Arrays; +import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; + +import org.junit.Test; /** * Created by IntelliJ IDEA. User: gmostizk Date: Aug 9, 2009 Time: 4:05:52 PM To change this template use File | diff --git a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ssh/BasicTest.java b/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ssh/BasicTest.java index 98f6d78..c596a49 100644 --- a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ssh/BasicTest.java +++ b/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ssh/BasicTest.java @@ -1,8 +1,11 @@ package org.ovirt.engine.core.utils.ssh; +import static org.junit.Assert.assertEquals; + import java.io.ByteArrayOutputStream; import java.security.KeyPair; import java.security.KeyPairGenerator; + import javax.naming.AuthenticationException; import org.junit.After; @@ -11,7 +14,6 @@ import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import static org.junit.Assert.*; /** * Basic tests. diff --git a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ssh/CommandTest.java b/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ssh/CommandTest.java index 8abcf19..1271e10 100644 --- a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ssh/CommandTest.java +++ b/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ssh/CommandTest.java @@ -1,9 +1,13 @@ package org.ovirt.engine.core.utils.ssh; -import java.io.ByteArrayOutputStream; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; + import javax.naming.TimeLimitExceededException; import org.junit.After; @@ -11,7 +15,6 @@ import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import static org.junit.Assert.*; /** * Command tests. diff --git a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ssh/ConstraintByteArrayOutputStreamTest.java b/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ssh/ConstraintByteArrayOutputStreamTest.java index 332fe83..bb42d6d 100644 --- a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ssh/ConstraintByteArrayOutputStreamTest.java +++ b/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ssh/ConstraintByteArrayOutputStreamTest.java @@ -1,10 +1,11 @@ package org.ovirt.engine.core.utils.ssh; +import static org.junit.Assert.assertTrue; + import java.io.ByteArrayOutputStream; import java.io.IOException; import org.junit.Test; -import static org.junit.Assert.*; /** * SSHClient.ConstraintByteArrayOutputStream tests. diff --git a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ssh/PropertiesTest.java b/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ssh/PropertiesTest.java index df1669e..78621b7 100644 --- a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ssh/PropertiesTest.java +++ b/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ssh/PropertiesTest.java @@ -1,7 +1,8 @@ package org.ovirt.engine.core.utils.ssh; +import static org.junit.Assert.assertEquals; + import org.junit.Test; -import static org.junit.Assert.*; /** * Basic tests. diff --git a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ssh/TimeoutTest.java b/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ssh/TimeoutTest.java index a0f6120..3d346f6 100644 --- a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ssh/TimeoutTest.java +++ b/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ssh/TimeoutTest.java @@ -1,19 +1,24 @@ package org.ovirt.engine.core.utils.ssh; +import static org.mockito.Matchers.anyInt; +import static org.mockito.Matchers.anyLong; +import static org.mockito.Matchers.anyString; +import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.when; + import javax.naming.TimeLimitExceededException; import org.apache.sshd.ClientSession; import org.apache.sshd.SshClient; import org.apache.sshd.client.future.AuthFuture; import org.apache.sshd.client.future.ConnectFuture; - import org.junit.After; import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import static org.junit.Assert.*; -import static org.mockito.Mockito.*; public class TimeoutTest { diff --git a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ssh/TransferTest.java b/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ssh/TransferTest.java index 26d24b6..d7672b9 100644 --- a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ssh/TransferTest.java +++ b/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ssh/TransferTest.java @@ -1,5 +1,7 @@ package org.ovirt.engine.core.utils.ssh; +import static org.junit.Assert.assertArrayEquals; + import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; @@ -12,11 +14,10 @@ import java.security.SecureRandom; import org.junit.After; -import org.junit.Before; import org.junit.AfterClass; +import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import static org.junit.Assert.*; /** * Long transfer test. -- To view, visit http://gerrit.ovirt.org/14791 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib6a542a6c66cd1284e63a31b0d87381eaf3ed2d6 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Allon Mureinik <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
