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

Fix context

Browse Source
This commit is contained in:
René Pfeuffer
2019-06-13 06:41:46 +02:00
parent 4991c2ad31
commit a14a2060b6
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
scm-webapp/src/main/java/sonia/scm/update/repository/MigrateVerbsToPermissionRoles.java
View File

@@ -36,13 +36,15 @@ public class MigrateVerbsToPermissionRoles implements UpdateStep {
private final SingleRepositoryUpdateProcessor updateProcessor;
private final SystemRepositoryPermissionProvider systemRepositoryPermissionProvider;
private final JAXBContext jaxbContext;
private final JAXBContext jaxbContextNewRepository;
private final JAXBContext jaxbContextOldRepository;
@Inject
public MigrateVerbsToPermissionRoles(SingleRepositoryUpdateProcessor updateProcessor, SystemRepositoryPermissionProvider systemRepositoryPermissionProvider) {
this.updateProcessor = updateProcessor;
this.systemRepositoryPermissionProvider = systemRepositoryPermissionProvider;
jaxbContext = createJAXBContext();
jaxbContextNewRepository = createJAXBContext(Repository.class);
jaxbContextOldRepository = createJAXBContext(OldRepository.class);
}
@Override
@@ -59,7 +61,7 @@ public class MigrateVerbsToPermissionRoles implements UpdateStep {
private void writeNewRepository(Path path, Repository newRepository) {
try {
Marshaller marshaller = jaxbContext.createMarshaller();
Marshaller marshaller = jaxbContextNewRepository.createMarshaller();
marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, Boolean.TRUE);
marshaller.marshal(newRepository, path.resolve("metadata.xml").toFile());
} catch (JAXBException e) {
@@ -69,7 +71,7 @@ public class MigrateVerbsToPermissionRoles implements UpdateStep {
private OldRepository readOldRepository(Path path) {
try {
return (OldRepository) jaxbContext.createUnmarshaller().unmarshal(path.resolve("metadata.xml").toFile());
return (OldRepository) jaxbContextOldRepository.createUnmarshaller().unmarshal(path.resolve("metadata.xml").toFile());
} catch (JAXBException e) {
throw new UpdateException("could not read old repository structure", e);
}
@@ -115,9 +117,9 @@ public class MigrateVerbsToPermissionRoles implements UpdateStep {
return verbs.size() == r.getVerbs().size() && r.getVerbs().containsAll(verbs);
}
private JAXBContext createJAXBContext() {
private JAXBContext createJAXBContext(Class<?> clazz) {
try {
return JAXBContext.newInstance(Repository.class);
return JAXBContext.newInstance(clazz);
} catch (JAXBException e) {
throw new UpdateException("could not create XML marshaller", e);
}