diff --git a/scm-core/src/main/java/sonia/scm/migration/MigrationDAO.java b/scm-core/src/main/java/sonia/scm/migration/MigrationDAO.java new file mode 100644 index 0000000000..acc37ce8ee --- /dev/null +++ b/scm-core/src/main/java/sonia/scm/migration/MigrationDAO.java @@ -0,0 +1,7 @@ +package sonia.scm.migration; + +import java.util.Collection; + +public interface MigrationDAO { + Collection getAll(); +} diff --git a/scm-core/src/main/java/sonia/scm/migration/MigrationInfo.java b/scm-core/src/main/java/sonia/scm/migration/MigrationInfo.java new file mode 100644 index 0000000000..19f5d8ba3a --- /dev/null +++ b/scm-core/src/main/java/sonia/scm/migration/MigrationInfo.java @@ -0,0 +1,38 @@ +package sonia.scm.migration; + +public class MigrationInfo { + + private final String id; + private final String protocol; + private final String originalRepositoryName; + private final String namespace; + private final String name; + + public MigrationInfo(String id, String protocol, String originalRepositoryName, String namespace, String name) { + this.id = id; + this.protocol = protocol; + this.originalRepositoryName = originalRepositoryName; + this.namespace = namespace; + this.name = name; + } + + public String getId() { + return id; + } + + public String getProtocol() { + return protocol; + } + + public String getOriginalRepositoryName() { + return originalRepositoryName; + } + + public String getNamespace() { + return namespace; + } + + public String getName() { + return name; + } +} diff --git a/scm-plugins/scm-legacy-plugin/src/main/java/sonia/scm/legacy/LegacyModule.java b/scm-plugins/scm-legacy-plugin/src/main/java/sonia/scm/legacy/LegacyModule.java new file mode 100644 index 0000000000..e8ec437248 --- /dev/null +++ b/scm-plugins/scm-legacy-plugin/src/main/java/sonia/scm/legacy/LegacyModule.java @@ -0,0 +1,13 @@ +package sonia.scm.legacy; + +import com.google.inject.servlet.ServletModule; +import sonia.scm.plugin.Extension; + +@Extension +public class LegacyModule extends ServletModule { + + @Override + protected void configureServlets() { + filter("/*").through(RepositoryLegacyProtocolRedirectFilter.class); + } +} diff --git a/scm-plugins/scm-legacy-plugin/src/main/java/sonia/scm/legacy/RepositoryLegacyProtocolRedirectFilter.java b/scm-plugins/scm-legacy-plugin/src/main/java/sonia/scm/legacy/RepositoryLegacyProtocolRedirectFilter.java new file mode 100644 index 0000000000..c008caf111 --- /dev/null +++ b/scm-plugins/scm-legacy-plugin/src/main/java/sonia/scm/legacy/RepositoryLegacyProtocolRedirectFilter.java @@ -0,0 +1,126 @@ +package sonia.scm.legacy; + +import sonia.scm.migration.MigrationDAO; +import sonia.scm.migration.MigrationInfo; +import sonia.scm.web.filter.HttpFilter; + +import javax.inject.Inject; +import javax.inject.Singleton; +import javax.servlet.FilterChain; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.Collection; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Optional; + +import static java.util.Arrays.asList; +import static java.util.Optional.empty; +import static java.util.Optional.of; + +@Singleton +public class RepositoryLegacyProtocolRedirectFilter extends HttpFilter { + + private final ProtocolBasedLegacyRepositoryInfo info; + + @Inject + public RepositoryLegacyProtocolRedirectFilter(MigrationDAO migrationDAO) { + this.info = load(migrationDAO); + } + + private static ProtocolBasedLegacyRepositoryInfo load(MigrationDAO migrationDAO) { + return new ProtocolBasedLegacyRepositoryInfo(migrationDAO.getAll()); + } + + @Override + protected void doFilter(HttpServletRequest request, HttpServletResponse response, FilterChain chain) throws IOException, ServletException { + String servletPath = request.getServletPath(); + if (servletPath.startsWith("/")) { + servletPath = servletPath.substring(1); + } + String[] pathElements = servletPath.split("/"); + if (pathElements.length > 0) { + Optional repository = info.findRepository(asList(pathElements)); + if (repository.isPresent()) { + String furtherPath = servletPath.substring(repository.get().getProtocol().length() + 1 + repository.get().getOriginalRepositoryName().length()); + String queryString = request.getQueryString(); + if (queryString != null && queryString.length() > 0) { + response.sendRedirect(String.format("%s/repo/%s/%s%s?%s", request.getContextPath(), repository.get().getNamespace(), repository.get().getName(), furtherPath, queryString)); + } else { + response.sendRedirect(String.format("%s/repo/%s/%s%s", request.getContextPath(), repository.get().getNamespace(), repository.get().getName(), furtherPath)); + } + } else { + chain.doFilter(request, response); + } + } else { + chain.doFilter(request, response); + } + } + + private static class ProtocolBasedLegacyRepositoryInfo { + + private final Map infosForProtocol = new HashMap<>(); + + public ProtocolBasedLegacyRepositoryInfo(Collection all) { + all.forEach(this::add); + } + + private void add(MigrationInfo migrationInfo) { + String protocol = migrationInfo.getProtocol(); + LegacyRepositoryInfoCollection legacyRepositoryInfoCollection = infosForProtocol.computeIfAbsent(protocol, x -> new LegacyRepositoryInfoCollection()); + legacyRepositoryInfoCollection.add(migrationInfo); + } + + private Optional findRepository(List pathElements) { + String protocol = pathElements.get(0); + if (!isProtocol(protocol)) { + return empty(); + } + return infosForProtocol.get(protocol).findRepository(removeFirstElement(pathElements)); + } + + public boolean isProtocol(String protocol) { + return infosForProtocol.containsKey(protocol); + } + } + + private static class LegacyRepositoryInfoCollection { + + private final Map repositories = new HashMap<>(); + private final Map next = new HashMap<>(); + + public Optional findRepository(List pathElements) { + if (repositories.containsKey(pathElements.get(0))) { + return of(repositories.get(pathElements.get(0))); + } else if (next.containsKey(pathElements.get(0))) { + return next.get(pathElements.get(0)).findRepository(removeFirstElement(pathElements)); + } else { + return empty(); + } + } + + private void add(MigrationInfo migrationInfo) { + String originalRepositoryName = migrationInfo.getOriginalRepositoryName(); + List originalRepositoryNameParts = asList(originalRepositoryName.split("/")); + add(migrationInfo, originalRepositoryNameParts); + } + + private void add(MigrationInfo migrationInfo, List originalRepositoryNameParts) { + if (originalRepositoryNameParts.isEmpty()) { + throw new IllegalArgumentException("cannot handle empty name"); + } else if (originalRepositoryNameParts.size() == 1) { + repositories.put(originalRepositoryNameParts.get(0), migrationInfo); + } else { + LegacyRepositoryInfoCollection subCollection = next.computeIfAbsent(originalRepositoryNameParts.get(0), x -> new LegacyRepositoryInfoCollection()); + subCollection.add(migrationInfo, removeFirstElement(originalRepositoryNameParts)); + } + } + } + + private static List removeFirstElement(List originalRepositoryNameParts) { + return originalRepositoryNameParts.subList(1, originalRepositoryNameParts.size()); + } +} diff --git a/scm-plugins/scm-legacy-plugin/src/test/java/sonia/scm/legacy/RepositoryLegacyProtocolRedirectFilterTest.java b/scm-plugins/scm-legacy-plugin/src/test/java/sonia/scm/legacy/RepositoryLegacyProtocolRedirectFilterTest.java new file mode 100644 index 0000000000..2dba66f54a --- /dev/null +++ b/scm-plugins/scm-legacy-plugin/src/test/java/sonia/scm/legacy/RepositoryLegacyProtocolRedirectFilterTest.java @@ -0,0 +1,83 @@ +package sonia.scm.legacy; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.Mock; +import org.mockito.junit.jupiter.MockitoExtension; +import sonia.scm.migration.MigrationDAO; +import sonia.scm.migration.MigrationInfo; + +import javax.servlet.FilterChain; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; + +import static java.util.Collections.singletonList; +import static org.mockito.Mockito.lenient; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +@ExtendWith(MockitoExtension.class) +class RepositoryLegacyProtocolRedirectFilterTest { + + @Mock + MigrationDAO migrationDAO; + @Mock + HttpServletRequest request; + @Mock + HttpServletResponse response; + @Mock + FilterChain filterChain; + + @BeforeEach + void initContextPath() { + lenient().when(request.getContextPath()).thenReturn("/scm"); + lenient().when(request.getQueryString()).thenReturn(""); + } + + @Test + void shouldNotRedirectForEmptyMigrationList() throws IOException, ServletException { + when(request.getServletPath()).thenReturn("/git/old/name"); + + new RepositoryLegacyProtocolRedirectFilter(migrationDAO).doFilter(request, response, filterChain); + + verify(filterChain).doFilter(request, response); + } + + @Test + void shouldRedirectForExistingRepository() throws IOException, ServletException { + when(migrationDAO.getAll()).thenReturn(singletonList(new MigrationInfo("id", "git", "old/name", "namespace", "name"))); + when(request.getServletPath()).thenReturn("/git/old/name"); + + new RepositoryLegacyProtocolRedirectFilter(migrationDAO).doFilter(request, response, filterChain); + + verify(response).sendRedirect("/scm/repo/namespace/name"); + verify(filterChain, never()).doFilter(request, response); + } + + @Test + void shouldRedirectForExistingRepositoryWithFurtherPathElements() throws IOException, ServletException { + when(migrationDAO.getAll()).thenReturn(singletonList(new MigrationInfo("id", "git", "old/name", "namespace", "name"))); + when(request.getServletPath()).thenReturn("/git/old/name/info/refs"); + + new RepositoryLegacyProtocolRedirectFilter(migrationDAO).doFilter(request, response, filterChain); + + verify(response).sendRedirect("/scm/repo/namespace/name/info/refs"); + verify(filterChain, never()).doFilter(request, response); + } + + @Test + void shouldRedirectWithQueryParameters() throws IOException, ServletException { + when(migrationDAO.getAll()).thenReturn(singletonList(new MigrationInfo("id", "git", "old/name", "namespace", "name"))); + when(request.getServletPath()).thenReturn("/git/old/name/info/refs"); + when(request.getQueryString()).thenReturn("parameter=value"); + + new RepositoryLegacyProtocolRedirectFilter(migrationDAO).doFilter(request, response, filterChain); + + verify(response).sendRedirect("/scm/repo/namespace/name/info/refs?parameter=value"); + verify(filterChain, never()).doFilter(request, response); + } +} diff --git a/scm-webapp/src/main/java/sonia/scm/lifecycle/modules/ScmServletModule.java b/scm-webapp/src/main/java/sonia/scm/lifecycle/modules/ScmServletModule.java index 7b8af8fbcc..7ece64f719 100644 --- a/scm-webapp/src/main/java/sonia/scm/lifecycle/modules/ScmServletModule.java +++ b/scm-webapp/src/main/java/sonia/scm/lifecycle/modules/ScmServletModule.java @@ -57,6 +57,7 @@ import sonia.scm.group.GroupDisplayManager; import sonia.scm.group.GroupManager; import sonia.scm.group.GroupManagerProvider; import sonia.scm.group.xml.XmlGroupDAO; +import sonia.scm.migration.MigrationDAO; import sonia.scm.net.SSLContextProvider; import sonia.scm.net.ahc.AdvancedHttpClient; import sonia.scm.net.ahc.ContentTransformer; @@ -97,6 +98,7 @@ import sonia.scm.template.MustacheTemplateEngine; import sonia.scm.template.TemplateEngine; import sonia.scm.template.TemplateEngineFactory; import sonia.scm.template.TemplateServlet; +import sonia.scm.update.repository.DefaultMigrationStrategyDAO; import sonia.scm.user.DefaultUserDisplayManager; import sonia.scm.user.DefaultUserManager; import sonia.scm.user.UserDAO; @@ -183,6 +185,7 @@ class ScmServletModule extends ServletModule { bind(RepositoryDAO.class, XmlRepositoryDAO.class); bind(RepositoryRoleDAO.class, XmlRepositoryRoleDAO.class); bind(RepositoryRoleManager.class).to(DefaultRepositoryRoleManager.class); + bind(MigrationDAO.class).to(DefaultMigrationStrategyDAO.class); bindDecorated(RepositoryManager.class, DefaultRepositoryManager.class, RepositoryManagerProvider.class); diff --git a/scm-webapp/src/main/java/sonia/scm/update/MigrationWizardServlet.java b/scm-webapp/src/main/java/sonia/scm/update/MigrationWizardServlet.java index 445a99feb7..e913cead25 100644 --- a/scm-webapp/src/main/java/sonia/scm/update/MigrationWizardServlet.java +++ b/scm-webapp/src/main/java/sonia/scm/update/MigrationWizardServlet.java @@ -10,7 +10,7 @@ import org.slf4j.LoggerFactory; import sonia.scm.lifecycle.RestartEvent; import sonia.scm.event.ScmEventBus; import sonia.scm.update.repository.MigrationStrategy; -import sonia.scm.update.repository.MigrationStrategyDao; +import sonia.scm.update.repository.DefaultMigrationStrategyDAO; import sonia.scm.update.repository.V1Repository; import sonia.scm.update.repository.XmlRepositoryV1UpdateStep; import sonia.scm.util.ValidationUtil; @@ -37,10 +37,10 @@ class MigrationWizardServlet extends HttpServlet { private static final Logger LOG = LoggerFactory.getLogger(MigrationWizardServlet.class); private final XmlRepositoryV1UpdateStep repositoryV1UpdateStep; - private final MigrationStrategyDao migrationStrategyDao; + private final DefaultMigrationStrategyDAO migrationStrategyDao; @Inject - MigrationWizardServlet(XmlRepositoryV1UpdateStep repositoryV1UpdateStep, MigrationStrategyDao migrationStrategyDao) { + MigrationWizardServlet(XmlRepositoryV1UpdateStep repositoryV1UpdateStep, DefaultMigrationStrategyDAO migrationStrategyDao) { this.repositoryV1UpdateStep = repositoryV1UpdateStep; this.migrationStrategyDao = migrationStrategyDao; } @@ -103,11 +103,12 @@ class MigrationWizardServlet extends HttpServlet { .forEach( entry-> { String id = entry.getId(); + String protocol = entry.getType(); String originalName = entry.getOriginalName(); String strategy = req.getParameter("strategy-" + id); String namespace = req.getParameter("namespace-" + id); String name = req.getParameter("name-" + id); - migrationStrategyDao.set(id, originalName, MigrationStrategy.valueOf(strategy), namespace, name); + migrationStrategyDao.set(id, protocol, originalName, MigrationStrategy.valueOf(strategy), namespace, name); } ); diff --git a/scm-webapp/src/main/java/sonia/scm/update/repository/DefaultMigrationStrategyDAO.java b/scm-webapp/src/main/java/sonia/scm/update/repository/DefaultMigrationStrategyDAO.java new file mode 100644 index 0000000000..4b10c3e6a7 --- /dev/null +++ b/scm-webapp/src/main/java/sonia/scm/update/repository/DefaultMigrationStrategyDAO.java @@ -0,0 +1,44 @@ +package sonia.scm.update.repository; + +import sonia.scm.migration.MigrationDAO; +import sonia.scm.migration.MigrationInfo; +import sonia.scm.store.ConfigurationStore; +import sonia.scm.store.ConfigurationStoreFactory; + +import javax.inject.Inject; +import javax.inject.Singleton; +import java.util.Collection; +import java.util.Optional; + +import static java.util.stream.Collectors.toList; + +@Singleton +public class DefaultMigrationStrategyDAO implements MigrationDAO { + + private final RepositoryMigrationPlan plan; + private final ConfigurationStore store; + + @Inject + public DefaultMigrationStrategyDAO(ConfigurationStoreFactory storeFactory) { + store = storeFactory.withType(RepositoryMigrationPlan.class).withName("migration-plan").build(); + this.plan = store.getOptional().orElse(new RepositoryMigrationPlan()); + } + + public Optional get(String id) { + return plan.get(id); + } + + public void set(String repositoryId, String protocol, String originalName, MigrationStrategy strategy, String newNamespace, String newName) { + plan.set(repositoryId, protocol, originalName, strategy, newNamespace, newName); + store.set(plan); + } + + @Override + public Collection getAll() { + return plan + .getEntries() + .stream() + .map(e -> new MigrationInfo(e.getRepositoryId(), e.getProtocol(), e.getOriginalName(), e.getNewNamespace(), e.getNewName())) + .collect(toList()); + } +} diff --git a/scm-webapp/src/main/java/sonia/scm/update/repository/MigrationStrategyDao.java b/scm-webapp/src/main/java/sonia/scm/update/repository/MigrationStrategyDao.java deleted file mode 100644 index bdc8f97359..0000000000 --- a/scm-webapp/src/main/java/sonia/scm/update/repository/MigrationStrategyDao.java +++ /dev/null @@ -1,30 +0,0 @@ -package sonia.scm.update.repository; - -import sonia.scm.store.ConfigurationStore; -import sonia.scm.store.ConfigurationStoreFactory; - -import javax.inject.Inject; -import javax.inject.Singleton; -import java.util.Optional; - -@Singleton -public class MigrationStrategyDao { - - private final RepositoryMigrationPlan plan; - private final ConfigurationStore store; - - @Inject - public MigrationStrategyDao(ConfigurationStoreFactory storeFactory) { - store = storeFactory.withType(RepositoryMigrationPlan.class).withName("migration-plan").build(); - this.plan = store.getOptional().orElse(new RepositoryMigrationPlan()); - } - - public Optional get(String id) { - return plan.get(id); - } - - public void set(String repositoryId, String originalName, MigrationStrategy strategy, String newNamespace, String newName) { - plan.set(repositoryId, originalName, strategy, newNamespace, newName); - store.set(plan); - } -} diff --git a/scm-webapp/src/main/java/sonia/scm/update/repository/RepositoryMigrationPlan.java b/scm-webapp/src/main/java/sonia/scm/update/repository/RepositoryMigrationPlan.java index 5f523ee76a..81d4d532ec 100644 --- a/scm-webapp/src/main/java/sonia/scm/update/repository/RepositoryMigrationPlan.java +++ b/scm-webapp/src/main/java/sonia/scm/update/repository/RepositoryMigrationPlan.java @@ -4,6 +4,8 @@ import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlRootElement; import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; import java.util.List; import java.util.Optional; @@ -29,14 +31,18 @@ class RepositoryMigrationPlan { .findFirst(); } - public void set(String repositoryId, String originalName, MigrationStrategy strategy, String newNamespace, String newName) { + public Collection getEntries() { + return Collections.unmodifiableList(entries); + } + + public void set(String repositoryId, String protocol, String originalName, MigrationStrategy strategy, String newNamespace, String newName) { Optional entry = get(repositoryId); if (entry.isPresent()) { entry.get().setStrategy(strategy); entry.get().setNewNamespace(newNamespace); entry.get().setNewName(newName); } else { - entries.add(new RepositoryMigrationEntry(repositoryId, originalName, strategy, newNamespace, newName)); + entries.add(new RepositoryMigrationEntry(repositoryId, protocol, originalName, strategy, newNamespace, newName)); } } @@ -45,6 +51,7 @@ class RepositoryMigrationPlan { static class RepositoryMigrationEntry { private String repositoryId; + private String protocol; private String originalName; private MigrationStrategy dataMigrationStrategy; private String newNamespace; @@ -53,14 +60,23 @@ class RepositoryMigrationPlan { RepositoryMigrationEntry() { } - RepositoryMigrationEntry(String repositoryId, String originalName, MigrationStrategy dataMigrationStrategy, String newNamespace, String newName) { + RepositoryMigrationEntry(String repositoryId, String protocol, String originalName, MigrationStrategy dataMigrationStrategy, String newNamespace, String newName) { this.repositoryId = repositoryId; + this.protocol = protocol; this.originalName = originalName; this.dataMigrationStrategy = dataMigrationStrategy; this.newNamespace = newNamespace; this.newName = newName; } + public String getRepositoryId() { + return repositoryId; + } + + public String getProtocol() { + return protocol; + } + public String getOriginalName() { return originalName; } diff --git a/scm-webapp/src/main/java/sonia/scm/update/repository/XmlRepositoryV1UpdateStep.java b/scm-webapp/src/main/java/sonia/scm/update/repository/XmlRepositoryV1UpdateStep.java index f7a4e1ed37..a2f7656498 100644 --- a/scm-webapp/src/main/java/sonia/scm/update/repository/XmlRepositoryV1UpdateStep.java +++ b/scm-webapp/src/main/java/sonia/scm/update/repository/XmlRepositoryV1UpdateStep.java @@ -49,7 +49,7 @@ import static sonia.scm.version.Version.parse; *
  • a new entry in the new repository-paths.xml database is written,
    • *
  • the data directory is moved or copied to a SCM v2 consistent directory. How this is done * can be specified by a strategy (@see {@link MigrationStrategy}), that has to be set in - * a database file named migration-plan.xml
    • (to create this file, use {@link MigrationStrategyDao}), + * a database file named migration-plan.xml (to create this file, use {@link DefaultMigrationStrategyDAO}), * and *
  • the new metadata.xml file is created.
    • * @@ -63,7 +63,7 @@ public class XmlRepositoryV1UpdateStep implements CoreUpdateStep { private final SCMContextProvider contextProvider; private final XmlRepositoryDAO repositoryDao; - private final MigrationStrategyDao migrationStrategyDao; + private final DefaultMigrationStrategyDAO migrationStrategyDao; private final Injector injector; private final ConfigurationEntryStore propertyStore; @@ -71,7 +71,7 @@ public class XmlRepositoryV1UpdateStep implements CoreUpdateStep { public XmlRepositoryV1UpdateStep( SCMContextProvider contextProvider, XmlRepositoryDAO repositoryDao, - MigrationStrategyDao migrationStrategyDao, + DefaultMigrationStrategyDAO migrationStrategyDao, Injector injector, ConfigurationEntryStoreFactory configurationEntryStoreFactory ) { diff --git a/scm-webapp/src/test/java/sonia/scm/update/MigrationWizardServletTest.java b/scm-webapp/src/test/java/sonia/scm/update/MigrationWizardServletTest.java index 325dc2eb1c..9dbe00059e 100644 --- a/scm-webapp/src/test/java/sonia/scm/update/MigrationWizardServletTest.java +++ b/scm-webapp/src/test/java/sonia/scm/update/MigrationWizardServletTest.java @@ -6,7 +6,7 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; import sonia.scm.update.repository.MigrationStrategy; -import sonia.scm.update.repository.MigrationStrategyDao; +import sonia.scm.update.repository.DefaultMigrationStrategyDAO; import sonia.scm.update.repository.V1Repository; import sonia.scm.update.repository.XmlRepositoryV1UpdateStep; @@ -26,7 +26,7 @@ class MigrationWizardServletTest { @Mock XmlRepositoryV1UpdateStep updateStep; @Mock - MigrationStrategyDao migrationStrategyDao; + DefaultMigrationStrategyDAO migrationStrategyDao; @Mock HttpServletRequest request; @@ -233,6 +233,6 @@ class MigrationWizardServletTest { servlet.doPost(request, response); - verify(migrationStrategyDao).set("id", "name", MigrationStrategy.COPY, "namespace", "name"); + verify(migrationStrategyDao).set("id", "git", "name", MigrationStrategy.COPY, "namespace", "name"); } } diff --git a/scm-webapp/src/test/java/sonia/scm/update/repository/MigrationStrategyDaoTest.java b/scm-webapp/src/test/java/sonia/scm/update/repository/DefaultMigrationStrategyDAOTest.java similarity index 83% rename from scm-webapp/src/test/java/sonia/scm/update/repository/MigrationStrategyDaoTest.java rename to scm-webapp/src/test/java/sonia/scm/update/repository/DefaultMigrationStrategyDAOTest.java index d3b487e916..a97d3b077a 100644 --- a/scm-webapp/src/test/java/sonia/scm/update/repository/MigrationStrategyDaoTest.java +++ b/scm-webapp/src/test/java/sonia/scm/update/repository/DefaultMigrationStrategyDAOTest.java @@ -12,7 +12,6 @@ import sonia.scm.SCMContextProvider; import sonia.scm.store.ConfigurationStoreFactory; import sonia.scm.store.JAXBConfigurationStoreFactory; -import javax.xml.bind.JAXBException; import java.nio.file.Path; import java.util.Optional; @@ -21,7 +20,7 @@ import static sonia.scm.update.repository.MigrationStrategy.INLINE; @ExtendWith(MockitoExtension.class) @ExtendWith(TempDirectory.class) -class MigrationStrategyDaoTest { +class DefaultMigrationStrategyDAOTest { @Mock SCMContextProvider contextProvider; @@ -36,7 +35,7 @@ class MigrationStrategyDaoTest { @Test void shouldReturnEmptyOptionalWhenStoreIsEmpty() { - MigrationStrategyDao dao = new MigrationStrategyDao(storeFactory); + DefaultMigrationStrategyDAO dao = new DefaultMigrationStrategyDAO(storeFactory); Optional entry = dao.get("any"); @@ -45,9 +44,9 @@ class MigrationStrategyDaoTest { @Test void shouldReturnNewValue() { - MigrationStrategyDao dao = new MigrationStrategyDao(storeFactory); + DefaultMigrationStrategyDAO dao = new DefaultMigrationStrategyDAO(storeFactory); - dao.set("id", "originalName", INLINE, "space", "name"); + dao.set("id", "git", "originalName", INLINE, "space", "name"); Optional entry = dao.get("id"); @@ -66,14 +65,14 @@ class MigrationStrategyDaoTest { class WithExistingDatabase { @BeforeEach void initExistingDatabase() { - MigrationStrategyDao dao = new MigrationStrategyDao(storeFactory); + DefaultMigrationStrategyDAO dao = new DefaultMigrationStrategyDAO(storeFactory); - dao.set("id", "originalName", INLINE, "space", "name"); + dao.set("id", "git", "originalName", INLINE, "space", "name"); } @Test void shouldFindExistingValue() { - MigrationStrategyDao dao = new MigrationStrategyDao(storeFactory); + DefaultMigrationStrategyDAO dao = new DefaultMigrationStrategyDAO(storeFactory); Optional entry = dao.get("id"); diff --git a/scm-webapp/src/test/java/sonia/scm/update/repository/XmlRepositoryV1UpdateStepTest.java b/scm-webapp/src/test/java/sonia/scm/update/repository/XmlRepositoryV1UpdateStepTest.java index f4abb32698..b3be09a9a9 100644 --- a/scm-webapp/src/test/java/sonia/scm/update/repository/XmlRepositoryV1UpdateStepTest.java +++ b/scm-webapp/src/test/java/sonia/scm/update/repository/XmlRepositoryV1UpdateStepTest.java @@ -16,8 +16,6 @@ import sonia.scm.repository.Repository; import sonia.scm.repository.RepositoryPermission; import sonia.scm.repository.xml.XmlRepositoryDAO; import sonia.scm.store.ConfigurationEntryStore; -import sonia.scm.store.ConfigurationEntryStoreFactory; -import sonia.scm.store.InMemoryConfigurationEntryStore; import sonia.scm.store.InMemoryConfigurationEntryStoreFactory; import sonia.scm.update.UpdateStepTestUtil; @@ -49,7 +47,7 @@ class XmlRepositoryV1UpdateStepTest { @Mock XmlRepositoryDAO repositoryDAO; @Mock - MigrationStrategyDao migrationStrategyDao; + DefaultMigrationStrategyDAO migrationStrategyDao; InMemoryConfigurationEntryStoreFactory configurationEntryStoreFactory = new InMemoryConfigurationEntryStoreFactory(); @@ -91,7 +89,7 @@ class XmlRepositoryV1UpdateStepTest { void createMigrationPlan() { Answer planAnswer = invocation -> { String id = invocation.getArgument(0).toString(); - return of(new RepositoryMigrationPlan.RepositoryMigrationEntry(id, "originalName", MOVE, "namespace-" + id, "name-" + id)); + return of(new RepositoryMigrationPlan.RepositoryMigrationEntry(id, "git", "originalName", MOVE, "namespace-" + id, "name-" + id)); }; lenient().when(migrationStrategyDao.get("3b91caa5-59c3-448f-920b-769aaa56b761")).thenAnswer(planAnswer);