This is an automated email from the ASF dual-hosted git repository. lburgazzoli pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 11636be01711ba65c6cd3b7229ddeac0be304722 Author: lburgazzoli <lburgazz...@gmail.com> AuthorDate: Mon Oct 21 13:40:32 2019 +0200 chore: re-organize support extensions --- .../common/deployment/CommonSupportFeature.java} | 19 +++++++++---------- .../runtime/graal/SubstituteBeansIntrospector.java | 2 +- .../runtime/graal/SubstituteBeansWeakCache.java | 2 +- .../jetty/deployment/JettySupportFeature.java} | 19 +++++++++---------- .../jetty/deployment/JettySupportProcessor.java} | 4 ++-- .../xstream/deployment/XStreamSupportFeature.java} | 19 +++++++++---------- .../xstream/deployment/XStreamSupportProcessor.java} | 4 ++-- 7 files changed, 33 insertions(+), 36 deletions(-) diff --git a/extensions/support/common/runtime/src/main/java/org/apache/camel/quarkus/common/runtime/graal/SubstituteBeansIntrospector.java b/extensions/support/common/deployment/src/main/java/org/apache/camel/quarkus/support/common/deployment/CommonSupportFeature.java similarity index 60% copy from extensions/support/common/runtime/src/main/java/org/apache/camel/quarkus/common/runtime/graal/SubstituteBeansIntrospector.java copy to extensions/support/common/deployment/src/main/java/org/apache/camel/quarkus/support/common/deployment/CommonSupportFeature.java index 22bbee7..939842d 100644 --- a/extensions/support/common/runtime/src/main/java/org/apache/camel/quarkus/common/runtime/graal/SubstituteBeansIntrospector.java +++ b/extensions/support/common/deployment/src/main/java/org/apache/camel/quarkus/support/common/deployment/CommonSupportFeature.java @@ -14,17 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.quarkus.common.runtime.graal; +package org.apache.camel.quarkus.support.common.deployment; -import java.lang.reflect.Method; +import io.quarkus.deployment.annotations.BuildStep; +import io.quarkus.deployment.builditem.FeatureBuildItem; -import com.oracle.svm.core.annotate.Alias; -import com.oracle.svm.core.annotate.RecomputeFieldValue; -import com.oracle.svm.core.annotate.TargetClass; +public class CommonSupportFeature { + private static final String FEATURE = "camel-support-common"; -@TargetClass(className = "java.beans.Introspector") -final class SubstituteBeansIntrospector { - @Alias - @RecomputeFieldValue(kind = RecomputeFieldValue.Kind.FromAlias) - private static SubstituteBeansWeakCache<Class<?>, Method[]> declaredMethodCache = new SubstituteBeansWeakCache<>(); + @BuildStep + FeatureBuildItem feature() { + return new FeatureBuildItem(FEATURE); + } } diff --git a/extensions/support/common/runtime/src/main/java/org/apache/camel/quarkus/common/runtime/graal/SubstituteBeansIntrospector.java b/extensions/support/common/runtime/src/main/java/org/apache/camel/quarkus/support/common/runtime/graal/SubstituteBeansIntrospector.java similarity index 95% copy from extensions/support/common/runtime/src/main/java/org/apache/camel/quarkus/common/runtime/graal/SubstituteBeansIntrospector.java copy to extensions/support/common/runtime/src/main/java/org/apache/camel/quarkus/support/common/runtime/graal/SubstituteBeansIntrospector.java index 22bbee7..5f7351c 100644 --- a/extensions/support/common/runtime/src/main/java/org/apache/camel/quarkus/common/runtime/graal/SubstituteBeansIntrospector.java +++ b/extensions/support/common/runtime/src/main/java/org/apache/camel/quarkus/support/common/runtime/graal/SubstituteBeansIntrospector.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.quarkus.common.runtime.graal; +package org.apache.camel.quarkus.support.common.runtime.graal; import java.lang.reflect.Method; diff --git a/extensions/support/common/runtime/src/main/java/org/apache/camel/quarkus/common/runtime/graal/SubstituteBeansWeakCache.java b/extensions/support/common/runtime/src/main/java/org/apache/camel/quarkus/support/common/runtime/graal/SubstituteBeansWeakCache.java similarity index 96% rename from extensions/support/common/runtime/src/main/java/org/apache/camel/quarkus/common/runtime/graal/SubstituteBeansWeakCache.java rename to extensions/support/common/runtime/src/main/java/org/apache/camel/quarkus/support/common/runtime/graal/SubstituteBeansWeakCache.java index 3698656..a89955c 100644 --- a/extensions/support/common/runtime/src/main/java/org/apache/camel/quarkus/common/runtime/graal/SubstituteBeansWeakCache.java +++ b/extensions/support/common/runtime/src/main/java/org/apache/camel/quarkus/support/common/runtime/graal/SubstituteBeansWeakCache.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.quarkus.common.runtime.graal; +package org.apache.camel.quarkus.support.common.runtime.graal; import java.lang.ref.Reference; import java.lang.ref.WeakReference; diff --git a/extensions/support/common/runtime/src/main/java/org/apache/camel/quarkus/common/runtime/graal/SubstituteBeansIntrospector.java b/extensions/support/jetty/deployment/src/main/java/org/apache/camel/quarkus/support/jetty/deployment/JettySupportFeature.java similarity index 60% copy from extensions/support/common/runtime/src/main/java/org/apache/camel/quarkus/common/runtime/graal/SubstituteBeansIntrospector.java copy to extensions/support/jetty/deployment/src/main/java/org/apache/camel/quarkus/support/jetty/deployment/JettySupportFeature.java index 22bbee7..e0860f7 100644 --- a/extensions/support/common/runtime/src/main/java/org/apache/camel/quarkus/common/runtime/graal/SubstituteBeansIntrospector.java +++ b/extensions/support/jetty/deployment/src/main/java/org/apache/camel/quarkus/support/jetty/deployment/JettySupportFeature.java @@ -14,17 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.quarkus.common.runtime.graal; +package org.apache.camel.quarkus.support.jetty.deployment; -import java.lang.reflect.Method; +import io.quarkus.deployment.annotations.BuildStep; +import io.quarkus.deployment.builditem.FeatureBuildItem; -import com.oracle.svm.core.annotate.Alias; -import com.oracle.svm.core.annotate.RecomputeFieldValue; -import com.oracle.svm.core.annotate.TargetClass; +public class JettySupportFeature { + private static final String FEATURE = "camel-support-jetty"; -@TargetClass(className = "java.beans.Introspector") -final class SubstituteBeansIntrospector { - @Alias - @RecomputeFieldValue(kind = RecomputeFieldValue.Kind.FromAlias) - private static SubstituteBeansWeakCache<Class<?>, Method[]> declaredMethodCache = new SubstituteBeansWeakCache<>(); + @BuildStep + FeatureBuildItem feature() { + return new FeatureBuildItem(FEATURE); + } } diff --git a/extensions/support/jetty/deployment/src/main/java/org/apache/camel/quarkus/jetty/common/deployment/JettyProcessor.java b/extensions/support/jetty/deployment/src/main/java/org/apache/camel/quarkus/support/jetty/deployment/JettySupportProcessor.java similarity index 94% rename from extensions/support/jetty/deployment/src/main/java/org/apache/camel/quarkus/jetty/common/deployment/JettyProcessor.java rename to extensions/support/jetty/deployment/src/main/java/org/apache/camel/quarkus/support/jetty/deployment/JettySupportProcessor.java index 584f1ce..434978d 100644 --- a/extensions/support/jetty/deployment/src/main/java/org/apache/camel/quarkus/jetty/common/deployment/JettyProcessor.java +++ b/extensions/support/jetty/deployment/src/main/java/org/apache/camel/quarkus/support/jetty/deployment/JettySupportProcessor.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.quarkus.jetty.common.deployment; +package org.apache.camel.quarkus.support.jetty.deployment; import java.util.Arrays; import java.util.List; @@ -25,7 +25,7 @@ import io.quarkus.deployment.builditem.substrate.ReflectiveClassBuildItem; import org.eclipse.jetty.client.HttpClient; import org.eclipse.jetty.client.ProtocolHandlers; -class JettyProcessor { +class JettySupportProcessor { private static final List<Class<?>> JETTY_REFLECTIVE_CLASSES = Arrays.asList( HttpClient.class, ProtocolHandlers.class diff --git a/extensions/support/common/runtime/src/main/java/org/apache/camel/quarkus/common/runtime/graal/SubstituteBeansIntrospector.java b/extensions/support/xstream/deployment/src/main/java/org/apache/camel/quarkus/support/xstream/deployment/XStreamSupportFeature.java similarity index 60% rename from extensions/support/common/runtime/src/main/java/org/apache/camel/quarkus/common/runtime/graal/SubstituteBeansIntrospector.java rename to extensions/support/xstream/deployment/src/main/java/org/apache/camel/quarkus/support/xstream/deployment/XStreamSupportFeature.java index 22bbee7..c4dda34 100644 --- a/extensions/support/common/runtime/src/main/java/org/apache/camel/quarkus/common/runtime/graal/SubstituteBeansIntrospector.java +++ b/extensions/support/xstream/deployment/src/main/java/org/apache/camel/quarkus/support/xstream/deployment/XStreamSupportFeature.java @@ -14,17 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.quarkus.common.runtime.graal; +package org.apache.camel.quarkus.support.xstream.deployment; -import java.lang.reflect.Method; +import io.quarkus.deployment.annotations.BuildStep; +import io.quarkus.deployment.builditem.FeatureBuildItem; -import com.oracle.svm.core.annotate.Alias; -import com.oracle.svm.core.annotate.RecomputeFieldValue; -import com.oracle.svm.core.annotate.TargetClass; +public class XStreamSupportFeature { + private static final String FEATURE = "camel-support-xstream"; -@TargetClass(className = "java.beans.Introspector") -final class SubstituteBeansIntrospector { - @Alias - @RecomputeFieldValue(kind = RecomputeFieldValue.Kind.FromAlias) - private static SubstituteBeansWeakCache<Class<?>, Method[]> declaredMethodCache = new SubstituteBeansWeakCache<>(); + @BuildStep + FeatureBuildItem feature() { + return new FeatureBuildItem(FEATURE); + } } diff --git a/extensions/support/xstream/deployment/src/main/java/org/apache/camel/quarkus/xstream/common/deployment/XStreamProcessor.java b/extensions/support/xstream/deployment/src/main/java/org/apache/camel/quarkus/support/xstream/deployment/XStreamSupportProcessor.java similarity index 99% rename from extensions/support/xstream/deployment/src/main/java/org/apache/camel/quarkus/xstream/common/deployment/XStreamProcessor.java rename to extensions/support/xstream/deployment/src/main/java/org/apache/camel/quarkus/support/xstream/deployment/XStreamSupportProcessor.java index 434d6c4..08a9c9c 100644 --- a/extensions/support/xstream/deployment/src/main/java/org/apache/camel/quarkus/xstream/common/deployment/XStreamProcessor.java +++ b/extensions/support/xstream/deployment/src/main/java/org/apache/camel/quarkus/support/xstream/deployment/XStreamSupportProcessor.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.quarkus.xstream.common.deployment; +package org.apache.camel.quarkus.support.xstream.deployment; import java.util.Arrays; import java.util.List; @@ -35,7 +35,7 @@ import org.jboss.jandex.ClassInfo; import org.jboss.jandex.DotName; -public class XStreamProcessor { +public class XStreamSupportProcessor { private static final List<String> INTERFACES_TO_REGISTER = Arrays.asList( Converter.class.getName(),