mirrors/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-10-01 12:15:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Code simplification

Browse Source
This commit is contained in:
Sebastian Stenzel
2016-02-15 22:34:11 +01:00
parent 2725b6b920
commit c41225eab6
5 changed files with 166 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
main/filesystem-crypto/src/main/java/org/cryptomator/filesystem/crypto/CryptoFolder.java
+4 -20
View File
@@ -71,21 +71,9 @@ class CryptoFolder extends CryptoNode implements Folder {
}
protected Optional<String> getDirectoryId() {
if (directoryId.get() != null) {
return Optional.of(directoryId.get());
}
if (physicalFile().isPresent()) {
File dirFile = physicalFile().get();
if (dirFile.exists()) {
try (Reader reader = Channels.newReader(dirFile.openReadable(), UTF_8.newDecoder(), -1)) {
directoryId.set(IOUtils.toString(reader));
return Optional.of(directoryId.get());
} catch (IOException e) {
throw new UncheckedIOException(e);
}
}
}
return Optional.empty();
return Optional.ofNullable(LazyInitializer.initializeLazily(directoryId, () -> {
return physicalFile().filter(File::exists).map(FileContents.UTF_8::readContents).orElse(null);
}));
}
@Override
@@ -156,11 +144,7 @@ class CryptoFolder extends CryptoNode implements Folder {
if (parent.file(name).exists()) {
throw new UncheckedIOException(new FileAlreadyExistsException(toString()));
}
try (Writer writer = Channels.newWriter(dirFile.openWritable(), UTF_8.newEncoder(), -1)) {
writer.write(directoryId.get());
} catch (IOException e) {
throw new UncheckedIOException(e);
}
FileContents.UTF_8.writeContents(dirFile, directoryId.get());
dir.create();
}