Skip to content

Commit

Permalink
Merge pull request #16186 from gsmet/rest-client-reactive
Browse files Browse the repository at this point in the history
REST Client Reactive cleanup
  • Loading branch information
gsmet authored Apr 2, 2021
2 parents d5bc503 + 84831e3 commit d3ecfb2
Show file tree
Hide file tree
Showing 64 changed files with 186 additions and 160 deletions.
4 changes: 2 additions & 2 deletions bom/application/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1922,12 +1922,12 @@
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-jaxrs-client</artifactId>
<artifactId>quarkus-jaxrs-client-reactive</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-jaxrs-client-deployment</artifactId>
<artifactId>quarkus-jaxrs-client-reactive-deployment</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ public enum Feature {
INFINISPAN_CLIENT,
INFINISPAN_EMBEDDED,
JAEGER,
JAXRS_CLIENT_REACTIVE,
JDBC_DB2,
JDBC_DERBY,
JDBC_H2,
Expand Down Expand Up @@ -91,7 +92,6 @@ public enum Feature {
RESTEASY_QUTE,
RESTEASY_REACTIVE,
RESTEASY_REACTIVE_QUTE,
RESTEASY_REACTIVE_JAXRS_CLIENT,
RESTEASY_REACTIVE_JSONB,
RESTEASY_REACTIVE_JACKSON,
RESTEASY_REACTIVE_LINKS,
Expand All @@ -100,6 +100,8 @@ public enum Feature {
REST_CLIENT_JAXB,
REST_CLIENT_JSONB,
REST_CLIENT_MUTINY,
REST_CLIENT_REACTIVE,
REST_CLIENT_REACTIVE_JACKSON,
SCALA,
SCHEDULER,
SECURITY,
Expand Down
2 changes: 1 addition & 1 deletion devtools/bom-descriptor-json/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -984,7 +984,7 @@
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-jaxrs-client</artifactId>
<artifactId>quarkus-jaxrs-client-reactive</artifactId>
<version>${project.version}</version>
<type>pom</type>
<scope>test</scope>
Expand Down
2 changes: 1 addition & 1 deletion docs/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -944,7 +944,7 @@
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-jaxrs-client-deployment</artifactId>
<artifactId>quarkus-jaxrs-client-reactive-deployment</artifactId>
<version>${project.version}</version>
<type>pom</type>
<scope>test</scope>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>quarkus-jaxrs-client-parent</artifactId>
<artifactId>quarkus-jaxrs-client-reactive-parent</artifactId>
<groupId>io.quarkus</groupId>
<version>999-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

<artifactId>quarkus-jaxrs-client-deployment</artifactId>
<name>Quarkus - JAXRS Client - Deployment</name>
<artifactId>quarkus-jaxrs-client-reactive-deployment</artifactId>
<name>Quarkus - JAX-RS Client Reactive - Deployment</name>

<dependencies>
<dependency>
Expand All @@ -35,7 +35,7 @@
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-jaxrs-client</artifactId>
<artifactId>quarkus-jaxrs-client-reactive</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.quarkus.resteasy.reactive.client.deployment;
package io.quarkus.jaxrs.client.reactive.deployment;

import static javax.ws.rs.core.MediaType.APPLICATION_JSON;
import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.JSONP_JSON_ARRAY;
Expand Down Expand Up @@ -35,9 +35,9 @@
import org.jboss.resteasy.reactive.common.providers.serialisers.jsonp.JsonStructureHandler;
import org.jboss.resteasy.reactive.common.providers.serialisers.jsonp.JsonValueHandler;

import io.quarkus.resteasy.reactive.client.deployment.beanparam.BeanParamParser;
import io.quarkus.resteasy.reactive.client.deployment.beanparam.ClientBeanParamInfo;
import io.quarkus.resteasy.reactive.client.deployment.beanparam.Item;
import io.quarkus.jaxrs.client.reactive.deployment.beanparam.BeanParamParser;
import io.quarkus.jaxrs.client.reactive.deployment.beanparam.ClientBeanParamInfo;
import io.quarkus.jaxrs.client.reactive.deployment.beanparam.Item;

public class ClientEndpointIndexer
extends EndpointIndexer<ClientEndpointIndexer, ClientEndpointIndexer.ClientIndexedParam, ResourceMethod> {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.quarkus.resteasy.reactive.client.deployment;
package io.quarkus.jaxrs.client.reactive.deployment;

import org.jboss.jandex.ClassInfo;
import org.jboss.jandex.IndexView;
Expand All @@ -13,7 +13,7 @@
/**
* Alter jaxrs client proxy generation
*/
public interface JaxrsClientEnricher {
public interface JaxrsClientReactiveEnricher {
/**
* Class-level alterations
*
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
package io.quarkus.jaxrs.client.reactive.deployment;

import io.quarkus.builder.item.MultiBuildItem;

/**
* BuildItem to register a {@link JaxrsClientReactiveEnricher}
*/
public final class JaxrsClientReactiveEnricherBuildItem extends MultiBuildItem {
private final JaxrsClientReactiveEnricher enricher;

public JaxrsClientReactiveEnricherBuildItem(JaxrsClientReactiveEnricher enricher) {
this.enricher = enricher;
}

public JaxrsClientReactiveEnricher getEnricher() {
return enricher;
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package io.quarkus.resteasy.reactive.client.deployment;
package io.quarkus.jaxrs.client.reactive.deployment;

import static io.quarkus.deployment.Feature.RESTEASY_REACTIVE_JAXRS_CLIENT;
import static io.quarkus.deployment.Feature.JAXRS_CLIENT_REACTIVE;
import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.COMPLETION_STAGE;
import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.UNI;
import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.WEB_APPLICATION_EXCEPTION;
Expand Down Expand Up @@ -85,14 +85,14 @@
import io.quarkus.gizmo.MethodDescriptor;
import io.quarkus.gizmo.ResultHandle;
import io.quarkus.gizmo.TryBlock;
import io.quarkus.resteasy.reactive.client.deployment.beanparam.BeanParamItem;
import io.quarkus.resteasy.reactive.client.deployment.beanparam.ClientBeanParamInfo;
import io.quarkus.resteasy.reactive.client.deployment.beanparam.CookieParamItem;
import io.quarkus.resteasy.reactive.client.deployment.beanparam.HeaderParamItem;
import io.quarkus.resteasy.reactive.client.deployment.beanparam.Item;
import io.quarkus.resteasy.reactive.client.deployment.beanparam.QueryParamItem;
import io.quarkus.resteasy.reactive.client.runtime.ClientResponseBuilderFactory;
import io.quarkus.resteasy.reactive.client.runtime.ResteasyReactiveClientRecorder;
import io.quarkus.jaxrs.client.reactive.deployment.beanparam.BeanParamItem;
import io.quarkus.jaxrs.client.reactive.deployment.beanparam.ClientBeanParamInfo;
import io.quarkus.jaxrs.client.reactive.deployment.beanparam.CookieParamItem;
import io.quarkus.jaxrs.client.reactive.deployment.beanparam.HeaderParamItem;
import io.quarkus.jaxrs.client.reactive.deployment.beanparam.Item;
import io.quarkus.jaxrs.client.reactive.deployment.beanparam.QueryParamItem;
import io.quarkus.jaxrs.client.reactive.runtime.ClientResponseBuilderFactory;
import io.quarkus.jaxrs.client.reactive.runtime.JaxrsClientReactiveRecorder;
import io.quarkus.resteasy.reactive.common.deployment.ApplicationResultBuildItem;
import io.quarkus.resteasy.reactive.common.deployment.QuarkusFactoryCreator;
import io.quarkus.resteasy.reactive.common.deployment.ResourceScanningResultBuildItem;
Expand All @@ -105,9 +105,9 @@
import io.quarkus.runtime.RuntimeValue;
import io.smallrye.mutiny.Uni;

public class JaxrsClientProcessor {
public class JaxrsClientReactiveProcessor {

private static final Logger log = Logger.getLogger(JaxrsClientProcessor.class);
private static final Logger log = Logger.getLogger(JaxrsClientReactiveProcessor.class);

private static final MethodDescriptor WEB_TARGET_RESOLVE_TEMPLATE_METHOD = MethodDescriptor.ofMethod(WebTarget.class,
"resolveTemplate",
Expand All @@ -116,7 +116,7 @@ public class JaxrsClientProcessor {

@BuildStep
void addFeature(BuildProducer<FeatureBuildItem> features) {
features.produce(new FeatureBuildItem(RESTEASY_REACTIVE_JAXRS_CLIENT));
features.produce(new FeatureBuildItem(JAXRS_CLIENT_REACTIVE));
}

@BuildStep
Expand All @@ -132,15 +132,15 @@ void initializeRuntimeInitializedClasses(BuildProducer<RuntimeInitializedClassBu

@BuildStep
@Record(ExecutionTime.STATIC_INIT)
void setupClientProxies(ResteasyReactiveClientRecorder recorder,
void setupClientProxies(JaxrsClientReactiveRecorder recorder,
BeanContainerBuildItem beanContainerBuildItem,
ApplicationResultBuildItem applicationResultBuildItem,
BuildProducer<ReflectiveClassBuildItem> reflectiveClassBuildItemBuildProducer,
List<MessageBodyReaderBuildItem> messageBodyReaderBuildItems,
List<MessageBodyWriterBuildItem> messageBodyWriterBuildItems,
List<MessageBodyReaderOverrideBuildItem> messageBodyReaderOverrideBuildItems,
List<MessageBodyWriterOverrideBuildItem> messageBodyWriterOverrideBuildItems,
List<JaxrsClientEnricherBuildItem> enricherBuildItems,
List<JaxrsClientReactiveEnricherBuildItem> enricherBuildItems,
BeanArchiveIndexBuildItem beanArchiveIndexBuildItem,
Optional<ResourceScanningResultBuildItem> resourceScanningResultBuildItem,
ResteasyReactiveConfig config,
Expand Down Expand Up @@ -248,7 +248,7 @@ private String defaultMediaType(List<? extends MediaTypeWithPriority> defaultMed

@BuildStep
@Record(ExecutionTime.STATIC_INIT)
public void registerInvocationCallbacks(CombinedIndexBuildItem index, ResteasyReactiveClientRecorder recorder) {
public void registerInvocationCallbacks(CombinedIndexBuildItem index, JaxrsClientReactiveRecorder recorder) {

Collection<ClassInfo> invocationCallbacks = index.getComputingIndex()
.getAllKnownImplementors(ResteasyReactiveDotNames.INVOCATION_CALLBACK);
Expand Down Expand Up @@ -290,7 +290,7 @@ public class BaseClient$$QuarkusRestClientInterface implements Closeable, BaseCl
final WebTarget target2;
private final Method javaMethod2;
private final HeaderFiller headerFiller2;
public BaseClient$$QuarkusRestClientInterface(WebTarget var1) {
WebTarget var3 = var1.path("");
DefaultClientHeadersFactoryImpl var2 = new DefaultClientHeadersFactoryImpl();
Expand All @@ -313,7 +313,7 @@ public class BaseClient$$QuarkusRestClientInterface implements Closeable, BaseCl
NoOpHeaderFiller var14 = NoOpHeaderFiller.INSTANCE;
this.headerFiller2 = (HeaderFiller)var14;
}
public Response executeBasePost() {
WebTarget var1 = this.target1;
String[] var2 = new String[]{"application/json"};
Expand All @@ -322,7 +322,7 @@ public Response executeBasePost() {
var3 = var3.property("org.eclipse.microprofile.rest.client.invokedMethod", var4);
HeaderFiller var5 = this.headerFiller1;
var3 = var3.property("io.quarkus.resteasy.reactive.client.microprofile.HeaderFiller", var5);
try {
return (Response)var3.method("POST", Response.class);
} catch (ProcessingException var8) {
Expand All @@ -334,7 +334,7 @@ public Response executeBasePost() {
}
}
}
public Response executeBaseGet() {
WebTarget var1 = this.target2;
String[] var2 = new String[]{"application/json"};
Expand All @@ -343,7 +343,7 @@ public Response executeBaseGet() {
var3 = var3.property("org.eclipse.microprofile.rest.client.invokedMethod", var4);
HeaderFiller var5 = this.headerFiller2;
var3 = var3.property("io.quarkus.resteasy.reactive.client.microprofile.HeaderFiller", var5);
try {
return (Response)var3.method("GET", Response.class);
} catch (ProcessingException var8) {
Expand All @@ -355,7 +355,7 @@ public Response executeBaseGet() {
}
}
}
public void close() {
((WebTargetImpl)this.target1).getRestClient().close();
((WebTargetImpl)this.target2).getRestClient().close();
Expand All @@ -366,7 +366,7 @@ public void close() {
@formatter:on
*/
private RuntimeValue<Function<WebTarget, ?>> generateClientInvoker(RecorderContext recorderContext,
RestClientInterface restClientInterface, List<JaxrsClientEnricherBuildItem> enrichers,
RestClientInterface restClientInterface, List<JaxrsClientReactiveEnricherBuildItem> enrichers,
BuildProducer<GeneratedClassBuildItem> generatedClassBuildItemBuildProducer, ClassInfo interfaceClass,
IndexView index, String defaultMediaType) {
boolean subResource = false;
Expand Down Expand Up @@ -401,7 +401,7 @@ public void close() {
MethodDescriptor.ofMethod(WebTarget.class, "path", WebTarget.class, String.class),
constructor.getMethodParam(0), constructor.load(restClientInterface.getPath())));

for (JaxrsClientEnricherBuildItem enricher : enrichers) {
for (JaxrsClientReactiveEnricherBuildItem enricher : enrichers) {
enricher.getEnricher().forClass(constructor, baseTarget, interfaceClass, index);
}

Expand Down Expand Up @@ -522,7 +522,7 @@ public void close() {
builder, invocationBuilderEnricher.getValue()));
}

for (JaxrsClientEnricherBuildItem enricher : enrichers) {
for (JaxrsClientReactiveEnricherBuildItem enricher : enrichers) {
enricher.getEnricher()
.forMethod(c, constructor, methodCreator, interfaceClass, jandexMethod, builder,
index, generatedClassBuildItemBuildProducer, methodIndex);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.quarkus.resteasy.reactive.client.deployment;
package io.quarkus.jaxrs.client.reactive.deployment;

public interface MediaTypeWithPriority {
int getPriority();
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.quarkus.resteasy.reactive.client.deployment;
package io.quarkus.jaxrs.client.reactive.deployment;

import io.quarkus.builder.item.MultiBuildItem;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.quarkus.resteasy.reactive.client.deployment;
package io.quarkus.jaxrs.client.reactive.deployment;

import io.quarkus.builder.item.MultiBuildItem;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.quarkus.resteasy.reactive.client.deployment.beanparam;
package io.quarkus.jaxrs.client.reactive.deployment.beanparam;

import java.util.List;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.quarkus.resteasy.reactive.client.deployment.beanparam;
package io.quarkus.jaxrs.client.reactive.deployment.beanparam;

import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.BEAN_PARAM;
import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.COOKIE_PARAM;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.quarkus.resteasy.reactive.client.deployment.beanparam;
package io.quarkus.jaxrs.client.reactive.deployment.beanparam;

import java.util.List;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.quarkus.resteasy.reactive.client.deployment.beanparam;
package io.quarkus.jaxrs.client.reactive.deployment.beanparam;

public class CookieParamItem extends Item {
private final String cookieName;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package io.quarkus.resteasy.reactive.client.deployment.beanparam;
package io.quarkus.jaxrs.client.reactive.deployment.beanparam;

import io.quarkus.gizmo.BytecodeCreator;
import io.quarkus.gizmo.MethodDescriptor;
import io.quarkus.gizmo.ResultHandle;
import io.quarkus.resteasy.reactive.client.runtime.ReflectionUtil;
import io.quarkus.jaxrs.client.reactive.runtime.ReflectionUtil;

public class FieldExtractor extends ValueExtractor {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.quarkus.resteasy.reactive.client.deployment.beanparam;
package io.quarkus.jaxrs.client.reactive.deployment.beanparam;

import org.jboss.jandex.MethodInfo;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.quarkus.resteasy.reactive.client.deployment.beanparam;
package io.quarkus.jaxrs.client.reactive.deployment.beanparam;

public class HeaderParamItem extends Item {
private final String headerName;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.quarkus.resteasy.reactive.client.deployment.beanparam;
package io.quarkus.jaxrs.client.reactive.deployment.beanparam;

import io.quarkus.gizmo.BytecodeCreator;
import io.quarkus.gizmo.ResultHandle;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.quarkus.resteasy.reactive.client.deployment.beanparam;
package io.quarkus.jaxrs.client.reactive.deployment.beanparam;

public enum ItemType {
BEAN_PARAM,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.quarkus.resteasy.reactive.client.deployment.beanparam;
package io.quarkus.jaxrs.client.reactive.deployment.beanparam;

public class QueryParamItem extends Item {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.quarkus.resteasy.reactive.client.deployment.beanparam;
package io.quarkus.jaxrs.client.reactive.deployment.beanparam;

import io.quarkus.gizmo.BytecodeCreator;
import io.quarkus.gizmo.ResultHandle;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.quarkus.resteasy.reactive.client.deployment.test;
package io.quarkus.jaxrs.client.reactive.deployment.test;

import java.net.URL;

Expand Down
Loading

0 comments on commit d3ecfb2

Please sign in to comment.