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

Close file lists

Browse Source 
Though we could not reproduce an error even with real big file
structures (100 directories, containing each another 100 directories
with 100 files each), it may be safer to make sure the streams will
really be closed in the end and recommended in the javadoc description
for Files#list
(https://docs.oracle.com/javase/8/docs/api/java/nio/file/Files.html#list-java.nio.file.Path-)
This commit is contained in:
René Pfeuffer
2020-06-16 11:50:14 +02:00
parent b3040678c5
commit 7f3f47c4c8
5 changed files with 23 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -15,6 +15,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Fixes configuration of jetty listener address with system property `jetty.host` ([#1173](https://github.com/scm-manager/scm-manager/pull/1173), [#1174](https://github.com/scm-manager/scm-manager/pull/1174))
- Fixes loading plugin bundles with context path `/` ([#1182](https://github.com/scm-manager/scm-manager/pull/1182/files), [#1181](https://github.com/scm-manager/scm-manager/issues/1181))
- Sets the new plugin center URL once ([#1184](https://github.com/scm-manager/scm-manager/pull/1184))
- Close file lists in migration ([#1191](https://github.com/scm-manager/scm-manager/pull/1191))
## [2.0.0] - 2020-06-04
### Added

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

@@ -31,6 +31,7 @@ import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.Arrays;
import java.util.function.Consumer;
import java.util.stream.Stream;
abstract class BaseMigrationStrategy implements MigrationStrategy.Instance {
@@ -50,9 +51,9 @@ abstract class BaseMigrationStrategy implements MigrationStrategy.Instance {
return contextProvider.getBaseDirectory().toPath().resolve("repositories").resolve(type);
}
Stream<Path> listSourceDirectory(Path sourceDirectory) {
try {
return Files.list(sourceDirectory);
void listSourceDirectory(Path sourceDirectory, Consumer<Stream<Path>> pathConsumer) {
try (Stream<Path> paths = Files.list(sourceDirectory)) {
pathConsumer.accept(paths);
} catch (IOException e) {
throw new UpdateException("could not read original directory", e);
}

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

@@ -62,15 +62,17 @@ class CopyMigrationStrategy extends BaseMigrationStrategy {
private void copyData(Path sourceDirectory, Path targetDirectory) {
createDataDirectory(targetDirectory);
listSourceDirectory(sourceDirectory).forEach(
listSourceDirectory(sourceDirectory, paths -> paths.forEach(
sourceFile -> {
Path targetFile = targetDirectory.resolve(sourceFile.getFileName());
if (Files.isDirectory(sourceFile)) {
LOG.trace("traversing down into sub directory {}", sourceFile);
copyData(sourceFile, targetFile);
} else {
LOG.trace("copying file {} to {}", sourceFile, targetFile);
copyFile(sourceFile, targetFile);
}
}
);
));
}
}

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

@@ -67,20 +67,23 @@ class InlineMigrationStrategy extends BaseMigrationStrategy {
private void moveData(Path sourceDirectory, Path targetDirectory, boolean deleteDirectory) {
createDataDirectory(targetDirectory);
listSourceDirectory(sourceDirectory)
listSourceDirectory(sourceDirectory, paths -> paths
.filter(sourceFile -> !targetDirectory.equals(sourceFile))
.forEach(
sourceFile -> {
Path targetFile = targetDirectory.resolve(sourceFile.getFileName());
if (Files.isDirectory(sourceFile)) {
LOG.trace("traversing down into sub directory {}", sourceFile);
moveData(sourceFile, targetFile, true);
} else {
LOG.trace("moving file {} to {}", sourceFile, targetFile);
moveFile(sourceFile, targetFile);
}
}
);
));
if (deleteDirectory) {
try {
LOG.trace("deleting source directory {}", sourceDirectory);
Files.delete(sourceDirectory);
} catch (IOException e) {
LOG.warn("could not delete source repository directory {}", sourceDirectory);

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

@@ -83,17 +83,20 @@ class MoveMigrationStrategy extends BaseMigrationStrategy {
private void moveData(Path sourceDirectory, Path targetDirectory) {
createDataDirectory(targetDirectory);
listSourceDirectory(sourceDirectory).forEach(
listSourceDirectory(sourceDirectory, paths -> paths.forEach(
sourceFile -> {
Path targetFile = targetDirectory.resolve(sourceFile.getFileName());
if (Files.isDirectory(sourceFile)) {
LOG.trace("traversing down into sub directory {}", sourceFile);
moveData(sourceFile, targetFile);
} else {
LOG.trace("moving file {} to {}", sourceFile, targetFile);
moveFile(sourceFile, targetFile);
}
}
);
));
try {
LOG.trace("deleting source directory {}", sourceDirectory);
Files.delete(sourceDirectory);
} catch (IOException e) {
LOG.warn("could not delete source repository directory {}", sourceDirectory);