Skip to content

Commit 3691c6b

Browse files
committed
rename eventConsumer variables in CryptoFileSystemProperties
1 parent 30ee882 commit 3691c6b

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

src/main/java/org/cryptomator/cryptofs/CryptoFileSystemProperties.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,9 @@ public class CryptoFileSystemProperties extends AbstractMap<String, Object> {
8686
*
8787
* @since 2.9.0
8888
*/
89-
public static final String PROPERTY_NOTIFY_METHOD = "notificationConsumer";
89+
public static final String PROPERTY_EVENT_CONSUMER = "notificationConsumer";
9090

91-
static final Consumer<FilesystemEvent> DEFAULT_NOTIFY_METHOD = (FilesystemEvent e) -> {};
91+
static final Consumer<FilesystemEvent> DEFAULT_EVENT_CONSUMER = ignored -> {};
9292

9393
/**
9494
* Key identifying the filesystem flags.
@@ -123,7 +123,7 @@ private CryptoFileSystemProperties(Builder builder) {
123123
Map.entry(PROPERTY_FILESYSTEM_FLAGS, builder.flags), //
124124
Map.entry(PROPERTY_VAULTCONFIG_FILENAME, builder.vaultConfigFilename), //
125125
Map.entry(PROPERTY_MASTERKEY_FILENAME, builder.masterkeyFilename), //
126-
Map.entry(PROPERTY_NOTIFY_METHOD, builder.eventConsumer), //
126+
Map.entry(PROPERTY_EVENT_CONSUMER, builder.eventConsumer), //
127127
Map.entry(PROPERTY_MAX_CLEARTEXT_NAME_LENGTH, builder.maxCleartextNameLength), //
128128
Map.entry(PROPERTY_SHORTENING_THRESHOLD, builder.shorteningThreshold), //
129129
Map.entry(PROPERTY_CIPHER_COMBO, builder.cipherCombo) //
@@ -165,7 +165,7 @@ int shorteningThreshold() {
165165
}
166166

167167
Consumer<FilesystemEvent> fsEventConsumner() {
168-
return (Consumer<FilesystemEvent>) get(PROPERTY_NOTIFY_METHOD);
168+
return (Consumer<FilesystemEvent>) get(PROPERTY_EVENT_CONSUMER);
169169
}
170170

171171
@Override
@@ -223,7 +223,7 @@ public static class Builder {
223223
private String masterkeyFilename = DEFAULT_MASTERKEY_FILENAME;
224224
private int maxCleartextNameLength = DEFAULT_MAX_CLEARTEXT_NAME_LENGTH;
225225
private int shorteningThreshold = DEFAULT_SHORTENING_THRESHOLD;
226-
private Consumer<FilesystemEvent> eventConsumer = DEFAULT_NOTIFY_METHOD;
226+
private Consumer<FilesystemEvent> eventConsumer = DEFAULT_EVENT_CONSUMER;
227227

228228
private Builder() {
229229
}
@@ -236,7 +236,7 @@ private Builder(Map<String, ?> properties) {
236236
checkedSet(Integer.class, PROPERTY_MAX_CLEARTEXT_NAME_LENGTH, properties, this::withMaxCleartextNameLength);
237237
checkedSet(Integer.class, PROPERTY_SHORTENING_THRESHOLD, properties, this::withShorteningThreshold);
238238
checkedSet(CryptorProvider.Scheme.class, PROPERTY_CIPHER_COMBO, properties, this::withCipherCombo);
239-
checkedSet(Consumer.class, PROPERTY_NOTIFY_METHOD, properties, this::withFilesystemEventConsumer);
239+
checkedSet(Consumer.class, PROPERTY_EVENT_CONSUMER, properties, this::withFilesystemEventConsumer);
240240
}
241241

242242
private <T> void checkedSet(Class<T> type, String key, Map<String, ?> properties, Consumer<T> setter) {

src/test/java/org/cryptomator/cryptofs/CryptoFileSystemPropertiesTest.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public void testSetMasterkeyFilenameAndReadonlyFlag() {
5252
anEntry(PROPERTY_SHORTENING_THRESHOLD, DEFAULT_SHORTENING_THRESHOLD), //
5353
anEntry(PROPERTY_CIPHER_COMBO, DEFAULT_CIPHER_COMBO), //
5454
anEntry(PROPERTY_FILESYSTEM_FLAGS, EnumSet.of(FileSystemFlags.READONLY)), //
55-
anEntry(PROPERTY_NOTIFY_METHOD, DEFAULT_NOTIFY_METHOD)));
55+
anEntry(PROPERTY_EVENT_CONSUMER, DEFAULT_EVENT_CONSUMER)));
5656
}
5757

5858
@Test
@@ -79,7 +79,7 @@ public void testFromMap() {
7979
anEntry(PROPERTY_SHORTENING_THRESHOLD, 221), //
8080
anEntry(PROPERTY_CIPHER_COMBO, DEFAULT_CIPHER_COMBO), //
8181
anEntry(PROPERTY_FILESYSTEM_FLAGS, EnumSet.of(FileSystemFlags.READONLY)), //
82-
anEntry(PROPERTY_NOTIFY_METHOD, DEFAULT_NOTIFY_METHOD)));
82+
anEntry(PROPERTY_EVENT_CONSUMER, DEFAULT_EVENT_CONSUMER)));
8383
}
8484

8585
@Test
@@ -102,7 +102,7 @@ public void testWrapMapWithTrueReadonly() {
102102
anEntry(PROPERTY_SHORTENING_THRESHOLD, DEFAULT_SHORTENING_THRESHOLD), //
103103
anEntry(PROPERTY_CIPHER_COMBO, DEFAULT_CIPHER_COMBO), //
104104
anEntry(PROPERTY_FILESYSTEM_FLAGS, EnumSet.of(FileSystemFlags.READONLY)), //
105-
anEntry(PROPERTY_NOTIFY_METHOD, DEFAULT_NOTIFY_METHOD)));
105+
anEntry(PROPERTY_EVENT_CONSUMER, DEFAULT_EVENT_CONSUMER)));
106106
}
107107

108108
@Test
@@ -125,7 +125,7 @@ public void testWrapMapWithFalseReadonly() {
125125
anEntry(PROPERTY_SHORTENING_THRESHOLD, DEFAULT_SHORTENING_THRESHOLD), //
126126
anEntry(PROPERTY_CIPHER_COMBO, DEFAULT_CIPHER_COMBO), //
127127
anEntry(PROPERTY_FILESYSTEM_FLAGS, EnumSet.noneOf(FileSystemFlags.class)), //
128-
anEntry(PROPERTY_NOTIFY_METHOD, DEFAULT_NOTIFY_METHOD)));
128+
anEntry(PROPERTY_EVENT_CONSUMER, DEFAULT_EVENT_CONSUMER)));
129129
}
130130

131131
@Test
@@ -178,7 +178,7 @@ public void testWrapMapWithoutReadonly() {
178178
anEntry(PROPERTY_SHORTENING_THRESHOLD, DEFAULT_SHORTENING_THRESHOLD), //
179179
anEntry(PROPERTY_CIPHER_COMBO, DEFAULT_CIPHER_COMBO), //
180180
anEntry(PROPERTY_FILESYSTEM_FLAGS, EnumSet.noneOf(FileSystemFlags.class)), //
181-
anEntry(PROPERTY_NOTIFY_METHOD, DEFAULT_NOTIFY_METHOD)));
181+
anEntry(PROPERTY_EVENT_CONSUMER, DEFAULT_EVENT_CONSUMER)));
182182
}
183183

184184
@Test

0 commit comments

Comments
 (0)