Merge pull request #17969 from stuartwdouglas/rr-move

Move client classes into the project
quarkusio · Jun 17, 2021 · 5b1cfac · 5b1cfac
2 parents c965b72 + c79ca43
commit 5b1cfac
Show file tree

Hide file tree

Showing 14 changed files with 27 additions and 31 deletions.
diff --git a/...c/main/java/io/quarkus/jaxrs/client/reactive/deployment/JaxrsClientReactiveProcessor.java b/...c/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/...e/deployment/beanparam/BeanParamItem.java → ...nt/processor/beanparam/BeanParamItem.java b/...e/deployment/beanparam/BeanParamItem.java → ...nt/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/...deployment/beanparam/BeanParamParser.java → .../processor/beanparam/BeanParamParser.java b/...deployment/beanparam/BeanParamParser.java → .../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/...oyment/beanparam/ClientBeanParamInfo.java → ...cessor/beanparam/ClientBeanParamInfo.java b/...oyment/beanparam/ClientBeanParamInfo.java → ...cessor/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/...deployment/beanparam/CookieParamItem.java → .../processor/beanparam/CookieParamItem.java b/...deployment/beanparam/CookieParamItem.java → .../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/.../deployment/beanparam/FieldExtractor.java → ...t/processor/beanparam/FieldExtractor.java b/.../deployment/beanparam/FieldExtractor.java → ...t/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/...deployment/beanparam/GetterExtractor.java → .../processor/beanparam/GetterExtractor.java b/...deployment/beanparam/GetterExtractor.java → .../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/...deployment/beanparam/HeaderParamItem.java → .../processor/beanparam/HeaderParamItem.java b/...deployment/beanparam/HeaderParamItem.java → .../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/...t/reactive/deployment/beanparam/Item.java → ...tive/client/processor/beanparam/Item.java b/...t/reactive/deployment/beanparam/Item.java → ...tive/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/...active/deployment/beanparam/ItemType.java → .../client/processor/beanparam/ItemType.java b/...active/deployment/beanparam/ItemType.java → .../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/.../deployment/beanparam/QueryParamItem.java → ...t/processor/beanparam/QueryParamItem.java b/.../deployment/beanparam/QueryParamItem.java → ...t/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/.../deployment/beanparam/ValueExtractor.java → ...t/processor/beanparam/ValueExtractor.java b/.../deployment/beanparam/ValueExtractor.java → ...t/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/...ive/deployment/ClientEndpointIndexer.java → ...essor/scanning/ClientEndpointIndexer.java b/...ive/deployment/ClientEndpointIndexer.java → ...essor/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<ClientEndpointIndexer, ClientEndpointIndexer.ClientIndexedParam, ResourceMethod> {
+    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<DotName, AnnotationInstance> anns, ClientIndexedParam builder, Type paramType,
             boolean field, Map<String, Object> methodContext) {
-        if (paramType.name().equals(JaxrsClientReactiveProcessor.CONTINUATION)) {
+        if (paramType.name().equals(CONTINUATION)) {
             builder.setType(ParameterType.CUSTOM);
             return true;
         }

diff --git a/...ient/reactive/runtime/ReflectionUtil.java → .../reactive/client/impl/ReflectionUtil.java b/...ient/reactive/runtime/ReflectionUtil.java → .../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;