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

Extract common code

Browse Source
This commit is contained in:
René Pfeuffer
2019-06-03 15:24:19 +02:00
parent 0be816dd28
commit 7c50ad07ec
32 changed files with 143 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
scm-webapp/src/main/java/sonia/scm/group/update/XmlGroupV1UpdateStep.java → scm-webapp/src/main/java/sonia/scm/update/group/XmlGroupV1UpdateStep.java
View File

@@ -1,4 +1,4 @@
package sonia.scm.group.update;
package sonia.scm.update.group;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -11,6 +11,7 @@ import sonia.scm.plugin.Extension;
import sonia.scm.store.ConfigurationEntryStore;
import sonia.scm.store.ConfigurationEntryStoreFactory;
import sonia.scm.store.StoreConstants;
import sonia.scm.update.properties.V1Properties;
import sonia.scm.version.Version;
import javax.inject.Inject;
@@ -25,7 +26,6 @@ import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import static java.util.Optional.empty;
@@ -140,19 +140,6 @@ public class XmlGroupV1UpdateStep implements UpdateStep {
}
}
@XmlAccessorType(XmlAccessType.FIELD)
private static class V1Property {
private String key;
private String value;
}
@XmlAccessorType(XmlAccessType.FIELD)
@XmlRootElement(name = "properties")
private static class V1Properties {
@XmlElement(name = "item")
private List<V1Property> properties;
}
private static class GroupList {
@XmlElement(name = "group")
private List<V1Group> groups;

14
scm-webapp/src/main/java/sonia/scm/update/properties/V1Properties.java Normal file
View File

@@ -0,0 +1,14 @@
package sonia.scm.update.properties;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import java.util.List;
@XmlAccessorType(XmlAccessType.FIELD)
@XmlRootElement(name = "properties")
public class V1Properties {
@XmlElement(name = "item")
private List<V1Property> properties;
}

10
scm-webapp/src/main/java/sonia/scm/update/properties/V1Property.java Normal file
View File

@@ -0,0 +1,10 @@
package sonia.scm.update.properties;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
@XmlAccessorType(XmlAccessType.FIELD)
public class V1Property {
private String key;
private String value;
}

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

@@ -1,4 +1,4 @@
package sonia.scm.repository.update;
package sonia.scm.update.repository;
import sonia.scm.SCMContextProvider;
import sonia.scm.migration.UpdateException;

2
scm-webapp/src/main/java/sonia/scm/repository/update/CopyMigrationStrategy.java → scm-webapp/src/main/java/sonia/scm/update/repository/CopyMigrationStrategy.java
View File

@@ -1,4 +1,4 @@
package sonia.scm.repository.update;
package sonia.scm.update.repository;
import sonia.scm.SCMContextProvider;
import sonia.scm.repository.RepositoryDirectoryHandler;

2
scm-webapp/src/main/java/sonia/scm/repository/update/InlineMigrationStrategy.java → scm-webapp/src/main/java/sonia/scm/update/repository/InlineMigrationStrategy.java
View File

@@ -1,4 +1,4 @@
package sonia.scm.repository.update;
package sonia.scm.update.repository;
import sonia.scm.SCMContextProvider;
import sonia.scm.repository.RepositoryDirectoryHandler;

2
scm-webapp/src/main/java/sonia/scm/repository/update/MigrationStrategy.java → scm-webapp/src/main/java/sonia/scm/update/repository/MigrationStrategy.java
View File

@@ -1,4 +1,4 @@
package sonia.scm.repository.update;
package sonia.scm.update.repository;
import com.google.inject.Injector;

2
scm-webapp/src/main/java/sonia/scm/repository/update/MigrationStrategyDao.java → scm-webapp/src/main/java/sonia/scm/update/repository/MigrationStrategyDao.java
View File

@@ -1,4 +1,4 @@
package sonia.scm.repository.update;
package sonia.scm.update.repository;
import sonia.scm.store.ConfigurationStore;
import sonia.scm.store.ConfigurationStoreFactory;

2
scm-webapp/src/main/java/sonia/scm/repository/update/MoveMigrationStrategy.java → scm-webapp/src/main/java/sonia/scm/update/repository/MoveMigrationStrategy.java
View File

@@ -1,4 +1,4 @@
package sonia.scm.repository.update;
package sonia.scm.update.repository;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

2
scm-webapp/src/main/java/sonia/scm/repository/update/RepositoryMigrationPlan.java → scm-webapp/src/main/java/sonia/scm/update/repository/RepositoryMigrationPlan.java
View File

@@ -1,4 +1,4 @@
package sonia.scm.repository.update;
package sonia.scm.update.repository;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;

2
scm-webapp/src/main/java/sonia/scm/repository/update/XmlRepositoryFileNameUpdateStep.java → scm-webapp/src/main/java/sonia/scm/update/repository/XmlRepositoryFileNameUpdateStep.java
View File

@@ -1,4 +1,4 @@
package sonia.scm.repository.update;
package sonia.scm.update.repository;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

16
scm-webapp/src/main/java/sonia/scm/repository/update/XmlRepositoryV1UpdateStep.java → scm-webapp/src/main/java/sonia/scm/update/repository/XmlRepositoryV1UpdateStep.java
View File

@@ -1,4 +1,4 @@
package sonia.scm.repository.update;
package sonia.scm.update.repository;
import com.google.inject.Injector;
import org.slf4j.Logger;
@@ -13,6 +13,7 @@ import sonia.scm.repository.xml.XmlRepositoryDAO;
import sonia.scm.store.ConfigurationEntryStore;
import sonia.scm.store.ConfigurationEntryStoreFactory;
import sonia.scm.store.StoreConstants;
import sonia.scm.update.properties.V1Properties;
import sonia.scm.version.Version;
import javax.inject.Inject;
@@ -199,19 +200,6 @@ public class XmlRepositoryV1UpdateStep implements UpdateStep {
private String type;
}
@XmlAccessorType(XmlAccessType.FIELD)
private static class V1Property {
private String key;
private String value;
}
@XmlAccessorType(XmlAccessType.FIELD)
@XmlRootElement(name = "properties")
private static class V1Properties {
@XmlElement(name = "item")
private List<V1Property> properties;
}
@XmlAccessorType(XmlAccessType.FIELD)
@XmlRootElement(name = "repositories")
private static class V1Repository {

2
scm-webapp/src/main/java/sonia/scm/security/update/XmlSecurityV1UpdateStep.java → scm-webapp/src/main/java/sonia/scm/update/security/XmlSecurityV1UpdateStep.java
View File

@@ -1,4 +1,4 @@
package sonia.scm.security.update;
package sonia.scm.update.security;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

16
scm-webapp/src/main/java/sonia/scm/user/update/XmlUserV1UpdateStep.java → scm-webapp/src/main/java/sonia/scm/update/user/XmlUserV1UpdateStep.java
View File

@@ -1,4 +1,4 @@
package sonia.scm.user.update;
package sonia.scm.update.user;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -10,6 +10,7 @@ import sonia.scm.security.AssignedPermission;
import sonia.scm.store.ConfigurationEntryStore;
import sonia.scm.store.ConfigurationEntryStoreFactory;
import sonia.scm.store.StoreConstants;
import sonia.scm.update.properties.V1Properties;
import sonia.scm.user.User;
import sonia.scm.user.xml.XmlUserDAO;
import sonia.scm.version.Version;
@@ -125,19 +126,6 @@ public class XmlUserV1UpdateStep implements UpdateStep {
return new File(contextProvider.getBaseDirectory(), StoreConstants.CONFIG_DIRECTORY_NAME).toPath();
}
@XmlAccessorType(XmlAccessType.FIELD)
private static class V1Property {
private String key;
private String value;
}
@XmlAccessorType(XmlAccessType.FIELD)
@XmlRootElement(name = "properties")
private static class V1Properties {
@XmlElement(name = "item")
private List<V1Property> properties;
}
@XmlAccessorType(XmlAccessType.FIELD)
@XmlRootElement(name = "user")
private static class V1User {