[RESTEASY-2055] Fix remaining failures on 3.6

resteasy-jaxrs/src/main/java/org/jboss/resteasy/client/ClientRequest.java

@@ -77,7 +77,7 @@ public class ClientRequest extends ClientInterceptorRepositoryImpl implements Cl
    /**
     * Set the default executor class name.
     *
-    * @param classname
+    * @param classname Class name
     */
    public static void setDefaultExecutorClass(String classname)
    {
@@ -479,8 +479,7 @@ public ClientResponse get() throws Exception
    /**
     * Tries to automatically unmarshal to target type.
     *
-    * @param returnType
-    * @param <T>
+    * @param returnType Return type
     * @return
     * @throws Exception
     */

resteasy-jaxrs/src/main/java/org/jboss/resteasy/core/ExceptionHandler.java

@@ -84,7 +84,6 @@ protected Response handleApplicationException(HttpRequest request, ApplicationEx
     * Execute an ExceptionMapper if one exists for the given exception.  Recurse to base class if not found.
     *
     * @param exception exception
-    * @param logger logger
     * @return true if an ExceptionMapper was found and executed
     */
    @SuppressWarnings(value = "unchecked")

resteasy-jaxrs/src/main/java/org/jboss/resteasy/core/PrefixedFormInjector.java

@@ -42,11 +42,10 @@ public Object inject(HttpRequest request, HttpResponse response)
    }
 
    /**
-    * Calls the super {@link #inject(org.jboss.resteasy.spi.HttpRequest, org.jboss.resteasy.spi.HttpResponse, boolean)} method.
+    * Calls the super {@link #inject(org.jboss.resteasy.spi.HttpRequest, org.jboss.resteasy.spi.HttpResponse)} method.
     * @param prefix prefix
     * @param request http request
     * @param response http response
-    * @param unwrapAsync unwrap async
     * @return injector instance
     */
    protected Object doInject(String prefix, HttpRequest request, HttpResponse response)

resteasy-jaxrs/src/main/java/org/jboss/resteasy/core/ValueInjector.java

@@ -13,7 +13,6 @@ public interface ValueInjector
     * Inject outside the context of an HTTP request.  For instance, a singleton may have proxiable and injectable
     * jax-rs objects like Request, UriInfo, or HttpHeaders.
     *
-    * @param unwrapAsync unwrap async
     * @return object
     */
    Object inject();
@@ -23,7 +22,6 @@ public interface ValueInjector
     *
     * @param request http request
     * @param response http response
-    * @param unwrapAsync unwrap async
     * @return object
     */
    Object inject(HttpRequest request, HttpResponse response);

resteasy-jaxrs/src/main/java/org/jboss/resteasy/spi/ConstructorInjector.java

@@ -10,7 +10,6 @@ public interface ConstructorInjector
 {
    /**
     * Construct outside the scope of an HTTP request.  Useful for singleton factories.
-    * @param unwrapAsync unwrap async
     * @return constructed object
     */
    Object construct();
@@ -20,7 +19,6 @@ public interface ConstructorInjector
     *
     * @param request http request
     * @param response http response
-    * @param unwrapAsync unwrap async
     * @return constructed object
     * @throws Failure if failure occurred
     * @throws WebApplicationException if application exception occurred
@@ -33,7 +31,6 @@ public interface ConstructorInjector
     * in cases where the resource factory wants to allocate the object itself, but wants resteasy to populate
     * the arguments.
     *
-    * @param unwrapAsync unwrap async
     * @return array of arguments
     */
    Object[] injectableArguments();
@@ -45,7 +42,6 @@ public interface ConstructorInjector
     *
     * @param request http request
     * @param response http response
-    * @param unwrapAsync unwrap async
     * @return array of arguments
     * @throws Failure if failure occurred
     */

resteasy-jaxrs/src/main/java/org/jboss/resteasy/spi/PropertyInjector.java

@@ -13,8 +13,6 @@ public interface PropertyInjector
     * This method should only be used outside the scope of an HTTP request.
     *
     * @param target target object
-    * @param unwrapAsync unwrap async
-    * @return {@link CompletionStage}
     */
    void inject(Object target);
 
@@ -25,8 +23,6 @@ public interface PropertyInjector
     * @param request http request
     * @param response http response
     * @param target target object
-    * @param unwrapAsync unwrap async
-    * @return {@link CompletionStage}
     * @throws Failure if application failure occurred
     * @throws WebApplicationException if application exception occurred
     */

resteasy-jaxrs/src/main/java/org/jboss/resteasy/spi/ResteasyProviderFactory.java

@@ -1357,6 +1357,7 @@ public void addClientExceptionMapper(ClientExceptionMapper<?> provider, Type exc
    /**
     * Add a {@link ClientErrorInterceptor} to this provider factory instance.
     * Duplicate handlers are ignored. (For Client Proxy API only)
+    * @param handler ClientErrorInterceptor handler
     */
    public void addClientErrorInterceptor(ClientErrorInterceptor handler)
    {
@@ -1373,6 +1374,8 @@ public void addClientErrorInterceptor(ClientErrorInterceptor handler)
 
    /**
     * Return the list of currently registered {@link ClientErrorInterceptor} instances.
+    *
+    * @return List of {@link ClientErrorInterceptor} instances
     */
    public List<ClientErrorInterceptor> getClientErrorInterceptors()
    {

resteasy-rxjava/src/main/java/org/jboss/resteasy/rxjava/ResteasyContextPropagatingOnObservableCreateAction.java

@@ -9,7 +9,7 @@
 import rx.functions.Func1;
 
 /**
- * @deprecated:
+ * Deprecated:
  *
  *   "RxJava 1.x is now officially end-of-life (EOL). No further developments,
  *    bugfixes, enhancements, javadoc changes or maintenance will be provided by

resteasy-rxjava/src/main/java/org/jboss/resteasy/rxjava/ResteasyContextPropagatingOnSingleCreateAction.java

@@ -10,7 +10,8 @@
 import rx.functions.Func1;
 
 /**
- * @deprecated:
+ *
+ * Deprecated:
  *
  *   "RxJava 1.x is now officially end-of-life (EOL). No further developments,
  *    bugfixes, enhancements, javadoc changes or maintenance will be provided by