Skip to content

Commit 377df56

Browse files
committed
Revert change that didn't improve code quality that much
1 parent 1e9c9ca commit 377df56

File tree

1 file changed

+8
-11
lines changed

1 file changed

+8
-11
lines changed

src/main/java/engineering/swat/watch/Watcher.java

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -158,36 +158,33 @@ public ActiveWatch start() throws IOException {
158158
throw new IllegalStateException("There is no onEvent handler defined");
159159
}
160160

161-
JDKBaseWatch result;
162-
163161
switch (scope) {
164162
case PATH_AND_CHILDREN: {
165-
result = new JDKDirectoryWatch(path, executor, eventHandler, false);
163+
var result = new JDKDirectoryWatch(path, executor, eventHandler, false);
166164
result.start();
167-
break;
165+
return result;
168166
}
169167
case PATH_AND_ALL_DESCENDANTS: {
170168
try {
171-
result = new JDKDirectoryWatch(path, executor, eventHandler, true);
169+
var result = new JDKDirectoryWatch(path, executor, eventHandler, true);
172170
result.start();
171+
return result;
173172
} catch (Throwable ex) {
174173
// no native support, use the simulation
175174
logger.debug("Not possible to register the native watcher, using fallback for {}", path);
176175
logger.trace(ex);
177-
result = new JDKRecursiveDirectoryWatch(path, executor, eventHandler);
176+
var result = new JDKRecursiveDirectoryWatch(path, executor, eventHandler);
178177
result.start();
178+
return result;
179179
}
180-
break;
181180
}
182181
case PATH_ONLY: {
183-
result = new JDKFileWatch(path, executor, eventHandler);
182+
var result = new JDKFileWatch(path, executor, eventHandler);
184183
result.start();
185-
break;
184+
return result;
186185
}
187186
default:
188187
throw new IllegalStateException("Not supported yet");
189188
}
190-
191-
return result;
192189
}
193190
}

0 commit comments

Comments
 (0)