diff --git a/scm-core/src/main/java/sonia/scm/repository/api/ModifyCommandBuilder.java b/scm-core/src/main/java/sonia/scm/repository/api/ModifyCommandBuilder.java index 57f70dcdc3..1035ccf009 100644 --- a/scm-core/src/main/java/sonia/scm/repository/api/ModifyCommandBuilder.java +++ b/scm-core/src/main/java/sonia/scm/repository/api/ModifyCommandBuilder.java @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - + package sonia.scm.repository.api; import com.google.common.base.Preconditions; @@ -34,7 +34,7 @@ import sonia.scm.repository.Person; import sonia.scm.repository.spi.ModifyCommand; import sonia.scm.repository.spi.ModifyCommandRequest; import sonia.scm.repository.util.AuthorUtil; -import sonia.scm.repository.util.WorkdirProvider; +import sonia.scm.repository.work.WorkdirProvider; import sonia.scm.util.IOUtil; import java.io.File; diff --git a/scm-core/src/main/java/sonia/scm/repository/api/RepositoryService.java b/scm-core/src/main/java/sonia/scm/repository/api/RepositoryService.java index a1978df90d..43f443b4bb 100644 --- a/scm-core/src/main/java/sonia/scm/repository/api/RepositoryService.java +++ b/scm-core/src/main/java/sonia/scm/repository/api/RepositoryService.java @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - + package sonia.scm.repository.api; import org.slf4j.Logger; @@ -33,7 +33,7 @@ import sonia.scm.repository.PreProcessorUtil; import sonia.scm.repository.Repository; import sonia.scm.repository.RepositoryPermissions; import sonia.scm.repository.spi.RepositoryServiceProvider; -import sonia.scm.repository.util.WorkdirProvider; +import sonia.scm.repository.work.WorkdirProvider; import java.io.Closeable; import java.io.IOException; diff --git a/scm-core/src/main/java/sonia/scm/repository/api/RepositoryServiceFactory.java b/scm-core/src/main/java/sonia/scm/repository/api/RepositoryServiceFactory.java index 15bc338ff0..60b11162d1 100644 --- a/scm-core/src/main/java/sonia/scm/repository/api/RepositoryServiceFactory.java +++ b/scm-core/src/main/java/sonia/scm/repository/api/RepositoryServiceFactory.java @@ -53,7 +53,7 @@ import sonia.scm.repository.RepositoryManager; import sonia.scm.repository.RepositoryPermissions; import sonia.scm.repository.spi.RepositoryServiceProvider; import sonia.scm.repository.spi.RepositoryServiceResolver; -import sonia.scm.repository.util.WorkdirProvider; +import sonia.scm.repository.work.WorkdirProvider; import sonia.scm.security.ScmSecurityException; import java.util.Set; diff --git a/scm-core/src/main/java/sonia/scm/repository/util/CloseableWrapper.java b/scm-core/src/main/java/sonia/scm/repository/util/CloseableWrapper.java deleted file mode 100644 index 3015387c6a..0000000000 --- a/scm-core/src/main/java/sonia/scm/repository/util/CloseableWrapper.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * MIT License - * - * Copyright (c) 2020-present Cloudogu GmbH and Contributors - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package sonia.scm.repository.util; - -import java.util.function.Consumer; - -public class CloseableWrapper implements AutoCloseable { - - private final T wrapped; - private final Consumer cleanup; - - public CloseableWrapper(T wrapped, Consumer cleanup) { - this.wrapped = wrapped; - this.cleanup = cleanup; - } - - public T get() { return wrapped; } - - @Override - public void close() { - cleanup.accept(wrapped); - } -} diff --git a/scm-core/src/main/java/sonia/scm/repository/util/CachingAllWorkingCopyPool.java b/scm-core/src/main/java/sonia/scm/repository/work/CachingAllWorkingCopyPool.java similarity index 99% rename from scm-core/src/main/java/sonia/scm/repository/util/CachingAllWorkingCopyPool.java rename to scm-core/src/main/java/sonia/scm/repository/work/CachingAllWorkingCopyPool.java index 612701bdc5..f93a374c00 100644 --- a/scm-core/src/main/java/sonia/scm/repository/util/CachingAllWorkingCopyPool.java +++ b/scm-core/src/main/java/sonia/scm/repository/work/CachingAllWorkingCopyPool.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package sonia.scm.repository.util; +package sonia.scm.repository.work; import com.google.common.base.Stopwatch; import org.slf4j.Logger; diff --git a/scm-core/src/main/java/sonia/scm/repository/util/NoneCachingWorkingCopyPool.java b/scm-core/src/main/java/sonia/scm/repository/work/NoneCachingWorkingCopyPool.java similarity index 98% rename from scm-core/src/main/java/sonia/scm/repository/util/NoneCachingWorkingCopyPool.java rename to scm-core/src/main/java/sonia/scm/repository/work/NoneCachingWorkingCopyPool.java index 5a5d40bf44..c5aef18b0e 100644 --- a/scm-core/src/main/java/sonia/scm/repository/util/NoneCachingWorkingCopyPool.java +++ b/scm-core/src/main/java/sonia/scm/repository/work/NoneCachingWorkingCopyPool.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package sonia.scm.repository.util; +package sonia.scm.repository.work; import sonia.scm.util.IOUtil; diff --git a/scm-core/src/main/java/sonia/scm/repository/util/SimpleWorkingCopyFactory.java b/scm-core/src/main/java/sonia/scm/repository/work/SimpleWorkingCopyFactory.java similarity index 99% rename from scm-core/src/main/java/sonia/scm/repository/util/SimpleWorkingCopyFactory.java rename to scm-core/src/main/java/sonia/scm/repository/work/SimpleWorkingCopyFactory.java index 7bcf7514b0..76bb0a7b5e 100644 --- a/scm-core/src/main/java/sonia/scm/repository/util/SimpleWorkingCopyFactory.java +++ b/scm-core/src/main/java/sonia/scm/repository/work/SimpleWorkingCopyFactory.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package sonia.scm.repository.util; +package sonia.scm.repository.work; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/scm-core/src/main/java/sonia/scm/repository/util/WorkdirProvider.java b/scm-core/src/main/java/sonia/scm/repository/work/WorkdirProvider.java similarity index 98% rename from scm-core/src/main/java/sonia/scm/repository/util/WorkdirProvider.java rename to scm-core/src/main/java/sonia/scm/repository/work/WorkdirProvider.java index a6acd537cc..7f511b8d74 100644 --- a/scm-core/src/main/java/sonia/scm/repository/util/WorkdirProvider.java +++ b/scm-core/src/main/java/sonia/scm/repository/work/WorkdirProvider.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package sonia.scm.repository.util; +package sonia.scm.repository.work; import java.io.File; import java.io.IOException; diff --git a/scm-core/src/main/java/sonia/scm/repository/util/WorkingCopy.java b/scm-core/src/main/java/sonia/scm/repository/work/WorkingCopy.java similarity index 98% rename from scm-core/src/main/java/sonia/scm/repository/util/WorkingCopy.java rename to scm-core/src/main/java/sonia/scm/repository/work/WorkingCopy.java index 8eb0cf9911..009fc4f109 100644 --- a/scm-core/src/main/java/sonia/scm/repository/util/WorkingCopy.java +++ b/scm-core/src/main/java/sonia/scm/repository/work/WorkingCopy.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package sonia.scm.repository.util; +package sonia.scm.repository.work; import sonia.scm.util.IOUtil; diff --git a/scm-core/src/main/java/sonia/scm/repository/util/WorkingCopyContext.java b/scm-core/src/main/java/sonia/scm/repository/work/WorkingCopyContext.java similarity index 98% rename from scm-core/src/main/java/sonia/scm/repository/util/WorkingCopyContext.java rename to scm-core/src/main/java/sonia/scm/repository/work/WorkingCopyContext.java index 684ee6ce21..9033a1b461 100644 --- a/scm-core/src/main/java/sonia/scm/repository/util/WorkingCopyContext.java +++ b/scm-core/src/main/java/sonia/scm/repository/work/WorkingCopyContext.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package sonia.scm.repository.util; +package sonia.scm.repository.work; import sonia.scm.repository.Repository; diff --git a/scm-core/src/main/java/sonia/scm/repository/util/WorkingCopyFactory.java b/scm-core/src/main/java/sonia/scm/repository/work/WorkingCopyFactory.java similarity index 94% rename from scm-core/src/main/java/sonia/scm/repository/util/WorkingCopyFactory.java rename to scm-core/src/main/java/sonia/scm/repository/work/WorkingCopyFactory.java index ac0bd5fa89..37ea57a11a 100644 --- a/scm-core/src/main/java/sonia/scm/repository/util/WorkingCopyFactory.java +++ b/scm-core/src/main/java/sonia/scm/repository/work/WorkingCopyFactory.java @@ -22,9 +22,7 @@ * SOFTWARE. */ -package sonia.scm.repository.util; - -import sonia.scm.plugin.ExtensionPoint; +package sonia.scm.repository.work; public interface WorkingCopyFactory { WorkingCopy createWorkingCopy(C repositoryContext, String initialBranch); diff --git a/scm-core/src/main/java/sonia/scm/repository/util/WorkingCopyFailedException.java b/scm-core/src/main/java/sonia/scm/repository/work/WorkingCopyFailedException.java similarity index 97% rename from scm-core/src/main/java/sonia/scm/repository/util/WorkingCopyFailedException.java rename to scm-core/src/main/java/sonia/scm/repository/work/WorkingCopyFailedException.java index 943fc4c495..985e348de7 100644 --- a/scm-core/src/main/java/sonia/scm/repository/util/WorkingCopyFailedException.java +++ b/scm-core/src/main/java/sonia/scm/repository/work/WorkingCopyFailedException.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package sonia.scm.repository.util; +package sonia.scm.repository.work; public class WorkingCopyFailedException extends Exception { public WorkingCopyFailedException(String message) { diff --git a/scm-core/src/main/java/sonia/scm/repository/util/WorkingCopyPool.java b/scm-core/src/main/java/sonia/scm/repository/work/WorkingCopyPool.java similarity index 98% rename from scm-core/src/main/java/sonia/scm/repository/util/WorkingCopyPool.java rename to scm-core/src/main/java/sonia/scm/repository/work/WorkingCopyPool.java index e54deb729c..dfbaac91b9 100644 --- a/scm-core/src/main/java/sonia/scm/repository/util/WorkingCopyPool.java +++ b/scm-core/src/main/java/sonia/scm/repository/work/WorkingCopyPool.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package sonia.scm.repository.util; +package sonia.scm.repository.work; import java.io.File; diff --git a/scm-core/src/test/java/sonia/scm/repository/api/ModifyCommandBuilderTest.java b/scm-core/src/test/java/sonia/scm/repository/api/ModifyCommandBuilderTest.java index a374a2272c..5583261e52 100644 --- a/scm-core/src/test/java/sonia/scm/repository/api/ModifyCommandBuilderTest.java +++ b/scm-core/src/test/java/sonia/scm/repository/api/ModifyCommandBuilderTest.java @@ -37,7 +37,7 @@ import org.mockito.stubbing.Answer; import sonia.scm.repository.Person; import sonia.scm.repository.spi.ModifyCommand; import sonia.scm.repository.spi.ModifyCommandRequest; -import sonia.scm.repository.util.WorkdirProvider; +import sonia.scm.repository.work.WorkdirProvider; import java.io.ByteArrayInputStream; import java.io.File; diff --git a/scm-core/src/test/java/sonia/scm/repository/api/RepositoryServiceFactoryTest.java b/scm-core/src/test/java/sonia/scm/repository/api/RepositoryServiceFactoryTest.java index d908321bb6..492d23dec8 100644 --- a/scm-core/src/test/java/sonia/scm/repository/api/RepositoryServiceFactoryTest.java +++ b/scm-core/src/test/java/sonia/scm/repository/api/RepositoryServiceFactoryTest.java @@ -45,11 +45,13 @@ import sonia.scm.repository.Repository; import sonia.scm.repository.RepositoryManager; import sonia.scm.repository.spi.RepositoryServiceProvider; import sonia.scm.repository.spi.RepositoryServiceResolver; -import sonia.scm.repository.util.WorkdirProvider; +import sonia.scm.repository.work.WorkdirProvider; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.mockito.Mockito.*; +import static org.mockito.Mockito.doThrow; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; @ExtendWith(MockitoExtension.class) class RepositoryServiceFactoryTest { diff --git a/scm-core/src/test/java/sonia/scm/repository/util/CachingAllWorkingCopyPoolTest.java b/scm-core/src/test/java/sonia/scm/repository/work/CachingAllWorkingCopyPoolTest.java similarity index 99% rename from scm-core/src/test/java/sonia/scm/repository/util/CachingAllWorkingCopyPoolTest.java rename to scm-core/src/test/java/sonia/scm/repository/work/CachingAllWorkingCopyPoolTest.java index 6982b7c8d2..74ccbe029b 100644 --- a/scm-core/src/test/java/sonia/scm/repository/util/CachingAllWorkingCopyPoolTest.java +++ b/scm-core/src/test/java/sonia/scm/repository/work/CachingAllWorkingCopyPoolTest.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package sonia.scm.repository.util; +package sonia.scm.repository.work; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/scm-core/src/test/java/sonia/scm/repository/util/SimpleWorkingCopyFactoryTest.java b/scm-core/src/test/java/sonia/scm/repository/work/SimpleWorkingCopyFactoryTest.java similarity index 99% rename from scm-core/src/test/java/sonia/scm/repository/util/SimpleWorkingCopyFactoryTest.java rename to scm-core/src/test/java/sonia/scm/repository/work/SimpleWorkingCopyFactoryTest.java index 97364e12ec..fd12e578dd 100644 --- a/scm-core/src/test/java/sonia/scm/repository/util/SimpleWorkingCopyFactoryTest.java +++ b/scm-core/src/test/java/sonia/scm/repository/work/SimpleWorkingCopyFactoryTest.java @@ -22,8 +22,7 @@ * SOFTWARE. */ -package sonia.scm.repository.util; - +package sonia.scm.repository.work; import org.junit.Before; import org.junit.Rule; diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/GitWorkingCopyFactory.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/GitWorkingCopyFactory.java index 7585d2824f..8b127d8fde 100644 --- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/GitWorkingCopyFactory.java +++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/GitWorkingCopyFactory.java @@ -26,7 +26,7 @@ package sonia.scm.repository; import org.eclipse.jgit.lib.Repository; import sonia.scm.repository.spi.GitContext; -import sonia.scm.repository.util.WorkingCopyFactory; +import sonia.scm.repository.work.WorkingCopyFactory; public interface GitWorkingCopyFactory extends WorkingCopyFactory { } diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/AbstractGitCommand.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/AbstractGitCommand.java index 11e2040f57..d52d0a1574 100644 --- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/AbstractGitCommand.java +++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/AbstractGitCommand.java @@ -45,7 +45,7 @@ import sonia.scm.repository.GitUtil; import sonia.scm.repository.GitWorkingCopyFactory; import sonia.scm.repository.InternalRepositoryException; import sonia.scm.repository.Person; -import sonia.scm.repository.util.WorkingCopy; +import sonia.scm.repository.work.WorkingCopy; import sonia.scm.user.User; import java.io.IOException; diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/SimpleGitWorkingCopyFactory.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/SimpleGitWorkingCopyFactory.java index 088eb099eb..ecd874e20c 100644 --- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/SimpleGitWorkingCopyFactory.java +++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/SimpleGitWorkingCopyFactory.java @@ -36,9 +36,9 @@ import org.slf4j.LoggerFactory; import sonia.scm.repository.GitUtil; import sonia.scm.repository.GitWorkingCopyFactory; import sonia.scm.repository.InternalRepositoryException; -import sonia.scm.repository.util.WorkingCopyPool; -import sonia.scm.repository.util.SimpleWorkingCopyFactory; -import sonia.scm.repository.util.WorkingCopyPool.ParentAndClone; +import sonia.scm.repository.work.WorkingCopyPool; +import sonia.scm.repository.work.SimpleWorkingCopyFactory; +import sonia.scm.repository.work.WorkingCopyPool.ParentAndClone; import sonia.scm.util.SystemUtil; import javax.inject.Inject; diff --git a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/CloseableWrapperTest.java b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/CloseableWrapperTest.java deleted file mode 100644 index f1069afede..0000000000 --- a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/CloseableWrapperTest.java +++ /dev/null @@ -1,55 +0,0 @@ -/* - * MIT License - * - * Copyright (c) 2020-present Cloudogu GmbH and Contributors - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package sonia.scm.repository; - -import org.junit.Test; -import sonia.scm.repository.util.CloseableWrapper; - -import java.util.function.Consumer; - -import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.verify; - -public class CloseableWrapperTest { - - @Test - public void shouldExecuteGivenMethodAtClose() { - Consumer wrapped = new Consumer() { - // no this cannot be replaced with a lambda because otherwise we could not use Mockito#spy - @Override - public void accept(AutoCloseable s) { - } - }; - - Consumer closer = spy(wrapped); - - AutoCloseable autoCloseable = () -> {}; - try (CloseableWrapper wrapper = new CloseableWrapper<>(autoCloseable, closer)) { - // nothing to do here - } - - verify(closer).accept(autoCloseable); - } -} diff --git a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitMergeCommandTest.java b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitMergeCommandTest.java index d8484fecb1..0bf61a739b 100644 --- a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitMergeCommandTest.java +++ b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitMergeCommandTest.java @@ -44,8 +44,8 @@ import sonia.scm.repository.GitWorkingCopyFactory; import sonia.scm.repository.Person; import sonia.scm.repository.api.MergeCommandResult; import sonia.scm.repository.api.MergeStrategy; -import sonia.scm.repository.util.NoneCachingWorkingCopyPool; -import sonia.scm.repository.util.WorkdirProvider; +import sonia.scm.repository.work.NoneCachingWorkingCopyPool; +import sonia.scm.repository.work.WorkdirProvider; import sonia.scm.user.User; import java.io.BufferedWriter; diff --git a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitMergeCommand_Conflict_Test.java b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitMergeCommand_Conflict_Test.java index 1581e2ec08..4c1763966e 100644 --- a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitMergeCommand_Conflict_Test.java +++ b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitMergeCommand_Conflict_Test.java @@ -27,8 +27,8 @@ package sonia.scm.repository.spi; import org.junit.Rule; import org.junit.Test; import sonia.scm.repository.spi.MergeConflictResult.SingleMergeConflict; -import sonia.scm.repository.util.NoneCachingWorkingCopyPool; -import sonia.scm.repository.util.WorkdirProvider; +import sonia.scm.repository.work.NoneCachingWorkingCopyPool; +import sonia.scm.repository.work.WorkdirProvider; import java.io.IOException; diff --git a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitModifyCommandTest.java b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitModifyCommandTest.java index 23799071b4..e72ad1af7e 100644 --- a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitModifyCommandTest.java +++ b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitModifyCommandTest.java @@ -42,8 +42,8 @@ import sonia.scm.BadRequestException; import sonia.scm.ConcurrentModificationException; import sonia.scm.NotFoundException; import sonia.scm.repository.Person; -import sonia.scm.repository.util.NoneCachingWorkingCopyPool; -import sonia.scm.repository.util.WorkdirProvider; +import sonia.scm.repository.work.NoneCachingWorkingCopyPool; +import sonia.scm.repository.work.WorkdirProvider; import sonia.scm.web.lfs.LfsBlobStoreFactory; import java.io.File; diff --git a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitModifyCommand_LFSTest.java b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitModifyCommand_LFSTest.java index df3f2689a0..6709505c90 100644 --- a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitModifyCommand_LFSTest.java +++ b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitModifyCommand_LFSTest.java @@ -35,8 +35,8 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; import sonia.scm.repository.Person; -import sonia.scm.repository.util.NoneCachingWorkingCopyPool; -import sonia.scm.repository.util.WorkdirProvider; +import sonia.scm.repository.work.NoneCachingWorkingCopyPool; +import sonia.scm.repository.work.WorkdirProvider; import sonia.scm.store.Blob; import sonia.scm.store.BlobStore; import sonia.scm.web.lfs.LfsBlobStoreFactory; diff --git a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitModifyCommand_withEmptyRepositoryTest.java b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitModifyCommand_withEmptyRepositoryTest.java index bf6d255538..5898845a74 100644 --- a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitModifyCommand_withEmptyRepositoryTest.java +++ b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitModifyCommand_withEmptyRepositoryTest.java @@ -38,8 +38,8 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; import sonia.scm.repository.Person; -import sonia.scm.repository.util.NoneCachingWorkingCopyPool; -import sonia.scm.repository.util.WorkdirProvider; +import sonia.scm.repository.work.NoneCachingWorkingCopyPool; +import sonia.scm.repository.work.WorkdirProvider; import sonia.scm.web.lfs.LfsBlobStoreFactory; import java.io.File; diff --git a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/SimpleGitWorkingCopyFactoryTest.java b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/SimpleGitWorkingCopyFactoryTest.java index 868c96c023..0b2ba55d95 100644 --- a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/SimpleGitWorkingCopyFactoryTest.java +++ b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/SimpleGitWorkingCopyFactoryTest.java @@ -38,9 +38,9 @@ import sonia.scm.repository.GitRepositoryHandler; import sonia.scm.repository.PreProcessorUtil; import sonia.scm.repository.RepositoryManager; import sonia.scm.repository.api.HookContextFactory; -import sonia.scm.repository.util.NoneCachingWorkingCopyPool; -import sonia.scm.repository.util.WorkdirProvider; -import sonia.scm.repository.util.WorkingCopy; +import sonia.scm.repository.work.NoneCachingWorkingCopyPool; +import sonia.scm.repository.work.WorkdirProvider; +import sonia.scm.repository.work.WorkingCopy; import java.io.File; import java.io.IOException; diff --git a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgBranchCommand.java b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgBranchCommand.java index 704e68343c..3a291b4501 100644 --- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgBranchCommand.java +++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgBranchCommand.java @@ -34,7 +34,7 @@ import sonia.scm.ContextEntry; import sonia.scm.repository.Branch; import sonia.scm.repository.InternalRepositoryException; import sonia.scm.repository.api.BranchRequest; -import sonia.scm.repository.util.WorkingCopy; +import sonia.scm.repository.work.WorkingCopy; import sonia.scm.user.User; /** diff --git a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgModifyCommand.java b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgModifyCommand.java index ea496fe74c..012592c7a4 100644 --- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgModifyCommand.java +++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgModifyCommand.java @@ -33,7 +33,7 @@ import com.aragost.javahg.commands.RemoveCommand; import com.aragost.javahg.commands.StatusCommand; import sonia.scm.NoChangesMadeException; import sonia.scm.repository.InternalRepositoryException; -import sonia.scm.repository.util.WorkingCopy; +import sonia.scm.repository.work.WorkingCopy; import java.io.File; import java.io.IOException; diff --git a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgWorkingCopyFactory.java b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgWorkingCopyFactory.java index 1dfc938493..15c39aa77e 100644 --- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgWorkingCopyFactory.java +++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgWorkingCopyFactory.java @@ -26,7 +26,7 @@ package sonia.scm.repository.spi; import com.aragost.javahg.Repository; import com.aragost.javahg.commands.PullCommand; -import sonia.scm.repository.util.WorkingCopyFactory; +import sonia.scm.repository.work.WorkingCopyFactory; public interface HgWorkingCopyFactory extends WorkingCopyFactory { void configure(PullCommand pullCommand); diff --git a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/SimpleHgWorkingCopyFactory.java b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/SimpleHgWorkingCopyFactory.java index 6e35d0f9ae..9285cf3417 100644 --- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/SimpleHgWorkingCopyFactory.java +++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/SimpleHgWorkingCopyFactory.java @@ -32,10 +32,10 @@ import com.aragost.javahg.commands.PullCommand; import com.aragost.javahg.commands.StatusCommand; import com.aragost.javahg.commands.UpdateCommand; import com.aragost.javahg.commands.flags.CloneCommandFlags; -import sonia.scm.repository.util.WorkingCopyFailedException; -import sonia.scm.repository.util.WorkingCopyPool; -import sonia.scm.repository.util.SimpleWorkingCopyFactory; -import sonia.scm.repository.util.WorkingCopyPool.ParentAndClone; +import sonia.scm.repository.work.WorkingCopyFailedException; +import sonia.scm.repository.work.WorkingCopyPool; +import sonia.scm.repository.work.SimpleWorkingCopyFactory; +import sonia.scm.repository.work.WorkingCopyPool.ParentAndClone; import sonia.scm.util.IOUtil; import sonia.scm.web.HgRepositoryEnvironmentBuilder; diff --git a/scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/repository/spi/HgBranchCommandTest.java b/scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/repository/spi/HgBranchCommandTest.java index 11acd21f1d..0972f11e8f 100644 --- a/scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/repository/spi/HgBranchCommandTest.java +++ b/scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/repository/spi/HgBranchCommandTest.java @@ -32,8 +32,8 @@ import sonia.scm.repository.Branch; import sonia.scm.repository.HgTestUtil; import sonia.scm.repository.InternalRepositoryException; import sonia.scm.repository.api.BranchRequest; -import sonia.scm.repository.util.NoneCachingWorkingCopyPool; -import sonia.scm.repository.util.WorkdirProvider; +import sonia.scm.repository.work.NoneCachingWorkingCopyPool; +import sonia.scm.repository.work.WorkdirProvider; import sonia.scm.web.HgRepositoryEnvironmentBuilder; import java.util.List; diff --git a/scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/repository/spi/HgModifyCommandTest.java b/scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/repository/spi/HgModifyCommandTest.java index 872151ab6b..d55005f675 100644 --- a/scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/repository/spi/HgModifyCommandTest.java +++ b/scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/repository/spi/HgModifyCommandTest.java @@ -35,8 +35,8 @@ import sonia.scm.NotFoundException; import sonia.scm.repository.HgHookManager; import sonia.scm.repository.HgTestUtil; import sonia.scm.repository.Person; -import sonia.scm.repository.util.NoneCachingWorkingCopyPool; -import sonia.scm.repository.util.WorkdirProvider; +import sonia.scm.repository.work.NoneCachingWorkingCopyPool; +import sonia.scm.repository.work.WorkdirProvider; import sonia.scm.web.HgRepositoryEnvironmentBuilder; import java.io.File; diff --git a/scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/repository/spi/SimpleHgWorkingCopyFactoryTest.java b/scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/repository/spi/SimpleHgWorkingCopyFactoryTest.java index 9199a23c92..779b847087 100644 --- a/scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/repository/spi/SimpleHgWorkingCopyFactoryTest.java +++ b/scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/repository/spi/SimpleHgWorkingCopyFactoryTest.java @@ -26,17 +26,15 @@ package sonia.scm.repository.spi; import com.aragost.javahg.Repository; import com.google.inject.util.Providers; -import org.assertj.core.api.Assertions; -import org.junit.Assert; import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; import sonia.scm.repository.HgHookManager; import sonia.scm.repository.HgTestUtil; -import sonia.scm.repository.util.CachingAllWorkingCopyPool; -import sonia.scm.repository.util.WorkdirProvider; -import sonia.scm.repository.util.WorkingCopy; +import sonia.scm.repository.work.CachingAllWorkingCopyPool; +import sonia.scm.repository.work.WorkdirProvider; +import sonia.scm.repository.work.WorkingCopy; import sonia.scm.web.HgRepositoryEnvironmentBuilder; import java.io.File; diff --git a/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/SvnWorkingCopyFactory.java b/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/SvnWorkingCopyFactory.java index 0c87f2d359..67793d1e90 100644 --- a/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/SvnWorkingCopyFactory.java +++ b/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/SvnWorkingCopyFactory.java @@ -25,7 +25,7 @@ package sonia.scm.repository; import sonia.scm.repository.spi.SvnContext; -import sonia.scm.repository.util.WorkingCopyFactory; +import sonia.scm.repository.work.WorkingCopyFactory; import java.io.File; diff --git a/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SimpleSvnWorkingCopyFactory.java b/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SimpleSvnWorkingCopyFactory.java index 922eb3bc38..91c995c179 100644 --- a/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SimpleSvnWorkingCopyFactory.java +++ b/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SimpleSvnWorkingCopyFactory.java @@ -35,9 +35,9 @@ import org.tmatesoft.svn.core.wc2.SvnTarget; import sonia.scm.repository.InternalRepositoryException; import sonia.scm.repository.Repository; import sonia.scm.repository.SvnWorkingCopyFactory; -import sonia.scm.repository.util.WorkingCopyPool; -import sonia.scm.repository.util.SimpleWorkingCopyFactory; -import sonia.scm.repository.util.WorkingCopyPool.ParentAndClone; +import sonia.scm.repository.work.WorkingCopyPool; +import sonia.scm.repository.work.SimpleWorkingCopyFactory; +import sonia.scm.repository.work.WorkingCopyPool.ParentAndClone; import javax.inject.Inject; import java.io.File; diff --git a/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SvnModifyCommand.java b/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SvnModifyCommand.java index e9cbcd68b6..57b7a3ad68 100644 --- a/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SvnModifyCommand.java +++ b/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SvnModifyCommand.java @@ -34,7 +34,7 @@ import org.tmatesoft.svn.core.wc.SVNWCUtil; import sonia.scm.repository.InternalRepositoryException; import sonia.scm.repository.Repository; import sonia.scm.repository.SvnWorkingCopyFactory; -import sonia.scm.repository.util.WorkingCopy; +import sonia.scm.repository.work.WorkingCopy; import java.io.File; import java.io.IOException; 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 120f7cc20b..66c51a94cb 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 @@ -30,9 +30,9 @@ import org.junit.Test; import org.junit.rules.TemporaryFolder; import org.tmatesoft.svn.core.SVNException; import sonia.scm.repository.Repository; -import sonia.scm.repository.util.NoneCachingWorkingCopyPool; -import sonia.scm.repository.util.WorkdirProvider; -import sonia.scm.repository.util.WorkingCopy; +import sonia.scm.repository.work.NoneCachingWorkingCopyPool; +import sonia.scm.repository.work.WorkdirProvider; +import sonia.scm.repository.work.WorkingCopy; import java.io.File; import java.io.IOException; diff --git a/scm-plugins/scm-svn-plugin/src/test/java/sonia/scm/repository/spi/SvnModifyCommandTest.java b/scm-plugins/scm-svn-plugin/src/test/java/sonia/scm/repository/spi/SvnModifyCommandTest.java index 029ad5cd07..dbace87411 100644 --- a/scm-plugins/scm-svn-plugin/src/test/java/sonia/scm/repository/spi/SvnModifyCommandTest.java +++ b/scm-plugins/scm-svn-plugin/src/test/java/sonia/scm/repository/spi/SvnModifyCommandTest.java @@ -33,9 +33,9 @@ import org.junit.Test; import org.junit.rules.TemporaryFolder; import sonia.scm.AlreadyExistsException; import sonia.scm.repository.Person; -import sonia.scm.repository.util.NoneCachingWorkingCopyPool; -import sonia.scm.repository.util.WorkdirProvider; -import sonia.scm.repository.util.WorkingCopy; +import sonia.scm.repository.work.NoneCachingWorkingCopyPool; +import sonia.scm.repository.work.WorkdirProvider; +import sonia.scm.repository.work.WorkingCopy; import java.io.File; import java.io.IOException; diff --git a/scm-webapp/src/main/java/sonia/scm/lifecycle/modules/WorkingCopyPoolModule.java b/scm-webapp/src/main/java/sonia/scm/lifecycle/modules/WorkingCopyPoolModule.java index 9ab838856c..63e9ce6cd4 100644 --- a/scm-webapp/src/main/java/sonia/scm/lifecycle/modules/WorkingCopyPoolModule.java +++ b/scm-webapp/src/main/java/sonia/scm/lifecycle/modules/WorkingCopyPoolModule.java @@ -26,10 +26,10 @@ package sonia.scm.lifecycle.modules; import com.google.inject.AbstractModule; import sonia.scm.plugin.PluginLoader; -import sonia.scm.repository.util.WorkingCopyPool; +import sonia.scm.repository.work.WorkingCopyPool; public class WorkingCopyPoolModule extends AbstractModule { - public static final String DEFAULT_WORKING_COPY_POOL_STRATEGY = "sonia.scm.repository.util.NoneCachingWorkingCopyPool"; + public static final String DEFAULT_WORKING_COPY_POOL_STRATEGY = "sonia.scm.repository.work.NoneCachingWorkingCopyPool"; public static final String WORKING_COPY_POOL_STRATEGY_PROPERTY = "scm.workingCopyPoolStrategy"; private final PluginLoader pluginLoader;