The Unified and Autonomous Development Platform
Refactoring for git command class
Andrea Del Bene4a951936abd9
diff --git a/server-core/src/main/java/io/onedev/server/git/ssh/AbstractProjectAwareGitCommand.java b/server-core/src/main/java/io/onedev/server/git/ssh/AbstractProjectAwareGitCommand.javanew file mode 100644index 0000000000..613d05c506--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/git/ssh/AbstractProjectAwareGitCommand.java@@ -0,0 +1,21 @@+package io.onedev.server.git.ssh;++import java.util.concurrent.ExecutorService;++import org.apache.sshd.server.command.AbstractCommandSupport;++public abstract class AbstractProjectAwareGitCommand extends AbstractCommandSupport {++ protected AbstractProjectAwareGitCommand(String command, ExecutorService executorService, boolean shutdownOnExit) {+ super(command, executorService, shutdownOnExit);+ }++ protected String getGitProjectName() {+ String gitCommand = getCommand();+ int lastSegment = gitCommand.lastIndexOf('/');+ int postifPos = gitCommand.lastIndexOf(".git");++ return gitCommand.substring(lastSegment +1, postifPos);+ }++}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/git/ssh/SimpleGitSshServer.java b/server-core/src/main/java/io/onedev/server/git/ssh/SimpleGitSshServer.javaindex 590eadc810..e4a98ccb29 100644--- a/server-core/src/main/java/io/onedev/server/git/ssh/SimpleGitSshServer.java+++ b/server-core/src/main/java/io/onedev/server/git/ssh/SimpleGitSshServer.java@@ -6,17 +6,19 @@ import java.text.MessageFormat;import java.util.Collections;import java.util.List;import java.util.concurrent.ExecutorService;+import javax.inject.Inject;import javax.inject.Singleton;+import org.apache.sshd.common.config.keys.KeyUtils;import org.apache.sshd.common.keyprovider.KeyPairProvider;import org.apache.sshd.common.util.threads.ThreadUtils;import org.apache.sshd.server.SshServer;-import org.apache.sshd.server.command.AbstractCommandSupport;import org.apache.sshd.server.shell.UnknownCommand;import org.eclipse.jgit.transport.ReceivePack;import org.eclipse.jgit.transport.RemoteConfig;import org.eclipse.jgit.transport.UploadPack;+import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.entitymanager.impl.DefaultUserManager;import io.onedev.server.model.Project;@@ -95,7 +97,7 @@ public class SimpleGitSshServer {server.stop(true);}- private class GitUploadPackCommand extends AbstractCommandSupport {+ private class GitUploadPackCommand extends AbstractProjectAwareGitCommand {protected GitUploadPackCommand(String command,ExecutorService executorService) {@@ -104,11 +106,7 @@ public class SimpleGitSshServer {@Overridepublic void run() {- String gitCommand = getCommand();- int lastSegment = gitCommand.lastIndexOf('/');- int postifPos = gitCommand.lastIndexOf(".git");-- String projectName = gitCommand.substring(lastSegment +1, postifPos);+ String projectName = getGitProjectName();Project project = projectManager.find(projectName);UploadPack uploadPack = new UploadPack(project.getRepository());@@ -131,7 +129,7 @@ public class SimpleGitSshServer {}- private class GitReceivePackCommand extends AbstractCommandSupport {+ private class GitReceivePackCommand extends AbstractProjectAwareGitCommand {protected GitReceivePackCommand(String command,ExecutorService executorService) {@@ -140,11 +138,7 @@ public class SimpleGitSshServer {@Overridepublic void run() {- String gitCommand = getCommand();- int lastSegment = gitCommand.lastIndexOf('/');- int postifPos = gitCommand.lastIndexOf(".git");-- String projectName = gitCommand.substring(lastSegment +1, postifPos);+ String projectName = getGitProjectName();Project project = projectManager.find(projectName);try {