Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove platform-http-vertx workarounds now that Quarkus & Camel Vert.x is in sync #3920

Merged
merged 1 commit into from
Jul 19, 2022
Merged

Remove platform-http-vertx workarounds now that Quarkus & Camel Vert.x is in sync #3920

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 0 additions & 5 deletions extensions/platform-http/runtime/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,6 @@
<groupId>io.quarkus</groupId>
<artifactId>quarkus-vertx-http</artifactId>
</dependency>
<dependency>
<groupId>org.graalvm.nativeimage</groupId>
<artifactId>svm</artifactId>
<scope>provided</scope>
</dependency>

</dependencies>

Expand Down
89 changes: 0 additions & 89 deletions ...org/apache/camel/component/platform/http/vertx/CamelQuarkusVertxPlatformHttpConsumer.java
View file
Open in desktop

This file was deleted.

36 changes: 0 additions & 36 deletions ...rg/apache/camel/quarkus/component/platform/http/graal/PlatformHttpVertxSubstitutions.java
View file
Open in desktop

This file was deleted.

14 changes: 1 addition & 13 deletions ...n/java/org/apache/camel/quarkus/component/platform/http/runtime/PlatformHttpRecorder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,19 +22,15 @@
import io.vertx.core.Vertx;
import io.vertx.ext.web.Router;
import io.vertx.ext.web.RoutingContext;
import org.apache.camel.Consumer;
import org.apache.camel.Processor;
import org.apache.camel.component.platform.http.PlatformHttpComponent;
import org.apache.camel.component.platform.http.PlatformHttpEndpoint;
import org.apache.camel.component.platform.http.spi.PlatformHttpEngine;
import org.apache.camel.component.platform.http.vertx.CamelQuarkusVertxPlatformHttpConsumer;
import org.apache.camel.component.platform.http.vertx.VertxPlatformHttpEngine;
import org.apache.camel.component.platform.http.vertx.VertxPlatformHttpRouter;

@Recorder
public class PlatformHttpRecorder {
public RuntimeValue<PlatformHttpEngine> createEngine() {
return new RuntimeValue<>(new CamelQuarkusVertxPlatformHttpEngine());
return new RuntimeValue<>(new VertxPlatformHttpEngine());
}

public RuntimeValue<PlatformHttpComponent> createComponent(RuntimeValue<PlatformHttpEngine> engine) {
Expand All @@ -54,12 +50,4 @@ public Handler<RoutingContext> bodyHandler() {
};
return new RuntimeValue<>(vertxPlatformHttpRouter);
}

// TODO: Remove when Camel / Quarkus Vert.x version is in sync https://github.com/apache/camel-quarkus/issues/3877
static final class CamelQuarkusVertxPlatformHttpEngine extends VertxPlatformHttpEngine {
@Override
public Consumer createConsumer(PlatformHttpEndpoint endpoint, Processor processor) {
return new CamelQuarkusVertxPlatformHttpConsumer(endpoint, processor, getHandlers());
}
}
}
4 changes: 2 additions & 2 deletions ...ttp/src/test/java/org/apache/camel/quarkus/component/http/server/it/PlatformHttpTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@
import io.restassured.http.ContentType;
import io.restassured.http.Method;
import org.apache.camel.component.platform.http.PlatformHttpComponent;
import org.apache.camel.component.platform.http.vertx.VertxPlatformHttpEngine;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.MethodSource;

import static org.hamcrest.CoreMatchers.endsWith;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.Matchers.notNullValue;
Expand Down Expand Up @@ -357,7 +357,7 @@ public void registrySetUp() {
.then()
.statusCode(200)
.body(
"engine", endsWith("CamelQuarkusVertxPlatformHttpEngine"),
"engine", is(VertxPlatformHttpEngine.class.getName()),
"component", is(PlatformHttpComponent.class.getName()));
}

Expand Down