dbalek commented on code in PR #4203:
URL: https://github.com/apache/netbeans/pull/4203#discussion_r899995787
##########
java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/input/LspInputServiceImpl.java:
##########
@@ -32,32 +32,42 @@
@JsonSegment("input")
public class LspInputServiceImpl implements InputService {
- private final Map<String, Function<InputCallbackParams,
CompletableFuture<Either<QuickPickStep, InputBoxStep>>>> stepCallbacks = new
HashMap<>();
- private final Map<String, Function<InputCallbackParams,
CompletableFuture<String>>> validateCallbacks = new HashMap<>();
+ private final RegistryImpl registry = new RegistryImpl();
- public String registerInput(Function<InputCallbackParams,
CompletableFuture<Either<QuickPickStep, InputBoxStep>>> stepCallback,
Function<InputCallbackParams, CompletableFuture<String>> validateCallback) {
- String id = "ID:" + System.identityHashCode(stepCallback);
- stepCallbacks.put(id, stepCallback);
- if (validateCallback != null) {
- validateCallbacks.put(id, validateCallback);
+ @Override
+ public CompletableFuture<Either<QuickPickStep, InputBoxStep>>
step(InputCallbackParams params) {
+ Callback callback = registry.callbacks.get(params.getInputId());
+ if (callback == null) {
+ return CompletableFuture.completedFuture(null);
}
- return id;
+ return callback.step(params).handle((step, ex) -> {
+ if (ex != null || step == null) {
+ registry.callbacks.remove(params.getInputId());
+ }
+ return step;
+ });
}
- public void unregisterInput(String inputId) {
- stepCallbacks.remove(inputId);
- validateCallbacks.remove(inputId);
+ @Override
+ public CompletableFuture<String> validate(InputCallbackParams params) {
+ Callback callback = registry.callbacks.get(params.getInputId());
+ return callback != null ? callback.validate(params) :
CompletableFuture.completedFuture(null);
}
- @Override
- public CompletableFuture<Either<QuickPickStep, InputBoxStep>>
step(InputCallbackParams params) {
- Function<InputCallbackParams, CompletableFuture<Either<QuickPickStep,
InputBoxStep>>> callback = stepCallbacks.get(params.getInputId());
- return callback != null ? callback.apply(params) :
CompletableFuture.completedFuture(null);
+ public Registry getRegistry() {
+ return registry;
}
- @Override
- public CompletableFuture<String> validate(InputCallbackParams params) {
- Function<InputCallbackParams, CompletableFuture<String>> callback =
validateCallbacks.get(params.getInputId());
- return callback != null ? callback.apply(params) :
CompletableFuture.completedFuture(null);
+ private static class RegistryImpl implements Registry {
+
+ private final Map<String, Callback> callbacks = new HashMap<>();
+ private final AtomicInteger cnt = new AtomicInteger();
+
+ @Override
+ public String registerInput(Callback callback) {
+ String id = "ID:" + cnt.incrementAndGet();
+ callbacks.put(id, callback);
Review Comment:
Fixed. `ConcurrentHashMap` used.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
