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

Fix broken test and missing license headers

Browse Source
This commit is contained in:
Sebastian Sdorra
2020-08-07 10:52:20 +02:00
parent 49c980e9af
commit d66f0ef141
6 changed files with 83 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scm-webapp/src/main/java/sonia/scm/plugin/PluginProcessor.java
View File

@@ -105,6 +105,8 @@ public final class PluginProcessor
//~--- constructors ---------------------------------------------------------
private final SmpDescriptorExtractor extractor = new SmpDescriptorExtractor();
private ClassLoaderLifeCycle classLoaderLifeCycle;
/**
@@ -198,7 +200,7 @@ public final class PluginProcessor
Map<Path, InstalledPluginDescriptor> pending = new HashMap<>();
for (Path archive : archives) {
pending.put(archive, SmpDescriptorExtractor.extractPluginDescriptor(archive));
pending.put(archive, extractor.extractPluginDescriptor(archive));
}
PluginInstallationContext installationContext = PluginInstallationContext.fromDescriptors(

6
scm-webapp/src/main/java/sonia/scm/plugin/SmpDescriptorExtractor.java
View File

@@ -33,12 +33,12 @@ import java.nio.file.Path;
import java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream;
final class SmpDescriptorExtractor {
class SmpDescriptorExtractor {
private SmpDescriptorExtractor() {
public SmpDescriptorExtractor() {
}
static InstalledPluginDescriptor extractPluginDescriptor(Path file) throws IOException {
InstalledPluginDescriptor extractPluginDescriptor(Path file) throws IOException {
try (ZipInputStream zipInputStream = new ZipInputStream(Files.newInputStream(file), StandardCharsets.UTF_8)) {
ZipEntry nextEntry;
while ((nextEntry = zipInputStream.getNextEntry()) != null) {