From f9643b471bd90dcdf736bba702bf82eb3188ac71 Mon Sep 17 00:00:00 2001 From: Fabrizio Cucci Date: Fri, 22 Sep 2017 09:43:39 +0100 Subject: [PATCH 1/4] Fixed javadoc in ParamInjectionResolver --- .../jersey/server/internal/inject/ParamInjectionResolver.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core-server/src/main/java/org/glassfish/jersey/server/internal/inject/ParamInjectionResolver.java b/core-server/src/main/java/org/glassfish/jersey/server/internal/inject/ParamInjectionResolver.java index 412db2b490..31cc69150e 100644 --- a/core-server/src/main/java/org/glassfish/jersey/server/internal/inject/ParamInjectionResolver.java +++ b/core-server/src/main/java/org/glassfish/jersey/server/internal/inject/ParamInjectionResolver.java @@ -60,7 +60,7 @@ import org.glassfish.jersey.server.spi.internal.ValueParamProvider; /** - * Abstract base class for resolving JAX-RS {@code @XxxParam} injection. + * Generic class for resolving JAX-RS {@code @XxxParam} injection. * * @param supported parameter injection annotation. * @author Marek Potociar (marek.potociar at oracle.com) From 124f473203948ddb294227f9a4dc373f39ddf5a4 Mon Sep 17 00:00:00 2001 From: Fabrizio Cucci Date: Thu, 21 Sep 2017 15:27:15 +0100 Subject: [PATCH 2/4] Fixed javadoc and typo in CommonConfig Given the current implementation of `CommonConfig#getBinder` (which has been also pluralized in this commit), the `componentBag` instance field clearly contains also binders. --- .../org/glassfish/jersey/model/internal/CommonConfig.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core-common/src/main/java/org/glassfish/jersey/model/internal/CommonConfig.java b/core-common/src/main/java/org/glassfish/jersey/model/internal/CommonConfig.java index 34d3d31bdb..82bf7ed4cb 100644 --- a/core-common/src/main/java/org/glassfish/jersey/model/internal/CommonConfig.java +++ b/core-common/src/main/java/org/glassfish/jersey/model/internal/CommonConfig.java @@ -102,7 +102,7 @@ public class CommonConfig implements FeatureContext, ExtendedConfig { private final Map immutablePropertiesView; private final Collection immutablePropertyNames; /** - * Configured providers, does not include features and binders. + * Configured providers and binders, does not include features. */ private final ComponentBag componentBag; /** @@ -642,7 +642,7 @@ private Set configureBinders(InjectionManager injectionManager, Set allConfigured = Collections.newSetFromMap(new IdentityHashMap<>()); allConfigured.addAll(configured); - Collection binders = getBinder(configured); + Collection binders = getBinders(configured); if (!binders.isEmpty()) { injectionManager.register(CompositeBinder.wrap(binders)); allConfigured.addAll(binders); @@ -651,7 +651,7 @@ private Set configureBinders(InjectionManager injectionManager, Set getBinder(Set configured) { + private Collection getBinders(Set configured) { return componentBag.getInstances(ComponentBag.BINDERS_ONLY) .stream() .map(CAST_TO_BINDER) From 9066452ed2ba6446d0075bf23c278c60d7ac4f35 Mon Sep 17 00:00:00 2001 From: Fabrizio Cucci Date: Tue, 12 Sep 2017 20:12:44 +0100 Subject: [PATCH 3/4] Fixed typo in "Server-Sent Events (SSE) Support" chapter --- docs/src/main/docbook/sse.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/src/main/docbook/sse.xml b/docs/src/main/docbook/sse.xml index 50299f6408..f0ee66ffe9 100644 --- a/docs/src/main/docbook/sse.xml +++ b/docs/src/main/docbook/sse.xml @@ -228,7 +228,7 @@ public static class SseResource { The code above defines the resource deployed on URI "/events". This resource has a single @GET - resource method which returns void. This is an imported difference + resource method which returns void. This is an important difference against the original API. It is Jersey's responsibility to bind the injected SseEventSink to the output chain. From a45933df56b7173cef0294dddcec6af88a50b5c8 Mon Sep 17 00:00:00 2001 From: Fabrizio Cucci Date: Fri, 22 Jul 2016 09:32:47 +0100 Subject: [PATCH 4/4] Fixed documentation in "Filters and Interceptors" chapter The following corrections have been applied: - "The response can also be aborted..." has been replaced with "The request can also be aborted..."; - "abort" has been replaced with "abortWith". --- docs/src/main/docbook/filters.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/src/main/docbook/filters.xml b/docs/src/main/docbook/filters.xml index 313b20cf06..567287fe07 100644 --- a/docs/src/main/docbook/filters.xml +++ b/docs/src/main/docbook/filters.xml @@ -243,9 +243,9 @@ public class PreMatchingFilter implements ContainerRequestFilter {
Client filters - Client filters are similar to container filters. The response can also be aborted + Client filters are similar to container filters. The request can also be aborted in the &jaxrs.client.ClientRequestFilter; which would cause that no request will actually be sent to the server at all. - A new response is passed to the abort method. This response will be used and delivered + A new response is passed to the abortWith method. This response will be used and delivered as a result of the request invocation. Such a response goes through the client response filters. This is similar to what happens on the server side. The process is shown in the following example: