diff --git a/extensions/resteasy-reactive/jaxrs-client-reactive/deployment/src/main/java/io/quarkus/jaxrs/client/reactive/deployment/JaxrsClientReactiveProcessor.java b/extensions/resteasy-reactive/jaxrs-client-reactive/deployment/src/main/java/io/quarkus/jaxrs/client/reactive/deployment/JaxrsClientReactiveProcessor.java index a11199347a4fe..92f0035c40743 100644 --- a/extensions/resteasy-reactive/jaxrs-client-reactive/deployment/src/main/java/io/quarkus/jaxrs/client/reactive/deployment/JaxrsClientReactiveProcessor.java +++ b/extensions/resteasy-reactive/jaxrs-client-reactive/deployment/src/main/java/io/quarkus/jaxrs/client/reactive/deployment/JaxrsClientReactiveProcessor.java @@ -56,6 +56,13 @@ import org.jboss.resteasy.reactive.client.impl.ClientImpl; import org.jboss.resteasy.reactive.client.impl.UniInvoker; import org.jboss.resteasy.reactive.client.impl.WebTargetImpl; +import org.jboss.resteasy.reactive.client.processor.beanparam.BeanParamItem; +import org.jboss.resteasy.reactive.client.processor.beanparam.ClientBeanParamInfo; +import org.jboss.resteasy.reactive.client.processor.beanparam.CookieParamItem; +import org.jboss.resteasy.reactive.client.processor.beanparam.HeaderParamItem; +import org.jboss.resteasy.reactive.client.processor.beanparam.Item; +import org.jboss.resteasy.reactive.client.processor.beanparam.QueryParamItem; +import org.jboss.resteasy.reactive.client.processor.scanning.ClientEndpointIndexer; import org.jboss.resteasy.reactive.client.spi.ClientRestHandler; import org.jboss.resteasy.reactive.common.core.GenericTypeMapping; import org.jboss.resteasy.reactive.common.core.ResponseBuilderFactory; @@ -106,12 +113,6 @@ import io.quarkus.gizmo.MethodDescriptor; import io.quarkus.gizmo.ResultHandle; import io.quarkus.gizmo.TryBlock; -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.jaxrs.client.reactive.runtime.MultipartFormUtils; diff --git a/extensions/resteasy-reactive/jaxrs-client-reactive/deployment/src/main/java/io/quarkus/jaxrs/client/reactive/deployment/beanparam/BeanParamItem.java b/independent-projects/resteasy-reactive/client/processor/src/main/java/org/jboss/resteasy/reactive/client/processor/beanparam/BeanParamItem.java similarity index 83% rename from extensions/resteasy-reactive/jaxrs-client-reactive/deployment/src/main/java/io/quarkus/jaxrs/client/reactive/deployment/beanparam/BeanParamItem.java rename to independent-projects/resteasy-reactive/client/processor/src/main/java/org/jboss/resteasy/reactive/client/processor/beanparam/BeanParamItem.java index 08c764cd6c035..6e8da45aeb95e 100644 --- a/extensions/resteasy-reactive/jaxrs-client-reactive/deployment/src/main/java/io/quarkus/jaxrs/client/reactive/deployment/beanparam/BeanParamItem.java +++ b/independent-projects/resteasy-reactive/client/processor/src/main/java/org/jboss/resteasy/reactive/client/processor/beanparam/BeanParamItem.java @@ -1,4 +1,4 @@ -package io.quarkus.jaxrs.client.reactive.deployment.beanparam; +package org.jboss.resteasy.reactive.client.processor.beanparam; import java.util.List; diff --git a/extensions/resteasy-reactive/jaxrs-client-reactive/deployment/src/main/java/io/quarkus/jaxrs/client/reactive/deployment/beanparam/BeanParamParser.java b/independent-projects/resteasy-reactive/client/processor/src/main/java/org/jboss/resteasy/reactive/client/processor/beanparam/BeanParamParser.java similarity index 99% rename from extensions/resteasy-reactive/jaxrs-client-reactive/deployment/src/main/java/io/quarkus/jaxrs/client/reactive/deployment/beanparam/BeanParamParser.java rename to independent-projects/resteasy-reactive/client/processor/src/main/java/org/jboss/resteasy/reactive/client/processor/beanparam/BeanParamParser.java index 6243bdcd7b4ce..74739e1d61ac8 100644 --- a/extensions/resteasy-reactive/jaxrs-client-reactive/deployment/src/main/java/io/quarkus/jaxrs/client/reactive/deployment/beanparam/BeanParamParser.java +++ b/independent-projects/resteasy-reactive/client/processor/src/main/java/org/jboss/resteasy/reactive/client/processor/beanparam/BeanParamParser.java @@ -1,4 +1,4 @@ -package io.quarkus.jaxrs.client.reactive.deployment.beanparam; +package org.jboss.resteasy.reactive.client.processor.beanparam; import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.BEAN_PARAM; import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.COOKIE_PARAM; @@ -8,7 +8,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; - import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.AnnotationTarget; import org.jboss.jandex.ClassInfo; diff --git a/extensions/resteasy-reactive/jaxrs-client-reactive/deployment/src/main/java/io/quarkus/jaxrs/client/reactive/deployment/beanparam/ClientBeanParamInfo.java b/independent-projects/resteasy-reactive/client/processor/src/main/java/org/jboss/resteasy/reactive/client/processor/beanparam/ClientBeanParamInfo.java similarity index 88% rename from extensions/resteasy-reactive/jaxrs-client-reactive/deployment/src/main/java/io/quarkus/jaxrs/client/reactive/deployment/beanparam/ClientBeanParamInfo.java rename to independent-projects/resteasy-reactive/client/processor/src/main/java/org/jboss/resteasy/reactive/client/processor/beanparam/ClientBeanParamInfo.java index 7f8a430d0f398..99a14353f3c3d 100644 --- a/extensions/resteasy-reactive/jaxrs-client-reactive/deployment/src/main/java/io/quarkus/jaxrs/client/reactive/deployment/beanparam/ClientBeanParamInfo.java +++ b/independent-projects/resteasy-reactive/client/processor/src/main/java/org/jboss/resteasy/reactive/client/processor/beanparam/ClientBeanParamInfo.java @@ -1,7 +1,6 @@ -package io.quarkus.jaxrs.client.reactive.deployment.beanparam; +package org.jboss.resteasy.reactive.client.processor.beanparam; import java.util.List; - import org.jboss.resteasy.reactive.common.model.MethodParameter; import org.jboss.resteasy.reactive.common.model.ParameterType; diff --git a/extensions/resteasy-reactive/jaxrs-client-reactive/deployment/src/main/java/io/quarkus/jaxrs/client/reactive/deployment/beanparam/CookieParamItem.java b/independent-projects/resteasy-reactive/client/processor/src/main/java/org/jboss/resteasy/reactive/client/processor/beanparam/CookieParamItem.java similarity index 83% rename from extensions/resteasy-reactive/jaxrs-client-reactive/deployment/src/main/java/io/quarkus/jaxrs/client/reactive/deployment/beanparam/CookieParamItem.java rename to independent-projects/resteasy-reactive/client/processor/src/main/java/org/jboss/resteasy/reactive/client/processor/beanparam/CookieParamItem.java index 16d70bdd6e548..6f8dc72a5c47b 100644 --- a/extensions/resteasy-reactive/jaxrs-client-reactive/deployment/src/main/java/io/quarkus/jaxrs/client/reactive/deployment/beanparam/CookieParamItem.java +++ b/independent-projects/resteasy-reactive/client/processor/src/main/java/org/jboss/resteasy/reactive/client/processor/beanparam/CookieParamItem.java @@ -1,4 +1,4 @@ -package io.quarkus.jaxrs.client.reactive.deployment.beanparam; +package org.jboss.resteasy.reactive.client.processor.beanparam; public class CookieParamItem extends Item { private final String cookieName; diff --git a/extensions/resteasy-reactive/jaxrs-client-reactive/deployment/src/main/java/io/quarkus/jaxrs/client/reactive/deployment/beanparam/FieldExtractor.java b/independent-projects/resteasy-reactive/client/processor/src/main/java/org/jboss/resteasy/reactive/client/processor/beanparam/FieldExtractor.java similarity index 88% rename from extensions/resteasy-reactive/jaxrs-client-reactive/deployment/src/main/java/io/quarkus/jaxrs/client/reactive/deployment/beanparam/FieldExtractor.java rename to independent-projects/resteasy-reactive/client/processor/src/main/java/org/jboss/resteasy/reactive/client/processor/beanparam/FieldExtractor.java index 9fb1b28cb97ee..7217063d67518 100644 --- a/extensions/resteasy-reactive/jaxrs-client-reactive/deployment/src/main/java/io/quarkus/jaxrs/client/reactive/deployment/beanparam/FieldExtractor.java +++ b/independent-projects/resteasy-reactive/client/processor/src/main/java/org/jboss/resteasy/reactive/client/processor/beanparam/FieldExtractor.java @@ -1,9 +1,9 @@ -package io.quarkus.jaxrs.client.reactive.deployment.beanparam; +package org.jboss.resteasy.reactive.client.processor.beanparam; import io.quarkus.gizmo.BytecodeCreator; import io.quarkus.gizmo.MethodDescriptor; import io.quarkus.gizmo.ResultHandle; -import io.quarkus.jaxrs.client.reactive.runtime.ReflectionUtil; +import org.jboss.resteasy.reactive.client.impl.ReflectionUtil; public class FieldExtractor extends ValueExtractor { diff --git a/extensions/resteasy-reactive/jaxrs-client-reactive/deployment/src/main/java/io/quarkus/jaxrs/client/reactive/deployment/beanparam/GetterExtractor.java b/independent-projects/resteasy-reactive/client/processor/src/main/java/org/jboss/resteasy/reactive/client/processor/beanparam/GetterExtractor.java similarity index 88% rename from extensions/resteasy-reactive/jaxrs-client-reactive/deployment/src/main/java/io/quarkus/jaxrs/client/reactive/deployment/beanparam/GetterExtractor.java rename to independent-projects/resteasy-reactive/client/processor/src/main/java/org/jboss/resteasy/reactive/client/processor/beanparam/GetterExtractor.java index 758732df141dc..b112083c376dc 100644 --- a/extensions/resteasy-reactive/jaxrs-client-reactive/deployment/src/main/java/io/quarkus/jaxrs/client/reactive/deployment/beanparam/GetterExtractor.java +++ b/independent-projects/resteasy-reactive/client/processor/src/main/java/org/jboss/resteasy/reactive/client/processor/beanparam/GetterExtractor.java @@ -1,9 +1,8 @@ -package io.quarkus.jaxrs.client.reactive.deployment.beanparam; - -import org.jboss.jandex.MethodInfo; +package org.jboss.resteasy.reactive.client.processor.beanparam; import io.quarkus.gizmo.BytecodeCreator; import io.quarkus.gizmo.ResultHandle; +import org.jboss.jandex.MethodInfo; public class GetterExtractor extends ValueExtractor { diff --git a/extensions/resteasy-reactive/jaxrs-client-reactive/deployment/src/main/java/io/quarkus/jaxrs/client/reactive/deployment/beanparam/HeaderParamItem.java b/independent-projects/resteasy-reactive/client/processor/src/main/java/org/jboss/resteasy/reactive/client/processor/beanparam/HeaderParamItem.java similarity index 83% rename from extensions/resteasy-reactive/jaxrs-client-reactive/deployment/src/main/java/io/quarkus/jaxrs/client/reactive/deployment/beanparam/HeaderParamItem.java rename to independent-projects/resteasy-reactive/client/processor/src/main/java/org/jboss/resteasy/reactive/client/processor/beanparam/HeaderParamItem.java index 65a09bf3507bf..b4e37d4430e7b 100644 --- a/extensions/resteasy-reactive/jaxrs-client-reactive/deployment/src/main/java/io/quarkus/jaxrs/client/reactive/deployment/beanparam/HeaderParamItem.java +++ b/independent-projects/resteasy-reactive/client/processor/src/main/java/org/jboss/resteasy/reactive/client/processor/beanparam/HeaderParamItem.java @@ -1,4 +1,4 @@ -package io.quarkus.jaxrs.client.reactive.deployment.beanparam; +package org.jboss.resteasy.reactive.client.processor.beanparam; public class HeaderParamItem extends Item { private final String headerName; diff --git a/extensions/resteasy-reactive/jaxrs-client-reactive/deployment/src/main/java/io/quarkus/jaxrs/client/reactive/deployment/beanparam/Item.java b/independent-projects/resteasy-reactive/client/processor/src/main/java/org/jboss/resteasy/reactive/client/processor/beanparam/Item.java similarity index 89% rename from extensions/resteasy-reactive/jaxrs-client-reactive/deployment/src/main/java/io/quarkus/jaxrs/client/reactive/deployment/beanparam/Item.java rename to independent-projects/resteasy-reactive/client/processor/src/main/java/org/jboss/resteasy/reactive/client/processor/beanparam/Item.java index 70e25310f4e2f..2cdd440b48e99 100644 --- a/extensions/resteasy-reactive/jaxrs-client-reactive/deployment/src/main/java/io/quarkus/jaxrs/client/reactive/deployment/beanparam/Item.java +++ b/independent-projects/resteasy-reactive/client/processor/src/main/java/org/jboss/resteasy/reactive/client/processor/beanparam/Item.java @@ -1,4 +1,4 @@ -package io.quarkus.jaxrs.client.reactive.deployment.beanparam; +package org.jboss.resteasy.reactive.client.processor.beanparam; import io.quarkus.gizmo.BytecodeCreator; import io.quarkus.gizmo.ResultHandle; diff --git a/extensions/resteasy-reactive/jaxrs-client-reactive/deployment/src/main/java/io/quarkus/jaxrs/client/reactive/deployment/beanparam/ItemType.java b/independent-projects/resteasy-reactive/client/processor/src/main/java/org/jboss/resteasy/reactive/client/processor/beanparam/ItemType.java similarity index 62% rename from extensions/resteasy-reactive/jaxrs-client-reactive/deployment/src/main/java/io/quarkus/jaxrs/client/reactive/deployment/beanparam/ItemType.java rename to independent-projects/resteasy-reactive/client/processor/src/main/java/org/jboss/resteasy/reactive/client/processor/beanparam/ItemType.java index 410632fcab2bb..747bb0a141cbd 100644 --- a/extensions/resteasy-reactive/jaxrs-client-reactive/deployment/src/main/java/io/quarkus/jaxrs/client/reactive/deployment/beanparam/ItemType.java +++ b/independent-projects/resteasy-reactive/client/processor/src/main/java/org/jboss/resteasy/reactive/client/processor/beanparam/ItemType.java @@ -1,4 +1,4 @@ -package io.quarkus.jaxrs.client.reactive.deployment.beanparam; +package org.jboss.resteasy.reactive.client.processor.beanparam; public enum ItemType { BEAN_PARAM, diff --git a/extensions/resteasy-reactive/jaxrs-client-reactive/deployment/src/main/java/io/quarkus/jaxrs/client/reactive/deployment/beanparam/QueryParamItem.java b/independent-projects/resteasy-reactive/client/processor/src/main/java/org/jboss/resteasy/reactive/client/processor/beanparam/QueryParamItem.java similarity index 87% rename from extensions/resteasy-reactive/jaxrs-client-reactive/deployment/src/main/java/io/quarkus/jaxrs/client/reactive/deployment/beanparam/QueryParamItem.java rename to independent-projects/resteasy-reactive/client/processor/src/main/java/org/jboss/resteasy/reactive/client/processor/beanparam/QueryParamItem.java index fb58bdb948aff..8fb3cc58a2e0f 100644 --- a/extensions/resteasy-reactive/jaxrs-client-reactive/deployment/src/main/java/io/quarkus/jaxrs/client/reactive/deployment/beanparam/QueryParamItem.java +++ b/independent-projects/resteasy-reactive/client/processor/src/main/java/org/jboss/resteasy/reactive/client/processor/beanparam/QueryParamItem.java @@ -1,4 +1,4 @@ -package io.quarkus.jaxrs.client.reactive.deployment.beanparam; +package org.jboss.resteasy.reactive.client.processor.beanparam; import org.jboss.jandex.Type; diff --git a/extensions/resteasy-reactive/jaxrs-client-reactive/deployment/src/main/java/io/quarkus/jaxrs/client/reactive/deployment/beanparam/ValueExtractor.java b/independent-projects/resteasy-reactive/client/processor/src/main/java/org/jboss/resteasy/reactive/client/processor/beanparam/ValueExtractor.java similarity index 76% rename from extensions/resteasy-reactive/jaxrs-client-reactive/deployment/src/main/java/io/quarkus/jaxrs/client/reactive/deployment/beanparam/ValueExtractor.java rename to independent-projects/resteasy-reactive/client/processor/src/main/java/org/jboss/resteasy/reactive/client/processor/beanparam/ValueExtractor.java index 8cdee17ff1b7c..342ac81a0580a 100644 --- a/extensions/resteasy-reactive/jaxrs-client-reactive/deployment/src/main/java/io/quarkus/jaxrs/client/reactive/deployment/beanparam/ValueExtractor.java +++ b/independent-projects/resteasy-reactive/client/processor/src/main/java/org/jboss/resteasy/reactive/client/processor/beanparam/ValueExtractor.java @@ -1,4 +1,4 @@ -package io.quarkus.jaxrs.client.reactive.deployment.beanparam; +package org.jboss.resteasy.reactive.client.processor.beanparam; import io.quarkus.gizmo.BytecodeCreator; import io.quarkus.gizmo.ResultHandle; diff --git a/extensions/resteasy-reactive/jaxrs-client-reactive/deployment/src/main/java/io/quarkus/jaxrs/client/reactive/deployment/ClientEndpointIndexer.java b/independent-projects/resteasy-reactive/client/processor/src/main/java/org/jboss/resteasy/reactive/client/processor/scanning/ClientEndpointIndexer.java similarity index 95% rename from extensions/resteasy-reactive/jaxrs-client-reactive/deployment/src/main/java/io/quarkus/jaxrs/client/reactive/deployment/ClientEndpointIndexer.java rename to independent-projects/resteasy-reactive/client/processor/src/main/java/org/jboss/resteasy/reactive/client/processor/scanning/ClientEndpointIndexer.java index d0f49dc03b254..fb3dd2d669a79 100644 --- a/extensions/resteasy-reactive/jaxrs-client-reactive/deployment/src/main/java/io/quarkus/jaxrs/client/reactive/deployment/ClientEndpointIndexer.java +++ b/independent-projects/resteasy-reactive/client/processor/src/main/java/org/jboss/resteasy/reactive/client/processor/scanning/ClientEndpointIndexer.java @@ -1,4 +1,4 @@ -package io.quarkus.jaxrs.client.reactive.deployment; +package org.jboss.resteasy.reactive.client.processor.scanning; import static javax.ws.rs.core.MediaType.APPLICATION_JSON; import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.JSONP_JSON_ARRAY; @@ -11,15 +11,16 @@ import java.util.HashSet; import java.util.List; import java.util.Map; - import javax.ws.rs.core.MediaType; - import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.ClassInfo; import org.jboss.jandex.DotName; import org.jboss.jandex.IndexView; import org.jboss.jandex.MethodInfo; import org.jboss.jandex.Type; +import org.jboss.resteasy.reactive.client.processor.beanparam.BeanParamParser; +import org.jboss.resteasy.reactive.client.processor.beanparam.ClientBeanParamInfo; +import org.jboss.resteasy.reactive.client.processor.beanparam.Item; import org.jboss.resteasy.reactive.common.model.InjectableBean; import org.jboss.resteasy.reactive.common.model.MaybeRestClientInterface; import org.jboss.resteasy.reactive.common.model.MethodParameter; @@ -36,12 +37,9 @@ import org.jboss.resteasy.reactive.common.providers.serialisers.jsonp.JsonStructureHandler; import org.jboss.resteasy.reactive.common.providers.serialisers.jsonp.JsonValueHandler; -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 { + static final DotName CONTINUATION = DotName.createSimple("kotlin.coroutines.Continuation"); private final String[] defaultProduces; private final String[] defaultProducesNegotiated; @@ -130,7 +128,7 @@ elementType, toClassName(paramType, currentClassInfo, actualEndpointInfo, index) @Override protected boolean handleCustomParameter(Map anns, ClientIndexedParam builder, Type paramType, boolean field, Map methodContext) { - if (paramType.name().equals(JaxrsClientReactiveProcessor.CONTINUATION)) { + if (paramType.name().equals(CONTINUATION)) { builder.setType(ParameterType.CUSTOM); return true; } diff --git a/extensions/resteasy-reactive/jaxrs-client-reactive/runtime/src/main/java/io/quarkus/jaxrs/client/reactive/runtime/ReflectionUtil.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ReflectionUtil.java similarity index 94% rename from extensions/resteasy-reactive/jaxrs-client-reactive/runtime/src/main/java/io/quarkus/jaxrs/client/reactive/runtime/ReflectionUtil.java rename to independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ReflectionUtil.java index 3292d6427eceb..27658097adf80 100644 --- a/extensions/resteasy-reactive/jaxrs-client-reactive/runtime/src/main/java/io/quarkus/jaxrs/client/reactive/runtime/ReflectionUtil.java +++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ReflectionUtil.java @@ -1,4 +1,4 @@ -package io.quarkus.jaxrs.client.reactive.runtime; +package org.jboss.resteasy.reactive.client.impl; import java.lang.reflect.Field;