From fcdd2243c323cc18fda149b5aa3bf32734228dad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Tue, 5 May 2020 21:34:44 +0200
Subject: [PATCH] Cleanup

---
 .../util/SimpleWorkingCopyFactory.java        | 19 +------------------
 .../repository/util/WorkingCopyFactory.java   |  2 ++
 .../spi/SimpleSvnWorkingCopyFactoryTest.java  |  2 +-
 3 files changed, 4 insertions(+), 19 deletions(-)

diff --git a/scm-core/src/main/java/sonia/scm/repository/util/SimpleWorkingCopyFactory.java b/scm-core/src/main/java/sonia/scm/repository/util/SimpleWorkingCopyFactory.java
index 963300d84a..4a1c69a8bb 100644
--- a/scm-core/src/main/java/sonia/scm/repository/util/SimpleWorkingCopyFactory.java
+++ b/scm-core/src/main/java/sonia/scm/repository/util/SimpleWorkingCopyFactory.java
@@ -35,7 +35,6 @@ import javax.servlet.ServletContextListener;
 import java.io.File;
 import java.io.IOException;
 
-@Extension
 public abstract class SimpleWorkingCopyFactory<R, W, C> implements WorkingCopyFactory<R, W, C>, ServletContextListener {
 
   private static final Logger LOG = LoggerFactory.getLogger(SimpleWorkingCopyFactory.class);
@@ -76,7 +75,7 @@ public abstract class SimpleWorkingCopyFactory<R, W, C> implements WorkingCopyFa
       LOG.warn("could not close central repository for {}", workingCopyContext.getScmRepository(), e);
     }
     try {
-      closeWorkingCopy(parentAndClone.getClone());
+      closeWorkingCopyInternal(parentAndClone.getClone());
     } catch (Exception e) {
       LOG.warn("could not close clone for {} in directory {}", workingCopyContext.getScmRepository(), parentAndClone.getDirectory(), e);
     }
@@ -120,22 +119,6 @@ public abstract class SimpleWorkingCopyFactory<R, W, C> implements WorkingCopyFa
 
   protected abstract ParentAndClone<R, W> reclaimRepository(C context, File target, String initialBranch) throws IOException, ReclaimFailedException;
 
-  private void closeCentral(R repository) {
-    try {
-      closeRepository(repository);
-    } catch (Exception e) {
-      LOG.warn("could not close temporary repository clone", e);
-    }
-  }
-
-  private void closeWorkingCopy(W repository) {
-    try {
-      closeWorkingCopyInternal(repository);
-    } catch (Exception e) {
-      LOG.warn("could not close temporary repository clone", e);
-    }
-  }
-
   protected static class ParentAndClone<R, W> {
     private final R parent;
     private final W clone;
diff --git a/scm-core/src/main/java/sonia/scm/repository/util/WorkingCopyFactory.java b/scm-core/src/main/java/sonia/scm/repository/util/WorkingCopyFactory.java
index bc48edfceb..ac0bd5fa89 100644
--- a/scm-core/src/main/java/sonia/scm/repository/util/WorkingCopyFactory.java
+++ b/scm-core/src/main/java/sonia/scm/repository/util/WorkingCopyFactory.java
@@ -24,6 +24,8 @@
 
 package sonia.scm.repository.util;
 
+import sonia.scm.plugin.ExtensionPoint;
+
 public interface WorkingCopyFactory<R, W, C> {
   WorkingCopy<R, W> createWorkingCopy(C repositoryContext, String initialBranch);
 }
diff --git a/scm-plugins/scm-svn-plugin/src/test/java/sonia/scm/repository/spi/SimpleSvnWorkingCopyFactoryTest.java b/scm-plugins/scm-svn-plugin/src/test/java/sonia/scm/repository/spi/SimpleSvnWorkingCopyFactoryTest.java
index 5be444aed0..120f7cc20b 100644
--- a/scm-plugins/scm-svn-plugin/src/test/java/sonia/scm/repository/spi/SimpleSvnWorkingCopyFactoryTest.java
+++ b/scm-plugins/scm-svn-plugin/src/test/java/sonia/scm/repository/spi/SimpleSvnWorkingCopyFactoryTest.java
@@ -65,7 +65,7 @@ public class SimpleSvnWorkingCopyFactoryTest extends AbstractSvnCommandTestBase
   }
 
   @Test
-  public void cloneFromPoolshouldNotBeReused() {
+  public void cloneFromPoolShouldNotBeReused() {
     SimpleSvnWorkingCopyFactory factory = new SimpleSvnWorkingCopyFactory(new NoneCachingWorkingCopyPool(workdirProvider));
 
     File firstDirectory;