Skip to content
This repository has been archived by the owner on May 28, 2018. It is now read-only.

Fix various javadoc, documentation and typos #3688

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ public class CommonConfig implements FeatureContext, ExtendedConfig {
private final Map<String, Object> immutablePropertiesView;
private final Collection<String> immutablePropertyNames;
/**
* Configured providers, does not include features and binders.
* Configured providers and binders, does not include features.
*/
private final ComponentBag componentBag;
/**
Expand Down Expand Up @@ -642,7 +642,7 @@ private Set<Binder> configureBinders(InjectionManager injectionManager, Set<Bind
Set<Binder> allConfigured = Collections.newSetFromMap(new IdentityHashMap<>());
allConfigured.addAll(configured);

Collection<Binder> binders = getBinder(configured);
Collection<Binder> binders = getBinders(configured);
if (!binders.isEmpty()) {
injectionManager.register(CompositeBinder.wrap(binders));
allConfigured.addAll(binders);
Expand All @@ -651,7 +651,7 @@ private Set<Binder> configureBinders(InjectionManager injectionManager, Set<Bind
return allConfigured;
}

private Collection<Binder> getBinder(Set<Binder> configured) {
private Collection<Binder> getBinders(Set<Binder> configured) {
return componentBag.getInstances(ComponentBag.BINDERS_ONLY)
.stream()
.map(CAST_TO_BINDER)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
import org.glassfish.jersey.server.spi.internal.ValueParamProvider;

/**
* Abstract base class for resolving JAX-RS {@code &#64;XxxParam} injection.
* Generic class for resolving JAX-RS {@code &#64;XxxParam} injection.
*
* @param <A> supported parameter injection annotation.
* @author Marek Potociar (marek.potociar at oracle.com)
Expand Down
4 changes: 2 additions & 2 deletions docs/src/main/docbook/filters.xml
Original file line number Diff line number Diff line change
Expand Up @@ -243,9 +243,9 @@ public class PreMatchingFilter implements ContainerRequestFilter {
<section>
<title>Client filters</title>
<para>
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 <literal>abort</literal> method. This response will be used and delivered
A new response is passed to the <literal>abortWith</literal> 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:
</para>
Expand Down
2 changes: 1 addition & 1 deletion docs/src/main/docbook/sse.xml
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ public static class SseResource {
<para>
The code above defines the resource deployed on URI "/events". This resource has a single
<literal>@GET</literal>
resource method which <emphasis>returns void</emphasis>. This is an imported difference
resource method which <emphasis>returns void</emphasis>. This is an important difference
against the original API. It is Jersey's responsibility to bind the injected <literal>SseEventSink</literal> to
the output chain.
</para>
Expand Down