mirrors/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-05-14 08:41:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

apply suggestions from AI review

Browse Source
This commit is contained in:
Armin Schrenk
2026-01-14 17:53:07 +01:00
parent 61be8c449c
commit f620c6685a
3 changed files with 15 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/main/java/org/cryptomator/launcher/AdminPropertiesSetter.java
View File

@@ -18,16 +18,16 @@ import java.util.Set;
/**
* Class to overwrite system properties with an external properties file
* <p>
* To overwrite system properties, the method {@link #adjustSystemProperties()} loads the JSON file {@value CONFIG_NAME} from an OS-dependent location and add all supported properties to the {@link System} properties.
* The predefined location are:
* <ul>
* <li>Linux - {@value LINUX_DIR }</li>
* <li>macOS - {@value MAC_DIR }</li>
* <li>Windows - {@value WIN_DIR }</li>
* </ul>
* To overwrite system properties, the method {@link #adjustSystemProperties()} loads the JSON file {@value CONFIG_NAME} from an OS-dependent location and adds all whitelisted properties to the {@link System} properties.
* The predefined locations are:
* <ul>
* <li>Linux - {@value LINUX_DIR }</li>
* <li>macOS - {@value MAC_DIR }</li>
* <li>Windows - {@value WIN_DIR }</li>
* </ul>
* </p>
* <p>
* Supported properties for override are:
* The overridable properties are:
* <ul>
* <li>cryptomator.logDir</li>
* <li>cryptomator.pluginDir</li>
@@ -71,8 +71,8 @@ class AdminPropertiesSetter {
/**
* Adjusts the system properties by loading administrative properties from a predefined file location.
* <p>
* If the file exists and is a valid properties file, its content will overwrite existing system properties.
* Only some properties are supported, see {@link AdminPropertiesSetter}
* If the file exists and is a valid JSON file, its content will overwrite existing system properties.
* Only some properties can be overridden, see {@link AdminPropertiesSetter}
*
* @return The adjusted system properties.
*/
@@ -100,7 +100,7 @@ class AdminPropertiesSetter {
}
} catch (NoSuchFileException _) {
//NO-OP
log("No admin properties found at {}.", List.of(adminPropertiesPath));
log("No admin properties found at {}.", List.of(adminPropertiesPath));
} catch (IOException | RuntimeException e) {
log("Failed to read administrative properties from {}. Returning empty properties.", List.of(adminPropertiesPath, e));
}

10
src/main/java/org/cryptomator/launcher/BufferedLog.java
View File

@@ -14,15 +14,11 @@ class BufferedLog {
record Entry(String className, String message, List<Object> messageInput) {}
static void log(String className, String message, List<Object> messageInput) {
add(new BufferedLog.Entry(className, message, messageInput));
synchronized static void log(String className, String message, List<Object> messageInput) {
logMessages.add(new BufferedLog.Entry(className, message, messageInput));
}
synchronized static void add(Entry e) {
logMessages.add(e);
}
synchronized static void flush(Logger log) {
synchronized static void flushTo(Logger log) {
logMessages.forEach(e -> {
var message = "PRE LOG INIT Event in %s: %s".formatted(e.className, e.message);
log.info(message, e.messageInput.toArray());

2
src/main/java/org/cryptomator/launcher/Cryptomator.java
View File

@@ -65,7 +65,7 @@ public class Cryptomator {
}
public static void main(String[] args) {
BufferedLog.flush(LOG);
BufferedLog.flushTo(LOG);
var printVersion = Optional.ofNullable(args) //
.stream() //Streams either one element (the args-array) or zero elements
.flatMap(Arrays::stream) //