Clean up imports Change-Id: I1a69586145120cf8a27e369205bc88363a6e8e43
diff --git a/src/main/java/com/amd/gerrit/plugins/manifestsubscription/BranchManifestCommand.java b/src/main/java/com/amd/gerrit/plugins/manifestsubscription/BranchManifestCommand.java index f8517d6..f2142e4 100644 --- a/src/main/java/com/amd/gerrit/plugins/manifestsubscription/BranchManifestCommand.java +++ b/src/main/java/com/amd/gerrit/plugins/manifestsubscription/BranchManifestCommand.java
@@ -22,7 +22,6 @@ import com.google.gerrit.sshd.CommandMetaData; import com.google.gerrit.sshd.SshCommand; import com.google.inject.Inject; - import org.kohsuke.args4j.Option; @RequiresCapability(GlobalCapability.ADMINISTRATE_SERVER)
diff --git a/src/main/java/com/amd/gerrit/plugins/manifestsubscription/BranchManifestServlet.java b/src/main/java/com/amd/gerrit/plugins/manifestsubscription/BranchManifestServlet.java index c03106b..770dba2 100644 --- a/src/main/java/com/amd/gerrit/plugins/manifestsubscription/BranchManifestServlet.java +++ b/src/main/java/com/amd/gerrit/plugins/manifestsubscription/BranchManifestServlet.java
@@ -21,12 +21,11 @@ import com.google.inject.Inject; import com.google.inject.Singleton; -import java.io.IOException; -import java.util.Map; - import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.Map; @Export("/branch") @Singleton
diff --git a/src/main/java/com/amd/gerrit/plugins/manifestsubscription/ManifestSubscription.java b/src/main/java/com/amd/gerrit/plugins/manifestsubscription/ManifestSubscription.java index 7e82ff2..007eee6 100644 --- a/src/main/java/com/amd/gerrit/plugins/manifestsubscription/ManifestSubscription.java +++ b/src/main/java/com/amd/gerrit/plugins/manifestsubscription/ManifestSubscription.java
@@ -14,8 +14,6 @@ package com.amd.gerrit.plugins.manifestsubscription; -import static com.google.gerrit.reviewdb.client.RefNames.REFS_CONFIG; - import com.amd.gerrit.plugins.manifestsubscription.manifest.Manifest; import com.google.common.collect.*; import com.google.gerrit.extensions.annotations.PluginName; @@ -41,6 +39,8 @@ import java.io.IOException; import java.util.*; +import static com.google.gerrit.reviewdb.client.RefNames.REFS_CONFIG; + public class ManifestSubscription implements GitReferenceUpdatedListener, LifecycleListener { private static final Logger log =
diff --git a/src/main/java/com/amd/gerrit/plugins/manifestsubscription/ShowSubscriptionCommand.java b/src/main/java/com/amd/gerrit/plugins/manifestsubscription/ShowSubscriptionCommand.java index 786bb56..a4b2763 100644 --- a/src/main/java/com/amd/gerrit/plugins/manifestsubscription/ShowSubscriptionCommand.java +++ b/src/main/java/com/amd/gerrit/plugins/manifestsubscription/ShowSubscriptionCommand.java
@@ -19,11 +19,8 @@ import com.google.gerrit.sshd.CommandMetaData; import com.google.gerrit.sshd.SshCommand; import com.google.inject.Inject; - import org.kohsuke.args4j.Option; -import java.util.Set; - @RequiresCapability(GlobalCapability.ADMINISTRATE_SERVER) @CommandMetaData(name = "show", description = "Show states of manifest-subscription") public class ShowSubscriptionCommand extends SshCommand {
diff --git a/src/main/java/com/amd/gerrit/plugins/manifestsubscription/ShowSubscriptionServlet.java b/src/main/java/com/amd/gerrit/plugins/manifestsubscription/ShowSubscriptionServlet.java index bd0bd32..eb6fbf8 100644 --- a/src/main/java/com/amd/gerrit/plugins/manifestsubscription/ShowSubscriptionServlet.java +++ b/src/main/java/com/amd/gerrit/plugins/manifestsubscription/ShowSubscriptionServlet.java
@@ -18,11 +18,10 @@ import com.google.inject.Inject; import com.google.inject.Singleton; -import java.io.IOException; - import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import java.io.IOException; @Export("/show") @Singleton
diff --git a/src/main/java/com/amd/gerrit/plugins/manifestsubscription/TagManifestCommand.java b/src/main/java/com/amd/gerrit/plugins/manifestsubscription/TagManifestCommand.java index b6e91b9..a2624a0 100644 --- a/src/main/java/com/amd/gerrit/plugins/manifestsubscription/TagManifestCommand.java +++ b/src/main/java/com/amd/gerrit/plugins/manifestsubscription/TagManifestCommand.java
@@ -14,23 +14,14 @@ package com.amd.gerrit.plugins.manifestsubscription; -import com.amd.gerrit.plugins.manifestsubscription.manifest.Manifest; import com.google.gerrit.common.data.GlobalCapability; import com.google.gerrit.extensions.annotations.RequiresCapability; -import com.google.gerrit.reviewdb.client.Project; import com.google.gerrit.server.git.GitRepositoryManager; import com.google.gerrit.sshd.CommandMetaData; import com.google.gerrit.sshd.SshCommand; import com.google.inject.Inject; -import org.eclipse.jgit.api.errors.GitAPIException; -import org.eclipse.jgit.errors.ConfigInvalidException; -import org.eclipse.jgit.lib.ObjectId; -import org.eclipse.jgit.lib.Repository; import org.kohsuke.args4j.Option; -import javax.xml.bind.JAXBException; -import java.io.IOException; - @RequiresCapability(GlobalCapability.ADMINISTRATE_SERVER) @CommandMetaData(name = "tag", description = "tag all projects described in a manifest on the server") public class TagManifestCommand extends SshCommand {
diff --git a/src/main/java/com/amd/gerrit/plugins/manifestsubscription/Utilities.java b/src/main/java/com/amd/gerrit/plugins/manifestsubscription/Utilities.java index 2a85b37..0ba152e 100644 --- a/src/main/java/com/amd/gerrit/plugins/manifestsubscription/Utilities.java +++ b/src/main/java/com/amd/gerrit/plugins/manifestsubscription/Utilities.java
@@ -33,7 +33,6 @@ import org.eclipse.jgit.lib.RefUpdate; import org.eclipse.jgit.lib.Repository; import org.eclipse.jgit.revwalk.RevCommit; -import org.eclipse.jgit.transport.ReceiveCommand; import org.slf4j.Logger; import org.slf4j.LoggerFactory;
diff --git a/src/main/java/com/amd/gerrit/plugins/manifestsubscription/VersionedManifests.java b/src/main/java/com/amd/gerrit/plugins/manifestsubscription/VersionedManifests.java index d8787b5..cacca5e 100644 --- a/src/main/java/com/amd/gerrit/plugins/manifestsubscription/VersionedManifests.java +++ b/src/main/java/com/amd/gerrit/plugins/manifestsubscription/VersionedManifests.java
@@ -14,17 +14,14 @@ package com.amd.gerrit.plugins.manifestsubscription; +import com.amd.gerrit.plugins.manifestsubscription.manifest.Manifest; import com.google.common.collect.HashBasedTable; import com.google.common.collect.Maps; import com.google.common.collect.Table; -import com.google.gerrit.reviewdb.client.Branch; import com.google.gerrit.reviewdb.client.Project; import com.google.gerrit.server.extensions.events.GitReferenceUpdated; import com.google.gerrit.server.git.GitRepositoryManager; import com.google.gerrit.server.git.VersionedMetaData; - -import com.amd.gerrit.plugins.manifestsubscription.manifest.Manifest; - import org.eclipse.jgit.api.Git; import org.eclipse.jgit.api.errors.GitAPIException; import org.eclipse.jgit.errors.ConfigInvalidException; @@ -36,20 +33,14 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.util.Arrays; -import java.util.Collections; -import java.util.Date; -import java.util.List; -import java.util.Map; -import java.util.Set; - import javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBException; import javax.xml.bind.Marshaller; import javax.xml.bind.Unmarshaller; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.util.*; public class VersionedManifests extends VersionedMetaData implements ManifestProvider { private static final Logger log =