diff --git a/core/deployment/src/main/java/io/quarkus/deployment/recording/BytecodeRecorderImpl.java b/core/deployment/src/main/java/io/quarkus/deployment/recording/BytecodeRecorderImpl.java index 1103e1a2c36d7..b5695a88b1fda 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/recording/BytecodeRecorderImpl.java +++ b/core/deployment/src/main/java/io/quarkus/deployment/recording/BytecodeRecorderImpl.java @@ -1935,7 +1935,7 @@ static ResultHandle arrayValue(AnnotationValue value, BytecodeCreator valueMetho static String componentType(MethodInfo method) { ArrayType arrayType = method.returnType().asArrayType(); - return arrayType.component().name().toString(); + return arrayType.constituent().name().toString(); } /** diff --git a/core/deployment/src/main/java/io/quarkus/deployment/steps/ReflectiveHierarchyStep.java b/core/deployment/src/main/java/io/quarkus/deployment/steps/ReflectiveHierarchyStep.java index 33d26d400177c..c3dd57bae5e17 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/steps/ReflectiveHierarchyStep.java +++ b/core/deployment/src/main/java/io/quarkus/deployment/steps/ReflectiveHierarchyStep.java @@ -160,7 +160,7 @@ private void addReflectiveHierarchy(CombinedIndexBuildItem combinedIndexBuildIte } } else if (type instanceof ArrayType) { visits.addLast(() -> addReflectiveHierarchy(combinedIndexBuildItem, reflectiveHierarchyBuildItem, source, - type.asArrayType().component(), + type.asArrayType().constituent(), processedReflectiveHierarchies, unindexedClasses, finalFieldsWritable, reflectiveClass, visits)); } else if (type instanceof ParameterizedType) { diff --git a/core/deployment/src/main/java/io/quarkus/deployment/steps/RegisterForReflectionBuildStep.java b/core/deployment/src/main/java/io/quarkus/deployment/steps/RegisterForReflectionBuildStep.java index d12692931434e..264350bb54b5c 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/steps/RegisterForReflectionBuildStep.java +++ b/core/deployment/src/main/java/io/quarkus/deployment/steps/RegisterForReflectionBuildStep.java @@ -210,7 +210,7 @@ private void registerType(BuildProducer reflective ClassLoader classLoader, Set processedReflectiveHierarchies, boolean methods, ReflectiveHierarchyBuildItem.Builder builder, Type type) { if (type.kind().equals(Kind.ARRAY)) { - type = type.asArrayType().component(); + type = type.asArrayType().constituent(); } if (type.kind() != Kind.PRIMITIVE && !processedReflectiveHierarchies.contains(type.name())) { registerClassDependencies(reflectiveClassHierarchy, classLoader, processedReflectiveHierarchies, diff --git a/core/deployment/src/main/java/io/quarkus/deployment/util/AsmUtil.java b/core/deployment/src/main/java/io/quarkus/deployment/util/AsmUtil.java index 6a087324497b2..389122cbbd3b1 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/util/AsmUtil.java +++ b/core/deployment/src/main/java/io/quarkus/deployment/util/AsmUtil.java @@ -222,7 +222,7 @@ private static void toSignature(StringBuilder sb, Type type, Function typeArgumentsFromSupert private static boolean containsTypeParameters(Type type) { switch (type.kind()) { case ARRAY: - return containsTypeParameters(type.asArrayType().component()); + return containsTypeParameters(type.asArrayType().constituent()); case PARAMETERIZED_TYPE: ParameterizedType parameterizedType = type.asParameterizedType(); if (parameterizedType.owner() != null @@ -259,7 +259,7 @@ private static Type mapGenerics(Type type, Map mapping) { switch (type.kind()) { case ARRAY: ArrayType arrayType = type.asArrayType(); - return ArrayType.create(mapGenerics(arrayType.component(), mapping), arrayType.dimensions()); + return ArrayType.create(mapGenerics(arrayType.constituent(), mapping), arrayType.dimensions()); case CLASS: return type; case PARAMETERIZED_TYPE: diff --git a/docs/src/main/asciidoc/kafka.adoc b/docs/src/main/asciidoc/kafka.adoc index 36ed170913a23..7dda7c2f445c5 100644 --- a/docs/src/main/asciidoc/kafka.adoc +++ b/docs/src/main/asciidoc/kafka.adoc @@ -177,7 +177,7 @@ Alternatively, your application can inject a `Multi` in your bean and subscribe [source, java] ---- import io.smallrye.mutiny.Multi; -import io.smallrye.reactive.messaging.annotations.Channel; +import org.eclipse.microprofile.reactive.messaging.Channel; import jakarta.inject.Inject; import jakarta.ws.rs.GET; diff --git a/docs/src/main/asciidoc/opentelemetry.adoc b/docs/src/main/asciidoc/opentelemetry.adoc index eb330845297b6..c93a3681cd269 100644 --- a/docs/src/main/asciidoc/opentelemetry.adoc +++ b/docs/src/main/asciidoc/opentelemetry.adoc @@ -447,10 +447,10 @@ The instrumentation documented in this section has been tested with Quarkus and === CDI -Annotating a method in any CDI aware bean with the `io.opentelemetry.extension.annotations.WithSpan` +Annotating a method in any CDI aware bean with the `io.opentelemetry.instrumentation.annotations.WithSpan` annotation will create a new Span and establish any required relationships with the current Trace context. -Method parameters can be annotated with the `io.opentelemetry.extension.annotations.SpanAttribute` annotation to +Method parameters can be annotated with the `io.opentelemetry.instrumentation.annotations.SpanAttribute` annotation to indicate which method parameters should be part of the Trace. Example: diff --git a/docs/src/main/asciidoc/resteasy-reactive.adoc b/docs/src/main/asciidoc/resteasy-reactive.adoc index ee06fd4369086..bbc232ca45c4e 100644 --- a/docs/src/main/asciidoc/resteasy-reactive.adoc +++ b/docs/src/main/asciidoc/resteasy-reactive.adoc @@ -956,7 +956,7 @@ import org.jboss.resteasy.reactive.RestStreamElementType; import io.smallrye.mutiny.Multi; -import io.smallrye.reactive.messaging.annotations.Channel; +import org.eclipse.microprofile.reactive.messaging.Channel; @Path("escoffier") public class Endpoint { @@ -995,7 +995,7 @@ import org.jboss.resteasy.reactive.RestStreamElementType; import io.smallrye.mutiny.Multi; -import io.smallrye.reactive.messaging.annotations.Channel; +import org.eclipse.microprofile.reactive.messaging.Channel; @Path("escoffier") public class Endpoint { diff --git a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/devconsole/Name.java b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/devconsole/Name.java index 1c35b43503bed..a014b59a2f594 100644 --- a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/devconsole/Name.java +++ b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/devconsole/Name.java @@ -52,7 +52,7 @@ static String createSimpleName(Type type) { case PARAMETERIZED_TYPE: return createSimple(type.asParameterizedType()); case ARRAY: - Type component = type.asArrayType().component(); + Type component = type.asArrayType().constituent(); if (component.kind() == Kind.CLASS) { return createSimple(type.toString()); } diff --git a/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/JpaJandexScavenger.java b/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/JpaJandexScavenger.java index 14584ab4c51fc..05c97b7fe85e7 100644 --- a/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/JpaJandexScavenger.java +++ b/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/JpaJandexScavenger.java @@ -497,7 +497,7 @@ private static void collectEmbeddedTypes(Set embeddedTypes, Type indexT } break; case ARRAY: - collectEmbeddedTypes(embeddedTypes, indexType.asArrayType().component()); + collectEmbeddedTypes(embeddedTypes, indexType.asArrayType().constituent()); break; default: // do nothing diff --git a/extensions/hibernate-search-orm-coordination-outbox-polling/deployment/src/test/java/io/quarkus/hibernate/search/orm/coordination/outboxpolling/test/HibernateSearchOutboxPollingClassesTest.java b/extensions/hibernate-search-orm-coordination-outbox-polling/deployment/src/test/java/io/quarkus/hibernate/search/orm/coordination/outboxpolling/test/HibernateSearchOutboxPollingClassesTest.java index be49d54a33287..db3024409f88e 100644 --- a/extensions/hibernate-search-orm-coordination-outbox-polling/deployment/src/test/java/io/quarkus/hibernate/search/orm/coordination/outboxpolling/test/HibernateSearchOutboxPollingClassesTest.java +++ b/extensions/hibernate-search-orm-coordination-outbox-polling/deployment/src/test/java/io/quarkus/hibernate/search/orm/coordination/outboxpolling/test/HibernateSearchOutboxPollingClassesTest.java @@ -145,7 +145,7 @@ private static void collectModelClassesRecursively(Index index, Type type, Set types = t.asParameterizedType().arguments(); if (types.size() == 1) { diff --git a/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/HttpSecurityProcessor.java b/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/HttpSecurityProcessor.java index ad5dd730eb7ca..26fe104ec8e63 100644 --- a/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/HttpSecurityProcessor.java +++ b/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/HttpSecurityProcessor.java @@ -144,7 +144,7 @@ private static boolean validateConstructor(IndexView index, String permissionCla } private static boolean isStringArray(Type type) { - return type.kind() == Type.Kind.ARRAY && isString(type.asArrayType().component()); + return type.kind() == Type.Kind.ARRAY && isString(type.asArrayType().constituent()); } private static boolean isString(Type type) { diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/AnnotationLiteralGenerator.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/AnnotationLiteralGenerator.java index e34b0139c192f..3a7dae47c1446 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/AnnotationLiteralGenerator.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/AnnotationLiteralGenerator.java @@ -174,7 +174,7 @@ static String defaultValueStaticFieldName(MethodInfo annotationMember) { private static boolean returnsClassOrClassArray(MethodInfo annotationMember) { boolean returnsClass = DotNames.CLASS.equals(annotationMember.returnType().name()); boolean returnsClassArray = annotationMember.returnType().kind() == Type.Kind.ARRAY - && DotNames.CLASS.equals(annotationMember.returnType().asArrayType().component().name()); + && DotNames.CLASS.equals(annotationMember.returnType().asArrayType().constituent().name()); return returnsClass || returnsClassArray; } diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/AnnotationLiteralProcessor.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/AnnotationLiteralProcessor.java index 78c2a429fec3c..6b5f0b671a764 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/AnnotationLiteralProcessor.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/AnnotationLiteralProcessor.java @@ -355,7 +355,7 @@ private static String componentType(MethodInfo method) { private static DotName componentTypeName(MethodInfo method) { ArrayType arrayType = method.returnType().asArrayType(); - return arrayType.component().name(); + return arrayType.constituent().name(); } private static String generateAnnotationLiteralClassName(DotName annotationName) { diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanResolverImpl.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanResolverImpl.java index 23051ce9d52ac..8d5cf0dcac47b 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanResolverImpl.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanResolverImpl.java @@ -145,7 +145,7 @@ boolean matchesNoBoxing(Type requiredType, Type beanType) { if (ARRAY.equals(requiredType.kind())) { if (ARRAY.equals(beanType.kind())) { // Array types are considered to match only if their element types are identical - return matchesNoBoxing(requiredType.asArrayType().component(), beanType.asArrayType().component()); + return matchesNoBoxing(requiredType.asArrayType().constituent(), beanType.asArrayType().constituent()); } } else if (CLASS.equals(requiredType.kind())) { if (CLASS.equals(beanType.kind())) { diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/InjectionPointInfo.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/InjectionPointInfo.java index 77fc221e4eb25..c02cb407a7026 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/InjectionPointInfo.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/InjectionPointInfo.java @@ -339,7 +339,7 @@ private static Type resolveType(Type type, ClassInfo beanClass, BeanDeployment b return ParameterizedType.create(parameterizedType.name(), typeParams, parameterizedType.owner()); } else if (type.kind() == org.jboss.jandex.Type.Kind.ARRAY) { ArrayType arrayType = type.asArrayType(); - Type component = arrayType.component(); + Type component = arrayType.constituent(); if (component.kind() == org.jboss.jandex.Type.Kind.TYPE_VARIABLE || component.kind() == org.jboss.jandex.Type.Kind.PARAMETERIZED_TYPE) { component = resolveType(component, beanClass, beanDeployment, resolvedTypeVariables); diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/Methods.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/Methods.java index ad6e073eec531..020495e2423f5 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/Methods.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/Methods.java @@ -523,7 +523,7 @@ public boolean test(MethodInfo method) { } DotName typeName = type.name(); if (type.kind() == Kind.ARRAY) { - Type componentType = type.asArrayType().component(); + Type componentType = type.asArrayType().constituent(); if (componentType.kind() == Kind.PRIMITIVE) { continue; } diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/Types.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/Types.java index aeb52b2e97195..4002918a6815a 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/Types.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/Types.java @@ -197,7 +197,7 @@ private static void getTypeHandle(AssignableResultHandle variable, BytecodeCreat arrayHandle = doLoadClass(creator, array.name().toString(), tccl); } else { // E.g. List[] -> new GenericArrayTypeImpl(new ParameterizedTypeImpl(List.class, String.class)) - Type componentType = type.asArrayType().component(); + Type componentType = type.asArrayType().constituent(); AssignableResultHandle componentTypeHandle = creator.createVariable(Object.class); getTypeHandle(componentTypeHandle, creator, componentType, tccl, cache, typeVariables); arrayHandle = creator.newInstance( @@ -349,9 +349,9 @@ static Type getProviderType(ClassInfo classInfo) { } static Type getArrayElementType(ArrayType array) { - Type elementType = array.component(); + Type elementType = array.constituent(); while (elementType.kind() == Kind.ARRAY) { - elementType = elementType.asArrayType().component(); + elementType = elementType.asArrayType().constituent(); } return elementType; } diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/bcextensions/ArrayTypeImpl.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/bcextensions/ArrayTypeImpl.java index e3cb1e0a71665..88e20c2c9cfe6 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/bcextensions/ArrayTypeImpl.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/bcextensions/ArrayTypeImpl.java @@ -13,8 +13,8 @@ class ArrayTypeImpl extends TypeImpl implements Arra public Type componentType() { int dimensions = jandexType.dimensions(); org.jboss.jandex.Type componentType = dimensions == 1 - ? jandexType.component() - : org.jboss.jandex.ArrayType.create(jandexType.component(), dimensions - 1); + ? jandexType.constituent() + : org.jboss.jandex.ArrayType.create(jandexType.constituent(), dimensions - 1); return fromJandexType(jandexIndex, annotationOverlays, componentType); } } diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/bcextensions/TypesImpl.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/bcextensions/TypesImpl.java index 1e7921dae5db8..097da7fc562c2 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/bcextensions/TypesImpl.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/bcextensions/TypesImpl.java @@ -135,15 +135,15 @@ private ParameterizedType parameterizedType(DotName genericTypeName, Type... typ @Override public WildcardType wildcardWithUpperBound(Type upperBound) { - org.jboss.jandex.WildcardType jandexType = org.jboss.jandex.WildcardType.create(((TypeImpl) upperBound).jandexType, - true); + org.jboss.jandex.WildcardType jandexType = org.jboss.jandex.WildcardType + .createUpperBound(((TypeImpl) upperBound).jandexType); return new WildcardTypeImpl(jandexIndex, annotationOverlays, jandexType); } @Override public WildcardType wildcardWithLowerBound(Type lowerBound) { - org.jboss.jandex.WildcardType jandexType = org.jboss.jandex.WildcardType.create(((TypeImpl) lowerBound).jandexType, - false); + org.jboss.jandex.WildcardType jandexType = org.jboss.jandex.WildcardType + .createLowerBound(((TypeImpl) lowerBound).jandexType); return new WildcardTypeImpl(jandexIndex, annotationOverlays, jandexType); } diff --git a/independent-projects/qute/generator/src/main/java/io/quarkus/qute/generator/ExtensionMethodGenerator.java b/independent-projects/qute/generator/src/main/java/io/quarkus/qute/generator/ExtensionMethodGenerator.java index 145514ca1dd66..bbc9b8f3cb965 100644 --- a/independent-projects/qute/generator/src/main/java/io/quarkus/qute/generator/ExtensionMethodGenerator.java +++ b/independent-projects/qute/generator/src/main/java/io/quarkus/qute/generator/ExtensionMethodGenerator.java @@ -328,7 +328,7 @@ private void implementResolve(ClassCreator valueResolver, ClassInfo declaringCla // Last param is varargs Type varargsParam = params.get(lastIdx).type; ResultHandle componentType = tryCatch - .loadClass(varargsParam.asArrayType().component().name().toString()); + .loadClass(varargsParam.asArrayType().constituent().name().toString()); ResultHandle varargsResults = tryCatch.invokeVirtualMethod( Descriptors.EVALUATED_PARAMS_GET_VARARGS_RESULTS, evaluatedParamsHandle, tryCatch.load(evaluated.size()), componentType); @@ -579,7 +579,7 @@ public void addMethod(MethodInfo method, String matchName, List matchNam // Last param is varargs Type varargsParam = params.get(lastIdx).type; ResultHandle componentType = tryCatch - .loadClass(varargsParam.asArrayType().component().name().toString()); + .loadClass(varargsParam.asArrayType().constituent().name().toString()); ResultHandle varargsResults = tryCatch.invokeVirtualMethod( Descriptors.EVALUATED_PARAMS_GET_VARARGS_RESULTS, whenEvaluatedParams, tryCatch.load(evaluated.size()), componentType); diff --git a/independent-projects/qute/generator/src/main/java/io/quarkus/qute/generator/ValueResolverGenerator.java b/independent-projects/qute/generator/src/main/java/io/quarkus/qute/generator/ValueResolverGenerator.java index 05e62a4f268fe..8d0a792ad82c0 100644 --- a/independent-projects/qute/generator/src/main/java/io/quarkus/qute/generator/ValueResolverGenerator.java +++ b/independent-projects/qute/generator/src/main/java/io/quarkus/qute/generator/ValueResolverGenerator.java @@ -703,7 +703,7 @@ private void matchMethod(MethodInfo method, ClassInfo clazz, MethodCreator resol // Then we need to create an array for the last argument Type varargsParam = parameterTypes.get(parameterTypes.size() - 1); ResultHandle componentType = tryCatch - .loadClass(varargsParam.asArrayType().component().name().toString()); + .loadClass(varargsParam.asArrayType().constituent().name().toString()); ResultHandle varargsResults = tryCatch.invokeVirtualMethod(Descriptors.EVALUATED_PARAMS_GET_VARARGS_RESULTS, evaluatedParams, tryCatch.load(parameterTypes.size()), componentType); // E.g. String, String, String -> String, String[] @@ -852,7 +852,7 @@ private void matchMethods(String matchName, int matchParamsCount, Collection String, String[] diff --git a/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/EndpointIndexer.java b/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/EndpointIndexer.java index db8480ea24f99..ffd385eac6eb8 100644 --- a/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/EndpointIndexer.java +++ b/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/EndpointIndexer.java @@ -1419,7 +1419,7 @@ && isParameterContainerType(paramType.asClassType())) { || convertible) { builder.setSingle(false); } - elementType = toClassName(at.component(), currentClassInfo, actualEndpointInfo, index); + elementType = toClassName(at.constituent(), currentClassInfo, actualEndpointInfo, index); if (convertible) { handleArrayParam(existingConverters, errorLocation, hasRuntimeConverters, builder, elementType); } @@ -1450,8 +1450,8 @@ && isParameterContainerType(paramType.asClassType())) { private boolean isFormParamConvertible(Type paramType) { // let's not call the array converter for byte[] for multipart if (paramType.kind() == Kind.ARRAY - && paramType.asArrayType().component().kind() == Kind.PRIMITIVE - && paramType.asArrayType().component().asPrimitiveType().primitive() == Primitive.BYTE) { + && paramType.asArrayType().constituent().kind() == Kind.PRIMITIVE + && paramType.asArrayType().constituent().asPrimitiveType().primitive() == Primitive.BYTE) { return false; } else { return true; diff --git a/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/JandexUtil.java b/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/JandexUtil.java index 1e2f2f6fc29ad..3c37e6de4f305 100644 --- a/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/JandexUtil.java +++ b/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/JandexUtil.java @@ -248,7 +248,7 @@ private static boolean containsTypeParameters(List typeArgumentsFromSupert private static boolean containsTypeParameters(Type type) { switch (type.kind()) { case ARRAY: - return containsTypeParameters(type.asArrayType().component()); + return containsTypeParameters(type.asArrayType().constituent()); case PARAMETERIZED_TYPE: ParameterizedType parameterizedType = type.asParameterizedType(); if (parameterizedType.owner() != null @@ -274,7 +274,7 @@ private static Type mapGenerics(Type type, Map mapping) { switch (type.kind()) { case ARRAY: ArrayType arrayType = type.asArrayType(); - return ArrayType.create(mapGenerics(arrayType.component(), mapping), arrayType.dimensions()); + return ArrayType.create(mapGenerics(arrayType.constituent(), mapping), arrayType.dimensions()); case CLASS: return type; case PARAMETERIZED_TYPE: diff --git a/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/scanning/ClassInjectorTransformer.java b/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/scanning/ClassInjectorTransformer.java index 154ebf66e40b0..f1235df88f3ff 100644 --- a/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/scanning/ClassInjectorTransformer.java +++ b/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/scanning/ClassInjectorTransformer.java @@ -377,7 +377,7 @@ private void generateMultipartFormStaticInit(MethodVisitor mv, FieldInfo fieldIn if (!extractor.isSingle()) { boolean isArray = type.kind() == org.jboss.jandex.Type.Kind.ARRAY; // it's T[] or List - type = isArray ? type.asArrayType().component() + type = isArray ? type.asArrayType().constituent() : type.asParameterizedType().arguments().get(0); } // type @@ -489,7 +489,7 @@ private void generateConverterInitMethod(FieldInfo fieldInfo, ParameterConverter // [instance, instance, converter] // array converter wants the array instance type if (converter instanceof ArrayConverter.ArraySupplier) { - org.jboss.jandex.Type componentType = fieldInfo.type().asArrayType().component(); + org.jboss.jandex.Type componentType = fieldInfo.type().asArrayType().constituent(); initConverterMethod.visitLdcInsn(componentType.name().toString('.')); // [instance, instance, converter, componentType] initConverterMethod.visitMethodInsn(Opcodes.INVOKESPECIAL, delegatorBinaryName, "", @@ -862,8 +862,8 @@ private MultipartFormParamExtractor.Type getMultipartFormType(ServerIndexedParam } else if (param.getElementType().equals(InputStream.class.getName())) { return MultipartFormParamExtractor.Type.InputStream; } else if (param.getParamType().kind() == Kind.ARRAY - && param.getParamType().asArrayType().component().kind() == Kind.PRIMITIVE - && param.getParamType().asArrayType().component().asPrimitiveType().primitive() == Primitive.BYTE) { + && param.getParamType().asArrayType().constituent().kind() == Kind.PRIMITIVE + && param.getParamType().asArrayType().constituent().asPrimitiveType().primitive() == Primitive.BYTE) { return MultipartFormParamExtractor.Type.ByteArray; } else if (mimeType != null && !mimeType.equals(MediaType.TEXT_PLAIN)) { return MultipartFormParamExtractor.Type.PartType;