Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-12 08:25:44 +01:00
Code Issues Packages Projects Releases Activity

Merge pull request #1201 from scm-manager/bugfix/mind_custom_repo_dir_in_migration

Browse Source 
Mind custom directories for repository types in migration
This commit is contained in:
Sebastian Sdorra
2020-06-18 07:27:34 +02:00
committed by GitHub
parent 2dee9e1ba3 e8642a451a
commit 74431664d8
6 changed files with 268 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
scm-webapp/src/main/java/sonia/scm/update/repository/BaseMigrationStrategy.java
View File

@@ -36,10 +36,10 @@ import java.util.stream.Stream;
abstract class BaseMigrationStrategy implements MigrationStrategy.Instance {
private final SCMContextProvider contextProvider;
private final V1RepositoryMigrationLocationResolver locationResolver;
BaseMigrationStrategy(SCMContextProvider contextProvider) {
this.contextProvider = contextProvider;
this.locationResolver = new V1RepositoryMigrationLocationResolver(contextProvider);
}
Path getSourceDataPath(String name, String type) {
@@ -48,7 +48,7 @@ abstract class BaseMigrationStrategy implements MigrationStrategy.Instance {
}
Path getTypeDependentPath(String type) {
return contextProvider.getBaseDirectory().toPath().resolve("repositories").resolve(type);
return locationResolver.getTypeDependentPath(type);
}
void listSourceDirectory(Path sourceDirectory, Consumer<Stream<Path>> pathConsumer) {

82
scm-webapp/src/main/java/sonia/scm/update/repository/V1RepositoryMigrationLocationResolver.java Normal file
View File

@@ -0,0 +1,82 @@
/*
* 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.update.repository;
import sonia.scm.SCMContextProvider;
import sonia.scm.migration.UpdateException;
import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBException;
import java.io.File;
import java.nio.file.Path;
import java.util.HashMap;
import java.util.Map;
import java.util.Optional;
import static java.util.Optional.empty;
import static java.util.Optional.of;
class V1RepositoryMigrationLocationResolver {
private final Map<String, Path> typeDependentPaths = new HashMap<>();
private final SCMContextProvider contextProvider;
V1RepositoryMigrationLocationResolver(SCMContextProvider contextProvider) {
this.contextProvider = contextProvider;
typeDependentPaths.put("git", readConfiguredPath(contextProvider, "git", "git.xml"));
typeDependentPaths.put("hg", readConfiguredPath(contextProvider, "hg", "hg.xml"));
typeDependentPaths.put("svn", readConfiguredPath(contextProvider, "svn", "svn.xml"));
}
Path getTypeDependentPath(String type) {
return typeDependentPaths.computeIfAbsent(type, t -> defaultPath(contextProvider, t));
}
private static Path readConfiguredPath(SCMContextProvider contextProvider, String type, String filename) {
return readConfig(contextProvider, filename)
.map(v1RepositoryTypeConfig -> v1RepositoryTypeConfig.getRepositoryDirectory().toPath())
.orElseGet(() -> defaultPath(contextProvider, type));
}
private static Path defaultPath(SCMContextProvider contextProvider, String type) {
return contextProvider.getBaseDirectory().toPath().resolve("repositories").resolve(type);
}
private static Optional<V1RepositoryTypeConfig> readConfig(SCMContextProvider contextProvider, String filename) {
try {
JAXBContext jaxbContext = JAXBContext.newInstance(V1RepositoryTypeConfig.class);
File file = new File(new File(contextProvider.getBaseDirectory(), "config"), filename);
if (file.exists()) {
Object unmarshal = jaxbContext.createUnmarshaller().unmarshal(file);
if (unmarshal instanceof V1RepositoryTypeConfig) {
return of((V1RepositoryTypeConfig) unmarshal);
}
}
} catch (JAXBException e) {
throw new UpdateException(String.format("could not read configuration file %s for repository type configuration", filename), e);
}
return empty();
}
}

42
scm-webapp/src/main/java/sonia/scm/update/repository/V1RepositoryTypeConfig.java Normal file
View File

@@ -0,0 +1,42 @@
/*
* 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.update.repository;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement;
import java.io.File;
@XmlRootElement(name = "config")
@XmlAccessorType(XmlAccessType.FIELD)
public class V1RepositoryTypeConfig {
private File repositoryDirectory;
public File getRepositoryDirectory() {
return repositoryDirectory;
}
}