Rename JerseySink to JerseyFlowSubscriber

Signed-off-by: Daniel Kec <[email protected]>
eclipse-ee4j · Jun 11, 2020 · cb3d761 · cb3d761
1 parent 89a3926
commit cb3d761
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 13 deletions.
diff --git a/...sh/jersey/internal/jsr166/JerseySink.java → ...internal/jsr166/JerseyFlowSubscriber.java b/...sh/jersey/internal/jsr166/JerseySink.java → ...internal/jsr166/JerseyFlowSubscriber.java
@@ -16,7 +16,7 @@
 
 package org.glassfish.jersey.internal.jsr166;
 
-public interface JerseySink<T> extends Flow.Subscriber<T>, java.util.concurrent.Flow.Subscriber<T> {
+public interface JerseyFlowSubscriber<T> extends Flow.Subscriber<T>, java.util.concurrent.Flow.Subscriber<T> {
     @Override
     default void onSubscribe(java.util.concurrent.Flow.Subscription subscription) {
         this.onSubscribe(new Flow.Subscription() {

diff --git a/...sh/jersey/internal/jsr166/JerseySink.java → ...internal/jsr166/JerseyFlowSubscriber.java b/...sh/jersey/internal/jsr166/JerseySink.java → ...internal/jsr166/JerseyFlowSubscriber.java
@@ -16,7 +16,7 @@
 
 package org.glassfish.jersey.internal.jsr166;
 
-public interface JerseySink<T> extends Flow.Subscriber<T> {
+public interface JerseyFlowSubscriber<T> extends Flow.Subscriber<T> {
     static boolean isSubscriber(Class<?> clazz) {
         return org.glassfish.jersey.internal.jsr166.Flow.Subscriber.class.equals(clazz);
     }

diff --git a/core-server/src/main/java/org/glassfish/jersey/server/model/IntrospectionModeller.java b/core-server/src/main/java/org/glassfish/jersey/server/model/IntrospectionModeller.java
@@ -43,7 +43,7 @@
 import javax.ws.rs.sse.SseEventSink;
 
 import org.glassfish.jersey.internal.Errors;
-import org.glassfish.jersey.internal.jsr166.JerseySink;
+import org.glassfish.jersey.internal.jsr166.JerseyFlowSubscriber;
 import org.glassfish.jersey.internal.util.Producer;
 import org.glassfish.jersey.internal.util.ReflectionHelper;
 import org.glassfish.jersey.internal.util.Tokenizer;
@@ -299,7 +299,7 @@ private static void introspectAsyncFeatures(AnnotatedMethod am, ResourceMethod.B
         }
 
         for (Class<?> paramType : am.getParameterTypes()) {
-            if (JerseySink.isSubscriber(paramType) || SseEventSink.class.equals(paramType)) {
+            if (JerseyFlowSubscriber.isSubscriber(paramType) || SseEventSink.class.equals(paramType)) {
                 resourceMethodBuilder.sse();
             }
         }

diff --git a/core-server/src/main/java/org/glassfish/jersey/server/model/ResourceMethodValidator.java b/core-server/src/main/java/org/glassfish/jersey/server/model/ResourceMethodValidator.java
@@ -40,7 +40,7 @@
 import javax.ws.rs.sse.SseEventSink;
 
 import org.glassfish.jersey.internal.Errors;
-import org.glassfish.jersey.internal.jsr166.JerseySink;
+import org.glassfish.jersey.internal.jsr166.JerseyFlowSubscriber;
 import org.glassfish.jersey.server.ContainerRequest;
 import org.glassfish.jersey.server.internal.LocalizationMessages;
 import org.glassfish.jersey.server.spi.internal.ParameterValueHelper;
@@ -86,7 +86,7 @@ private void checkMethod(ResourceMethod method) {
         if ("GET".equals(method.getHttpMethod())) {
             final long eventSinkCount = invocable.getParameters()
                     .stream()
-                    .filter(parameter -> JerseySink.isSubscriber(parameter.getRawType())
+                    .filter(parameter -> JerseyFlowSubscriber.isSubscriber(parameter.getRawType())
                             || SseEventSink.class.equals(parameter.getRawType()))
                     .count();
 
@@ -216,7 +216,7 @@ private void checkParameters(ResourceMethod method) {
 
     private boolean isSseInjected(final Invocable invocable) {
         return invocable.getParameters().stream()
-                .anyMatch(parameter -> JerseySink.isSubscriber(parameter.getRawType())
+                .anyMatch(parameter -> JerseyFlowSubscriber.isSubscriber(parameter.getRawType())
                         || SseEventSink.class.equals(parameter.getRawType()));
     }
 

diff --git a/...java/org/glassfish/jersey/server/model/internal/JavaResourceMethodDispatcherProvider.java b/...java/org/glassfish/jersey/server/model/internal/JavaResourceMethodDispatcherProvider.java
@@ -28,7 +28,7 @@
 import javax.ws.rs.core.Response;
 import javax.ws.rs.sse.SseEventSink;
 
-import org.glassfish.jersey.internal.jsr166.JerseySink;
+import org.glassfish.jersey.internal.jsr166.JerseyFlowSubscriber;
 import org.glassfish.jersey.server.ContainerRequest;
 import org.glassfish.jersey.server.internal.inject.ConfiguredValidator;
 import org.glassfish.jersey.server.model.Invocable;
@@ -77,7 +77,7 @@ public ResourceMethodDispatcher create(final Invocable resourceMethod,
             // return type is void
             int i = 0;
             for (final Parameter parameter : resourceMethod.getParameters()) {
-                if (JerseySink.isSubscriber(parameter.getRawType()) || SseEventSink.class.equals(parameter.getRawType())) {
+                if (JerseyFlowSubscriber.isSubscriber(parameter.getRawType()) || SseEventSink.class.equals(parameter.getRawType())) {
                     resourceMethodDispatcher =
                             new SseEventSinkInvoker(resourceMethod, invocationHandler, valueProviders, validator, i);
                     break;

diff --git a/media/sse/src/main/java/org/glassfish/jersey/media/sse/internal/JerseyEventSink.java b/media/sse/src/main/java/org/glassfish/jersey/media/sse/internal/JerseyEventSink.java
@@ -30,7 +30,7 @@
 import javax.inject.Provider;
 
 import org.glassfish.jersey.internal.jsr166.Flow;
-import org.glassfish.jersey.internal.jsr166.JerseySink;
+import org.glassfish.jersey.internal.jsr166.JerseyFlowSubscriber;
 import org.glassfish.jersey.media.sse.LocalizationMessages;
 import org.glassfish.jersey.media.sse.OutboundEvent;
 import org.glassfish.jersey.server.AsyncContext;
@@ -44,7 +44,7 @@
  * @author Adam Lindenthal]
  */
 class JerseyEventSink extends ChunkedOutput<OutboundSseEvent>
-        implements SseEventSink, Flushable, JerseySink<Object> {
+        implements SseEventSink, Flushable, JerseyFlowSubscriber<Object> {
 
     private static final Logger LOGGER = Logger.getLogger(JerseyEventSink.class.getName());
     private static final byte[] SSE_EVENT_DELIMITER = "\n".getBytes(Charset.forName("UTF-8"));

diff --git a/...src/main/java/org/glassfish/jersey/media/sse/internal/SseEventSinkValueParamProvider.java b/...src/main/java/org/glassfish/jersey/media/sse/internal/SseEventSinkValueParamProvider.java
@@ -24,7 +24,7 @@
 import javax.inject.Inject;
 import javax.inject.Provider;
 
-import org.glassfish.jersey.internal.jsr166.JerseySink;
+import org.glassfish.jersey.internal.jsr166.JerseyFlowSubscriber;
 import org.glassfish.jersey.server.AsyncContext;
 import org.glassfish.jersey.server.ContainerRequest;
 import org.glassfish.jersey.server.internal.inject.AbstractValueParamProvider;
@@ -60,7 +60,7 @@ protected Function<ContainerRequest, SseEventSink> createValueProvider(Parameter
         }
 
         final Class<?> rawParameterType = parameter.getRawType();
-        if ((JerseySink.isSubscriber(rawParameterType) || rawParameterType == SseEventSink.class)
+        if ((JerseyFlowSubscriber.isSubscriber(rawParameterType) || rawParameterType == SseEventSink.class)
                 && parameter.isAnnotationPresent(Context.class)) {
             return new SseEventSinkValueSupplier(asyncContextSupplier);
         }