Skip to content

Commit

Permalink
Merge pull request quarkusio#15723 from michalszynkiewicz/rename-rr-m…
Browse files Browse the repository at this point in the history
…p-client

Rename RestEasy Reactive MP Client to quarkus-rest-client-reactive
  • Loading branch information
michalszynkiewicz authored Mar 16, 2021
2 parents 6e39ee8 + a2ad55d commit 810b9e8
Show file tree
Hide file tree
Showing 46 changed files with 67 additions and 69 deletions.
4 changes: 2 additions & 2 deletions bom/application/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1904,12 +1904,12 @@
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-rest-client-microprofile</artifactId>
<artifactId>quarkus-rest-client-reactive</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-rest-client-microprofile-deployment</artifactId>
<artifactId>quarkus-rest-client-reactive-deployment</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
Expand Down
4 changes: 2 additions & 2 deletions devtools/bom-descriptor-json/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1752,7 +1752,7 @@
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-rest-client-microprofile</artifactId>
<artifactId>quarkus-rest-client-mutiny</artifactId>
<version>${project.version}</version>
<type>pom</type>
<scope>test</scope>
Expand All @@ -1765,7 +1765,7 @@
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-rest-client-mutiny</artifactId>
<artifactId>quarkus-rest-client-reactive</artifactId>
<version>${project.version}</version>
<type>pom</type>
<scope>test</scope>
Expand Down
4 changes: 2 additions & 2 deletions docs/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1711,7 +1711,7 @@
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-rest-client-microprofile-deployment</artifactId>
<artifactId>quarkus-rest-client-mutiny-deployment</artifactId>
<version>${project.version}</version>
<type>pom</type>
<scope>test</scope>
Expand All @@ -1724,7 +1724,7 @@
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-rest-client-mutiny-deployment</artifactId>
<artifactId>quarkus-rest-client-reactive-deployment</artifactId>
<version>${project.version}</version>
<type>pom</type>
<scope>test</scope>
Expand Down
2 changes: 1 addition & 1 deletion docs/src/main/asciidoc/resteasy-reactive.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -1817,7 +1817,7 @@ Please note that if a JAX-RS Application has been detected and the method `getCl
== RESTEasy Reactive client
In addition to the Server side, RESTEasy Reactive comes with a new MicroProfile Rest Client implementation that is non-blocking at its core.

To use it, add the `quarkus-rest-client-microprofile` extension to your project.
To use it, add the `quarkus-rest-client-reactive` extension to your project.
The client can be used as described in https://quarkus.io/guides/rest-client[Using the REST Client guide] and specified in the https://download.eclipse.org/microprofile/microprofile-rest-client-1.4.1/microprofile-rest-client-1.4.1.html[MicroProfile Rest Client specification], with a few exceptions:

- the extension name
Expand Down
2 changes: 1 addition & 1 deletion extensions/resteasy-reactive/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@
<name>Quarkus - RESTEasy Reactive - Parent - Aggregator</name>
<packaging>pom</packaging>
<modules>
<module>rest-client-microprofile</module>
<module>quarkus-resteasy-reactive-common</module>
<module>quarkus-resteasy-reactive</module>
<module>quarkus-jaxrs-client</module>
<module>quarkus-resteasy-reactive-jackson</module>
<module>quarkus-resteasy-reactive-jsonb</module>
<module>quarkus-resteasy-reactive-qute</module>
<module>quarkus-resteasy-reactive-servlet</module>
<module>rest-client-reactive</module>
</modules>

</project>
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,18 @@
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-rest-client-microprofile-parent</artifactId>
<artifactId>quarkus-rest-client-reactive-parent</artifactId>
<groupId>io.quarkus</groupId>
<version>999-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

<artifactId>quarkus-rest-client-microprofile-deployment</artifactId>
<name>Quarkus - MicroProfile Rest Client - Deployment</name>
<artifactId>quarkus-rest-client-reactive-deployment</artifactId>
<name>Quarkus - MicroProfile Rest Client with RestEasy Reactive - Deployment</name>
<dependencies>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-rest-client-microprofile</artifactId>
<artifactId>quarkus-rest-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.microprofile.deployment;
package io.quarkus.rest.client.reactive.deployment;

import org.eclipse.microprofile.rest.client.annotation.ClientHeaderParam;
import org.eclipse.microprofile.rest.client.annotation.ClientHeaderParams;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package io.quarkus.resteasy.reactive.client.microprofile.deployment;
package io.quarkus.rest.client.reactive.deployment;

import static io.quarkus.arc.processor.DotNames.STRING;
import static io.quarkus.resteasy.reactive.client.microprofile.deployment.DotNames.CLIENT_HEADER_PARAM;
import static io.quarkus.resteasy.reactive.client.microprofile.deployment.DotNames.CLIENT_HEADER_PARAMS;
import static io.quarkus.resteasy.reactive.client.microprofile.deployment.DotNames.REGISTER_CLIENT_HEADERS;
import static io.quarkus.resteasy.reactive.client.microprofile.deployment.DotNames.REGISTER_PROVIDER;
import static io.quarkus.resteasy.reactive.client.microprofile.deployment.DotNames.REGISTER_PROVIDERS;
import static io.quarkus.rest.client.reactive.deployment.DotNames.CLIENT_HEADER_PARAM;
import static io.quarkus.rest.client.reactive.deployment.DotNames.CLIENT_HEADER_PARAMS;
import static io.quarkus.rest.client.reactive.deployment.DotNames.REGISTER_CLIENT_HEADERS;
import static io.quarkus.rest.client.reactive.deployment.DotNames.REGISTER_PROVIDER;
import static io.quarkus.rest.client.reactive.deployment.DotNames.REGISTER_PROVIDERS;
import static org.objectweb.asm.Opcodes.ACC_STATIC;

import java.lang.annotation.Annotation;
Expand Down Expand Up @@ -52,10 +52,10 @@
import io.quarkus.gizmo.MethodDescriptor;
import io.quarkus.gizmo.ResultHandle;
import io.quarkus.gizmo.TryBlock;
import io.quarkus.rest.client.reactive.HeaderFiller;
import io.quarkus.rest.client.reactive.MicroProfileRestClientRequestFilter;
import io.quarkus.rest.client.reactive.NoOpHeaderFiller;
import io.quarkus.resteasy.reactive.client.deployment.JaxrsClientEnricher;
import io.quarkus.resteasy.reactive.client.microprofile.HeaderFiller;
import io.quarkus.resteasy.reactive.client.microprofile.MicroProfileRestClientRequestFilter;
import io.quarkus.resteasy.reactive.client.microprofile.NoOpHeaderFiller;
import io.quarkus.runtime.util.HashUtil;

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

import static org.jboss.resteasy.reactive.common.processor.EndpointIndexer.CDI_WRAPPER_SUFFIX;
import static org.jboss.resteasy.reactive.common.processor.scanning.ResteasyReactiveScanner.BUILTIN_HTTP_ANNOTATIONS_TO_METHOD;
Expand Down Expand Up @@ -48,14 +48,14 @@
import io.quarkus.gizmo.MethodCreator;
import io.quarkus.gizmo.MethodDescriptor;
import io.quarkus.gizmo.ResultHandle;
import io.quarkus.rest.client.reactive.HeaderCapturingServerFilter;
import io.quarkus.rest.client.reactive.HeaderContainer;
import io.quarkus.rest.client.reactive.ReactiveResteasyMpClientConfig;
import io.quarkus.rest.client.reactive.RestClientCDIDelegateBuilder;
import io.quarkus.rest.client.reactive.recorder.RestClientRecorder;
import io.quarkus.resteasy.reactive.client.deployment.JaxrsClientEnricherBuildItem;
import io.quarkus.resteasy.reactive.client.deployment.RestClientDefaultConsumesBuildItem;
import io.quarkus.resteasy.reactive.client.deployment.RestClientDefaultProducesBuildItem;
import io.quarkus.resteasy.reactive.client.microprofile.HeaderCapturingServerFilter;
import io.quarkus.resteasy.reactive.client.microprofile.HeaderContainer;
import io.quarkus.resteasy.reactive.client.microprofile.ReactiveResteasyMpClientConfig;
import io.quarkus.resteasy.reactive.client.microprofile.RestClientCDIDelegateBuilder;
import io.quarkus.resteasy.reactive.client.microprofile.recorder.RestClientRecorder;
import io.quarkus.resteasy.reactive.spi.ContainerRequestFilterBuildItem;

class ReactiveResteasyMpClientProcessor {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.quarkus.resteasy.reactive.client;
package io.quarkus.rest.client.reactive;

import static org.assertj.core.api.Assertions.assertThat;

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

import javax.ws.rs.Consumes;
import javax.ws.rs.POST;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.quarkus.resteasy.reactive.client;
package io.quarkus.rest.client.reactive;

import javax.ws.rs.Consumes;
import javax.ws.rs.POST;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.quarkus.resteasy.reactive.client;
package io.quarkus.rest.client.reactive;

import javax.ws.rs.Consumes;
import javax.ws.rs.POST;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.quarkus.resteasy.reactive.client;
package io.quarkus.rest.client.reactive;

import static org.assertj.core.api.Assertions.assertThat;

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

import java.net.URL;

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

import javax.ws.rs.Consumes;
import javax.ws.rs.GET;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.quarkus.resteasy.reactive.client.registerclientheaders;
package io.quarkus.rest.client.reactive.registerclientheaders;

import javax.ws.rs.GET;
import javax.ws.rs.Path;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.quarkus.resteasy.reactive.client.registerclientheaders;
package io.quarkus.rest.client.reactive.registerclientheaders;

import javax.ws.rs.GET;
import javax.ws.rs.HeaderParam;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.quarkus.resteasy.reactive.client.registerclientheaders;
package io.quarkus.rest.client.reactive.registerclientheaders;

import static org.junit.jupiter.api.Assertions.assertNotNull;

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

import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.quarkus.resteasy.reactive.client.registerclientheaders;
package io.quarkus.rest.client.reactive.registerclientheaders;

import java.util.List;
import java.util.Map;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.quarkus.resteasy.reactive.client.registerclientheaders;
package io.quarkus.rest.client.reactive.registerclientheaders;

import javax.enterprise.context.ApplicationScoped;
import javax.ws.rs.Consumes;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.quarkus.resteasy.reactive.client.timeout;
package io.quarkus.rest.client.reactive.timeout;

import javax.ws.rs.Consumes;
import javax.ws.rs.GET;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.quarkus.resteasy.reactive.client.timeout;
package io.quarkus.rest.client.reactive.timeout;

import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertThrows;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.quarkus.resteasy.reactive.client.timeout;
package io.quarkus.rest.client.reactive.timeout;

import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CompletionStage;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
</parent>
<modelVersion>4.0.0</modelVersion>

<artifactId>quarkus-rest-client-microprofile-parent</artifactId>
<name>Quarkus - JAXRS Client</name>
<artifactId>quarkus-rest-client-reactive-parent</artifactId>
<name>Quarkus - MicroProfile Rest Client with Reactive RestEasy</name>
<packaging>pom</packaging>
<modules>
<module>deployment</module>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,13 @@
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-rest-client-microprofile-parent</artifactId>
<artifactId>quarkus-rest-client-reactive-parent</artifactId>
<groupId>io.quarkus</groupId>
<version>999-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

<artifactId>quarkus-rest-client-microprofile</artifactId>
<artifactId>quarkus-rest-client-reactive</artifactId>
<name>Quarkus - MicroProfile Rest Client - Runtime</name>
<description>MicroProfile Rest Client</description>

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

import org.eclipse.microprofile.rest.client.RestClientBuilder;
import org.eclipse.microprofile.rest.client.spi.RestClientBuilderResolver;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.quarkus.resteasy.reactive.client.microprofile;
package io.quarkus.rest.client.reactive;

import javax.ws.rs.WebApplicationException;
import javax.ws.rs.core.MultivaluedMap;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.quarkus.resteasy.reactive.client.microprofile;
package io.quarkus.rest.client.reactive;

import javax.ws.rs.container.ContainerRequestContext;
import javax.ws.rs.container.ContainerRequestFilter;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.quarkus.resteasy.reactive.client.microprofile;
package io.quarkus.rest.client.reactive;

import javax.enterprise.context.RequestScoped;
import javax.ws.rs.container.ContainerRequestContext;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.quarkus.resteasy.reactive.client.microprofile;
package io.quarkus.rest.client.reactive;

import javax.ws.rs.core.MultivaluedMap;

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

import java.util.ArrayList;
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.microprofile;
package io.quarkus.rest.client.reactive;

import java.io.IOException;
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.microprofile;
package io.quarkus.rest.client.reactive;

import javax.ws.rs.core.MultivaluedMap;

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

import io.quarkus.runtime.annotations.ConfigItem;
import io.quarkus.runtime.annotations.ConfigPhase;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.quarkus.resteasy.reactive.client.microprofile;
package io.quarkus.rest.client.reactive;

import java.lang.reflect.InvocationTargetException;
import java.net.URISyntaxException;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.quarkus.resteasy.reactive.client.microprofile;
package io.quarkus.rest.client.reactive;

import java.io.File;
import java.io.FileInputStream;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.quarkus.resteasy.reactive.client.microprofile;
package io.quarkus.rest.client.reactive;

import java.util.ArrayList;
import java.util.Collection;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package io.quarkus.resteasy.reactive.client.microprofile.recorder;
package io.quarkus.rest.client.reactive.recorder;

import org.eclipse.microprofile.rest.client.spi.RestClientBuilderResolver;

import io.quarkus.resteasy.reactive.client.microprofile.BuilderResolver;
import io.quarkus.rest.client.reactive.BuilderResolver;
import io.quarkus.runtime.annotations.Recorder;

@Recorder
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<!-- Client dependencies -->
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-rest-client-microprofile</artifactId>
<artifactId>quarkus-rest-client-reactive</artifactId>
</dependency>

<dependency>
Expand All @@ -42,7 +42,7 @@
<!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-rest-client-microprofile-deployment</artifactId>
<artifactId>quarkus-rest-client-reactive-deployment</artifactId>
<version>${project.version}</version>
<type>pom</type>
<scope>test</scope>
Expand Down
Loading

0 comments on commit 810b9e8

Please sign in to comment.