Skip to content

Commit

Permalink
Merge pull request #24448 from gsmet/rest-client-reactive-jaxb-jsonb
Browse files Browse the repository at this point in the history 
Add REST Client Reactive extensions for JAXB and JSON-B
  • Loading branch information
@gsmet
gsmet authored Mar 21, 2022
2 parents cd22cb5 + a79fe70 commit c9b15fb
Show file tree
Hide file tree
Showing 38 changed files with 972 additions and 35 deletions.
40 changes: 40 additions & 0 deletions bom/application/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2157,6 +2157,26 @@
<artifactId>quarkus-rest-client-reactive-jackson-deployment</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-rest-client-reactive-jaxb</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-rest-client-reactive-jaxb-deployment</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-rest-client-reactive-jsonb</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-rest-client-reactive-jsonb-deployment</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-resteasy-reactive-kotlin-serialization-common</artifactId>
Expand Down Expand Up @@ -2197,6 +2217,16 @@
<artifactId>quarkus-resteasy-reactive-jsonb-deployment</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-resteasy-reactive-jsonb-common</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-resteasy-reactive-jsonb-common-deployment</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-resteasy-reactive-jaxb</artifactId>
Expand All @@ -2207,6 +2237,16 @@
<artifactId>quarkus-resteasy-reactive-jaxb-deployment</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-resteasy-reactive-jaxb-common</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-resteasy-reactive-jaxb-common-deployment</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-resteasy-reactive-jackson</artifactId>
Expand Down
2 changes: 2 additions & 0 deletions core/deployment/src/main/java/io/quarkus/deployment/Feature.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,8 @@ public enum Feature {
REST_CLIENT_MUTINY,
REST_CLIENT_REACTIVE,
REST_CLIENT_REACTIVE_JACKSON,
REST_CLIENT_REACTIVE_JAXB,
REST_CLIENT_REACTIVE_JSONB,
REST_CLIENT_REACTIVE_KOTLIN_SERIALIZATION,
SCALA,
SCHEDULER,
Expand Down
52 changes: 52 additions & 0 deletions devtools/bom-descriptor-json/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1813,6 +1813,32 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-rest-client-reactive-jaxb</artifactId>
<version>${project.version}</version>
<type>pom</type>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-rest-client-reactive-jsonb</artifactId>
<version>${project.version}</version>
<type>pom</type>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-rest-client-reactive-kotlin-serialization</artifactId>
Expand Down Expand Up @@ -2034,6 +2060,19 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-resteasy-reactive-jaxb-common</artifactId>
<version>${project.version}</version>
<type>pom</type>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-resteasy-reactive-jsonb</artifactId>
Expand All @@ -2047,6 +2086,19 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-resteasy-reactive-jsonb-common</artifactId>
<version>${project.version}</version>
<type>pom</type>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-resteasy-reactive-kotlin</artifactId>
Expand Down
2 changes: 2 additions & 0 deletions devtools/bom-descriptor-json/src/main/resources/catalog-overrides.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
"io.quarkus:quarkus-resteasy-reactive-links",
"io.quarkus:quarkus-rest-client-reactive",
"io.quarkus:quarkus-rest-client-reactive-jackson",
"io.quarkus:quarkus-rest-client-reactive-jsonb",
"io.quarkus:quarkus-rest-client-reactive-jaxb",
"io.quarkus:quarkus-rest-client-reactive-kotlin-serialization",
"io.quarkus:quarkus-resteasy",
"io.quarkus:quarkus-resteasy-jackson",
Expand Down
52 changes: 52 additions & 0 deletions docs/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1773,6 +1773,32 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-rest-client-reactive-jaxb-deployment</artifactId>
<version>${project.version}</version>
<type>pom</type>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-rest-client-reactive-jsonb-deployment</artifactId>
<version>${project.version}</version>
<type>pom</type>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-rest-client-reactive-kotlin-serialization-deployment</artifactId>
Expand Down Expand Up @@ -1994,6 +2020,19 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-resteasy-reactive-jaxb-common-deployment</artifactId>
<version>${project.version}</version>
<type>pom</type>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-resteasy-reactive-jsonb-deployment</artifactId>
Expand All @@ -2007,6 +2046,19 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-resteasy-reactive-jsonb-common-deployment</artifactId>
<version>${project.version}</version>
<type>pom</type>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-resteasy-reactive-kotlin-deployment</artifactId>
Expand Down
4 changes: 4 additions & 0 deletions extensions/resteasy-reactive/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,16 @@
<module>quarkus-resteasy-reactive-jackson</module>
<module>quarkus-resteasy-reactive-jackson-common</module>
<module>quarkus-resteasy-reactive-jsonb</module>
<module>quarkus-resteasy-reactive-jsonb-common</module>
<module>quarkus-resteasy-reactive-jaxb</module>
<module>quarkus-resteasy-reactive-jaxb-common</module>
<module>quarkus-resteasy-reactive-qute</module>
<module>quarkus-resteasy-reactive-servlet</module>
<module>jaxrs-client-reactive</module>
<module>rest-client-reactive</module>
<module>rest-client-reactive-jackson</module>
<module>rest-client-reactive-jsonb</module>
<module>rest-client-reactive-jaxb</module>
<module>rest-client-reactive-kotlin-serialization</module>
<module>quarkus-resteasy-reactive-links</module>
<module>quarkus-resteasy-reactive-kotlin</module>
Expand Down
46 changes: 46 additions & 0 deletions extensions/resteasy-reactive/quarkus-resteasy-reactive-jaxb-common/deployment/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>quarkus-resteasy-reactive-jaxb-common-parent</artifactId>
<groupId>io.quarkus</groupId>
<version>999-SNAPSHOT</version>
</parent>

<artifactId>quarkus-resteasy-reactive-jaxb-common-deployment</artifactId>
<name>Quarkus - RESTEasy Reactive - JAXB Common Bits - Deployment</name>

<dependencies>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-resteasy-reactive-common-deployment</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-jaxb-deployment</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-resteasy-reactive-jaxb-common</artifactId>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<annotationProcessorPaths>
<path>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-extension-processor</artifactId>
<version>${project.version}</version>
</path>
</annotationProcessorPaths>
</configuration>
</plugin>
</plugins>
</build>
</project>
15 changes: 4 additions & 11 deletions ...cessor/ResteasyReactiveJaxbProcessor.java → .../ResteasyReactiveJaxbCommonProcessor.java
View file
Original file line number Diff line number Diff line change
@@ -1,25 +1,18 @@
package io.quarkus.resteasy.reactive.jaxb.deployment.processor;
package io.quarkus.resteasy.reactive.jaxb.common.deployment;

import java.util.Collections;

import javax.ws.rs.core.MediaType;

import io.quarkus.arc.deployment.AdditionalBeanBuildItem;
import io.quarkus.deployment.Feature;
import io.quarkus.deployment.annotations.BuildProducer;
import io.quarkus.deployment.annotations.BuildStep;
import io.quarkus.deployment.builditem.FeatureBuildItem;
import io.quarkus.resteasy.reactive.jaxb.runtime.serialisers.JaxbMessageBodyReader;
import io.quarkus.resteasy.reactive.jaxb.runtime.serialisers.JaxbMessageBodyWriter;
import io.quarkus.resteasy.reactive.jaxb.common.runtime.serialisers.JaxbMessageBodyReader;
import io.quarkus.resteasy.reactive.jaxb.common.runtime.serialisers.JaxbMessageBodyWriter;
import io.quarkus.resteasy.reactive.spi.MessageBodyReaderBuildItem;
import io.quarkus.resteasy.reactive.spi.MessageBodyWriterBuildItem;

public class ResteasyReactiveJaxbProcessor {

@BuildStep
void feature(BuildProducer<FeatureBuildItem> feature) {
feature.produce(new FeatureBuildItem(Feature.RESTEASY_REACTIVE_JAXB));
}
public class ResteasyReactiveJaxbCommonProcessor {

@BuildStep
void additionalProviders(BuildProducer<AdditionalBeanBuildItem> additionalBean,
Expand Down
20 changes: 20 additions & 0 deletions extensions/resteasy-reactive/quarkus-resteasy-reactive-jaxb-common/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>quarkus-resteasy-reactive-parent-aggregator</artifactId>
<groupId>io.quarkus</groupId>
<version>999-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

<artifactId>quarkus-resteasy-reactive-jaxb-common-parent</artifactId>
<name>Quarkus - RESTEasy Reactive - JAXB Common Bits</name>
<packaging>pom</packaging>
<modules>
<module>deployment</module>
<module>runtime</module>
</modules>
</project>
53 changes: 53 additions & 0 deletions extensions/resteasy-reactive/quarkus-resteasy-reactive-jaxb-common/runtime/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>quarkus-resteasy-reactive-jaxb-common-parent</artifactId>
<groupId>io.quarkus</groupId>
<version>999-SNAPSHOT</version>
</parent>

<artifactId>quarkus-resteasy-reactive-jaxb-common</artifactId>
<name>Quarkus - RESTEasy Reactive - JAXB Common Bits- Runtime</name>
<description>Common classes for JAXB serialization support for RESTEasy Reactive</description>

<dependencies>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-resteasy-reactive-common</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus.resteasy.reactive</groupId>
<artifactId>resteasy-reactive</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-jaxb</artifactId>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-bootstrap-maven-plugin</artifactId>
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<annotationProcessorPaths>
<path>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-extension-processor</artifactId>
<version>${project.version}</version>
</path>
</annotationProcessorPaths>
</configuration>
</plugin>
</plugins>
</build>


</project>
2 changes: 1 addition & 1 deletion ...me/serialisers/JaxbMessageBodyReader.java → ...me/serialisers/JaxbMessageBodyReader.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.quarkus.resteasy.reactive.jaxb.runtime.serialisers;
package io.quarkus.resteasy.reactive.jaxb.common.runtime.serialisers;

import java.io.IOException;
import java.io.InputStream;
Expand Down
Loading

0 comments on commit c9b15fb

Please sign in to comment.