Renamings

Author: artem-v

services-discovery/src/main/java/io/scalecube/services/discovery/ScalecubeServiceDiscovery.java

@@ -37,7 +37,6 @@
 import reactor.core.publisher.Mono;
 import reactor.core.publisher.SignalType;
 import reactor.core.publisher.Sinks;
-import reactor.core.publisher.Sinks.EmitFailureHandler;
 import reactor.core.publisher.Sinks.EmitResult;
 
 public final class ScalecubeServiceDiscovery implements ServiceDiscovery {
@@ -173,13 +172,13 @@ public Mono<Void> shutdown() {
     return Mono.defer(
         () -> {
           if (cluster == null) {
-            sink.emitComplete(RetryEmitFailureHandler.INSTANCE);
+            sink.emitComplete(EmitFailureHandler.RETRY_NOT_SERIALIZED);
             return Mono.empty();
           }
           cluster.shutdown();
           return cluster
               .onShutdown()
-              .doFinally(s -> sink.emitComplete(RetryEmitFailureHandler.INSTANCE));
+              .doFinally(s -> sink.emitComplete(EmitFailureHandler.RETRY_NOT_SERIALIZED));
         });
   }
 
@@ -196,7 +195,7 @@ private void onMembershipEvent(MembershipEvent membershipEvent) {
 
     if (discoveryEvent != null) {
       LOGGER.debug("Publish discoveryEvent: {}", discoveryEvent);
-      sink.emitNext(discoveryEvent, RetryEmitFailureHandler.INSTANCE);
+      sink.emitNext(discoveryEvent, EmitFailureHandler.RETRY_NOT_SERIALIZED);
     }
   }
 
@@ -290,9 +289,9 @@ private void onDiscoveryEvent(ServiceDiscoveryEvent event) {
     }
   }
 
-  private static class RetryEmitFailureHandler implements EmitFailureHandler {
+  private static class EmitFailureHandler implements Sinks.EmitFailureHandler {
 
-    private static final RetryEmitFailureHandler INSTANCE = new RetryEmitFailureHandler();
+    private static final EmitFailureHandler RETRY_NOT_SERIALIZED = new EmitFailureHandler();
 
     @Override
     public boolean onEmitFailure(SignalType signalType, EmitResult emitResult) {

services/src/main/java/io/scalecube/services/Microservices.java

@@ -61,7 +61,6 @@
 import reactor.core.publisher.Mono;
 import reactor.core.publisher.SignalType;
 import reactor.core.publisher.Sinks;
-import reactor.core.publisher.Sinks.EmitFailureHandler;
 import reactor.core.publisher.Sinks.EmitResult;
 import reactor.core.scheduler.Scheduler;
 import reactor.core.scheduler.Schedulers;
@@ -172,7 +171,7 @@ private Microservices(Builder builder) {
     shutdown
         .asMono()
         .then(doShutdown())
-        .doFinally(s -> onShutdown.emitEmpty(RetryEmitFailureHandler.INSTANCE))
+        .doFinally(s -> onShutdown.emitEmpty(EmitFailureHandler.RETRY_NOT_SERIALIZED))
         .subscribe(
             null, ex -> LOGGER.warn("[{}][doShutdown] Exception occurred: {}", id, ex.toString()));
   }
@@ -351,7 +350,7 @@ public Flux<ServiceDiscoveryEvent> listenDiscovery() {
   public Mono<Void> shutdown() {
     return Mono.defer(
         () -> {
-          shutdown.emitEmpty(RetryEmitFailureHandler.INSTANCE);
+          shutdown.emitEmpty(EmitFailureHandler.RETRY_NOT_SERIALIZED);
           return onShutdown.asMono();
         });
   }
@@ -650,7 +649,7 @@ private Mono<? extends Void> start0(String id, ServiceDiscovery discovery) {
               .subscribeOn(scheduler)
               .publishOn(scheduler)
               .doOnNext(event -> onDiscoveryEvent(microservices, event))
-              .doOnNext(event -> sink.emitNext(event, RetryEmitFailureHandler.INSTANCE))
+              .doOnNext(event -> sink.emitNext(event, EmitFailureHandler.RETRY_NOT_SERIALIZED))
               .subscribe());
 
       return Mono.deferContextual(context -> discovery.start())
@@ -674,7 +673,7 @@ public Mono<Void> shutdown() {
       return Mono.defer(
           () -> {
             disposables.dispose();
-            sink.emitComplete(RetryEmitFailureHandler.INSTANCE);
+            sink.emitComplete(EmitFailureHandler.RETRY_NOT_SERIALIZED);
             return Mono.whenDelayError(
                     discoveryInstances.values().stream()
                         .map(ServiceDiscovery::shutdown)
@@ -911,9 +910,9 @@ private static String asString(ServiceInfo serviceInfo) {
     }
   }
 
-  private static class RetryEmitFailureHandler implements EmitFailureHandler {
+  private static class EmitFailureHandler implements Sinks.EmitFailureHandler {
 
-    private static final RetryEmitFailureHandler INSTANCE = new RetryEmitFailureHandler();
+    private static final EmitFailureHandler RETRY_NOT_SERIALIZED = new EmitFailureHandler();
 
     @Override
     public boolean onEmitFailure(SignalType signalType, EmitResult emitResult) {