Remove unnecessary interfaces

This commit is contained in:
René Pfeuffer
2020-05-14 23:30:26 +02:00
parent 7e945afc43
commit 77d6784386
10 changed files with 62 additions and 89 deletions

View File

@@ -32,7 +32,6 @@ import org.eclipse.jgit.lib.Repository;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import sonia.scm.repository.InternalRepositoryException;
import sonia.scm.repository.work.SimpleWorkingCopyFactory;
import sonia.scm.repository.work.SimpleWorkingCopyFactory.ParentAndClone;
import java.io.File;
@@ -41,7 +40,7 @@ import java.io.IOException;
import static sonia.scm.ContextEntry.ContextBuilder.entity;
import static sonia.scm.NotFoundException.notFound;
class GitWorkingCopyInitializer implements SimpleWorkingCopyFactory.WorkingCopyInitializer<Repository, Repository> {
class GitWorkingCopyInitializer {
private static final Logger LOG = LoggerFactory.getLogger(GitWorkingCopyInitializer.class);
@@ -53,7 +52,6 @@ class GitWorkingCopyInitializer implements SimpleWorkingCopyFactory.WorkingCopyI
this.context = context;
}
@Override
public ParentAndClone<Repository, Repository> initialize(File target, String initialBranch) {
LOG.trace("clone repository {}", context.getRepository().getId());
long start = System.nanoTime();

View File

@@ -37,7 +37,7 @@ import sonia.scm.repository.work.SimpleWorkingCopyFactory.ParentAndClone;
import java.io.File;
import java.io.IOException;
class GitWorkingCopyReclaimer implements SimpleWorkingCopyFactory.WorkingCopyReclaimer<Repository, Repository> {
class GitWorkingCopyReclaimer {
private static final Logger LOG = LoggerFactory.getLogger(GitWorkingCopyReclaimer.class);
@@ -47,7 +47,6 @@ class GitWorkingCopyReclaimer implements SimpleWorkingCopyFactory.WorkingCopyRec
this.context = context;
}
@Override
public ParentAndClone<Repository, Repository> reclaim(File target, String initialBranch) throws SimpleWorkingCopyFactory.ReclaimFailedException {
LOG.trace("reclaim repository {}", context.getRepository().getId());
long start = System.nanoTime();

View File

@@ -26,18 +26,14 @@ package sonia.scm.repository.spi;
import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.transport.ScmTransportProtocol;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import sonia.scm.repository.GitWorkingCopyFactory;
import sonia.scm.repository.work.WorkingCopyPool;
import sonia.scm.repository.work.SimpleWorkingCopyFactory;
import sonia.scm.repository.work.WorkingCopyPool;
import sonia.scm.util.SystemUtil;
import javax.inject.Inject;
import java.io.File;
import static sonia.scm.ContextEntry.ContextBuilder.entity;
public class SimpleGitWorkingCopyFactory extends SimpleWorkingCopyFactory<Repository, Repository, GitContext> implements GitWorkingCopyFactory {
@Inject
@@ -46,13 +42,13 @@ public class SimpleGitWorkingCopyFactory extends SimpleWorkingCopyFactory<Reposi
}
@Override
public WorkingCopyInitializer<Repository, Repository> getInitializer(GitContext context) {
return new GitWorkingCopyInitializer(this, context);
public ParentAndClone<Repository, Repository> initialize(GitContext context, File target, String initialBranch) {
return new GitWorkingCopyInitializer(this, context).initialize(target, initialBranch);
}
@Override
protected WorkingCopyReclaimer<Repository, Repository> getReclaimer(GitContext context) {
return new GitWorkingCopyReclaimer(context);
public ParentAndClone<Repository, Repository> reclaim(GitContext context, File target, String initialBranch) throws SimpleWorkingCopyFactory.ReclaimFailedException {
return new GitWorkingCopyReclaimer(context).reclaim(target, initialBranch);
}
String createScmTransportProtocolUri(File bareRepository) {