opendev/gerrit
Code Issues Proposed changes

Merge "Consistently use com.google.inject.Inject instead of javax.inject.Inject"

Browse Source
This commit is contained in:
Dave Borowitz
2014-10-07 15:40:25 +00:00
committed by Gerrit Code Review
parent 839650ed0b 4c02f6b049
commit dd5ddc22a9
9 changed files with 10 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
gerrit-sshd/src/main/java/com/google/gerrit/sshd/PluginCommandModule.java
View File

@@ -16,12 +16,11 @@ package com.google.gerrit.sshd;
import com.google.common.base.Preconditions;
import com.google.gerrit.extensions.annotations.PluginName;
import com.google.inject.Inject;
import com.google.inject.binder.LinkedBindingBuilder;
import org.apache.sshd.server.Command;
import javax.inject.Inject;
public abstract class PluginCommandModule extends CommandModule {
private CommandName command;

3
gerrit-sshd/src/main/java/com/google/gerrit/sshd/SingleCommandPluginModule.java
View File

@@ -16,12 +16,11 @@ package com.google.gerrit.sshd;
import com.google.common.base.Preconditions;
import com.google.gerrit.extensions.annotations.PluginName;
import com.google.inject.Inject;
import com.google.inject.binder.LinkedBindingBuilder;
import org.apache.sshd.server.Command;
import javax.inject.Inject;
/**
* Binds one SSH command to the plugin name itself.
* <p>

3
gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshPluginStarterCallback.java
View File

@@ -17,6 +17,7 @@ package com.google.gerrit.sshd;
import com.google.gerrit.server.plugins.Plugin;
import com.google.gerrit.server.plugins.ReloadPluginListener;
import com.google.gerrit.server.plugins.StartPluginListener;
import com.google.inject.Inject;
import com.google.inject.Key;
import com.google.inject.Provider;
import com.google.inject.Singleton;
@@ -25,8 +26,6 @@ import org.apache.sshd.server.Command;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import javax.inject.Inject;
@Singleton
class SshPluginStarterCallback
implements StartPluginListener, ReloadPluginListener {

3
gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ListMembersCommand.java
View File

@@ -29,14 +29,13 @@ import com.google.gerrit.server.ioutil.ColumnFormatter;
import com.google.gerrit.sshd.CommandMetaData;
import com.google.gerrit.sshd.SshCommand;
import com.google.gwtorm.server.OrmException;
import com.google.inject.Inject;
import org.kohsuke.args4j.Argument;
import java.io.PrintWriter;
import java.util.List;
import javax.inject.Inject;
/**
* Implements a command that allows the user to see the members of a group.
*/