Branch: refs/heads/master Home: https://github.com/resteasy/Resteasy Commit: 2bfc96d4024623b176d1448dae9d1b12827c21ac https://github.com/resteasy/Resteasy/commit/2bfc96d4024623b176d1448dae9d1... Author: Frederik Boster <frederik.boster(a)kpit.com&gt; Date: 2017-09-19 (Tue, 19 Sep 2017) Changed paths: M resteasy-jaxrs/src/main/java/org/jboss/resteasy/core/ResourceMethodRegistry.java M resteasy-jaxrs/src/main/java/org/jboss/resteasy/spi/metadata/ResourceBuilder.java M resteasy-jaxrs/src/main/java/org/jboss/resteasy/util/Types.java Log Message: ----------- [RESTEASY-1706] Add support for jax-rs annotation inheritance with generics. Adjust the discovery process of overridden resource methods to resolve generic type parameters in method signatures by the actual type at runtime. * Replace implementation of annotation inheritance discovery in ResourceMethodRegistry by the usage of the implementation in ResourceBuilder. * Enhance the implementation of annotation inheritance discovery in ResourceBuilder. * Move general generics logics to and enhance the utility class Types. JIRA Issue: https://issues.jboss.org/projects/RESTEASY/issues/RESTEASY-1706 Commit: 0a05163865ae58bfa331c4caa123c3efdfaf797a https://github.com/resteasy/Resteasy/commit/0a05163865ae58bfa331c4caa123c... Author: Frederik Boster <frederik.boster(a)kpit.com&gt; Date: 2017-09-20 (Wed, 20 Sep 2017) Changed paths: A testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/core/basic/AnnotationInheritanceGenericsTest.java A testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/core/basic/resource/AnnotationInheritanceGenericsAbstract.java A testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/core/basic/resource/AnnotationInheritanceGenericsEntity.java A testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/core/basic/resource/AnnotationInheritanceGenericsImpl.java A testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/core/basic/resource/AnnotationInheritanceGenericsInterface.java Log Message: ----------- [RESTEASY-1706] Add integration test for jax-rs annotation inheritance with generics. * Add the Arquillian integration test AnnotationInheritanceGenericsTest to resteasy-integration-tests. JIRA Issue: https://issues.jboss.org/projects/RESTEASY/issues/RESTEASY-1706 Commit: c99c4fbe3853ee6a03a67d00d09f73ede2c26c16 https://github.com/resteasy/Resteasy/commit/c99c4fbe3853ee6a03a67d00d09f7... Author: Alessio Soldano <soldano.servizi(a)email.it&gt; Date: 2017-10-03 (Tue, 03 Oct 2017) Changed paths: M .travis.yml M distribution/assembly.xml M distribution/pom.xml M docbook/reference/en/en-US/modules/Installation_Configuration.xml M docbook/reference/en/en-US/modules/RESTEasy_Client_Framework.xml M docbook/reference/en/en-US/modules/StringConverter.xml M docbook/reference/en/en-US/modules/gzip.xml M jboss-modules/build.xml M jboss-modules/pom.xml A jboss-modules/src/main/resources/modules/javax/json/bind/api/main/module.xml A jboss-modules/src/main/resources/modules/org/eclipse/yasson/main/module.xml A jboss-modules/src/main/resources/modules/org/glassfish/javax/json/main/module.xml M jboss-modules/src/main/resources/modules/org/jboss/resteasy/resteasy-jaxrs/main/module.xml A jboss-modules/src/main/resources/modules/org/jboss/resteasy/resteasy-json-binding-provider/main/module.xml A jboss-modules/src/main/resources/modules/org/reactivestreams/main/module.xml M providers/jackson/src/main/java/org/jboss/resteasy/plugins/providers/jackson/JacksonJsonpInterceptor.java M providers/jackson/src/test/java/org/jboss/resteasy/test/nextgen/providers/jackson/JacksonTest.java A providers/json-binding/pom.xml A providers/json-binding/src/main/java/org/jboss/resteasy/plugins/providers/jsonb/AbstractJsonBindingProvider.java A providers/json-binding/src/main/java/org/jboss/resteasy/plugins/providers/jsonb/JsonBindingProvider.java A providers/json-binding/src/main/java/org/jboss/resteasy/plugins/providers/jsonb/i18n/LogMessages.java A providers/json-binding/src/main/java/org/jboss/resteasy/plugins/providers/jsonb/i18n/Messages.java A providers/json-binding/src/main/resources/META-INF/services/javax.ws.rs.ext.Providers M providers/json-p-ee7/pom.xml M providers/pom.xml M resteasy-bom/pom.xml M resteasy-client/pom.xml A resteasy-client/src/main/java/org/jboss/resteasy/client/jaxrs/AsyncClientHttpEngine.java M resteasy-client/src/main/java/org/jboss/resteasy/client/jaxrs/ResteasyClientBuilder.java A resteasy-client/src/main/java/org/jboss/resteasy/client/jaxrs/engines/ApacheHttpAsyncClient4Engine.java M resteasy-client/src/main/java/org/jboss/resteasy/client/jaxrs/engines/ApacheHttpClient4Engine.java M resteasy-client/src/main/java/org/jboss/resteasy/client/jaxrs/i18n/LogMessages.java M resteasy-client/src/main/java/org/jboss/resteasy/client/jaxrs/internal/ClientInvocation.java M resteasy-client/src/main/java/org/jboss/resteasy/client/jaxrs/internal/ClientInvocationBuilder.java M resteasy-client/src/main/java/org/jboss/resteasy/client/jaxrs/internal/ClientResponse.java M resteasy-client/src/main/java/org/jboss/resteasy/plugins/providers/sse/client/SseEventSourceImpl.java M resteasy-dependencies-bom/pom.xml M resteasy-jaxrs/pom.xml A resteasy-jaxrs/src/main/java/org/jboss/resteasy/annotations/Stream.java M resteasy-jaxrs/src/main/java/org/jboss/resteasy/core/AbstractAsynchronousResponse.java A resteasy-jaxrs/src/main/java/org/jboss/resteasy/core/AsyncResponseConsumer.java R resteasy-jaxrs/src/main/java/org/jboss/resteasy/core/CompletionStageResponseConsumer.java M resteasy-jaxrs/src/main/java/org/jboss/resteasy/core/InjectorFactoryImpl.java M resteasy-jaxrs/src/main/java/org/jboss/resteasy/core/ResourceMethodInvoker.java M resteasy-jaxrs/src/main/java/org/jboss/resteasy/core/ResourceMethodRegistry.java M resteasy-jaxrs/src/main/java/org/jboss/resteasy/core/ServerResponseWriter.java M resteasy-jaxrs/src/main/java/org/jboss/resteasy/core/SynchronousDispatcher.java M resteasy-jaxrs/src/main/java/org/jboss/resteasy/core/SynchronousExecutionContext.java M resteasy-jaxrs/src/main/java/org/jboss/resteasy/core/ThreadLocalResteasyProviderFactory.java M resteasy-jaxrs/src/main/java/org/jboss/resteasy/core/interception/jaxrs/ContainerResponseContextImpl.java M resteasy-jaxrs/src/main/java/org/jboss/resteasy/core/interception/jaxrs/PostMatchContainerRequestContext.java M resteasy-jaxrs/src/main/java/org/jboss/resteasy/core/interception/jaxrs/PreMatchContainerRequestContext.java M resteasy-jaxrs/src/main/java/org/jboss/resteasy/core/interception/jaxrs/ResponseContainerRequestContext.java A resteasy-jaxrs/src/main/java/org/jboss/resteasy/core/interception/jaxrs/SuspendableContainerRequestContext.java A resteasy-jaxrs/src/main/java/org/jboss/resteasy/core/interception/jaxrs/SuspendableContainerResponseContext.java M resteasy-jaxrs/src/main/java/org/jboss/resteasy/mock/MockHttpResponse.java A resteasy-jaxrs/src/main/java/org/jboss/resteasy/plugins/providers/ReactiveStreamProvider.java M resteasy-jaxrs/src/main/java/org/jboss/resteasy/plugins/providers/sse/EventByteArrayOutputStream.java M resteasy-jaxrs/src/main/java/org/jboss/resteasy/plugins/providers/sse/InboundSseEventImpl.java M resteasy-jaxrs/src/main/java/org/jboss/resteasy/plugins/providers/sse/SseBroadcasterImpl.java M resteasy-jaxrs/src/main/java/org/jboss/resteasy/plugins/providers/sse/SseConstants.java M resteasy-jaxrs/src/main/java/org/jboss/resteasy/plugins/providers/sse/SseEventInputImpl.java M resteasy-jaxrs/src/main/java/org/jboss/resteasy/plugins/providers/sse/SseEventOutputImpl.java M resteasy-jaxrs/src/main/java/org/jboss/resteasy/plugins/providers/sse/SseEventProvider.java M resteasy-jaxrs/src/main/java/org/jboss/resteasy/plugins/providers/sse/SseEventSinkInterceptor.java M resteasy-jaxrs/src/main/java/org/jboss/resteasy/plugins/server/servlet/HttpServletResponseHeaders.java M resteasy-jaxrs/src/main/java/org/jboss/resteasy/plugins/server/servlet/HttpServletResponseWrapper.java M resteasy-jaxrs/src/main/java/org/jboss/resteasy/plugins/server/servlet/Servlet3AsyncHttpRequest.java M resteasy-jaxrs/src/main/java/org/jboss/resteasy/resteasy_jaxrs/i18n/LogMessages.java M resteasy-jaxrs/src/main/java/org/jboss/resteasy/resteasy_jaxrs/i18n/Messages.java M resteasy-jaxrs/src/main/java/org/jboss/resteasy/specimpl/LinkBuilderImpl.java A resteasy-jaxrs/src/main/java/org/jboss/resteasy/spi/AsyncStreamProvider.java M resteasy-jaxrs/src/main/java/org/jboss/resteasy/spi/HttpResponse.java M resteasy-jaxrs/src/main/java/org/jboss/resteasy/spi/Registry.java M resteasy-jaxrs/src/main/java/org/jboss/resteasy/spi/ResteasyAsynchronousResponse.java M resteasy-jaxrs/src/main/java/org/jboss/resteasy/spi/ResteasyDeployment.java M resteasy-jaxrs/src/main/java/org/jboss/resteasy/spi/ResteasyProviderFactory.java M resteasy-jaxrs/src/main/java/org/jboss/resteasy/spi/metadata/ResourceBuilder.java M resteasy-jaxrs/src/main/java/org/jboss/resteasy/spi/metadata/ResourceMethod.java M resteasy-jaxrs/src/main/java/org/jboss/resteasy/util/FindAnnotation.java M resteasy-jaxrs/src/main/resources/META-INF/services/javax.ws.rs.ext.Providers M resteasy-legacy/src/main/java/org/jboss/resteasy/core/interception/ContainerResponseContextImpl.java M resteasy-legacy/src/main/java/org/jboss/resteasy/core/interception/PostMatchContainerRequestContext.java M resteasy-legacy/src/main/java/org/jboss/resteasy/core/interception/PreMatchContainerRequestContext.java M resteasy-legacy/src/main/java/org/jboss/resteasy/spi/old/ResteasyProviderFactory.java M resteasy-links/src/test/java/org/jboss/resteasy/links/test/TestFacadeLinks.java M resteasy-links/src/test/java/org/jboss/resteasy/links/test/TestLinkIds.java M resteasy-links/src/test/java/org/jboss/resteasy/links/test/TestLinks.java M resteasy-links/src/test/java/org/jboss/resteasy/links/test/TestSecureLinks.java M resteasy-links/src/test/java/org/jboss/resteasy/links/test/el/TestLinksInvalidEL.java M resteasy-links/src/test/java/org/jboss/resteasy/links/test/el/TestLinksNoPackage.java M resteasy-upgrade-guide/reference/en/en-US/modules/Miscellaneous.xml M security-legacy/skeleton-key-idm/skeleton-key-as7/src/main/java/org/jboss/resteasy/skeleton/key/as7/OAuthAuthenticationServerValve.java M security-legacy/skeleton-key-idm/skeleton-key-core/src/main/java/org/jboss/resteasy/skeleton/key/representations/idm/PublishedRealmRepresentation.java M security-legacy/skeleton-key-idm/skeleton-key-core/src/test/java/org/jboss/resteasy/test/skeleton/key/RSAVerifierTest.java M security-legacy/skeleton-key-idm/skeleton-key-idp/src/main/java/org/jboss/resteasy/skeleton/key/idm/model/data/Realm.java M security-legacy/skeleton-key-idm/skeleton-key-idp/src/test/java/org/jboss/resteasy/test/skeleton/key/GrantTest.java M security-legacy/skeleton-key-idm/skeleton-key-idp/src/test/java/org/jboss/resteasy/test/skeleton/key/SkeletonTestBase.java M server-adapters/resteasy-jdk-http/src/main/java/org/jboss/resteasy/plugins/server/sun/http/HttpServerResponse.java M server-adapters/resteasy-jdk-http/src/test/java/org/jboss/resteasy/test/security/BasicAuthTest.java M server-adapters/resteasy-netty/src/main/java/org/jboss/resteasy/plugins/server/netty/NettyHttpResponse.java M server-adapters/resteasy-netty/src/main/java/org/jboss/resteasy/plugins/server/netty/NettyUtil.java M server-adapters/resteasy-netty4/src/main/java/org/jboss/resteasy/plugins/server/netty/NettyHttpRequest.java M server-adapters/resteasy-netty4/src/main/java/org/jboss/resteasy/plugins/server/netty/NettyHttpResponse.java M server-adapters/resteasy-netty4/src/main/java/org/jboss/resteasy/plugins/server/netty/NettyUtil.java M server-adapters/resteasy-netty4/src/main/java/org/jboss/resteasy/plugins/server/netty/RestEasyHttpRequestDecoder.java M server-adapters/resteasy-netty4/src/main/java/org/jboss/resteasy/plugins/server/netty/RestEasyHttpResponseEncoder.java A server-adapters/resteasy-netty4/src/test/java/org/jboss/resteasy/test/HeaderTooLongTest.java M server-adapters/resteasy-netty4/src/test/java/org/jboss/resteasy/test/JaxrsAsyncTest.java M server-adapters/resteasy-netty4/src/test/java/org/jboss/resteasy/test/RESTEASY1325Test.java M server-adapters/resteasy-vertx/src/main/java/org/jboss/resteasy/plugins/server/vertx/VertxHttpRequest.java M server-adapters/resteasy-vertx/src/main/java/org/jboss/resteasy/plugins/server/vertx/VertxHttpResponse.java M server-adapters/resteasy-vertx/src/main/java/org/jboss/resteasy/plugins/server/vertx/VertxRegistry.java M testsuite/integration-tests-spring/pom.xml M testsuite/integration-tests/pom.xml A testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/asynch/AsyncRequestFilterTest.java A testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/asynch/resource/AsyncPreMatchRequestFilter1.java A testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/asynch/resource/AsyncPreMatchRequestFilter2.java A testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/asynch/resource/AsyncPreMatchRequestFilter3.java A testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/asynch/resource/AsyncRequestFilter.java A testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/asynch/resource/AsyncRequestFilter1.java A testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/asynch/resource/AsyncRequestFilter2.java A testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/asynch/resource/AsyncRequestFilter3.java A testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/asynch/resource/AsyncRequestFilterResource.java A testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/asynch/resource/AsyncResponseFilter.java A testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/asynch/resource/AsyncResponseFilter1.java A testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/asynch/resource/AsyncResponseFilter2.java A testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/asynch/resource/AsyncResponseFilter3.java A testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/client/AsyncBenchTest.java M testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/client/AsyncInvokeTest.java A testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/client/ClientResponseWithEntityTest.java M testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/client/InputStreamTest.java M testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/client/other/ApacheHttpClient43Test.java A testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/core/interceptors/resource/TestResource1.java A testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/core/interceptors/resource/TestResource2.java A testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/core/interceptors/resource/TestSubResource.java A testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jsonb/basic/JsonBindingTest.java A testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jsonb/basic/resource/Cat.java A testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jsonb/basic/resource/JsonBindingResource.java A testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/sse/EscapingSseResource.java M testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/sse/SseApplication.java M testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/sse/SseResource.java M testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/sse/SseTest.java A testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/response/AnotherPublisherResponseTest.java M testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/response/CompletionStageResponseTest.java A testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/response/PublisherResponseTest.java A testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/response/SingleProvider.java A testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/response/resource/AsyncResponseCallback.java A testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/response/resource/AsyncResponseException.java A testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/response/resource/AsyncResponseExceptionMapper.java M testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/response/resource/CompletionStageResponseResource.java A testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/response/resource/PublisherResponseResource.java A testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/warning/SubResourceWarningTest.java A testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/warning/resource/SubResourceWarningResource.java A testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/warning/resource/TestResource1.java A testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/warning/resource/TestResource2.java A testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/warning/resource/TestSubResource.java M testsuite/legacy-integration-tests/pom.xml M testsuite/unit-tests/src/test/java/org/jboss/resteasy/test/client/LinkHeaderTest.java M testsuite/unit-tests/src/test/java/org/jboss/resteasy/test/interception/DecoratorMatcherTest.java M testsuite/unit-tests/src/test/java/org/jboss/resteasy/test/interception/JaxrsInterceptorRegistryTest.java M testsuite/unit-tests/src/test/java/org/jboss/resteasy/test/interception/PriorityTest.java M testsuite/unit-tests/src/test/java/org/jboss/resteasy/test/providers/ProviderFactoryTest.java M testsuite/unit-tests/src/test/java/org/jboss/resteasy/test/request/ContainerRequestContextTest.java M testsuite/unit-tests/src/test/java/org/jboss/resteasy/test/resource/AcceptParameterHttpPreprocessorTest.java Log Message: ----------- Merge branch 'master' into bug-RESTEASY-1706 Commit: 8925936dbf5401ab51dc81f953089927a0ad212d https://github.com/resteasy/Resteasy/commit/8925936dbf5401ab51dc81f953089... Author: Alessio Soldano <soldano.servizi(a)email.it&gt; Date: 2017-10-03 (Tue, 03 Oct 2017) Log Message: ----------- Merge branch 'master' into bug-RESTEASY-1706 Commit: 81f27a3ce196409bde2e8111b709624dc9db9865 https://github.com/resteasy/Resteasy/commit/81f27a3ce196409bde2e8111b7096... Author: Alessio Soldano <asoldano(a)redhat.com&gt; Date: 2017-10-03 (Tue, 03 Oct 2017) Changed paths: M resteasy-jaxrs/src/main/java/org/jboss/resteasy/core/ResourceMethodRegistry.java M resteasy-jaxrs/src/main/java/org/jboss/resteasy/spi/metadata/ResourceBuilder.java M resteasy-jaxrs/src/main/java/org/jboss/resteasy/util/Types.java A testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/core/basic/AnnotationInheritanceGenericsTest.java A testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/core/basic/resource/AnnotationInheritanceGenericsAbstract.java A testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/core/basic/resource/AnnotationInheritanceGenericsEntity.java A testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/core/basic/resource/AnnotationInheritanceGenericsImpl.java A testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/core/basic/resource/AnnotationInheritanceGenericsInterface.java Log Message: ----------- Merge branch 'Syquel-bug-RESTEASY-1706' Compare: https://github.com/resteasy/Resteasy/compare/4cb510908527...81f27a3ce196