This is an automated email from the ASF dual-hosted git repository. lburgazzoli pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
View the commit online: https://github.com/apache/camel-quarkus/commit/3763f1a7837e5293c50b40df986cfc1c1c8b5eb3 The following commit(s) were added to refs/heads/master by this push: new 3763f1a Remove workaround for https://github.com/quarkusio/quarkus/issues/4564 as it seems to be fixed 3763f1a is described below commit 3763f1a7837e5293c50b40df986cfc1c1c8b5eb3 Author: lburgazzoli <lburgazz...@gmail.com> AuthorDate: Wed Nov 20 11:53:54 2019 +0100 Remove workaround for https://github.com/quarkusio/quarkus/issues/4564 as it seems to be fixed --- .../http/deployment/PlatformHttpProcessor.java | 31 +++++----------------- .../http/server/it/PlatformHttpEngineTest.java | 2 +- 2 files changed, 7 insertions(+), 26 deletions(-) diff --git a/extensions/platform-http/deployment/src/main/java/org/apache/camel/quarkus/component/platform/http/deployment/PlatformHttpProcessor.java b/extensions/platform-http/deployment/src/main/java/org/apache/camel/quarkus/component/platform/http/deployment/PlatformHttpProcessor.java index de57e3f..02f5676 100644 --- a/extensions/platform-http/deployment/src/main/java/org/apache/camel/quarkus/component/platform/http/deployment/PlatformHttpProcessor.java +++ b/extensions/platform-http/deployment/src/main/java/org/apache/camel/quarkus/component/platform/http/deployment/PlatformHttpProcessor.java @@ -16,8 +16,7 @@ */ package org.apache.camel.quarkus.component.platform.http.deployment; -import java.util.ArrayList; -import java.util.List; +import java.util.Collections; import io.quarkus.deployment.annotations.BuildStep; import io.quarkus.deployment.annotations.ExecutionTime; @@ -25,11 +24,8 @@ import io.quarkus.deployment.annotations.Record; import io.quarkus.deployment.builditem.FeatureBuildItem; import io.quarkus.vertx.http.deployment.VertxWebRouterBuildItem; import io.quarkus.vertx.web.deployment.BodyHandlerBuildItem; -import io.vertx.core.Handler; -import io.vertx.ext.web.RoutingContext; import org.apache.camel.component.platform.http.PlatformHttpComponent; import org.apache.camel.component.platform.http.PlatformHttpConstants; -import org.apache.camel.quarkus.component.platform.http.runtime.PlatformHttpHandlers; import org.apache.camel.quarkus.component.platform.http.runtime.PlatformHttpRecorder; import org.apache.camel.quarkus.component.platform.http.runtime.QuarkusPlatformHttpEngine; import org.apache.camel.quarkus.core.CamelServiceFilter; @@ -60,32 +56,17 @@ class PlatformHttpProcessor { PlatformHttpRecorder recorder, VertxWebRouterBuildItem router, BodyHandlerBuildItem bodyHandler, - List<FeatureBuildItem> features, UploadAttacherBuildItem uploadAttacher) { - List<Handler<RoutingContext>> handlers = new ArrayList<>(); - - // - // When RESTEasy is added to the classpath, then the routes are paused - // so we need to resume them. - // - // https://github.com/quarkusio/quarkus/issues/4564 - // - // TODO: remove this once the issue get fixed - // - if (features.stream().map(FeatureBuildItem::getInfo).anyMatch("resteasy"::equals)) { - handlers.add(new PlatformHttpHandlers.Resumer()); - } - - handlers.add(bodyHandler.getHandler()); - return new PlatformHttpEngineBuildItem( - recorder.createEngine(router.getRouter(), handlers, uploadAttacher.getInstance())); + recorder.createEngine( + router.getRouter(), + Collections.singletonList(bodyHandler.getHandler()), + uploadAttacher.getInstance())); } - @Record(ExecutionTime.RUNTIME_INIT) @BuildStep - CamelRuntimeBeanBuildItem platformHttpEngineBean(PlatformHttpRecorder recorder, PlatformHttpEngineBuildItem engine) { + CamelRuntimeBeanBuildItem platformHttpEngineBean(PlatformHttpEngineBuildItem engine) { return new CamelRuntimeBeanBuildItem( PlatformHttpConstants.PLATFORM_HTTP_ENGINE_NAME, QuarkusPlatformHttpEngine.class.getName(), diff --git a/integration-tests/platform-http-engine/src/test/java/org/apache/camel/quarkus/component/http/server/it/PlatformHttpEngineTest.java b/integration-tests/platform-http-engine/src/test/java/org/apache/camel/quarkus/component/http/server/it/PlatformHttpEngineTest.java index 420648a..34577aa 100644 --- a/integration-tests/platform-http-engine/src/test/java/org/apache/camel/quarkus/component/http/server/it/PlatformHttpEngineTest.java +++ b/integration-tests/platform-http-engine/src/test/java/org/apache/camel/quarkus/component/http/server/it/PlatformHttpEngineTest.java @@ -38,7 +38,7 @@ class PlatformHttpEngineTest { .body( PlatformHttpConstants.PLATFORM_HTTP_ENGINE_NAME, is(QuarkusPlatformHttpEngine.class.getName()), PlatformHttpConstants.PLATFORM_HTTP_COMPONENT_NAME, is(PlatformHttpComponent.class.getName()), - "handlers-size", is(2)); + "handlers-size", is(1)); } @Test
