Cleaned up imports.

ajoberstar · Mar 27, 2014 · 24e26d1 · 24e26d1
1 parent 0663b52
commit 24e26d1
Show file tree

Hide file tree

Showing 50 changed files with 51 additions and 306 deletions.
diff --git a/src/main/groovy/org/ajoberstar/grgit/Repository.groovy b/src/main/groovy/org/ajoberstar/grgit/Repository.groovy
@@ -16,7 +16,9 @@
 package org.ajoberstar.grgit
 
 import groovy.transform.Canonical
+
 import org.ajoberstar.grgit.auth.Credentials
+
 import org.eclipse.jgit.api.Git
 
 // TODO: When Gradle is built with Groovy 2.0+, switch to @Immutable

diff --git a/src/main/groovy/org/ajoberstar/grgit/auth/JschAgentProxySessionFactory.groovy b/src/main/groovy/org/ajoberstar/grgit/auth/JschAgentProxySessionFactory.groovy
@@ -15,9 +15,6 @@
  */
 package org.ajoberstar.grgit.auth
 
-import org.eclipse.jgit.transport.JschConfigSessionFactory
-import org.eclipse.jgit.transport.OpenSshConfig.Host
-import org.eclipse.jgit.util.FS
 import com.jcraft.jsch.IdentityRepository
 import com.jcraft.jsch.JSch
 import com.jcraft.jsch.JSchException
@@ -29,6 +26,11 @@ import com.jcraft.jsch.agentproxy.USocketFactory
 import com.jcraft.jsch.agentproxy.connector.PageantConnector
 import com.jcraft.jsch.agentproxy.connector.SSHAgentConnector
 import com.jcraft.jsch.agentproxy.usocket.JNAUSocketFactory
+
+import org.eclipse.jgit.transport.JschConfigSessionFactory
+import org.eclipse.jgit.transport.OpenSshConfig.Host
+import org.eclipse.jgit.util.FS
+
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
 

diff --git a/src/main/groovy/org/ajoberstar/grgit/auth/TransportOpUtil.groovy b/src/main/groovy/org/ajoberstar/grgit/auth/TransportOpUtil.groovy
@@ -19,6 +19,7 @@ import org.eclipse.jgit.api.TransportCommand
 import org.eclipse.jgit.awtui.AwtCredentialsProvider
 import org.eclipse.jgit.transport.CredentialsProvider
 import org.eclipse.jgit.transport.UsernamePasswordCredentialsProvider
+
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
 

diff --git a/src/main/groovy/org/ajoberstar/grgit/operation/BranchListOp.groovy b/src/main/groovy/org/ajoberstar/grgit/operation/BranchListOp.groovy
@@ -24,7 +24,6 @@ import org.ajoberstar.grgit.util.JGitUtil
 
 import org.eclipse.jgit.api.ListBranchCommand
 import org.eclipse.jgit.api.errors.GitAPIException
-import org.eclipse.jgit.lib.Ref
 
 class BranchListOp implements Callable<List<Branch>> {
 	private final Repository repo

diff --git a/src/main/groovy/org/ajoberstar/grgit/operation/BranchRemoveOp.groovy b/src/main/groovy/org/ajoberstar/grgit/operation/BranchRemoveOp.groovy
@@ -17,13 +17,11 @@ package org.ajoberstar.grgit.operation
 
 import java.util.concurrent.Callable
 
-import org.ajoberstar.grgit.Branch
 import org.ajoberstar.grgit.Repository
 import org.ajoberstar.grgit.exception.GrgitException
 
 import org.eclipse.jgit.api.DeleteBranchCommand
 import org.eclipse.jgit.api.errors.GitAPIException
-import org.eclipse.jgit.lib.Ref
 
 class BranchRemoveOp implements Callable<List<String>> {
 	private final Repository repo

diff --git a/src/main/groovy/org/ajoberstar/grgit/operation/BranchStatusOp.groovy b/src/main/groovy/org/ajoberstar/grgit/operation/BranchStatusOp.groovy
@@ -19,8 +19,8 @@ import java.io.IOException
 import java.util.concurrent.Callable
 
 import org.ajoberstar.grgit.Branch
-import org.ajoberstar.grgit.Repository
 import org.ajoberstar.grgit.BranchStatus
+import org.ajoberstar.grgit.Repository
 import org.ajoberstar.grgit.exception.GrgitException
 import org.ajoberstar.grgit.util.JGitUtil
 

diff --git a/src/main/groovy/org/ajoberstar/grgit/operation/CheckoutOp.groovy b/src/main/groovy/org/ajoberstar/grgit/operation/CheckoutOp.groovy
@@ -17,16 +17,11 @@ package org.ajoberstar.grgit.operation
 
 import java.util.concurrent.Callable
 
-import org.ajoberstar.grgit.Commit
-import org.ajoberstar.grgit.Person
 import org.ajoberstar.grgit.Repository
 import org.ajoberstar.grgit.exception.GrgitException
-import org.ajoberstar.grgit.util.JGitUtil
 
 import org.eclipse.jgit.api.CheckoutCommand
 import org.eclipse.jgit.api.errors.GitAPIException
-import org.eclipse.jgit.lib.PersonIdent
-import org.eclipse.jgit.revwalk.RevCommit
 
 class CheckoutOp implements Callable<Void> {
 	private final Repository repo

diff --git a/src/main/groovy/org/ajoberstar/grgit/operation/CloneOp.groovy b/src/main/groovy/org/ajoberstar/grgit/operation/CloneOp.groovy
@@ -23,8 +23,8 @@ import org.ajoberstar.grgit.auth.TransportOpUtil
 import org.ajoberstar.grgit.exception.GrgitException
 import org.ajoberstar.grgit.service.RepositoryService
 
-import org.eclipse.jgit.api.Git
 import org.eclipse.jgit.api.CloneCommand
+import org.eclipse.jgit.api.Git
 import org.eclipse.jgit.api.errors.GitAPIException
 
 class CloneOp implements Callable<RepositoryService> {

diff --git a/src/main/groovy/org/ajoberstar/grgit/operation/LogOp.groovy b/src/main/groovy/org/ajoberstar/grgit/operation/LogOp.groovy
@@ -21,6 +21,7 @@ import org.ajoberstar.grgit.Commit
 import org.ajoberstar.grgit.Repository
 import org.ajoberstar.grgit.exception.GrgitException
 import org.ajoberstar.grgit.util.JGitUtil
+
 import org.eclipse.jgit.api.LogCommand
 import org.eclipse.jgit.api.errors.GitAPIException
 import org.eclipse.jgit.lib.ObjectId

diff --git a/src/main/groovy/org/ajoberstar/grgit/operation/PullOp.groovy b/src/main/groovy/org/ajoberstar/grgit/operation/PullOp.groovy
@@ -19,7 +19,6 @@ import java.util.concurrent.Callable
 
 import org.ajoberstar.grgit.Repository
 import org.ajoberstar.grgit.exception.GrgitException
-import org.ajoberstar.grgit.util.JGitUtil
 
 import org.eclipse.jgit.api.PullCommand
 import org.eclipse.jgit.api.PullResult

diff --git a/src/main/groovy/org/ajoberstar/grgit/operation/RevertOp.groovy b/src/main/groovy/org/ajoberstar/grgit/operation/RevertOp.groovy
@@ -18,14 +18,12 @@ package org.ajoberstar.grgit.operation
 import java.util.concurrent.Callable
 
 import org.ajoberstar.grgit.Commit
-import org.ajoberstar.grgit.Person
 import org.ajoberstar.grgit.Repository
 import org.ajoberstar.grgit.exception.GrgitException
 import org.ajoberstar.grgit.util.JGitUtil
 
 import org.eclipse.jgit.api.RevertCommand
 import org.eclipse.jgit.api.errors.GitAPIException
-import org.eclipse.jgit.lib.PersonIdent
 import org.eclipse.jgit.revwalk.RevCommit
 
 class RevertOp implements Callable<Commit> {

diff --git a/src/main/groovy/org/ajoberstar/grgit/operation/TagAddOp.groovy b/src/main/groovy/org/ajoberstar/grgit/operation/TagAddOp.groovy
@@ -17,9 +17,9 @@ package org.ajoberstar.grgit.operation
 
 import java.util.concurrent.Callable
 
-import org.ajoberstar.grgit.Tag
 import org.ajoberstar.grgit.Person
 import org.ajoberstar.grgit.Repository
+import org.ajoberstar.grgit.Tag
 import org.ajoberstar.grgit.exception.GrgitException
 import org.ajoberstar.grgit.util.JGitUtil
 

diff --git a/src/main/groovy/org/ajoberstar/grgit/operation/TagListOp.groovy b/src/main/groovy/org/ajoberstar/grgit/operation/TagListOp.groovy
@@ -17,14 +17,13 @@ package org.ajoberstar.grgit.operation
 
 import java.util.concurrent.Callable
 
-import org.ajoberstar.grgit.Tag
 import org.ajoberstar.grgit.Repository
+import org.ajoberstar.grgit.Tag
 import org.ajoberstar.grgit.exception.GrgitException
 import org.ajoberstar.grgit.util.JGitUtil
 
 import org.eclipse.jgit.api.ListTagCommand
 import org.eclipse.jgit.api.errors.GitAPIException
-import org.eclipse.jgit.lib.Ref
 
 class TagListOp implements Callable<List<Tag>> {
 	private final Repository repo

diff --git a/src/main/groovy/org/ajoberstar/grgit/operation/TagRemoveOp.groovy b/src/main/groovy/org/ajoberstar/grgit/operation/TagRemoveOp.groovy
@@ -17,13 +17,11 @@ package org.ajoberstar.grgit.operation
 
 import java.util.concurrent.Callable
 
-import org.ajoberstar.grgit.Tag
 import org.ajoberstar.grgit.Repository
 import org.ajoberstar.grgit.exception.GrgitException
 
 import org.eclipse.jgit.api.DeleteTagCommand
 import org.eclipse.jgit.api.errors.GitAPIException
-import org.eclipse.jgit.lib.Ref
 
 class TagRemoveOp implements Callable<List<String>> {
 	private final Repository repo

diff --git a/src/main/groovy/org/ajoberstar/grgit/service/BranchService.groovy b/src/main/groovy/org/ajoberstar/grgit/service/BranchService.groovy
@@ -20,6 +20,7 @@ import org.ajoberstar.grgit.Repository
 import org.ajoberstar.grgit.operation.*
 import org.ajoberstar.grgit.util.JGitUtil
 import org.ajoberstar.grgit.util.OpSyntaxUtil
+
 import org.eclipse.jgit.lib.Ref
 
 class BranchService {

diff --git a/src/main/groovy/org/ajoberstar/grgit/service/RepositoryService.groovy b/src/main/groovy/org/ajoberstar/grgit/service/RepositoryService.groovy
@@ -17,7 +17,6 @@ package org.ajoberstar.grgit.service
 
 import org.ajoberstar.grgit.Commit
 import org.ajoberstar.grgit.Repository
-import org.ajoberstar.grgit.Status
 import org.ajoberstar.grgit.operation.*
 import org.ajoberstar.grgit.util.JGitUtil
 import org.ajoberstar.grgit.util.OpSyntaxUtil

diff --git a/src/main/groovy/org/ajoberstar/grgit/service/TagService.groovy b/src/main/groovy/org/ajoberstar/grgit/service/TagService.groovy
@@ -15,7 +15,6 @@
  */
 package org.ajoberstar.grgit.service
 
-import org.ajoberstar.grgit.Tag
 import org.ajoberstar.grgit.Repository
 import org.ajoberstar.grgit.operation.TagAddOp
 import org.ajoberstar.grgit.operation.TagListOp

diff --git a/src/main/groovy/org/ajoberstar/grgit/util/JGitUtil.groovy b/src/main/groovy/org/ajoberstar/grgit/util/JGitUtil.groovy
@@ -22,15 +22,15 @@ import org.ajoberstar.grgit.Repository
 import org.ajoberstar.grgit.Status
 import org.ajoberstar.grgit.Tag
 import org.ajoberstar.grgit.exception.GrgitException
-import org.eclipse.jgit.api.errors.GitAPIException
+
 import org.eclipse.jgit.errors.AmbiguousObjectException
 import org.eclipse.jgit.errors.IncorrectObjectTypeException
 import org.eclipse.jgit.errors.MissingObjectException
 import org.eclipse.jgit.errors.RevisionSyntaxException
 import org.eclipse.jgit.lib.BranchConfig
 import org.eclipse.jgit.lib.Config
-import org.eclipse.jgit.lib.PersonIdent
 import org.eclipse.jgit.lib.ObjectId
+import org.eclipse.jgit.lib.PersonIdent
 import org.eclipse.jgit.lib.Ref
 import org.eclipse.jgit.revwalk.RevCommit
 import org.eclipse.jgit.revwalk.RevObject

diff --git a/src/test/groovy/org/ajoberstar/grgit/auth/AuthConfigSpec.groovy b/src/test/groovy/org/ajoberstar/grgit/auth/AuthConfigSpec.groovy
@@ -15,11 +15,11 @@
  */
 package org.ajoberstar.grgit.auth
 
+import static org.ajoberstar.grgit.auth.AuthConfig.Option.*
+
 import spock.lang.Specification
 import spock.lang.Unroll
 
-import static org.ajoberstar.grgit.auth.AuthConfig.Option.*
-
 class AuthConfigSpec extends Specification {
 	@Unroll('with #properties only #allowed are allowed')
 	def 'properties result in correct options allowed'() {

diff --git a/src/test/groovy/org/ajoberstar/grgit/auth/LinuxAuthenticationSpec.groovy b/src/test/groovy/org/ajoberstar/grgit/auth/LinuxAuthenticationSpec.groovy
@@ -15,19 +15,19 @@
  */
 package org.ajoberstar.grgit.auth
 
-import spock.lang.Specification
-import spock.lang.Unroll
-
 import org.ajoberstar.grgit.Grgit
 import org.ajoberstar.grgit.Person
-import org.ajoberstar.grgit.service.RepositoryService
-import org.ajoberstar.grgit.fixtures.LinuxSpecific
 import org.ajoberstar.grgit.fixtures.GitTestUtil
+import org.ajoberstar.grgit.fixtures.LinuxSpecific
+import org.ajoberstar.grgit.service.RepositoryService
 
 import org.junit.Rule
 import org.junit.experimental.categories.Category
 import org.junit.rules.TemporaryFolder
 
+import spock.lang.Specification
+import spock.lang.Unroll
+
 @Category(LinuxSpecific)
 class LinuxAuthenticationSpec extends Specification {
 	private static final String SSH_URI = 'git@github.com:ajoberstar/grgit-test.git'

diff --git a/src/test/groovy/org/ajoberstar/grgit/auth/MacAuthenticationSpec.groovy b/src/test/groovy/org/ajoberstar/grgit/auth/MacAuthenticationSpec.groovy
@@ -15,12 +15,12 @@
  */
 package org.ajoberstar.grgit.auth
 
-import spock.lang.Specification
-
 import org.ajoberstar.grgit.fixtures.MacSpecific
 
 import org.junit.experimental.categories.Category
 
+import spock.lang.Specification
+
 @Category(MacSpecific)
 class MacAuthenticationSpec extends Specification {
 	def 'dummy'() {

diff --git a/src/test/groovy/org/ajoberstar/grgit/auth/WindowsAuthenticationSpec.groovy b/src/test/groovy/org/ajoberstar/grgit/auth/WindowsAuthenticationSpec.groovy
@@ -15,19 +15,19 @@
  */
 package org.ajoberstar.grgit.auth
 
-import spock.lang.Specification
-import spock.lang.Unroll
-
 import org.ajoberstar.grgit.Grgit
 import org.ajoberstar.grgit.Person
-import org.ajoberstar.grgit.service.RepositoryService
-import org.ajoberstar.grgit.fixtures.WindowsSpecific
 import org.ajoberstar.grgit.fixtures.GitTestUtil
+import org.ajoberstar.grgit.fixtures.WindowsSpecific
+import org.ajoberstar.grgit.service.RepositoryService
 
 import org.junit.Rule
 import org.junit.experimental.categories.Category
 import org.junit.rules.TemporaryFolder
 
+import spock.lang.Specification
+import spock.lang.Unroll
+
 @Category(WindowsSpecific)
 class WindowsAuthenticationSpec extends Specification {
 	private static final String SSH_URI = 'git@github.com:ajoberstar/grgit-test.git'

diff --git a/src/test/groovy/org/ajoberstar/grgit/fixtures/GitTestUtil.groovy b/src/test/groovy/org/ajoberstar/grgit/fixtures/GitTestUtil.groovy
@@ -19,6 +19,7 @@ import org.ajoberstar.grgit.Branch
 import org.ajoberstar.grgit.Commit
 import org.ajoberstar.grgit.service.RepositoryService
 import org.ajoberstar.grgit.util.JGitUtil
+
 import org.eclipse.jgit.api.ListBranchCommand.ListMode
 import org.eclipse.jgit.transport.RemoteConfig
 

diff --git a/src/test/groovy/org/ajoberstar/grgit/fixtures/MultiGitOpSpec.groovy b/src/test/groovy/org/ajoberstar/grgit/fixtures/MultiGitOpSpec.groovy
@@ -15,17 +15,17 @@
  */
 package org.ajoberstar.grgit.fixtures
 
-import spock.lang.Specification
-
-import org.ajoberstar.grgit.service.RepositoryService
 import org.ajoberstar.grgit.Grgit
 import org.ajoberstar.grgit.Person
+import org.ajoberstar.grgit.service.RepositoryService
 
 import org.eclipse.jgit.api.Git
 
 import org.junit.Rule
 import org.junit.rules.TemporaryFolder
 
+import spock.lang.Specification
+
 class MultiGitOpSpec extends Specification {
 	@Rule TemporaryFolder tempDir = new TemporaryFolder()
 

diff --git a/src/test/groovy/org/ajoberstar/grgit/fixtures/SimpleGitOpSpec.groovy b/src/test/groovy/org/ajoberstar/grgit/fixtures/SimpleGitOpSpec.groovy
@@ -15,17 +15,17 @@
  */
 package org.ajoberstar.grgit.fixtures
 
-import spock.lang.Specification
-
-import org.ajoberstar.grgit.service.RepositoryService
 import org.ajoberstar.grgit.Grgit
 import org.ajoberstar.grgit.Person
+import org.ajoberstar.grgit.service.RepositoryService
 
 import org.eclipse.jgit.api.Git
 
 import org.junit.Rule
 import org.junit.rules.TemporaryFolder
 
+import spock.lang.Specification
+
 class SimpleGitOpSpec extends Specification {
 	@Rule TemporaryFolder tempDir = new TemporaryFolder()
 

diff --git a/src/test/groovy/org/ajoberstar/grgit/operation/AddOpSpec.groovy b/src/test/groovy/org/ajoberstar/grgit/operation/AddOpSpec.groovy
@@ -15,15 +15,7 @@
  */
 package org.ajoberstar.grgit.operation
 
-import org.ajoberstar.grgit.Grgit
-import org.ajoberstar.grgit.Repository
 import org.ajoberstar.grgit.fixtures.SimpleGitOpSpec
-import org.ajoberstar.grgit.service.RepositoryService
-
-import org.eclipse.jgit.api.Git
-
-import org.junit.Rule
-import org.junit.rules.TemporaryFolder
 
 class AddOpSpec extends SimpleGitOpSpec {
 	def 'adding specific file only adds that file'() {

diff --git a/src/test/groovy/org/ajoberstar/grgit/operation/ApplyOpSpec.groovy b/src/test/groovy/org/ajoberstar/grgit/operation/ApplyOpSpec.groovy
@@ -15,15 +15,7 @@
  */
 package org.ajoberstar.grgit.operation
 
-import org.ajoberstar.grgit.Grgit
-import org.ajoberstar.grgit.Repository
 import org.ajoberstar.grgit.fixtures.SimpleGitOpSpec
-import org.ajoberstar.grgit.service.RepositoryService
-
-import org.eclipse.jgit.api.Git
-
-import org.junit.Rule
-import org.junit.rules.TemporaryFolder
 
 class ApplyOpSpec extends SimpleGitOpSpec {
 	def 'apply with no patch fails'() {

diff --git a/src/test/groovy/org/ajoberstar/grgit/operation/BranchAddOpSpec.groovy b/src/test/groovy/org/ajoberstar/grgit/operation/BranchAddOpSpec.groovy
@@ -15,24 +15,12 @@
  */
 package org.ajoberstar.grgit.operation
 
-import spock.lang.Unroll
-
-import org.ajoberstar.grgit.Branch
-import org.ajoberstar.grgit.Grgit
-import org.ajoberstar.grgit.Person
-import org.ajoberstar.grgit.Repository
-import org.ajoberstar.grgit.Status
 import org.ajoberstar.grgit.exception.GrgitException
 import org.ajoberstar.grgit.fixtures.GitTestUtil
 import org.ajoberstar.grgit.fixtures.MultiGitOpSpec
 import org.ajoberstar.grgit.service.RepositoryService
-import org.ajoberstar.grgit.util.JGitUtil
 
-import org.eclipse.jgit.api.Git
-import org.eclipse.jgit.api.ListBranchCommand.ListMode
-
-import org.junit.Rule
-import org.junit.rules.TemporaryFolder
+import spock.lang.Unroll
 
 class BranchAddOpSpec extends MultiGitOpSpec {
 	RepositoryService localGrgit