diff --git a/http/http-advanced-reactive/pom.xml b/http/http-advanced-reactive/pom.xml index b09677ab0..e81a2b3b9 100644 --- a/http/http-advanced-reactive/pom.xml +++ b/http/http-advanced-reactive/pom.xml @@ -94,10 +94,6 @@ commons-io commons-io - - com.aayushatharva.brotli4j - brotli4j - com.microsoft.playwright playwright diff --git a/http/http-advanced-reactive/src/test/java/io/quarkus/ts/http/advanced/reactive/Brotli4JHttpIT.java b/http/http-advanced-reactive/src/test/java/io/quarkus/ts/http/advanced/reactive/Brotli4JHttpIT.java index 168a20040..71e168de7 100644 --- a/http/http-advanced-reactive/src/test/java/io/quarkus/ts/http/advanced/reactive/Brotli4JHttpIT.java +++ b/http/http-advanced-reactive/src/test/java/io/quarkus/ts/http/advanced/reactive/Brotli4JHttpIT.java @@ -20,15 +20,19 @@ import io.quarkus.test.bootstrap.RestService; import io.quarkus.test.scenarios.QuarkusScenario; import io.quarkus.test.scenarios.annotations.DisabledOnNative; +import io.quarkus.test.services.Dependency; import io.quarkus.test.services.QuarkusApplication; import io.quarkus.test.utils.FileUtils; +import io.quarkus.ts.http.advanced.reactive.brotli4j.Brotli4JHttpServerConfig; +import io.quarkus.ts.http.advanced.reactive.brotli4j.Brotli4JResource; +import io.quarkus.ts.http.advanced.reactive.brotli4j.Brotli4JRestMock; import io.restassured.response.Response; @Tag("QQE-378") @QuarkusScenario public class Brotli4JHttpIT { @QuarkusApplication(classes = { Brotli4JHttpServerConfig.class, Brotli4JResource.class, - Brotli4JRestMock.class }, properties = "compression.properties") + Brotli4JRestMock.class }, dependencies = @Dependency(groupId = "com.aayushatharva.brotli4j", artifactId = "brotli4j"), properties = "compression.properties") static RestService app = new RestService(); private final static String DEFAULT_TEXT_PLAIN = Brotli4JResource.DEFAULT_TEXT_PLAIN; diff --git a/http/http-advanced-reactive/src/test/java/io/quarkus/ts/http/advanced/reactive/DevModeBrotli4JHttpIT.java b/http/http-advanced-reactive/src/test/java/io/quarkus/ts/http/advanced/reactive/DevModeBrotli4JHttpIT.java index 837c4922e..a54d0cde4 100644 --- a/http/http-advanced-reactive/src/test/java/io/quarkus/ts/http/advanced/reactive/DevModeBrotli4JHttpIT.java +++ b/http/http-advanced-reactive/src/test/java/io/quarkus/ts/http/advanced/reactive/DevModeBrotli4JHttpIT.java @@ -1,7 +1,7 @@ package io.quarkus.ts.http.advanced.reactive; import static io.quarkus.ts.http.advanced.reactive.Brotli4JHttpIT.CONTENT_LENGTH_DEFAULT_TEXT_PLAIN; -import static io.quarkus.ts.http.advanced.reactive.Brotli4JResource.DEFAULT_TEXT_PLAIN; +import static io.quarkus.ts.http.advanced.reactive.brotli4j.Brotli4JResource.DEFAULT_TEXT_PLAIN; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; @@ -15,6 +15,9 @@ import io.quarkus.test.bootstrap.DevModeQuarkusService; import io.quarkus.test.scenarios.QuarkusScenario; import io.quarkus.test.services.DevModeQuarkusApplication; +import io.quarkus.ts.http.advanced.reactive.brotli4j.Brotli4JHttpServerConfig; +import io.quarkus.ts.http.advanced.reactive.brotli4j.Brotli4JResource; +import io.quarkus.ts.http.advanced.reactive.brotli4j.Brotli4JRestMock; import io.restassured.response.Response; @QuarkusScenario diff --git a/http/http-advanced-reactive/src/test/java/io/quarkus/ts/http/advanced/reactive/OpenShiftBrotli4JIT.java b/http/http-advanced-reactive/src/test/java/io/quarkus/ts/http/advanced/reactive/OpenShiftBrotli4JIT.java index f3c2a9bf7..e29cc30cf 100644 --- a/http/http-advanced-reactive/src/test/java/io/quarkus/ts/http/advanced/reactive/OpenShiftBrotli4JIT.java +++ b/http/http-advanced-reactive/src/test/java/io/quarkus/ts/http/advanced/reactive/OpenShiftBrotli4JIT.java @@ -1,7 +1,10 @@ package io.quarkus.ts.http.advanced.reactive; +import org.junit.jupiter.api.condition.DisabledIfSystemProperty; + import io.quarkus.test.scenarios.OpenShiftScenario; @OpenShiftScenario +@DisabledIfSystemProperty(named = "ts.arm.missing.services.excludes", matches = "true", disabledReason = "https://github.com/quarkusio/quarkus/issues/43770") public class OpenShiftBrotli4JIT extends Brotli4JHttpIT { } diff --git a/http/http-advanced-reactive/src/main/java/io/quarkus/ts/http/advanced/reactive/Brotli4JHttpServerConfig.java b/http/http-advanced-reactive/src/test/java/io/quarkus/ts/http/advanced/reactive/brotli4j/Brotli4JHttpServerConfig.java similarity index 94% rename from http/http-advanced-reactive/src/main/java/io/quarkus/ts/http/advanced/reactive/Brotli4JHttpServerConfig.java rename to http/http-advanced-reactive/src/test/java/io/quarkus/ts/http/advanced/reactive/brotli4j/Brotli4JHttpServerConfig.java index 10f30faca..f4df2b863 100644 --- a/http/http-advanced-reactive/src/main/java/io/quarkus/ts/http/advanced/reactive/Brotli4JHttpServerConfig.java +++ b/http/http-advanced-reactive/src/test/java/io/quarkus/ts/http/advanced/reactive/brotli4j/Brotli4JHttpServerConfig.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.http.advanced.reactive; +package io.quarkus.ts.http.advanced.reactive.brotli4j; import jakarta.enterprise.context.ApplicationScoped; diff --git a/http/http-advanced-reactive/src/main/java/io/quarkus/ts/http/advanced/reactive/Brotli4JResource.java b/http/http-advanced-reactive/src/test/java/io/quarkus/ts/http/advanced/reactive/brotli4j/Brotli4JResource.java similarity index 97% rename from http/http-advanced-reactive/src/main/java/io/quarkus/ts/http/advanced/reactive/Brotli4JResource.java rename to http/http-advanced-reactive/src/test/java/io/quarkus/ts/http/advanced/reactive/brotli4j/Brotli4JResource.java index f3b86be28..a7271957f 100644 --- a/http/http-advanced-reactive/src/main/java/io/quarkus/ts/http/advanced/reactive/Brotli4JResource.java +++ b/http/http-advanced-reactive/src/test/java/io/quarkus/ts/http/advanced/reactive/brotli4j/Brotli4JResource.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.http.advanced.reactive; +package io.quarkus.ts.http.advanced.reactive.brotli4j; import java.util.HashMap; diff --git a/http/http-advanced-reactive/src/main/java/io/quarkus/ts/http/advanced/reactive/Brotli4JRestMock.java b/http/http-advanced-reactive/src/test/java/io/quarkus/ts/http/advanced/reactive/brotli4j/Brotli4JRestMock.java similarity index 98% rename from http/http-advanced-reactive/src/main/java/io/quarkus/ts/http/advanced/reactive/Brotli4JRestMock.java rename to http/http-advanced-reactive/src/test/java/io/quarkus/ts/http/advanced/reactive/brotli4j/Brotli4JRestMock.java index 70960772e..ba0551952 100644 --- a/http/http-advanced-reactive/src/main/java/io/quarkus/ts/http/advanced/reactive/Brotli4JRestMock.java +++ b/http/http-advanced-reactive/src/test/java/io/quarkus/ts/http/advanced/reactive/brotli4j/Brotli4JRestMock.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.http.advanced.reactive; +package io.quarkus.ts.http.advanced.reactive.brotli4j; import java.io.IOException; import java.io.InputStream;