diff --git a/independent-projects/arc/pom.xml b/independent-projects/arc/pom.xml index 98c4b545d845a..922376406458b 100644 --- a/independent-projects/arc/pom.xml +++ b/independent-projects/arc/pom.xml @@ -264,8 +264,10 @@ .cache/impsort-maven-plugin-${impsort-maven-plugin.version} - true + java.,javax.,jakarta.,org.,com. + * ${format.skip} + true diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/AbstractAnnotationsTransformation.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/AbstractAnnotationsTransformation.java index bad852efda06a..ce4a5916a8e7b 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/AbstractAnnotationsTransformation.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/AbstractAnnotationsTransformation.java @@ -5,6 +5,7 @@ import java.util.Collections; import java.util.function.Consumer; import java.util.function.Predicate; + import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.AnnotationTarget; import org.jboss.jandex.AnnotationValue; diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/AbstractGenerator.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/AbstractGenerator.java index 69fe3445deff8..369677fef4f20 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/AbstractGenerator.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/AbstractGenerator.java @@ -1,10 +1,12 @@ package io.quarkus.arc.processor; -import io.quarkus.arc.Arc; import java.lang.reflect.Modifier; + import org.jboss.jandex.FieldInfo; import org.jboss.jandex.MethodInfo; +import io.quarkus.arc.Arc; + abstract class AbstractGenerator { static final String DEFAULT_PACKAGE = Arc.class.getPackage().getName() + ".generator"; diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/AlternativePriorities.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/AlternativePriorities.java index 50461f5d31fc8..8a4625e2f8d28 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/AlternativePriorities.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/AlternativePriorities.java @@ -1,6 +1,7 @@ package io.quarkus.arc.processor; import java.util.Collection; + import org.jboss.jandex.AnnotationTarget; /** 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 fbabcc0fa47f4..635e4faadd6d3 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 @@ -5,17 +5,6 @@ import static org.objectweb.asm.Opcodes.ACC_PUBLIC; import static org.objectweb.asm.Opcodes.ACC_STATIC; -import io.quarkus.arc.impl.ComputingCache; -import io.quarkus.arc.processor.AnnotationLiteralProcessor.AnnotationLiteralClassInfo; -import io.quarkus.arc.processor.AnnotationLiteralProcessor.CacheKey; -import io.quarkus.arc.processor.ResourceOutput.Resource; -import io.quarkus.gizmo.ClassCreator; -import io.quarkus.gizmo.ClassOutput; -import io.quarkus.gizmo.FieldCreator; -import io.quarkus.gizmo.FieldDescriptor; -import io.quarkus.gizmo.MethodCreator; -import io.quarkus.gizmo.MethodDescriptor; -import io.quarkus.gizmo.ResultHandle; import java.util.ArrayList; import java.util.Collection; import java.util.List; @@ -23,12 +12,26 @@ import java.util.concurrent.Callable; import java.util.concurrent.ExecutorService; import java.util.concurrent.Future; + import javax.enterprise.util.AnnotationLiteral; + import org.jboss.jandex.AnnotationValue; import org.jboss.jandex.MethodInfo; import org.jboss.jandex.Type; import org.jboss.logging.Logger; +import io.quarkus.arc.impl.ComputingCache; +import io.quarkus.arc.processor.AnnotationLiteralProcessor.AnnotationLiteralClassInfo; +import io.quarkus.arc.processor.AnnotationLiteralProcessor.CacheKey; +import io.quarkus.arc.processor.ResourceOutput.Resource; +import io.quarkus.gizmo.ClassCreator; +import io.quarkus.gizmo.ClassOutput; +import io.quarkus.gizmo.FieldCreator; +import io.quarkus.gizmo.FieldDescriptor; +import io.quarkus.gizmo.MethodCreator; +import io.quarkus.gizmo.MethodDescriptor; +import io.quarkus.gizmo.ResultHandle; + /** * This is an internal companion of {@link AnnotationLiteralProcessor} that handles generating * annotation literal classes. See {@link #generate(ComputingCache, Set) generate()} for more info. 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 4756bef8b5562..1e5b9f9e429dc 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 @@ -1,16 +1,12 @@ package io.quarkus.arc.processor; -import io.quarkus.arc.impl.ComputingCache; -import io.quarkus.gizmo.BytecodeCreator; -import io.quarkus.gizmo.ClassOutput; -import io.quarkus.gizmo.FieldDescriptor; -import io.quarkus.gizmo.MethodDescriptor; -import io.quarkus.gizmo.ResultHandle; import java.util.ArrayList; import java.util.List; import java.util.Objects; import java.util.function.Predicate; + import javax.enterprise.util.AnnotationLiteral; + import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.AnnotationValue; import org.jboss.jandex.ArrayType; @@ -21,6 +17,13 @@ import org.jboss.jandex.PrimitiveType; import org.jboss.jandex.Type; +import io.quarkus.arc.impl.ComputingCache; +import io.quarkus.gizmo.BytecodeCreator; +import io.quarkus.gizmo.ClassOutput; +import io.quarkus.gizmo.FieldDescriptor; +import io.quarkus.gizmo.MethodDescriptor; +import io.quarkus.gizmo.ResultHandle; + /** * Handles generating bytecode for annotation literals. The * {@link #create(BytecodeCreator, ClassInfo, AnnotationInstance) create()} method can be used diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/AnnotationStore.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/AnnotationStore.java index 7ffbc21d4f2f4..5793a7d820a00 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/AnnotationStore.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/AnnotationStore.java @@ -1,7 +1,5 @@ package io.quarkus.arc.processor; -import io.quarkus.arc.processor.AnnotationsTransformer.TransformationContext; -import io.quarkus.arc.processor.BuildExtension.BuildContext; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -10,6 +8,7 @@ import java.util.Objects; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; + import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.AnnotationTarget; import org.jboss.jandex.AnnotationTarget.Kind; @@ -17,6 +16,9 @@ import org.jboss.jandex.FieldInfo; import org.jboss.jandex.MethodInfo; +import io.quarkus.arc.processor.AnnotationsTransformer.TransformationContext; +import io.quarkus.arc.processor.BuildExtension.BuildContext; + /** * Applies {@link AnnotationsTransformer}s and caches the results of transformations. * diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/Annotations.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/Annotations.java index 9383212f0d3d2..2697010b656ed 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/Annotations.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/Annotations.java @@ -5,6 +5,7 @@ import java.util.HashSet; import java.util.Set; import java.util.function.Function; + import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.AnnotationTarget; import org.jboss.jandex.AnnotationTarget.Kind; diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/AnnotationsTransformation.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/AnnotationsTransformation.java index 08fd137203c0e..43c58c0593824 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/AnnotationsTransformation.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/AnnotationsTransformation.java @@ -3,6 +3,7 @@ import java.lang.annotation.Annotation; import java.util.Collection; import java.util.function.Predicate; + import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.AnnotationValue; import org.jboss.jandex.DotName; diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/AnnotationsTransformationContext.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/AnnotationsTransformationContext.java index f01baad07dabf..c7e994c9a37c4 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/AnnotationsTransformationContext.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/AnnotationsTransformationContext.java @@ -1,11 +1,13 @@ package io.quarkus.arc.processor; -import io.quarkus.arc.processor.BuildExtension.BuildContext; -import io.quarkus.arc.processor.BuildExtension.Key; import java.util.Collection; + import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.AnnotationTarget; +import io.quarkus.arc.processor.BuildExtension.BuildContext; +import io.quarkus.arc.processor.BuildExtension.Key; + /** * Transformation context base for an {@link AnnotationsTransformation}. */ diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/AnnotationsTransformer.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/AnnotationsTransformer.java index b408ef0d52ca9..e88fe61cdefcd 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/AnnotationsTransformer.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/AnnotationsTransformer.java @@ -8,6 +8,7 @@ import java.util.function.Consumer; import java.util.function.Predicate; import java.util.stream.Collectors; + import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.AnnotationTarget; import org.jboss.jandex.AnnotationTarget.Kind; diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/AsmUtilCopy.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/AsmUtilCopy.java index 6b60e5587e664..4a09aba37dcc2 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/AsmUtilCopy.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/AsmUtilCopy.java @@ -2,6 +2,7 @@ import java.util.List; import java.util.function.Function; + import org.jboss.jandex.ArrayType; import org.jboss.jandex.ClassInfo; import org.jboss.jandex.MethodInfo; diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/AssignabilityCheck.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/AssignabilityCheck.java index 5d5599203827c..512041a0b5126 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/AssignabilityCheck.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/AssignabilityCheck.java @@ -4,6 +4,7 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; + import org.jboss.jandex.ClassInfo; import org.jboss.jandex.CompositeIndex; import org.jboss.jandex.DotName; diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanArchives.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanArchives.java index 18f24553f034f..b2a7320b7519d 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanArchives.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanArchives.java @@ -1,12 +1,5 @@ package io.quarkus.arc.processor; -import io.quarkus.arc.All; -import io.quarkus.arc.Lock; -import io.quarkus.arc.impl.ActivateRequestContextInterceptor; -import io.quarkus.arc.impl.DefaultAsyncObserverExceptionHandler; -import io.quarkus.arc.impl.Identified; -import io.quarkus.arc.impl.InjectableRequestContextController; -import io.quarkus.arc.impl.LockInterceptor; import java.io.IOException; import java.io.InputStream; import java.lang.reflect.Modifier; @@ -22,6 +15,7 @@ import java.util.Optional; import java.util.Queue; import java.util.Set; + import javax.enterprise.context.BeforeDestroyed; import javax.enterprise.context.Destroyed; import javax.enterprise.context.Initialized; @@ -31,6 +25,7 @@ import javax.enterprise.inject.Intercepted; import javax.enterprise.inject.Model; import javax.inject.Named; + import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.ClassInfo; import org.jboss.jandex.CompositeIndex; @@ -42,6 +37,14 @@ import org.jboss.jandex.Type; import org.jboss.logging.Logger; +import io.quarkus.arc.All; +import io.quarkus.arc.Lock; +import io.quarkus.arc.impl.ActivateRequestContextInterceptor; +import io.quarkus.arc.impl.DefaultAsyncObserverExceptionHandler; +import io.quarkus.arc.impl.Identified; +import io.quarkus.arc.impl.InjectableRequestContextController; +import io.quarkus.arc.impl.LockInterceptor; + public final class BeanArchives { private static final Logger LOGGER = Logger.getLogger(BeanArchives.class); diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanConfigurator.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanConfigurator.java index 45a7f939608fb..c1377c40cf962 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanConfigurator.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanConfigurator.java @@ -5,6 +5,7 @@ import java.util.Objects; import java.util.concurrent.atomic.AtomicBoolean; import java.util.function.Consumer; + import org.jboss.jandex.ClassInfo; import org.jboss.jandex.DotName; diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanConfiguratorBase.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanConfiguratorBase.java index 5e325dfab60aa..a37f616558041 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanConfiguratorBase.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanConfiguratorBase.java @@ -1,12 +1,5 @@ package io.quarkus.arc.processor; -import io.quarkus.arc.BeanCreator; -import io.quarkus.arc.BeanDestroyer; -import io.quarkus.arc.InjectableReferenceProvider; -import io.quarkus.gizmo.FieldDescriptor; -import io.quarkus.gizmo.MethodCreator; -import io.quarkus.gizmo.MethodDescriptor; -import io.quarkus.gizmo.ResultHandle; import java.lang.annotation.Annotation; import java.lang.annotation.Inherited; import java.util.ArrayList; @@ -16,14 +9,24 @@ import java.util.Map; import java.util.Set; import java.util.function.Consumer; + import javax.enterprise.context.NormalScope; import javax.enterprise.context.spi.CreationalContext; + import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.AnnotationValue; import org.jboss.jandex.DotName; import org.jboss.jandex.Type; import org.jboss.jandex.Type.Kind; +import io.quarkus.arc.BeanCreator; +import io.quarkus.arc.BeanDestroyer; +import io.quarkus.arc.InjectableReferenceProvider; +import io.quarkus.gizmo.FieldDescriptor; +import io.quarkus.gizmo.MethodCreator; +import io.quarkus.gizmo.MethodDescriptor; +import io.quarkus.gizmo.ResultHandle; + /** * This construct is not thread-safe. */ diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanDeployment.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanDeployment.java index 4cf0e445bb2c9..dfcca8ff7ebde 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanDeployment.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanDeployment.java @@ -3,13 +3,6 @@ import static io.quarkus.arc.processor.BeanProcessor.initAndSort; import static io.quarkus.arc.processor.IndexClassLookupUtils.getClassByName; -import io.quarkus.arc.processor.BeanDeploymentValidator.ValidationContext; -import io.quarkus.arc.processor.BeanProcessor.BuildContextImpl; -import io.quarkus.arc.processor.BeanRegistrar.RegistrationContext; -import io.quarkus.arc.processor.BuildExtension.BuildContext; -import io.quarkus.arc.processor.BuildExtension.Key; -import io.quarkus.gizmo.MethodCreator; -import io.quarkus.gizmo.ResultHandle; import java.lang.annotation.Annotation; import java.lang.reflect.Modifier; import java.util.ArrayList; @@ -30,9 +23,11 @@ import java.util.function.Function; import java.util.function.Predicate; import java.util.stream.Collectors; + import javax.enterprise.event.Reception; import javax.enterprise.inject.spi.DefinitionException; import javax.enterprise.inject.spi.DeploymentException; + import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.AnnotationTarget; import org.jboss.jandex.AnnotationTarget.Kind; @@ -46,6 +41,14 @@ import org.jboss.logging.Logger; import org.jboss.logging.Logger.Level; +import io.quarkus.arc.processor.BeanDeploymentValidator.ValidationContext; +import io.quarkus.arc.processor.BeanProcessor.BuildContextImpl; +import io.quarkus.arc.processor.BeanRegistrar.RegistrationContext; +import io.quarkus.arc.processor.BuildExtension.BuildContext; +import io.quarkus.arc.processor.BuildExtension.Key; +import io.quarkus.gizmo.MethodCreator; +import io.quarkus.gizmo.ResultHandle; + public class BeanDeployment { private static final Logger LOGGER = Logger.getLogger(BeanDeployment.class); diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanDeploymentValidator.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanDeploymentValidator.java index 55d4cb056d760..7b93819ac93a3 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanDeploymentValidator.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanDeploymentValidator.java @@ -2,6 +2,7 @@ import java.util.Collection; import java.util.List; + import javax.enterprise.inject.spi.DeploymentException; /** diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanGenerator.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanGenerator.java index 33db890c2adc7..002135d2146b8 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanGenerator.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanGenerator.java @@ -7,32 +7,6 @@ import static org.objectweb.asm.Opcodes.ACC_PUBLIC; import static org.objectweb.asm.Opcodes.ACC_VOLATILE; -import io.quarkus.arc.InjectableBean; -import io.quarkus.arc.InjectableDecorator; -import io.quarkus.arc.InjectableInterceptor; -import io.quarkus.arc.InjectableReferenceProvider; -import io.quarkus.arc.impl.CreationalContextImpl; -import io.quarkus.arc.impl.CurrentInjectionPointProvider; -import io.quarkus.arc.impl.DecoratorDelegateProvider; -import io.quarkus.arc.impl.InitializedInterceptor; -import io.quarkus.arc.processor.BeanInfo.InterceptionInfo; -import io.quarkus.arc.processor.BeanProcessor.PrivateMembersCollector; -import io.quarkus.arc.processor.BuiltinBean.GeneratorContext; -import io.quarkus.arc.processor.ResourceOutput.Resource; -import io.quarkus.arc.processor.ResourceOutput.Resource.SpecialType; -import io.quarkus.gizmo.AssignableResultHandle; -import io.quarkus.gizmo.BytecodeCreator; -import io.quarkus.gizmo.CatchBlockCreator; -import io.quarkus.gizmo.ClassCreator; -import io.quarkus.gizmo.ClassOutput; -import io.quarkus.gizmo.DescriptorUtils; -import io.quarkus.gizmo.FieldCreator; -import io.quarkus.gizmo.FieldDescriptor; -import io.quarkus.gizmo.FunctionCreator; -import io.quarkus.gizmo.MethodCreator; -import io.quarkus.gizmo.MethodDescriptor; -import io.quarkus.gizmo.ResultHandle; -import io.quarkus.gizmo.TryBlock; import java.lang.reflect.Member; import java.lang.reflect.Modifier; import java.util.ArrayList; @@ -50,12 +24,14 @@ import java.util.function.Function; import java.util.function.Predicate; import java.util.function.Supplier; + import javax.enterprise.context.spi.Contextual; import javax.enterprise.context.spi.CreationalContext; import javax.enterprise.inject.IllegalProductException; import javax.enterprise.inject.literal.InjectLiteral; import javax.enterprise.inject.spi.InterceptionType; import javax.interceptor.InvocationContext; + import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.AnnotationTarget; import org.jboss.jandex.AnnotationTarget.Kind; @@ -65,6 +41,33 @@ import org.jboss.jandex.MethodInfo; import org.jboss.jandex.Type; +import io.quarkus.arc.InjectableBean; +import io.quarkus.arc.InjectableDecorator; +import io.quarkus.arc.InjectableInterceptor; +import io.quarkus.arc.InjectableReferenceProvider; +import io.quarkus.arc.impl.CreationalContextImpl; +import io.quarkus.arc.impl.CurrentInjectionPointProvider; +import io.quarkus.arc.impl.DecoratorDelegateProvider; +import io.quarkus.arc.impl.InitializedInterceptor; +import io.quarkus.arc.processor.BeanInfo.InterceptionInfo; +import io.quarkus.arc.processor.BeanProcessor.PrivateMembersCollector; +import io.quarkus.arc.processor.BuiltinBean.GeneratorContext; +import io.quarkus.arc.processor.ResourceOutput.Resource; +import io.quarkus.arc.processor.ResourceOutput.Resource.SpecialType; +import io.quarkus.gizmo.AssignableResultHandle; +import io.quarkus.gizmo.BytecodeCreator; +import io.quarkus.gizmo.CatchBlockCreator; +import io.quarkus.gizmo.ClassCreator; +import io.quarkus.gizmo.ClassOutput; +import io.quarkus.gizmo.DescriptorUtils; +import io.quarkus.gizmo.FieldCreator; +import io.quarkus.gizmo.FieldDescriptor; +import io.quarkus.gizmo.FunctionCreator; +import io.quarkus.gizmo.MethodCreator; +import io.quarkus.gizmo.MethodDescriptor; +import io.quarkus.gizmo.ResultHandle; +import io.quarkus.gizmo.TryBlock; + /** * * @author Martin Kouba diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanInfo.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanInfo.java index 20173365f9615..9beb087827f3b 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanInfo.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanInfo.java @@ -2,10 +2,6 @@ import static io.quarkus.arc.processor.IndexClassLookupUtils.getClassByName; -import io.quarkus.arc.processor.Methods.MethodKey; -import io.quarkus.arc.processor.Methods.SubclassSkipPredicate; -import io.quarkus.gizmo.MethodCreator; -import io.quarkus.gizmo.MethodDescriptor; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -21,9 +17,11 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.function.Consumer; import java.util.stream.Collectors; + import javax.enterprise.inject.spi.DefinitionException; import javax.enterprise.inject.spi.DeploymentException; import javax.enterprise.inject.spi.InterceptionType; + import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.AnnotationTarget; import org.jboss.jandex.AnnotationTarget.Kind; @@ -32,6 +30,11 @@ import org.jboss.jandex.MethodInfo; import org.jboss.jandex.Type; +import io.quarkus.arc.processor.Methods.MethodKey; +import io.quarkus.arc.processor.Methods.SubclassSkipPredicate; +import io.quarkus.gizmo.MethodCreator; +import io.quarkus.gizmo.MethodDescriptor; + /** * Represents a CDI bean at build time. */ diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanProcessor.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanProcessor.java index 42ea504dcbbb1..b869031c5461b 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanProcessor.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanProcessor.java @@ -1,13 +1,5 @@ package io.quarkus.arc.processor; -import io.quarkus.arc.AlternativePriority; -import io.quarkus.arc.InjectableBean; -import io.quarkus.arc.processor.BeanDeploymentValidator.ValidationContext; -import io.quarkus.arc.processor.BuildExtension.BuildContext; -import io.quarkus.arc.processor.BuildExtension.Key; -import io.quarkus.arc.processor.ResourceOutput.Resource; -import io.quarkus.arc.processor.ResourceOutput.Resource.SpecialType; -import io.quarkus.gizmo.BytecodeCreator; import java.io.IOException; import java.util.ArrayList; import java.util.Collection; @@ -30,13 +22,24 @@ import java.util.function.Function; import java.util.function.Predicate; import java.util.stream.Collectors; + import javax.annotation.Priority; + import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.ClassInfo; import org.jboss.jandex.DotName; import org.jboss.jandex.IndexView; import org.jboss.logging.Logger; +import io.quarkus.arc.AlternativePriority; +import io.quarkus.arc.InjectableBean; +import io.quarkus.arc.processor.BeanDeploymentValidator.ValidationContext; +import io.quarkus.arc.processor.BuildExtension.BuildContext; +import io.quarkus.arc.processor.BuildExtension.Key; +import io.quarkus.arc.processor.ResourceOutput.Resource; +import io.quarkus.arc.processor.ResourceOutput.Resource.SpecialType; +import io.quarkus.gizmo.BytecodeCreator; + /** * An integrator should create a new instance of the bean processor using the convenient {@link Builder} and then invoke the * "processing" methods in the following order: diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanRegistrar.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanRegistrar.java index 1e6bacd389580..e66eb84dd4be3 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanRegistrar.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanRegistrar.java @@ -1,6 +1,7 @@ package io.quarkus.arc.processor; import java.util.Collection; + import org.jboss.jandex.DotName; /** diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanResolver.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanResolver.java index b99ab94bc2660..45c2febb4a6a9 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanResolver.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanResolver.java @@ -2,7 +2,9 @@ import java.util.Collections; import java.util.Set; + import javax.enterprise.inject.AmbiguousResolutionException; + import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.Type; 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 3285cd0f5c143..2be7e8e9fd397 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 @@ -7,7 +7,6 @@ import static org.jboss.jandex.Type.Kind.TYPE_VARIABLE; import static org.jboss.jandex.Type.Kind.WILDCARD_TYPE; -import io.quarkus.arc.processor.InjectionPointInfo.TypeAndQualifiers; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -17,7 +16,9 @@ import java.util.Objects; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; + import javax.enterprise.inject.AmbiguousResolutionException; + import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.ClassType; import org.jboss.jandex.Type; @@ -25,6 +26,8 @@ import org.jboss.jandex.TypeVariable; import org.jboss.jandex.WildcardType; +import io.quarkus.arc.processor.InjectionPointInfo.TypeAndQualifiers; + class BeanResolverImpl implements BeanResolver { protected final BeanDeployment beanDeployment; diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanStream.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanStream.java index 6a21d459fc8cd..106cdce96be40 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanStream.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanStream.java @@ -12,6 +12,7 @@ import java.util.stream.Collector; import java.util.stream.Collectors; import java.util.stream.Stream; + import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.DotName; import org.jboss.jandex.Type; diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/Beans.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/Beans.java index 8cb3edbdeb856..422f5317a2c55 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/Beans.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/Beans.java @@ -2,8 +2,6 @@ import static io.quarkus.arc.processor.IndexClassLookupUtils.getClassByName; -import io.quarkus.arc.processor.InjectionPointInfo.TypeAndQualifiers; -import io.quarkus.gizmo.Gizmo; import java.lang.reflect.Modifier; import java.util.ArrayList; import java.util.Collection; @@ -15,10 +13,12 @@ import java.util.function.BiFunction; import java.util.function.Consumer; import java.util.stream.Collectors; + import javax.enterprise.inject.AmbiguousResolutionException; import javax.enterprise.inject.UnsatisfiedResolutionException; import javax.enterprise.inject.spi.DefinitionException; import javax.enterprise.inject.spi.DeploymentException; + import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.AnnotationTarget; import org.jboss.jandex.AnnotationValue; @@ -34,6 +34,9 @@ import org.objectweb.asm.MethodVisitor; import org.objectweb.asm.Opcodes; +import io.quarkus.arc.processor.InjectionPointInfo.TypeAndQualifiers; +import io.quarkus.gizmo.Gizmo; + public final class Beans { static final Logger LOGGER = Logger.getLogger(Beans.class); diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BuildExtension.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BuildExtension.java index 164c4042f4633..03370d9c17812 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BuildExtension.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BuildExtension.java @@ -4,6 +4,7 @@ import java.util.Collection; import java.util.Map; + import org.jboss.jandex.ClassInfo; import org.jboss.jandex.DotName; import org.jboss.jandex.IndexView; diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BuiltinBean.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BuiltinBean.java index 6243b40e0bc56..68aaa2a2a97b4 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BuiltinBean.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BuiltinBean.java @@ -2,6 +2,21 @@ import static io.quarkus.arc.processor.IndexClassLookupUtils.getClassByName; +import java.lang.reflect.Member; +import java.util.HashSet; +import java.util.Set; +import java.util.function.BiPredicate; +import java.util.function.Consumer; +import java.util.function.Predicate; +import java.util.function.Supplier; + +import javax.enterprise.inject.spi.DefinitionException; + +import org.jboss.jandex.AnnotationInstance; +import org.jboss.jandex.ClassInfo; +import org.jboss.jandex.DotName; +import org.jboss.jandex.Type.Kind; + import io.quarkus.arc.InjectableBean; import io.quarkus.arc.impl.BeanManagerProvider; import io.quarkus.arc.impl.BeanMetadataProvider; @@ -18,18 +33,6 @@ import io.quarkus.gizmo.MethodCreator; import io.quarkus.gizmo.MethodDescriptor; import io.quarkus.gizmo.ResultHandle; -import java.lang.reflect.Member; -import java.util.HashSet; -import java.util.Set; -import java.util.function.BiPredicate; -import java.util.function.Consumer; -import java.util.function.Predicate; -import java.util.function.Supplier; -import javax.enterprise.inject.spi.DefinitionException; -import org.jboss.jandex.AnnotationInstance; -import org.jboss.jandex.ClassInfo; -import org.jboss.jandex.DotName; -import org.jboss.jandex.Type.Kind; /** * diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BuiltinQualifier.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BuiltinQualifier.java index 41d25f94d1561..be7a9593e7e10 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BuiltinQualifier.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BuiltinQualifier.java @@ -1,13 +1,16 @@ package io.quarkus.arc.processor; -import io.quarkus.gizmo.BytecodeCreator; -import io.quarkus.gizmo.FieldDescriptor; -import io.quarkus.gizmo.ResultHandle; import java.util.Collections; + import javax.enterprise.inject.Any; import javax.enterprise.inject.Default; + import org.jboss.jandex.AnnotationInstance; +import io.quarkus.gizmo.BytecodeCreator; +import io.quarkus.gizmo.FieldDescriptor; +import io.quarkus.gizmo.ResultHandle; + enum BuiltinQualifier { DEFAULT(AnnotationInstance.create(DotNames.DEFAULT, null, Collections.emptyList()), diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BuiltinScope.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BuiltinScope.java index 55c342c873e05..d82db985f3f3d 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BuiltinScope.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BuiltinScope.java @@ -1,10 +1,12 @@ package io.quarkus.arc.processor; import java.lang.annotation.Annotation; + import javax.enterprise.context.ApplicationScoped; import javax.enterprise.context.Dependent; import javax.enterprise.context.RequestScoped; import javax.inject.Singleton; + import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.ClassInfo; import org.jboss.jandex.DotName; diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BytecodeTransformer.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BytecodeTransformer.java index 18391a0516208..b4956f47abd00 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BytecodeTransformer.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BytecodeTransformer.java @@ -1,6 +1,7 @@ package io.quarkus.arc.processor; import java.util.function.BiFunction; + import org.objectweb.asm.ClassVisitor; public class BytecodeTransformer { diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ClientProxyGenerator.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ClientProxyGenerator.java index e13c36fcebb3b..a3c63d605ddf7 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ClientProxyGenerator.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ClientProxyGenerator.java @@ -5,20 +5,6 @@ import static org.objectweb.asm.Opcodes.ACC_PRIVATE; import static org.objectweb.asm.Opcodes.ACC_VOLATILE; -import io.quarkus.arc.ClientProxy; -import io.quarkus.arc.InjectableBean; -import io.quarkus.arc.InjectableContext; -import io.quarkus.arc.impl.Mockable; -import io.quarkus.arc.processor.BeanGenerator.ProviderType; -import io.quarkus.arc.processor.ResourceOutput.Resource; -import io.quarkus.arc.processor.ResourceOutput.Resource.SpecialType; -import io.quarkus.gizmo.BytecodeCreator; -import io.quarkus.gizmo.ClassCreator; -import io.quarkus.gizmo.FieldCreator; -import io.quarkus.gizmo.FieldDescriptor; -import io.quarkus.gizmo.MethodCreator; -import io.quarkus.gizmo.MethodDescriptor; -import io.quarkus.gizmo.ResultHandle; import java.lang.reflect.Modifier; import java.util.ArrayList; import java.util.Collection; @@ -29,6 +15,7 @@ import java.util.Set; import java.util.function.Consumer; import java.util.function.Predicate; + import org.jboss.jandex.ClassInfo; import org.jboss.jandex.DotName; import org.jboss.jandex.FieldInfo; @@ -36,6 +23,21 @@ import org.jboss.jandex.MethodInfo; import org.jboss.jandex.Type; +import io.quarkus.arc.ClientProxy; +import io.quarkus.arc.InjectableBean; +import io.quarkus.arc.InjectableContext; +import io.quarkus.arc.impl.Mockable; +import io.quarkus.arc.processor.BeanGenerator.ProviderType; +import io.quarkus.arc.processor.ResourceOutput.Resource; +import io.quarkus.arc.processor.ResourceOutput.Resource.SpecialType; +import io.quarkus.gizmo.BytecodeCreator; +import io.quarkus.gizmo.ClassCreator; +import io.quarkus.gizmo.FieldCreator; +import io.quarkus.gizmo.FieldDescriptor; +import io.quarkus.gizmo.MethodCreator; +import io.quarkus.gizmo.MethodDescriptor; +import io.quarkus.gizmo.ResultHandle; + /** * * @author Martin Kouba diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ComponentsProviderGenerator.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ComponentsProviderGenerator.java index f562f9cde4cf4..76e34376eef3a 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ComponentsProviderGenerator.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ComponentsProviderGenerator.java @@ -5,22 +5,6 @@ import static org.objectweb.asm.Opcodes.ACC_PUBLIC; import static org.objectweb.asm.Opcodes.ACC_STATIC; -import io.quarkus.arc.Arc; -import io.quarkus.arc.Components; -import io.quarkus.arc.ComponentsProvider; -import io.quarkus.arc.InjectableBean; -import io.quarkus.arc.processor.ResourceOutput.Resource; -import io.quarkus.gizmo.AssignableResultHandle; -import io.quarkus.gizmo.BytecodeCreator; -import io.quarkus.gizmo.CatchBlockCreator; -import io.quarkus.gizmo.ClassCreator; -import io.quarkus.gizmo.ClassOutput; -import io.quarkus.gizmo.FieldDescriptor; -import io.quarkus.gizmo.FunctionCreator; -import io.quarkus.gizmo.MethodCreator; -import io.quarkus.gizmo.MethodDescriptor; -import io.quarkus.gizmo.ResultHandle; -import io.quarkus.gizmo.TryBlock; import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.Collection; @@ -35,11 +19,29 @@ import java.util.function.Predicate; import java.util.function.Supplier; import java.util.stream.Collectors; + import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.ClassInfo; import org.jboss.jandex.DotName; import org.objectweb.asm.Type; +import io.quarkus.arc.Arc; +import io.quarkus.arc.Components; +import io.quarkus.arc.ComponentsProvider; +import io.quarkus.arc.InjectableBean; +import io.quarkus.arc.processor.ResourceOutput.Resource; +import io.quarkus.gizmo.AssignableResultHandle; +import io.quarkus.gizmo.BytecodeCreator; +import io.quarkus.gizmo.CatchBlockCreator; +import io.quarkus.gizmo.ClassCreator; +import io.quarkus.gizmo.ClassOutput; +import io.quarkus.gizmo.FieldDescriptor; +import io.quarkus.gizmo.FunctionCreator; +import io.quarkus.gizmo.MethodCreator; +import io.quarkus.gizmo.MethodDescriptor; +import io.quarkus.gizmo.ResultHandle; +import io.quarkus.gizmo.TryBlock; + /** * * @author Martin Kouba diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ConfiguratorBase.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ConfiguratorBase.java index 813897822caf3..26fc96710c622 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ConfiguratorBase.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ConfiguratorBase.java @@ -3,6 +3,7 @@ import java.util.HashMap; import java.util.Map; import java.util.Objects; + import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.ClassInfo; diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ContextConfigurator.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ContextConfigurator.java index 5e11304c07f7c..c94a00dacc1d5 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ContextConfigurator.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ContextConfigurator.java @@ -1,10 +1,5 @@ package io.quarkus.arc.processor; -import io.quarkus.arc.ContextCreator; -import io.quarkus.arc.InjectableContext; -import io.quarkus.gizmo.MethodCreator; -import io.quarkus.gizmo.MethodDescriptor; -import io.quarkus.gizmo.ResultHandle; import java.lang.annotation.Annotation; import java.util.HashMap; import java.util.Map; @@ -13,8 +8,15 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.function.Consumer; import java.util.function.Function; + import javax.enterprise.context.NormalScope; +import io.quarkus.arc.ContextCreator; +import io.quarkus.arc.InjectableContext; +import io.quarkus.gizmo.MethodCreator; +import io.quarkus.gizmo.MethodDescriptor; +import io.quarkus.gizmo.ResultHandle; + /** * Custom context configurator. * diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ContextRegistrar.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ContextRegistrar.java index 36dac1c9e865c..a959a968367f3 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ContextRegistrar.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ContextRegistrar.java @@ -1,8 +1,9 @@ package io.quarkus.arc.processor; -import io.quarkus.arc.InjectableContext; import java.lang.annotation.Annotation; +import io.quarkus.arc.InjectableContext; + /** * Use this extension point to register a custom {@link InjectableContext} implementation. * diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/DecoratorGenerator.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/DecoratorGenerator.java index 6091bad566cc4..04957a6e01da4 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/DecoratorGenerator.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/DecoratorGenerator.java @@ -4,18 +4,6 @@ import static org.objectweb.asm.Opcodes.ACC_PRIVATE; import static org.objectweb.asm.Opcodes.ACC_PUBLIC; -import io.quarkus.arc.InjectableDecorator; -import io.quarkus.arc.processor.BeanProcessor.PrivateMembersCollector; -import io.quarkus.arc.processor.ResourceOutput.Resource; -import io.quarkus.arc.processor.ResourceOutput.Resource.SpecialType; -import io.quarkus.gizmo.ClassCreator; -import io.quarkus.gizmo.ClassOutput; -import io.quarkus.gizmo.DescriptorUtils; -import io.quarkus.gizmo.FieldCreator; -import io.quarkus.gizmo.FieldDescriptor; -import io.quarkus.gizmo.MethodCreator; -import io.quarkus.gizmo.MethodDescriptor; -import io.quarkus.gizmo.ResultHandle; import java.lang.reflect.Type; import java.util.Collection; import java.util.Collections; @@ -27,6 +15,7 @@ import java.util.Set; import java.util.function.Predicate; import java.util.function.Supplier; + import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.ClassInfo; import org.jboss.jandex.DotName; @@ -35,6 +24,19 @@ import org.jboss.jandex.Type.Kind; import org.jboss.jandex.TypeVariable; +import io.quarkus.arc.InjectableDecorator; +import io.quarkus.arc.processor.BeanProcessor.PrivateMembersCollector; +import io.quarkus.arc.processor.ResourceOutput.Resource; +import io.quarkus.arc.processor.ResourceOutput.Resource.SpecialType; +import io.quarkus.gizmo.ClassCreator; +import io.quarkus.gizmo.ClassOutput; +import io.quarkus.gizmo.DescriptorUtils; +import io.quarkus.gizmo.FieldCreator; +import io.quarkus.gizmo.FieldDescriptor; +import io.quarkus.gizmo.MethodCreator; +import io.quarkus.gizmo.MethodDescriptor; +import io.quarkus.gizmo.ResultHandle; + public class DecoratorGenerator extends BeanGenerator { protected static final String FIELD_NAME_DECORATED_TYPES = "decoratedTypes"; diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/DecoratorInfo.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/DecoratorInfo.java index 9dfd05fbb8103..a4bb76071c61e 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/DecoratorInfo.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/DecoratorInfo.java @@ -5,6 +5,7 @@ import java.util.HashSet; import java.util.List; import java.util.Set; + import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.AnnotationTarget; import org.jboss.jandex.ClassInfo; diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/Decorators.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/Decorators.java index 92370dae42b4a..efb373a015d12 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/Decorators.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/Decorators.java @@ -6,7 +6,9 @@ import java.util.LinkedList; import java.util.List; import java.util.Set; + import javax.enterprise.inject.spi.DefinitionException; + import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.ClassInfo; import org.jboss.jandex.MethodInfo; diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/DelegateInjectionPointResolverImpl.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/DelegateInjectionPointResolverImpl.java index 262cfb44dd67b..8e01c669758b0 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/DelegateInjectionPointResolverImpl.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/DelegateInjectionPointResolverImpl.java @@ -5,6 +5,7 @@ import java.util.Collections; import java.util.List; + import org.jboss.jandex.Type; import org.jboss.jandex.TypeVariable; import org.jboss.jandex.WildcardType; diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/DisposerInfo.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/DisposerInfo.java index 7fa39b962fe39..36154d5d65838 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/DisposerInfo.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/DisposerInfo.java @@ -5,7 +5,9 @@ import java.util.HashSet; import java.util.List; import java.util.Set; + import javax.enterprise.inject.spi.DefinitionException; + import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.AnnotationTarget.Kind; import org.jboss.jandex.MethodInfo; diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/DotNames.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/DotNames.java index e7272bf380d54..49c68aee322ff 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/DotNames.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/DotNames.java @@ -1,17 +1,5 @@ package io.quarkus.arc.processor; -import io.quarkus.arc.All; -import io.quarkus.arc.AlternativePriority; -import io.quarkus.arc.ArcInvocationContext; -import io.quarkus.arc.DefaultBean; -import io.quarkus.arc.InjectableBean; -import io.quarkus.arc.InjectableInstance; -import io.quarkus.arc.InstanceHandle; -import io.quarkus.arc.NoClassInterceptors; -import io.quarkus.arc.Unremovable; -import io.quarkus.arc.VetoedProducer; -import io.quarkus.arc.impl.ComputingCache; -import io.quarkus.arc.impl.Identified; import java.io.Serializable; import java.lang.annotation.Inherited; import java.lang.annotation.Repeatable; @@ -20,6 +8,7 @@ import java.util.OptionalDouble; import java.util.OptionalInt; import java.util.OptionalLong; + import javax.annotation.PostConstruct; import javax.annotation.PreDestroy; import javax.annotation.Priority; @@ -59,9 +48,23 @@ import javax.interceptor.Interceptor; import javax.interceptor.InterceptorBinding; import javax.interceptor.InvocationContext; + import org.jboss.jandex.ClassInfo; import org.jboss.jandex.DotName; +import io.quarkus.arc.All; +import io.quarkus.arc.AlternativePriority; +import io.quarkus.arc.ArcInvocationContext; +import io.quarkus.arc.DefaultBean; +import io.quarkus.arc.InjectableBean; +import io.quarkus.arc.InjectableInstance; +import io.quarkus.arc.InstanceHandle; +import io.quarkus.arc.NoClassInterceptors; +import io.quarkus.arc.Unremovable; +import io.quarkus.arc.VetoedProducer; +import io.quarkus.arc.impl.ComputingCache; +import io.quarkus.arc.impl.Identified; + public final class DotNames { private static final ComputingCache NAMES = new ComputingCache<>(DotNames::create); diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/FieldDescriptors.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/FieldDescriptors.java index f7fe340ef62c9..8e2f5102ed716 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/FieldDescriptors.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/FieldDescriptors.java @@ -1,9 +1,10 @@ package io.quarkus.arc.processor; +import java.util.Set; + import io.quarkus.arc.impl.AnnotationLiterals; import io.quarkus.arc.impl.Qualifiers; import io.quarkus.gizmo.FieldDescriptor; -import java.util.Set; /** * diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/IndexClassLookupUtils.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/IndexClassLookupUtils.java index eb9ef9665b82f..d43aa379cbd62 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/IndexClassLookupUtils.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/IndexClassLookupUtils.java @@ -2,6 +2,7 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; + import org.jboss.jandex.ClassInfo; import org.jboss.jandex.DotName; import org.jboss.jandex.IndexView; diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/Injection.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/Injection.java index 7e3a5ece0152f..3bc805bc94fdc 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/Injection.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/Injection.java @@ -8,7 +8,9 @@ import java.util.List; import java.util.Set; import java.util.stream.Collectors; + import javax.enterprise.inject.spi.DefinitionException; + import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.AnnotationTarget; import org.jboss.jandex.AnnotationTarget.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 2bdf5ea705f41..33e80fd13f665 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 @@ -13,6 +13,7 @@ import java.util.Set; import java.util.concurrent.atomic.AtomicReference; import java.util.function.Predicate; + import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.AnnotationTarget; import org.jboss.jandex.AnnotationTarget.Kind; diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/InjectionPointModifier.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/InjectionPointModifier.java index c3a0fe32b8dc0..9133a81f86bf8 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/InjectionPointModifier.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/InjectionPointModifier.java @@ -1,13 +1,15 @@ package io.quarkus.arc.processor; -import io.quarkus.arc.processor.BuildExtension.BuildContext; import java.util.HashSet; import java.util.List; import java.util.Set; + import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.AnnotationTarget; import org.jboss.jandex.Type; +import io.quarkus.arc.processor.BuildExtension.BuildContext; + /** * Holds all {@link InjectionPointsTransformer} instances and provides helper method to apply them on a given * type. This is used in {@link InjectionPointInfo}, prior to creating actual injection points. diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/InjectionPointsTransformer.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/InjectionPointsTransformer.java index e6d79b4b2937c..cb0fcde50feb9 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/InjectionPointsTransformer.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/InjectionPointsTransformer.java @@ -3,6 +3,7 @@ import java.util.Collection; import java.util.Set; import java.util.function.Consumer; + import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.AnnotationTarget; import org.jboss.jandex.Type; diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/InterceptorBindingRegistrar.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/InterceptorBindingRegistrar.java index 7578a29655b12..1412b55312c5d 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/InterceptorBindingRegistrar.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/InterceptorBindingRegistrar.java @@ -5,7 +5,9 @@ import java.util.List; import java.util.Set; import java.util.function.Predicate; + import javax.enterprise.util.Nonbinding; + import org.jboss.jandex.DotName; public interface InterceptorBindingRegistrar extends BuildExtension { diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/InterceptorGenerator.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/InterceptorGenerator.java index 3e1e11fdbda65..cfd885fbfb6a3 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/InterceptorGenerator.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/InterceptorGenerator.java @@ -4,20 +4,6 @@ import static org.objectweb.asm.Opcodes.ACC_PRIVATE; import static org.objectweb.asm.Opcodes.ACC_PUBLIC; -import io.quarkus.arc.ArcInvocationContext; -import io.quarkus.arc.InjectableInterceptor; -import io.quarkus.arc.processor.BeanProcessor.PrivateMembersCollector; -import io.quarkus.arc.processor.ResourceOutput.Resource; -import io.quarkus.arc.processor.ResourceOutput.Resource.SpecialType; -import io.quarkus.gizmo.BranchResult; -import io.quarkus.gizmo.BytecodeCreator; -import io.quarkus.gizmo.ClassCreator; -import io.quarkus.gizmo.ClassOutput; -import io.quarkus.gizmo.FieldCreator; -import io.quarkus.gizmo.FieldDescriptor; -import io.quarkus.gizmo.MethodCreator; -import io.quarkus.gizmo.MethodDescriptor; -import io.quarkus.gizmo.ResultHandle; import java.lang.reflect.Modifier; import java.util.Collection; import java.util.Collections; @@ -27,14 +13,31 @@ import java.util.Set; import java.util.function.Predicate; import java.util.function.Supplier; + import javax.enterprise.inject.spi.InterceptionType; import javax.interceptor.InvocationContext; + import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.ClassInfo; import org.jboss.jandex.DotName; import org.jboss.jandex.MethodInfo; import org.jboss.jandex.Type; +import io.quarkus.arc.ArcInvocationContext; +import io.quarkus.arc.InjectableInterceptor; +import io.quarkus.arc.processor.BeanProcessor.PrivateMembersCollector; +import io.quarkus.arc.processor.ResourceOutput.Resource; +import io.quarkus.arc.processor.ResourceOutput.Resource.SpecialType; +import io.quarkus.gizmo.BranchResult; +import io.quarkus.gizmo.BytecodeCreator; +import io.quarkus.gizmo.ClassCreator; +import io.quarkus.gizmo.ClassOutput; +import io.quarkus.gizmo.FieldCreator; +import io.quarkus.gizmo.FieldDescriptor; +import io.quarkus.gizmo.MethodCreator; +import io.quarkus.gizmo.MethodDescriptor; +import io.quarkus.gizmo.ResultHandle; + /** * * @author Martin Kouba diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/InterceptorInfo.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/InterceptorInfo.java index 4d89cd216cb71..175ddbe05370d 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/InterceptorInfo.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/InterceptorInfo.java @@ -8,7 +8,9 @@ import java.util.HashSet; import java.util.List; import java.util.Set; + import javax.enterprise.inject.spi.InterceptionType; + import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.AnnotationTarget; import org.jboss.jandex.ClassInfo; diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/InterceptorResolver.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/InterceptorResolver.java index 8ed42fe4c3b9a..2b6f07aa3e9f0 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/InterceptorResolver.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/InterceptorResolver.java @@ -5,7 +5,9 @@ import java.util.Collections; import java.util.List; import java.util.Set; + import javax.enterprise.inject.spi.InterceptionType; + import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.AnnotationValue; import org.jboss.jandex.ClassInfo; diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/Interceptors.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/Interceptors.java index f3b843a20e5b7..5cbb002271ee1 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/Interceptors.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/Interceptors.java @@ -3,7 +3,9 @@ import java.util.Collections; import java.util.HashSet; import java.util.Set; + import javax.enterprise.inject.spi.DefinitionException; + import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.ClassInfo; import org.jboss.logging.Logger; diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/MethodDescriptors.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/MethodDescriptors.java index c0b52952f1476..30991148a39b8 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/MethodDescriptors.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/MethodDescriptors.java @@ -1,5 +1,24 @@ package io.quarkus.arc.processor; +import java.lang.reflect.Constructor; +import java.lang.reflect.Field; +import java.lang.reflect.Member; +import java.lang.reflect.Method; +import java.lang.reflect.Type; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.function.Function; +import java.util.function.Supplier; + +import javax.enterprise.context.spi.Context; +import javax.enterprise.context.spi.Contextual; +import javax.enterprise.context.spi.CreationalContext; +import javax.enterprise.inject.spi.EventContext; +import javax.enterprise.inject.spi.EventMetadata; +import javax.interceptor.InvocationContext; + import io.quarkus.arc.Arc; import io.quarkus.arc.ArcContainer; import io.quarkus.arc.ClientProxy; @@ -23,23 +42,6 @@ import io.quarkus.arc.impl.RemovedBeanImpl; import io.quarkus.arc.impl.Sets; import io.quarkus.gizmo.MethodDescriptor; -import java.lang.reflect.Constructor; -import java.lang.reflect.Field; -import java.lang.reflect.Member; -import java.lang.reflect.Method; -import java.lang.reflect.Type; -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.function.Function; -import java.util.function.Supplier; -import javax.enterprise.context.spi.Context; -import javax.enterprise.context.spi.Contextual; -import javax.enterprise.context.spi.CreationalContext; -import javax.enterprise.inject.spi.EventContext; -import javax.enterprise.inject.spi.EventMetadata; -import javax.interceptor.InvocationContext; /** * 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 623dc14c5589a..f993b93ea534f 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 @@ -2,9 +2,6 @@ import static io.quarkus.arc.processor.IndexClassLookupUtils.getClassByName; -import io.quarkus.gizmo.DescriptorUtils; -import io.quarkus.gizmo.Gizmo; -import io.quarkus.gizmo.MethodDescriptor; import java.lang.reflect.Modifier; import java.util.ArrayList; import java.util.Collection; @@ -17,7 +14,9 @@ import java.util.function.Consumer; import java.util.function.Predicate; import java.util.stream.Collectors; + import javax.enterprise.inject.spi.DeploymentException; + import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.ClassInfo; import org.jboss.jandex.DotName; @@ -31,6 +30,10 @@ import org.objectweb.asm.MethodVisitor; import org.objectweb.asm.Opcodes; +import io.quarkus.gizmo.DescriptorUtils; +import io.quarkus.gizmo.Gizmo; +import io.quarkus.gizmo.MethodDescriptor; + /** * * @author Martin Kouba diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ObserverConfigurator.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ObserverConfigurator.java index 6ce8e6ed3fb01..01ece104c26b0 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ObserverConfigurator.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ObserverConfigurator.java @@ -1,19 +1,22 @@ package io.quarkus.arc.processor; -import io.quarkus.gizmo.MethodCreator; import java.lang.annotation.Annotation; import java.util.Collections; import java.util.HashSet; import java.util.Set; import java.util.function.Consumer; + import javax.enterprise.event.TransactionPhase; import javax.enterprise.inject.spi.ObserverMethod; + import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.AnnotationValue; import org.jboss.jandex.DotName; import org.jboss.jandex.Type; import org.jboss.jandex.Type.Kind; +import io.quarkus.gizmo.MethodCreator; + /** * Configures a synthetic observer. *

diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ObserverGenerator.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ObserverGenerator.java index 8e3b714784111..144ce5fee6200 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ObserverGenerator.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ObserverGenerator.java @@ -6,25 +6,6 @@ import static org.objectweb.asm.Opcodes.ACC_PUBLIC; import static org.objectweb.asm.Opcodes.ACC_VOLATILE; -import io.quarkus.arc.InjectableBean; -import io.quarkus.arc.InjectableObserverMethod; -import io.quarkus.arc.impl.CreationalContextImpl; -import io.quarkus.arc.impl.CurrentInjectionPointProvider; -import io.quarkus.arc.impl.Mockable; -import io.quarkus.arc.processor.BeanProcessor.PrivateMembersCollector; -import io.quarkus.arc.processor.BuiltinBean.GeneratorContext; -import io.quarkus.arc.processor.ResourceOutput.Resource; -import io.quarkus.arc.processor.ResourceOutput.Resource.SpecialType; -import io.quarkus.gizmo.AssignableResultHandle; -import io.quarkus.gizmo.BranchResult; -import io.quarkus.gizmo.BytecodeCreator; -import io.quarkus.gizmo.ClassCreator; -import io.quarkus.gizmo.ClassOutput; -import io.quarkus.gizmo.FieldCreator; -import io.quarkus.gizmo.FieldDescriptor; -import io.quarkus.gizmo.MethodCreator; -import io.quarkus.gizmo.MethodDescriptor; -import io.quarkus.gizmo.ResultHandle; import java.lang.reflect.Member; import java.lang.reflect.Modifier; import java.lang.reflect.Type; @@ -41,16 +22,38 @@ import java.util.function.Predicate; import java.util.function.Supplier; import java.util.stream.Collectors; + import javax.enterprise.context.ContextNotActiveException; import javax.enterprise.context.spi.Contextual; import javax.enterprise.event.Reception; import javax.enterprise.event.TransactionPhase; import javax.enterprise.inject.spi.EventContext; import javax.enterprise.inject.spi.ObserverMethod; + import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.ClassInfo; import org.jboss.jandex.DotName; +import io.quarkus.arc.InjectableBean; +import io.quarkus.arc.InjectableObserverMethod; +import io.quarkus.arc.impl.CreationalContextImpl; +import io.quarkus.arc.impl.CurrentInjectionPointProvider; +import io.quarkus.arc.impl.Mockable; +import io.quarkus.arc.processor.BeanProcessor.PrivateMembersCollector; +import io.quarkus.arc.processor.BuiltinBean.GeneratorContext; +import io.quarkus.arc.processor.ResourceOutput.Resource; +import io.quarkus.arc.processor.ResourceOutput.Resource.SpecialType; +import io.quarkus.gizmo.AssignableResultHandle; +import io.quarkus.gizmo.BranchResult; +import io.quarkus.gizmo.BytecodeCreator; +import io.quarkus.gizmo.ClassCreator; +import io.quarkus.gizmo.ClassOutput; +import io.quarkus.gizmo.FieldCreator; +import io.quarkus.gizmo.FieldDescriptor; +import io.quarkus.gizmo.MethodCreator; +import io.quarkus.gizmo.MethodDescriptor; +import io.quarkus.gizmo.ResultHandle; + /** * * @author Martin Kouba diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ObserverInfo.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ObserverInfo.java index b858c74df729e..c593fa4d423f0 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ObserverInfo.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ObserverInfo.java @@ -3,10 +3,6 @@ import static io.quarkus.arc.processor.Annotations.find; import static io.quarkus.arc.processor.Annotations.getParameterAnnotations; -import io.quarkus.arc.processor.BuildExtension.BuildContext; -import io.quarkus.arc.processor.ObserverTransformer.ObserverTransformation; -import io.quarkus.arc.processor.ObserverTransformer.TransformationContext; -import io.quarkus.gizmo.MethodCreator; import java.util.ArrayList; import java.util.Collections; import java.util.HashSet; @@ -15,10 +11,12 @@ import java.util.Map; import java.util.Set; import java.util.function.Consumer; + import javax.enterprise.event.Reception; import javax.enterprise.event.TransactionPhase; import javax.enterprise.inject.spi.DefinitionException; import javax.enterprise.inject.spi.ObserverMethod; + import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.AnnotationTarget; import org.jboss.jandex.AnnotationTarget.Kind; @@ -29,6 +27,11 @@ import org.jboss.jandex.Type; import org.jboss.logging.Logger; +import io.quarkus.arc.processor.BuildExtension.BuildContext; +import io.quarkus.arc.processor.ObserverTransformer.ObserverTransformation; +import io.quarkus.arc.processor.ObserverTransformer.TransformationContext; +import io.quarkus.gizmo.MethodCreator; + /** * Represents an observer method. * diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ObserverTransformer.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ObserverTransformer.java index 86bf2b74920e8..146d7739a71ba 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ObserverTransformer.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ObserverTransformer.java @@ -2,8 +2,10 @@ import java.util.Collection; import java.util.Set; + import javax.enterprise.event.Reception; import javax.enterprise.event.TransactionPhase; + import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.MethodInfo; import org.jboss.jandex.Type; diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/QualifierConfigurator.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/QualifierConfigurator.java index f302859c7a4eb..42ab5f5c8b538 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/QualifierConfigurator.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/QualifierConfigurator.java @@ -5,6 +5,7 @@ import java.util.ArrayList; import java.util.List; import java.util.function.Consumer; + import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.AnnotationValue; import org.jboss.jandex.DotName; diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/QualifierRegistrar.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/QualifierRegistrar.java index 99257f37b1235..0c275eeeb338f 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/QualifierRegistrar.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/QualifierRegistrar.java @@ -2,7 +2,9 @@ import java.util.Map; import java.util.Set; + import javax.inject.Qualifier; + import org.jboss.jandex.DotName; /** diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ResourceClassOutput.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ResourceClassOutput.java index 23b3be05f0612..f6afc5b6dcfaa 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ResourceClassOutput.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ResourceClassOutput.java @@ -1,8 +1,5 @@ package io.quarkus.arc.processor; -import io.quarkus.arc.processor.ResourceOutput.Resource; -import io.quarkus.arc.processor.ResourceOutput.Resource.SpecialType; -import io.quarkus.gizmo.ClassOutput; import java.io.StringWriter; import java.io.Writer; import java.util.ArrayList; @@ -11,6 +8,10 @@ import java.util.Map; import java.util.function.Function; +import io.quarkus.arc.processor.ResourceOutput.Resource; +import io.quarkus.arc.processor.ResourceOutput.Resource.SpecialType; +import io.quarkus.gizmo.ClassOutput; + /** * */ diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ResourceImpl.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ResourceImpl.java index 1048707369e10..805d9a09aa635 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ResourceImpl.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ResourceImpl.java @@ -1,12 +1,13 @@ package io.quarkus.arc.processor; -import io.quarkus.arc.processor.ResourceOutput.Resource; import java.io.File; import java.io.FileOutputStream; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; +import io.quarkus.arc.processor.ResourceOutput.Resource; + /** * * @author Martin Kouba diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ScopeInfo.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ScopeInfo.java index a1a3745176990..944d47739648e 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ScopeInfo.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ScopeInfo.java @@ -3,6 +3,7 @@ import java.lang.annotation.Annotation; import java.lang.annotation.Inherited; import java.util.Objects; + import org.jboss.jandex.DotName; /** diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/StereotypeInfo.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/StereotypeInfo.java index 2c8d5ffd6bd34..956c89265b03a 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/StereotypeInfo.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/StereotypeInfo.java @@ -1,6 +1,7 @@ package io.quarkus.arc.processor; import java.util.List; + import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.ClassInfo; import org.jboss.jandex.DotName; diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/StereotypeRegistrar.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/StereotypeRegistrar.java index 1f4f5e5a37c4a..1c8259569ef04 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/StereotypeRegistrar.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/StereotypeRegistrar.java @@ -1,7 +1,9 @@ package io.quarkus.arc.processor; import java.util.Set; + import javax.enterprise.inject.Stereotype; + import org.jboss.jandex.DotName; /** diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/SubclassGenerator.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/SubclassGenerator.java index d385a31f874c0..0dfb282aa6440 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/SubclassGenerator.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/SubclassGenerator.java @@ -4,29 +4,6 @@ import static org.objectweb.asm.Opcodes.ACC_FINAL; import static org.objectweb.asm.Opcodes.ACC_PRIVATE; -import io.quarkus.arc.ArcUndeclaredThrowableException; -import io.quarkus.arc.InjectableDecorator; -import io.quarkus.arc.InjectableInterceptor; -import io.quarkus.arc.Subclass; -import io.quarkus.arc.impl.InterceptedMethodMetadata; -import io.quarkus.arc.processor.BeanInfo.DecorationInfo; -import io.quarkus.arc.processor.BeanInfo.InterceptionInfo; -import io.quarkus.arc.processor.Methods.MethodKey; -import io.quarkus.arc.processor.ResourceOutput.Resource; -import io.quarkus.arc.processor.ResourceOutput.Resource.SpecialType; -import io.quarkus.gizmo.AssignableResultHandle; -import io.quarkus.gizmo.BytecodeCreator; -import io.quarkus.gizmo.CatchBlockCreator; -import io.quarkus.gizmo.ClassCreator; -import io.quarkus.gizmo.ClassOutput; -import io.quarkus.gizmo.DescriptorUtils; -import io.quarkus.gizmo.FieldCreator; -import io.quarkus.gizmo.FieldDescriptor; -import io.quarkus.gizmo.FunctionCreator; -import io.quarkus.gizmo.MethodCreator; -import io.quarkus.gizmo.MethodDescriptor; -import io.quarkus.gizmo.ResultHandle; -import io.quarkus.gizmo.TryBlock; import java.lang.reflect.Method; import java.lang.reflect.Modifier; import java.util.ArrayList; @@ -45,9 +22,11 @@ import java.util.function.Function; import java.util.function.Predicate; import java.util.stream.Collectors; + import javax.enterprise.context.spi.CreationalContext; import javax.enterprise.inject.spi.InterceptionType; import javax.interceptor.InvocationContext; + import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.ClassInfo; import org.jboss.jandex.DotName; @@ -57,6 +36,30 @@ import org.jboss.jandex.Type.Kind; import org.jboss.jandex.TypeVariable; +import io.quarkus.arc.ArcUndeclaredThrowableException; +import io.quarkus.arc.InjectableDecorator; +import io.quarkus.arc.InjectableInterceptor; +import io.quarkus.arc.Subclass; +import io.quarkus.arc.impl.InterceptedMethodMetadata; +import io.quarkus.arc.processor.BeanInfo.DecorationInfo; +import io.quarkus.arc.processor.BeanInfo.InterceptionInfo; +import io.quarkus.arc.processor.Methods.MethodKey; +import io.quarkus.arc.processor.ResourceOutput.Resource; +import io.quarkus.arc.processor.ResourceOutput.Resource.SpecialType; +import io.quarkus.gizmo.AssignableResultHandle; +import io.quarkus.gizmo.BytecodeCreator; +import io.quarkus.gizmo.CatchBlockCreator; +import io.quarkus.gizmo.ClassCreator; +import io.quarkus.gizmo.ClassOutput; +import io.quarkus.gizmo.DescriptorUtils; +import io.quarkus.gizmo.FieldCreator; +import io.quarkus.gizmo.FieldDescriptor; +import io.quarkus.gizmo.FunctionCreator; +import io.quarkus.gizmo.MethodCreator; +import io.quarkus.gizmo.MethodDescriptor; +import io.quarkus.gizmo.ResultHandle; +import io.quarkus.gizmo.TryBlock; + /** * A subclass is generated for any intercepted/decorated bean. */ diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/SyntheticComponentsUtil.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/SyntheticComponentsUtil.java index 06362098f0918..d708352e7699e 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/SyntheticComponentsUtil.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/SyntheticComponentsUtil.java @@ -3,18 +3,20 @@ import static org.objectweb.asm.Opcodes.ACC_FINAL; import static org.objectweb.asm.Opcodes.ACC_PRIVATE; -import io.quarkus.gizmo.ClassCreator; -import io.quarkus.gizmo.FieldCreator; -import io.quarkus.gizmo.MethodCreator; -import io.quarkus.gizmo.MethodDescriptor; -import io.quarkus.gizmo.ResultHandle; import java.lang.annotation.Annotation; import java.util.HashMap; import java.util.Map; + import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.ClassInfo; import org.jboss.jandex.IndexView; +import io.quarkus.gizmo.ClassCreator; +import io.quarkus.gizmo.FieldCreator; +import io.quarkus.gizmo.MethodCreator; +import io.quarkus.gizmo.MethodDescriptor; +import io.quarkus.gizmo.ResultHandle; + final class SyntheticComponentsUtil { private static final String FIELD_NAME_PARAMS = "params"; diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/Transformation.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/Transformation.java index 7c810c76ea594..134d235b51c57 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/Transformation.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/Transformation.java @@ -2,6 +2,7 @@ import java.util.Collection; import java.util.function.Consumer; + import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.AnnotationTarget; 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 a17f01ed58dbb..504b347e5eea1 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 @@ -2,17 +2,6 @@ import static io.quarkus.arc.processor.IndexClassLookupUtils.getClassByName; -import io.quarkus.arc.impl.GenericArrayTypeImpl; -import io.quarkus.arc.impl.ParameterizedTypeImpl; -import io.quarkus.arc.impl.TypeVariableImpl; -import io.quarkus.arc.impl.TypeVariableReferenceImpl; -import io.quarkus.arc.impl.WildcardTypeImpl; -import io.quarkus.gizmo.AssignableResultHandle; -import io.quarkus.gizmo.BranchResult; -import io.quarkus.gizmo.BytecodeCreator; -import io.quarkus.gizmo.MethodCreator; -import io.quarkus.gizmo.MethodDescriptor; -import io.quarkus.gizmo.ResultHandle; import java.util.ArrayDeque; import java.util.ArrayList; import java.util.Arrays; @@ -26,7 +15,9 @@ import java.util.Map; import java.util.Set; import java.util.function.BiConsumer; + import javax.enterprise.inject.spi.DefinitionException; + import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.AnnotationTarget; import org.jboss.jandex.AnnotationValue; @@ -43,6 +34,18 @@ import org.jboss.jandex.WildcardType; import org.jboss.logging.Logger; +import io.quarkus.arc.impl.GenericArrayTypeImpl; +import io.quarkus.arc.impl.ParameterizedTypeImpl; +import io.quarkus.arc.impl.TypeVariableImpl; +import io.quarkus.arc.impl.TypeVariableReferenceImpl; +import io.quarkus.arc.impl.WildcardTypeImpl; +import io.quarkus.gizmo.AssignableResultHandle; +import io.quarkus.gizmo.BranchResult; +import io.quarkus.gizmo.BytecodeCreator; +import io.quarkus.gizmo.MethodCreator; +import io.quarkus.gizmo.MethodDescriptor; +import io.quarkus.gizmo.ResultHandle; + /** * * @author Martin Kouba diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/UnusedBeans.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/UnusedBeans.java index 341d4b6feb8e0..83a6e115b8587 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/UnusedBeans.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/UnusedBeans.java @@ -10,6 +10,7 @@ import java.util.Set; import java.util.function.Predicate; import java.util.stream.Collectors; + import org.jboss.logging.Logger; final class UnusedBeans { diff --git a/independent-projects/arc/processor/src/test/java/io/quarkus/arc/processor/AnnotationLiteralProcessorTest.java b/independent-projects/arc/processor/src/test/java/io/quarkus/arc/processor/AnnotationLiteralProcessorTest.java index 82bc84526a715..19c83d0e7b8bf 100644 --- a/independent-projects/arc/processor/src/test/java/io/quarkus/arc/processor/AnnotationLiteralProcessorTest.java +++ b/independent-projects/arc/processor/src/test/java/io/quarkus/arc/processor/AnnotationLiteralProcessorTest.java @@ -2,16 +2,13 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import io.quarkus.gizmo.ClassCreator; -import io.quarkus.gizmo.MethodCreator; -import io.quarkus.gizmo.ResultHandle; -import io.quarkus.gizmo.TestClassLoader; import java.io.IOException; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.util.Collection; import java.util.Collections; import java.util.List; + import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.AnnotationValue; import org.jboss.jandex.DotName; @@ -21,6 +18,11 @@ import org.junit.jupiter.api.Test; import org.objectweb.asm.Opcodes; +import io.quarkus.gizmo.ClassCreator; +import io.quarkus.gizmo.MethodCreator; +import io.quarkus.gizmo.ResultHandle; +import io.quarkus.gizmo.TestClassLoader; + public class AnnotationLiteralProcessorTest { public enum SimpleEnum { FOO, diff --git a/independent-projects/arc/processor/src/test/java/io/quarkus/arc/processor/Basics.java b/independent-projects/arc/processor/src/test/java/io/quarkus/arc/processor/Basics.java index 9ed9acfedbe80..d6ad13dc4bba0 100644 --- a/independent-projects/arc/processor/src/test/java/io/quarkus/arc/processor/Basics.java +++ b/independent-projects/arc/processor/src/test/java/io/quarkus/arc/processor/Basics.java @@ -2,6 +2,7 @@ import java.io.IOException; import java.io.InputStream; + import org.jboss.jandex.DotName; import org.jboss.jandex.Index; import org.jboss.jandex.Indexer; diff --git a/independent-projects/arc/processor/src/test/java/io/quarkus/arc/processor/BeanInfoInjectionsTest.java b/independent-projects/arc/processor/src/test/java/io/quarkus/arc/processor/BeanInfoInjectionsTest.java index 7cc59d4899d83..981ae74c5bd4c 100644 --- a/independent-projects/arc/processor/src/test/java/io/quarkus/arc/processor/BeanInfoInjectionsTest.java +++ b/independent-projects/arc/processor/src/test/java/io/quarkus/arc/processor/BeanInfoInjectionsTest.java @@ -5,15 +5,13 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.fail; -import io.quarkus.arc.processor.types.Bar; -import io.quarkus.arc.processor.types.Foo; -import io.quarkus.arc.processor.types.FooQualifier; import java.io.IOException; import java.util.AbstractCollection; import java.util.AbstractList; import java.util.Collection; import java.util.Collections; import java.util.List; + import org.jboss.jandex.ClassInfo; import org.jboss.jandex.DotName; import org.jboss.jandex.Index; @@ -22,6 +20,10 @@ import org.jboss.jandex.Type.Kind; import org.junit.jupiter.api.Test; +import io.quarkus.arc.processor.types.Bar; +import io.quarkus.arc.processor.types.Foo; +import io.quarkus.arc.processor.types.FooQualifier; + /** * * @author Martin Kouba diff --git a/independent-projects/arc/processor/src/test/java/io/quarkus/arc/processor/BeanInfoQualifiersTest.java b/independent-projects/arc/processor/src/test/java/io/quarkus/arc/processor/BeanInfoQualifiersTest.java index 9243557ae4fa8..6e5203478b4a4 100644 --- a/independent-projects/arc/processor/src/test/java/io/quarkus/arc/processor/BeanInfoQualifiersTest.java +++ b/independent-projects/arc/processor/src/test/java/io/quarkus/arc/processor/BeanInfoQualifiersTest.java @@ -5,14 +5,12 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import io.quarkus.arc.processor.types.Bar; -import io.quarkus.arc.processor.types.Foo; -import io.quarkus.arc.processor.types.FooQualifier; import java.io.IOException; import java.util.AbstractCollection; import java.util.AbstractList; import java.util.Collection; import java.util.List; + import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.AnnotationTarget.Kind; import org.jboss.jandex.ClassInfo; @@ -20,6 +18,10 @@ import org.jboss.jandex.Index; import org.junit.jupiter.api.Test; +import io.quarkus.arc.processor.types.Bar; +import io.quarkus.arc.processor.types.Foo; +import io.quarkus.arc.processor.types.FooQualifier; + /** * * @author Martin Kouba diff --git a/independent-projects/arc/processor/src/test/java/io/quarkus/arc/processor/BeanInfoTypesTest.java b/independent-projects/arc/processor/src/test/java/io/quarkus/arc/processor/BeanInfoTypesTest.java index f37e30b9f7a46..75dd27ee2e3e8 100644 --- a/independent-projects/arc/processor/src/test/java/io/quarkus/arc/processor/BeanInfoTypesTest.java +++ b/independent-projects/arc/processor/src/test/java/io/quarkus/arc/processor/BeanInfoTypesTest.java @@ -5,15 +5,13 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -import io.quarkus.arc.processor.types.Bar; -import io.quarkus.arc.processor.types.Foo; -import io.quarkus.arc.processor.types.FooQualifier; import java.io.IOException; import java.util.AbstractCollection; import java.util.AbstractList; import java.util.Collection; import java.util.List; import java.util.Set; + import org.jboss.jandex.ClassInfo; import org.jboss.jandex.DotName; import org.jboss.jandex.Index; @@ -22,6 +20,10 @@ import org.jboss.jandex.Type.Kind; import org.junit.jupiter.api.Test; +import io.quarkus.arc.processor.types.Bar; +import io.quarkus.arc.processor.types.Foo; +import io.quarkus.arc.processor.types.FooQualifier; + /** * * @author Martin Kouba diff --git a/independent-projects/arc/processor/src/test/java/io/quarkus/arc/processor/DotNamesTest.java b/independent-projects/arc/processor/src/test/java/io/quarkus/arc/processor/DotNamesTest.java index 70f5d33e845b5..7d83fccdb6a6c 100644 --- a/independent-projects/arc/processor/src/test/java/io/quarkus/arc/processor/DotNamesTest.java +++ b/independent-projects/arc/processor/src/test/java/io/quarkus/arc/processor/DotNamesTest.java @@ -5,13 +5,15 @@ import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; -import io.quarkus.arc.processor.DotNamesTest.Nested.NestedNested; import java.io.IOException; + import org.jboss.jandex.DotName; import org.jboss.jandex.Index; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; +import io.quarkus.arc.processor.DotNamesTest.Nested.NestedNested; + public class DotNamesTest { @Test diff --git a/independent-projects/arc/processor/src/test/java/io/quarkus/arc/processor/MethodUtilsTest.java b/independent-projects/arc/processor/src/test/java/io/quarkus/arc/processor/MethodUtilsTest.java index 4be3cb1cd8e8f..4ad312d5ca884 100644 --- a/independent-projects/arc/processor/src/test/java/io/quarkus/arc/processor/MethodUtilsTest.java +++ b/independent-projects/arc/processor/src/test/java/io/quarkus/arc/processor/MethodUtilsTest.java @@ -9,6 +9,7 @@ import java.util.List; import java.util.Set; import java.util.stream.Collectors; + import org.jboss.jandex.ClassInfo; import org.jboss.jandex.DotName; import org.jboss.jandex.Index; diff --git a/independent-projects/arc/processor/src/test/java/io/quarkus/arc/processor/SubclassSkipPredicateTest.java b/independent-projects/arc/processor/src/test/java/io/quarkus/arc/processor/SubclassSkipPredicateTest.java index b5089205f11e3..c45159d440a80 100644 --- a/independent-projects/arc/processor/src/test/java/io/quarkus/arc/processor/SubclassSkipPredicateTest.java +++ b/independent-projects/arc/processor/src/test/java/io/quarkus/arc/processor/SubclassSkipPredicateTest.java @@ -4,17 +4,20 @@ import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; -import io.quarkus.arc.processor.Methods.SubclassSkipPredicate; import java.io.IOException; import java.util.List; import java.util.stream.Collectors; + import javax.enterprise.context.ApplicationScoped; + import org.jboss.jandex.ClassInfo; import org.jboss.jandex.DotName; import org.jboss.jandex.IndexView; import org.jboss.jandex.MethodInfo; import org.junit.jupiter.api.Test; +import io.quarkus.arc.processor.Methods.SubclassSkipPredicate; + public class SubclassSkipPredicateTest { @Test diff --git a/independent-projects/arc/processor/src/test/java/io/quarkus/arc/processor/TypesTest.java b/independent-projects/arc/processor/src/test/java/io/quarkus/arc/processor/TypesTest.java index b24c18e3cba06..b6bcc93594732 100644 --- a/independent-projects/arc/processor/src/test/java/io/quarkus/arc/processor/TypesTest.java +++ b/independent-projects/arc/processor/src/test/java/io/quarkus/arc/processor/TypesTest.java @@ -10,6 +10,7 @@ import java.util.List; import java.util.Map; import java.util.Set; + import org.jboss.jandex.ClassInfo; import org.jboss.jandex.DotName; import org.jboss.jandex.FieldInfo; diff --git a/independent-projects/arc/processor/src/test/java/io/quarkus/arc/processor/types/Bar.java b/independent-projects/arc/processor/src/test/java/io/quarkus/arc/processor/types/Bar.java index 78e8b78502421..827bc41a81e2e 100644 --- a/independent-projects/arc/processor/src/test/java/io/quarkus/arc/processor/types/Bar.java +++ b/independent-projects/arc/processor/src/test/java/io/quarkus/arc/processor/types/Bar.java @@ -1,6 +1,7 @@ package io.quarkus.arc.processor.types; import java.util.List; + import javax.enterprise.context.ApplicationScoped; import javax.inject.Inject; diff --git a/independent-projects/arc/processor/src/test/java/io/quarkus/arc/processor/types/Baz.java b/independent-projects/arc/processor/src/test/java/io/quarkus/arc/processor/types/Baz.java index 241f1002b8cd8..2258a70e3716d 100644 --- a/independent-projects/arc/processor/src/test/java/io/quarkus/arc/processor/types/Baz.java +++ b/independent-projects/arc/processor/src/test/java/io/quarkus/arc/processor/types/Baz.java @@ -1,6 +1,7 @@ package io.quarkus.arc.processor.types; import java.util.List; + import javax.enterprise.context.Dependent; import javax.enterprise.inject.Instance; import javax.inject.Inject; diff --git a/independent-projects/arc/processor/src/test/java/io/quarkus/arc/processor/types/Foo.java b/independent-projects/arc/processor/src/test/java/io/quarkus/arc/processor/types/Foo.java index b0f9839b0d7c2..eee8bc6102bd4 100644 --- a/independent-projects/arc/processor/src/test/java/io/quarkus/arc/processor/types/Foo.java +++ b/independent-projects/arc/processor/src/test/java/io/quarkus/arc/processor/types/Foo.java @@ -1,6 +1,7 @@ package io.quarkus.arc.processor.types; import java.util.AbstractList; + import javax.annotation.PreDestroy; import javax.enterprise.context.Dependent; import javax.enterprise.inject.Default; diff --git a/independent-projects/arc/processor/src/test/java/io/quarkus/arc/processor/types/FooQualifier.java b/independent-projects/arc/processor/src/test/java/io/quarkus/arc/processor/types/FooQualifier.java index 16b4349606e4f..aae68ef90f8d0 100644 --- a/independent-projects/arc/processor/src/test/java/io/quarkus/arc/processor/types/FooQualifier.java +++ b/independent-projects/arc/processor/src/test/java/io/quarkus/arc/processor/types/FooQualifier.java @@ -9,6 +9,7 @@ import java.lang.annotation.Inherited; import java.lang.annotation.Retention; import java.lang.annotation.Target; + import javax.enterprise.util.Nonbinding; import javax.inject.Qualifier; diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/All.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/All.java index 03d26f220941a..cbe377b26d3db 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/All.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/All.java @@ -9,6 +9,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; import java.util.List; + import javax.enterprise.inject.Any; import javax.enterprise.inject.Instance; import javax.enterprise.util.AnnotationLiteral; diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/AlternativePriority.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/AlternativePriority.java index cf3688e34ef9b..0c48f47a847d2 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/AlternativePriority.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/AlternativePriority.java @@ -4,6 +4,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; + import javax.enterprise.inject.Alternative; /** diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/Arc.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/Arc.java index 1041df2099e7d..f524f5892fd40 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/Arc.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/Arc.java @@ -1,9 +1,10 @@ package io.quarkus.arc; -import io.quarkus.arc.impl.ArcContainerImpl; import java.util.concurrent.ExecutorService; import java.util.concurrent.atomic.AtomicReference; +import io.quarkus.arc.impl.ArcContainerImpl; + /** * Provides access to the ArC container. */ diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/ArcContainer.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/ArcContainer.java index 8d792b40d9f87..6f778ca19e69a 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/ArcContainer.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/ArcContainer.java @@ -6,6 +6,7 @@ import java.util.Set; import java.util.concurrent.ExecutorService; import java.util.function.Supplier; + import javax.enterprise.context.ContextNotActiveException; import javax.enterprise.inject.Instance; import javax.enterprise.inject.spi.BeanManager; diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/ArcInvocationContext.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/ArcInvocationContext.java index ab8d50b9700a1..a27daed536e0f 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/ArcInvocationContext.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/ArcInvocationContext.java @@ -4,6 +4,7 @@ import java.util.Collections; import java.util.List; import java.util.Set; + import javax.interceptor.InvocationContext; /** diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/BeanCreator.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/BeanCreator.java index 67a67c759aac5..ac5f36e23f98e 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/BeanCreator.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/BeanCreator.java @@ -1,6 +1,7 @@ package io.quarkus.arc; import java.util.Map; + import javax.enterprise.context.spi.Contextual; import javax.enterprise.context.spi.CreationalContext; diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/BeanDestroyer.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/BeanDestroyer.java index f5580f3e15b7e..d50fdc3f638fd 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/BeanDestroyer.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/BeanDestroyer.java @@ -3,6 +3,7 @@ import java.io.Closeable; import java.io.IOException; import java.util.Map; + import javax.enterprise.context.spi.Contextual; import javax.enterprise.context.spi.CreationalContext; diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/CurrentContextFactory.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/CurrentContextFactory.java index d85a4452be3a0..811600e553846 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/CurrentContextFactory.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/CurrentContextFactory.java @@ -1,8 +1,9 @@ package io.quarkus.arc; -import io.quarkus.arc.InjectableContext.ContextState; import java.lang.annotation.Annotation; +import io.quarkus.arc.InjectableContext.ContextState; + /** * This factory can be used to create a new {@link CurrentContext} for a normal scope, e.g. for * {@link javax.enterprise.context.RequestScoped}. It's usually not necessary for shared contexts, such as diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/InjectableBean.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/InjectableBean.java index edb5bcc8ffd6b..129c418bcbb7b 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/InjectableBean.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/InjectableBean.java @@ -1,16 +1,18 @@ package io.quarkus.arc; -import io.quarkus.arc.impl.Qualifiers; import java.lang.annotation.Annotation; import java.lang.reflect.Type; import java.util.Collections; import java.util.Set; + import javax.enterprise.context.Dependent; import javax.enterprise.context.spi.CreationalContext; import javax.enterprise.inject.Instance; import javax.enterprise.inject.spi.Bean; import javax.enterprise.inject.spi.InjectionPoint; +import io.quarkus.arc.impl.Qualifiers; + /** * Quarkus representation of an injectable bean. * This interface extends the standard CDI {@link Bean} interface. diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/InjectableContext.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/InjectableContext.java index 4a48af59363ef..e03e954a5e1e0 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/InjectableContext.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/InjectableContext.java @@ -2,6 +2,7 @@ import java.util.Map; import java.util.function.Function; + import javax.enterprise.context.ContextNotActiveException; import javax.enterprise.context.NormalScope; import javax.enterprise.context.spi.AlterableContext; diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/InjectableInstance.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/InjectableInstance.java index 95a7da7c5fc99..1cdd2efaf401e 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/InjectableInstance.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/InjectableInstance.java @@ -2,6 +2,7 @@ import java.lang.annotation.Annotation; import java.util.Iterator; + import javax.enterprise.context.Dependent; import javax.enterprise.inject.Instance; import javax.enterprise.util.TypeLiteral; diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/InjectableObserverMethod.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/InjectableObserverMethod.java index d66efa983be20..29e139bbcda7e 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/InjectableObserverMethod.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/InjectableObserverMethod.java @@ -3,6 +3,7 @@ import java.lang.annotation.Annotation; import java.util.Collections; import java.util.Set; + import javax.enterprise.event.Reception; import javax.enterprise.event.TransactionPhase; import javax.enterprise.inject.spi.ObserverMethod; diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/Lock.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/Lock.java index 37784cbcb72f4..150d9f920ae67 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/Lock.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/Lock.java @@ -9,6 +9,7 @@ import java.lang.annotation.Target; import java.util.concurrent.TimeUnit; import java.util.concurrent.locks.ReadWriteLock; + import javax.enterprise.util.Nonbinding; import javax.interceptor.InterceptorBinding; diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/WithCaching.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/WithCaching.java index 3315c4a3d0b0b..c89b3feb4114d 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/WithCaching.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/WithCaching.java @@ -6,6 +6,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; + import javax.enterprise.context.Dependent; import javax.enterprise.inject.Instance; diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/AbstractInstanceHandle.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/AbstractInstanceHandle.java index ae414613eb6b6..e2d622d84103e 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/AbstractInstanceHandle.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/AbstractInstanceHandle.java @@ -1,16 +1,19 @@ package io.quarkus.arc.impl; -import io.quarkus.arc.Arc; -import io.quarkus.arc.InjectableBean; -import io.quarkus.arc.InjectableContext; -import io.quarkus.arc.InstanceHandle; import java.util.concurrent.atomic.AtomicIntegerFieldUpdater; import java.util.function.Consumer; + import javax.enterprise.context.ContextNotActiveException; import javax.enterprise.context.Dependent; import javax.enterprise.context.spi.CreationalContext; + import org.jboss.logging.Logger; +import io.quarkus.arc.Arc; +import io.quarkus.arc.InjectableBean; +import io.quarkus.arc.InjectableContext; +import io.quarkus.arc.InstanceHandle; + abstract class AbstractInstanceHandle implements InstanceHandle { private static final Logger LOGGER = Logger.getLogger(AbstractInstanceHandle.class.getName()); diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/AbstractInvocationContext.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/AbstractInvocationContext.java index 909907ebb43f5..8bae659f2a40b 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/AbstractInvocationContext.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/AbstractInvocationContext.java @@ -1,6 +1,5 @@ package io.quarkus.arc.impl; -import io.quarkus.arc.ArcInvocationContext; import java.lang.annotation.Annotation; import java.lang.reflect.Constructor; import java.lang.reflect.Method; @@ -11,6 +10,8 @@ import java.util.Objects; import java.util.Set; +import io.quarkus.arc.ArcInvocationContext; + abstract class AbstractInvocationContext implements ArcInvocationContext { private static final Object[] EMPTY_PARAMS = new Object[0]; diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/AbstractSharedContext.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/AbstractSharedContext.java index 7a14e2dbb72bb..8900d1a0be5be 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/AbstractSharedContext.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/AbstractSharedContext.java @@ -1,17 +1,19 @@ package io.quarkus.arc.impl; -import io.quarkus.arc.ContextInstanceHandle; -import io.quarkus.arc.InjectableBean; -import io.quarkus.arc.InjectableContext; import java.util.Iterator; import java.util.Map; import java.util.Objects; import java.util.Set; import java.util.function.Supplier; import java.util.stream.Collectors; + import javax.enterprise.context.spi.Contextual; import javax.enterprise.context.spi.CreationalContext; +import io.quarkus.arc.ContextInstanceHandle; +import io.quarkus.arc.InjectableBean; +import io.quarkus.arc.InjectableContext; + abstract class AbstractSharedContext implements InjectableContext, InjectableContext.ContextState { protected final ComputingCache> instances; diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/ActivateRequestContextInterceptor.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/ActivateRequestContextInterceptor.java index 44bb09bbe0095..42909774ef55d 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/ActivateRequestContextInterceptor.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/ActivateRequestContextInterceptor.java @@ -1,18 +1,20 @@ package io.quarkus.arc.impl; -import io.quarkus.arc.Arc; -import io.quarkus.arc.InjectableContext; -import io.quarkus.arc.ManagedContext; -import io.smallrye.mutiny.Multi; -import io.smallrye.mutiny.Uni; import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionStage; + import javax.annotation.Priority; import javax.enterprise.context.control.ActivateRequestContext; import javax.interceptor.AroundInvoke; import javax.interceptor.Interceptor; import javax.interceptor.InvocationContext; +import io.quarkus.arc.Arc; +import io.quarkus.arc.InjectableContext; +import io.quarkus.arc.ManagedContext; +import io.smallrye.mutiny.Multi; +import io.smallrye.mutiny.Uni; + @Interceptor @ActivateRequestContext @Priority(Interceptor.Priority.PLATFORM_BEFORE + 100) diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/ApplicationContext.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/ApplicationContext.java index 64560e3e14996..0754c7bbaf2a2 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/ApplicationContext.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/ApplicationContext.java @@ -1,6 +1,7 @@ package io.quarkus.arc.impl; import java.lang.annotation.Annotation; + import javax.enterprise.context.ApplicationScoped; class ApplicationContext extends AbstractSharedContext { diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/ArcCDIProvider.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/ArcCDIProvider.java index a305d66a70d03..7efb7ba85eafc 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/ArcCDIProvider.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/ArcCDIProvider.java @@ -1,14 +1,16 @@ package io.quarkus.arc.impl; -import io.quarkus.arc.Arc; import java.lang.annotation.Annotation; import java.util.Iterator; + import javax.enterprise.inject.Instance; import javax.enterprise.inject.spi.BeanManager; import javax.enterprise.inject.spi.CDI; import javax.enterprise.inject.spi.CDIProvider; import javax.enterprise.util.TypeLiteral; +import io.quarkus.arc.Arc; + /** * * @author Martin Kouba diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/ArcContainerImpl.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/ArcContainerImpl.java index 6d95b55c40cd6..669a3659889d8 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/ArcContainerImpl.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/ArcContainerImpl.java @@ -2,22 +2,6 @@ import static java.util.function.Predicate.not; -import io.quarkus.arc.Arc; -import io.quarkus.arc.ArcContainer; -import io.quarkus.arc.Components; -import io.quarkus.arc.ComponentsProvider; -import io.quarkus.arc.CurrentContextFactory; -import io.quarkus.arc.InjectableBean; -import io.quarkus.arc.InjectableContext; -import io.quarkus.arc.InjectableDecorator; -import io.quarkus.arc.InjectableInstance; -import io.quarkus.arc.InjectableInterceptor; -import io.quarkus.arc.InjectableObserverMethod; -import io.quarkus.arc.InstanceHandle; -import io.quarkus.arc.ManagedContext; -import io.quarkus.arc.RemovedBean; -import io.quarkus.arc.ResourceReferenceProvider; -import io.quarkus.arc.impl.ArcCDIProvider.ArcCDI; import java.lang.StackWalker.StackFrame; import java.lang.annotation.Annotation; import java.lang.reflect.Type; @@ -41,6 +25,7 @@ import java.util.function.Supplier; import java.util.stream.Collectors; import java.util.stream.Stream; + import javax.enterprise.context.ApplicationScoped; import javax.enterprise.context.BeforeDestroyed; import javax.enterprise.context.Dependent; @@ -63,8 +48,26 @@ import javax.enterprise.util.TypeLiteral; import javax.inject.Scope; import javax.inject.Singleton; + import org.jboss.logging.Logger; +import io.quarkus.arc.Arc; +import io.quarkus.arc.ArcContainer; +import io.quarkus.arc.Components; +import io.quarkus.arc.ComponentsProvider; +import io.quarkus.arc.CurrentContextFactory; +import io.quarkus.arc.InjectableBean; +import io.quarkus.arc.InjectableContext; +import io.quarkus.arc.InjectableDecorator; +import io.quarkus.arc.InjectableInstance; +import io.quarkus.arc.InjectableInterceptor; +import io.quarkus.arc.InjectableObserverMethod; +import io.quarkus.arc.InstanceHandle; +import io.quarkus.arc.ManagedContext; +import io.quarkus.arc.RemovedBean; +import io.quarkus.arc.ResourceReferenceProvider; +import io.quarkus.arc.impl.ArcCDIProvider.ArcCDI; + public class ArcContainerImpl implements ArcContainer { private static final Logger LOGGER = Logger.getLogger(ArcContainerImpl.class.getPackage().getName()); diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/AroundInvokeInvocationContext.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/AroundInvokeInvocationContext.java index 070659d479686..0ebb9780c6f83 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/AroundInvokeInvocationContext.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/AroundInvokeInvocationContext.java @@ -6,6 +6,7 @@ import java.util.List; import java.util.Set; import java.util.function.Function; + import javax.interceptor.InvocationContext; /** diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/BeanManagerBean.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/BeanManagerBean.java index 1c7ba49422e7c..40a0367b46274 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/BeanManagerBean.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/BeanManagerBean.java @@ -2,6 +2,7 @@ import java.lang.reflect.Type; import java.util.Set; + import javax.enterprise.context.spi.CreationalContext; import javax.enterprise.inject.spi.BeanManager; diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/BeanManagerImpl.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/BeanManagerImpl.java index a33e85039d7f1..059c86e3235c8 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/BeanManagerImpl.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/BeanManagerImpl.java @@ -1,7 +1,5 @@ package io.quarkus.arc.impl; -import io.quarkus.arc.Arc; -import io.quarkus.arc.InjectableBean; import java.lang.annotation.Annotation; import java.lang.reflect.Type; import java.util.Arrays; @@ -11,6 +9,7 @@ import java.util.Objects; import java.util.Set; import java.util.stream.Collectors; + import javax.el.ELResolver; import javax.el.ExpressionFactory; import javax.enterprise.context.ContextNotActiveException; @@ -42,6 +41,9 @@ import javax.inject.Qualifier; import javax.interceptor.InterceptorBinding; +import io.quarkus.arc.Arc; +import io.quarkus.arc.InjectableBean; + /** * @author Martin Kouba */ diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/BeanManagerProvider.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/BeanManagerProvider.java index 464ee445bd7ce..e2adf206ca47c 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/BeanManagerProvider.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/BeanManagerProvider.java @@ -1,9 +1,10 @@ package io.quarkus.arc.impl; -import io.quarkus.arc.InjectableReferenceProvider; import javax.enterprise.context.spi.CreationalContext; import javax.enterprise.inject.spi.BeanManager; +import io.quarkus.arc.InjectableReferenceProvider; + /** * {@link BeanManager} provider. * diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/BeanMetadataProvider.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/BeanMetadataProvider.java index 6957c8f278a27..e1004fec2bbf6 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/BeanMetadataProvider.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/BeanMetadataProvider.java @@ -1,10 +1,11 @@ package io.quarkus.arc.impl; +import javax.enterprise.context.spi.CreationalContext; +import javax.enterprise.inject.spi.Bean; + import io.quarkus.arc.Arc; import io.quarkus.arc.InjectableBean; import io.quarkus.arc.InjectableReferenceProvider; -import javax.enterprise.context.spi.CreationalContext; -import javax.enterprise.inject.spi.Bean; /** * {@link Bean} metadata provider. diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/BuiltInBean.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/BuiltInBean.java index fa68edf4560dd..91db032697dbf 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/BuiltInBean.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/BuiltInBean.java @@ -1,8 +1,9 @@ package io.quarkus.arc.impl; -import io.quarkus.arc.InjectableBean; import javax.enterprise.context.spi.CreationalContext; +import io.quarkus.arc.InjectableBean; + /** * Common class for all built-in beans. * diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/ClientProxies.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/ClientProxies.java index 3b0a8109d540e..85bcd64f9e4e0 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/ClientProxies.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/ClientProxies.java @@ -1,13 +1,15 @@ package io.quarkus.arc.impl; -import io.quarkus.arc.Arc; -import io.quarkus.arc.InjectableBean; -import io.quarkus.arc.InjectableContext; import java.util.List; + import javax.enterprise.context.ContextNotActiveException; import javax.enterprise.context.RequestScoped; import javax.enterprise.context.spi.Contextual; +import io.quarkus.arc.Arc; +import io.quarkus.arc.InjectableBean; +import io.quarkus.arc.InjectableContext; + public final class ClientProxies { private ClientProxies() { diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/ContextDataMap.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/ContextDataMap.java index eca0c770e2418..97e7e91cfab90 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/ContextDataMap.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/ContextDataMap.java @@ -1,6 +1,5 @@ package io.quarkus.arc.impl; -import io.quarkus.arc.ArcInvocationContext; import java.lang.annotation.Annotation; import java.util.AbstractMap; import java.util.ArrayList; @@ -12,8 +11,11 @@ import java.util.Map; import java.util.Objects; import java.util.Set; + import javax.interceptor.InvocationContext; +import io.quarkus.arc.ArcInvocationContext; + /** * This Map implementation is specifically optimised to implement * {@link InvocationContext#getContextData()}. diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/ContextInstanceHandleImpl.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/ContextInstanceHandleImpl.java index de78b4c38a810..88c3ab4a1a641 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/ContextInstanceHandleImpl.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/ContextInstanceHandleImpl.java @@ -1,8 +1,9 @@ package io.quarkus.arc.impl; +import javax.enterprise.context.spi.CreationalContext; + import io.quarkus.arc.ContextInstanceHandle; import io.quarkus.arc.InjectableBean; -import javax.enterprise.context.spi.CreationalContext; /** * diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/Contexts.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/Contexts.java index 67027ed54b30a..33cae5c4955fd 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/Contexts.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/Contexts.java @@ -1,7 +1,5 @@ package io.quarkus.arc.impl; -import io.quarkus.arc.InjectableContext; -import io.quarkus.arc.ManagedContext; import java.lang.annotation.Annotation; import java.util.ArrayList; import java.util.Collections; @@ -10,10 +8,14 @@ import java.util.List; import java.util.Map; import java.util.Set; + import javax.enterprise.context.ApplicationScoped; import javax.enterprise.context.RequestScoped; import javax.inject.Singleton; +import io.quarkus.arc.InjectableContext; +import io.quarkus.arc.ManagedContext; + /** * Encapsulates all contexts used in the container. *

diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/CreationalContextImpl.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/CreationalContextImpl.java index 75189ab60649c..4da18083d7191 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/CreationalContextImpl.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/CreationalContextImpl.java @@ -1,15 +1,17 @@ package io.quarkus.arc.impl; -import io.quarkus.arc.InjectableBean; -import io.quarkus.arc.InjectableReferenceProvider; -import io.quarkus.arc.InstanceHandle; import java.util.ArrayList; import java.util.Iterator; import java.util.List; import java.util.function.Function; + import javax.enterprise.context.spi.Contextual; import javax.enterprise.context.spi.CreationalContext; +import io.quarkus.arc.InjectableBean; +import io.quarkus.arc.InjectableReferenceProvider; +import io.quarkus.arc.InstanceHandle; + /** * * @author Martin Kouba diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/CurrentInjectionPointProvider.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/CurrentInjectionPointProvider.java index f615c11ef92f0..2f21bbd7ab532 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/CurrentInjectionPointProvider.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/CurrentInjectionPointProvider.java @@ -1,7 +1,5 @@ package io.quarkus.arc.impl; -import io.quarkus.arc.InjectableBean; -import io.quarkus.arc.InjectableReferenceProvider; import java.lang.annotation.Annotation; import java.lang.reflect.Constructor; import java.lang.reflect.Executable; @@ -15,6 +13,7 @@ import java.util.List; import java.util.Set; import java.util.function.Supplier; + import javax.enterprise.context.spi.CreationalContext; import javax.enterprise.inject.spi.Annotated; import javax.enterprise.inject.spi.AnnotatedCallable; @@ -26,6 +25,9 @@ import javax.enterprise.inject.spi.Bean; import javax.enterprise.inject.spi.InjectionPoint; +import io.quarkus.arc.InjectableBean; +import io.quarkus.arc.InjectableReferenceProvider; + /** * Set the current {@link InjectionPoint} during creation of a dependent bean. */ diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/DecoratorDelegateProvider.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/DecoratorDelegateProvider.java index 313781c975ed7..3afe7668e5178 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/DecoratorDelegateProvider.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/DecoratorDelegateProvider.java @@ -1,8 +1,9 @@ package io.quarkus.arc.impl; -import io.quarkus.arc.InjectableReferenceProvider; import javax.enterprise.context.spi.CreationalContext; +import io.quarkus.arc.InjectableReferenceProvider; + public class DecoratorDelegateProvider implements InjectableReferenceProvider { private static final ThreadLocal CURRENT = new ThreadLocal<>(); diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/DefaultAsyncObserverExceptionHandler.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/DefaultAsyncObserverExceptionHandler.java index 7b9c6ce01b719..e72d314832720 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/DefaultAsyncObserverExceptionHandler.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/DefaultAsyncObserverExceptionHandler.java @@ -1,12 +1,14 @@ package io.quarkus.arc.impl; -import io.quarkus.arc.AsyncObserverExceptionHandler; -import io.quarkus.arc.DefaultBean; import javax.enterprise.inject.spi.EventContext; import javax.enterprise.inject.spi.ObserverMethod; import javax.inject.Singleton; + import org.jboss.logging.Logger; +import io.quarkus.arc.AsyncObserverExceptionHandler; +import io.quarkus.arc.DefaultBean; + @DefaultBean @Singleton public class DefaultAsyncObserverExceptionHandler implements AsyncObserverExceptionHandler { diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/EagerInstanceHandle.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/EagerInstanceHandle.java index bdf374f597f97..e80cd5c1c7671 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/EagerInstanceHandle.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/EagerInstanceHandle.java @@ -1,10 +1,12 @@ package io.quarkus.arc.impl; -import io.quarkus.arc.InjectableBean; -import io.quarkus.arc.InstanceHandle; import java.util.function.Consumer; + import javax.enterprise.context.spi.CreationalContext; +import io.quarkus.arc.InjectableBean; +import io.quarkus.arc.InstanceHandle; + /** * * @param diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/EventBean.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/EventBean.java index 633ada74d0f65..5da32f79160cc 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/EventBean.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/EventBean.java @@ -2,6 +2,7 @@ import java.lang.reflect.Type; import java.util.Set; + import javax.enterprise.context.spi.CreationalContext; import javax.enterprise.event.Event; import javax.enterprise.inject.spi.InjectionPoint; diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/EventImpl.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/EventImpl.java index 3514ee38e9ec4..c8ff31fbff796 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/EventImpl.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/EventImpl.java @@ -2,10 +2,6 @@ import static javax.transaction.Status.STATUS_COMMITTED; -import io.quarkus.arc.Arc; -import io.quarkus.arc.AsyncObserverExceptionHandler; -import io.quarkus.arc.InstanceHandle; -import io.quarkus.arc.ManagedContext; import java.lang.annotation.Annotation; import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; @@ -23,6 +19,7 @@ import java.util.concurrent.Executor; import java.util.function.Predicate; import java.util.function.Supplier; + import javax.enterprise.event.Event; import javax.enterprise.event.NotificationOptions; import javax.enterprise.event.ObserverException; @@ -37,8 +34,14 @@ import javax.transaction.Synchronization; import javax.transaction.SystemException; import javax.transaction.TransactionManager; + import org.jboss.logging.Logger; +import io.quarkus.arc.Arc; +import io.quarkus.arc.AsyncObserverExceptionHandler; +import io.quarkus.arc.InstanceHandle; +import io.quarkus.arc.ManagedContext; + /** * * @author Martin Kouba diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/EventProvider.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/EventProvider.java index 707646ef4285a..12baf664ebef4 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/EventProvider.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/EventProvider.java @@ -1,12 +1,14 @@ package io.quarkus.arc.impl; -import io.quarkus.arc.InjectableReferenceProvider; import java.lang.annotation.Annotation; import java.lang.reflect.Type; import java.util.Set; + import javax.enterprise.context.spi.CreationalContext; import javax.enterprise.event.Event; +import io.quarkus.arc.InjectableReferenceProvider; + /** * * @author Martin Kouba diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/Identified.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/Identified.java index c3f5162d4bb8e..943906717f41a 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/Identified.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/Identified.java @@ -8,6 +8,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; + import javax.enterprise.util.AnnotationLiteral; import javax.inject.Qualifier; diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/InitializedInterceptor.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/InitializedInterceptor.java index 38f87011c0a02..3832d54401daa 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/InitializedInterceptor.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/InitializedInterceptor.java @@ -1,13 +1,15 @@ package io.quarkus.arc.impl; -import io.quarkus.arc.InjectableInterceptor; import java.lang.annotation.Annotation; import java.lang.reflect.Type; import java.util.Set; + import javax.enterprise.context.spi.CreationalContext; import javax.enterprise.inject.spi.InterceptionType; import javax.interceptor.InvocationContext; +import io.quarkus.arc.InjectableInterceptor; + /** * * @author Martin Kouba diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/InjectableReferenceProviders.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/InjectableReferenceProviders.java index 4633cbe6ff8ea..4aca922bb5413 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/InjectableReferenceProviders.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/InjectableReferenceProviders.java @@ -1,9 +1,10 @@ package io.quarkus.arc.impl; -import io.quarkus.arc.InjectableReferenceProvider; import javax.enterprise.context.spi.Contextual; import javax.enterprise.context.spi.CreationalContext; +import io.quarkus.arc.InjectableReferenceProvider; + public final class InjectableReferenceProviders { private InjectableReferenceProviders() { diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/InjectableRequestContextController.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/InjectableRequestContextController.java index 414d24623a060..de041f88a6161 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/InjectableRequestContextController.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/InjectableRequestContextController.java @@ -1,13 +1,15 @@ package io.quarkus.arc.impl; -import io.quarkus.arc.Arc; -import io.quarkus.arc.ManagedContext; import java.util.concurrent.atomic.AtomicBoolean; + import javax.enterprise.context.ContextNotActiveException; import javax.enterprise.context.Dependent; import javax.enterprise.context.RequestScoped; import javax.enterprise.context.control.RequestContextController; +import io.quarkus.arc.Arc; +import io.quarkus.arc.ManagedContext; + @Dependent public class InjectableRequestContextController implements RequestContextController { diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/InjectionPointBean.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/InjectionPointBean.java index 3920df70fd41c..9aaee5f64a9e9 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/InjectionPointBean.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/InjectionPointBean.java @@ -2,6 +2,7 @@ import java.lang.reflect.Type; import java.util.Set; + import javax.enterprise.context.spi.CreationalContext; import javax.enterprise.inject.spi.InjectionPoint; diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/InjectionPointProvider.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/InjectionPointProvider.java index 77cfb1d6c6400..08593713425e3 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/InjectionPointProvider.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/InjectionPointProvider.java @@ -1,9 +1,10 @@ package io.quarkus.arc.impl; -import io.quarkus.arc.InjectableReferenceProvider; import javax.enterprise.context.spi.CreationalContext; import javax.enterprise.inject.spi.InjectionPoint; +import io.quarkus.arc.InjectableReferenceProvider; + /** * * @author Martin Kouba diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/InstanceBean.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/InstanceBean.java index dbf5e27bf7f87..bbe1bab5b4923 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/InstanceBean.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/InstanceBean.java @@ -1,13 +1,15 @@ package io.quarkus.arc.impl; -import io.quarkus.arc.InjectableBean; import java.lang.reflect.Type; import java.util.Collections; import java.util.Set; + import javax.enterprise.context.spi.CreationalContext; import javax.enterprise.inject.Instance; import javax.enterprise.inject.spi.InjectionPoint; +import io.quarkus.arc.InjectableBean; + public class InstanceBean extends BuiltInBean> { public static final Set INSTANCE_TYPES = Set.of(Instance.class, Object.class); diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/InstanceImpl.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/InstanceImpl.java index cdcbb86b07ca6..798cafcd5ef33 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/InstanceImpl.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/InstanceImpl.java @@ -1,13 +1,5 @@ package io.quarkus.arc.impl; -import io.quarkus.arc.Arc; -import io.quarkus.arc.ClientProxy; -import io.quarkus.arc.InjectableBean; -import io.quarkus.arc.InjectableContext; -import io.quarkus.arc.InjectableInstance; -import io.quarkus.arc.InstanceHandle; -import io.quarkus.arc.WithCaching; -import io.quarkus.arc.impl.CurrentInjectionPointProvider.InjectionPointImpl; import java.lang.annotation.Annotation; import java.lang.reflect.Member; import java.lang.reflect.ParameterizedType; @@ -20,6 +12,7 @@ import java.util.Objects; import java.util.Set; import java.util.function.Supplier; + import javax.enterprise.context.ContextNotActiveException; import javax.enterprise.context.Dependent; import javax.enterprise.inject.AmbiguousResolutionException; @@ -29,6 +22,15 @@ import javax.inject.Provider; import javax.inject.Singleton; +import io.quarkus.arc.Arc; +import io.quarkus.arc.ClientProxy; +import io.quarkus.arc.InjectableBean; +import io.quarkus.arc.InjectableContext; +import io.quarkus.arc.InjectableInstance; +import io.quarkus.arc.InstanceHandle; +import io.quarkus.arc.WithCaching; +import io.quarkus.arc.impl.CurrentInjectionPointProvider.InjectionPointImpl; + /** * * @author Martin Kouba diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/InstanceProvider.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/InstanceProvider.java index 2ac2c92024df5..51cde16792933 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/InstanceProvider.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/InstanceProvider.java @@ -1,14 +1,16 @@ package io.quarkus.arc.impl; -import io.quarkus.arc.InjectableBean; -import io.quarkus.arc.InjectableReferenceProvider; import java.lang.annotation.Annotation; import java.lang.reflect.Member; import java.lang.reflect.Type; import java.util.Set; + import javax.enterprise.context.spi.CreationalContext; import javax.enterprise.inject.Instance; +import io.quarkus.arc.InjectableBean; +import io.quarkus.arc.InjectableReferenceProvider; + /** * * @author Martin Kouba diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/Instances.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/Instances.java index 6bfb25154a00a..4e548bc65e8a4 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/Instances.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/Instances.java @@ -1,8 +1,5 @@ package io.quarkus.arc.impl; -import io.quarkus.arc.InjectableBean; -import io.quarkus.arc.InstanceHandle; -import io.quarkus.arc.impl.CurrentInjectionPointProvider.InjectionPointImpl; import java.lang.annotation.Annotation; import java.lang.reflect.Member; import java.lang.reflect.Type; @@ -12,10 +9,15 @@ import java.util.List; import java.util.Set; import java.util.function.Supplier; + import javax.enterprise.context.Dependent; import javax.enterprise.inject.Any; import javax.enterprise.inject.spi.InjectionPoint; +import io.quarkus.arc.InjectableBean; +import io.quarkus.arc.InstanceHandle; +import io.quarkus.arc.impl.CurrentInjectionPointProvider.InjectionPointImpl; + public final class Instances { static final Annotation[] EMPTY_ANNOTATION_ARRAY = new Annotation[] {}; diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/InterceptedBeanMetadataProvider.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/InterceptedBeanMetadataProvider.java index 4461c7e8a7b08..2419db6af3fe7 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/InterceptedBeanMetadataProvider.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/InterceptedBeanMetadataProvider.java @@ -2,12 +2,13 @@ import static io.quarkus.arc.impl.CreationalContextImpl.unwrap; -import io.quarkus.arc.InjectableReferenceProvider; import javax.enterprise.context.spi.Contextual; import javax.enterprise.context.spi.CreationalContext; import javax.enterprise.inject.Intercepted; import javax.enterprise.inject.spi.Bean; +import io.quarkus.arc.InjectableReferenceProvider; + /** * {@link Intercepted} {@link Bean} metadata provider. */ diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/InterceptedStaticMethods.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/InterceptedStaticMethods.java index ce2a45ce141c2..2bf04c1c85a7d 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/InterceptedStaticMethods.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/InterceptedStaticMethods.java @@ -3,6 +3,7 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import java.util.function.Function; + import javax.interceptor.InvocationContext; public final class InterceptedStaticMethods { diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/InterceptorInvocation.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/InterceptorInvocation.java index f729e2fad3f16..3c8e235ac0434 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/InterceptorInvocation.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/InterceptorInvocation.java @@ -1,9 +1,10 @@ package io.quarkus.arc.impl; -import io.quarkus.arc.InjectableInterceptor; import javax.enterprise.inject.spi.InterceptionType; import javax.interceptor.InvocationContext; +import io.quarkus.arc.InjectableInterceptor; + public final class InterceptorInvocation { public static InterceptorInvocation aroundInvoke(InjectableInterceptor interceptor, Object interceptorInstance) { diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/InvocationContexts.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/InvocationContexts.java index 3ef3ae6a854d8..39db0202169d3 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/InvocationContexts.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/InvocationContexts.java @@ -7,6 +7,7 @@ import java.util.Set; import java.util.function.Function; import java.util.function.Supplier; + import javax.interceptor.InvocationContext; public final class InvocationContexts { diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/LazyInstanceHandle.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/LazyInstanceHandle.java index 9ae0e0c621c60..8c13e17465647 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/LazyInstanceHandle.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/LazyInstanceHandle.java @@ -1,10 +1,12 @@ package io.quarkus.arc.impl; -import io.quarkus.arc.InjectableBean; import java.util.function.Consumer; import java.util.function.Supplier; + import javax.enterprise.context.spi.CreationalContext; +import io.quarkus.arc.InjectableBean; + /** * * @param diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/LockInterceptor.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/LockInterceptor.java index d10e560bd9cd1..00a1289f3d778 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/LockInterceptor.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/LockInterceptor.java @@ -2,18 +2,20 @@ import static javax.interceptor.Interceptor.Priority.PLATFORM_BEFORE; -import io.quarkus.arc.ArcInvocationContext; -import io.quarkus.arc.Lock; -import io.quarkus.arc.LockException; import java.lang.annotation.Annotation; import java.util.Set; import java.util.concurrent.locks.ReadWriteLock; import java.util.concurrent.locks.ReentrantReadWriteLock; + import javax.annotation.Priority; import javax.interceptor.AroundInvoke; import javax.interceptor.Interceptor; import javax.interceptor.InvocationContext; +import io.quarkus.arc.ArcInvocationContext; +import io.quarkus.arc.Lock; +import io.quarkus.arc.LockException; + @Lock @Interceptor @Priority(PLATFORM_BEFORE) diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/Qualifiers.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/Qualifiers.java index b5cbe20ab0bc3..216ed66668235 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/Qualifiers.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/Qualifiers.java @@ -11,6 +11,7 @@ import java.util.Map; import java.util.Set; import java.util.function.BiFunction; + import javax.enterprise.inject.Any; import javax.enterprise.inject.Default; import javax.enterprise.util.Nonbinding; diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/ReactiveType.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/ReactiveType.java index ea4e1dbaad978..e39e35bc44835 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/ReactiveType.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/ReactiveType.java @@ -1,11 +1,12 @@ package io.quarkus.arc.impl; -import io.smallrye.mutiny.Multi; -import io.smallrye.mutiny.Uni; import java.lang.reflect.Method; import java.util.Objects; import java.util.concurrent.CompletionStage; +import io.smallrye.mutiny.Multi; +import io.smallrye.mutiny.Uni; + /** * A method reactive returned type. */ diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/RemovedBeanImpl.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/RemovedBeanImpl.java index 6d24ee55856cf..2a08114b82b5f 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/RemovedBeanImpl.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/RemovedBeanImpl.java @@ -1,11 +1,12 @@ package io.quarkus.arc.impl; -import io.quarkus.arc.InjectableBean.Kind; -import io.quarkus.arc.RemovedBean; import java.lang.annotation.Annotation; import java.lang.reflect.Type; import java.util.Set; +import io.quarkus.arc.InjectableBean.Kind; +import io.quarkus.arc.RemovedBean; + public final class RemovedBeanImpl implements RemovedBean { private final Kind kind; diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/RequestContext.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/RequestContext.java index 4d66adff3fc02..4786437600efa 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/RequestContext.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/RequestContext.java @@ -1,10 +1,5 @@ package io.quarkus.arc.impl; -import io.quarkus.arc.ContextInstanceHandle; -import io.quarkus.arc.CurrentContext; -import io.quarkus.arc.InjectableBean; -import io.quarkus.arc.ManagedContext; -import io.quarkus.arc.impl.EventImpl.Notifier; import java.lang.annotation.Annotation; import java.util.Arrays; import java.util.HashSet; @@ -14,6 +9,7 @@ import java.util.concurrent.ConcurrentMap; import java.util.function.Function; import java.util.stream.Collectors; + import javax.enterprise.context.BeforeDestroyed; import javax.enterprise.context.ContextNotActiveException; import javax.enterprise.context.Destroyed; @@ -22,8 +18,15 @@ import javax.enterprise.context.spi.Contextual; import javax.enterprise.context.spi.CreationalContext; import javax.enterprise.inject.Any; + import org.jboss.logging.Logger; +import io.quarkus.arc.ContextInstanceHandle; +import io.quarkus.arc.CurrentContext; +import io.quarkus.arc.InjectableBean; +import io.quarkus.arc.ManagedContext; +import io.quarkus.arc.impl.EventImpl.Notifier; + /** * The built-in context for {@link RequestScoped}. * diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/ResourceProvider.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/ResourceProvider.java index b4b4da9314c18..fe4a43f64102f 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/ResourceProvider.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/ResourceProvider.java @@ -1,13 +1,15 @@ package io.quarkus.arc.impl; -import io.quarkus.arc.InjectableReferenceProvider; -import io.quarkus.arc.InstanceHandle; -import io.quarkus.arc.ResourceReferenceProvider; import java.lang.annotation.Annotation; import java.lang.reflect.Type; import java.util.Set; + import javax.enterprise.context.spi.CreationalContext; +import io.quarkus.arc.InjectableReferenceProvider; +import io.quarkus.arc.InstanceHandle; +import io.quarkus.arc.ResourceReferenceProvider; + /** * Represents a placeholder for all suppored non-CDI injection points. * diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/SingletonContext.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/SingletonContext.java index 661e301d0e819..2ee8f46e75cdb 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/SingletonContext.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/SingletonContext.java @@ -1,10 +1,12 @@ package io.quarkus.arc.impl; -import io.quarkus.arc.ContextInstanceHandle; -import io.quarkus.arc.InstanceHandle; import java.lang.annotation.Annotation; + import javax.inject.Singleton; +import io.quarkus.arc.ContextInstanceHandle; +import io.quarkus.arc.InstanceHandle; + class SingletonContext extends AbstractSharedContext { @Override diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/ThreadLocalCurrentContextFactory.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/ThreadLocalCurrentContextFactory.java index 636ac5f02fcbf..74c3401fe2de9 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/ThreadLocalCurrentContextFactory.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/ThreadLocalCurrentContextFactory.java @@ -1,9 +1,10 @@ package io.quarkus.arc.impl; +import java.lang.annotation.Annotation; + import io.quarkus.arc.CurrentContext; import io.quarkus.arc.CurrentContextFactory; import io.quarkus.arc.InjectableContext.ContextState; -import java.lang.annotation.Annotation; /** * The default implementation makes use of {@link ThreadLocal} variables. diff --git a/independent-projects/arc/runtime/src/test/java/io/quarkus/arc/impl/QualifiersTest.java b/independent-projects/arc/runtime/src/test/java/io/quarkus/arc/impl/QualifiersTest.java index e7c9fd702059a..d6fb4ed39ccde 100644 --- a/independent-projects/arc/runtime/src/test/java/io/quarkus/arc/impl/QualifiersTest.java +++ b/independent-projects/arc/runtime/src/test/java/io/quarkus/arc/impl/QualifiersTest.java @@ -6,8 +6,10 @@ import java.lang.annotation.Annotation; import java.util.Collections; import java.util.Set; + import javax.enterprise.context.Initialized; import javax.enterprise.inject.Any; + import org.junit.jupiter.api.Test; public class QualifiersTest { diff --git a/independent-projects/arc/runtime/src/test/java/io/quarkus/arc/impl/ReactiveTypeTest.java b/independent-projects/arc/runtime/src/test/java/io/quarkus/arc/impl/ReactiveTypeTest.java index 1dd8f5c40d16b..e13871af4172f 100644 --- a/independent-projects/arc/runtime/src/test/java/io/quarkus/arc/impl/ReactiveTypeTest.java +++ b/independent-projects/arc/runtime/src/test/java/io/quarkus/arc/impl/ReactiveTypeTest.java @@ -4,13 +4,15 @@ import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; -import io.smallrye.mutiny.Multi; -import io.smallrye.mutiny.Uni; import java.lang.reflect.Method; import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionStage; + import org.junit.jupiter.api.Test; +import io.smallrye.mutiny.Multi; +import io.smallrye.mutiny.Uni; + public class ReactiveTypeTest { @Test diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/ArcTestContainer.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/ArcTestContainer.java index ad9c6a70e8e55..6d428b83335a6 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/ArcTestContainer.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/ArcTestContainer.java @@ -1,23 +1,5 @@ package io.quarkus.arc.test; -import io.quarkus.arc.Arc; -import io.quarkus.arc.ComponentsProvider; -import io.quarkus.arc.ResourceReferenceProvider; -import io.quarkus.arc.processor.AlternativePriorities; -import io.quarkus.arc.processor.AnnotationsTransformer; -import io.quarkus.arc.processor.BeanArchives; -import io.quarkus.arc.processor.BeanDeploymentValidator; -import io.quarkus.arc.processor.BeanInfo; -import io.quarkus.arc.processor.BeanProcessor; -import io.quarkus.arc.processor.BeanRegistrar; -import io.quarkus.arc.processor.ContextRegistrar; -import io.quarkus.arc.processor.InjectionPointsTransformer; -import io.quarkus.arc.processor.InterceptorBindingRegistrar; -import io.quarkus.arc.processor.ObserverRegistrar; -import io.quarkus.arc.processor.ObserverTransformer; -import io.quarkus.arc.processor.QualifierRegistrar; -import io.quarkus.arc.processor.ResourceOutput; -import io.quarkus.arc.processor.StereotypeRegistrar; import java.io.File; import java.io.FileOutputStream; import java.io.IOException; @@ -35,6 +17,7 @@ import java.util.concurrent.atomic.AtomicReference; import java.util.function.Predicate; import java.util.stream.Collectors; + import org.jboss.jandex.DotName; import org.jboss.jandex.Index; import org.jboss.jandex.Indexer; @@ -42,6 +25,25 @@ import org.junit.jupiter.api.extension.BeforeEachCallback; import org.junit.jupiter.api.extension.ExtensionContext; +import io.quarkus.arc.Arc; +import io.quarkus.arc.ComponentsProvider; +import io.quarkus.arc.ResourceReferenceProvider; +import io.quarkus.arc.processor.AlternativePriorities; +import io.quarkus.arc.processor.AnnotationsTransformer; +import io.quarkus.arc.processor.BeanArchives; +import io.quarkus.arc.processor.BeanDeploymentValidator; +import io.quarkus.arc.processor.BeanInfo; +import io.quarkus.arc.processor.BeanProcessor; +import io.quarkus.arc.processor.BeanRegistrar; +import io.quarkus.arc.processor.ContextRegistrar; +import io.quarkus.arc.processor.InjectionPointsTransformer; +import io.quarkus.arc.processor.InterceptorBindingRegistrar; +import io.quarkus.arc.processor.ObserverRegistrar; +import io.quarkus.arc.processor.ObserverTransformer; +import io.quarkus.arc.processor.QualifierRegistrar; +import io.quarkus.arc.processor.ResourceOutput; +import io.quarkus.arc.processor.StereotypeRegistrar; + /** * Junit5 extension for Arc bootstrap/shutdown. * Designed to be used via {code @RegisterExtension} fields in tests. diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/MyQualifier.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/MyQualifier.java index a11153d6fd23f..5cfae8d773450 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/MyQualifier.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/MyQualifier.java @@ -9,6 +9,7 @@ import java.lang.annotation.Inherited; import java.lang.annotation.Retention; import java.lang.annotation.Target; + import javax.inject.Qualifier; @Qualifier diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/all/ListAllTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/all/ListAllTest.java index 3af8385cbb08a..d3e0c3f44ba49 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/all/ListAllTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/all/ListAllTest.java @@ -4,13 +4,10 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -import io.quarkus.arc.Arc; -import io.quarkus.arc.InstanceHandle; -import io.quarkus.arc.test.ArcTestContainer; -import io.quarkus.arc.test.MyQualifier; import java.util.List; import java.util.Optional; import java.util.concurrent.atomic.AtomicBoolean; + import javax.annotation.PreDestroy; import javax.annotation.Priority; import javax.enterprise.context.Dependent; @@ -18,9 +15,15 @@ import javax.enterprise.util.AnnotationLiteral; import javax.inject.Inject; import javax.inject.Singleton; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.InstanceHandle; +import io.quarkus.arc.test.ArcTestContainer; +import io.quarkus.arc.test.MyQualifier; + public class ListAllTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/alternatives/AlternativesPriorityTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/alternatives/AlternativesPriorityTest.java index b3b8d3d811ff4..439bd1f22ff1a 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/alternatives/AlternativesPriorityTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/alternatives/AlternativesPriorityTest.java @@ -2,18 +2,21 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import io.quarkus.arc.Arc; -import io.quarkus.arc.test.ArcTestContainer; import java.util.function.Supplier; + import javax.annotation.Priority; import javax.enterprise.inject.Alternative; import javax.enterprise.inject.Produces; import javax.enterprise.util.TypeLiteral; import javax.inject.Inject; import javax.inject.Singleton; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.test.ArcTestContainer; + public class AlternativesPriorityTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/alternatives/AlternativesTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/alternatives/AlternativesTest.java index bcd002091c2a9..c9ecc8a39bc2f 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/alternatives/AlternativesTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/alternatives/AlternativesTest.java @@ -2,17 +2,20 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import io.quarkus.arc.Arc; -import io.quarkus.arc.test.ArcTestContainer; import java.util.function.Supplier; + import javax.annotation.Priority; import javax.enterprise.inject.Alternative; import javax.enterprise.util.TypeLiteral; import javax.inject.Inject; import javax.inject.Singleton; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.test.ArcTestContainer; + public class AlternativesTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/alternatives/priority/AlternativePriorityAnnotationTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/alternatives/priority/AlternativePriorityAnnotationTest.java index a1b6ac60c0cd3..9f77a29cc040b 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/alternatives/priority/AlternativePriorityAnnotationTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/alternatives/priority/AlternativePriorityAnnotationTest.java @@ -3,8 +3,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -import io.quarkus.arc.AlternativePriority; -import io.quarkus.arc.test.ArcTestContainer; import javax.annotation.Priority; import javax.enterprise.context.ApplicationScoped; import javax.enterprise.context.Dependent; @@ -13,9 +11,13 @@ import javax.enterprise.inject.Produces; import javax.enterprise.inject.Vetoed; import javax.enterprise.inject.spi.CDI; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.AlternativePriority; +import io.quarkus.arc.test.ArcTestContainer; + /** * Tests {@link io.quarkus.arc.AlternativePriority} annotation. */ diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/alternatives/priority/AlternativePriorityResolutionTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/alternatives/priority/AlternativePriorityResolutionTest.java index 46e3f4fca4f80..89ad409155918 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/alternatives/priority/AlternativePriorityResolutionTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/alternatives/priority/AlternativePriorityResolutionTest.java @@ -3,18 +3,20 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; -import io.quarkus.arc.AlternativePriority; -import io.quarkus.arc.Arc; -import io.quarkus.arc.test.ArcTestContainer; import javax.annotation.Priority; import javax.enterprise.inject.Alternative; import javax.enterprise.inject.Produces; import javax.enterprise.inject.Vetoed; import javax.inject.Inject; import javax.inject.Singleton; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.AlternativePriority; +import io.quarkus.arc.Arc; +import io.quarkus.arc.test.ArcTestContainer; + public class AlternativePriorityResolutionTest { @RegisterExtension ArcTestContainer testContainer = new ArcTestContainer(NoParentAlternativePriorityProducer1.class, diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/alternatives/priority/ComputedAlternativePriorityTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/alternatives/priority/ComputedAlternativePriorityTest.java index 3043758f453bf..e5b76406f782a 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/alternatives/priority/ComputedAlternativePriorityTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/alternatives/priority/ComputedAlternativePriorityTest.java @@ -3,16 +3,18 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -import io.quarkus.arc.Arc; -import io.quarkus.arc.InstanceHandle; -import io.quarkus.arc.test.ArcTestContainer; import javax.enterprise.context.ApplicationScoped; import javax.enterprise.inject.Alternative; import javax.enterprise.inject.Produces; + import org.jboss.jandex.AnnotationTarget; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.InstanceHandle; +import io.quarkus.arc.test.ArcTestContainer; + /** * Tests {@link io.quarkus.arc.AlternativePriority} annotation. */ diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/bean/destroy/BeanPreDestroyErrorTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/bean/destroy/BeanPreDestroyErrorTest.java index 7f3646b8844dc..b9f8f1a2e68eb 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/bean/destroy/BeanPreDestroyErrorTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/bean/destroy/BeanPreDestroyErrorTest.java @@ -2,18 +2,21 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import io.quarkus.arc.Arc; -import io.quarkus.arc.InstanceHandle; -import io.quarkus.arc.test.ArcTestContainer; import java.math.BigDecimal; + import javax.annotation.PreDestroy; import javax.enterprise.context.Dependent; import javax.enterprise.inject.Disposes; import javax.enterprise.inject.Produces; import javax.inject.Singleton; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.InstanceHandle; +import io.quarkus.arc.test.ArcTestContainer; + public class BeanPreDestroyErrorTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/bean/lifecycle/inheritance/BeanLifecycleMethodsOverridenTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/bean/lifecycle/inheritance/BeanLifecycleMethodsOverridenTest.java index 0a9145c62188e..c549693afa73e 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/bean/lifecycle/inheritance/BeanLifecycleMethodsOverridenTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/bean/lifecycle/inheritance/BeanLifecycleMethodsOverridenTest.java @@ -2,11 +2,12 @@ import static org.junit.jupiter.api.Assertions.assertEquals; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.RegisterExtension; + import io.quarkus.arc.Arc; import io.quarkus.arc.InstanceHandle; import io.quarkus.arc.test.ArcTestContainer; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.RegisterExtension; /** * Tests the behavior of overrided pre-destroy and post construct methods in beans. diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/bean/lifecycle/inheritance/Bird.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/bean/lifecycle/inheritance/Bird.java index c90b0eda4bd9b..7083606fe3134 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/bean/lifecycle/inheritance/Bird.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/bean/lifecycle/inheritance/Bird.java @@ -1,6 +1,7 @@ package io.quarkus.arc.test.bean.lifecycle.inheritance; import java.util.concurrent.atomic.AtomicInteger; + import javax.annotation.PostConstruct; import javax.annotation.PreDestroy; import javax.enterprise.context.Dependent; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/bean/lifecycle/inheritance/Eagle.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/bean/lifecycle/inheritance/Eagle.java index 13afb03375052..50fc34985e981 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/bean/lifecycle/inheritance/Eagle.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/bean/lifecycle/inheritance/Eagle.java @@ -1,6 +1,7 @@ package io.quarkus.arc.test.bean.lifecycle.inheritance; import java.util.concurrent.atomic.AtomicInteger; + import javax.annotation.PostConstruct; import javax.annotation.PreDestroy; import javax.enterprise.context.Dependent; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/bean/lifecycle/inheritance/Falcon.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/bean/lifecycle/inheritance/Falcon.java index d3ecb1324f3e8..a38ddb19b7623 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/bean/lifecycle/inheritance/Falcon.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/bean/lifecycle/inheritance/Falcon.java @@ -1,6 +1,7 @@ package io.quarkus.arc.test.bean.lifecycle.inheritance; import java.util.concurrent.atomic.AtomicInteger; + import javax.enterprise.context.Dependent; // extends Bird class, overrides pre-destroy and post construct with new variant diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/bean/types/EnumBeanTypesTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/bean/types/EnumBeanTypesTest.java index bd243d53685f3..aeff5ab1f0c12 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/bean/types/EnumBeanTypesTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/bean/types/EnumBeanTypesTest.java @@ -3,18 +3,21 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -import io.quarkus.arc.Arc; -import io.quarkus.arc.InjectableBean; -import io.quarkus.arc.test.ArcTestContainer; import java.io.Serializable; import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; import java.util.Set; + import javax.enterprise.context.Dependent; import javax.enterprise.inject.Produces; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.InjectableBean; +import io.quarkus.arc.test.ArcTestContainer; + public class EnumBeanTypesTest { @RegisterExtension ArcTestContainer container = new ArcTestContainer(ExtendedBooleanProducer.class); diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/bean/types/GenericBeanTypesTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/bean/types/GenericBeanTypesTest.java index 27db37d462b64..ee10eeac3989f 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/bean/types/GenericBeanTypesTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/bean/types/GenericBeanTypesTest.java @@ -3,19 +3,22 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -import io.quarkus.arc.Arc; -import io.quarkus.arc.InjectableBean; -import io.quarkus.arc.test.ArcTestContainer; import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; import java.lang.reflect.TypeVariable; import java.util.Iterator; import java.util.Set; + import javax.enterprise.context.Dependent; import javax.inject.Named; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.InjectableBean; +import io.quarkus.arc.test.ArcTestContainer; + public class GenericBeanTypesTest { @RegisterExtension ArcTestContainer container = new ArcTestContainer(MyBean.class); diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/bean/types/SimpleBeanTypesTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/bean/types/SimpleBeanTypesTest.java index 58f6095c8c94a..99a38c1b8bc88 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/bean/types/SimpleBeanTypesTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/bean/types/SimpleBeanTypesTest.java @@ -3,16 +3,19 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -import io.quarkus.arc.Arc; -import io.quarkus.arc.InjectableBean; -import io.quarkus.arc.test.ArcTestContainer; import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; import java.util.Set; + import javax.enterprise.context.Dependent; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.InjectableBean; +import io.quarkus.arc.test.ArcTestContainer; + public class SimpleBeanTypesTest { @RegisterExtension ArcTestContainer container = new ArcTestContainer(MyBean.class); diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/beanmanager/BeanManagerEventTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/beanmanager/BeanManagerEventTest.java index 3729d4e629613..f8fc7df3dd819 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/beanmanager/BeanManagerEventTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/beanmanager/BeanManagerEventTest.java @@ -2,15 +2,18 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import io.quarkus.arc.Arc; -import io.quarkus.arc.test.ArcTestContainer; import java.util.concurrent.atomic.AtomicReference; + import javax.enterprise.context.Dependent; import javax.enterprise.event.Observes; import javax.enterprise.inject.spi.BeanManager; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.test.ArcTestContainer; + public class BeanManagerEventTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/beanmanager/BeanManagerInstanceTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/beanmanager/BeanManagerInstanceTest.java index 6ea5afcfa4e6d..f4b3fd716a5ba 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/beanmanager/BeanManagerInstanceTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/beanmanager/BeanManagerInstanceTest.java @@ -3,15 +3,17 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -import io.quarkus.arc.Arc; -import io.quarkus.arc.test.ArcTestContainer; import javax.annotation.PostConstruct; import javax.enterprise.context.Dependent; import javax.enterprise.inject.Instance; import javax.enterprise.inject.spi.BeanManager; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.test.ArcTestContainer; + public class BeanManagerInstanceTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/beanmanager/BeanManagerTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/beanmanager/BeanManagerTest.java index 3e0d1625856be..72729d1d1ab53 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/beanmanager/BeanManagerTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/beanmanager/BeanManagerTest.java @@ -11,10 +11,6 @@ import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import io.quarkus.arc.Arc; -import io.quarkus.arc.ManagedContext; -import io.quarkus.arc.processor.QualifierRegistrar; -import io.quarkus.arc.test.ArcTestContainer; import java.lang.annotation.Annotation; import java.lang.annotation.Documented; import java.lang.annotation.Retention; @@ -27,6 +23,7 @@ import java.util.Set; import java.util.UUID; import java.util.concurrent.atomic.AtomicBoolean; + import javax.annotation.PostConstruct; import javax.annotation.PreDestroy; import javax.annotation.Priority; @@ -53,10 +50,16 @@ import javax.interceptor.Interceptor; import javax.interceptor.InterceptorBinding; import javax.interceptor.InvocationContext; + import org.jboss.jandex.DotName; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.ManagedContext; +import io.quarkus.arc.processor.QualifierRegistrar; +import io.quarkus.arc.test.ArcTestContainer; + public class BeanManagerTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/annotations/AddObservesTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/annotations/AddObservesTest.java index 643c2cecf8f83..fb9b13e9dd36a 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/annotations/AddObservesTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/annotations/AddObservesTest.java @@ -2,12 +2,11 @@ import static org.junit.jupiter.api.Assertions.assertTrue; -import io.quarkus.arc.Arc; -import io.quarkus.arc.processor.AnnotationsTransformer; -import io.quarkus.arc.test.ArcTestContainer; import java.util.concurrent.atomic.AtomicBoolean; + import javax.enterprise.event.Observes; import javax.inject.Singleton; + import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.AnnotationTarget.Kind; import org.jboss.jandex.AnnotationValue; @@ -17,6 +16,10 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.processor.AnnotationsTransformer; +import io.quarkus.arc.test.ArcTestContainer; + public class AddObservesTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/annotations/AnnotationsTransformerBuilderTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/annotations/AnnotationsTransformerBuilderTest.java index 81ab4229becbf..f91f70145ff7c 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/annotations/AnnotationsTransformerBuilderTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/annotations/AnnotationsTransformerBuilderTest.java @@ -4,21 +4,24 @@ import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; -import io.quarkus.arc.Arc; -import io.quarkus.arc.ArcContainer; -import io.quarkus.arc.InstanceHandle; -import io.quarkus.arc.processor.AnnotationsTransformer; -import io.quarkus.arc.test.ArcTestContainer; import java.util.AbstractList; + import javax.enterprise.context.Dependent; import javax.enterprise.inject.Produces; import javax.enterprise.inject.Vetoed; import javax.inject.Inject; + import org.jboss.jandex.AnnotationTarget.Kind; import org.jboss.jandex.PrimitiveType; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.ArcContainer; +import io.quarkus.arc.InstanceHandle; +import io.quarkus.arc.processor.AnnotationsTransformer; +import io.quarkus.arc.test.ArcTestContainer; + public class AnnotationsTransformerBuilderTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/annotations/AnnotationsTransformerInterceptorBindingTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/annotations/AnnotationsTransformerInterceptorBindingTest.java index 85655559f2e38..90ca921ede1b6 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/annotations/AnnotationsTransformerInterceptorBindingTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/annotations/AnnotationsTransformerInterceptorBindingTest.java @@ -2,14 +2,16 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import io.quarkus.arc.Arc; -import io.quarkus.arc.processor.AnnotationsTransformer; -import io.quarkus.arc.test.ArcTestContainer; import javax.enterprise.context.Dependent; + import org.jboss.jandex.AnnotationTarget.Kind; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.processor.AnnotationsTransformer; +import io.quarkus.arc.test.ArcTestContainer; + public class AnnotationsTransformerInterceptorBindingTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/annotations/AnnotationsTransformerTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/annotations/AnnotationsTransformerTest.java index bbb37569f11de..af93afe9d97f2 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/annotations/AnnotationsTransformerTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/annotations/AnnotationsTransformerTest.java @@ -5,20 +5,23 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import io.quarkus.arc.Arc; -import io.quarkus.arc.ArcContainer; -import io.quarkus.arc.InstanceHandle; -import io.quarkus.arc.processor.AnnotationsTransformer; -import io.quarkus.arc.test.ArcTestContainer; import java.util.AbstractList; + import javax.enterprise.context.Dependent; import javax.enterprise.inject.Vetoed; import javax.inject.Inject; + import org.jboss.jandex.AnnotationTarget.Kind; import org.jboss.jandex.DotName; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.ArcContainer; +import io.quarkus.arc.InstanceHandle; +import io.quarkus.arc.processor.AnnotationsTransformer; +import io.quarkus.arc.test.ArcTestContainer; + public class AnnotationsTransformerTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/annotations/Simple.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/annotations/Simple.java index eef408029f27a..dca55da5eec8e 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/annotations/Simple.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/annotations/Simple.java @@ -7,6 +7,7 @@ import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; + import javax.interceptor.InterceptorBinding; @Target({ TYPE, METHOD }) diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/beans/BeanRegistrarTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/beans/BeanRegistrarTest.java index c9316aa2ce11c..54e2308b6cc13 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/beans/BeanRegistrarTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/beans/BeanRegistrarTest.java @@ -8,28 +8,20 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -import io.quarkus.arc.Arc; -import io.quarkus.arc.BeanCreator; -import io.quarkus.arc.BeanDestroyer; -import io.quarkus.arc.InjectableInstance; -import io.quarkus.arc.processor.BeanConfigurator; -import io.quarkus.arc.processor.BeanInfo; -import io.quarkus.arc.processor.BeanRegistrar; -import io.quarkus.arc.test.ArcTestContainer; -import io.quarkus.gizmo.MethodDescriptor; -import io.quarkus.gizmo.ResultHandle; import java.lang.annotation.Inherited; import java.lang.annotation.Retention; import java.lang.annotation.Target; import java.util.List; import java.util.Map; import java.util.Optional; + import javax.enterprise.context.ApplicationScoped; import javax.enterprise.context.spi.CreationalContext; import javax.enterprise.util.AnnotationLiteral; import javax.inject.Inject; import javax.inject.Qualifier; import javax.inject.Singleton; + import org.jboss.jandex.DotName; import org.jboss.jandex.ParameterizedType; import org.jboss.jandex.Type; @@ -39,6 +31,17 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.BeanCreator; +import io.quarkus.arc.BeanDestroyer; +import io.quarkus.arc.InjectableInstance; +import io.quarkus.arc.processor.BeanConfigurator; +import io.quarkus.arc.processor.BeanInfo; +import io.quarkus.arc.processor.BeanRegistrar; +import io.quarkus.arc.test.ArcTestContainer; +import io.quarkus.gizmo.MethodDescriptor; +import io.quarkus.gizmo.ResultHandle; + public class BeanRegistrarTest { public static volatile boolean beanDestroyerInvoked = false; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/beans/SynthBeanWithWrongScopeTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/beans/SynthBeanWithWrongScopeTest.java index 2e232bb57c245..c6cbed652feff 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/beans/SynthBeanWithWrongScopeTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/beans/SynthBeanWithWrongScopeTest.java @@ -8,16 +8,19 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import io.quarkus.arc.BeanCreator; -import io.quarkus.arc.processor.BeanRegistrar; -import io.quarkus.arc.test.ArcTestContainer; import java.lang.annotation.Retention; import java.lang.annotation.Target; import java.util.Map; + import javax.enterprise.context.spi.CreationalContext; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.BeanCreator; +import io.quarkus.arc.processor.BeanRegistrar; +import io.quarkus.arc.test.ArcTestContainer; + public class SynthBeanWithWrongScopeTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/beans/SyntheticBeanCollisionTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/beans/SyntheticBeanCollisionTest.java index 05a0a0c2542d5..df7ccbb20bc34 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/beans/SyntheticBeanCollisionTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/beans/SyntheticBeanCollisionTest.java @@ -3,14 +3,17 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import io.quarkus.arc.BeanCreator; -import io.quarkus.arc.processor.BeanRegistrar; -import io.quarkus.arc.test.ArcTestContainer; import java.util.Map; + import javax.enterprise.context.spi.CreationalContext; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.BeanCreator; +import io.quarkus.arc.processor.BeanRegistrar; +import io.quarkus.arc.test.ArcTestContainer; + public class SyntheticBeanCollisionTest { public static volatile boolean beanDestroyerInvoked = false; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/beans/SyntheticBeanParamsTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/beans/SyntheticBeanParamsTest.java index 4f33bcd44bb23..586680402cd5b 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/beans/SyntheticBeanParamsTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/beans/SyntheticBeanParamsTest.java @@ -4,17 +4,12 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import io.quarkus.arc.Arc; -import io.quarkus.arc.processor.BeanRegistrar; -import io.quarkus.arc.test.ArcTestContainer; -import io.quarkus.gizmo.FieldDescriptor; -import io.quarkus.gizmo.MethodDescriptor; -import io.quarkus.gizmo.ResultHandle; import java.lang.annotation.Annotation; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.util.List; import java.util.Map; + import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.AnnotationValue; import org.jboss.jandex.ClassInfo; @@ -22,6 +17,13 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.processor.BeanRegistrar; +import io.quarkus.arc.test.ArcTestContainer; +import io.quarkus.gizmo.FieldDescriptor; +import io.quarkus.gizmo.MethodDescriptor; +import io.quarkus.gizmo.ResultHandle; + public class SyntheticBeanParamsTest { public enum SimpleEnum { FOO, diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/beans/SyntheticBeanWithStereotypeTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/beans/SyntheticBeanWithStereotypeTest.java index d9c02b0f9c30d..f5f4d3007a521 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/beans/SyntheticBeanWithStereotypeTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/beans/SyntheticBeanWithStereotypeTest.java @@ -9,18 +9,10 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import io.quarkus.arc.AlternativePriority; -import io.quarkus.arc.Arc; -import io.quarkus.arc.InstanceHandle; -import io.quarkus.arc.processor.AnnotationsTransformer; -import io.quarkus.arc.processor.BeanRegistrar; -import io.quarkus.arc.processor.StereotypeInfo; -import io.quarkus.arc.processor.StereotypeRegistrar; -import io.quarkus.arc.test.ArcTestContainer; -import io.quarkus.gizmo.MethodDescriptor; import java.lang.annotation.Retention; import java.lang.annotation.Target; import java.util.Set; + import javax.annotation.Priority; import javax.enterprise.context.ApplicationScoped; import javax.inject.Named; @@ -28,12 +20,23 @@ import javax.interceptor.Interceptor; import javax.interceptor.InterceptorBinding; import javax.interceptor.InvocationContext; + import org.jboss.jandex.AnnotationTarget; import org.jboss.jandex.AnnotationValue; import org.jboss.jandex.DotName; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.AlternativePriority; +import io.quarkus.arc.Arc; +import io.quarkus.arc.InstanceHandle; +import io.quarkus.arc.processor.AnnotationsTransformer; +import io.quarkus.arc.processor.BeanRegistrar; +import io.quarkus.arc.processor.StereotypeInfo; +import io.quarkus.arc.processor.StereotypeRegistrar; +import io.quarkus.arc.test.ArcTestContainer; +import io.quarkus.gizmo.MethodDescriptor; + public class SyntheticBeanWithStereotypeTest { @RegisterExtension public ArcTestContainer container = ArcTestContainer.builder() diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/injectionPoints/InjectionPointTransformerTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/injectionPoints/InjectionPointTransformerTest.java index b6f7f30945e1b..916116c2bdbd8 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/injectionPoints/InjectionPointTransformerTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/injectionPoints/InjectionPointTransformerTest.java @@ -8,20 +8,17 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -import io.quarkus.arc.Arc; -import io.quarkus.arc.ArcContainer; -import io.quarkus.arc.processor.InjectionPointsTransformer; -import io.quarkus.arc.test.ArcTestContainer; -import io.quarkus.arc.test.MyQualifier; import java.lang.annotation.Inherited; import java.lang.annotation.Retention; import java.lang.annotation.Target; + import javax.enterprise.context.ApplicationScoped; import javax.enterprise.context.Dependent; import javax.enterprise.event.Observes; import javax.enterprise.inject.Produces; import javax.inject.Inject; import javax.inject.Qualifier; + import org.jboss.jandex.AnnotationTarget; import org.jboss.jandex.DotName; import org.jboss.jandex.FieldInfo; @@ -30,6 +27,12 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.ArcContainer; +import io.quarkus.arc.processor.InjectionPointsTransformer; +import io.quarkus.arc.test.ArcTestContainer; +import io.quarkus.arc.test.MyQualifier; + public class InjectionPointTransformerTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/interceptor/bindings/AdditionalInterceptorBindingsPredicateTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/interceptor/bindings/AdditionalInterceptorBindingsPredicateTest.java index c10378e4d758d..290138a2439a5 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/interceptor/bindings/AdditionalInterceptorBindingsPredicateTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/interceptor/bindings/AdditionalInterceptorBindingsPredicateTest.java @@ -6,24 +6,27 @@ import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import io.quarkus.arc.Arc; -import io.quarkus.arc.processor.InterceptorBindingRegistrar; -import io.quarkus.arc.test.ArcTestContainer; import java.lang.annotation.Inherited; import java.lang.annotation.Retention; import java.lang.annotation.Target; import java.util.ArrayList; import java.util.List; import java.util.function.Supplier; + import javax.annotation.Priority; import javax.enterprise.context.ApplicationScoped; import javax.interceptor.AroundInvoke; import javax.interceptor.Interceptor; import javax.interceptor.InvocationContext; + import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.processor.InterceptorBindingRegistrar; +import io.quarkus.arc.test.ArcTestContainer; + public class AdditionalInterceptorBindingsPredicateTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/interceptor/bindings/AdditionalInterceptorBindingsTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/interceptor/bindings/AdditionalInterceptorBindingsTest.java index 2a2b06601309e..afdf7fa298bda 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/interceptor/bindings/AdditionalInterceptorBindingsTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/interceptor/bindings/AdditionalInterceptorBindingsTest.java @@ -6,24 +6,27 @@ import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import io.quarkus.arc.Arc; -import io.quarkus.arc.processor.InterceptorBindingRegistrar; -import io.quarkus.arc.test.ArcTestContainer; import java.lang.annotation.Inherited; import java.lang.annotation.Retention; import java.lang.annotation.Target; import java.util.Collections; import java.util.List; import java.util.function.Supplier; + import javax.annotation.Priority; import javax.enterprise.context.ApplicationScoped; import javax.interceptor.AroundInvoke; import javax.interceptor.Interceptor; import javax.interceptor.InvocationContext; + import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.processor.InterceptorBindingRegistrar; +import io.quarkus.arc.test.ArcTestContainer; + public class AdditionalInterceptorBindingsTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/observers/SyntheticObserverErrorTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/observers/SyntheticObserverErrorTest.java index 5c8f15099ead8..e0273719729c9 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/observers/SyntheticObserverErrorTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/observers/SyntheticObserverErrorTest.java @@ -3,11 +3,12 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import io.quarkus.arc.processor.ObserverRegistrar; -import io.quarkus.arc.test.ArcTestContainer; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.processor.ObserverRegistrar; +import io.quarkus.arc.test.ArcTestContainer; + public class SyntheticObserverErrorTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/observers/SyntheticObserverParamsTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/observers/SyntheticObserverParamsTest.java index eef2265b9910f..a79ae989d6ba8 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/observers/SyntheticObserverParamsTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/observers/SyntheticObserverParamsTest.java @@ -3,17 +3,12 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -import io.quarkus.arc.Arc; -import io.quarkus.arc.processor.ObserverRegistrar; -import io.quarkus.arc.test.ArcTestContainer; -import io.quarkus.gizmo.FieldDescriptor; -import io.quarkus.gizmo.MethodDescriptor; -import io.quarkus.gizmo.ResultHandle; import java.lang.annotation.Annotation; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.util.List; import java.util.Map; + import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.AnnotationValue; import org.jboss.jandex.ClassInfo; @@ -21,6 +16,13 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.processor.ObserverRegistrar; +import io.quarkus.arc.test.ArcTestContainer; +import io.quarkus.gizmo.FieldDescriptor; +import io.quarkus.gizmo.MethodDescriptor; +import io.quarkus.gizmo.ResultHandle; + public class SyntheticObserverParamsTest { public enum SimpleEnum { FOO, diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/observers/SyntheticObserverTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/observers/SyntheticObserverTest.java index f4f0e5feb5864..b69e2e0900930 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/observers/SyntheticObserverTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/observers/SyntheticObserverTest.java @@ -3,22 +3,25 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -import io.quarkus.arc.Arc; -import io.quarkus.arc.processor.ObserverRegistrar; -import io.quarkus.arc.test.ArcTestContainer; -import io.quarkus.gizmo.FieldDescriptor; -import io.quarkus.gizmo.MethodDescriptor; -import io.quarkus.gizmo.ResultHandle; import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; + import javax.enterprise.event.Observes; import javax.enterprise.inject.literal.NamedLiteral; import javax.enterprise.inject.spi.EventContext; import javax.inject.Named; import javax.inject.Singleton; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.processor.ObserverRegistrar; +import io.quarkus.arc.test.ArcTestContainer; +import io.quarkus.gizmo.FieldDescriptor; +import io.quarkus.gizmo.MethodDescriptor; +import io.quarkus.gizmo.ResultHandle; + public class SyntheticObserverTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/qualifiers/AdditionalQualifiersTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/qualifiers/AdditionalQualifiersTest.java index 46658ef7d0b43..0214d05226687 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/qualifiers/AdditionalQualifiersTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/qualifiers/AdditionalQualifiersTest.java @@ -7,10 +7,6 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; import static org.junit.jupiter.api.Assertions.assertTrue; -import io.quarkus.arc.Arc; -import io.quarkus.arc.ArcContainer; -import io.quarkus.arc.processor.QualifierRegistrar; -import io.quarkus.arc.test.ArcTestContainer; import java.lang.annotation.Repeatable; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; @@ -19,12 +15,19 @@ import java.util.HashMap; import java.util.Map; import java.util.Set; + import javax.enterprise.util.AnnotationLiteral; import javax.inject.Singleton; + import org.jboss.jandex.DotName; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.ArcContainer; +import io.quarkus.arc.processor.QualifierRegistrar; +import io.quarkus.arc.test.ArcTestContainer; + public class AdditionalQualifiersTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/stereotypes/AdditionalStereotypesTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/stereotypes/AdditionalStereotypesTest.java index 104c4bb87b01d..90ea7e0dade6e 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/stereotypes/AdditionalStereotypesTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/stereotypes/AdditionalStereotypesTest.java @@ -9,14 +9,10 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import io.quarkus.arc.Arc; -import io.quarkus.arc.InstanceHandle; -import io.quarkus.arc.processor.AnnotationsTransformer; -import io.quarkus.arc.processor.StereotypeRegistrar; -import io.quarkus.arc.test.ArcTestContainer; import java.lang.annotation.Retention; import java.lang.annotation.Target; import java.util.Set; + import javax.annotation.Priority; import javax.enterprise.context.ApplicationScoped; import javax.enterprise.inject.Alternative; @@ -25,12 +21,19 @@ import javax.interceptor.Interceptor; import javax.interceptor.InterceptorBinding; import javax.interceptor.InvocationContext; + import org.jboss.jandex.AnnotationTarget; import org.jboss.jandex.AnnotationValue; import org.jboss.jandex.DotName; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.InstanceHandle; +import io.quarkus.arc.processor.AnnotationsTransformer; +import io.quarkus.arc.processor.StereotypeRegistrar; +import io.quarkus.arc.test.ArcTestContainer; + public class AdditionalStereotypesTest { @RegisterExtension public ArcTestContainer container = ArcTestContainer.builder() diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/validator/BeanDeploymentValidatorTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/validator/BeanDeploymentValidatorTest.java index 697f188186964..8f62965d29e08 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/validator/BeanDeploymentValidatorTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/validator/BeanDeploymentValidatorTest.java @@ -4,19 +4,12 @@ import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; -import io.quarkus.arc.Arc; -import io.quarkus.arc.BeanCreator; -import io.quarkus.arc.processor.BeanDeploymentValidator; -import io.quarkus.arc.processor.BeanInfo; -import io.quarkus.arc.processor.BeanRegistrar; -import io.quarkus.arc.processor.InjectionPointInfo; -import io.quarkus.arc.processor.ObserverInfo; -import io.quarkus.arc.test.ArcTestContainer; import java.util.Collection; import java.util.Collections; import java.util.List; import java.util.Map; import java.util.stream.Collectors; + import javax.enterprise.context.ApplicationScoped; import javax.enterprise.context.Initialized; import javax.enterprise.context.spi.CreationalContext; @@ -24,6 +17,7 @@ import javax.enterprise.inject.Instance; import javax.inject.Inject; import javax.inject.Named; + import org.jboss.jandex.DotName; import org.jboss.jandex.ParameterizedType; import org.jboss.jandex.Type; @@ -31,6 +25,15 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.BeanCreator; +import io.quarkus.arc.processor.BeanDeploymentValidator; +import io.quarkus.arc.processor.BeanInfo; +import io.quarkus.arc.processor.BeanRegistrar; +import io.quarkus.arc.processor.InjectionPointInfo; +import io.quarkus.arc.processor.ObserverInfo; +import io.quarkus.arc.test.ArcTestContainer; + public class BeanDeploymentValidatorTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/builtin/beans/BuiltInBeansAreResolvableTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/builtin/beans/BuiltInBeansAreResolvableTest.java index 5753ab7360ddb..043acb8a25bd8 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/builtin/beans/BuiltInBeansAreResolvableTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/builtin/beans/BuiltInBeansAreResolvableTest.java @@ -4,9 +4,6 @@ import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; -import io.quarkus.arc.Arc; -import io.quarkus.arc.impl.CreationalContextImpl; -import io.quarkus.arc.test.ArcTestContainer; import java.lang.annotation.Annotation; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; @@ -15,6 +12,7 @@ import java.util.Arrays; import java.util.HashSet; import java.util.Set; + import javax.enterprise.context.ApplicationScoped; import javax.enterprise.event.Event; import javax.enterprise.event.Observes; @@ -27,9 +25,14 @@ import javax.enterprise.util.AnnotationLiteral; import javax.enterprise.util.TypeLiteral; import javax.inject.Qualifier; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.impl.CreationalContextImpl; +import io.quarkus.arc.test.ArcTestContainer; + public class BuiltInBeansAreResolvableTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/builtin/beans/InjectionPointBuiltInBeanTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/builtin/beans/InjectionPointBuiltInBeanTest.java index f13b2f48d6f3d..7c89169b8238a 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/builtin/beans/InjectionPointBuiltInBeanTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/builtin/beans/InjectionPointBuiltInBeanTest.java @@ -2,10 +2,9 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import io.quarkus.arc.Arc; -import io.quarkus.arc.test.ArcTestContainer; import java.lang.reflect.Executable; import java.lang.reflect.Field; + import javax.enterprise.context.Dependent; import javax.enterprise.inject.Instance; import javax.enterprise.inject.Produces; @@ -14,9 +13,13 @@ import javax.enterprise.inject.spi.InjectionPoint; import javax.inject.Inject; import javax.inject.Singleton; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.test.ArcTestContainer; + public class InjectionPointBuiltInBeanTest { @RegisterExtension public ArcTestContainer container = ArcTestContainer.builder() diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/cdiprovider/CDIProviderTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/cdiprovider/CDIProviderTest.java index a5d737f40b7ee..1e2e92919dba6 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/cdiprovider/CDIProviderTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/cdiprovider/CDIProviderTest.java @@ -3,18 +3,21 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -import io.quarkus.arc.test.ArcTestContainer; import java.io.IOException; import java.lang.reflect.Field; import java.util.concurrent.atomic.AtomicBoolean; + import javax.annotation.PostConstruct; import javax.annotation.PreDestroy; import javax.enterprise.context.Dependent; import javax.enterprise.inject.spi.CDI; + import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.test.ArcTestContainer; + public class CDIProviderTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/circular/CircularDependenciesChainTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/circular/CircularDependenciesChainTest.java index 6059e021fb9e4..30115de9e5ca8 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/circular/CircularDependenciesChainTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/circular/CircularDependenciesChainTest.java @@ -3,15 +3,18 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; -import io.quarkus.arc.Arc; -import io.quarkus.arc.test.ArcTestContainer; import java.util.Comparator; + import javax.enterprise.context.ApplicationScoped; import javax.enterprise.inject.Produces; import javax.inject.Inject; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.test.ArcTestContainer; + public class CircularDependenciesChainTest { @RegisterExtension public ArcTestContainer container = new ArcTestContainer( diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/circular/SelfInjectionWithNormalScopeTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/circular/SelfInjectionWithNormalScopeTest.java index f058a0b879450..00032c3bfd1c7 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/circular/SelfInjectionWithNormalScopeTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/circular/SelfInjectionWithNormalScopeTest.java @@ -3,13 +3,15 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; -import io.quarkus.arc.test.ArcTestContainer; import javax.enterprise.context.ApplicationScoped; import javax.enterprise.inject.spi.CDI; import javax.inject.Inject; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.test.ArcTestContainer; + public class SelfInjectionWithNormalScopeTest { @RegisterExtension public ArcTestContainer container = new ArcTestContainer( diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/clientproxy/ClientProxyGetContextualInstanceTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/clientproxy/ClientProxyGetContextualInstanceTest.java index 81dbe0079ccd5..88dd50a71beae 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/clientproxy/ClientProxyGetContextualInstanceTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/clientproxy/ClientProxyGetContextualInstanceTest.java @@ -3,15 +3,18 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -import io.quarkus.arc.Arc; -import io.quarkus.arc.ClientProxy; -import io.quarkus.arc.test.ArcTestContainer; import java.io.IOException; + import javax.annotation.PostConstruct; import javax.enterprise.context.ApplicationScoped; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.ClientProxy; +import io.quarkus.arc.test.ArcTestContainer; + public class ClientProxyGetContextualInstanceTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/clientproxy/ProducerClientProxyTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/clientproxy/ProducerClientProxyTest.java index 3bdcb323f7e70..88f61b9127d6e 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/clientproxy/ProducerClientProxyTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/clientproxy/ProducerClientProxyTest.java @@ -2,17 +2,20 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import io.quarkus.arc.Arc; -import io.quarkus.arc.InstanceHandle; -import io.quarkus.arc.test.ArcTestContainer; import java.io.IOException; import java.util.function.Function; + import javax.enterprise.context.ApplicationScoped; import javax.enterprise.inject.Produces; import javax.inject.Singleton; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.InstanceHandle; +import io.quarkus.arc.test.ArcTestContainer; + public class ProducerClientProxyTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/clientproxy/bridgemethod/Complex.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/clientproxy/bridgemethod/Complex.java index f06477f2b81dd..849a5e8789d1d 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/clientproxy/bridgemethod/Complex.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/clientproxy/bridgemethod/Complex.java @@ -9,6 +9,7 @@ import java.lang.annotation.Inherited; import java.lang.annotation.Retention; import java.lang.annotation.Target; + import javax.enterprise.util.AnnotationLiteral; import javax.inject.Qualifier; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/clientproxy/bridgemethod/SameDescriptorDifferentReturnTypeMethodTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/clientproxy/bridgemethod/SameDescriptorDifferentReturnTypeMethodTest.java index 7159629617916..8f55cbc65bfc8 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/clientproxy/bridgemethod/SameDescriptorDifferentReturnTypeMethodTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/clientproxy/bridgemethod/SameDescriptorDifferentReturnTypeMethodTest.java @@ -2,16 +2,19 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import io.quarkus.arc.Arc; -import io.quarkus.arc.test.ArcTestContainer; import java.io.IOException; import java.io.Serializable; + import javax.enterprise.context.ApplicationScoped; import javax.enterprise.context.Dependent; import javax.enterprise.inject.Produces; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.test.ArcTestContainer; + public class SameDescriptorDifferentReturnTypeMethodTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/clientproxy/constructor/ClientProxyConstructorGuardTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/clientproxy/constructor/ClientProxyConstructorGuardTest.java index 16717a1b3f9ea..f2e990eacbf1f 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/clientproxy/constructor/ClientProxyConstructorGuardTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/clientproxy/constructor/ClientProxyConstructorGuardTest.java @@ -3,14 +3,17 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -import io.quarkus.arc.Arc; -import io.quarkus.arc.ClientProxy; -import io.quarkus.arc.test.ArcTestContainer; import java.io.IOException; + import javax.enterprise.context.ApplicationScoped; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.ClientProxy; +import io.quarkus.arc.test.ArcTestContainer; + public class ClientProxyConstructorGuardTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/clientproxy/constructor/ProducerReturnTypePackagePrivateNoArgsConstructorTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/clientproxy/constructor/ProducerReturnTypePackagePrivateNoArgsConstructorTest.java index 8fa51503cc28e..459aa47e727bb 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/clientproxy/constructor/ProducerReturnTypePackagePrivateNoArgsConstructorTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/clientproxy/constructor/ProducerReturnTypePackagePrivateNoArgsConstructorTest.java @@ -4,17 +4,20 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import io.quarkus.arc.Arc; -import io.quarkus.arc.ClientProxy; -import io.quarkus.arc.test.ArcTestContainer; -import io.quarkus.arc.test.clientproxy.constructor.some.Resource; import java.io.IOException; + import javax.enterprise.context.ApplicationScoped; import javax.enterprise.inject.Produces; import javax.inject.Singleton; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.ClientProxy; +import io.quarkus.arc.test.ArcTestContainer; +import io.quarkus.arc.test.clientproxy.constructor.some.Resource; + // This test aims to test the https://github.com/quarkusio/quarkus/issues/22815 in ArC standalone // There is a duplicate test for Quarkus integration: io.quarkus.arc.test.unproxyable.ProducerReturnTypePackagePrivateNoArgsConstructorTest public class ProducerReturnTypePackagePrivateNoArgsConstructorTest { diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/clientproxy/contextnotactive/ClientProxyContextNotActiveTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/clientproxy/contextnotactive/ClientProxyContextNotActiveTest.java index cac1e4ad3c145..73c0fd33acf29 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/clientproxy/contextnotactive/ClientProxyContextNotActiveTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/clientproxy/contextnotactive/ClientProxyContextNotActiveTest.java @@ -2,13 +2,15 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import io.quarkus.arc.Arc; -import io.quarkus.arc.test.ArcTestContainer; import javax.enterprise.context.ContextNotActiveException; import javax.enterprise.context.RequestScoped; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.test.ArcTestContainer; + public class ClientProxyContextNotActiveTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/clientproxy/delegatingmethods/ClientProxyMethodInvocationInConstructorTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/clientproxy/delegatingmethods/ClientProxyMethodInvocationInConstructorTest.java index ae0620a9b4852..72d3bd88f044c 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/clientproxy/delegatingmethods/ClientProxyMethodInvocationInConstructorTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/clientproxy/delegatingmethods/ClientProxyMethodInvocationInConstructorTest.java @@ -3,13 +3,15 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -import io.quarkus.arc.Arc; -import io.quarkus.arc.ClientProxy; -import io.quarkus.arc.test.ArcTestContainer; import java.io.IOException; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.ClientProxy; +import io.quarkus.arc.test.ArcTestContainer; + public class ClientProxyMethodInvocationInConstructorTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/clientproxy/finalmethod/FinalMethodIgnoredTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/clientproxy/finalmethod/FinalMethodIgnoredTest.java index 40d808267a276..9dcf7e185ee1e 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/clientproxy/finalmethod/FinalMethodIgnoredTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/clientproxy/finalmethod/FinalMethodIgnoredTest.java @@ -3,15 +3,18 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -import io.quarkus.arc.Arc; -import io.quarkus.arc.ClientProxy; -import io.quarkus.arc.test.ArcTestContainer; import java.io.IOException; + import javax.annotation.PostConstruct; import javax.enterprise.context.ApplicationScoped; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.ClientProxy; +import io.quarkus.arc.test.ArcTestContainer; + public class FinalMethodIgnoredTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/clientproxy/toString/ClientProxyToStringDelegatedTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/clientproxy/toString/ClientProxyToStringDelegatedTest.java index 4984e1b585b5b..5b95e3e9e1068 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/clientproxy/toString/ClientProxyToStringDelegatedTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/clientproxy/toString/ClientProxyToStringDelegatedTest.java @@ -1,11 +1,12 @@ package io.quarkus.arc.test.clientproxy.toString; -import io.quarkus.arc.Arc; -import io.quarkus.arc.test.ArcTestContainer; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.test.ArcTestContainer; + public class ClientProxyToStringDelegatedTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/contexts/application/ApplicationContextGetTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/contexts/application/ApplicationContextGetTest.java index 488db33f0d246..1120dd4ad0be9 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/contexts/application/ApplicationContextGetTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/contexts/application/ApplicationContextGetTest.java @@ -4,17 +4,20 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; -import io.quarkus.arc.Arc; -import io.quarkus.arc.InjectableBean; -import io.quarkus.arc.InjectableContext; -import io.quarkus.arc.impl.CreationalContextImpl; -import io.quarkus.arc.test.ArcTestContainer; import java.util.List; + import javax.enterprise.context.ApplicationScoped; import javax.inject.Singleton; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.InjectableBean; +import io.quarkus.arc.InjectableContext; +import io.quarkus.arc.impl.CreationalContextImpl; +import io.quarkus.arc.test.ArcTestContainer; + public class ApplicationContextGetTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/contexts/application/ApplicationInitializedTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/contexts/application/ApplicationInitializedTest.java index 01d173bcb42d2..4b2caa89329e3 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/contexts/application/ApplicationInitializedTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/contexts/application/ApplicationInitializedTest.java @@ -2,18 +2,21 @@ import static org.junit.jupiter.api.Assertions.assertTrue; -import io.quarkus.arc.test.ArcTestContainer; import java.util.concurrent.atomic.AtomicBoolean; + import javax.enterprise.context.ApplicationScoped; import javax.enterprise.context.BeforeDestroyed; import javax.enterprise.context.Dependent; import javax.enterprise.context.Destroyed; import javax.enterprise.context.Initialized; import javax.enterprise.event.Observes; + import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.test.ArcTestContainer; + public class ApplicationInitializedTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/contexts/dependent/DependentCreationalContextTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/contexts/dependent/DependentCreationalContextTest.java index 350dcae44f5a7..fc2f66cae7888 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/contexts/dependent/DependentCreationalContextTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/contexts/dependent/DependentCreationalContextTest.java @@ -4,22 +4,25 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import io.quarkus.arc.Arc; -import io.quarkus.arc.BeanCreator; -import io.quarkus.arc.BeanDestroyer; -import io.quarkus.arc.impl.InstanceImpl; -import io.quarkus.arc.processor.BeanRegistrar; -import io.quarkus.arc.test.ArcTestContainer; import java.util.Map; + import javax.annotation.PreDestroy; import javax.enterprise.context.Dependent; import javax.enterprise.context.spi.CreationalContext; import javax.enterprise.inject.Disposes; import javax.enterprise.inject.Produces; import javax.inject.Inject; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.BeanCreator; +import io.quarkus.arc.BeanDestroyer; +import io.quarkus.arc.impl.InstanceImpl; +import io.quarkus.arc.processor.BeanRegistrar; +import io.quarkus.arc.test.ArcTestContainer; + public class DependentCreationalContextTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/contexts/request/Controller.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/contexts/request/Controller.java index d19c982b10ebd..7c047d64b6d6c 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/contexts/request/Controller.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/contexts/request/Controller.java @@ -2,6 +2,7 @@ import java.util.UUID; import java.util.concurrent.atomic.AtomicBoolean; + import javax.annotation.PostConstruct; import javax.annotation.PreDestroy; import javax.enterprise.context.RequestScoped; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/contexts/request/LifecycleEventsWithNoBeanTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/contexts/request/LifecycleEventsWithNoBeanTest.java index b3dcf8738e900..6c6fb47cdb470 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/contexts/request/LifecycleEventsWithNoBeanTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/contexts/request/LifecycleEventsWithNoBeanTest.java @@ -2,12 +2,13 @@ import static org.junit.jupiter.api.Assertions.assertEquals; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.RegisterExtension; + import io.quarkus.arc.Arc; import io.quarkus.arc.ArcContainer; import io.quarkus.arc.ManagedContext; import io.quarkus.arc.test.ArcTestContainer; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.RegisterExtension; /** * Tests that lifecycle events for request scoped are fired even though no actual request scoped bean exists. diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/contexts/request/RequestContextTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/contexts/request/RequestContextTest.java index 0ec435c32878c..531d260650a9c 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/contexts/request/RequestContextTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/contexts/request/RequestContextTest.java @@ -7,17 +7,19 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; +import javax.enterprise.context.ApplicationScoped; +import javax.enterprise.context.ContextNotActiveException; +import javax.enterprise.context.control.RequestContextController; + +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.RegisterExtension; + import io.quarkus.arc.Arc; import io.quarkus.arc.ArcContainer; import io.quarkus.arc.InjectableBean; import io.quarkus.arc.ManagedContext; import io.quarkus.arc.impl.CreationalContextImpl; import io.quarkus.arc.test.ArcTestContainer; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.context.ContextNotActiveException; -import javax.enterprise.context.control.RequestContextController; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.RegisterExtension; public class RequestContextTest { diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/contexts/request/propagation/ActivateRequestContextInterceptorTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/contexts/request/propagation/ActivateRequestContextInterceptorTest.java index 29766a92dbf72..510e694bd7af8 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/contexts/request/propagation/ActivateRequestContextInterceptorTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/contexts/request/propagation/ActivateRequestContextInterceptorTest.java @@ -4,18 +4,12 @@ import static io.quarkus.arc.test.contexts.request.propagation.ActivateRequestContextInterceptorTest.FakeSession.State.INIT; import static io.quarkus.arc.test.contexts.request.propagation.ActivateRequestContextInterceptorTest.FakeSession.State.OPENED; -import io.quarkus.arc.Arc; -import io.quarkus.arc.InstanceHandle; -import io.quarkus.arc.impl.ActivateRequestContextInterceptor; -import io.quarkus.arc.test.ArcTestContainer; -import io.quarkus.arc.test.contexts.request.propagation.ActivateRequestContextInterceptorTest.FakeSession.State; -import io.smallrye.mutiny.Multi; -import io.smallrye.mutiny.Uni; import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionStage; import java.util.concurrent.Executor; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; + import javax.enterprise.context.ApplicationScoped; import javax.enterprise.context.RequestScoped; import javax.enterprise.context.control.ActivateRequestContext; @@ -23,6 +17,7 @@ import javax.enterprise.inject.Produces; import javax.inject.Inject; import javax.inject.Singleton; + import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; @@ -30,6 +25,14 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.InstanceHandle; +import io.quarkus.arc.impl.ActivateRequestContextInterceptor; +import io.quarkus.arc.test.ArcTestContainer; +import io.quarkus.arc.test.contexts.request.propagation.ActivateRequestContextInterceptorTest.FakeSession.State; +import io.smallrye.mutiny.Multi; +import io.smallrye.mutiny.Uni; + /** * Test the {@link ActivateRequestContextInterceptor} when {@link ActivateRequestContext} is applied to a method. */ diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/contexts/request/propagation/RequestContextPropagationTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/contexts/request/propagation/RequestContextPropagationTest.java index 0c9d9f24cd427..b3f956f1dc978 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/contexts/request/propagation/RequestContextPropagationTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/contexts/request/propagation/RequestContextPropagationTest.java @@ -6,14 +6,16 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; +import javax.enterprise.context.ContextNotActiveException; + +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.RegisterExtension; + import io.quarkus.arc.Arc; import io.quarkus.arc.ArcContainer; import io.quarkus.arc.InjectableContext.ContextState; import io.quarkus.arc.ManagedContext; import io.quarkus.arc.test.ArcTestContainer; -import javax.enterprise.context.ContextNotActiveException; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.RegisterExtension; public class RequestContextPropagationTest { diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/contexts/request/propagation/SuperButton.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/contexts/request/propagation/SuperButton.java index 66b941da07525..596fa7bee0b19 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/contexts/request/propagation/SuperButton.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/contexts/request/propagation/SuperButton.java @@ -1,6 +1,7 @@ package io.quarkus.arc.test.contexts.request.propagation; import java.util.concurrent.atomic.AtomicBoolean; + import javax.annotation.PreDestroy; import javax.enterprise.context.Dependent; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/contexts/request/propagation/SuperController.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/contexts/request/propagation/SuperController.java index f3fb12dd7169b..c0a6c7784dbb1 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/contexts/request/propagation/SuperController.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/contexts/request/propagation/SuperController.java @@ -2,6 +2,7 @@ import java.util.UUID; import java.util.concurrent.atomic.AtomicBoolean; + import javax.annotation.PostConstruct; import javax.annotation.PreDestroy; import javax.enterprise.context.RequestScoped; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/contexts/request/propagation/YetAnotherReqScopedBean.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/contexts/request/propagation/YetAnotherReqScopedBean.java index 94105a893bd97..9dcc23499c207 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/contexts/request/propagation/YetAnotherReqScopedBean.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/contexts/request/propagation/YetAnotherReqScopedBean.java @@ -1,6 +1,7 @@ package io.quarkus.arc.test.contexts.request.propagation; import java.util.Random; + import javax.enterprise.context.RequestScoped; @RequestScoped diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/contexts/singleton/SingletonContextGetTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/contexts/singleton/SingletonContextGetTest.java index 05c980606ea4b..32aea5c47de88 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/contexts/singleton/SingletonContextGetTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/contexts/singleton/SingletonContextGetTest.java @@ -4,17 +4,20 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; -import io.quarkus.arc.Arc; -import io.quarkus.arc.InjectableBean; -import io.quarkus.arc.InjectableContext; -import io.quarkus.arc.impl.CreationalContextImpl; -import io.quarkus.arc.test.ArcTestContainer; import java.util.List; + import javax.enterprise.context.RequestScoped; import javax.inject.Singleton; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.InjectableBean; +import io.quarkus.arc.InjectableContext; +import io.quarkus.arc.impl.CreationalContextImpl; +import io.quarkus.arc.test.ArcTestContainer; + public class SingletonContextGetTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/contexts/singleton/SingletonDestructionTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/contexts/singleton/SingletonDestructionTest.java index 9164da56142cf..8873adb8a94c1 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/contexts/singleton/SingletonDestructionTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/contexts/singleton/SingletonDestructionTest.java @@ -2,17 +2,20 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import io.quarkus.arc.Arc; -import io.quarkus.arc.InstanceHandle; -import io.quarkus.arc.test.ArcTestContainer; import java.util.concurrent.atomic.AtomicInteger; + import javax.annotation.PostConstruct; import javax.annotation.PreDestroy; import javax.enterprise.context.Dependent; import javax.inject.Singleton; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.InstanceHandle; +import io.quarkus.arc.test.ArcTestContainer; + public class SingletonDestructionTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/SimpleDecoratorTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/SimpleDecoratorTest.java index 1176f02f643b4..55ce203ca4a2a 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/SimpleDecoratorTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/SimpleDecoratorTest.java @@ -2,17 +2,19 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import io.quarkus.arc.Arc; -import io.quarkus.arc.test.ArcTestContainer; import javax.annotation.Priority; import javax.decorator.Decorator; import javax.decorator.Delegate; import javax.enterprise.context.ApplicationScoped; import javax.enterprise.context.Dependent; import javax.inject.Inject; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.test.ArcTestContainer; + public class SimpleDecoratorTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/abstractimpl/AbstractDecoratorTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/abstractimpl/AbstractDecoratorTest.java index 16ce5bd1c4db2..3ec64820c0915 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/abstractimpl/AbstractDecoratorTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/abstractimpl/AbstractDecoratorTest.java @@ -2,16 +2,18 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import io.quarkus.arc.Arc; -import io.quarkus.arc.test.ArcTestContainer; import javax.annotation.Priority; import javax.decorator.Decorator; import javax.decorator.Delegate; import javax.enterprise.context.ApplicationScoped; import javax.inject.Inject; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.test.ArcTestContainer; + public class AbstractDecoratorTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/abstractimpl/InterceptorAndAbstractDecoratorTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/abstractimpl/InterceptorAndAbstractDecoratorTest.java index 1ce3ff0bac5dc..c8885ba668aa9 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/abstractimpl/InterceptorAndAbstractDecoratorTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/abstractimpl/InterceptorAndAbstractDecoratorTest.java @@ -5,12 +5,11 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; import static org.junit.jupiter.api.Assertions.assertEquals; -import io.quarkus.arc.Arc; -import io.quarkus.arc.test.ArcTestContainer; import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; import java.util.concurrent.atomic.AtomicReference; + import javax.annotation.Priority; import javax.decorator.Decorator; import javax.decorator.Delegate; @@ -20,9 +19,13 @@ import javax.interceptor.Interceptor; import javax.interceptor.InterceptorBinding; import javax.interceptor.InvocationContext; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.test.ArcTestContainer; + public class InterceptorAndAbstractDecoratorTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/delegate/DelegateSubtypeTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/delegate/DelegateSubtypeTest.java index 4711780eb8a81..b666e4e94de53 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/delegate/DelegateSubtypeTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/delegate/DelegateSubtypeTest.java @@ -2,15 +2,17 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import io.quarkus.arc.Arc; -import io.quarkus.arc.test.ArcTestContainer; import javax.decorator.Decorator; import javax.decorator.Delegate; import javax.enterprise.context.ApplicationScoped; import javax.inject.Inject; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.test.ArcTestContainer; + public class DelegateSubtypeTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/generics/DecoratorWithTypeVariableTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/generics/DecoratorWithTypeVariableTest.java index 93f548aea085d..e9d48318daf6e 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/generics/DecoratorWithTypeVariableTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/generics/DecoratorWithTypeVariableTest.java @@ -1,21 +1,24 @@ package io.quarkus.arc.test.decorators.generics; -import io.quarkus.arc.Arc; -import io.quarkus.arc.Priority; -import io.quarkus.arc.Unremovable; -import io.quarkus.arc.test.ArcTestContainer; import java.util.List; import java.util.Set; + import javax.decorator.Decorator; import javax.decorator.Delegate; import javax.enterprise.context.ApplicationScoped; import javax.enterprise.inject.Any; import javax.enterprise.util.TypeLiteral; import javax.inject.Inject; + import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.Priority; +import io.quarkus.arc.Unremovable; +import io.quarkus.arc.test.ArcTestContainer; + public class DecoratorWithTypeVariableTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/generics/GenericsDecoratorTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/generics/GenericsDecoratorTest.java index adaa50d2e494b..b05d965a78ab4 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/generics/GenericsDecoratorTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/generics/GenericsDecoratorTest.java @@ -3,17 +3,20 @@ import static java.util.Collections.singletonList; import static org.junit.jupiter.api.Assertions.assertEquals; -import io.quarkus.arc.Arc; -import io.quarkus.arc.test.ArcTestContainer; import java.util.List; + import javax.annotation.Priority; import javax.decorator.Decorator; import javax.decorator.Delegate; import javax.enterprise.context.ApplicationScoped; import javax.inject.Inject; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.test.ArcTestContainer; + public class GenericsDecoratorTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/interceptor/InterceptorAndDecoratorTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/interceptor/InterceptorAndDecoratorTest.java index f51e0fa8e4c7f..ffbcaf8e053eb 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/interceptor/InterceptorAndDecoratorTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/interceptor/InterceptorAndDecoratorTest.java @@ -5,12 +5,11 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; import static org.junit.jupiter.api.Assertions.assertEquals; -import io.quarkus.arc.Arc; -import io.quarkus.arc.test.ArcTestContainer; import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; import java.util.concurrent.atomic.AtomicReference; + import javax.annotation.Priority; import javax.decorator.Decorator; import javax.decorator.Delegate; @@ -20,9 +19,13 @@ import javax.interceptor.Interceptor; import javax.interceptor.InterceptorBinding; import javax.interceptor.InvocationContext; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.test.ArcTestContainer; + public class InterceptorAndDecoratorTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/priority/BravoConverterDecorator.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/priority/BravoConverterDecorator.java index 512237b87dafd..a2fdd18d47292 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/priority/BravoConverterDecorator.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/priority/BravoConverterDecorator.java @@ -1,10 +1,11 @@ package io.quarkus.arc.test.decorators.priority; -import io.quarkus.arc.Priority; import javax.decorator.Decorator; import javax.decorator.Delegate; import javax.inject.Inject; +import io.quarkus.arc.Priority; + @Priority(2) @Decorator class BravoConverterDecorator implements Converter { diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/priority/MultipleDecoratorsSamePriorityTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/priority/MultipleDecoratorsSamePriorityTest.java index 817a436ca69e3..b88f28aa2d555 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/priority/MultipleDecoratorsSamePriorityTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/priority/MultipleDecoratorsSamePriorityTest.java @@ -2,12 +2,14 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import io.quarkus.arc.Arc; -import io.quarkus.arc.test.ArcTestContainer; import javax.enterprise.context.ApplicationScoped; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.test.ArcTestContainer; + public class MultipleDecoratorsSamePriorityTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/priority/MultipleDecoratorsTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/priority/MultipleDecoratorsTest.java index 6d3afa81ad3cd..cae321ede26da 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/priority/MultipleDecoratorsTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/priority/MultipleDecoratorsTest.java @@ -2,12 +2,14 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import io.quarkus.arc.Arc; -import io.quarkus.arc.test.ArcTestContainer; import javax.enterprise.context.ApplicationScoped; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.test.ArcTestContainer; + public class MultipleDecoratorsTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/qualifiers/DelegateQualifiersTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/qualifiers/DelegateQualifiersTest.java index 37fbc8b4a2606..a8c17d4a17480 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/qualifiers/DelegateQualifiersTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/qualifiers/DelegateQualifiersTest.java @@ -2,9 +2,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import io.quarkus.arc.Arc; -import io.quarkus.arc.test.ArcTestContainer; -import io.quarkus.arc.test.MyQualifier; import javax.annotation.Priority; import javax.decorator.Decorator; import javax.decorator.Delegate; @@ -12,9 +9,14 @@ import javax.enterprise.context.Dependent; import javax.enterprise.util.AnnotationLiteral; import javax.inject.Inject; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.test.ArcTestContainer; +import io.quarkus.arc.test.MyQualifier; + public class DelegateQualifiersTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/validation/AbstractDecoratorWithAbstractMethodTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/validation/AbstractDecoratorWithAbstractMethodTest.java index 5a87e389de51c..4808722aaefaf 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/validation/AbstractDecoratorWithAbstractMethodTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/validation/AbstractDecoratorWithAbstractMethodTest.java @@ -3,14 +3,16 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import io.quarkus.arc.test.ArcTestContainer; import javax.annotation.Priority; import javax.decorator.Decorator; import javax.decorator.Delegate; import javax.inject.Inject; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.test.ArcTestContainer; + public class AbstractDecoratorWithAbstractMethodTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/validation/DecoratorForBuiltInEventTypeTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/validation/DecoratorForBuiltInEventTypeTest.java index 1658e8f866329..6716eb2ca48c6 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/validation/DecoratorForBuiltInEventTypeTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/validation/DecoratorForBuiltInEventTypeTest.java @@ -3,19 +3,22 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import io.quarkus.arc.Priority; -import io.quarkus.arc.test.ArcTestContainer; import java.lang.annotation.Annotation; import java.util.concurrent.CompletionStage; + import javax.decorator.Decorator; import javax.decorator.Delegate; import javax.enterprise.event.Event; import javax.enterprise.event.NotificationOptions; import javax.enterprise.util.TypeLiteral; import javax.inject.Inject; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Priority; +import io.quarkus.arc.test.ArcTestContainer; + public class DecoratorForBuiltInEventTypeTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/validation/DelegateDoesNotImplementDecoratedTypeTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/validation/DelegateDoesNotImplementDecoratedTypeTest.java index 13d41900fea4b..5b6fffd985965 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/validation/DelegateDoesNotImplementDecoratedTypeTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/validation/DelegateDoesNotImplementDecoratedTypeTest.java @@ -3,15 +3,17 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import io.quarkus.arc.test.ArcTestContainer; import javax.annotation.Priority; import javax.decorator.Decorator; import javax.decorator.Delegate; import javax.enterprise.context.Dependent; import javax.inject.Inject; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.test.ArcTestContainer; + public class DelegateDoesNotImplementDecoratedTypeTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/validation/MultipleDelegateInjectionPointsTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/validation/MultipleDelegateInjectionPointsTest.java index 044c37dea7b95..0001f187e13a9 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/validation/MultipleDelegateInjectionPointsTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/validation/MultipleDelegateInjectionPointsTest.java @@ -3,14 +3,16 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import io.quarkus.arc.test.ArcTestContainer; import javax.annotation.Priority; import javax.decorator.Decorator; import javax.decorator.Delegate; import javax.inject.Inject; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.test.ArcTestContainer; + public class MultipleDelegateInjectionPointsTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/validation/NoDecoratedTypeTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/validation/NoDecoratedTypeTest.java index 78d7c3b0a0239..8547756c23c30 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/validation/NoDecoratedTypeTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/validation/NoDecoratedTypeTest.java @@ -3,14 +3,16 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import io.quarkus.arc.test.ArcTestContainer; import javax.annotation.Priority; import javax.decorator.Decorator; import javax.decorator.Delegate; import javax.inject.Inject; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.test.ArcTestContainer; + public class NoDecoratedTypeTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/validation/NoDelegateInjectionPointTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/validation/NoDelegateInjectionPointTest.java index 70f475cea1ef5..e7fb0cdaa2b7f 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/validation/NoDelegateInjectionPointTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/validation/NoDelegateInjectionPointTest.java @@ -3,12 +3,14 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import io.quarkus.arc.test.ArcTestContainer; import javax.annotation.Priority; import javax.decorator.Decorator; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.test.ArcTestContainer; + public class NoDelegateInjectionPointTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/validation/NonDependentScopeTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/validation/NonDependentScopeTest.java index 4b27b314f6bd1..d7873e19a27ff 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/validation/NonDependentScopeTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/validation/NonDependentScopeTest.java @@ -3,15 +3,17 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import io.quarkus.arc.test.ArcTestContainer; import javax.annotation.Priority; import javax.decorator.Decorator; import javax.decorator.Delegate; import javax.enterprise.context.ApplicationScoped; import javax.inject.Inject; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.test.ArcTestContainer; + public class NonDependentScopeTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/defaultbean/DefaultClassBeanTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/defaultbean/DefaultClassBeanTest.java index 8f34f2ec435b2..156ea33c02ba2 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/defaultbean/DefaultClassBeanTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/defaultbean/DefaultClassBeanTest.java @@ -2,21 +2,24 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import io.quarkus.arc.Arc; -import io.quarkus.arc.DefaultBean; -import io.quarkus.arc.test.ArcTestContainer; import java.util.Set; import java.util.stream.Collectors; + import javax.enterprise.context.ApplicationScoped; import javax.enterprise.inject.Instance; import javax.enterprise.inject.Produces; import javax.enterprise.inject.spi.CDI; import javax.inject.Inject; import javax.inject.Singleton; + import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.DefaultBean; +import io.quarkus.arc.test.ArcTestContainer; + public class DefaultClassBeanTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/defaultbean/DefaultProducerFieldTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/defaultbean/DefaultProducerFieldTest.java index e86d047bb4e82..9cf0c82e93004 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/defaultbean/DefaultProducerFieldTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/defaultbean/DefaultProducerFieldTest.java @@ -3,20 +3,23 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -import io.quarkus.arc.Arc; -import io.quarkus.arc.DefaultBean; -import io.quarkus.arc.test.ArcTestContainer; import java.util.List; import java.util.stream.Collectors; + import javax.enterprise.context.ApplicationScoped; import javax.enterprise.inject.Instance; import javax.enterprise.inject.Produces; import javax.enterprise.inject.spi.CDI; import javax.inject.Inject; import javax.inject.Singleton; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.DefaultBean; +import io.quarkus.arc.test.ArcTestContainer; + public class DefaultProducerFieldTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/defaultbean/DefaultProducerMethodTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/defaultbean/DefaultProducerMethodTest.java index 478e10ac0d564..df27a01a0099e 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/defaultbean/DefaultProducerMethodTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/defaultbean/DefaultProducerMethodTest.java @@ -3,15 +3,17 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; -import io.quarkus.arc.Arc; -import io.quarkus.arc.DefaultBean; -import io.quarkus.arc.test.ArcTestContainer; import javax.enterprise.inject.Produces; import javax.enterprise.inject.spi.CDI; import javax.inject.Singleton; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.DefaultBean; +import io.quarkus.arc.test.ArcTestContainer; + public class DefaultProducerMethodTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/discovery/AbstractClassIgnoredTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/discovery/AbstractClassIgnoredTest.java index c3d560189f730..e30d6ef1c392e 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/discovery/AbstractClassIgnoredTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/discovery/AbstractClassIgnoredTest.java @@ -2,12 +2,14 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import io.quarkus.arc.Arc; -import io.quarkus.arc.test.ArcTestContainer; import javax.enterprise.context.ApplicationScoped; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.test.ArcTestContainer; + public class AbstractClassIgnoredTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/discovery/ParameterizedBeanTypeWithVariableTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/discovery/ParameterizedBeanTypeWithVariableTest.java index a0bd3b70bfa15..71f6da5da3ca3 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/discovery/ParameterizedBeanTypeWithVariableTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/discovery/ParameterizedBeanTypeWithVariableTest.java @@ -2,12 +2,14 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import io.quarkus.arc.Arc; -import io.quarkus.arc.test.ArcTestContainer; import javax.enterprise.context.ApplicationScoped; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.test.ArcTestContainer; + public class ParameterizedBeanTypeWithVariableTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/event/select/EventSelectTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/event/select/EventSelectTest.java index 5c55f109cbe54..381db746464f4 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/event/select/EventSelectTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/event/select/EventSelectTest.java @@ -1,13 +1,15 @@ package io.quarkus.arc.test.event.select; -import io.quarkus.arc.Arc; -import io.quarkus.arc.test.ArcTestContainer; import javax.enterprise.util.AnnotationLiteral; import javax.enterprise.util.TypeLiteral; + import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.test.ArcTestContainer; + /** * Tests that event selection throws exceptions under certain circumstances. */ diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/event/select/SystemTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/event/select/SystemTest.java index 07a57bee53505..fbf3f5a23e0ad 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/event/select/SystemTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/event/select/SystemTest.java @@ -5,6 +5,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; + import javax.enterprise.util.AnnotationLiteral; import javax.inject.Qualifier; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/index/AdditionalIndexTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/index/AdditionalIndexTest.java index ca43a536541e6..c28c446096e0f 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/index/AdditionalIndexTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/index/AdditionalIndexTest.java @@ -2,16 +2,19 @@ import static org.junit.jupiter.api.Assertions.assertTrue; -import io.quarkus.arc.Arc; -import io.quarkus.arc.test.ArcTestContainer; import java.util.ArrayList; import java.util.List; + import javax.enterprise.context.Dependent; import javax.enterprise.inject.Produces; import javax.inject.Inject; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.test.ArcTestContainer; + public class AdditionalIndexTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/inheritance/MemberLevelInheritanceTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/inheritance/MemberLevelInheritanceTest.java index 27cd06dd332c7..523d99f1474b6 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/inheritance/MemberLevelInheritanceTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/inheritance/MemberLevelInheritanceTest.java @@ -8,12 +8,10 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; -import io.quarkus.arc.Arc; -import io.quarkus.arc.ArcContainer; -import io.quarkus.arc.test.ArcTestContainer; import java.lang.annotation.Inherited; import java.lang.annotation.Retention; import java.lang.annotation.Target; + import javax.annotation.Priority; import javax.enterprise.context.ApplicationScoped; import javax.enterprise.inject.Produces; @@ -23,9 +21,14 @@ import javax.interceptor.Interceptor; import javax.interceptor.InterceptorBinding; import javax.interceptor.InvocationContext; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.ArcContainer; +import io.quarkus.arc.test.ArcTestContainer; + public class MemberLevelInheritanceTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/inheritance/QualifiersInheritanceTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/inheritance/QualifiersInheritanceTest.java index cfb9900cd7c56..cd2b49b50d6f2 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/inheritance/QualifiersInheritanceTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/inheritance/QualifiersInheritanceTest.java @@ -4,17 +4,20 @@ import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; -import io.quarkus.arc.Arc; -import io.quarkus.arc.ArcContainer; -import io.quarkus.arc.test.ArcTestContainer; import java.lang.annotation.Inherited; import java.lang.annotation.Retention; + import javax.enterprise.context.ApplicationScoped; import javax.enterprise.util.AnnotationLiteral; import javax.inject.Qualifier; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.ArcContainer; +import io.quarkus.arc.test.ArcTestContainer; + public class QualifiersInheritanceTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/inheritance/ScopeInheritanceStereotypeTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/inheritance/ScopeInheritanceStereotypeTest.java index dd5d99634dee7..30855b3cdd955 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/inheritance/ScopeInheritanceStereotypeTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/inheritance/ScopeInheritanceStereotypeTest.java @@ -2,14 +2,16 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import io.quarkus.arc.Arc; -import io.quarkus.arc.InjectableBean; -import io.quarkus.arc.test.ArcTestContainer; import javax.enterprise.context.ApplicationScoped; import javax.enterprise.inject.Model; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.InjectableBean; +import io.quarkus.arc.test.ArcTestContainer; + public class ScopeInheritanceStereotypeTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/inheritance/ScopeInheritanceTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/inheritance/ScopeInheritanceTest.java index 2e8bcc8ebba5b..cfaf38dee9d4e 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/inheritance/ScopeInheritanceTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/inheritance/ScopeInheritanceTest.java @@ -6,21 +6,24 @@ import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import io.quarkus.arc.Arc; -import io.quarkus.arc.test.ArcTestContainer; import java.lang.annotation.Inherited; import java.lang.annotation.Retention; import java.lang.annotation.Target; import java.util.Set; + import javax.enterprise.context.ApplicationScoped; import javax.enterprise.context.RequestScoped; import javax.enterprise.inject.Stereotype; import javax.enterprise.inject.spi.Bean; import javax.enterprise.inject.spi.BeanManager; + import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.test.ArcTestContainer; + public class ScopeInheritanceTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/inheritance/TypeLevelInheritanceTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/inheritance/TypeLevelInheritanceTest.java index 289688b8c8cad..0823a715fcef2 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/inheritance/TypeLevelInheritanceTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/inheritance/TypeLevelInheritanceTest.java @@ -9,12 +9,10 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; -import io.quarkus.arc.Arc; -import io.quarkus.arc.ArcContainer; -import io.quarkus.arc.test.ArcTestContainer; import java.lang.annotation.Inherited; import java.lang.annotation.Retention; import java.lang.annotation.Target; + import javax.annotation.Priority; import javax.enterprise.context.ApplicationScoped; import javax.enterprise.inject.Stereotype; @@ -25,9 +23,14 @@ import javax.interceptor.Interceptor; import javax.interceptor.InterceptorBinding; import javax.interceptor.InvocationContext; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.ArcContainer; +import io.quarkus.arc.test.ArcTestContainer; + /** * Tests type inheritence, e.g. that scopes, stereotypes, bindings and qualifiers are inherited so long as they * declare {@code @Inherited} diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/assignability/ListJdkElementTypeTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/assignability/ListJdkElementTypeTest.java index c9937c022c1da..54f17fa3609db 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/assignability/ListJdkElementTypeTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/assignability/ListJdkElementTypeTest.java @@ -2,17 +2,20 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import io.quarkus.arc.Arc; -import io.quarkus.arc.test.ArcTestContainer; import java.util.Collections; import java.util.List; + import javax.enterprise.context.ApplicationScoped; import javax.enterprise.context.Dependent; import javax.enterprise.inject.Produces; import javax.inject.Inject; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.test.ArcTestContainer; + public class ListJdkElementTypeTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/assignability/OptionalAssignabilityTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/assignability/OptionalAssignabilityTest.java index c5242725732a6..a124e1d65a47b 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/assignability/OptionalAssignabilityTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/assignability/OptionalAssignabilityTest.java @@ -2,17 +2,20 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import io.quarkus.arc.Arc; -import io.quarkus.arc.test.ArcTestContainer; import java.util.Optional; + import javax.enterprise.context.ApplicationScoped; import javax.enterprise.context.Dependent; import javax.enterprise.inject.Produces; import javax.enterprise.inject.spi.InjectionPoint; import javax.inject.Inject; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.test.ArcTestContainer; + public class OptionalAssignabilityTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/assignability/generics/AssignabilityWithGenericsTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/assignability/generics/AssignabilityWithGenericsTest.java index d7195d95c97e7..732f252628d41 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/assignability/generics/AssignabilityWithGenericsTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/assignability/generics/AssignabilityWithGenericsTest.java @@ -4,13 +4,11 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import io.quarkus.arc.Arc; -import io.quarkus.arc.InstanceHandle; -import io.quarkus.arc.test.ArcTestContainer; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; + import javax.enterprise.context.ApplicationScoped; import javax.enterprise.context.Dependent; import javax.enterprise.event.Observes; @@ -18,9 +16,14 @@ import javax.enterprise.inject.Produces; import javax.enterprise.util.TypeLiteral; import javax.inject.Inject; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.InstanceHandle; +import io.quarkus.arc.test.ArcTestContainer; + public class AssignabilityWithGenericsTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/assignability/generics/RawTypeAssignabilityTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/assignability/generics/RawTypeAssignabilityTest.java index f1fbf93a9b9cf..242c134fa7f20 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/assignability/generics/RawTypeAssignabilityTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/assignability/generics/RawTypeAssignabilityTest.java @@ -1,16 +1,18 @@ package io.quarkus.arc.test.injection.assignability.generics; -import io.quarkus.arc.Arc; -import io.quarkus.arc.ArcContainer; -import io.quarkus.arc.test.ArcTestContainer; import javax.enterprise.context.ApplicationScoped; import javax.enterprise.inject.Produces; import javax.enterprise.inject.Vetoed; import javax.inject.Inject; + import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.ArcContainer; +import io.quarkus.arc.test.ArcTestContainer; + public class RawTypeAssignabilityTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/constructornoinject/MultiInjectConstructorFailureTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/constructornoinject/MultiInjectConstructorFailureTest.java index d0866469517dc..64a305879f4ca 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/constructornoinject/MultiInjectConstructorFailureTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/constructornoinject/MultiInjectConstructorFailureTest.java @@ -3,14 +3,16 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import io.quarkus.arc.test.ArcTestContainer; import javax.enterprise.context.Dependent; import javax.enterprise.inject.spi.DefinitionException; import javax.inject.Inject; import javax.inject.Singleton; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.test.ArcTestContainer; + public class MultiInjectConstructorFailureTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/constructornoinject/NoArgConstructorTakesPrecedenceTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/constructornoinject/NoArgConstructorTakesPrecedenceTest.java index 56573933e5a5a..e0d6e4c87a93b 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/constructornoinject/NoArgConstructorTakesPrecedenceTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/constructornoinject/NoArgConstructorTakesPrecedenceTest.java @@ -2,12 +2,14 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import io.quarkus.arc.Arc; -import io.quarkus.arc.test.ArcTestContainer; import javax.inject.Singleton; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.test.ArcTestContainer; + public class NoArgConstructorTakesPrecedenceTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/constructornoinject/SingleNonNoArgConstructorInjectionTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/constructornoinject/SingleNonNoArgConstructorInjectionTest.java index 073e722453bef..991d98fc546cf 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/constructornoinject/SingleNonNoArgConstructorInjectionTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/constructornoinject/SingleNonNoArgConstructorInjectionTest.java @@ -2,14 +2,16 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; -import io.quarkus.arc.Arc; -import io.quarkus.arc.test.ArcTestContainer; import javax.enterprise.context.Dependent; import javax.inject.Inject; import javax.inject.Singleton; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.test.ArcTestContainer; + public class SingleNonNoArgConstructorInjectionTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/erroneous/CircularInjectionNotSupportedTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/erroneous/CircularInjectionNotSupportedTest.java index 28faa0ab50e97..a03a76ce42641 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/erroneous/CircularInjectionNotSupportedTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/erroneous/CircularInjectionNotSupportedTest.java @@ -2,12 +2,14 @@ import static org.assertj.core.api.Assertions.assertThat; -import io.quarkus.arc.test.ArcTestContainer; import javax.inject.Inject; import javax.inject.Singleton; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.test.ArcTestContainer; + public class CircularInjectionNotSupportedTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/finalfield/FinalFieldInjectionTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/finalfield/FinalFieldInjectionTest.java index 3b5243358eeed..791fcd7a4c7a1 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/finalfield/FinalFieldInjectionTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/finalfield/FinalFieldInjectionTest.java @@ -3,14 +3,17 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; -import io.quarkus.arc.Arc; -import io.quarkus.arc.test.ArcTestContainer; import java.util.concurrent.atomic.AtomicInteger; + import javax.enterprise.context.Dependent; import javax.inject.Inject; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.test.ArcTestContainer; + public class FinalFieldInjectionTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/illegal/TypeVariableFieldInjectionPointTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/illegal/TypeVariableFieldInjectionPointTest.java index 788b776f47dde..a4f84e6ee71ca 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/illegal/TypeVariableFieldInjectionPointTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/illegal/TypeVariableFieldInjectionPointTest.java @@ -4,13 +4,15 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import io.quarkus.arc.test.ArcTestContainer; import javax.enterprise.context.Dependent; import javax.enterprise.inject.spi.DefinitionException; import javax.inject.Inject; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.test.ArcTestContainer; + public class TypeVariableFieldInjectionPointTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/illegal/TypeVariableInitializerInjectionPointTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/illegal/TypeVariableInitializerInjectionPointTest.java index 42581bc18a589..7c7e6eab95008 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/illegal/TypeVariableInitializerInjectionPointTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/illegal/TypeVariableInitializerInjectionPointTest.java @@ -4,13 +4,15 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import io.quarkus.arc.test.ArcTestContainer; import javax.enterprise.context.Dependent; import javax.enterprise.inject.spi.DefinitionException; import javax.inject.Inject; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.test.ArcTestContainer; + public class TypeVariableInitializerInjectionPointTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/privateconstructor/PrivateConstructorInjectionTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/privateconstructor/PrivateConstructorInjectionTest.java index 042115acde683..99b8a8e7e4d69 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/privateconstructor/PrivateConstructorInjectionTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/privateconstructor/PrivateConstructorInjectionTest.java @@ -2,14 +2,16 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; -import io.quarkus.arc.Arc; -import io.quarkus.arc.test.ArcTestContainer; import javax.enterprise.context.Dependent; import javax.inject.Inject; import javax.inject.Singleton; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.test.ArcTestContainer; + public class PrivateConstructorInjectionTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/privatefield/PrivateFieldInjectionTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/privatefield/PrivateFieldInjectionTest.java index 3575fb8aebb5c..549f02da936e3 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/privatefield/PrivateFieldInjectionTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/privatefield/PrivateFieldInjectionTest.java @@ -2,14 +2,16 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; -import io.quarkus.arc.Arc; -import io.quarkus.arc.test.ArcTestContainer; import javax.enterprise.context.ApplicationScoped; import javax.enterprise.context.Dependent; import javax.inject.Inject; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.test.ArcTestContainer; + public class PrivateFieldInjectionTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/privateinitializer/PrivateInitializerInjectionTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/privateinitializer/PrivateInitializerInjectionTest.java index 3e8cb9ae5c7e2..a4e6582c0b619 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/privateinitializer/PrivateInitializerInjectionTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/privateinitializer/PrivateInitializerInjectionTest.java @@ -2,14 +2,16 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; -import io.quarkus.arc.Arc; -import io.quarkus.arc.test.ArcTestContainer; import javax.enterprise.context.ApplicationScoped; import javax.enterprise.context.Dependent; import javax.inject.Inject; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.test.ArcTestContainer; + public class PrivateInitializerInjectionTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/resource/ResourceInjectionTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/resource/ResourceInjectionTest.java index 8129a91c962fe..1658d1474e071 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/resource/ResourceInjectionTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/resource/ResourceInjectionTest.java @@ -5,10 +5,6 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import io.quarkus.arc.Arc; -import io.quarkus.arc.InstanceHandle; -import io.quarkus.arc.ResourceReferenceProvider; -import io.quarkus.arc.test.ArcTestContainer; import java.lang.annotation.Annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; @@ -19,6 +15,7 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.atomic.AtomicBoolean; + import javax.enterprise.context.Dependent; import javax.enterprise.inject.Produces; import javax.inject.Inject; @@ -38,9 +35,15 @@ import javax.persistence.criteria.CriteriaQuery; import javax.persistence.criteria.CriteriaUpdate; import javax.persistence.metamodel.Metamodel; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.InstanceHandle; +import io.quarkus.arc.ResourceReferenceProvider; +import io.quarkus.arc.test.ArcTestContainer; + public class ResourceInjectionTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/staticfield/StaticFieldInjectionTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/staticfield/StaticFieldInjectionTest.java index 6f8894cda55e9..ab70d2a846955 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/staticfield/StaticFieldInjectionTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/staticfield/StaticFieldInjectionTest.java @@ -3,14 +3,17 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; -import io.quarkus.arc.Arc; -import io.quarkus.arc.test.ArcTestContainer; import java.util.concurrent.atomic.AtomicInteger; + import javax.enterprise.context.Dependent; import javax.inject.Inject; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.test.ArcTestContainer; + public class StaticFieldInjectionTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/superclass/SuperclassInjectionTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/superclass/SuperclassInjectionTest.java index b5fbf998c8390..b9f8dd4431447 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/superclass/SuperclassInjectionTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/superclass/SuperclassInjectionTest.java @@ -4,20 +4,23 @@ import static org.junit.jupiter.api.Assertions.assertNotEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; -import io.quarkus.arc.Arc; -import io.quarkus.arc.test.ArcTestContainer; -import io.quarkus.arc.test.injection.superclass.foo.FooHarvester; import java.util.HashSet; import java.util.Set; import java.util.UUID; + import javax.annotation.PostConstruct; import javax.enterprise.context.ApplicationScoped; import javax.enterprise.context.Dependent; import javax.inject.Inject; import javax.inject.Singleton; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.test.ArcTestContainer; +import io.quarkus.arc.test.injection.superclass.foo.FooHarvester; + public class SuperclassInjectionTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/superclass/foo/FooHarvester.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/superclass/foo/FooHarvester.java index 1477c0b584ad4..a45db78a3de81 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/superclass/foo/FooHarvester.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/superclass/foo/FooHarvester.java @@ -1,8 +1,9 @@ package io.quarkus.arc.test.injection.superclass.foo; +import javax.inject.Inject; + import io.quarkus.arc.test.injection.superclass.SuperclassInjectionTest.Head; import io.quarkus.arc.test.injection.superclass.SuperclassInjectionTest.SuperHarvester; -import javax.inject.Inject; public abstract class FooHarvester extends SuperHarvester { diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/instance/ArcContainerSelectTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/instance/ArcContainerSelectTest.java index 3c53cd31d0a02..fd64da3df0482 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/instance/ArcContainerSelectTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/instance/ArcContainerSelectTest.java @@ -5,16 +5,13 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import io.quarkus.arc.Arc; -import io.quarkus.arc.InjectableInstance; -import io.quarkus.arc.InstanceHandle; -import io.quarkus.arc.test.ArcTestContainer; import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; import java.util.HashSet; import java.util.Set; import java.util.concurrent.atomic.AtomicBoolean; import java.util.function.Supplier; + import javax.annotation.PostConstruct; import javax.annotation.PreDestroy; import javax.enterprise.context.Dependent; @@ -24,9 +21,15 @@ import javax.enterprise.util.TypeLiteral; import javax.inject.Inject; import javax.inject.Singleton; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.InjectableInstance; +import io.quarkus.arc.InstanceHandle; +import io.quarkus.arc.test.ArcTestContainer; + public class ArcContainerSelectTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/instance/InjectableInstanceTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/instance/InjectableInstanceTest.java index 0d0d4db794a85..60ee66907cd98 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/instance/InjectableInstanceTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/instance/InjectableInstanceTest.java @@ -5,22 +5,25 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import io.quarkus.arc.Arc; -import io.quarkus.arc.InjectableBean; -import io.quarkus.arc.InjectableInstance; -import io.quarkus.arc.InstanceHandle; -import io.quarkus.arc.impl.InstanceImpl; -import io.quarkus.arc.test.ArcTestContainer; import java.util.concurrent.atomic.AtomicBoolean; + import javax.annotation.PostConstruct; import javax.annotation.PreDestroy; import javax.enterprise.context.Dependent; import javax.enterprise.inject.Instance; import javax.inject.Inject; import javax.inject.Singleton; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.InjectableBean; +import io.quarkus.arc.InjectableInstance; +import io.quarkus.arc.InstanceHandle; +import io.quarkus.arc.impl.InstanceImpl; +import io.quarkus.arc.test.ArcTestContainer; + public class InjectableInstanceTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/instance/InvalidQualifierInstanceTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/instance/InvalidQualifierInstanceTest.java index 5896aa9f441d1..13faed49a5d70 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/instance/InvalidQualifierInstanceTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/instance/InvalidQualifierInstanceTest.java @@ -2,15 +2,17 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; -import io.quarkus.arc.Arc; -import io.quarkus.arc.test.ArcTestContainer; import javax.enterprise.inject.Instance; import javax.enterprise.util.AnnotationLiteral; import javax.inject.Inject; import javax.inject.Singleton; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.test.ArcTestContainer; + public class InvalidQualifierInstanceTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/instance/PriorityTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/instance/PriorityTest.java index 4b1f9cea93bb2..310db680932e9 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/instance/PriorityTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/instance/PriorityTest.java @@ -2,15 +2,17 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import io.quarkus.arc.Arc; -import io.quarkus.arc.InjectableInstance; -import io.quarkus.arc.Priority; -import io.quarkus.arc.test.ArcTestContainer; import javax.enterprise.inject.Produces; import javax.inject.Singleton; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.InjectableInstance; +import io.quarkus.arc.Priority; +import io.quarkus.arc.test.ArcTestContainer; + public class PriorityTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/instance/RawTypeInstanceTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/instance/RawTypeInstanceTest.java index 1706ac92adb64..d6923687706e7 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/instance/RawTypeInstanceTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/instance/RawTypeInstanceTest.java @@ -4,14 +4,16 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import io.quarkus.arc.test.ArcTestContainer; import javax.enterprise.inject.Instance; import javax.enterprise.inject.spi.DefinitionException; import javax.inject.Inject; import javax.inject.Singleton; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.test.ArcTestContainer; + public class RawTypeInstanceTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/instance/cacheget/InstanceWithCachingTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/instance/cacheget/InstanceWithCachingTest.java index e899ca24b3343..c719155148340 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/instance/cacheget/InstanceWithCachingTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/instance/cacheget/InstanceWithCachingTest.java @@ -3,21 +3,24 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -import io.quarkus.arc.Arc; -import io.quarkus.arc.InjectableInstance; -import io.quarkus.arc.WithCaching; -import io.quarkus.arc.test.ArcTestContainer; import java.util.UUID; import java.util.concurrent.atomic.AtomicBoolean; + import javax.annotation.PostConstruct; import javax.annotation.PreDestroy; import javax.enterprise.context.ApplicationScoped; import javax.enterprise.context.Dependent; import javax.enterprise.inject.Instance; import javax.inject.Inject; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.InjectableInstance; +import io.quarkus.arc.WithCaching; +import io.quarkus.arc.test.ArcTestContainer; + public class InstanceWithCachingTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/instance/destroy/InstanceDestroyTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/instance/destroy/InstanceDestroyTest.java index f3437c69bf64d..97ce20addbc88 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/instance/destroy/InstanceDestroyTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/instance/destroy/InstanceDestroyTest.java @@ -4,10 +4,9 @@ import static org.junit.jupiter.api.Assertions.assertNotEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -import io.quarkus.arc.Arc; -import io.quarkus.arc.test.ArcTestContainer; import java.util.UUID; import java.util.concurrent.atomic.AtomicBoolean; + import javax.annotation.PostConstruct; import javax.annotation.PreDestroy; import javax.enterprise.context.ApplicationScoped; @@ -15,9 +14,13 @@ import javax.enterprise.inject.Instance; import javax.inject.Inject; import javax.inject.Singleton; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.test.ArcTestContainer; + public class InstanceDestroyTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/instance/frombean/InstanceFromBeanTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/instance/frombean/InstanceFromBeanTest.java index 038c35215a00e..fe3f2566b9cb4 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/instance/frombean/InstanceFromBeanTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/instance/frombean/InstanceFromBeanTest.java @@ -2,15 +2,18 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import io.quarkus.arc.Arc; -import io.quarkus.arc.InjectableBean; -import io.quarkus.arc.test.ArcTestContainer; import java.util.UUID; + import javax.annotation.PostConstruct; import javax.inject.Singleton; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.InjectableBean; +import io.quarkus.arc.test.ArcTestContainer; + public class InstanceFromBeanTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/instance/illegal/TypeVariableInstanceInjectionPointTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/instance/illegal/TypeVariableInstanceInjectionPointTest.java index 1d961ca039e0c..b01573a6e3684 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/instance/illegal/TypeVariableInstanceInjectionPointTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/instance/illegal/TypeVariableInstanceInjectionPointTest.java @@ -4,14 +4,16 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import io.quarkus.arc.test.ArcTestContainer; import javax.enterprise.context.Dependent; import javax.enterprise.inject.Instance; import javax.enterprise.inject.spi.DefinitionException; import javax.inject.Inject; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.test.ArcTestContainer; + public class TypeVariableInstanceInjectionPointTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/instance/illegal/WildcardInstanceInjectionPointTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/instance/illegal/WildcardInstanceInjectionPointTest.java index 530082ece139a..4ead3ec2fb9b4 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/instance/illegal/WildcardInstanceInjectionPointTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/instance/illegal/WildcardInstanceInjectionPointTest.java @@ -4,14 +4,16 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import io.quarkus.arc.test.ArcTestContainer; import javax.enterprise.context.Dependent; import javax.enterprise.inject.Instance; import javax.enterprise.inject.spi.DefinitionException; import javax.inject.Inject; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.test.ArcTestContainer; + public class WildcardInstanceInjectionPointTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/Counter.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/Counter.java index 16bc65b40439d..3c7d11a47265d 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/Counter.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/Counter.java @@ -1,6 +1,7 @@ package io.quarkus.arc.test.interceptors; import java.util.concurrent.atomic.AtomicInteger; + import javax.inject.Singleton; @Singleton diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/KotlinInterceptorTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/KotlinInterceptorTest.java index 9fa390b4b8866..34bf64effb821 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/KotlinInterceptorTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/KotlinInterceptorTest.java @@ -5,21 +5,24 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; import static org.junit.jupiter.api.Assertions.assertThrows; -import io.quarkus.arc.Arc; -import io.quarkus.arc.test.ArcTestContainer; import java.io.IOException; import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; + import javax.annotation.Priority; import javax.enterprise.context.ApplicationScoped; import javax.interceptor.AroundInvoke; import javax.interceptor.Interceptor; import javax.interceptor.InterceptorBinding; import javax.interceptor.InvocationContext; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.test.ArcTestContainer; + public class KotlinInterceptorTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/Lifecycle.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/Lifecycle.java index b39f6c0b28803..12f8809470e5d 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/Lifecycle.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/Lifecycle.java @@ -7,6 +7,7 @@ import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; + import javax.interceptor.InterceptorBinding; @Target({ TYPE, METHOD }) diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/LifecycleInterceptor.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/LifecycleInterceptor.java index 911c2c3a34eb1..ac92863f1921a 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/LifecycleInterceptor.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/LifecycleInterceptor.java @@ -1,8 +1,8 @@ package io.quarkus.arc.test.interceptors; -import io.quarkus.arc.ArcInvocationContext; import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; + import javax.annotation.PostConstruct; import javax.annotation.PreDestroy; import javax.annotation.Priority; @@ -10,6 +10,8 @@ import javax.interceptor.Interceptor; import javax.interceptor.InvocationContext; +import io.quarkus.arc.ArcInvocationContext; + @Lifecycle @Priority(1) @Interceptor diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/Logging.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/Logging.java index 8781d432b7008..2b5ec678af827 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/Logging.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/Logging.java @@ -7,6 +7,7 @@ import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; + import javax.interceptor.InterceptorBinding; @Target({ TYPE, METHOD }) diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/LoggingInterceptor.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/LoggingInterceptor.java index 912ad15d80c0e..5a8678bed552c 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/LoggingInterceptor.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/LoggingInterceptor.java @@ -1,11 +1,13 @@ package io.quarkus.arc.test.interceptors; -import io.quarkus.arc.Priority; import java.util.concurrent.atomic.AtomicReference; + import javax.interceptor.AroundInvoke; import javax.interceptor.Interceptor; import javax.interceptor.InvocationContext; +import io.quarkus.arc.Priority; + @Logging @Priority(10) @Interceptor diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/Simple.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/Simple.java index a7e8659021681..c821dc26953a4 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/Simple.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/Simple.java @@ -7,6 +7,7 @@ import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; + import javax.interceptor.InterceptorBinding; @Target({ TYPE, METHOD }) diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/SimpleInterceptor.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/SimpleInterceptor.java index a58ebbf25bb91..3f0dc7e8766a1 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/SimpleInterceptor.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/SimpleInterceptor.java @@ -1,12 +1,13 @@ package io.quarkus.arc.test.interceptors; -import io.quarkus.arc.ArcInvocationContext; import javax.annotation.Priority; import javax.inject.Inject; import javax.interceptor.AroundInvoke; import javax.interceptor.Interceptor; import javax.interceptor.InvocationContext; +import io.quarkus.arc.ArcInvocationContext; + @Simple @Priority(1) @Interceptor diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/SimpleInterceptorTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/SimpleInterceptorTest.java index 1db761c96c516..13334ff188b20 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/SimpleInterceptorTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/SimpleInterceptorTest.java @@ -3,12 +3,13 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.RegisterExtension; + import io.quarkus.arc.Arc; import io.quarkus.arc.ArcContainer; import io.quarkus.arc.InstanceHandle; import io.quarkus.arc.test.ArcTestContainer; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.RegisterExtension; public class SimpleInterceptorTest { diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/arcInvContext/ArcContextInterceptor.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/arcInvContext/ArcContextInterceptor.java index 6e9d7fa17de9e..84b6fdaa4edee 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/arcInvContext/ArcContextInterceptor.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/arcInvContext/ArcContextInterceptor.java @@ -1,12 +1,14 @@ package io.quarkus.arc.test.interceptors.arcInvContext; -import io.quarkus.arc.ArcInvocationContext; import java.lang.annotation.Annotation; import java.util.Set; + import javax.annotation.Priority; import javax.interceptor.AroundInvoke; import javax.interceptor.Interceptor; +import io.quarkus.arc.ArcInvocationContext; + @Priority(1) @Interceptor @SomeBinding diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/arcInvContext/ArcContextInterceptorPrivate.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/arcInvContext/ArcContextInterceptorPrivate.java index 24c94d29c2eba..58461b193a866 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/arcInvContext/ArcContextInterceptorPrivate.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/arcInvContext/ArcContextInterceptorPrivate.java @@ -1,12 +1,14 @@ package io.quarkus.arc.test.interceptors.arcInvContext; -import io.quarkus.arc.ArcInvocationContext; import java.lang.annotation.Annotation; import java.util.Set; + import javax.annotation.Priority; import javax.interceptor.AroundInvoke; import javax.interceptor.Interceptor; +import io.quarkus.arc.ArcInvocationContext; + @Priority(2) @Interceptor @SomeBinding diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/arcInvContext/ArcContextLifecycleInterceptor.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/arcInvContext/ArcContextLifecycleInterceptor.java index bb278e511e2e7..2e2751c127851 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/arcInvContext/ArcContextLifecycleInterceptor.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/arcInvContext/ArcContextLifecycleInterceptor.java @@ -1,13 +1,15 @@ package io.quarkus.arc.test.interceptors.arcInvContext; -import io.quarkus.arc.ArcInvocationContext; import java.lang.annotation.Annotation; import java.util.Set; + import javax.annotation.PostConstruct; import javax.annotation.PreDestroy; import javax.annotation.Priority; import javax.interceptor.Interceptor; +import io.quarkus.arc.ArcInvocationContext; + @Priority(1) @Interceptor @SomeBinding diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/arcInvContext/ArcContextLifecycleInterceptorPrivate.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/arcInvContext/ArcContextLifecycleInterceptorPrivate.java index 2f4f7ab941bf3..64c67ac849d40 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/arcInvContext/ArcContextLifecycleInterceptorPrivate.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/arcInvContext/ArcContextLifecycleInterceptorPrivate.java @@ -1,13 +1,15 @@ package io.quarkus.arc.test.interceptors.arcInvContext; -import io.quarkus.arc.ArcInvocationContext; import java.lang.annotation.Annotation; import java.util.Set; + import javax.annotation.PostConstruct; import javax.annotation.PreDestroy; import javax.annotation.Priority; import javax.interceptor.Interceptor; +import io.quarkus.arc.ArcInvocationContext; + @Priority(2) @Interceptor @SomeBinding diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/arcInvContext/ArcInvocationContextTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/arcInvContext/ArcInvocationContextTest.java index a8a3255b81cfb..de6b277b88f3a 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/arcInvContext/ArcInvocationContextTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/arcInvContext/ArcInvocationContextTest.java @@ -1,12 +1,13 @@ package io.quarkus.arc.test.interceptors.arcInvContext; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.RegisterExtension; + import io.quarkus.arc.Arc; import io.quarkus.arc.ArcContainer; import io.quarkus.arc.InstanceHandle; import io.quarkus.arc.test.ArcTestContainer; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.RegisterExtension; /** * Tests that {@link io.quarkus.arc.ArcInvocationContext} can used as interceptor method parameter. diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/arcInvContext/SomeBinding.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/arcInvContext/SomeBinding.java index 830261145c289..ea9c665ce82a1 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/arcInvContext/SomeBinding.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/arcInvContext/SomeBinding.java @@ -7,6 +7,7 @@ import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; + import javax.interceptor.InterceptorBinding; @Target({ TYPE, METHOD }) diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/aroundconstruct/AroundConstructAppliedViaConstructorTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/aroundconstruct/AroundConstructAppliedViaConstructorTest.java index e9cd18112094b..c2741cdb809e4 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/aroundconstruct/AroundConstructAppliedViaConstructorTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/aroundconstruct/AroundConstructAppliedViaConstructorTest.java @@ -3,19 +3,22 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import io.quarkus.arc.Arc; -import io.quarkus.arc.test.ArcTestContainer; import java.util.concurrent.atomic.AtomicBoolean; + import javax.enterprise.context.Dependent; import javax.inject.Inject; import javax.inject.Singleton; import javax.interceptor.AroundConstruct; import javax.interceptor.Interceptor; import javax.interceptor.InvocationContext; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.test.ArcTestContainer; + public class AroundConstructAppliedViaConstructorTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/aroundconstruct/AroundConstructReturningObjectTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/aroundconstruct/AroundConstructReturningObjectTest.java index 469985c549de1..0d0409d87d06d 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/aroundconstruct/AroundConstructReturningObjectTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/aroundconstruct/AroundConstructReturningObjectTest.java @@ -3,16 +3,19 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import io.quarkus.arc.Arc; -import io.quarkus.arc.test.ArcTestContainer; import java.util.concurrent.atomic.AtomicBoolean; + import javax.inject.Singleton; import javax.interceptor.AroundConstruct; import javax.interceptor.Interceptor; import javax.interceptor.InvocationContext; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.test.ArcTestContainer; + public class AroundConstructReturningObjectTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/aroundconstruct/AroundConstructTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/aroundconstruct/AroundConstructTest.java index 7338bbddd6714..37a083de51c8f 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/aroundconstruct/AroundConstructTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/aroundconstruct/AroundConstructTest.java @@ -2,17 +2,20 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; -import io.quarkus.arc.Arc; -import io.quarkus.arc.test.ArcTestContainer; import java.util.concurrent.atomic.AtomicBoolean; + import javax.inject.Singleton; import javax.interceptor.AroundConstruct; import javax.interceptor.Interceptor; import javax.interceptor.InvocationContext; + import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.test.ArcTestContainer; + public class AroundConstructTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/aroundconstruct/MyOtherTransactional.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/aroundconstruct/MyOtherTransactional.java index 9166ee4e3139a..ef549a960f6e0 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/aroundconstruct/MyOtherTransactional.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/aroundconstruct/MyOtherTransactional.java @@ -6,6 +6,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; + import javax.interceptor.InterceptorBinding; @Target({ TYPE, CONSTRUCTOR }) diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/aroundconstruct/MyTransactional.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/aroundconstruct/MyTransactional.java index fdb228e36ff4a..f7a514caeb549 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/aroundconstruct/MyTransactional.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/aroundconstruct/MyTransactional.java @@ -6,6 +6,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; + import javax.interceptor.InterceptorBinding; @Target({ TYPE, CONSTRUCTOR }) diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindingdefaultvalue/BindingDefaultValueTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindingdefaultvalue/BindingDefaultValueTest.java index 04e98fc52a5a7..8b9e2eb705fe9 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindingdefaultvalue/BindingDefaultValueTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindingdefaultvalue/BindingDefaultValueTest.java @@ -2,17 +2,19 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import io.quarkus.arc.Arc; -import io.quarkus.arc.ArcContainer; -import io.quarkus.arc.test.ArcTestContainer; import javax.annotation.Priority; import javax.inject.Singleton; import javax.interceptor.AroundInvoke; import javax.interceptor.Interceptor; import javax.interceptor.InvocationContext; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.ArcContainer; +import io.quarkus.arc.test.ArcTestContainer; + public class BindingDefaultValueTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindingdefaultvalue/MyTransactional.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindingdefaultvalue/MyTransactional.java index 2b8ea3ee1734d..372ca48cea8e6 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindingdefaultvalue/MyTransactional.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindingdefaultvalue/MyTransactional.java @@ -7,6 +7,7 @@ import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; + import javax.interceptor.InterceptorBinding; @Target({ TYPE, METHOD }) diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/InvocationContextBindingsTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/InvocationContextBindingsTest.java index b1a2e70027016..0e4e0e86ff984 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/InvocationContextBindingsTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/InvocationContextBindingsTest.java @@ -2,19 +2,21 @@ import static org.junit.jupiter.api.Assertions.assertTrue; -import io.quarkus.arc.Arc; -import io.quarkus.arc.ArcContainer; -import io.quarkus.arc.ArcInvocationContext; -import io.quarkus.arc.test.ArcTestContainer; -import io.quarkus.arc.test.interceptors.Simple; import javax.annotation.Priority; import javax.inject.Singleton; import javax.interceptor.AroundInvoke; import javax.interceptor.Interceptor; import javax.interceptor.InvocationContext; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.ArcContainer; +import io.quarkus.arc.ArcInvocationContext; +import io.quarkus.arc.test.ArcTestContainer; +import io.quarkus.arc.test.interceptors.Simple; + public class InvocationContextBindingsTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/MyTransactional.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/MyTransactional.java index 010ba136bb2fb..a4badc71535c6 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/MyTransactional.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/MyTransactional.java @@ -7,6 +7,7 @@ import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; + import javax.enterprise.util.Nonbinding; import javax.interceptor.InterceptorBinding; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/multiple/BarBinding.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/multiple/BarBinding.java index a88cc7da20b30..5f80e77947f20 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/multiple/BarBinding.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/multiple/BarBinding.java @@ -7,6 +7,7 @@ import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; + import javax.interceptor.InterceptorBinding; @InterceptorBinding diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/multiple/FooBinding.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/multiple/FooBinding.java index 637a97006bb2a..57096cc8b362d 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/multiple/FooBinding.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/multiple/FooBinding.java @@ -7,6 +7,7 @@ import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; + import javax.interceptor.InterceptorBinding; @InterceptorBinding diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/multiple/MultipleBindingsTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/multiple/MultipleBindingsTest.java index 342731aaf3f4c..8e7c0f8115453 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/multiple/MultipleBindingsTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/multiple/MultipleBindingsTest.java @@ -2,11 +2,12 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import io.quarkus.arc.Arc; -import io.quarkus.arc.test.ArcTestContainer; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.test.ArcTestContainer; + /** * Tests behavior the case where there is more then one binding specified on an interceptor. */ diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/repeatable/InheritedRepeatableInterceptorBindingTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/repeatable/InheritedRepeatableInterceptorBindingTest.java index 0fe18aab02fef..21d72b07fa20d 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/repeatable/InheritedRepeatableInterceptorBindingTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/repeatable/InheritedRepeatableInterceptorBindingTest.java @@ -3,8 +3,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; -import io.quarkus.arc.Arc; -import io.quarkus.arc.test.ArcTestContainer; import java.lang.annotation.ElementType; import java.lang.annotation.Inherited; import java.lang.annotation.Repeatable; @@ -12,6 +10,7 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; import java.util.concurrent.atomic.AtomicBoolean; + import javax.annotation.PostConstruct; import javax.annotation.PreDestroy; import javax.enterprise.context.ApplicationScoped; @@ -20,10 +19,14 @@ import javax.interceptor.Interceptor; import javax.interceptor.InterceptorBinding; import javax.interceptor.InvocationContext; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.test.ArcTestContainer; + /** * Tests usage of inherited repeating interceptor binding. */ diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/repeatable/RepeatableInterceptorBindingTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/repeatable/RepeatableInterceptorBindingTest.java index 938f60e60f899..217d3df90fb50 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/repeatable/RepeatableInterceptorBindingTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/repeatable/RepeatableInterceptorBindingTest.java @@ -4,14 +4,13 @@ import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; -import io.quarkus.arc.Arc; -import io.quarkus.arc.test.ArcTestContainer; import java.lang.annotation.ElementType; import java.lang.annotation.Repeatable; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; import java.util.concurrent.atomic.AtomicBoolean; + import javax.annotation.PostConstruct; import javax.annotation.PreDestroy; import javax.enterprise.context.ApplicationScoped; @@ -20,10 +19,14 @@ import javax.interceptor.Interceptor; import javax.interceptor.InterceptorBinding; import javax.interceptor.InvocationContext; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.test.ArcTestContainer; + /** * Tests repeating interceptor binding usage. */ diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/repeatable/RepeatableInterceptorBindingWithNonbindingAttributeTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/repeatable/RepeatableInterceptorBindingWithNonbindingAttributeTest.java index 1659dc6b138b9..114e26d0a805c 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/repeatable/RepeatableInterceptorBindingWithNonbindingAttributeTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/repeatable/RepeatableInterceptorBindingWithNonbindingAttributeTest.java @@ -4,14 +4,13 @@ import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; -import io.quarkus.arc.Arc; -import io.quarkus.arc.test.ArcTestContainer; import java.lang.annotation.ElementType; import java.lang.annotation.Repeatable; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; import java.util.concurrent.atomic.AtomicBoolean; + import javax.annotation.PostConstruct; import javax.annotation.PreDestroy; import javax.enterprise.context.ApplicationScoped; @@ -21,10 +20,14 @@ import javax.interceptor.Interceptor; import javax.interceptor.InterceptorBinding; import javax.interceptor.InvocationContext; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.test.ArcTestContainer; + /** * Tests repeating interceptor binding usage, with a nonbinding annotation attribute. */ diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/transitive/AnotherAnnotation.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/transitive/AnotherAnnotation.java index 63fcca96167eb..8bc648e20e8df 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/transitive/AnotherAnnotation.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/transitive/AnotherAnnotation.java @@ -7,6 +7,7 @@ import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; + import javax.interceptor.InterceptorBinding; @Target({ TYPE, METHOD }) diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/transitive/CounterBinding.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/transitive/CounterBinding.java index 3a08e3e57a8d8..d99390a56fb01 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/transitive/CounterBinding.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/transitive/CounterBinding.java @@ -7,6 +7,7 @@ import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; + import javax.interceptor.InterceptorBinding; @Target({ TYPE, METHOD }) diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/transitive/SomeAnnotation.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/transitive/SomeAnnotation.java index e58413db45304..d357426257f56 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/transitive/SomeAnnotation.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/transitive/SomeAnnotation.java @@ -7,6 +7,7 @@ import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; + import javax.interceptor.InterceptorBinding; /** diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/transitive/TransitiveInterceptorBindingTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/transitive/TransitiveInterceptorBindingTest.java index aa8184fa5c75c..134a5b45e3bff 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/transitive/TransitiveInterceptorBindingTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/transitive/TransitiveInterceptorBindingTest.java @@ -1,11 +1,12 @@ package io.quarkus.arc.test.interceptors.bindings.transitive; -import io.quarkus.arc.Arc; -import io.quarkus.arc.test.ArcTestContainer; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.test.ArcTestContainer; + public class TransitiveInterceptorBindingTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/transitive/with/transformer/MuchCoolerBinding.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/transitive/with/transformer/MuchCoolerBinding.java index 5dd1d2a6b3c96..ab1de49529aa8 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/transitive/with/transformer/MuchCoolerBinding.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/transitive/with/transformer/MuchCoolerBinding.java @@ -7,6 +7,7 @@ import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; + import javax.interceptor.InterceptorBinding; @Target({ TYPE, METHOD }) diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/transitive/with/transformer/PlainBinding.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/transitive/with/transformer/PlainBinding.java index 9054f57119aee..404f039d9f4d4 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/transitive/with/transformer/PlainBinding.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/transitive/with/transformer/PlainBinding.java @@ -7,6 +7,7 @@ import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; + import javax.interceptor.InterceptorBinding; @Target({ TYPE, METHOD }) diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/transitive/with/transformer/TransitiveInterceptionWithTransformerApplicationTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/transitive/with/transformer/TransitiveInterceptionWithTransformerApplicationTest.java index 729792c0bc677..a213cad67deaf 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/transitive/with/transformer/TransitiveInterceptionWithTransformerApplicationTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/transitive/with/transformer/TransitiveInterceptionWithTransformerApplicationTest.java @@ -1,13 +1,14 @@ package io.quarkus.arc.test.interceptors.bindings.transitive.with.transformer; -import io.quarkus.arc.Arc; -import io.quarkus.arc.processor.AnnotationsTransformer; -import io.quarkus.arc.test.ArcTestContainer; import org.jboss.jandex.AnnotationTarget; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.processor.AnnotationsTransformer; +import io.quarkus.arc.test.ArcTestContainer; + /** * Tests transitive interceptor bindings when annotation transformers were applied */ diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bridge/BridgeMethodInterceptionTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bridge/BridgeMethodInterceptionTest.java index d9c9747894b4a..4d893c1ca96ff 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bridge/BridgeMethodInterceptionTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bridge/BridgeMethodInterceptionTest.java @@ -3,15 +3,17 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; -import io.quarkus.arc.Arc; -import io.quarkus.arc.ArcContainer; -import io.quarkus.arc.test.ArcTestContainer; -import io.quarkus.arc.test.interceptors.Counter; import javax.enterprise.context.ApplicationScoped; import javax.inject.Singleton; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.ArcContainer; +import io.quarkus.arc.test.ArcTestContainer; +import io.quarkus.arc.test.interceptors.Counter; + public class BridgeMethodInterceptionTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bridge/ExampleResource.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bridge/ExampleResource.java index 4c0c4236e4960..9a70d1a5f4a14 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bridge/ExampleResource.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bridge/ExampleResource.java @@ -1,6 +1,7 @@ package io.quarkus.arc.test.interceptors.bridge; import java.util.List; + import javax.inject.Singleton; @Singleton diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bridge/Simple.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bridge/Simple.java index bb90455fc115e..f38aa216c8075 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bridge/Simple.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bridge/Simple.java @@ -7,6 +7,7 @@ import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; + import javax.interceptor.InterceptorBinding; @Target({ TYPE, METHOD }) diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bridge/SimpleInterceptor.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bridge/SimpleInterceptor.java index 992d56b961327..e18ae3009f141 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bridge/SimpleInterceptor.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bridge/SimpleInterceptor.java @@ -1,12 +1,13 @@ package io.quarkus.arc.test.interceptors.bridge; -import io.quarkus.arc.test.interceptors.Counter; import javax.annotation.Priority; import javax.inject.Inject; import javax.interceptor.AroundInvoke; import javax.interceptor.Interceptor; import javax.interceptor.InvocationContext; +import io.quarkus.arc.test.interceptors.Counter; + @Simple @Priority(1) @Interceptor diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/complex/MultipleInterceptionTypesTogetherTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/complex/MultipleInterceptionTypesTogetherTest.java index 2c6dabf1a0ffa..4cd98a7156c5a 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/complex/MultipleInterceptionTypesTogetherTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/complex/MultipleInterceptionTypesTogetherTest.java @@ -1,12 +1,13 @@ package io.quarkus.arc.test.interceptors.complex; -import io.quarkus.arc.Arc; -import io.quarkus.arc.InstanceHandle; -import io.quarkus.arc.test.ArcTestContainer; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.InstanceHandle; +import io.quarkus.arc.test.ArcTestContainer; + public class MultipleInterceptionTypesTogetherTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/complex/MyBinding.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/complex/MyBinding.java index 21b0676c74630..23cb0b6f5114d 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/complex/MyBinding.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/complex/MyBinding.java @@ -7,6 +7,7 @@ import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; + import javax.interceptor.InterceptorBinding; @Target({ TYPE, METHOD }) diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/complex/MyInterceptor.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/complex/MyInterceptor.java index c61548c310a04..146799133a0a8 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/complex/MyInterceptor.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/complex/MyInterceptor.java @@ -1,6 +1,7 @@ package io.quarkus.arc.test.interceptors.complex; import java.util.concurrent.atomic.AtomicBoolean; + import javax.annotation.PostConstruct; import javax.annotation.PreDestroy; import javax.annotation.Priority; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/complex/SomeBean.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/complex/SomeBean.java index 4de05da30ffb9..ab25290da36b7 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/complex/SomeBean.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/complex/SomeBean.java @@ -1,6 +1,7 @@ package io.quarkus.arc.test.interceptors.complex; import java.util.concurrent.atomic.AtomicBoolean; + import javax.annotation.PostConstruct; import javax.annotation.PreDestroy; import javax.inject.Singleton; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/constructor/SubclassConstructorGuardTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/constructor/SubclassConstructorGuardTest.java index 6cc69352a3200..be86db3ccf54d 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/constructor/SubclassConstructorGuardTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/constructor/SubclassConstructorGuardTest.java @@ -2,18 +2,21 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import io.quarkus.arc.Arc; -import io.quarkus.arc.test.ArcTestContainer; -import io.quarkus.arc.test.interceptors.Simple; import java.io.IOException; + import javax.annotation.Priority; import javax.inject.Singleton; import javax.interceptor.AroundInvoke; import javax.interceptor.Interceptor; import javax.interceptor.InvocationContext; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.test.ArcTestContainer; +import io.quarkus.arc.test.interceptors.Simple; + public class SubclassConstructorGuardTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/context/AsyncContinuationTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/context/AsyncContinuationTest.java index 5f5e3fd959dfb..96b732c598b71 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/context/AsyncContinuationTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/context/AsyncContinuationTest.java @@ -3,24 +3,27 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -import io.quarkus.arc.Arc; -import io.quarkus.arc.test.ArcTestContainer; -import io.quarkus.arc.test.interceptors.Simple; import java.io.IOException; import java.util.concurrent.CountDownLatch; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; + import javax.annotation.Priority; import javax.inject.Singleton; import javax.interceptor.AroundInvoke; import javax.interceptor.Interceptor; import javax.interceptor.InvocationContext; + import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.test.ArcTestContainer; +import io.quarkus.arc.test.interceptors.Simple; + public class AsyncContinuationTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/context/ContextDataTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/context/ContextDataTest.java index 35231502036e9..09167a3005a37 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/context/ContextDataTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/context/ContextDataTest.java @@ -2,18 +2,21 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import io.quarkus.arc.Arc; -import io.quarkus.arc.test.ArcTestContainer; -import io.quarkus.arc.test.interceptors.Simple; import java.io.IOException; + import javax.annotation.Priority; import javax.inject.Singleton; import javax.interceptor.AroundInvoke; import javax.interceptor.Interceptor; import javax.interceptor.InvocationContext; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.test.ArcTestContainer; +import io.quarkus.arc.test.interceptors.Simple; + public class ContextDataTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/defaultmethod/ABinding.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/defaultmethod/ABinding.java index 7935a1b82826b..010c185973da5 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/defaultmethod/ABinding.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/defaultmethod/ABinding.java @@ -7,6 +7,7 @@ import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; + import javax.interceptor.InterceptorBinding; @Target({ TYPE, METHOD }) diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/defaultmethod/DefaultMethodInterceptorTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/defaultmethod/DefaultMethodInterceptorTest.java index 4bd08a1acd39f..9d1c361e27112 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/defaultmethod/DefaultMethodInterceptorTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/defaultmethod/DefaultMethodInterceptorTest.java @@ -1,12 +1,13 @@ package io.quarkus.arc.test.interceptors.defaultmethod; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.RegisterExtension; + import io.quarkus.arc.Arc; import io.quarkus.arc.ArcContainer; import io.quarkus.arc.InstanceHandle; import io.quarkus.arc.test.ArcTestContainer; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.RegisterExtension; public class DefaultMethodInterceptorTest { diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/defaultmethod/NextBinding.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/defaultmethod/NextBinding.java index 565f74bb31012..012c9a1dc6e11 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/defaultmethod/NextBinding.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/defaultmethod/NextBinding.java @@ -7,6 +7,7 @@ import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; + import javax.interceptor.InterceptorBinding; @Target({ TYPE, METHOD }) diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/exceptionhandling/ExceptionHandlingInterceptorBinding.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/exceptionhandling/ExceptionHandlingInterceptorBinding.java index 8c1d1be754658..857126aed789f 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/exceptionhandling/ExceptionHandlingInterceptorBinding.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/exceptionhandling/ExceptionHandlingInterceptorBinding.java @@ -7,6 +7,7 @@ import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; + import javax.interceptor.InterceptorBinding; @Target({ TYPE, METHOD }) diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/exceptionhandling/InterceptorExceptionHandlingTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/exceptionhandling/InterceptorExceptionHandlingTest.java index d0f8ae76eab15..143b76fa0f7fb 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/exceptionhandling/InterceptorExceptionHandlingTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/exceptionhandling/InterceptorExceptionHandlingTest.java @@ -5,11 +5,12 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.RegisterExtension; + import io.quarkus.arc.Arc; import io.quarkus.arc.Subclass; import io.quarkus.arc.test.ArcTestContainer; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.RegisterExtension; public class InterceptorExceptionHandlingTest { diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/finalmethod/FinalInterceptedMethodTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/finalmethod/FinalInterceptedMethodTest.java index 350c67aa36401..3e6f9f8d160a1 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/finalmethod/FinalInterceptedMethodTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/finalmethod/FinalInterceptedMethodTest.java @@ -3,17 +3,19 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import io.quarkus.arc.test.ArcTestContainer; -import io.quarkus.arc.test.interceptors.Simple; import javax.annotation.Priority; import javax.enterprise.inject.spi.DeploymentException; import javax.inject.Singleton; import javax.interceptor.AroundInvoke; import javax.interceptor.Interceptor; import javax.interceptor.InvocationContext; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.test.ArcTestContainer; +import io.quarkus.arc.test.interceptors.Simple; + public class FinalInterceptedMethodTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/finalmethod/FinalNonInterceptedMethodTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/finalmethod/FinalNonInterceptedMethodTest.java index a4ce410c69cc7..799739fb29310 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/finalmethod/FinalNonInterceptedMethodTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/finalmethod/FinalNonInterceptedMethodTest.java @@ -2,18 +2,20 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import io.quarkus.arc.Arc; -import io.quarkus.arc.test.ArcTestContainer; -import io.quarkus.arc.test.interceptors.Simple; import javax.annotation.PostConstruct; import javax.annotation.Priority; import javax.inject.Singleton; import javax.interceptor.AroundInvoke; import javax.interceptor.Interceptor; import javax.interceptor.InvocationContext; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.test.ArcTestContainer; +import io.quarkus.arc.test.interceptors.Simple; + public class FinalNonInterceptedMethodTest { static final String VAL = "ping"; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/inheritance/InterceptorSuperclassTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/inheritance/InterceptorSuperclassTest.java index 6088b8a5d4095..e77f88a535050 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/inheritance/InterceptorSuperclassTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/inheritance/InterceptorSuperclassTest.java @@ -2,12 +2,14 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import io.quarkus.arc.Arc; -import io.quarkus.arc.test.ArcTestContainer; import javax.enterprise.context.ApplicationScoped; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.test.ArcTestContainer; + /** * "Around-invoke methods may be defined on interceptor classes and/or the target class and/or super- * classes of the target class or the interceptor classes. However, only one around-invoke method may be diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/inheritance/One.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/inheritance/One.java index 07908f4a77a7d..4ba511186fe49 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/inheritance/One.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/inheritance/One.java @@ -7,6 +7,7 @@ import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; + import javax.interceptor.InterceptorBinding; @Target({ TYPE, METHOD }) diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/inheritance/Two.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/inheritance/Two.java index c052c2d11e067..f5eb942d138b0 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/inheritance/Two.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/inheritance/Two.java @@ -7,6 +7,7 @@ import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; + import javax.interceptor.InterceptorBinding; @Target({ TYPE, METHOD }) diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/intercepted/InterceptedBeanInjectionTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/intercepted/InterceptedBeanInjectionTest.java index ca5c43a3b18b7..0cd7c1751bd14 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/intercepted/InterceptedBeanInjectionTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/intercepted/InterceptedBeanInjectionTest.java @@ -2,15 +2,17 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import io.quarkus.arc.Arc; -import io.quarkus.arc.test.ArcTestContainer; import javax.enterprise.context.ApplicationScoped; import javax.enterprise.context.Dependent; import javax.enterprise.inject.spi.Bean; import javax.inject.Inject; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.test.ArcTestContainer; + public class InterceptedBeanInjectionTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/intercepted/Simple.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/intercepted/Simple.java index 18be9b3e63428..f611d304c081b 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/intercepted/Simple.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/intercepted/Simple.java @@ -7,6 +7,7 @@ import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; + import javax.interceptor.InterceptorBinding; @Target({ TYPE, METHOD }) diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/methodargs/CustomExecutor.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/methodargs/CustomExecutor.java index d98f5c5aeb5e7..9a0462fbd3ecf 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/methodargs/CustomExecutor.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/methodargs/CustomExecutor.java @@ -1,8 +1,9 @@ package io.quarkus.arc.test.interceptors.methodargs; -import io.quarkus.arc.test.interceptors.methodargs.base.BaseExecutor; import javax.inject.Singleton; +import io.quarkus.arc.test.interceptors.methodargs.base.BaseExecutor; + @Singleton @Simple public class CustomExecutor extends BaseExecutor { diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/methodargs/ExampleResource.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/methodargs/ExampleResource.java index 9310e2c6d5d32..fe34a773c7aec 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/methodargs/ExampleResource.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/methodargs/ExampleResource.java @@ -1,6 +1,7 @@ package io.quarkus.arc.test.interceptors.methodargs; import java.util.List; + import javax.inject.Singleton; @Singleton diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/methodargs/MethodArgsInterceptionTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/methodargs/MethodArgsInterceptionTest.java index 6fc27dfed31c7..8e8dddd15f6ba 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/methodargs/MethodArgsInterceptionTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/methodargs/MethodArgsInterceptionTest.java @@ -2,13 +2,15 @@ import static org.junit.jupiter.api.Assertions.assertEquals; +import java.util.List; + +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.RegisterExtension; + import io.quarkus.arc.Arc; import io.quarkus.arc.ArcContainer; import io.quarkus.arc.test.ArcTestContainer; import io.quarkus.arc.test.interceptors.Counter; -import java.util.List; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.RegisterExtension; public class MethodArgsInterceptionTest { diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/methodargs/Simple.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/methodargs/Simple.java index 04878c01a10a9..ef212e7c6703d 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/methodargs/Simple.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/methodargs/Simple.java @@ -7,6 +7,7 @@ import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; + import javax.interceptor.InterceptorBinding; @Target({ TYPE, METHOD }) diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/methodargs/SimpleInterceptor.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/methodargs/SimpleInterceptor.java index d0c3d0eed7f14..431c8a5c364b4 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/methodargs/SimpleInterceptor.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/methodargs/SimpleInterceptor.java @@ -1,12 +1,13 @@ package io.quarkus.arc.test.interceptors.methodargs; -import io.quarkus.arc.test.interceptors.Counter; import javax.annotation.Priority; import javax.inject.Inject; import javax.interceptor.AroundInvoke; import javax.interceptor.Interceptor; import javax.interceptor.InvocationContext; +import io.quarkus.arc.test.interceptors.Counter; + @Simple @Priority(1) @Interceptor diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/mixed/BusinessLifecycleInterceptorTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/mixed/BusinessLifecycleInterceptorTest.java index 18ff3718cfeb5..ca94707516b71 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/mixed/BusinessLifecycleInterceptorTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/mixed/BusinessLifecycleInterceptorTest.java @@ -2,10 +2,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import io.quarkus.arc.Arc; -import io.quarkus.arc.InstanceHandle; -import io.quarkus.arc.test.ArcTestContainer; import java.util.concurrent.atomic.AtomicInteger; + import javax.annotation.PostConstruct; import javax.annotation.PreDestroy; import javax.annotation.Priority; @@ -13,9 +11,14 @@ import javax.interceptor.AroundInvoke; import javax.interceptor.Interceptor; import javax.interceptor.InvocationContext; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.InstanceHandle; +import io.quarkus.arc.test.ArcTestContainer; + public class BusinessLifecycleInterceptorTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/mixed/MyTransactional.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/mixed/MyTransactional.java index 5533bf2ad6fb9..d5db845a4bc19 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/mixed/MyTransactional.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/mixed/MyTransactional.java @@ -6,6 +6,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; + import javax.interceptor.InterceptorBinding; @Target({ TYPE, CONSTRUCTOR }) diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/no/priority/InterceptorWithNoPriorityTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/no/priority/InterceptorWithNoPriorityTest.java index 4572e8092db6c..3978e91dcdbdf 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/no/priority/InterceptorWithNoPriorityTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/no/priority/InterceptorWithNoPriorityTest.java @@ -3,11 +3,12 @@ import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; -import io.quarkus.arc.Arc; -import io.quarkus.arc.test.ArcTestContainer; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.test.ArcTestContainer; + /** * Tests that interceptor without @Priority will still be picked up and working with some default priority assigned. */ diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/no/priority/Simple.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/no/priority/Simple.java index 240a7d8cf5dee..ecd221e13f004 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/no/priority/Simple.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/no/priority/Simple.java @@ -7,6 +7,7 @@ import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; + import javax.interceptor.InterceptorBinding; @Target({ TYPE, METHOD }) diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/noclassinterceptors/ClassLevel.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/noclassinterceptors/ClassLevel.java index c098c776878fb..2e6ce3c65fe62 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/noclassinterceptors/ClassLevel.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/noclassinterceptors/ClassLevel.java @@ -8,6 +8,7 @@ import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; + import javax.interceptor.InterceptorBinding; @Target({ TYPE, METHOD, CONSTRUCTOR }) diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/noclassinterceptors/InheritedClassLevel.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/noclassinterceptors/InheritedClassLevel.java index 229c3eb01e52b..f48e7e749e329 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/noclassinterceptors/InheritedClassLevel.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/noclassinterceptors/InheritedClassLevel.java @@ -8,6 +8,7 @@ import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; + import javax.interceptor.InterceptorBinding; @Target({ TYPE, METHOD, CONSTRUCTOR }) diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/noclassinterceptors/InterceptedBean.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/noclassinterceptors/InterceptedBean.java index 8dcfc970bb827..6fea3881b9b82 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/noclassinterceptors/InterceptedBean.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/noclassinterceptors/InterceptedBean.java @@ -1,8 +1,9 @@ package io.quarkus.arc.test.interceptors.noclassinterceptors; -import io.quarkus.arc.NoClassInterceptors; import javax.enterprise.context.ApplicationScoped; +import io.quarkus.arc.NoClassInterceptors; + @ApplicationScoped @ClassLevel public class InterceptedBean extends SuperclassWithInterceptor implements Superinterface { diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/noclassinterceptors/MethodLevel.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/noclassinterceptors/MethodLevel.java index 8fc228bb8827e..af6e41314edb0 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/noclassinterceptors/MethodLevel.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/noclassinterceptors/MethodLevel.java @@ -8,6 +8,7 @@ import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; + import javax.interceptor.InterceptorBinding; @Target({ TYPE, METHOD, CONSTRUCTOR }) diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/noclassinterceptors/NoClassInterceptorsTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/noclassinterceptors/NoClassInterceptorsTest.java index 672a6e593578c..37a67da652577 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/noclassinterceptors/NoClassInterceptorsTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/noclassinterceptors/NoClassInterceptorsTest.java @@ -2,11 +2,12 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import io.quarkus.arc.Arc; -import io.quarkus.arc.test.ArcTestContainer; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.test.ArcTestContainer; + /** * Tests that method annotated @NoClassInterceptors will not be intercepted by class-level interceptors. */ diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/nonpublicparams/NonPublicParametersTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/nonpublicparams/NonPublicParametersTest.java index bf9ab47450255..907a91a29adcb 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/nonpublicparams/NonPublicParametersTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/nonpublicparams/NonPublicParametersTest.java @@ -2,19 +2,21 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import io.quarkus.arc.Arc; -import io.quarkus.arc.ArcContainer; -import io.quarkus.arc.test.ArcTestContainer; -import io.quarkus.arc.test.interceptors.Simple; -import io.quarkus.arc.test.interceptors.nonpublicparams.charlie.Charlie; import javax.annotation.Priority; import javax.inject.Singleton; import javax.interceptor.AroundInvoke; import javax.interceptor.Interceptor; import javax.interceptor.InvocationContext; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.ArcContainer; +import io.quarkus.arc.test.ArcTestContainer; +import io.quarkus.arc.test.interceptors.Simple; +import io.quarkus.arc.test.interceptors.nonpublicparams.charlie.Charlie; + public class NonPublicParametersTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/parameters/ParamInterceptorTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/parameters/ParamInterceptorTest.java index 67d18576b286c..d27867c112d53 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/parameters/ParamInterceptorTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/parameters/ParamInterceptorTest.java @@ -4,12 +4,13 @@ import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertThrows; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.RegisterExtension; + import io.quarkus.arc.Arc; import io.quarkus.arc.ArcContainer; import io.quarkus.arc.InstanceHandle; import io.quarkus.arc.test.ArcTestContainer; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.RegisterExtension; public class ParamInterceptorTest { diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/parameters/Simple.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/parameters/Simple.java index 9695156d2156d..d057f970f41e0 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/parameters/Simple.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/parameters/Simple.java @@ -7,6 +7,7 @@ import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; + import javax.interceptor.InterceptorBinding; @Target({ TYPE, METHOD }) diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/postConstruct/inherited/PackagePrivatePostConstructInheritanceTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/postConstruct/inherited/PackagePrivatePostConstructInheritanceTest.java index 4aa01c1facce7..2b7b98840924f 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/postConstruct/inherited/PackagePrivatePostConstructInheritanceTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/postConstruct/inherited/PackagePrivatePostConstructInheritanceTest.java @@ -1,13 +1,14 @@ package io.quarkus.arc.test.interceptors.postConstruct.inherited; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.RegisterExtension; + import io.quarkus.arc.Arc; import io.quarkus.arc.ArcContainer; import io.quarkus.arc.InstanceHandle; import io.quarkus.arc.test.ArcTestContainer; import io.quarkus.arc.test.interceptors.postConstruct.inherited.subpackage.AlternativeBean; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.RegisterExtension; public class PackagePrivatePostConstructInheritanceTest { diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/postConstruct/inherited/subpackage/AlternativeBean.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/postConstruct/inherited/subpackage/AlternativeBean.java index d1e75ba33f897..3c6403ade99d7 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/postConstruct/inherited/subpackage/AlternativeBean.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/postConstruct/inherited/subpackage/AlternativeBean.java @@ -1,10 +1,11 @@ package io.quarkus.arc.test.interceptors.postConstruct.inherited.subpackage; -import io.quarkus.arc.test.interceptors.postConstruct.inherited.OriginalBean; import javax.annotation.Priority; import javax.enterprise.context.ApplicationScoped; import javax.enterprise.inject.Alternative; +import io.quarkus.arc.test.interceptors.postConstruct.inherited.OriginalBean; + @Alternative @ApplicationScoped @Priority(1) diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/privatemethod/PrivateInterceptorMethodTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/privatemethod/PrivateInterceptorMethodTest.java index cc3040aa66f92..984b482216912 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/privatemethod/PrivateInterceptorMethodTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/privatemethod/PrivateInterceptorMethodTest.java @@ -2,18 +2,20 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import io.quarkus.arc.Arc; -import io.quarkus.arc.ArcContainer; -import io.quarkus.arc.test.ArcTestContainer; -import io.quarkus.arc.test.interceptors.Simple; import javax.annotation.Priority; import javax.inject.Singleton; import javax.interceptor.AroundInvoke; import javax.interceptor.Interceptor; import javax.interceptor.InvocationContext; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.ArcContainer; +import io.quarkus.arc.test.ArcTestContainer; +import io.quarkus.arc.test.interceptors.Simple; + public class PrivateInterceptorMethodTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/selfinvocation/Nok.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/selfinvocation/Nok.java index 9d4f59fc6a6d7..6efdc252b96dd 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/selfinvocation/Nok.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/selfinvocation/Nok.java @@ -7,6 +7,7 @@ import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; + import javax.interceptor.InterceptorBinding; @Target({ TYPE, METHOD }) diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/selfinvocation/Ok.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/selfinvocation/Ok.java index ca54ff750ff58..de4f94d5e5568 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/selfinvocation/Ok.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/selfinvocation/Ok.java @@ -7,6 +7,7 @@ import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; + import javax.interceptor.InterceptorBinding; @Target({ TYPE, METHOD }) diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/selfinvocation/SelfInvocationTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/selfinvocation/SelfInvocationTest.java index 666d86f9d3949..02704c633c9e6 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/selfinvocation/SelfInvocationTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/selfinvocation/SelfInvocationTest.java @@ -2,13 +2,15 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import io.quarkus.arc.Arc; -import io.quarkus.arc.test.ArcTestContainer; import javax.enterprise.context.ApplicationScoped; import javax.enterprise.context.Dependent; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.test.ArcTestContainer; + public class SelfInvocationTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/subclasses/InterceptorSubclassesAreSharedTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/subclasses/InterceptorSubclassesAreSharedTest.java index d5070ba17c281..18e2862dc7521 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/subclasses/InterceptorSubclassesAreSharedTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/subclasses/InterceptorSubclassesAreSharedTest.java @@ -2,13 +2,15 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import io.quarkus.arc.Arc; -import io.quarkus.arc.ArcContainer; -import io.quarkus.arc.test.ArcTestContainer; import java.io.IOException; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.ArcContainer; +import io.quarkus.arc.test.ArcTestContainer; + /** * Tests that interceptor instances are shared per bean. * That means that bean having two methods intercepted by one interceptor will only hold reference to one interceptor diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/subclasses/MyBinding.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/subclasses/MyBinding.java index 57a802a557635..b597edce21385 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/subclasses/MyBinding.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/subclasses/MyBinding.java @@ -7,6 +7,7 @@ import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; + import javax.interceptor.InterceptorBinding; @Target({ TYPE, METHOD }) diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/subclasses/SomeBean.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/subclasses/SomeBean.java index 2cedd416a40ac..dc07fcc975d71 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/subclasses/SomeBean.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/subclasses/SomeBean.java @@ -1,6 +1,7 @@ package io.quarkus.arc.test.interceptors.subclasses; import java.io.IOException; + import javax.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/lock/LockInterceptorTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/lock/LockInterceptorTest.java index 5aa92ae068025..e248dc7396a7a 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/lock/LockInterceptorTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/lock/LockInterceptorTest.java @@ -4,11 +4,6 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; -import io.quarkus.arc.Arc; -import io.quarkus.arc.Lock; -import io.quarkus.arc.Lock.Type; -import io.quarkus.arc.impl.LockInterceptor; -import io.quarkus.arc.test.ArcTestContainer; import java.util.ArrayList; import java.util.List; import java.util.concurrent.CountDownLatch; @@ -19,14 +14,22 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.AtomicInteger; + import javax.enterprise.context.ApplicationScoped; import javax.enterprise.context.Dependent; import javax.inject.Singleton; + import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.Lock; +import io.quarkus.arc.Lock.Type; +import io.quarkus.arc.impl.LockInterceptor; +import io.quarkus.arc.test.ArcTestContainer; + public class LockInterceptorTest { private static int POOL_SIZE = 4; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/lock/LockWaitTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/lock/LockWaitTest.java index 37e88b9cd46fd..b5824f04e7177 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/lock/LockWaitTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/lock/LockWaitTest.java @@ -5,11 +5,6 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; -import io.quarkus.arc.Arc; -import io.quarkus.arc.Lock; -import io.quarkus.arc.LockException; -import io.quarkus.arc.impl.LockInterceptor; -import io.quarkus.arc.test.ArcTestContainer; import java.util.concurrent.CountDownLatch; import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutorService; @@ -17,10 +12,18 @@ import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; + import javax.enterprise.context.ApplicationScoped; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.Lock; +import io.quarkus.arc.LockException; +import io.quarkus.arc.impl.LockInterceptor; +import io.quarkus.arc.test.ArcTestContainer; + public class LockWaitTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/metadata/BeanMetadataTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/metadata/BeanMetadataTest.java index 696505ad0751a..427a3de2aabcd 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/metadata/BeanMetadataTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/metadata/BeanMetadataTest.java @@ -4,13 +4,15 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import io.quarkus.arc.Arc; -import io.quarkus.arc.ArcContainer; -import io.quarkus.arc.test.ArcTestContainer; import javax.enterprise.inject.spi.Bean; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.ArcContainer; +import io.quarkus.arc.test.ArcTestContainer; + public class BeanMetadataTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/metadata/InjectionPointMetadataTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/metadata/InjectionPointMetadataTest.java index 342da8cfde554..1012f36b0612b 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/metadata/InjectionPointMetadataTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/metadata/InjectionPointMetadataTest.java @@ -5,14 +5,12 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import io.quarkus.arc.Arc; -import io.quarkus.arc.ArcContainer; -import io.quarkus.arc.test.ArcTestContainer; import java.lang.annotation.Annotation; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.util.Set; import java.util.concurrent.atomic.AtomicReference; + import javax.enterprise.context.Dependent; import javax.enterprise.event.Observes; import javax.enterprise.inject.Default; @@ -26,10 +24,15 @@ import javax.enterprise.util.TypeLiteral; import javax.inject.Inject; import javax.inject.Singleton; + import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.ArcContainer; +import io.quarkus.arc.test.ArcTestContainer; + public class InjectionPointMetadataTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/name/AmbiguousNameTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/name/AmbiguousNameTest.java index f423846a58d2e..e65e50366386d 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/name/AmbiguousNameTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/name/AmbiguousNameTest.java @@ -3,14 +3,16 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import io.quarkus.arc.test.ArcTestContainer; import javax.enterprise.context.Dependent; import javax.enterprise.inject.spi.DeploymentException; import javax.inject.Named; import javax.inject.Singleton; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.test.ArcTestContainer; + public class AmbiguousNameTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/name/NameResolutionTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/name/NameResolutionTest.java index 78ae066230d06..f6097778775ab 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/name/NameResolutionTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/name/NameResolutionTest.java @@ -3,16 +3,18 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -import io.quarkus.arc.Arc; -import io.quarkus.arc.test.ArcTestContainer; import javax.enterprise.context.Dependent; import javax.enterprise.inject.Produces; import javax.enterprise.inject.literal.NamedLiteral; import javax.inject.Named; import javax.inject.Singleton; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.test.ArcTestContainer; + public class NameResolutionTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/ParameterizedPayloadTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/ParameterizedPayloadTest.java index eece91744985d..526b23a7fa7ce 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/ParameterizedPayloadTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/ParameterizedPayloadTest.java @@ -3,21 +3,24 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; -import io.quarkus.arc.Arc; -import io.quarkus.arc.test.ArcTestContainer; import java.util.ArrayList; import java.util.Collection; import java.util.List; import java.util.concurrent.atomic.AtomicReference; + import javax.annotation.PostConstruct; import javax.enterprise.context.Dependent; import javax.enterprise.event.Event; import javax.enterprise.event.Observes; import javax.inject.Inject; import javax.inject.Singleton; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.test.ArcTestContainer; + public class ParameterizedPayloadTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/RuntimeClassTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/RuntimeClassTest.java index ecdfd28da4dd2..d85238bfa1c36 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/RuntimeClassTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/RuntimeClassTest.java @@ -2,19 +2,22 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import io.quarkus.arc.Arc; -import io.quarkus.arc.test.ArcTestContainer; import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; + import javax.annotation.PostConstruct; import javax.enterprise.context.Dependent; import javax.enterprise.event.Event; import javax.enterprise.event.Observes; import javax.inject.Inject; import javax.inject.Singleton; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.test.ArcTestContainer; + public class RuntimeClassTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/SimpleObserverTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/SimpleObserverTest.java index 52ec3e0ade544..7c5abc7c7f5e2 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/SimpleObserverTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/SimpleObserverTest.java @@ -2,19 +2,22 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import io.quarkus.arc.Arc; -import io.quarkus.arc.test.ArcTestContainer; import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; + import javax.annotation.PostConstruct; import javax.enterprise.context.Dependent; import javax.enterprise.event.Event; import javax.enterprise.event.Observes; import javax.inject.Inject; import javax.inject.Singleton; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.test.ArcTestContainer; + public class SimpleObserverTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/async/AsyncObserverExceptionTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/async/AsyncObserverExceptionTest.java index 781111b9ccfc8..bfd25ce0043b1 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/async/AsyncObserverExceptionTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/async/AsyncObserverExceptionTest.java @@ -5,9 +5,6 @@ import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import io.quarkus.arc.Arc; -import io.quarkus.arc.ArcContainer; -import io.quarkus.arc.test.ArcTestContainer; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -17,6 +14,7 @@ import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.TimeUnit; + import javax.annotation.PostConstruct; import javax.annotation.Priority; import javax.enterprise.context.Dependent; @@ -24,9 +22,14 @@ import javax.enterprise.event.ObservesAsync; import javax.inject.Inject; import javax.inject.Singleton; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.ArcContainer; +import io.quarkus.arc.test.ArcTestContainer; + public class AsyncObserverExceptionTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/async/AsyncObserverTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/async/AsyncObserverTest.java index d8972399302f8..b30a8ab2f70be 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/async/AsyncObserverTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/async/AsyncObserverTest.java @@ -4,15 +4,13 @@ import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; -import io.quarkus.arc.Arc; -import io.quarkus.arc.ArcContainer; -import io.quarkus.arc.test.ArcTestContainer; import java.util.List; import java.util.concurrent.CompletionStage; import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; + import javax.annotation.PostConstruct; import javax.enterprise.context.Dependent; import javax.enterprise.context.RequestScoped; @@ -21,9 +19,14 @@ import javax.enterprise.event.ObservesAsync; import javax.inject.Inject; import javax.inject.Singleton; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.ArcContainer; +import io.quarkus.arc.test.ArcTestContainer; + public class AsyncObserverTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/async/CustomAsyncObserverExceptionHandlerTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/async/CustomAsyncObserverExceptionHandlerTest.java index aa4d60cba984e..9b9409e7d0092 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/async/CustomAsyncObserverExceptionHandlerTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/async/CustomAsyncObserverExceptionHandlerTest.java @@ -3,9 +3,6 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import io.quarkus.arc.Arc; -import io.quarkus.arc.AsyncObserverExceptionHandler; -import io.quarkus.arc.test.ArcTestContainer; import java.util.concurrent.BlockingQueue; import java.util.concurrent.CompletionStage; import java.util.concurrent.ExecutionException; @@ -13,6 +10,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.AtomicBoolean; + import javax.enterprise.context.Dependent; import javax.enterprise.event.Event; import javax.enterprise.event.ObservesAsync; @@ -20,9 +18,14 @@ import javax.enterprise.inject.spi.ObserverMethod; import javax.inject.Inject; import javax.inject.Singleton; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.AsyncObserverExceptionHandler; +import io.quarkus.arc.test.ArcTestContainer; + public class CustomAsyncObserverExceptionHandlerTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/discovery/ObserverOnClassWithoutBeanDefiningAnnotationTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/discovery/ObserverOnClassWithoutBeanDefiningAnnotationTest.java index b1636facc15c6..0c69615622422 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/discovery/ObserverOnClassWithoutBeanDefiningAnnotationTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/discovery/ObserverOnClassWithoutBeanDefiningAnnotationTest.java @@ -2,15 +2,18 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import io.quarkus.arc.Arc; -import io.quarkus.arc.test.ArcTestContainer; import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; + import javax.enterprise.event.Observes; import javax.enterprise.inject.spi.BeanManager; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.test.ArcTestContainer; + public class ObserverOnClassWithoutBeanDefiningAnnotationTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/duplicate/bindings/BindingTypeA.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/duplicate/bindings/BindingTypeA.java index 7c0fe87504208..cec895c3bded8 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/duplicate/bindings/BindingTypeA.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/duplicate/bindings/BindingTypeA.java @@ -5,6 +5,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; + import javax.enterprise.util.AnnotationLiteral; import javax.inject.Qualifier; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/duplicate/bindings/DuplicateBindingsResolutionTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/duplicate/bindings/DuplicateBindingsResolutionTest.java index fc11b558eeaa2..25e4974788f62 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/duplicate/bindings/DuplicateBindingsResolutionTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/duplicate/bindings/DuplicateBindingsResolutionTest.java @@ -1,14 +1,17 @@ package io.quarkus.arc.test.observers.duplicate.bindings; -import io.quarkus.arc.test.ArcTestContainer; import java.lang.annotation.Annotation; + import javax.enterprise.context.Dependent; import javax.enterprise.event.Observes; import javax.enterprise.inject.spi.CDI; + import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.test.ArcTestContainer; + /** * Tests that when you try to resolve observer methods via * {@link javax.enterprise.inject.spi.BeanManager#resolveObserverMethods(Object, Annotation...)}, diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/ifexists/ReceptionIfExistsTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/ifexists/ReceptionIfExistsTest.java index 7282c34178abb..143699cdbd6df 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/ifexists/ReceptionIfExistsTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/ifexists/ReceptionIfExistsTest.java @@ -2,19 +2,22 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import io.quarkus.arc.Arc; -import io.quarkus.arc.ArcContainer; -import io.quarkus.arc.test.ArcTestContainer; import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; + import javax.annotation.Priority; import javax.enterprise.context.Dependent; import javax.enterprise.context.RequestScoped; import javax.enterprise.event.Observes; import javax.enterprise.event.Reception; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.ArcContainer; +import io.quarkus.arc.test.ArcTestContainer; + public class ReceptionIfExistsTest { static final List EVENTS = new CopyOnWriteArrayList<>(); diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/inheritance/ObserverInheritanceTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/inheritance/ObserverInheritanceTest.java index 9fcb9d753f5a8..7cd9f756fb3c5 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/inheritance/ObserverInheritanceTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/inheritance/ObserverInheritanceTest.java @@ -2,14 +2,17 @@ import static org.assertj.core.api.Assertions.assertThat; -import io.quarkus.arc.Arc; -import io.quarkus.arc.test.ArcTestContainer; import java.lang.annotation.Annotation; + import javax.enterprise.util.AnnotationLiteral; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.test.ArcTestContainer; + /** * @author Michal Szynkiewicz, michal.l.szynkiewicz@gmail.com *
diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/inheritance/ObservingBean.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/inheritance/ObservingBean.java index 2a04151e5b925..3beb625a943f7 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/inheritance/ObservingBean.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/inheritance/ObservingBean.java @@ -4,6 +4,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; + import javax.enterprise.context.ApplicationScoped; import javax.enterprise.event.Observes; import javax.inject.Qualifier; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/inheritance/different/packages/subpackage/AlternativeBean.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/inheritance/different/packages/subpackage/AlternativeBean.java index 0c5104fdfd791..b4a5b83001fdc 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/inheritance/different/packages/subpackage/AlternativeBean.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/inheritance/different/packages/subpackage/AlternativeBean.java @@ -1,10 +1,11 @@ package io.quarkus.arc.test.observers.inheritance.different.packages.subpackage; -import io.quarkus.arc.test.observers.inheritance.different.packages.OriginalBean; import javax.annotation.Priority; import javax.enterprise.context.ApplicationScoped; import javax.enterprise.inject.Alternative; +import io.quarkus.arc.test.observers.inheritance.different.packages.OriginalBean; + @Alternative @ApplicationScoped @Priority(1) diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/inheritance/different/packages/subpackage/PackagePrivateObserverInheritanceTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/inheritance/different/packages/subpackage/PackagePrivateObserverInheritanceTest.java index 2a6bcca8c8f66..021c46a50e43a 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/inheritance/different/packages/subpackage/PackagePrivateObserverInheritanceTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/inheritance/different/packages/subpackage/PackagePrivateObserverInheritanceTest.java @@ -1,13 +1,14 @@ package io.quarkus.arc.test.observers.inheritance.different.packages.subpackage; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.RegisterExtension; + import io.quarkus.arc.Arc; import io.quarkus.arc.ArcContainer; import io.quarkus.arc.InstanceHandle; import io.quarkus.arc.test.ArcTestContainer; import io.quarkus.arc.test.observers.inheritance.different.packages.OriginalBean; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.RegisterExtension; public class PackagePrivateObserverInheritanceTest { diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/inheritance/generated/GeneratedObserverClassNotSharedTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/inheritance/generated/GeneratedObserverClassNotSharedTest.java index f4b23a0c6f61c..96886ffdd490a 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/inheritance/generated/GeneratedObserverClassNotSharedTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/inheritance/generated/GeneratedObserverClassNotSharedTest.java @@ -3,18 +3,21 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -import io.quarkus.arc.Arc; -import io.quarkus.arc.ClientProxy; -import io.quarkus.arc.test.ArcTestContainer; import java.util.Set; import java.util.concurrent.CopyOnWriteArraySet; + import javax.enterprise.context.ApplicationScoped; import javax.enterprise.event.Event; import javax.enterprise.event.Observes; import javax.inject.Singleton; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.ClientProxy; +import io.quarkus.arc.test.ArcTestContainer; + // see https://github.com/quarkusio/quarkus/issues/23888 public class GeneratedObserverClassNotSharedTest { diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/inheritance/typevariable/ObserverInheritanceTypeVariableTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/inheritance/typevariable/ObserverInheritanceTypeVariableTest.java index 42151cdc53ea2..30390f3bc73a8 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/inheritance/typevariable/ObserverInheritanceTypeVariableTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/inheritance/typevariable/ObserverInheritanceTypeVariableTest.java @@ -3,17 +3,19 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; -import io.quarkus.arc.Arc; -import io.quarkus.arc.Unremovable; -import io.quarkus.arc.test.ArcTestContainer; import javax.enterprise.context.ApplicationScoped; import javax.enterprise.context.Dependent; import javax.enterprise.event.Event; import javax.enterprise.event.Observes; import javax.inject.Inject; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.Unremovable; +import io.quarkus.arc.test.ArcTestContainer; + /** * https://github.com/quarkusio/quarkus/issues/25364 */ diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/injection/SimpleObserverInjectionTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/injection/SimpleObserverInjectionTest.java index 598e9b463ceeb..56483d2a27343 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/injection/SimpleObserverInjectionTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/injection/SimpleObserverInjectionTest.java @@ -4,11 +4,10 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import io.quarkus.arc.Arc; -import io.quarkus.arc.test.ArcTestContainer; import java.util.UUID; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicReference; + import javax.annotation.PostConstruct; import javax.annotation.PreDestroy; import javax.enterprise.context.Dependent; @@ -16,9 +15,13 @@ import javax.enterprise.inject.Instance; import javax.enterprise.util.TypeLiteral; import javax.inject.Singleton; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.test.ArcTestContainer; + public class SimpleObserverInjectionTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/metadata/EventMetadataTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/metadata/EventMetadataTest.java index 788b252d6f256..781270997ce4f 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/metadata/EventMetadataTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/metadata/EventMetadataTest.java @@ -3,17 +3,20 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; -import io.quarkus.arc.Arc; -import io.quarkus.arc.test.ArcTestContainer; import java.math.BigDecimal; import java.util.concurrent.atomic.AtomicReference; + import javax.enterprise.event.Observes; import javax.enterprise.inject.Any; import javax.enterprise.inject.spi.EventMetadata; import javax.inject.Singleton; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.test.ArcTestContainer; + public class EventMetadataTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/metadata/EventMetadataWrongInjectionTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/metadata/EventMetadataWrongInjectionTest.java index 2362790b2bf36..e2bef85aebfe2 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/metadata/EventMetadataWrongInjectionTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/metadata/EventMetadataWrongInjectionTest.java @@ -3,14 +3,16 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import io.quarkus.arc.test.ArcTestContainer; import javax.enterprise.inject.spi.DefinitionException; import javax.enterprise.inject.spi.EventMetadata; import javax.inject.Inject; import javax.inject.Singleton; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.test.ArcTestContainer; + public class EventMetadataWrongInjectionTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/notification/ObserverNotificationTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/notification/ObserverNotificationTest.java index f15f849dc11ab..cfb1953fb1612 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/notification/ObserverNotificationTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/notification/ObserverNotificationTest.java @@ -2,14 +2,17 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import io.quarkus.arc.Arc; -import io.quarkus.arc.test.ArcTestContainer; import java.util.concurrent.atomic.AtomicInteger; + import javax.enterprise.context.ApplicationScoped; import javax.enterprise.event.Observes; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.test.ArcTestContainer; + public class ObserverNotificationTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/ordering/ObserverOrderingTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/ordering/ObserverOrderingTest.java index 7d99d54d95695..c2a1f9f27e82c 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/ordering/ObserverOrderingTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/ordering/ObserverOrderingTest.java @@ -2,11 +2,9 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import io.quarkus.arc.Arc; -import io.quarkus.arc.ArcContainer; -import io.quarkus.arc.test.ArcTestContainer; import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; + import javax.annotation.PostConstruct; import javax.annotation.Priority; import javax.enterprise.context.Dependent; @@ -14,9 +12,14 @@ import javax.enterprise.event.Observes; import javax.inject.Inject; import javax.inject.Singleton; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.ArcContainer; +import io.quarkus.arc.test.ArcTestContainer; + public class ObserverOrderingTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/request/RequestInObserverNotificationTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/request/RequestInObserverNotificationTest.java index 4151e4bed7b00..2c95cb2182de3 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/request/RequestInObserverNotificationTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/request/RequestInObserverNotificationTest.java @@ -6,21 +6,24 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import io.quarkus.arc.Arc; -import io.quarkus.arc.ArcContainer; -import io.quarkus.arc.ManagedContext; -import io.quarkus.arc.test.ArcTestContainer; import java.util.UUID; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicReference; + import javax.annotation.PostConstruct; import javax.annotation.PreDestroy; import javax.enterprise.context.RequestScoped; import javax.enterprise.event.Observes; import javax.inject.Singleton; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.ArcContainer; +import io.quarkus.arc.ManagedContext; +import io.quarkus.arc.test.ArcTestContainer; + public class RequestInObserverNotificationTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/staticmethods/StaticObserverTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/staticmethods/StaticObserverTest.java index fa5762d54510e..8685bf5f02776 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/staticmethods/StaticObserverTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/staticmethods/StaticObserverTest.java @@ -5,17 +5,20 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import io.quarkus.arc.Arc; -import io.quarkus.arc.test.ArcTestContainer; import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.atomic.AtomicBoolean; + import javax.annotation.PreDestroy; import javax.enterprise.context.Dependent; import javax.enterprise.event.Observes; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.test.ArcTestContainer; + public class StaticObserverTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/async/AsyncProducerTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/async/AsyncProducerTest.java index b3306d84c5af4..e08b220f5bf45 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/async/AsyncProducerTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/async/AsyncProducerTest.java @@ -3,19 +3,22 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; -import io.quarkus.arc.Arc; -import io.quarkus.arc.test.ArcTestContainer; import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionStage; import java.util.concurrent.ExecutionException; import java.util.concurrent.atomic.AtomicReference; + import javax.enterprise.context.Dependent; import javax.enterprise.inject.Produces; import javax.inject.Inject; import javax.inject.Singleton; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.test.ArcTestContainer; + public class AsyncProducerTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/dependent/DeclaringBeanTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/dependent/DeclaringBeanTest.java index f5d7baf6ab3ca..20139fff7458e 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/dependent/DeclaringBeanTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/dependent/DeclaringBeanTest.java @@ -5,19 +5,22 @@ import static org.junit.jupiter.api.Assertions.assertNotEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -import io.quarkus.arc.Arc; -import io.quarkus.arc.test.ArcTestContainer; import java.util.ArrayList; import java.util.List; import java.util.concurrent.atomic.AtomicBoolean; + import javax.annotation.PreDestroy; import javax.enterprise.context.Dependent; import javax.enterprise.inject.Produces; import javax.enterprise.util.TypeLiteral; import javax.inject.Singleton; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.test.ArcTestContainer; + public class DeclaringBeanTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/discovery/ProducerOnClassWithoutBeanDefiningAnnotationTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/discovery/ProducerOnClassWithoutBeanDefiningAnnotationTest.java index e37a8c2fec2b5..a7880303b6d79 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/discovery/ProducerOnClassWithoutBeanDefiningAnnotationTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/discovery/ProducerOnClassWithoutBeanDefiningAnnotationTest.java @@ -2,12 +2,14 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import io.quarkus.arc.Arc; -import io.quarkus.arc.test.ArcTestContainer; import javax.enterprise.inject.Produces; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.test.ArcTestContainer; + public class ProducerOnClassWithoutBeanDefiningAnnotationTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/disposer/DisposerTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/disposer/DisposerTest.java index af2f4e4960d0a..ba94705131cf0 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/disposer/DisposerTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/disposer/DisposerTest.java @@ -4,14 +4,11 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import io.quarkus.arc.Arc; -import io.quarkus.arc.InstanceHandle; -import io.quarkus.arc.test.ArcTestContainer; -import io.quarkus.arc.test.MyQualifier; import java.math.BigDecimal; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicReference; + import javax.annotation.PostConstruct; import javax.annotation.PreDestroy; import javax.enterprise.context.ApplicationScoped; @@ -21,10 +18,16 @@ import javax.enterprise.inject.Produces; import javax.enterprise.util.TypeLiteral; import javax.inject.Singleton; + import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.InstanceHandle; +import io.quarkus.arc.test.ArcTestContainer; +import io.quarkus.arc.test.MyQualifier; + public class DisposerTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/disposer/DisposerWithWildcardTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/disposer/DisposerWithWildcardTest.java index 4ce0e7226ebc3..625cc290f7aac 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/disposer/DisposerWithWildcardTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/disposer/DisposerWithWildcardTest.java @@ -3,21 +3,24 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -import io.quarkus.arc.Arc; -import io.quarkus.arc.ArcContainer; -import io.quarkus.arc.InstanceHandle; -import io.quarkus.arc.test.ArcTestContainer; import java.util.Collections; import java.util.List; import java.util.Map; import java.util.concurrent.CopyOnWriteArrayList; + import javax.enterprise.inject.Disposes; import javax.enterprise.inject.Produces; import javax.enterprise.util.TypeLiteral; import javax.inject.Singleton; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.ArcContainer; +import io.quarkus.arc.InstanceHandle; +import io.quarkus.arc.test.ArcTestContainer; + public class DisposerWithWildcardTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/generic/Claim.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/generic/Claim.java index 85cb9fb04e047..7e41972dc157f 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/generic/Claim.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/generic/Claim.java @@ -4,6 +4,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; + import javax.enterprise.util.Nonbinding; import javax.inject.Qualifier; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/generic/ErasedGenericTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/generic/ErasedGenericTest.java index 67bb25f1e8a0b..fb899125fc465 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/generic/ErasedGenericTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/generic/ErasedGenericTest.java @@ -2,20 +2,23 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import io.quarkus.arc.Arc; -import io.quarkus.arc.ArcContainer; -import io.quarkus.arc.test.ArcTestContainer; import java.lang.annotation.Annotation; import java.util.Optional; + import javax.enterprise.context.Dependent; import javax.enterprise.inject.Produces; import javax.enterprise.inject.spi.InjectionPoint; import javax.inject.Inject; import javax.inject.Named; import javax.inject.Singleton; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.ArcContainer; +import io.quarkus.arc.test.ArcTestContainer; + /** * Test for https://github.com/quarkusio/quarkus/issues/120 */ diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/generic/GenericProducerHierarchyTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/generic/GenericProducerHierarchyTest.java index 92cd734d2557f..faf086924a312 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/generic/GenericProducerHierarchyTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/generic/GenericProducerHierarchyTest.java @@ -2,16 +2,19 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import io.quarkus.arc.Arc; -import io.quarkus.arc.test.ArcTestContainer; import java.util.Optional; import java.util.function.Function; + import javax.enterprise.inject.Produces; import javax.inject.Inject; import javax.inject.Singleton; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.test.ArcTestContainer; + public class GenericProducerHierarchyTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/illegal/IllegalProducerTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/illegal/IllegalProducerTest.java index 1157a55d019a6..c55ac3e81fa05 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/illegal/IllegalProducerTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/illegal/IllegalProducerTest.java @@ -2,17 +2,20 @@ import static org.junit.jupiter.api.Assertions.fail; -import io.quarkus.arc.Arc; -import io.quarkus.arc.test.ArcTestContainer; import java.io.Serializable; import java.time.temporal.Temporal; + import javax.enterprise.context.ApplicationScoped; import javax.enterprise.context.Dependent; import javax.enterprise.inject.IllegalProductException; import javax.enterprise.inject.Produces; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.test.ArcTestContainer; + public class IllegalProducerTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/illegal/ProducerFieldWithInjectTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/illegal/ProducerFieldWithInjectTest.java index b65defd54cdf5..39a1ef2b985ad 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/illegal/ProducerFieldWithInjectTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/illegal/ProducerFieldWithInjectTest.java @@ -3,15 +3,18 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import io.quarkus.arc.test.ArcTestContainer; import java.time.temporal.Temporal; + import javax.enterprise.context.Dependent; import javax.enterprise.inject.Produces; import javax.enterprise.inject.spi.DefinitionException; import javax.inject.Inject; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.test.ArcTestContainer; + public class ProducerFieldWithInjectTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/primitive/PrimitiveProducerTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/primitive/PrimitiveProducerTest.java index c88db32d9c72c..bc762a2193c0f 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/primitive/PrimitiveProducerTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/primitive/PrimitiveProducerTest.java @@ -2,15 +2,17 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import io.quarkus.arc.Arc; -import io.quarkus.arc.test.ArcTestContainer; import javax.enterprise.context.Dependent; import javax.enterprise.inject.Produces; import javax.inject.Inject; import javax.inject.Singleton; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.test.ArcTestContainer; + public class PrimitiveProducerTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/privatemember/PrivateProducerFieldTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/privatemember/PrivateProducerFieldTest.java index 7cdb9ed4935d2..dee3671884dac 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/privatemember/PrivateProducerFieldTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/privatemember/PrivateProducerFieldTest.java @@ -2,13 +2,15 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import io.quarkus.arc.Arc; -import io.quarkus.arc.test.ArcTestContainer; import javax.enterprise.context.ApplicationScoped; import javax.enterprise.inject.Produces; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.test.ArcTestContainer; + public class PrivateProducerFieldTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/privatemember/PrivateProducerMethodTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/privatemember/PrivateProducerMethodTest.java index a5407748ef656..92c07219f72b3 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/privatemember/PrivateProducerMethodTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/privatemember/PrivateProducerMethodTest.java @@ -2,14 +2,16 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import io.quarkus.arc.Arc; -import io.quarkus.arc.test.ArcTestContainer; import javax.annotation.PostConstruct; import javax.enterprise.context.ApplicationScoped; import javax.enterprise.inject.Produces; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.test.ArcTestContainer; + public class PrivateProducerMethodTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/staticProducers/StaticMethodProducerTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/staticProducers/StaticMethodProducerTest.java index ce753b6bdcf88..dc959ae0fe887 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/staticProducers/StaticMethodProducerTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/staticProducers/StaticMethodProducerTest.java @@ -1,20 +1,23 @@ package io.quarkus.arc.test.producer.staticProducers; -import io.quarkus.arc.Arc; -import io.quarkus.arc.InstanceHandle; -import io.quarkus.arc.test.ArcTestContainer; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; + import javax.enterprise.inject.Produces; import javax.enterprise.util.AnnotationLiteral; import javax.inject.Qualifier; import javax.inject.Singleton; + import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.InstanceHandle; +import io.quarkus.arc.test.ArcTestContainer; + /** * Tests static method/field producers */ diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/qualifiers/Location.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/qualifiers/Location.java index 024135489f046..266d953d31741 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/qualifiers/Location.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/qualifiers/Location.java @@ -10,6 +10,7 @@ import java.lang.annotation.Repeatable; import java.lang.annotation.Retention; import java.lang.annotation.Target; + import javax.enterprise.util.AnnotationLiteral; import javax.inject.Qualifier; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/qualifiers/RepeatingQualifierClassTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/qualifiers/RepeatingQualifierClassTest.java index d41fdbab19d28..922c0f057a507 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/qualifiers/RepeatingQualifierClassTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/qualifiers/RepeatingQualifierClassTest.java @@ -1,16 +1,18 @@ package io.quarkus.arc.test.qualifiers; -import io.quarkus.arc.Arc; -import io.quarkus.arc.ArcContainer; -import io.quarkus.arc.InstanceHandle; -import io.quarkus.arc.test.ArcTestContainer; import javax.enterprise.context.ApplicationScoped; import javax.inject.Inject; import javax.inject.Singleton; + import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.ArcContainer; +import io.quarkus.arc.InstanceHandle; +import io.quarkus.arc.test.ArcTestContainer; + /** * Tests usage of repeated qualifiers for class based beans. */ diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/qualifiers/RepeatingQualifierObserverTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/qualifiers/RepeatingQualifierObserverTest.java index 6e3cacd8e1c79..3710b4fa912bf 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/qualifiers/RepeatingQualifierObserverTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/qualifiers/RepeatingQualifierObserverTest.java @@ -1,17 +1,20 @@ package io.quarkus.arc.test.qualifiers; -import io.quarkus.arc.Arc; -import io.quarkus.arc.ArcContainer; -import io.quarkus.arc.test.ArcTestContainer; import java.util.ArrayList; import java.util.List; + import javax.enterprise.context.ApplicationScoped; import javax.enterprise.event.Event; import javax.enterprise.event.Observes; + import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.ArcContainer; +import io.quarkus.arc.test.ArcTestContainer; + public class RepeatingQualifierObserverTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/qualifiers/RepeatingQualifierProducerTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/qualifiers/RepeatingQualifierProducerTest.java index 3bfc289f31395..0dbe9dd1bd604 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/qualifiers/RepeatingQualifierProducerTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/qualifiers/RepeatingQualifierProducerTest.java @@ -1,17 +1,19 @@ package io.quarkus.arc.test.qualifiers; -import io.quarkus.arc.Arc; -import io.quarkus.arc.ArcContainer; -import io.quarkus.arc.InstanceHandle; -import io.quarkus.arc.test.ArcTestContainer; import javax.enterprise.context.ApplicationScoped; import javax.enterprise.context.RequestScoped; import javax.enterprise.inject.Disposes; import javax.enterprise.inject.Produces; + import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.ArcContainer; +import io.quarkus.arc.InstanceHandle; +import io.quarkus.arc.test.ArcTestContainer; + /** * Tests repeating qualifier usage for producers. */ diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/qualifiers/defaultvalues/AnimalQualifier.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/qualifiers/defaultvalues/AnimalQualifier.java index 866d8990c998f..8d54c2259c588 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/qualifiers/defaultvalues/AnimalQualifier.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/qualifiers/defaultvalues/AnimalQualifier.java @@ -4,6 +4,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; + import javax.inject.Qualifier; @Qualifier diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/qualifiers/defaultvalues/QualifierDefaultValuesTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/qualifiers/defaultvalues/QualifierDefaultValuesTest.java index bcf7cf77d0de3..7fabbc0829ef5 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/qualifiers/defaultvalues/QualifierDefaultValuesTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/qualifiers/defaultvalues/QualifierDefaultValuesTest.java @@ -2,13 +2,15 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import io.quarkus.arc.Arc; -import io.quarkus.arc.test.ArcTestContainer; import javax.enterprise.context.Dependent; import javax.inject.Inject; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.test.ArcTestContainer; + public class QualifierDefaultValuesTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/resolution/RuntimeResolutionTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/resolution/RuntimeResolutionTest.java index 60faef5cf7d8d..b0833540378ec 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/resolution/RuntimeResolutionTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/resolution/RuntimeResolutionTest.java @@ -3,18 +3,21 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -import io.quarkus.arc.Arc; -import io.quarkus.arc.ArcContainer; -import io.quarkus.arc.InstanceHandle; -import io.quarkus.arc.test.ArcTestContainer; import java.io.IOException; import java.util.AbstractList; import java.util.List; + import javax.enterprise.util.TypeLiteral; import javax.inject.Singleton; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.ArcContainer; +import io.quarkus.arc.InstanceHandle; +import io.quarkus.arc.test.ArcTestContainer; + public class RuntimeResolutionTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/resolution/TypedTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/resolution/TypedTest.java index 54e0d2df8d3e0..309e2dd495d5d 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/resolution/TypedTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/resolution/TypedTest.java @@ -5,21 +5,24 @@ import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import io.quarkus.arc.Arc; -import io.quarkus.arc.ArcContainer; -import io.quarkus.arc.InjectableBean; -import io.quarkus.arc.InstanceHandle; -import io.quarkus.arc.test.ArcTestContainer; import java.io.IOException; import java.util.concurrent.atomic.AtomicReference; + import javax.enterprise.event.Observes; import javax.enterprise.inject.Produces; import javax.enterprise.inject.Typed; import javax.enterprise.inject.spi.Bean; import javax.inject.Singleton; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.ArcContainer; +import io.quarkus.arc.InjectableBean; +import io.quarkus.arc.InstanceHandle; +import io.quarkus.arc.test.ArcTestContainer; + public class TypedTest { static final AtomicReference EVENT = new AtomicReference(); diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/stereotypes/MultipleStereotypeScopesTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/stereotypes/MultipleStereotypeScopesTest.java index 5234190b54440..2356f7e026d1b 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/stereotypes/MultipleStereotypeScopesTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/stereotypes/MultipleStereotypeScopesTest.java @@ -7,16 +7,19 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import io.quarkus.arc.test.ArcTestContainer; import java.lang.annotation.Retention; import java.lang.annotation.Target; + import javax.enterprise.context.ApplicationScoped; import javax.enterprise.inject.Model; import javax.enterprise.inject.Stereotype; import javax.enterprise.inject.spi.DefinitionException; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.test.ArcTestContainer; + public class MultipleStereotypeScopesTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/stereotypes/SimpleBinding.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/stereotypes/SimpleBinding.java index 075a6b32d92a9..d0032fa9a7587 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/stereotypes/SimpleBinding.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/stereotypes/SimpleBinding.java @@ -7,6 +7,7 @@ import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; + import javax.interceptor.InterceptorBinding; @Target({ TYPE, METHOD }) diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/stereotypes/StereotypeAlternativeArcPriorityTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/stereotypes/StereotypeAlternativeArcPriorityTest.java index 79bbb23b75b92..037098c99020f 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/stereotypes/StereotypeAlternativeArcPriorityTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/stereotypes/StereotypeAlternativeArcPriorityTest.java @@ -6,20 +6,23 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; import static org.junit.jupiter.api.Assertions.assertEquals; -import io.quarkus.arc.AlternativePriority; -import io.quarkus.arc.Arc; -import io.quarkus.arc.Priority; -import io.quarkus.arc.test.ArcTestContainer; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; + import javax.enterprise.context.Dependent; import javax.enterprise.inject.Alternative; import javax.enterprise.inject.Stereotype; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.AlternativePriority; +import io.quarkus.arc.Arc; +import io.quarkus.arc.Priority; +import io.quarkus.arc.test.ArcTestContainer; + // copy of `StereotypeAlternativeTest` that uses ArC `@Priority` and `@AlternativePriority` // instead of Jakarta Common Annotations `@Priority` public class StereotypeAlternativeArcPriorityTest { diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/stereotypes/StereotypeAlternativeTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/stereotypes/StereotypeAlternativeTest.java index 2948e6cfc0c4a..c3d7483d4ddb6 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/stereotypes/StereotypeAlternativeTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/stereotypes/StereotypeAlternativeTest.java @@ -6,19 +6,22 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; import static org.junit.jupiter.api.Assertions.assertEquals; -import io.quarkus.arc.Arc; -import io.quarkus.arc.test.ArcTestContainer; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; + import javax.annotation.Priority; import javax.enterprise.context.Dependent; import javax.enterprise.inject.Alternative; import javax.enterprise.inject.Stereotype; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.test.ArcTestContainer; + public class StereotypeAlternativeTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/stereotypes/StereotypeInheritanceTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/stereotypes/StereotypeInheritanceTest.java index 9945e7cb77491..20b772d85ebcd 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/stereotypes/StereotypeInheritanceTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/stereotypes/StereotypeInheritanceTest.java @@ -8,22 +8,25 @@ import static org.junit.jupiter.api.Assertions.assertNotEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; -import io.quarkus.arc.Arc; -import io.quarkus.arc.ArcContainer; -import io.quarkus.arc.test.ArcTestContainer; import java.lang.annotation.Inherited; import java.lang.annotation.Retention; import java.lang.annotation.Target; import java.util.Set; import java.util.UUID; + import javax.annotation.PostConstruct; import javax.enterprise.context.RequestScoped; import javax.enterprise.inject.Stereotype; import javax.enterprise.inject.spi.Bean; import javax.enterprise.inject.spi.BeanManager; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.ArcContainer; +import io.quarkus.arc.test.ArcTestContainer; + public class StereotypeInheritanceTest { @RegisterExtension public ArcTestContainer container = new ArcTestContainer(MyStereotype.class, MyBeanDefiningAnnotation.class, @@ -96,4 +99,4 @@ public String getId() { return id; } } -} \ No newline at end of file +} diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/stereotypes/StereotypeInterceptorTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/stereotypes/StereotypeInterceptorTest.java index 310539a0adc05..8db333459c8af 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/stereotypes/StereotypeInterceptorTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/stereotypes/StereotypeInterceptorTest.java @@ -2,20 +2,23 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import io.quarkus.arc.Arc; -import io.quarkus.arc.test.ArcTestContainer; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; + import javax.enterprise.inject.Stereotype; import javax.enterprise.inject.spi.BeanManager; import javax.enterprise.inject.spi.CDI; + import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.test.ArcTestContainer; + public class StereotypeInterceptorTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/stereotypes/StereotypeNamedTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/stereotypes/StereotypeNamedTest.java index 4b416abfb613f..a7474a1192a75 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/stereotypes/StereotypeNamedTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/stereotypes/StereotypeNamedTest.java @@ -2,18 +2,21 @@ import static org.junit.jupiter.api.Assertions.assertTrue; -import io.quarkus.arc.Arc; -import io.quarkus.arc.test.ArcTestContainer; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; + import javax.enterprise.context.ApplicationScoped; import javax.enterprise.inject.Stereotype; import javax.inject.Named; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.test.ArcTestContainer; + public class StereotypeNamedTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/stereotypes/StereotypeOnProducerTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/stereotypes/StereotypeOnProducerTest.java index 898326e2e54a9..f9aec4a03e664 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/stereotypes/StereotypeOnProducerTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/stereotypes/StereotypeOnProducerTest.java @@ -2,19 +2,22 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; -import io.quarkus.arc.Arc; -import io.quarkus.arc.test.ArcTestContainer; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; + import javax.enterprise.context.RequestScoped; import javax.enterprise.inject.Produces; import javax.enterprise.inject.Stereotype; import javax.inject.Named; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.test.ArcTestContainer; + public class StereotypeOnProducerTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/stereotypes/StereotypeScopeTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/stereotypes/StereotypeScopeTest.java index 2f9f6566a2b9c..052ed0664a0ef 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/stereotypes/StereotypeScopeTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/stereotypes/StereotypeScopeTest.java @@ -3,17 +3,20 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotEquals; -import io.quarkus.arc.Arc; -import io.quarkus.arc.ArcContainer; -import io.quarkus.arc.test.ArcTestContainer; import java.util.UUID; + import javax.annotation.PostConstruct; import javax.enterprise.context.ApplicationScoped; import javax.enterprise.inject.Model; import javax.enterprise.inject.Typed; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.ArcContainer; +import io.quarkus.arc.test.ArcTestContainer; + public class StereotypeScopeTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/stereotypes/TransitiveStereotypeTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/stereotypes/TransitiveStereotypeTest.java index f6374f3b3395c..b195a02cc4736 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/stereotypes/TransitiveStereotypeTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/stereotypes/TransitiveStereotypeTest.java @@ -8,21 +8,24 @@ import static org.junit.jupiter.api.Assertions.assertNotEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; -import io.quarkus.arc.Arc; -import io.quarkus.arc.ArcContainer; -import io.quarkus.arc.test.ArcTestContainer; import java.lang.annotation.Retention; import java.lang.annotation.Target; import java.util.Set; import java.util.UUID; + import javax.annotation.PostConstruct; import javax.enterprise.context.RequestScoped; import javax.enterprise.inject.Stereotype; import javax.enterprise.inject.spi.Bean; import javax.enterprise.inject.spi.BeanManager; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.ArcContainer; +import io.quarkus.arc.test.ArcTestContainer; + public class TransitiveStereotypeTest { @RegisterExtension public ArcTestContainer container = new ArcTestContainer(MyStereotype.class, MyOtherStereotype.class, MyBean.class); @@ -90,4 +93,4 @@ public String getId() { return id; } } -} \ No newline at end of file +} diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/transientreference/TransientReferenceDestroyedTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/transientreference/TransientReferenceDestroyedTest.java index d5136cbd90aa6..a78d8d1b95c80 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/transientreference/TransientReferenceDestroyedTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/transientreference/TransientReferenceDestroyedTest.java @@ -4,12 +4,10 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import io.quarkus.arc.Arc; -import io.quarkus.arc.InstanceHandle; -import io.quarkus.arc.test.ArcTestContainer; import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.atomic.AtomicInteger; + import javax.enterprise.context.ApplicationScoped; import javax.enterprise.context.Dependent; import javax.enterprise.context.control.ActivateRequestContext; @@ -20,9 +18,14 @@ import javax.enterprise.inject.spi.InjectionPoint; import javax.inject.Inject; import javax.inject.Singleton; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.InstanceHandle; +import io.quarkus.arc.test.ArcTestContainer; + public class TransientReferenceDestroyedTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/unused/Alpha.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/unused/Alpha.java index 40b27f2570366..62c4030d78082 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/unused/Alpha.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/unused/Alpha.java @@ -7,6 +7,7 @@ import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; + import javax.interceptor.InterceptorBinding; @Target({ TYPE, METHOD }) diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/unused/Bravo.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/unused/Bravo.java index 00f2ff4514088..02fab14a65e04 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/unused/Bravo.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/unused/Bravo.java @@ -7,6 +7,7 @@ import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; + import javax.interceptor.InterceptorBinding; @Target({ TYPE, METHOD }) diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/unused/Counter.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/unused/Counter.java index d719794680733..df54d4ddf683b 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/unused/Counter.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/unused/Counter.java @@ -1,6 +1,7 @@ package io.quarkus.arc.test.unused; import java.util.concurrent.atomic.AtomicInteger; + import javax.inject.Singleton; @Bravo // Intercepted by Bravo, injected in Alpha! diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/unused/RemoveUnusedBeansTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/unused/RemoveUnusedBeansTest.java index 0cd9ed2888808..89c12cf726f8a 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/unused/RemoveUnusedBeansTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/unused/RemoveUnusedBeansTest.java @@ -4,12 +4,9 @@ import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; -import io.quarkus.arc.Arc; -import io.quarkus.arc.ArcContainer; -import io.quarkus.arc.impl.ArcContainerImpl; -import io.quarkus.arc.test.ArcTestContainer; import java.math.BigDecimal; import java.math.BigInteger; + import javax.annotation.PostConstruct; import javax.annotation.Priority; import javax.enterprise.context.Dependent; @@ -21,9 +18,15 @@ import javax.inject.Named; import javax.inject.Provider; import javax.inject.Singleton; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.ArcContainer; +import io.quarkus.arc.impl.ArcContainerImpl; +import io.quarkus.arc.test.ArcTestContainer; + public class RemoveUnusedBeansTest extends RemoveUnusedComponentsTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/unused/RemoveUnusedDecoratorTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/unused/RemoveUnusedDecoratorTest.java index 11ab44ce4fed7..e3edf75dd84a7 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/unused/RemoveUnusedDecoratorTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/unused/RemoveUnusedDecoratorTest.java @@ -2,19 +2,22 @@ import static org.junit.jupiter.api.Assertions.assertTrue; -import io.quarkus.arc.Arc; -import io.quarkus.arc.ArcContainer; -import io.quarkus.arc.test.ArcTestContainer; import java.util.Set; + import javax.annotation.Priority; import javax.decorator.Decorator; import javax.decorator.Delegate; import javax.enterprise.context.Dependent; import javax.enterprise.event.Observes; import javax.inject.Inject; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.ArcContainer; +import io.quarkus.arc.test.ArcTestContainer; + public class RemoveUnusedDecoratorTest extends RemoveUnusedComponentsTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/unused/RemoveUnusedInterceptorTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/unused/RemoveUnusedInterceptorTest.java index 18fa645b9a0bf..be8971eda0a91 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/unused/RemoveUnusedInterceptorTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/unused/RemoveUnusedInterceptorTest.java @@ -2,16 +2,18 @@ import static org.junit.jupiter.api.Assertions.assertTrue; -import io.quarkus.arc.Arc; -import io.quarkus.arc.ArcContainer; -import io.quarkus.arc.test.ArcTestContainer; import javax.enterprise.context.Dependent; import javax.enterprise.event.Observes; import javax.enterprise.inject.spi.InterceptionType; import javax.enterprise.util.AnnotationLiteral; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.ArcContainer; +import io.quarkus.arc.test.ArcTestContainer; + public class RemoveUnusedInterceptorTest extends RemoveUnusedComponentsTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/validation/AbstractNormalScopedFinalTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/validation/AbstractNormalScopedFinalTest.java index bd222057061d2..a091442f73623 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/validation/AbstractNormalScopedFinalTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/validation/AbstractNormalScopedFinalTest.java @@ -3,14 +3,16 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import io.quarkus.arc.test.ArcTestContainer; import javax.enterprise.context.ApplicationScoped; import javax.enterprise.inject.Produces; import javax.enterprise.inject.Vetoed; import javax.enterprise.inject.spi.DeploymentException; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.test.ArcTestContainer; + public abstract class AbstractNormalScopedFinalTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/validation/BoundInterceptorFinalTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/validation/BoundInterceptorFinalTest.java index efe5601a4f800..ee195e8bca5c5 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/validation/BoundInterceptorFinalTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/validation/BoundInterceptorFinalTest.java @@ -3,12 +3,14 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import io.quarkus.arc.test.ArcTestContainer; import javax.enterprise.context.Dependent; import javax.enterprise.inject.spi.DeploymentException; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.test.ArcTestContainer; + public class BoundInterceptorFinalTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/validation/BoundInterceptorPrivateNoArgsConstructorTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/validation/BoundInterceptorPrivateNoArgsConstructorTest.java index 87c8f1b4fa002..00999bfd34412 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/validation/BoundInterceptorPrivateNoArgsConstructorTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/validation/BoundInterceptorPrivateNoArgsConstructorTest.java @@ -3,12 +3,14 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import io.quarkus.arc.test.ArcTestContainer; import javax.enterprise.context.Dependent; import javax.enterprise.inject.spi.DeploymentException; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.test.ArcTestContainer; + public class BoundInterceptorPrivateNoArgsConstructorTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/validation/ClassBeanMultipleScopesTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/validation/ClassBeanMultipleScopesTest.java index eb084890de47d..c0c47f3fd430f 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/validation/ClassBeanMultipleScopesTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/validation/ClassBeanMultipleScopesTest.java @@ -3,13 +3,15 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import io.quarkus.arc.test.ArcTestContainer; import javax.enterprise.context.Dependent; import javax.enterprise.inject.spi.DefinitionException; import javax.inject.Singleton; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.test.ArcTestContainer; + public class ClassBeanMultipleScopesTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/validation/InitializerMethodMarkedAsyncObserverTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/validation/InitializerMethodMarkedAsyncObserverTest.java index b73ebc907d69f..968c141e564c5 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/validation/InitializerMethodMarkedAsyncObserverTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/validation/InitializerMethodMarkedAsyncObserverTest.java @@ -3,14 +3,16 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import io.quarkus.arc.test.ArcTestContainer; import javax.enterprise.context.ApplicationScoped; import javax.enterprise.event.ObservesAsync; import javax.enterprise.inject.spi.DefinitionException; import javax.inject.Inject; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.test.ArcTestContainer; + public class InitializerMethodMarkedAsyncObserverTest { @RegisterExtension public ArcTestContainer container = ArcTestContainer.builder().beanClasses(MyBean.class).shouldFail().build(); diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/validation/InitializerMethodMarkedDisposerTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/validation/InitializerMethodMarkedDisposerTest.java index 0094546f3dc12..a4e0bcfab8f4a 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/validation/InitializerMethodMarkedDisposerTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/validation/InitializerMethodMarkedDisposerTest.java @@ -3,15 +3,17 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import io.quarkus.arc.test.ArcTestContainer; import javax.enterprise.context.ApplicationScoped; import javax.enterprise.inject.Disposes; import javax.enterprise.inject.Produces; import javax.enterprise.inject.spi.DefinitionException; import javax.inject.Inject; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.test.ArcTestContainer; + public class InitializerMethodMarkedDisposerTest { @RegisterExtension public ArcTestContainer container = ArcTestContainer.builder().beanClasses(Producers.class).shouldFail().build(); diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/validation/InitializerMethodMarkedObserverTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/validation/InitializerMethodMarkedObserverTest.java index 7b24ff4c97114..f4f4b64243637 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/validation/InitializerMethodMarkedObserverTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/validation/InitializerMethodMarkedObserverTest.java @@ -3,14 +3,16 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import io.quarkus.arc.test.ArcTestContainer; import javax.enterprise.context.ApplicationScoped; import javax.enterprise.event.Observes; import javax.enterprise.inject.spi.DefinitionException; import javax.inject.Inject; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.test.ArcTestContainer; + public class InitializerMethodMarkedObserverTest { @RegisterExtension public ArcTestContainer container = ArcTestContainer.builder().beanClasses(MyBean.class).shouldFail().build(); diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/validation/InitializerMethodMarkedProducerTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/validation/InitializerMethodMarkedProducerTest.java index 188393f30ab87..338b56a4fb96e 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/validation/InitializerMethodMarkedProducerTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/validation/InitializerMethodMarkedProducerTest.java @@ -3,14 +3,16 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import io.quarkus.arc.test.ArcTestContainer; import javax.enterprise.context.ApplicationScoped; import javax.enterprise.inject.Produces; import javax.enterprise.inject.spi.DefinitionException; import javax.inject.Inject; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.test.ArcTestContainer; + public class InitializerMethodMarkedProducerTest { @RegisterExtension public ArcTestContainer container = ArcTestContainer.builder().beanClasses(Producers.class).shouldFail().build(); diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/validation/NormalScopedConstructorTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/validation/NormalScopedConstructorTest.java index 017e778ff4c59..125cd7685198d 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/validation/NormalScopedConstructorTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/validation/NormalScopedConstructorTest.java @@ -3,14 +3,16 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import io.quarkus.arc.test.ArcTestContainer; import javax.enterprise.context.ApplicationScoped; import javax.enterprise.inject.Instance; import javax.enterprise.inject.spi.DeploymentException; import javax.inject.Inject; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.test.ArcTestContainer; + public class NormalScopedConstructorTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/validation/NormalScopedPrivateNoArgsConstructorTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/validation/NormalScopedPrivateNoArgsConstructorTest.java index df77dad900fa3..6c32c5ac71ea7 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/validation/NormalScopedPrivateNoArgsConstructorTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/validation/NormalScopedPrivateNoArgsConstructorTest.java @@ -3,12 +3,14 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import io.quarkus.arc.test.ArcTestContainer; import javax.enterprise.context.ApplicationScoped; import javax.enterprise.inject.spi.DeploymentException; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.test.ArcTestContainer; + public class NormalScopedPrivateNoArgsConstructorTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/validation/ProducerFieldMultipleScopesTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/validation/ProducerFieldMultipleScopesTest.java index 8a4dd503b86fe..caf2308068e8d 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/validation/ProducerFieldMultipleScopesTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/validation/ProducerFieldMultipleScopesTest.java @@ -3,16 +3,19 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import io.quarkus.arc.test.ArcTestContainer; import java.util.List; + import javax.enterprise.context.ApplicationScoped; import javax.enterprise.context.Dependent; import javax.enterprise.context.RequestScoped; import javax.enterprise.inject.Produces; import javax.enterprise.inject.spi.DefinitionException; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.test.ArcTestContainer; + public class ProducerFieldMultipleScopesTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/validation/ProducerMethodMultipleScopesTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/validation/ProducerMethodMultipleScopesTest.java index 681fc10bba887..85f6ac327d5e9 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/validation/ProducerMethodMultipleScopesTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/validation/ProducerMethodMultipleScopesTest.java @@ -3,16 +3,19 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import io.quarkus.arc.test.ArcTestContainer; import java.util.List; + import javax.enterprise.context.ApplicationScoped; import javax.enterprise.context.Dependent; import javax.enterprise.context.RequestScoped; import javax.enterprise.inject.Produces; import javax.enterprise.inject.spi.DefinitionException; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.test.ArcTestContainer; + public class ProducerMethodMultipleScopesTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/validation/Simple.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/validation/Simple.java index d71dec60e40f2..036466f573e96 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/validation/Simple.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/validation/Simple.java @@ -7,6 +7,7 @@ import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; + import javax.interceptor.InterceptorBinding; @Target({ TYPE, METHOD }) diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/validation/StereotypeOnFieldTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/validation/StereotypeOnFieldTest.java index 5b755d4b3b053..92da8e090f1f2 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/validation/StereotypeOnFieldTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/validation/StereotypeOnFieldTest.java @@ -3,17 +3,20 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import io.quarkus.arc.test.ArcTestContainer; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; + import javax.enterprise.context.ApplicationScoped; import javax.enterprise.inject.Stereotype; import javax.enterprise.inject.spi.DefinitionException; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.test.ArcTestContainer; + public class StereotypeOnFieldTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/validation/StereotypeOnMethodTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/validation/StereotypeOnMethodTest.java index e7ab38e7b59be..320c0d2bbfa9d 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/validation/StereotypeOnMethodTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/validation/StereotypeOnMethodTest.java @@ -3,17 +3,20 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import io.quarkus.arc.test.ArcTestContainer; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; + import javax.enterprise.context.ApplicationScoped; import javax.enterprise.inject.Stereotype; import javax.enterprise.inject.spi.DefinitionException; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.test.ArcTestContainer; + public class StereotypeOnMethodTest { @RegisterExtension diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/vetoed/Logging.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/vetoed/Logging.java index 7f2834ff2146e..1525641c2855a 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/vetoed/Logging.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/vetoed/Logging.java @@ -7,6 +7,7 @@ import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; + import javax.interceptor.InterceptorBinding; @Target({ TYPE, METHOD }) diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/vetoed/VetoedTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/vetoed/VetoedTest.java index 0447ddd673719..319dca8810975 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/vetoed/VetoedTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/vetoed/VetoedTest.java @@ -4,20 +4,23 @@ import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; -import io.quarkus.arc.Arc; -import io.quarkus.arc.ArcContainer; -import io.quarkus.arc.test.ArcTestContainer; import java.util.AbstractList; import java.util.concurrent.atomic.AtomicBoolean; + import javax.annotation.Priority; import javax.enterprise.context.Dependent; import javax.enterprise.inject.Vetoed; import javax.interceptor.AroundInvoke; import javax.interceptor.Interceptor; import javax.interceptor.InvocationContext; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; +import io.quarkus.arc.ArcContainer; +import io.quarkus.arc.test.ArcTestContainer; + public class VetoedTest { @RegisterExtension diff --git a/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/model/AppArtifact.java b/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/model/AppArtifact.java index e067014f56063..23d5751479c88 100644 --- a/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/model/AppArtifact.java +++ b/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/model/AppArtifact.java @@ -1,11 +1,12 @@ package io.quarkus.bootstrap.model; +import java.io.Serializable; +import java.nio.file.Path; + import io.quarkus.bootstrap.workspace.WorkspaceModule; import io.quarkus.maven.dependency.ResolvedDependency; import io.quarkus.paths.PathCollection; import io.quarkus.paths.PathList; -import java.io.Serializable; -import java.nio.file.Path; /** * Represents an application (or its dependency) artifact. diff --git a/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/model/AppArtifactCoords.java b/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/model/AppArtifactCoords.java index cff61568d44b4..437dc609e39ec 100644 --- a/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/model/AppArtifactCoords.java +++ b/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/model/AppArtifactCoords.java @@ -2,11 +2,12 @@ import static java.util.Objects.requireNonNull; -import io.quarkus.maven.dependency.ArtifactCoords; -import io.quarkus.maven.dependency.GACT; import java.io.Serializable; import java.util.Objects; +import io.quarkus.maven.dependency.ArtifactCoords; +import io.quarkus.maven.dependency.GACT; + /** * GroupId, artifactId, classifier, type, version * diff --git a/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/model/AppArtifactKey.java b/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/model/AppArtifactKey.java index 96c27390820d1..d2c91d0f2dccf 100644 --- a/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/model/AppArtifactKey.java +++ b/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/model/AppArtifactKey.java @@ -1,8 +1,9 @@ package io.quarkus.bootstrap.model; +import java.io.Serializable; + import io.quarkus.maven.dependency.ArtifactKey; import io.quarkus.maven.dependency.GACT; -import java.io.Serializable; /** * GroupId, artifactId and classifier diff --git a/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/model/AppDependency.java b/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/model/AppDependency.java index c6abfa68bc6e7..4c74856d5f9b3 100644 --- a/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/model/AppDependency.java +++ b/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/model/AppDependency.java @@ -1,11 +1,12 @@ package io.quarkus.bootstrap.model; +import java.io.Serializable; +import java.util.Objects; + import io.quarkus.maven.dependency.ArtifactKey; import io.quarkus.maven.dependency.DependencyFlags; import io.quarkus.maven.dependency.ResolvedDependency; import io.quarkus.paths.PathCollection; -import java.io.Serializable; -import java.util.Objects; public class AppDependency implements ResolvedDependency, Serializable { diff --git a/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/model/AppModel.java b/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/model/AppModel.java index f80655fed5429..46335966a5c19 100644 --- a/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/model/AppModel.java +++ b/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/model/AppModel.java @@ -1,7 +1,5 @@ package io.quarkus.bootstrap.model; -import io.quarkus.maven.dependency.ArtifactKey; -import io.quarkus.maven.dependency.ResolvedDependency; import java.io.Serializable; import java.util.ArrayList; import java.util.Collection; @@ -14,8 +12,12 @@ import java.util.Set; import java.util.function.Predicate; import java.util.stream.Collectors; + import org.jboss.logging.Logger; +import io.quarkus.maven.dependency.ArtifactKey; +import io.quarkus.maven.dependency.ResolvedDependency; + /** * A representation of the Quarkus dependency model for a given application. * diff --git a/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/model/ApplicationModel.java b/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/model/ApplicationModel.java index dfebda76a2d00..1f94f001c2764 100644 --- a/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/model/ApplicationModel.java +++ b/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/model/ApplicationModel.java @@ -1,10 +1,5 @@ package io.quarkus.bootstrap.model; -import io.quarkus.bootstrap.workspace.WorkspaceModule; -import io.quarkus.bootstrap.workspace.WorkspaceModuleId; -import io.quarkus.maven.dependency.ArtifactKey; -import io.quarkus.maven.dependency.Dependency; -import io.quarkus.maven.dependency.ResolvedDependency; import java.util.Collection; import java.util.Collections; import java.util.HashMap; @@ -12,6 +7,12 @@ import java.util.Set; import java.util.stream.Collectors; +import io.quarkus.bootstrap.workspace.WorkspaceModule; +import io.quarkus.bootstrap.workspace.WorkspaceModuleId; +import io.quarkus.maven.dependency.ArtifactKey; +import io.quarkus.maven.dependency.Dependency; +import io.quarkus.maven.dependency.ResolvedDependency; + public interface ApplicationModel { ResolvedDependency getAppArtifact(); diff --git a/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/model/ApplicationModelBuilder.java b/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/model/ApplicationModelBuilder.java index cd4d9f76075a6..79fd8dc2d54fe 100644 --- a/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/model/ApplicationModelBuilder.java +++ b/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/model/ApplicationModelBuilder.java @@ -1,12 +1,5 @@ package io.quarkus.bootstrap.model; -import io.quarkus.bootstrap.workspace.WorkspaceModule; -import io.quarkus.bootstrap.workspace.WorkspaceModuleId; -import io.quarkus.maven.dependency.ArtifactKey; -import io.quarkus.maven.dependency.DependencyFlags; -import io.quarkus.maven.dependency.GACT; -import io.quarkus.maven.dependency.ResolvedDependency; -import io.quarkus.maven.dependency.ResolvedDependencyBuilder; import java.io.File; import java.util.ArrayList; import java.util.Collection; @@ -17,8 +10,17 @@ import java.util.Map; import java.util.Properties; import java.util.Set; + import org.jboss.logging.Logger; +import io.quarkus.bootstrap.workspace.WorkspaceModule; +import io.quarkus.bootstrap.workspace.WorkspaceModuleId; +import io.quarkus.maven.dependency.ArtifactKey; +import io.quarkus.maven.dependency.DependencyFlags; +import io.quarkus.maven.dependency.GACT; +import io.quarkus.maven.dependency.ResolvedDependency; +import io.quarkus.maven.dependency.ResolvedDependencyBuilder; + public class ApplicationModelBuilder { public static final String PARENT_FIRST_ARTIFACTS = "parent-first-artifacts"; diff --git a/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/model/DefaultApplicationModel.java b/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/model/DefaultApplicationModel.java index 945e37337031a..2b80f9cb4952f 100644 --- a/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/model/DefaultApplicationModel.java +++ b/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/model/DefaultApplicationModel.java @@ -1,9 +1,5 @@ package io.quarkus.bootstrap.model; -import io.quarkus.maven.dependency.ArtifactKey; -import io.quarkus.maven.dependency.Dependency; -import io.quarkus.maven.dependency.DependencyFlags; -import io.quarkus.maven.dependency.ResolvedDependency; import java.io.Serializable; import java.util.Collection; import java.util.List; @@ -11,6 +7,11 @@ import java.util.Set; import java.util.stream.Collectors; +import io.quarkus.maven.dependency.ArtifactKey; +import io.quarkus.maven.dependency.Dependency; +import io.quarkus.maven.dependency.DependencyFlags; +import io.quarkus.maven.dependency.ResolvedDependency; + public class DefaultApplicationModel implements ApplicationModel, Serializable { private static final long serialVersionUID = -3878782344578748234L; diff --git a/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/model/MutableJarApplicationModel.java b/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/model/MutableJarApplicationModel.java index d311227800d56..b705dac6dde86 100644 --- a/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/model/MutableJarApplicationModel.java +++ b/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/model/MutableJarApplicationModel.java @@ -1,10 +1,5 @@ package io.quarkus.bootstrap.model; -import io.quarkus.maven.dependency.ArtifactKey; -import io.quarkus.maven.dependency.GACTV; -import io.quarkus.maven.dependency.ResolvedDependency; -import io.quarkus.maven.dependency.ResolvedDependencyBuilder; -import io.quarkus.paths.PathList; import java.io.Serializable; import java.nio.file.Path; import java.util.ArrayList; @@ -17,6 +12,12 @@ import java.util.Set; import java.util.stream.Collectors; +import io.quarkus.maven.dependency.ArtifactKey; +import io.quarkus.maven.dependency.GACTV; +import io.quarkus.maven.dependency.ResolvedDependency; +import io.quarkus.maven.dependency.ResolvedDependencyBuilder; +import io.quarkus.paths.PathList; + /** * A representation of AppModel, that has been serialized to disk for an existing application. *

diff --git a/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/model/PathsCollection.java b/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/model/PathsCollection.java index 46619f101922f..fda4c17ae234b 100644 --- a/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/model/PathsCollection.java +++ b/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/model/PathsCollection.java @@ -1,6 +1,5 @@ package io.quarkus.bootstrap.model; -import io.quarkus.paths.PathCollection; import java.io.IOException; import java.io.Serializable; import java.nio.file.Files; @@ -13,6 +12,8 @@ import java.util.Iterator; import java.util.List; +import io.quarkus.paths.PathCollection; + public class PathsCollection implements PathCollection, Serializable { private static final long serialVersionUID = -7214825505580070033L; diff --git a/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/model/PlatformImports.java b/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/model/PlatformImports.java index 5022cebd04442..2eaf421801162 100644 --- a/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/model/PlatformImports.java +++ b/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/model/PlatformImports.java @@ -1,9 +1,10 @@ package io.quarkus.bootstrap.model; -import io.quarkus.maven.dependency.ArtifactCoords; import java.util.Collection; import java.util.Map; +import io.quarkus.maven.dependency.ArtifactCoords; + public interface PlatformImports { /** diff --git a/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/model/PlatformImportsImpl.java b/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/model/PlatformImportsImpl.java index 87b1d1a4e0019..1b747cb158390 100644 --- a/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/model/PlatformImportsImpl.java +++ b/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/model/PlatformImportsImpl.java @@ -1,8 +1,5 @@ package io.quarkus.bootstrap.model; -import io.quarkus.bootstrap.BootstrapConstants; -import io.quarkus.bootstrap.resolver.AppModelResolverException; -import io.quarkus.maven.dependency.ArtifactCoords; import java.io.BufferedWriter; import java.io.IOException; import java.io.InputStream; @@ -17,6 +14,10 @@ import java.util.Map; import java.util.Properties; +import io.quarkus.bootstrap.BootstrapConstants; +import io.quarkus.bootstrap.resolver.AppModelResolverException; +import io.quarkus.maven.dependency.ArtifactCoords; + public class PlatformImportsImpl implements PlatformImports, Serializable { private static final long serialVersionUID = -1722573527738064746L; diff --git a/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/model/PlatformInfo.java b/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/model/PlatformInfo.java index 9825fa508c3d4..491df20fd4ca5 100644 --- a/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/model/PlatformInfo.java +++ b/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/model/PlatformInfo.java @@ -1,12 +1,13 @@ package io.quarkus.bootstrap.model; -import io.quarkus.maven.dependency.ArtifactCoords; import java.io.Serializable; import java.util.ArrayList; import java.util.Collection; import java.util.Iterator; import java.util.List; +import io.quarkus.maven.dependency.ArtifactCoords; + public class PlatformInfo implements Serializable { private static final long serialVersionUID = 7143227956636416934L; diff --git a/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/model/PlatformReleaseInfo.java b/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/model/PlatformReleaseInfo.java index dffdad4feb0e3..edc14c9d71678 100644 --- a/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/model/PlatformReleaseInfo.java +++ b/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/model/PlatformReleaseInfo.java @@ -1,11 +1,12 @@ package io.quarkus.bootstrap.model; -import io.quarkus.maven.dependency.ArtifactCoords; -import io.quarkus.maven.dependency.GACTV; import java.io.Serializable; import java.util.ArrayList; import java.util.List; +import io.quarkus.maven.dependency.ArtifactCoords; +import io.quarkus.maven.dependency.GACTV; + /** * Platform release info that is encoded into a property in a platform properties artifact * following the format {@code platform.release-info@$#=(,)} diff --git a/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/model/PlatformStreamInfo.java b/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/model/PlatformStreamInfo.java index d0de2b5faf01b..5ac2fd690765d 100644 --- a/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/model/PlatformStreamInfo.java +++ b/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/model/PlatformStreamInfo.java @@ -1,7 +1,5 @@ package io.quarkus.bootstrap.model; -import io.quarkus.maven.dependency.ArtifactCoords; -import io.quarkus.maven.dependency.ArtifactKey; import java.io.Serializable; import java.util.ArrayList; import java.util.Collection; @@ -10,6 +8,9 @@ import java.util.Map; import java.util.function.Supplier; +import io.quarkus.maven.dependency.ArtifactCoords; +import io.quarkus.maven.dependency.ArtifactKey; + public class PlatformStreamInfo implements Serializable { private static final long serialVersionUID = 7472307823974997268L; diff --git a/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/model/gradle/impl/ModelParameterImpl.java b/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/model/gradle/impl/ModelParameterImpl.java index 4868f9cfc1092..ca6ed4777062f 100644 --- a/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/model/gradle/impl/ModelParameterImpl.java +++ b/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/model/gradle/impl/ModelParameterImpl.java @@ -1,8 +1,9 @@ package io.quarkus.bootstrap.model.gradle.impl; -import io.quarkus.bootstrap.model.gradle.ModelParameter; import java.io.Serializable; +import io.quarkus.bootstrap.model.gradle.ModelParameter; + public class ModelParameterImpl implements ModelParameter, Serializable { private static final long serialVersionUID = 4617775770506785059L; diff --git a/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/resolver/AppModelResolver.java b/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/resolver/AppModelResolver.java index a7bb1703663eb..8287c5f7623fb 100644 --- a/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/resolver/AppModelResolver.java +++ b/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/resolver/AppModelResolver.java @@ -1,16 +1,17 @@ package io.quarkus.bootstrap.resolver; -import io.quarkus.bootstrap.model.ApplicationModel; -import io.quarkus.maven.dependency.ArtifactCoords; -import io.quarkus.maven.dependency.ArtifactKey; -import io.quarkus.maven.dependency.Dependency; -import io.quarkus.maven.dependency.ResolvedDependency; import java.nio.file.Path; import java.util.Collection; import java.util.Collections; import java.util.List; import java.util.Set; +import io.quarkus.bootstrap.model.ApplicationModel; +import io.quarkus.maven.dependency.ArtifactCoords; +import io.quarkus.maven.dependency.ArtifactKey; +import io.quarkus.maven.dependency.Dependency; +import io.quarkus.maven.dependency.ResolvedDependency; + /** * Application model resolver used to resolve application and/or its dependency artifacts. * diff --git a/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/util/BootstrapUtils.java b/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/util/BootstrapUtils.java index 318f87a2b341f..ed026079a73a3 100644 --- a/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/util/BootstrapUtils.java +++ b/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/util/BootstrapUtils.java @@ -1,5 +1,17 @@ package io.quarkus.bootstrap.util; +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.ArrayList; +import java.util.function.Function; +import java.util.regex.Pattern; +import java.util.stream.Collectors; + import io.quarkus.bootstrap.BootstrapConstants; import io.quarkus.bootstrap.model.AppArtifact; import io.quarkus.bootstrap.model.AppArtifactKey; @@ -13,17 +25,6 @@ import io.quarkus.maven.dependency.DependencyFlags; import io.quarkus.maven.dependency.GACT; import io.quarkus.maven.dependency.ResolvedDependency; -import java.io.File; -import java.io.IOException; -import java.io.InputStream; -import java.io.ObjectInputStream; -import java.io.ObjectOutputStream; -import java.nio.file.Files; -import java.nio.file.Path; -import java.util.ArrayList; -import java.util.function.Function; -import java.util.regex.Pattern; -import java.util.stream.Collectors; public class BootstrapUtils { diff --git a/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/workspace/ArtifactSources.java b/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/workspace/ArtifactSources.java index f4016b2dd5074..5b8e385f08b00 100644 --- a/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/workspace/ArtifactSources.java +++ b/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/workspace/ArtifactSources.java @@ -1,12 +1,13 @@ package io.quarkus.bootstrap.workspace; -import io.quarkus.paths.EmptyPathTree; -import io.quarkus.paths.MultiRootPathTree; -import io.quarkus.paths.PathTree; import java.util.ArrayList; import java.util.Collection; import java.util.List; +import io.quarkus.paths.EmptyPathTree; +import io.quarkus.paths.MultiRootPathTree; +import io.quarkus.paths.PathTree; + public interface ArtifactSources { String MAIN = ""; diff --git a/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/workspace/DefaultSourceDir.java b/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/workspace/DefaultSourceDir.java index 7db0ff9e0c738..38091c0cf60ad 100644 --- a/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/workspace/DefaultSourceDir.java +++ b/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/workspace/DefaultSourceDir.java @@ -1,7 +1,5 @@ package io.quarkus.bootstrap.workspace; -import io.quarkus.paths.DirectoryPathTree; -import io.quarkus.paths.PathTree; import java.io.Serializable; import java.nio.file.Path; import java.util.Collections; @@ -9,6 +7,9 @@ import java.util.Map; import java.util.Objects; +import io.quarkus.paths.DirectoryPathTree; +import io.quarkus.paths.PathTree; + public class DefaultSourceDir implements SourceDir, Serializable { private static final long serialVersionUID = 6544177650615687691L; diff --git a/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/workspace/DefaultWorkspaceModule.java b/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/workspace/DefaultWorkspaceModule.java index dd6b849576a34..64c472fb67e4e 100644 --- a/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/workspace/DefaultWorkspaceModule.java +++ b/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/workspace/DefaultWorkspaceModule.java @@ -1,8 +1,5 @@ package io.quarkus.bootstrap.workspace; -import io.quarkus.maven.dependency.Dependency; -import io.quarkus.paths.PathCollection; -import io.quarkus.paths.PathList; import java.io.File; import java.io.Serializable; import java.nio.file.Path; @@ -13,6 +10,10 @@ import java.util.List; import java.util.Map; +import io.quarkus.maven.dependency.Dependency; +import io.quarkus.paths.PathCollection; +import io.quarkus.paths.PathList; + public class DefaultWorkspaceModule implements WorkspaceModule, Serializable { private static final long serialVersionUID = 6906903256002107806L; diff --git a/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/workspace/SourceDir.java b/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/workspace/SourceDir.java index ff78be5821a21..18d066fb56f1d 100644 --- a/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/workspace/SourceDir.java +++ b/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/workspace/SourceDir.java @@ -1,9 +1,10 @@ package io.quarkus.bootstrap.workspace; -import io.quarkus.paths.PathTree; import java.nio.file.Files; import java.nio.file.Path; +import io.quarkus.paths.PathTree; + public interface SourceDir { static SourceDir of(Path src, Path dest) { diff --git a/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/workspace/WorkspaceModule.java b/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/workspace/WorkspaceModule.java index dd00e3ee1fb9e..a8a92800e19d1 100644 --- a/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/workspace/WorkspaceModule.java +++ b/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/workspace/WorkspaceModule.java @@ -1,14 +1,15 @@ package io.quarkus.bootstrap.workspace; -import io.quarkus.maven.dependency.Dependency; -import io.quarkus.paths.EmptyPathTree; -import io.quarkus.paths.PathCollection; -import io.quarkus.paths.PathTree; import java.io.File; import java.nio.file.Path; import java.util.Collection; import java.util.List; +import io.quarkus.maven.dependency.Dependency; +import io.quarkus.paths.EmptyPathTree; +import io.quarkus.paths.PathCollection; +import io.quarkus.paths.PathTree; + public interface WorkspaceModule { static Mutable builder() { diff --git a/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/maven/ArtifactCoords.java b/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/maven/ArtifactCoords.java index 8e92fc06a866d..85110c4c65bab 100644 --- a/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/maven/ArtifactCoords.java +++ b/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/maven/ArtifactCoords.java @@ -1,9 +1,10 @@ package io.quarkus.maven; -import io.quarkus.maven.dependency.GACT; import java.io.Serializable; import java.util.Objects; +import io.quarkus.maven.dependency.GACT; + @Deprecated(forRemoval = true) /** * WARNING: DO NOT USE THIS CLASS @@ -143,4 +144,4 @@ public String toCompactCoords() { b.append(getVersion()); return b.toString(); } -} \ No newline at end of file +} diff --git a/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/maven/ArtifactKey.java b/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/maven/ArtifactKey.java index bcbfdcd8dda55..0211e16fe45c2 100644 --- a/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/maven/ArtifactKey.java +++ b/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/maven/ArtifactKey.java @@ -1,9 +1,10 @@ package io.quarkus.maven; -import io.quarkus.maven.dependency.GACT; import java.io.Serializable; import java.util.Objects; +import io.quarkus.maven.dependency.GACT; + @Deprecated(forRemoval = true) /** * WARNING: DO NOT USE THIS CLASS @@ -100,4 +101,4 @@ public String toString() { } return buf.toString(); } -} \ No newline at end of file +} diff --git a/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/maven/dependency/GAV.java b/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/maven/dependency/GAV.java index 2cc3028ee22ff..437d397745feb 100644 --- a/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/maven/dependency/GAV.java +++ b/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/maven/dependency/GAV.java @@ -1,9 +1,10 @@ package io.quarkus.maven.dependency; -import io.quarkus.bootstrap.workspace.WorkspaceModuleId; import java.io.Serializable; import java.util.Objects; +import io.quarkus.bootstrap.workspace.WorkspaceModuleId; + public class GAV implements WorkspaceModuleId, Serializable { private static final long serialVersionUID = -1110768961345248967L; diff --git a/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/maven/dependency/ResolvedArtifactDependency.java b/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/maven/dependency/ResolvedArtifactDependency.java index a8d9751376e78..e8788cd70f53b 100644 --- a/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/maven/dependency/ResolvedArtifactDependency.java +++ b/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/maven/dependency/ResolvedArtifactDependency.java @@ -1,12 +1,13 @@ package io.quarkus.maven.dependency; +import java.io.Serializable; +import java.nio.file.Path; +import java.util.Objects; + import io.quarkus.bootstrap.workspace.WorkspaceModule; import io.quarkus.paths.PathCollection; import io.quarkus.paths.PathList; import io.quarkus.paths.PathTree; -import java.io.Serializable; -import java.nio.file.Path; -import java.util.Objects; public class ResolvedArtifactDependency extends ArtifactDependency implements ResolvableDependency, Serializable { diff --git a/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/maven/dependency/ResolvedDependency.java b/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/maven/dependency/ResolvedDependency.java index 0fd66e33dd9a0..392a844ee9863 100644 --- a/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/maven/dependency/ResolvedDependency.java +++ b/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/maven/dependency/ResolvedDependency.java @@ -1,12 +1,13 @@ package io.quarkus.maven.dependency; +import java.nio.file.Path; + import io.quarkus.bootstrap.workspace.ArtifactSources; import io.quarkus.bootstrap.workspace.WorkspaceModule; import io.quarkus.paths.EmptyPathTree; import io.quarkus.paths.MultiRootPathTree; import io.quarkus.paths.PathCollection; import io.quarkus.paths.PathTree; -import java.nio.file.Path; public interface ResolvedDependency extends Dependency { diff --git a/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/maven/dependency/ResolvedDependencyBuilder.java b/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/maven/dependency/ResolvedDependencyBuilder.java index d394460843a3a..551898e1f7d8f 100644 --- a/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/maven/dependency/ResolvedDependencyBuilder.java +++ b/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/maven/dependency/ResolvedDependencyBuilder.java @@ -1,9 +1,10 @@ package io.quarkus.maven.dependency; +import java.nio.file.Path; + import io.quarkus.bootstrap.workspace.WorkspaceModule; import io.quarkus.paths.PathCollection; import io.quarkus.paths.PathList; -import java.nio.file.Path; public class ResolvedDependencyBuilder extends AbstractDependencyBuilder { diff --git a/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/paths/ArchivePathTree.java b/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/paths/ArchivePathTree.java index 13214b2a2214d..6a34410efe4a9 100644 --- a/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/paths/ArchivePathTree.java +++ b/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/paths/ArchivePathTree.java @@ -1,6 +1,5 @@ package io.quarkus.paths; -import io.quarkus.fs.util.ZipUtils; import java.io.IOException; import java.io.UncheckedIOException; import java.nio.file.FileSystem; @@ -15,6 +14,8 @@ import java.util.function.Function; import java.util.jar.Manifest; +import io.quarkus.fs.util.ZipUtils; + public class ArchivePathTree extends PathTreeWithManifest implements PathTree { private final Path archive; diff --git a/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/paths/PathFilter.java b/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/paths/PathFilter.java index 0ce24323c0077..9ea7d81d5d0c5 100644 --- a/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/paths/PathFilter.java +++ b/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/paths/PathFilter.java @@ -1,6 +1,5 @@ package io.quarkus.paths; -import io.quarkus.util.GlobUtil; import java.io.Serializable; import java.util.ArrayList; import java.util.Collection; @@ -8,6 +7,8 @@ import java.util.Objects; import java.util.regex.Pattern; +import io.quarkus.util.GlobUtil; + public class PathFilter implements Serializable { private static final long serialVersionUID = -5712472676677054175L; diff --git a/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/paths/PathTreeWithManifest.java b/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/paths/PathTreeWithManifest.java index dacbc4284603f..7a1fe1a9de4dd 100644 --- a/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/paths/PathTreeWithManifest.java +++ b/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/paths/PathTreeWithManifest.java @@ -17,6 +17,7 @@ import java.util.function.Function; import java.util.jar.Manifest; import java.util.stream.Stream; + import org.jboss.logging.Logger; public abstract class PathTreeWithManifest implements PathTree { diff --git a/independent-projects/bootstrap/app-model/src/test/java/io/quarkus/bootstrap/model/PlatformImportsTest.java b/independent-projects/bootstrap/app-model/src/test/java/io/quarkus/bootstrap/model/PlatformImportsTest.java index 8afa13dc83617..56106751314b2 100644 --- a/independent-projects/bootstrap/app-model/src/test/java/io/quarkus/bootstrap/model/PlatformImportsTest.java +++ b/independent-projects/bootstrap/app-model/src/test/java/io/quarkus/bootstrap/model/PlatformImportsTest.java @@ -5,9 +5,6 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import io.quarkus.bootstrap.util.IoUtils; -import io.quarkus.maven.dependency.ArtifactCoords; -import io.quarkus.maven.dependency.GACTV; import java.io.BufferedReader; import java.io.BufferedWriter; import java.io.IOException; @@ -19,9 +16,14 @@ import java.util.List; import java.util.Map; import java.util.Properties; + import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; +import io.quarkus.bootstrap.util.IoUtils; +import io.quarkus.maven.dependency.ArtifactCoords; +import io.quarkus.maven.dependency.GACTV; + public class PlatformImportsTest { private final List platformProps = new ArrayList<>(); diff --git a/independent-projects/bootstrap/app-model/src/test/java/io/quarkus/bootstrap/model/PlatformInfoTest.java b/independent-projects/bootstrap/app-model/src/test/java/io/quarkus/bootstrap/model/PlatformInfoTest.java index 1e95064e6f3d9..d034732966f8e 100644 --- a/independent-projects/bootstrap/app-model/src/test/java/io/quarkus/bootstrap/model/PlatformInfoTest.java +++ b/independent-projects/bootstrap/app-model/src/test/java/io/quarkus/bootstrap/model/PlatformInfoTest.java @@ -3,11 +3,13 @@ import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; -import io.quarkus.maven.dependency.GACTV; import java.util.Arrays; import java.util.Collections; + import org.junit.jupiter.api.Test; +import io.quarkus.maven.dependency.GACTV; + public class PlatformInfoTest { @Test diff --git a/independent-projects/bootstrap/app-model/src/test/java/io/quarkus/bootstrap/model/PlatformStreamInfoTest.java b/independent-projects/bootstrap/app-model/src/test/java/io/quarkus/bootstrap/model/PlatformStreamInfoTest.java index 9f41cd6cf5826..fa32c8a181038 100644 --- a/independent-projects/bootstrap/app-model/src/test/java/io/quarkus/bootstrap/model/PlatformStreamInfoTest.java +++ b/independent-projects/bootstrap/app-model/src/test/java/io/quarkus/bootstrap/model/PlatformStreamInfoTest.java @@ -3,11 +3,13 @@ import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; -import io.quarkus.maven.dependency.GACTV; import java.util.Arrays; import java.util.Collections; + import org.junit.jupiter.api.Test; +import io.quarkus.maven.dependency.GACTV; + public class PlatformStreamInfoTest { @Test diff --git a/independent-projects/bootstrap/app-model/src/test/java/io/quarkus/paths/DirectoryPathTreeTest.java b/independent-projects/bootstrap/app-model/src/test/java/io/quarkus/paths/DirectoryPathTreeTest.java index 9042660ae4e05..71d52dbf78c90 100644 --- a/independent-projects/bootstrap/app-model/src/test/java/io/quarkus/paths/DirectoryPathTreeTest.java +++ b/independent-projects/bootstrap/app-model/src/test/java/io/quarkus/paths/DirectoryPathTreeTest.java @@ -11,6 +11,7 @@ import java.nio.file.Path; import java.util.HashSet; import java.util.Set; + import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/independent-projects/bootstrap/app-model/src/test/java/io/quarkus/paths/JarPathTreeTest.java b/independent-projects/bootstrap/app-model/src/test/java/io/quarkus/paths/JarPathTreeTest.java index 70cc9c6cd0b0d..757eec3255735 100644 --- a/independent-projects/bootstrap/app-model/src/test/java/io/quarkus/paths/JarPathTreeTest.java +++ b/independent-projects/bootstrap/app-model/src/test/java/io/quarkus/paths/JarPathTreeTest.java @@ -4,7 +4,6 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.junit.jupiter.api.Assertions.fail; -import io.quarkus.fs.util.ZipUtils; import java.io.IOException; import java.io.UncheckedIOException; import java.net.URL; @@ -12,9 +11,12 @@ import java.nio.file.Path; import java.util.HashSet; import java.util.Set; + import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; +import io.quarkus.fs.util.ZipUtils; + public class JarPathTreeTest { private static final String BASE_DIR = "paths/directory-path-tree"; diff --git a/independent-projects/bootstrap/app-model/src/test/java/io/quarkus/util/GlobUtilTest.java b/independent-projects/bootstrap/app-model/src/test/java/io/quarkus/util/GlobUtilTest.java index d3df4885a7c7b..7ec0ebecdd943 100644 --- a/independent-projects/bootstrap/app-model/src/test/java/io/quarkus/util/GlobUtilTest.java +++ b/independent-projects/bootstrap/app-model/src/test/java/io/quarkus/util/GlobUtilTest.java @@ -5,6 +5,7 @@ import java.util.List; import java.util.regex.Pattern; import java.util.regex.PatternSyntaxException; + import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/BootstrapAppModelFactory.java b/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/BootstrapAppModelFactory.java index 9fb1554c640c3..410640b31a9e7 100644 --- a/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/BootstrapAppModelFactory.java +++ b/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/BootstrapAppModelFactory.java @@ -1,20 +1,5 @@ package io.quarkus.bootstrap; -import io.quarkus.bootstrap.app.CurationResult; -import io.quarkus.bootstrap.model.ApplicationModel; -import io.quarkus.bootstrap.resolver.AppModelResolver; -import io.quarkus.bootstrap.resolver.AppModelResolverException; -import io.quarkus.bootstrap.resolver.BootstrapAppModelResolver; -import io.quarkus.bootstrap.resolver.maven.BootstrapMavenContext; -import io.quarkus.bootstrap.resolver.maven.BootstrapMavenContextConfig; -import io.quarkus.bootstrap.resolver.maven.MavenArtifactResolver; -import io.quarkus.bootstrap.resolver.maven.workspace.LocalProject; -import io.quarkus.bootstrap.resolver.maven.workspace.LocalWorkspace; -import io.quarkus.bootstrap.resolver.maven.workspace.ModelUtils; -import io.quarkus.bootstrap.util.IoUtils; -import io.quarkus.maven.dependency.ArtifactCoords; -import io.quarkus.maven.dependency.ArtifactKey; -import io.quarkus.maven.dependency.ResolvedDependency; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; @@ -30,9 +15,26 @@ import java.util.HashSet; import java.util.List; import java.util.Set; + import org.apache.maven.model.Dependency; import org.jboss.logging.Logger; +import io.quarkus.bootstrap.app.CurationResult; +import io.quarkus.bootstrap.model.ApplicationModel; +import io.quarkus.bootstrap.resolver.AppModelResolver; +import io.quarkus.bootstrap.resolver.AppModelResolverException; +import io.quarkus.bootstrap.resolver.BootstrapAppModelResolver; +import io.quarkus.bootstrap.resolver.maven.BootstrapMavenContext; +import io.quarkus.bootstrap.resolver.maven.BootstrapMavenContextConfig; +import io.quarkus.bootstrap.resolver.maven.MavenArtifactResolver; +import io.quarkus.bootstrap.resolver.maven.workspace.LocalProject; +import io.quarkus.bootstrap.resolver.maven.workspace.LocalWorkspace; +import io.quarkus.bootstrap.resolver.maven.workspace.ModelUtils; +import io.quarkus.bootstrap.util.IoUtils; +import io.quarkus.maven.dependency.ArtifactCoords; +import io.quarkus.maven.dependency.ArtifactKey; +import io.quarkus.maven.dependency.ResolvedDependency; + /** * The factory that creates the application dependency model. * diff --git a/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/IDELauncherImpl.java b/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/IDELauncherImpl.java index b0390e2bc9124..508e3addc5873 100644 --- a/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/IDELauncherImpl.java +++ b/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/IDELauncherImpl.java @@ -1,5 +1,12 @@ package io.quarkus.bootstrap; +import java.io.Closeable; +import java.io.IOException; +import java.nio.file.Path; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + import io.quarkus.bootstrap.app.AdditionalDependency; import io.quarkus.bootstrap.app.CuratedApplication; import io.quarkus.bootstrap.app.QuarkusBootstrap; @@ -13,12 +20,6 @@ import io.quarkus.bootstrap.workspace.SourceDir; import io.quarkus.bootstrap.workspace.WorkspaceModule; import io.quarkus.maven.dependency.ResolvedDependency; -import java.io.Closeable; -import java.io.IOException; -import java.nio.file.Path; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; /** * IDE entry point. diff --git a/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/app/AdditionalDependency.java b/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/app/AdditionalDependency.java index 5862c65b0cae3..80a81e2e57935 100644 --- a/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/app/AdditionalDependency.java +++ b/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/app/AdditionalDependency.java @@ -1,10 +1,11 @@ package io.quarkus.bootstrap.app; +import java.io.Serializable; +import java.nio.file.Path; + import io.quarkus.bootstrap.model.PathsCollection; import io.quarkus.paths.PathCollection; import io.quarkus.paths.PathList; -import java.io.Serializable; -import java.nio.file.Path; /** * An additional archive that should be added to the generated application. diff --git a/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/app/ConfiguredClassLoading.java b/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/app/ConfiguredClassLoading.java index e93f7fb0fafce..70074a1d91c45 100644 --- a/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/app/ConfiguredClassLoading.java +++ b/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/app/ConfiguredClassLoading.java @@ -1,11 +1,5 @@ package io.quarkus.bootstrap.app; -import io.quarkus.bootstrap.app.QuarkusBootstrap.Mode; -import io.quarkus.bootstrap.model.ApplicationModel; -import io.quarkus.bootstrap.workspace.WorkspaceModule; -import io.quarkus.maven.dependency.ArtifactKey; -import io.quarkus.maven.dependency.GACT; -import io.quarkus.paths.PathCollection; import java.io.IOException; import java.io.InputStream; import java.io.Serializable; @@ -20,6 +14,13 @@ import java.util.Properties; import java.util.Set; +import io.quarkus.bootstrap.app.QuarkusBootstrap.Mode; +import io.quarkus.bootstrap.model.ApplicationModel; +import io.quarkus.bootstrap.workspace.WorkspaceModule; +import io.quarkus.maven.dependency.ArtifactKey; +import io.quarkus.maven.dependency.GACT; +import io.quarkus.paths.PathCollection; + public class ConfiguredClassLoading implements Serializable { private static final long serialVersionUID = 8458420778153976864L; diff --git a/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/app/CuratedApplication.java b/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/app/CuratedApplication.java index a6abbc6294c2e..c9e89b91d4f5b 100644 --- a/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/app/CuratedApplication.java +++ b/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/app/CuratedApplication.java @@ -1,18 +1,5 @@ package io.quarkus.bootstrap.app; -import io.quarkus.bootstrap.classloading.ClassPathElement; -import io.quarkus.bootstrap.classloading.ClassPathResource; -import io.quarkus.bootstrap.classloading.FilteredClassPathElement; -import io.quarkus.bootstrap.classloading.MemoryClassPathElement; -import io.quarkus.bootstrap.classloading.QuarkusClassLoader; -import io.quarkus.bootstrap.model.AppModel; -import io.quarkus.bootstrap.model.ApplicationModel; -import io.quarkus.bootstrap.util.BootstrapUtils; -import io.quarkus.maven.dependency.ArtifactKey; -import io.quarkus.maven.dependency.DependencyFlags; -import io.quarkus.maven.dependency.ResolvedDependency; -import io.quarkus.paths.OpenPathTree; -import io.quarkus.paths.PathTree; import java.io.IOException; import java.io.Serializable; import java.nio.file.Path; @@ -31,6 +18,20 @@ import java.util.jar.Manifest; import java.util.stream.Collectors; +import io.quarkus.bootstrap.classloading.ClassPathElement; +import io.quarkus.bootstrap.classloading.ClassPathResource; +import io.quarkus.bootstrap.classloading.FilteredClassPathElement; +import io.quarkus.bootstrap.classloading.MemoryClassPathElement; +import io.quarkus.bootstrap.classloading.QuarkusClassLoader; +import io.quarkus.bootstrap.model.AppModel; +import io.quarkus.bootstrap.model.ApplicationModel; +import io.quarkus.bootstrap.util.BootstrapUtils; +import io.quarkus.maven.dependency.ArtifactKey; +import io.quarkus.maven.dependency.DependencyFlags; +import io.quarkus.maven.dependency.ResolvedDependency; +import io.quarkus.paths.OpenPathTree; +import io.quarkus.paths.PathTree; + /** * The result of the curate step that is done by QuarkusBootstrap. * diff --git a/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/app/QuarkusBootstrap.java b/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/app/QuarkusBootstrap.java index f617b5e9fba6d..001b08b33e944 100644 --- a/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/app/QuarkusBootstrap.java +++ b/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/app/QuarkusBootstrap.java @@ -1,5 +1,16 @@ package io.quarkus.bootstrap.app; +import java.io.Serializable; +import java.nio.file.Path; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.HashSet; +import java.util.List; +import java.util.Objects; +import java.util.Properties; +import java.util.Set; + import io.quarkus.bootstrap.BootstrapAppModelFactory; import io.quarkus.bootstrap.BootstrapException; import io.quarkus.bootstrap.classloading.ClassLoaderEventListener; @@ -12,16 +23,6 @@ import io.quarkus.maven.dependency.ResolvedDependency; import io.quarkus.paths.PathCollection; import io.quarkus.paths.PathList; -import java.io.Serializable; -import java.nio.file.Path; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.HashSet; -import java.util.List; -import java.util.Objects; -import java.util.Properties; -import java.util.Set; /** * The entry point for starting/building a Quarkus application. This class sets up the base class loading diff --git a/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/classloading/AbstractClassPathElement.java b/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/classloading/AbstractClassPathElement.java index c98780f268b68..d2a2faed0a835 100644 --- a/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/classloading/AbstractClassPathElement.java +++ b/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/classloading/AbstractClassPathElement.java @@ -3,6 +3,7 @@ import java.io.ByteArrayInputStream; import java.io.IOException; import java.util.jar.Manifest; + import org.jboss.logging.Logger; public abstract class AbstractClassPathElement implements ClassPathElement { diff --git a/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/classloading/ClassPathElement.java b/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/classloading/ClassPathElement.java index 61e5cbcbd434a..26ade4b620f43 100644 --- a/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/classloading/ClassPathElement.java +++ b/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/classloading/ClassPathElement.java @@ -1,10 +1,5 @@ package io.quarkus.bootstrap.classloading; -import io.quarkus.maven.dependency.ArtifactKey; -import io.quarkus.maven.dependency.ResolvedDependency; -import io.quarkus.paths.EmptyPathTree; -import io.quarkus.paths.OpenPathTree; -import io.quarkus.paths.PathTree; import java.io.Closeable; import java.nio.file.Path; import java.security.ProtectionDomain; @@ -13,6 +8,12 @@ import java.util.function.Function; import java.util.jar.Manifest; +import io.quarkus.maven.dependency.ArtifactKey; +import io.quarkus.maven.dependency.ResolvedDependency; +import io.quarkus.paths.EmptyPathTree; +import io.quarkus.paths.OpenPathTree; +import io.quarkus.paths.PathTree; + /** * Represents an element on the virtual classpath, such as a jar file or classes * directory. diff --git a/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/classloading/DirectoryClassPathElement.java b/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/classloading/DirectoryClassPathElement.java index 267c8019704a9..ad71f5d817fab 100644 --- a/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/classloading/DirectoryClassPathElement.java +++ b/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/classloading/DirectoryClassPathElement.java @@ -1,7 +1,5 @@ package io.quarkus.bootstrap.classloading; -import io.quarkus.paths.DirectoryPathTree; -import io.quarkus.paths.OpenPathTree; import java.io.File; import java.io.IOException; import java.io.InterruptedIOException; @@ -21,6 +19,9 @@ import java.util.function.Function; import java.util.stream.Stream; +import io.quarkus.paths.DirectoryPathTree; +import io.quarkus.paths.OpenPathTree; + /** * A class path element that represents a file on the file system * diff --git a/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/classloading/DriverRemover.java b/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/classloading/DriverRemover.java index 99176b1dff7a4..6369b726630dd 100644 --- a/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/classloading/DriverRemover.java +++ b/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/classloading/DriverRemover.java @@ -4,6 +4,7 @@ import java.sql.DriverManager; import java.sql.SQLException; import java.util.Enumeration; + import org.jboss.logging.Logger; public class DriverRemover implements Runnable { diff --git a/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/classloading/FilteredClassPathElement.java b/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/classloading/FilteredClassPathElement.java index 016205bfd9f91..5e362a7e27d33 100644 --- a/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/classloading/FilteredClassPathElement.java +++ b/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/classloading/FilteredClassPathElement.java @@ -1,7 +1,5 @@ package io.quarkus.bootstrap.classloading; -import io.quarkus.maven.dependency.ArtifactKey; -import io.quarkus.paths.OpenPathTree; import java.io.IOException; import java.nio.file.Path; import java.security.ProtectionDomain; @@ -11,6 +9,9 @@ import java.util.function.Function; import java.util.jar.Manifest; +import io.quarkus.maven.dependency.ArtifactKey; +import io.quarkus.paths.OpenPathTree; + public class FilteredClassPathElement implements ClassPathElement { final ClassPathElement delegate; diff --git a/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/classloading/JarClassPathElement.java b/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/classloading/JarClassPathElement.java index bd6a6e2729b10..4ffbabf05a7ae 100644 --- a/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/classloading/JarClassPathElement.java +++ b/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/classloading/JarClassPathElement.java @@ -1,9 +1,5 @@ package io.quarkus.bootstrap.classloading; -import io.quarkus.paths.OpenPathTree; -import io.quarkus.paths.PathTree; -import io.smallrye.common.io.jar.JarEntries; -import io.smallrye.common.io.jar.JarFiles; import java.io.ByteArrayOutputStream; import java.io.File; import java.io.IOException; @@ -29,8 +25,14 @@ import java.util.jar.JarEntry; import java.util.jar.JarFile; import java.util.jar.Manifest; + import org.jboss.logging.Logger; +import io.quarkus.paths.OpenPathTree; +import io.quarkus.paths.PathTree; +import io.smallrye.common.io.jar.JarEntries; +import io.smallrye.common.io.jar.JarFiles; + /** * A class path element that represents a file on the file system * diff --git a/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/classloading/MemoryClassPathElement.java b/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/classloading/MemoryClassPathElement.java index d9c0d08a012c1..4458602ae5730 100644 --- a/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/classloading/MemoryClassPathElement.java +++ b/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/classloading/MemoryClassPathElement.java @@ -1,7 +1,5 @@ package io.quarkus.bootstrap.classloading; -import io.quarkus.paths.EmptyPathTree; -import io.quarkus.paths.OpenPathTree; import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; @@ -18,6 +16,9 @@ import java.util.Set; import java.util.function.Function; +import io.quarkus.paths.EmptyPathTree; +import io.quarkus.paths.OpenPathTree; + public class MemoryClassPathElement extends AbstractClassPathElement { private volatile Map resources; diff --git a/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/classloading/PathTreeClassPathElement.java b/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/classloading/PathTreeClassPathElement.java index 4a490ee38c4b7..5b182c0b2f654 100644 --- a/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/classloading/PathTreeClassPathElement.java +++ b/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/classloading/PathTreeClassPathElement.java @@ -1,10 +1,5 @@ package io.quarkus.bootstrap.classloading; -import io.quarkus.maven.dependency.ArtifactKey; -import io.quarkus.paths.OpenPathTree; -import io.quarkus.paths.PathTree; -import io.quarkus.paths.PathVisit; -import io.quarkus.paths.PathVisitor; import java.io.IOException; import java.io.InterruptedIOException; import java.io.UncheckedIOException; @@ -24,8 +19,15 @@ import java.util.concurrent.locks.ReentrantReadWriteLock; import java.util.function.Function; import java.util.jar.Manifest; + import org.jboss.logging.Logger; +import io.quarkus.maven.dependency.ArtifactKey; +import io.quarkus.paths.OpenPathTree; +import io.quarkus.paths.PathTree; +import io.quarkus.paths.PathVisit; +import io.quarkus.paths.PathVisitor; + public class PathTreeClassPathElement extends AbstractClassPathElement { private static final Logger log = Logger.getLogger(PathTreeClassPathElement.class); diff --git a/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/classloading/QuarkusClassLoader.java b/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/classloading/QuarkusClassLoader.java index 1badcfe6c8c20..fc3a2366c740a 100644 --- a/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/classloading/QuarkusClassLoader.java +++ b/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/classloading/QuarkusClassLoader.java @@ -24,6 +24,7 @@ import java.util.concurrent.ConcurrentMap; import java.util.jar.Attributes; import java.util.jar.Manifest; + import org.jboss.logging.Logger; /** diff --git a/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/devmode/DependenciesFilter.java b/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/devmode/DependenciesFilter.java index efde3aab8acae..3cab0132ecfbf 100644 --- a/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/devmode/DependenciesFilter.java +++ b/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/devmode/DependenciesFilter.java @@ -1,15 +1,17 @@ package io.quarkus.bootstrap.devmode; -import io.quarkus.bootstrap.model.ApplicationModel; -import io.quarkus.maven.dependency.ArtifactKey; -import io.quarkus.maven.dependency.Dependency; -import io.quarkus.maven.dependency.ResolvedDependency; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; + import org.jboss.logging.Logger; +import io.quarkus.bootstrap.model.ApplicationModel; +import io.quarkus.maven.dependency.ArtifactKey; +import io.quarkus.maven.dependency.Dependency; +import io.quarkus.maven.dependency.ResolvedDependency; + public class DependenciesFilter { private static final Logger log = Logger.getLogger(DependenciesFilter.class); diff --git a/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/jbang/JBangBuilderImpl.java b/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/jbang/JBangBuilderImpl.java index 29ba65451f225..28d6cc7018768 100644 --- a/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/jbang/JBangBuilderImpl.java +++ b/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/jbang/JBangBuilderImpl.java @@ -1,15 +1,5 @@ package io.quarkus.bootstrap.jbang; -import io.quarkus.bootstrap.app.CuratedApplication; -import io.quarkus.bootstrap.app.QuarkusBootstrap; -import io.quarkus.bootstrap.resolver.maven.BootstrapMavenContext; -import io.quarkus.bootstrap.resolver.maven.BootstrapMavenException; -import io.quarkus.bootstrap.resolver.maven.MavenArtifactResolver; -import io.quarkus.maven.dependency.ArtifactCoords; -import io.quarkus.maven.dependency.ArtifactDependency; -import io.quarkus.maven.dependency.Dependency; -import io.quarkus.maven.dependency.GACTV; -import io.quarkus.maven.dependency.ResolvedArtifactDependency; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; @@ -21,8 +11,20 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; + import org.eclipse.aether.repository.RemoteRepository; +import io.quarkus.bootstrap.app.CuratedApplication; +import io.quarkus.bootstrap.app.QuarkusBootstrap; +import io.quarkus.bootstrap.resolver.maven.BootstrapMavenContext; +import io.quarkus.bootstrap.resolver.maven.BootstrapMavenException; +import io.quarkus.bootstrap.resolver.maven.MavenArtifactResolver; +import io.quarkus.maven.dependency.ArtifactCoords; +import io.quarkus.maven.dependency.ArtifactDependency; +import io.quarkus.maven.dependency.Dependency; +import io.quarkus.maven.dependency.GACTV; +import io.quarkus.maven.dependency.ResolvedArtifactDependency; + public class JBangBuilderImpl { public static Map postBuild(Path appClasses, Path pomFile, List> repositories, List> dependencies, diff --git a/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/jbang/JBangDevModeLauncherImpl.java b/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/jbang/JBangDevModeLauncherImpl.java index 9c71629f8fc6f..207281a09cb35 100644 --- a/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/jbang/JBangDevModeLauncherImpl.java +++ b/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/jbang/JBangDevModeLauncherImpl.java @@ -1,17 +1,5 @@ package io.quarkus.bootstrap.jbang; -import io.quarkus.bootstrap.app.CuratedApplication; -import io.quarkus.bootstrap.app.QuarkusBootstrap; -import io.quarkus.bootstrap.resolver.maven.BootstrapMavenContext; -import io.quarkus.bootstrap.resolver.maven.MavenArtifactResolver; -import io.quarkus.bootstrap.resolver.maven.workspace.LocalProject; -import io.quarkus.maven.dependency.ArtifactCoords; -import io.quarkus.maven.dependency.ArtifactDependency; -import io.quarkus.maven.dependency.Dependency; -import io.quarkus.maven.dependency.ResolvedArtifactDependency; -import io.quarkus.maven.dependency.ResolvedDependency; -import io.quarkus.maven.dependency.ResolvedDependencyBuilder; -import io.quarkus.paths.PathList; import java.io.ByteArrayOutputStream; import java.io.Closeable; import java.io.DataInputStream; @@ -31,6 +19,19 @@ import java.util.zip.ZipEntry; import java.util.zip.ZipFile; +import io.quarkus.bootstrap.app.CuratedApplication; +import io.quarkus.bootstrap.app.QuarkusBootstrap; +import io.quarkus.bootstrap.resolver.maven.BootstrapMavenContext; +import io.quarkus.bootstrap.resolver.maven.MavenArtifactResolver; +import io.quarkus.bootstrap.resolver.maven.workspace.LocalProject; +import io.quarkus.maven.dependency.ArtifactCoords; +import io.quarkus.maven.dependency.ArtifactDependency; +import io.quarkus.maven.dependency.Dependency; +import io.quarkus.maven.dependency.ResolvedArtifactDependency; +import io.quarkus.maven.dependency.ResolvedDependency; +import io.quarkus.maven.dependency.ResolvedDependencyBuilder; +import io.quarkus.paths.PathList; + /** * JBang Dev mode entry point. *

diff --git a/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/utils/BuildToolHelper.java b/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/utils/BuildToolHelper.java index b80ad18fa9bb5..fe9fd8358f9ae 100644 --- a/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/utils/BuildToolHelper.java +++ b/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/utils/BuildToolHelper.java @@ -1,16 +1,18 @@ package io.quarkus.bootstrap.utils; -import io.quarkus.bootstrap.model.ApplicationModel; -import io.quarkus.bootstrap.resolver.AppModelResolverException; -import io.quarkus.bootstrap.resolver.QuarkusGradleModelFactory; -import io.quarkus.bootstrap.util.BootstrapUtils; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; import java.util.Collections; import java.util.List; + import org.jboss.logging.Logger; +import io.quarkus.bootstrap.model.ApplicationModel; +import io.quarkus.bootstrap.resolver.AppModelResolverException; +import io.quarkus.bootstrap.resolver.QuarkusGradleModelFactory; +import io.quarkus.bootstrap.util.BootstrapUtils; + /** * Helper class used to expose build tool used by the project */ diff --git a/independent-projects/bootstrap/core/src/test/java/io/quarkus/bootstrap/classloader/ClassLoadingInterruptTestCase.java b/independent-projects/bootstrap/core/src/test/java/io/quarkus/bootstrap/classloader/ClassLoadingInterruptTestCase.java index f5414309f2240..87d545b083981 100644 --- a/independent-projects/bootstrap/core/src/test/java/io/quarkus/bootstrap/classloader/ClassLoadingInterruptTestCase.java +++ b/independent-projects/bootstrap/core/src/test/java/io/quarkus/bootstrap/classloader/ClassLoadingInterruptTestCase.java @@ -1,16 +1,18 @@ package io.quarkus.bootstrap.classloader; -import io.quarkus.bootstrap.classloading.DirectoryClassPathElement; -import io.quarkus.bootstrap.classloading.QuarkusClassLoader; -import io.quarkus.bootstrap.util.IoUtils; import java.nio.file.Files; import java.nio.file.Path; + import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.exporter.ExplodedExporter; import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; +import io.quarkus.bootstrap.classloading.DirectoryClassPathElement; +import io.quarkus.bootstrap.classloading.QuarkusClassLoader; +import io.quarkus.bootstrap.util.IoUtils; + public class ClassLoadingInterruptTestCase { @Test diff --git a/independent-projects/bootstrap/core/src/test/java/io/quarkus/bootstrap/classloader/ClassLoadingPathTreeResourceUrlTestCase.java b/independent-projects/bootstrap/core/src/test/java/io/quarkus/bootstrap/classloader/ClassLoadingPathTreeResourceUrlTestCase.java index 8bf5811e1cc51..74fc4fc2effe4 100644 --- a/independent-projects/bootstrap/core/src/test/java/io/quarkus/bootstrap/classloader/ClassLoadingPathTreeResourceUrlTestCase.java +++ b/independent-projects/bootstrap/core/src/test/java/io/quarkus/bootstrap/classloader/ClassLoadingPathTreeResourceUrlTestCase.java @@ -1,13 +1,11 @@ package io.quarkus.bootstrap.classloader; -import io.quarkus.bootstrap.classloading.ClassPathElement; -import io.quarkus.bootstrap.classloading.QuarkusClassLoader; -import io.quarkus.bootstrap.util.IoUtils; import java.io.InputStream; import java.net.URL; import java.nio.file.Files; import java.nio.file.Path; import java.util.List; + import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.jboss.shrinkwrap.api.exporter.ExplodedExporter; @@ -19,6 +17,10 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; +import io.quarkus.bootstrap.classloading.ClassPathElement; +import io.quarkus.bootstrap.classloading.QuarkusClassLoader; +import io.quarkus.bootstrap.util.IoUtils; + public class ClassLoadingPathTreeResourceUrlTestCase { /** diff --git a/independent-projects/bootstrap/core/src/test/java/io/quarkus/bootstrap/classloader/ClassLoadingResourceUrlTestCase.java b/independent-projects/bootstrap/core/src/test/java/io/quarkus/bootstrap/classloader/ClassLoadingResourceUrlTestCase.java index 250da6466bbc7..4504bc5aea370 100644 --- a/independent-projects/bootstrap/core/src/test/java/io/quarkus/bootstrap/classloader/ClassLoadingResourceUrlTestCase.java +++ b/independent-projects/bootstrap/core/src/test/java/io/quarkus/bootstrap/classloader/ClassLoadingResourceUrlTestCase.java @@ -1,10 +1,5 @@ package io.quarkus.bootstrap.classloader; -import io.quarkus.bootstrap.classloading.DirectoryClassPathElement; -import io.quarkus.bootstrap.classloading.JarClassPathElement; -import io.quarkus.bootstrap.classloading.MemoryClassPathElement; -import io.quarkus.bootstrap.classloading.QuarkusClassLoader; -import io.quarkus.bootstrap.util.IoUtils; import java.io.InputStream; import java.net.URL; import java.net.URLConnection; @@ -13,6 +8,7 @@ import java.nio.file.Path; import java.util.Collections; import java.util.List; + import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.jboss.shrinkwrap.api.exporter.ExplodedExporter; @@ -24,6 +20,12 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; +import io.quarkus.bootstrap.classloading.DirectoryClassPathElement; +import io.quarkus.bootstrap.classloading.JarClassPathElement; +import io.quarkus.bootstrap.classloading.MemoryClassPathElement; +import io.quarkus.bootstrap.classloading.QuarkusClassLoader; +import io.quarkus.bootstrap.util.IoUtils; + //see https://github.com/quarkusio/quarkus/issues/10943 public class ClassLoadingResourceUrlTestCase { diff --git a/independent-projects/bootstrap/core/src/test/java/io/quarkus/bootstrap/classloader/MultiReleaseJarTestCase.java b/independent-projects/bootstrap/core/src/test/java/io/quarkus/bootstrap/classloader/MultiReleaseJarTestCase.java index e83045c75dccc..4ff78f79d4c42 100644 --- a/independent-projects/bootstrap/core/src/test/java/io/quarkus/bootstrap/classloader/MultiReleaseJarTestCase.java +++ b/independent-projects/bootstrap/core/src/test/java/io/quarkus/bootstrap/classloader/MultiReleaseJarTestCase.java @@ -5,9 +5,6 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import io.quarkus.bootstrap.classloading.JarClassPathElement; -import io.quarkus.bootstrap.classloading.QuarkusClassLoader; -import io.quarkus.bootstrap.util.IoUtils; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; @@ -18,6 +15,7 @@ import java.util.jar.JarEntry; import java.util.jar.JarFile; import java.util.jar.JarOutputStream; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.DisabledOnJre; @@ -25,6 +23,10 @@ import org.junit.jupiter.api.condition.JRE; import org.junit.jupiter.api.io.TempDir; +import io.quarkus.bootstrap.classloading.JarClassPathElement; +import io.quarkus.bootstrap.classloading.QuarkusClassLoader; +import io.quarkus.bootstrap.util.IoUtils; + public class MultiReleaseJarTestCase { Path jarPath; diff --git a/independent-projects/bootstrap/core/src/test/java/io/quarkus/bootstrap/resolver/BootstrapTestBase.java b/independent-projects/bootstrap/core/src/test/java/io/quarkus/bootstrap/resolver/BootstrapTestBase.java index f9265541f19a7..6077e8746c5eb 100644 --- a/independent-projects/bootstrap/core/src/test/java/io/quarkus/bootstrap/resolver/BootstrapTestBase.java +++ b/independent-projects/bootstrap/core/src/test/java/io/quarkus/bootstrap/resolver/BootstrapTestBase.java @@ -1,8 +1,9 @@ package io.quarkus.bootstrap.resolver; -import io.quarkus.bootstrap.app.QuarkusBootstrap; import org.junit.jupiter.api.Test; +import io.quarkus.bootstrap.app.QuarkusBootstrap; + public abstract class BootstrapTestBase extends ResolverSetupCleanup { @Test diff --git a/independent-projects/bootstrap/core/src/test/java/io/quarkus/bootstrap/resolver/CollectDependenciesBase.java b/independent-projects/bootstrap/core/src/test/java/io/quarkus/bootstrap/resolver/CollectDependenciesBase.java index 9217b3490e2ef..ade5086b19147 100644 --- a/independent-projects/bootstrap/core/src/test/java/io/quarkus/bootstrap/resolver/CollectDependenciesBase.java +++ b/independent-projects/bootstrap/core/src/test/java/io/quarkus/bootstrap/resolver/CollectDependenciesBase.java @@ -2,18 +2,20 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import io.quarkus.maven.dependency.ArtifactDependency; -import io.quarkus.maven.dependency.Dependency; -import io.quarkus.maven.dependency.DependencyFlags; import java.nio.file.Path; import java.util.ArrayList; import java.util.HashSet; import java.util.List; import java.util.stream.Collectors; + import org.eclipse.aether.util.artifact.JavaScopes; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import io.quarkus.maven.dependency.ArtifactDependency; +import io.quarkus.maven.dependency.Dependency; +import io.quarkus.maven.dependency.DependencyFlags; + /** * * @author Alexey Loubyansky diff --git a/independent-projects/bootstrap/core/src/test/java/io/quarkus/bootstrap/resolver/ResolverSetupCleanup.java b/independent-projects/bootstrap/core/src/test/java/io/quarkus/bootstrap/resolver/ResolverSetupCleanup.java index 83c8da19979be..880ef8079b0bb 100644 --- a/independent-projects/bootstrap/core/src/test/java/io/quarkus/bootstrap/resolver/ResolverSetupCleanup.java +++ b/independent-projects/bootstrap/core/src/test/java/io/quarkus/bootstrap/resolver/ResolverSetupCleanup.java @@ -1,9 +1,5 @@ package io.quarkus.bootstrap.resolver; -import io.quarkus.bootstrap.resolver.maven.BootstrapMavenException; -import io.quarkus.bootstrap.resolver.maven.MavenArtifactResolver; -import io.quarkus.bootstrap.resolver.maven.workspace.LocalProject; -import io.quarkus.bootstrap.util.IoUtils; import java.io.BufferedWriter; import java.io.IOException; import java.net.MalformedURLException; @@ -12,6 +8,7 @@ import java.util.HashMap; import java.util.Map; import java.util.UUID; + import org.apache.maven.settings.Activation; import org.apache.maven.settings.Profile; import org.apache.maven.settings.Repository; @@ -21,6 +18,11 @@ import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; +import io.quarkus.bootstrap.resolver.maven.BootstrapMavenException; +import io.quarkus.bootstrap.resolver.maven.MavenArtifactResolver; +import io.quarkus.bootstrap.resolver.maven.workspace.LocalProject; +import io.quarkus.bootstrap.util.IoUtils; + /** * * @author Alexey Loubyansky diff --git a/independent-projects/bootstrap/core/src/test/java/io/quarkus/bootstrap/resolver/TsArtifact.java b/independent-projects/bootstrap/core/src/test/java/io/quarkus/bootstrap/resolver/TsArtifact.java index aab7d0c0f8bd5..95757a621addb 100644 --- a/independent-projects/bootstrap/core/src/test/java/io/quarkus/bootstrap/resolver/TsArtifact.java +++ b/independent-projects/bootstrap/core/src/test/java/io/quarkus/bootstrap/resolver/TsArtifact.java @@ -1,9 +1,5 @@ package io.quarkus.bootstrap.resolver; -import io.quarkus.maven.dependency.ArtifactCoords; -import io.quarkus.maven.dependency.ArtifactKey; -import io.quarkus.maven.dependency.GACT; -import io.quarkus.maven.dependency.GACTV; import java.io.IOException; import java.nio.file.Path; import java.util.ArrayList; @@ -11,10 +7,16 @@ import java.util.List; import java.util.Properties; import java.util.function.Supplier; + import org.apache.maven.model.DependencyManagement; import org.apache.maven.model.Model; import org.apache.maven.model.Profile; +import io.quarkus.maven.dependency.ArtifactCoords; +import io.quarkus.maven.dependency.ArtifactKey; +import io.quarkus.maven.dependency.GACT; +import io.quarkus.maven.dependency.GACTV; + /** * * @author Alexey Loubyansky diff --git a/independent-projects/bootstrap/core/src/test/java/io/quarkus/bootstrap/resolver/TsDependency.java b/independent-projects/bootstrap/core/src/test/java/io/quarkus/bootstrap/resolver/TsDependency.java index 25577c3a3642d..f175045941846 100644 --- a/independent-projects/bootstrap/core/src/test/java/io/quarkus/bootstrap/resolver/TsDependency.java +++ b/independent-projects/bootstrap/core/src/test/java/io/quarkus/bootstrap/resolver/TsDependency.java @@ -3,6 +3,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; + import org.apache.maven.model.Dependency; import org.apache.maven.model.Exclusion; diff --git a/independent-projects/bootstrap/core/src/test/java/io/quarkus/bootstrap/resolver/TsJar.java b/independent-projects/bootstrap/core/src/test/java/io/quarkus/bootstrap/resolver/TsJar.java index 3808908fc8f64..979953476106e 100644 --- a/independent-projects/bootstrap/core/src/test/java/io/quarkus/bootstrap/resolver/TsJar.java +++ b/independent-projects/bootstrap/core/src/test/java/io/quarkus/bootstrap/resolver/TsJar.java @@ -1,7 +1,5 @@ package io.quarkus.bootstrap.resolver; -import io.quarkus.bootstrap.util.IoUtils; -import io.quarkus.fs.util.ZipUtils; import java.io.BufferedWriter; import java.io.IOException; import java.io.StringWriter; @@ -14,6 +12,9 @@ import java.util.Properties; import java.util.UUID; +import io.quarkus.bootstrap.util.IoUtils; +import io.quarkus.fs.util.ZipUtils; + /** * * @author Alexey Loubyansky diff --git a/independent-projects/bootstrap/core/src/test/java/io/quarkus/bootstrap/resolver/TsQuarkusExt.java b/independent-projects/bootstrap/core/src/test/java/io/quarkus/bootstrap/resolver/TsQuarkusExt.java index 8293afc4c781c..cce22dcf20460 100644 --- a/independent-projects/bootstrap/core/src/test/java/io/quarkus/bootstrap/resolver/TsQuarkusExt.java +++ b/independent-projects/bootstrap/core/src/test/java/io/quarkus/bootstrap/resolver/TsQuarkusExt.java @@ -1,12 +1,13 @@ package io.quarkus.bootstrap.resolver; -import io.quarkus.bootstrap.BootstrapConstants; import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Properties; import java.util.stream.Collectors; +import io.quarkus.bootstrap.BootstrapConstants; + public class TsQuarkusExt { protected final TsArtifact runtime; diff --git a/independent-projects/bootstrap/core/src/test/java/io/quarkus/bootstrap/resolver/TsRepoBuilder.java b/independent-projects/bootstrap/core/src/test/java/io/quarkus/bootstrap/resolver/TsRepoBuilder.java index 2f1ff0e7b627a..8d8eb33b0a59f 100644 --- a/independent-projects/bootstrap/core/src/test/java/io/quarkus/bootstrap/resolver/TsRepoBuilder.java +++ b/independent-projects/bootstrap/core/src/test/java/io/quarkus/bootstrap/resolver/TsRepoBuilder.java @@ -1,17 +1,19 @@ package io.quarkus.bootstrap.resolver; -import io.quarkus.bootstrap.resolver.maven.BootstrapMavenException; -import io.quarkus.bootstrap.resolver.maven.MavenArtifactResolver; -import io.quarkus.bootstrap.resolver.maven.workspace.ModelUtils; -import io.quarkus.maven.dependency.ArtifactCoords; import java.io.BufferedWriter; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; import java.util.Map; import java.util.UUID; + import org.eclipse.aether.artifact.DefaultArtifact; +import io.quarkus.bootstrap.resolver.maven.BootstrapMavenException; +import io.quarkus.bootstrap.resolver.maven.MavenArtifactResolver; +import io.quarkus.bootstrap.resolver.maven.workspace.ModelUtils; +import io.quarkus.maven.dependency.ArtifactCoords; + /** * * @author Alexey Loubyansky diff --git a/independent-projects/bootstrap/core/src/test/java/io/quarkus/bootstrap/resolver/test/SystemPropertyOverridesPomPropertyDependencyTestCase.java b/independent-projects/bootstrap/core/src/test/java/io/quarkus/bootstrap/resolver/test/SystemPropertyOverridesPomPropertyDependencyTestCase.java index c4997cb261fd0..6f4f0bb697c61 100644 --- a/independent-projects/bootstrap/core/src/test/java/io/quarkus/bootstrap/resolver/test/SystemPropertyOverridesPomPropertyDependencyTestCase.java +++ b/independent-projects/bootstrap/core/src/test/java/io/quarkus/bootstrap/resolver/test/SystemPropertyOverridesPomPropertyDependencyTestCase.java @@ -1,13 +1,14 @@ package io.quarkus.bootstrap.resolver.test; +import java.nio.file.Files; +import java.nio.file.Path; + import io.quarkus.bootstrap.resolver.BootstrapAppModelResolver; import io.quarkus.bootstrap.resolver.CollectDependenciesBase; import io.quarkus.bootstrap.resolver.TsArtifact; import io.quarkus.bootstrap.resolver.maven.workspace.LocalProject; import io.quarkus.bootstrap.util.IoUtils; import io.quarkus.maven.dependency.DependencyFlags; -import java.nio.file.Files; -import java.nio.file.Path; /** * diff --git a/independent-projects/bootstrap/gradle-resolver/src/main/java/io/quarkus/bootstrap/resolver/QuarkusGradleModelFactory.java b/independent-projects/bootstrap/gradle-resolver/src/main/java/io/quarkus/bootstrap/resolver/QuarkusGradleModelFactory.java index fbc32145a0cd1..6c42d1f260ffa 100644 --- a/independent-projects/bootstrap/gradle-resolver/src/main/java/io/quarkus/bootstrap/resolver/QuarkusGradleModelFactory.java +++ b/independent-projects/bootstrap/gradle-resolver/src/main/java/io/quarkus/bootstrap/resolver/QuarkusGradleModelFactory.java @@ -1,13 +1,15 @@ package io.quarkus.bootstrap.resolver; -import io.quarkus.bootstrap.model.ApplicationModel; import java.io.File; import java.util.Collections; import java.util.List; + import org.gradle.tooling.GradleConnector; import org.gradle.tooling.ModelBuilder; import org.gradle.tooling.ProjectConnection; +import io.quarkus.bootstrap.model.ApplicationModel; + public class QuarkusGradleModelFactory { public static ApplicationModel create(File projectDir, String mode, String... tasks) { diff --git a/independent-projects/bootstrap/gradle-resolver/src/main/java/io/quarkus/bootstrap/resolver/QuarkusModelBuildAction.java b/independent-projects/bootstrap/gradle-resolver/src/main/java/io/quarkus/bootstrap/resolver/QuarkusModelBuildAction.java index 267071b6a0599..d65c32a592d57 100644 --- a/independent-projects/bootstrap/gradle-resolver/src/main/java/io/quarkus/bootstrap/resolver/QuarkusModelBuildAction.java +++ b/independent-projects/bootstrap/gradle-resolver/src/main/java/io/quarkus/bootstrap/resolver/QuarkusModelBuildAction.java @@ -1,11 +1,13 @@ package io.quarkus.bootstrap.resolver; -import io.quarkus.bootstrap.model.ApplicationModel; -import io.quarkus.bootstrap.model.gradle.ModelParameter; import java.io.Serializable; + import org.gradle.tooling.BuildAction; import org.gradle.tooling.BuildController; +import io.quarkus.bootstrap.model.ApplicationModel; +import io.quarkus.bootstrap.model.gradle.ModelParameter; + public class QuarkusModelBuildAction implements BuildAction, Serializable { private static final long serialVersionUID = 9152408068581769671L; diff --git a/independent-projects/bootstrap/maven-plugin/src/main/java/io/quarkus/maven/BootstrapWorkspaceProvider.java b/independent-projects/bootstrap/maven-plugin/src/main/java/io/quarkus/maven/BootstrapWorkspaceProvider.java index a4a94477b5942..59b9190242ce2 100644 --- a/independent-projects/bootstrap/maven-plugin/src/main/java/io/quarkus/maven/BootstrapWorkspaceProvider.java +++ b/independent-projects/bootstrap/maven-plugin/src/main/java/io/quarkus/maven/BootstrapWorkspaceProvider.java @@ -1,14 +1,16 @@ package io.quarkus.maven; -import io.quarkus.bootstrap.resolver.maven.BootstrapMavenException; -import io.quarkus.bootstrap.resolver.maven.options.BootstrapMavenOptions; -import io.quarkus.bootstrap.resolver.maven.workspace.LocalProject; -import io.quarkus.bootstrap.resolver.maven.workspace.LocalWorkspace; import java.nio.file.Path; import java.nio.file.Paths; + import org.codehaus.plexus.component.annotations.Component; import org.jboss.logging.Logger; +import io.quarkus.bootstrap.resolver.maven.BootstrapMavenException; +import io.quarkus.bootstrap.resolver.maven.options.BootstrapMavenOptions; +import io.quarkus.bootstrap.resolver.maven.workspace.LocalProject; +import io.quarkus.bootstrap.resolver.maven.workspace.LocalWorkspace; + @Component(role = BootstrapWorkspaceProvider.class, instantiationStrategy = "singleton") public class BootstrapWorkspaceProvider { diff --git a/independent-projects/bootstrap/maven-plugin/src/main/java/io/quarkus/maven/ExtensionDescriptorMojo.java b/independent-projects/bootstrap/maven-plugin/src/main/java/io/quarkus/maven/ExtensionDescriptorMojo.java index e3a7cc9728b5f..23f8a2eaead13 100644 --- a/independent-projects/bootstrap/maven-plugin/src/main/java/io/quarkus/maven/ExtensionDescriptorMojo.java +++ b/independent-projects/bootstrap/maven-plugin/src/main/java/io/quarkus/maven/ExtensionDescriptorMojo.java @@ -1,31 +1,5 @@ package io.quarkus.maven; -import com.fasterxml.jackson.core.json.JsonReadFeature; -import com.fasterxml.jackson.core.util.DefaultIndenter; -import com.fasterxml.jackson.core.util.DefaultPrettyPrinter; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.PropertyNamingStrategies; -import com.fasterxml.jackson.databind.SerializationFeature; -import com.fasterxml.jackson.databind.json.JsonMapper; -import com.fasterxml.jackson.databind.node.ArrayNode; -import com.fasterxml.jackson.databind.node.ObjectNode; -import com.fasterxml.jackson.dataformat.yaml.YAMLFactory; -import io.quarkus.bootstrap.BootstrapConstants; -import io.quarkus.bootstrap.model.ApplicationModelBuilder; -import io.quarkus.bootstrap.resolver.maven.BootstrapMavenContext; -import io.quarkus.bootstrap.resolver.maven.BootstrapMavenException; -import io.quarkus.bootstrap.resolver.maven.MavenArtifactResolver; -import io.quarkus.bootstrap.resolver.maven.workspace.LocalProject; -import io.quarkus.bootstrap.resolver.maven.workspace.LocalWorkspace; -import io.quarkus.bootstrap.util.DependencyUtils; -import io.quarkus.fs.util.ZipUtils; -import io.quarkus.maven.ExtensionDescriptorMojo.RemovedResources; -import io.quarkus.maven.capabilities.CapabilitiesConfig; -import io.quarkus.maven.capabilities.CapabilityConfig; -import io.quarkus.maven.dependency.ArtifactCoords; -import io.quarkus.maven.dependency.ArtifactKey; -import io.quarkus.maven.dependency.GACTV; import java.io.BufferedReader; import java.io.BufferedWriter; import java.io.File; @@ -44,6 +18,7 @@ import java.util.Properties; import java.util.Set; import java.util.concurrent.atomic.AtomicReference; + import org.apache.maven.artifact.Artifact; import org.apache.maven.execution.MavenSession; import org.apache.maven.plugin.AbstractMojo; @@ -74,6 +49,33 @@ import org.eclipse.aether.resolution.DependencyResult; import org.eclipse.aether.util.artifact.JavaScopes; +import com.fasterxml.jackson.core.json.JsonReadFeature; +import com.fasterxml.jackson.core.util.DefaultIndenter; +import com.fasterxml.jackson.core.util.DefaultPrettyPrinter; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.PropertyNamingStrategies; +import com.fasterxml.jackson.databind.SerializationFeature; +import com.fasterxml.jackson.databind.json.JsonMapper; +import com.fasterxml.jackson.databind.node.ArrayNode; +import com.fasterxml.jackson.databind.node.ObjectNode; +import com.fasterxml.jackson.dataformat.yaml.YAMLFactory; + +import io.quarkus.bootstrap.BootstrapConstants; +import io.quarkus.bootstrap.model.ApplicationModelBuilder; +import io.quarkus.bootstrap.resolver.maven.BootstrapMavenContext; +import io.quarkus.bootstrap.resolver.maven.BootstrapMavenException; +import io.quarkus.bootstrap.resolver.maven.MavenArtifactResolver; +import io.quarkus.bootstrap.resolver.maven.workspace.LocalProject; +import io.quarkus.bootstrap.resolver.maven.workspace.LocalWorkspace; +import io.quarkus.bootstrap.util.DependencyUtils; +import io.quarkus.fs.util.ZipUtils; +import io.quarkus.maven.capabilities.CapabilitiesConfig; +import io.quarkus.maven.capabilities.CapabilityConfig; +import io.quarkus.maven.dependency.ArtifactCoords; +import io.quarkus.maven.dependency.ArtifactKey; +import io.quarkus.maven.dependency.GACTV; + /** * @deprecated in favor of {@code io.quarkus:quarkus-extension-maven-plugin}. *

diff --git a/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/BootstrapAppModelResolver.java b/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/BootstrapAppModelResolver.java index ab99eaec68c81..8d486d0c7a989 100644 --- a/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/BootstrapAppModelResolver.java +++ b/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/BootstrapAppModelResolver.java @@ -1,22 +1,5 @@ package io.quarkus.bootstrap.resolver; -import io.quarkus.bootstrap.BootstrapDependencyProcessingException; -import io.quarkus.bootstrap.model.ApplicationModel; -import io.quarkus.bootstrap.model.ApplicationModelBuilder; -import io.quarkus.bootstrap.resolver.maven.ApplicationDependencyTreeResolver; -import io.quarkus.bootstrap.resolver.maven.BootstrapMavenException; -import io.quarkus.bootstrap.resolver.maven.MavenArtifactResolver; -import io.quarkus.bootstrap.util.DependencyUtils; -import io.quarkus.bootstrap.workspace.ArtifactSources; -import io.quarkus.bootstrap.workspace.SourceDir; -import io.quarkus.bootstrap.workspace.WorkspaceModule; -import io.quarkus.maven.dependency.ArtifactCoords; -import io.quarkus.maven.dependency.ArtifactKey; -import io.quarkus.maven.dependency.ResolvableDependency; -import io.quarkus.maven.dependency.ResolvedDependency; -import io.quarkus.maven.dependency.ResolvedDependencyBuilder; -import io.quarkus.paths.PathCollection; -import io.quarkus.paths.PathList; import java.nio.file.Files; import java.nio.file.Path; import java.util.ArrayList; @@ -26,6 +9,7 @@ import java.util.Map; import java.util.Set; import java.util.function.Consumer; + import org.eclipse.aether.artifact.Artifact; import org.eclipse.aether.artifact.DefaultArtifact; import org.eclipse.aether.collection.CollectRequest; @@ -45,6 +29,24 @@ import org.eclipse.aether.util.graph.visitor.TreeDependencyVisitor; import org.eclipse.aether.version.Version; +import io.quarkus.bootstrap.BootstrapDependencyProcessingException; +import io.quarkus.bootstrap.model.ApplicationModel; +import io.quarkus.bootstrap.model.ApplicationModelBuilder; +import io.quarkus.bootstrap.resolver.maven.ApplicationDependencyTreeResolver; +import io.quarkus.bootstrap.resolver.maven.BootstrapMavenException; +import io.quarkus.bootstrap.resolver.maven.MavenArtifactResolver; +import io.quarkus.bootstrap.util.DependencyUtils; +import io.quarkus.bootstrap.workspace.ArtifactSources; +import io.quarkus.bootstrap.workspace.SourceDir; +import io.quarkus.bootstrap.workspace.WorkspaceModule; +import io.quarkus.maven.dependency.ArtifactCoords; +import io.quarkus.maven.dependency.ArtifactKey; +import io.quarkus.maven.dependency.ResolvableDependency; +import io.quarkus.maven.dependency.ResolvedDependency; +import io.quarkus.maven.dependency.ResolvedDependencyBuilder; +import io.quarkus.paths.PathCollection; +import io.quarkus.paths.PathList; + /** * @author Alexey Loubyansky */ diff --git a/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/ApplicationDependencyTreeResolver.java b/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/ApplicationDependencyTreeResolver.java index fbae3d08f32e7..21d10db1cec82 100644 --- a/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/ApplicationDependencyTreeResolver.java +++ b/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/ApplicationDependencyTreeResolver.java @@ -1,21 +1,5 @@ package io.quarkus.bootstrap.resolver.maven; -import io.quarkus.bootstrap.BootstrapConstants; -import io.quarkus.bootstrap.BootstrapDependencyProcessingException; -import io.quarkus.bootstrap.model.ApplicationModelBuilder; -import io.quarkus.bootstrap.model.CapabilityContract; -import io.quarkus.bootstrap.model.PlatformImportsImpl; -import io.quarkus.bootstrap.resolver.AppModelResolverException; -import io.quarkus.bootstrap.util.BootstrapUtils; -import io.quarkus.bootstrap.util.DependencyUtils; -import io.quarkus.bootstrap.util.PropertyUtils; -import io.quarkus.bootstrap.workspace.WorkspaceModule; -import io.quarkus.maven.dependency.ArtifactCoords; -import io.quarkus.maven.dependency.ArtifactKey; -import io.quarkus.maven.dependency.DependencyFlags; -import io.quarkus.maven.dependency.ResolvedDependencyBuilder; -import io.quarkus.paths.PathList; -import io.quarkus.paths.PathTree; import java.io.BufferedReader; import java.io.IOException; import java.io.UncheckedIOException; @@ -35,6 +19,7 @@ import java.util.Properties; import java.util.Set; import java.util.function.Consumer; + import org.eclipse.aether.DefaultRepositorySystemSession; import org.eclipse.aether.RepositoryException; import org.eclipse.aether.RepositorySystemSession; @@ -56,6 +41,23 @@ import org.eclipse.aether.util.graph.transformer.ConflictMarker; import org.jboss.logging.Logger; +import io.quarkus.bootstrap.BootstrapConstants; +import io.quarkus.bootstrap.BootstrapDependencyProcessingException; +import io.quarkus.bootstrap.model.ApplicationModelBuilder; +import io.quarkus.bootstrap.model.CapabilityContract; +import io.quarkus.bootstrap.model.PlatformImportsImpl; +import io.quarkus.bootstrap.resolver.AppModelResolverException; +import io.quarkus.bootstrap.util.BootstrapUtils; +import io.quarkus.bootstrap.util.DependencyUtils; +import io.quarkus.bootstrap.util.PropertyUtils; +import io.quarkus.bootstrap.workspace.WorkspaceModule; +import io.quarkus.maven.dependency.ArtifactCoords; +import io.quarkus.maven.dependency.ArtifactKey; +import io.quarkus.maven.dependency.DependencyFlags; +import io.quarkus.maven.dependency.ResolvedDependencyBuilder; +import io.quarkus.paths.PathList; +import io.quarkus.paths.PathTree; + public class ApplicationDependencyTreeResolver { private static final Logger log = Logger.getLogger(ApplicationDependencyTreeResolver.class); diff --git a/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/BootstrapArtifactVersion.java b/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/BootstrapArtifactVersion.java index 01243b1b11457..34f0aa0ed04c8 100644 --- a/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/BootstrapArtifactVersion.java +++ b/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/BootstrapArtifactVersion.java @@ -7,6 +7,7 @@ import java.util.Locale; import java.util.Map; import java.util.TreeMap; + import org.eclipse.aether.version.Version; public class BootstrapArtifactVersion implements Version { diff --git a/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/BootstrapArtifactVersionConstraint.java b/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/BootstrapArtifactVersionConstraint.java index 657033c6d3124..39aa769e46b50 100644 --- a/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/BootstrapArtifactVersionConstraint.java +++ b/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/BootstrapArtifactVersionConstraint.java @@ -3,6 +3,7 @@ import static java.util.Objects.requireNonNull; import java.util.Objects; + import org.eclipse.aether.version.Version; import org.eclipse.aether.version.VersionConstraint; import org.eclipse.aether.version.VersionRange; diff --git a/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/BootstrapMavenContext.java b/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/BootstrapMavenContext.java index f538d1a74d2b5..b456a5c4b3cbe 100644 --- a/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/BootstrapMavenContext.java +++ b/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/BootstrapMavenContext.java @@ -1,11 +1,5 @@ package io.quarkus.bootstrap.resolver.maven; -import io.quarkus.bootstrap.resolver.maven.options.BootstrapMavenOptions; -import io.quarkus.bootstrap.resolver.maven.workspace.LocalProject; -import io.quarkus.bootstrap.resolver.maven.workspace.LocalWorkspace; -import io.quarkus.bootstrap.resolver.maven.workspace.ModelUtils; -import io.quarkus.bootstrap.util.PropertyUtils; -import io.quarkus.maven.dependency.ArtifactCoords; import java.io.File; import java.io.IOException; import java.io.InputStream; @@ -19,6 +13,7 @@ import java.util.Map; import java.util.Properties; import java.util.function.Supplier; + import org.apache.commons.lang3.StringUtils; import org.apache.maven.cli.transfer.BatchModeMavenTransferListener; import org.apache.maven.cli.transfer.ConsoleMavenTransferListener; @@ -81,6 +76,13 @@ import org.eclipse.aether.util.repository.DefaultProxySelector; import org.jboss.logging.Logger; +import io.quarkus.bootstrap.resolver.maven.options.BootstrapMavenOptions; +import io.quarkus.bootstrap.resolver.maven.workspace.LocalProject; +import io.quarkus.bootstrap.resolver.maven.workspace.LocalWorkspace; +import io.quarkus.bootstrap.resolver.maven.workspace.ModelUtils; +import io.quarkus.bootstrap.util.PropertyUtils; +import io.quarkus.maven.dependency.ArtifactCoords; + public class BootstrapMavenContext { private static final Logger log = Logger.getLogger(BootstrapMavenContext.class); diff --git a/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/BootstrapMavenContextConfig.java b/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/BootstrapMavenContextConfig.java index fb3e218374916..efa4ffa77d939 100644 --- a/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/BootstrapMavenContextConfig.java +++ b/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/BootstrapMavenContextConfig.java @@ -1,17 +1,19 @@ package io.quarkus.bootstrap.resolver.maven; -import io.quarkus.bootstrap.resolver.maven.options.BootstrapMavenOptions; -import io.quarkus.bootstrap.resolver.maven.workspace.LocalProject; import java.io.File; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; import java.util.List; + import org.eclipse.aether.RepositorySystem; import org.eclipse.aether.RepositorySystemSession; import org.eclipse.aether.impl.RemoteRepositoryManager; import org.eclipse.aether.repository.RemoteRepository; +import io.quarkus.bootstrap.resolver.maven.options.BootstrapMavenOptions; +import io.quarkus.bootstrap.resolver.maven.workspace.LocalProject; + public class BootstrapMavenContextConfig> { protected String localRepo; diff --git a/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/BootstrapModelResolver.java b/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/BootstrapModelResolver.java index 086c8e5a278a9..59eea3fa57360 100644 --- a/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/BootstrapModelResolver.java +++ b/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/BootstrapModelResolver.java @@ -1,7 +1,5 @@ package io.quarkus.bootstrap.resolver.maven; -import io.quarkus.bootstrap.resolver.maven.workspace.LocalWorkspace; -import io.quarkus.maven.dependency.ArtifactCoords; import java.io.File; import java.util.ArrayList; import java.util.Collection; @@ -10,6 +8,7 @@ import java.util.Iterator; import java.util.List; import java.util.Set; + import org.apache.maven.model.Dependency; import org.apache.maven.model.Parent; import org.apache.maven.model.Repository; @@ -36,6 +35,9 @@ import org.eclipse.aether.resolution.VersionRangeResolutionException; import org.eclipse.aether.resolution.VersionRangeResult; +import io.quarkus.bootstrap.resolver.maven.workspace.LocalWorkspace; +import io.quarkus.maven.dependency.ArtifactCoords; + public class BootstrapModelResolver implements ModelResolver { public static ModelResolver newInstance(BootstrapMavenContext ctx, LocalWorkspace workspace) diff --git a/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/BuildDependencyGraphVisitor.java b/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/BuildDependencyGraphVisitor.java index ff7ae17b067eb..1220e94142f9a 100644 --- a/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/BuildDependencyGraphVisitor.java +++ b/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/BuildDependencyGraphVisitor.java @@ -3,18 +3,20 @@ */ package io.quarkus.bootstrap.resolver.maven; -import io.quarkus.bootstrap.model.ApplicationModelBuilder; -import io.quarkus.bootstrap.util.DependencyUtils; -import io.quarkus.bootstrap.workspace.WorkspaceModule; -import io.quarkus.maven.dependency.ArtifactKey; -import io.quarkus.maven.dependency.DependencyFlags; import java.util.ArrayList; import java.util.List; import java.util.function.Consumer; + import org.eclipse.aether.artifact.Artifact; import org.eclipse.aether.graph.Dependency; import org.eclipse.aether.graph.DependencyNode; +import io.quarkus.bootstrap.model.ApplicationModelBuilder; +import io.quarkus.bootstrap.util.DependencyUtils; +import io.quarkus.bootstrap.workspace.WorkspaceModule; +import io.quarkus.maven.dependency.ArtifactKey; +import io.quarkus.maven.dependency.DependencyFlags; + public class BuildDependencyGraphVisitor { private final MavenArtifactResolver resolver; diff --git a/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/DeploymentDependencySelector.java b/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/DeploymentDependencySelector.java index 51364dd4f29cd..ce60412b31ad9 100644 --- a/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/DeploymentDependencySelector.java +++ b/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/DeploymentDependencySelector.java @@ -1,6 +1,7 @@ package io.quarkus.bootstrap.resolver.maven; import java.util.Objects; + import org.eclipse.aether.collection.DependencyCollectionContext; import org.eclipse.aether.collection.DependencySelector; import org.eclipse.aether.graph.Dependency; diff --git a/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/MavenArtifactResolver.java b/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/MavenArtifactResolver.java index eabfb1053137e..8b56ffadd41c9 100644 --- a/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/MavenArtifactResolver.java +++ b/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/MavenArtifactResolver.java @@ -3,10 +3,6 @@ */ package io.quarkus.bootstrap.resolver.maven; -import io.quarkus.bootstrap.resolver.maven.workspace.ProjectModuleResolver; -import io.quarkus.bootstrap.util.DependencyUtils; -import io.quarkus.bootstrap.util.PropertyUtils; -import io.quarkus.maven.dependency.ArtifactKey; import java.nio.file.Path; import java.nio.file.Paths; import java.util.ArrayList; @@ -16,6 +12,7 @@ import java.util.List; import java.util.Map; import java.util.Set; + import org.eclipse.aether.DefaultRepositorySystemSession; import org.eclipse.aether.RepositorySystem; import org.eclipse.aether.RepositorySystemSession; @@ -48,6 +45,11 @@ import org.eclipse.aether.version.InvalidVersionSpecificationException; import org.eclipse.aether.version.Version; +import io.quarkus.bootstrap.resolver.maven.workspace.ProjectModuleResolver; +import io.quarkus.bootstrap.util.DependencyUtils; +import io.quarkus.bootstrap.util.PropertyUtils; +import io.quarkus.maven.dependency.ArtifactKey; + /** * * @author Alexey Loubyansky diff --git a/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/MavenLocalRepositoryManager.java b/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/MavenLocalRepositoryManager.java index bf1b4ab3f8985..3b2959a417153 100644 --- a/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/MavenLocalRepositoryManager.java +++ b/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/MavenLocalRepositoryManager.java @@ -1,9 +1,9 @@ package io.quarkus.bootstrap.resolver.maven; -import io.quarkus.bootstrap.util.IoUtils; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; + import org.eclipse.aether.RepositorySystemSession; import org.eclipse.aether.artifact.Artifact; import org.eclipse.aether.metadata.Metadata; @@ -17,6 +17,8 @@ import org.eclipse.aether.repository.LocalRepositoryManager; import org.eclipse.aether.repository.RemoteRepository; +import io.quarkus.bootstrap.util.IoUtils; + /** * * @author Alexey Loubyansky diff --git a/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/MavenModelBuilder.java b/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/MavenModelBuilder.java index 2b25e09de8b66..e0fc3ee7b6f3b 100644 --- a/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/MavenModelBuilder.java +++ b/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/MavenModelBuilder.java @@ -1,14 +1,11 @@ package io.quarkus.bootstrap.resolver.maven; -import io.quarkus.bootstrap.resolver.maven.options.BootstrapMavenOptions; -import io.quarkus.bootstrap.resolver.maven.workspace.LocalWorkspace; -import io.quarkus.bootstrap.resolver.maven.workspace.ModelUtils; -import io.quarkus.maven.dependency.ArtifactCoords; import java.io.File; import java.io.IOException; import java.util.HashSet; import java.util.List; import java.util.Set; + import org.apache.maven.model.Model; import org.apache.maven.model.Profile; import org.apache.maven.model.building.ModelBuilder; @@ -19,6 +16,11 @@ import org.eclipse.aether.artifact.Artifact; import org.eclipse.aether.artifact.DefaultArtifact; +import io.quarkus.bootstrap.resolver.maven.options.BootstrapMavenOptions; +import io.quarkus.bootstrap.resolver.maven.workspace.LocalWorkspace; +import io.quarkus.bootstrap.resolver.maven.workspace.ModelUtils; +import io.quarkus.maven.dependency.ArtifactCoords; + /** * * @author Alexey Loubyansky diff --git a/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/SecDispatcherImpl.java b/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/SecDispatcherImpl.java index 3cfc8d3a0d449..d72e59a51c73a 100644 --- a/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/SecDispatcherImpl.java +++ b/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/SecDispatcherImpl.java @@ -3,6 +3,7 @@ import java.util.HashMap; import java.util.Map; import java.util.StringTokenizer; + import org.sonatype.plexus.components.cipher.DefaultPlexusCipher; import org.sonatype.plexus.components.cipher.PlexusCipher; import org.sonatype.plexus.components.cipher.PlexusCipherException; diff --git a/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/SettingsDecrypterImpl.java b/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/SettingsDecrypterImpl.java index f2990244c03e5..2eb54f373d11b 100644 --- a/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/SettingsDecrypterImpl.java +++ b/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/SettingsDecrypterImpl.java @@ -2,6 +2,7 @@ import java.util.ArrayList; import java.util.List; + import org.apache.maven.settings.Proxy; import org.apache.maven.settings.Server; import org.apache.maven.settings.building.DefaultSettingsProblem; diff --git a/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/SettingsDecryptionResultImpl.java b/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/SettingsDecryptionResultImpl.java index 67da3fdebb6da..a4ad15a68b587 100644 --- a/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/SettingsDecryptionResultImpl.java +++ b/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/SettingsDecryptionResultImpl.java @@ -2,6 +2,7 @@ import java.util.Collections; import java.util.List; + import org.apache.maven.settings.Proxy; import org.apache.maven.settings.Server; import org.apache.maven.settings.building.SettingsProblem; diff --git a/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/SimpleDependencyGraphTransformationContext.java b/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/SimpleDependencyGraphTransformationContext.java index 96cb1ec239f3c..866f9943edd40 100644 --- a/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/SimpleDependencyGraphTransformationContext.java +++ b/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/SimpleDependencyGraphTransformationContext.java @@ -2,6 +2,7 @@ import java.util.HashMap; import java.util.Map; + import org.eclipse.aether.RepositorySystemSession; import org.eclipse.aether.collection.DependencyGraphTransformationContext; diff --git a/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/options/BootstrapMavenOptions.java b/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/options/BootstrapMavenOptions.java index b580963bb6c41..5ef8f4297a0d4 100644 --- a/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/options/BootstrapMavenOptions.java +++ b/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/options/BootstrapMavenOptions.java @@ -1,6 +1,5 @@ package io.quarkus.bootstrap.resolver.maven.options; -import io.quarkus.bootstrap.util.PropertyUtils; import java.io.IOException; import java.lang.reflect.Method; import java.net.MalformedURLException; @@ -18,9 +17,12 @@ import java.util.StringTokenizer; import java.util.stream.Collectors; import java.util.stream.Stream; + import org.apache.maven.shared.utils.cli.CommandLineException; import org.apache.maven.shared.utils.cli.CommandLineUtils; +import io.quarkus.bootstrap.util.PropertyUtils; + /** * This class resolves relevant Maven command line options in case it's called * from a Maven build process. Maven internally uses org.apache.commons.cli.* API diff --git a/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/options/BootstrapMavenOptionsParser.java b/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/options/BootstrapMavenOptionsParser.java index 354f9ffb82874..dbd1f4ad4c572 100644 --- a/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/options/BootstrapMavenOptionsParser.java +++ b/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/options/BootstrapMavenOptionsParser.java @@ -5,6 +5,7 @@ import java.util.List; import java.util.Map; import java.util.Properties; + import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.ParseException; import org.apache.maven.cli.CLIManager; diff --git a/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/workspace/LocalProject.java b/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/workspace/LocalProject.java index 0ecf5f23b6001..29e84613bfb0c 100644 --- a/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/workspace/LocalProject.java +++ b/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/workspace/LocalProject.java @@ -1,23 +1,5 @@ package io.quarkus.bootstrap.resolver.maven.workspace; -import io.quarkus.bootstrap.resolver.maven.BootstrapMavenContext; -import io.quarkus.bootstrap.resolver.maven.BootstrapMavenException; -import io.quarkus.bootstrap.workspace.ArtifactSources; -import io.quarkus.bootstrap.workspace.DefaultArtifactSources; -import io.quarkus.bootstrap.workspace.DefaultSourceDir; -import io.quarkus.bootstrap.workspace.SourceDir; -import io.quarkus.bootstrap.workspace.WorkspaceModule; -import io.quarkus.maven.dependency.ArtifactCoords; -import io.quarkus.maven.dependency.ArtifactDependency; -import io.quarkus.maven.dependency.ArtifactKey; -import io.quarkus.maven.dependency.GAV; -import io.quarkus.maven.dependency.ResolvedArtifactDependency; -import io.quarkus.maven.dependency.ResolvedDependency; -import io.quarkus.maven.dependency.ResolvedDependencyBuilder; -import io.quarkus.paths.DirectoryPathTree; -import io.quarkus.paths.PathCollection; -import io.quarkus.paths.PathFilter; -import io.quarkus.paths.PathList; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; @@ -29,6 +11,7 @@ import java.util.Map; import java.util.function.Function; import java.util.stream.Collectors; + import org.apache.maven.model.Build; import org.apache.maven.model.Dependency; import org.apache.maven.model.Model; @@ -39,6 +22,25 @@ import org.apache.maven.model.building.ModelBuildingResult; import org.codehaus.plexus.util.xml.Xpp3Dom; +import io.quarkus.bootstrap.resolver.maven.BootstrapMavenContext; +import io.quarkus.bootstrap.resolver.maven.BootstrapMavenException; +import io.quarkus.bootstrap.workspace.ArtifactSources; +import io.quarkus.bootstrap.workspace.DefaultArtifactSources; +import io.quarkus.bootstrap.workspace.DefaultSourceDir; +import io.quarkus.bootstrap.workspace.SourceDir; +import io.quarkus.bootstrap.workspace.WorkspaceModule; +import io.quarkus.maven.dependency.ArtifactCoords; +import io.quarkus.maven.dependency.ArtifactDependency; +import io.quarkus.maven.dependency.ArtifactKey; +import io.quarkus.maven.dependency.GAV; +import io.quarkus.maven.dependency.ResolvedArtifactDependency; +import io.quarkus.maven.dependency.ResolvedDependency; +import io.quarkus.maven.dependency.ResolvedDependencyBuilder; +import io.quarkus.paths.DirectoryPathTree; +import io.quarkus.paths.PathCollection; +import io.quarkus.paths.PathFilter; +import io.quarkus.paths.PathList; + /** * * @author Alexey Loubyansky diff --git a/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/workspace/LocalWorkspace.java b/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/workspace/LocalWorkspace.java index 479c110a3c593..a4c84f32a29b7 100644 --- a/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/workspace/LocalWorkspace.java +++ b/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/workspace/LocalWorkspace.java @@ -1,11 +1,5 @@ package io.quarkus.bootstrap.resolver.maven.workspace; -import io.quarkus.bootstrap.resolver.maven.BootstrapMavenContext; -import io.quarkus.bootstrap.resolver.maven.BootstrapMavenException; -import io.quarkus.bootstrap.workspace.WorkspaceModule; -import io.quarkus.maven.dependency.ArtifactCoords; -import io.quarkus.maven.dependency.ArtifactKey; -import io.quarkus.maven.dependency.GACT; import java.io.File; import java.io.IOException; import java.nio.file.Files; @@ -15,6 +9,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; + import org.apache.maven.model.Model; import org.apache.maven.model.resolution.UnresolvableModelException; import org.apache.maven.model.resolution.WorkspaceModelResolver; @@ -23,6 +18,13 @@ import org.eclipse.aether.repository.WorkspaceReader; import org.eclipse.aether.repository.WorkspaceRepository; +import io.quarkus.bootstrap.resolver.maven.BootstrapMavenContext; +import io.quarkus.bootstrap.resolver.maven.BootstrapMavenException; +import io.quarkus.bootstrap.workspace.WorkspaceModule; +import io.quarkus.maven.dependency.ArtifactCoords; +import io.quarkus.maven.dependency.ArtifactKey; +import io.quarkus.maven.dependency.GACT; + /** * * @author Alexey Loubyansky diff --git a/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/workspace/ModelUtils.java b/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/workspace/ModelUtils.java index 167e46e7691ad..30459be661365 100644 --- a/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/workspace/ModelUtils.java +++ b/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/workspace/ModelUtils.java @@ -1,11 +1,5 @@ package io.quarkus.bootstrap.resolver.maven.workspace; -import io.quarkus.bootstrap.util.PropertyUtils; -import io.quarkus.fs.util.ZipUtils; -import io.quarkus.maven.dependency.ArtifactCoords; -import io.quarkus.maven.dependency.GACTV; -import io.quarkus.maven.dependency.ResolvedDependency; -import io.quarkus.maven.dependency.ResolvedDependencyBuilder; import java.io.BufferedReader; import java.io.BufferedWriter; import java.io.IOException; @@ -19,12 +13,20 @@ import java.util.Properties; import java.util.regex.Matcher; import java.util.regex.Pattern; + import org.apache.maven.model.Model; import org.apache.maven.model.Parent; import org.apache.maven.model.io.xpp3.MavenXpp3Reader; import org.apache.maven.model.io.xpp3.MavenXpp3Writer; import org.codehaus.plexus.util.xml.pull.XmlPullParserException; +import io.quarkus.bootstrap.util.PropertyUtils; +import io.quarkus.fs.util.ZipUtils; +import io.quarkus.maven.dependency.ArtifactCoords; +import io.quarkus.maven.dependency.GACTV; +import io.quarkus.maven.dependency.ResolvedDependency; +import io.quarkus.maven.dependency.ResolvedDependencyBuilder; + /** * * @author Alexey Loubyansky diff --git a/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/workspace/WorkspaceLoader.java b/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/workspace/WorkspaceLoader.java index feae8f9ac560c..6a0cd9b562761 100644 --- a/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/workspace/WorkspaceLoader.java +++ b/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/workspace/WorkspaceLoader.java @@ -1,10 +1,5 @@ package io.quarkus.bootstrap.resolver.maven.workspace; -import io.quarkus.bootstrap.resolver.maven.BootstrapMavenContext; -import io.quarkus.bootstrap.resolver.maven.BootstrapMavenException; -import io.quarkus.bootstrap.resolver.maven.BootstrapModelBuilderFactory; -import io.quarkus.bootstrap.resolver.maven.BootstrapModelResolver; -import io.quarkus.bootstrap.resolver.maven.options.BootstrapMavenOptions; import java.io.IOException; import java.nio.file.Files; import java.nio.file.NoSuchFileException; @@ -13,6 +8,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; + import org.apache.maven.model.Model; import org.apache.maven.model.Parent; import org.apache.maven.model.Profile; @@ -25,6 +21,12 @@ import org.apache.maven.model.resolution.WorkspaceModelResolver; import org.jboss.logging.Logger; +import io.quarkus.bootstrap.resolver.maven.BootstrapMavenContext; +import io.quarkus.bootstrap.resolver.maven.BootstrapMavenException; +import io.quarkus.bootstrap.resolver.maven.BootstrapModelBuilderFactory; +import io.quarkus.bootstrap.resolver.maven.BootstrapModelResolver; +import io.quarkus.bootstrap.resolver.maven.options.BootstrapMavenOptions; + public class WorkspaceLoader implements WorkspaceModelResolver { private static final Logger log = Logger.getLogger(WorkspaceLoader.class); diff --git a/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/util/DependencyUtils.java b/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/util/DependencyUtils.java index d801cbb9278b5..6bdd514695b05 100644 --- a/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/util/DependencyUtils.java +++ b/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/util/DependencyUtils.java @@ -1,19 +1,21 @@ package io.quarkus.bootstrap.util; -import io.quarkus.maven.dependency.ArtifactCoords; -import io.quarkus.maven.dependency.ArtifactKey; -import io.quarkus.maven.dependency.GACTV; import java.io.PrintWriter; import java.util.ArrayList; import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; + import org.eclipse.aether.artifact.Artifact; import org.eclipse.aether.artifact.DefaultArtifact; import org.eclipse.aether.graph.Dependency; import org.eclipse.aether.graph.DependencyNode; +import io.quarkus.maven.dependency.ArtifactCoords; +import io.quarkus.maven.dependency.ArtifactKey; +import io.quarkus.maven.dependency.GACTV; + public class DependencyUtils { public static ArtifactKey getKey(Artifact artifact) { diff --git a/independent-projects/bootstrap/maven-resolver/src/test/java/io/quarkus/bootstrap/resolver/maven/ReposInitializedFromEnvVarsTest.java b/independent-projects/bootstrap/maven-resolver/src/test/java/io/quarkus/bootstrap/resolver/maven/ReposInitializedFromEnvVarsTest.java index 2fb60afb99b24..72466d2abf55f 100644 --- a/independent-projects/bootstrap/maven-resolver/src/test/java/io/quarkus/bootstrap/resolver/maven/ReposInitializedFromEnvVarsTest.java +++ b/independent-projects/bootstrap/maven-resolver/src/test/java/io/quarkus/bootstrap/resolver/maven/ReposInitializedFromEnvVarsTest.java @@ -6,6 +6,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; + import org.eclipse.aether.repository.RemoteRepository; import org.junit.jupiter.api.Test; diff --git a/independent-projects/bootstrap/maven-resolver/src/test/java/io/quarkus/bootstrap/resolver/maven/test/BasicPomReposEffectivePomTest.java b/independent-projects/bootstrap/maven-resolver/src/test/java/io/quarkus/bootstrap/resolver/maven/test/BasicPomReposEffectivePomTest.java index fdd6334caadc3..76fed72bce92f 100644 --- a/independent-projects/bootstrap/maven-resolver/src/test/java/io/quarkus/bootstrap/resolver/maven/test/BasicPomReposEffectivePomTest.java +++ b/independent-projects/bootstrap/maven-resolver/src/test/java/io/quarkus/bootstrap/resolver/maven/test/BasicPomReposEffectivePomTest.java @@ -2,11 +2,13 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import io.quarkus.bootstrap.resolver.maven.BootstrapMavenContext; import java.nio.file.Files; import java.util.Arrays; + import org.junit.jupiter.api.Test; +import io.quarkus.bootstrap.resolver.maven.BootstrapMavenContext; + public class BasicPomReposEffectivePomTest extends BootstrapMavenContextTestBase { @Test diff --git a/independent-projects/bootstrap/maven-resolver/src/test/java/io/quarkus/bootstrap/resolver/maven/test/BootstrapMavenContextTestBase.java b/independent-projects/bootstrap/maven-resolver/src/test/java/io/quarkus/bootstrap/resolver/maven/test/BootstrapMavenContextTestBase.java index 1b6ee36b015ec..dbc11c5fb97b6 100644 --- a/independent-projects/bootstrap/maven-resolver/src/test/java/io/quarkus/bootstrap/resolver/maven/test/BootstrapMavenContextTestBase.java +++ b/independent-projects/bootstrap/maven-resolver/src/test/java/io/quarkus/bootstrap/resolver/maven/test/BootstrapMavenContextTestBase.java @@ -2,8 +2,6 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; -import io.quarkus.bootstrap.resolver.maven.BootstrapMavenContext; -import io.quarkus.bootstrap.resolver.maven.BootstrapMavenContextConfig; import java.net.URISyntaxException; import java.net.URL; import java.nio.file.Files; @@ -11,9 +9,13 @@ import java.nio.file.Paths; import java.util.HashMap; import java.util.Map; + import org.eclipse.aether.repository.RemoteRepository; import org.junit.jupiter.api.AfterEach; +import io.quarkus.bootstrap.resolver.maven.BootstrapMavenContext; +import io.quarkus.bootstrap.resolver.maven.BootstrapMavenContextConfig; + public class BootstrapMavenContextTestBase { private Map cleanupProps = new HashMap<>(); diff --git a/independent-projects/bootstrap/maven-resolver/src/test/java/io/quarkus/bootstrap/resolver/maven/test/BootstrapMavenOptionsTest.java b/independent-projects/bootstrap/maven-resolver/src/test/java/io/quarkus/bootstrap/resolver/maven/test/BootstrapMavenOptionsTest.java index 3f99cea1fbc30..3e425f0df34a3 100644 --- a/independent-projects/bootstrap/maven-resolver/src/test/java/io/quarkus/bootstrap/resolver/maven/test/BootstrapMavenOptionsTest.java +++ b/independent-projects/bootstrap/maven-resolver/src/test/java/io/quarkus/bootstrap/resolver/maven/test/BootstrapMavenOptionsTest.java @@ -3,11 +3,13 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -import io.quarkus.bootstrap.resolver.maven.options.BootstrapMavenOptions; import java.util.Properties; + import org.apache.maven.cli.CLIManager; import org.junit.jupiter.api.Test; +import io.quarkus.bootstrap.resolver.maven.options.BootstrapMavenOptions; + public class BootstrapMavenOptionsTest { @Test diff --git a/independent-projects/bootstrap/maven-resolver/src/test/java/io/quarkus/bootstrap/resolver/maven/test/CentralRepoOverridesEffectivePomTest.java b/independent-projects/bootstrap/maven-resolver/src/test/java/io/quarkus/bootstrap/resolver/maven/test/CentralRepoOverridesEffectivePomTest.java index 13a575e5799ad..082b5cc2ecc48 100644 --- a/independent-projects/bootstrap/maven-resolver/src/test/java/io/quarkus/bootstrap/resolver/maven/test/CentralRepoOverridesEffectivePomTest.java +++ b/independent-projects/bootstrap/maven-resolver/src/test/java/io/quarkus/bootstrap/resolver/maven/test/CentralRepoOverridesEffectivePomTest.java @@ -2,11 +2,13 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import io.quarkus.bootstrap.resolver.maven.BootstrapMavenContext; import java.nio.file.Files; import java.util.Arrays; + import org.junit.jupiter.api.Test; +import io.quarkus.bootstrap.resolver.maven.BootstrapMavenContext; + public class CentralRepoOverridesEffectivePomTest extends BootstrapMavenContextTestBase { @Test diff --git a/independent-projects/bootstrap/maven-resolver/src/test/java/io/quarkus/bootstrap/resolver/maven/test/NoProxyNoMirrorSettingsReposTest.java b/independent-projects/bootstrap/maven-resolver/src/test/java/io/quarkus/bootstrap/resolver/maven/test/NoProxyNoMirrorSettingsReposTest.java index 4dabc3c30fa21..f44fb05e61d31 100644 --- a/independent-projects/bootstrap/maven-resolver/src/test/java/io/quarkus/bootstrap/resolver/maven/test/NoProxyNoMirrorSettingsReposTest.java +++ b/independent-projects/bootstrap/maven-resolver/src/test/java/io/quarkus/bootstrap/resolver/maven/test/NoProxyNoMirrorSettingsReposTest.java @@ -4,11 +4,13 @@ import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import io.quarkus.bootstrap.resolver.maven.BootstrapMavenContext; import java.util.List; + import org.eclipse.aether.repository.RemoteRepository; import org.junit.jupiter.api.Test; +import io.quarkus.bootstrap.resolver.maven.BootstrapMavenContext; + public class NoProxyNoMirrorSettingsReposTest extends BootstrapMavenContextTestBase { @Test diff --git a/independent-projects/bootstrap/maven-resolver/src/test/java/io/quarkus/bootstrap/resolver/maven/test/PomProfileReposEffectivePomTest.java b/independent-projects/bootstrap/maven-resolver/src/test/java/io/quarkus/bootstrap/resolver/maven/test/PomProfileReposEffectivePomTest.java index ae42d9b071bde..75936675f2d98 100644 --- a/independent-projects/bootstrap/maven-resolver/src/test/java/io/quarkus/bootstrap/resolver/maven/test/PomProfileReposEffectivePomTest.java +++ b/independent-projects/bootstrap/maven-resolver/src/test/java/io/quarkus/bootstrap/resolver/maven/test/PomProfileReposEffectivePomTest.java @@ -2,11 +2,13 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import io.quarkus.bootstrap.resolver.maven.BootstrapMavenContext; import java.nio.file.Files; import java.util.Arrays; + import org.junit.jupiter.api.Test; +import io.quarkus.bootstrap.resolver.maven.BootstrapMavenContext; + public class PomProfileReposEffectivePomTest extends BootstrapMavenContextTestBase { @Test diff --git a/independent-projects/bootstrap/maven-resolver/src/test/java/io/quarkus/bootstrap/resolver/maven/test/PomReposMirroredTest.java b/independent-projects/bootstrap/maven-resolver/src/test/java/io/quarkus/bootstrap/resolver/maven/test/PomReposMirroredTest.java index 24d05bb7f83eb..4c1ba830af87e 100644 --- a/independent-projects/bootstrap/maven-resolver/src/test/java/io/quarkus/bootstrap/resolver/maven/test/PomReposMirroredTest.java +++ b/independent-projects/bootstrap/maven-resolver/src/test/java/io/quarkus/bootstrap/resolver/maven/test/PomReposMirroredTest.java @@ -5,16 +5,18 @@ import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import io.quarkus.bootstrap.resolver.maven.BootstrapMavenContext; -import io.quarkus.bootstrap.resolver.maven.BootstrapMavenContextConfig; import java.nio.file.Files; import java.nio.file.Path; import java.util.HashMap; import java.util.List; import java.util.Map; + import org.eclipse.aether.repository.RemoteRepository; import org.junit.jupiter.api.Test; +import io.quarkus.bootstrap.resolver.maven.BootstrapMavenContext; +import io.quarkus.bootstrap.resolver.maven.BootstrapMavenContextConfig; + public class PomReposMirroredTest extends BootstrapMavenContextTestBase { private static final String projectPath = "custom-settings/pom-repos-mirrored"; diff --git a/independent-projects/bootstrap/maven-resolver/src/test/java/io/quarkus/bootstrap/resolver/maven/test/PreferPomsFromWorkspaceTest.java b/independent-projects/bootstrap/maven-resolver/src/test/java/io/quarkus/bootstrap/resolver/maven/test/PreferPomsFromWorkspaceTest.java index 1e36422ae9282..4ef51e928c22e 100644 --- a/independent-projects/bootstrap/maven-resolver/src/test/java/io/quarkus/bootstrap/resolver/maven/test/PreferPomsFromWorkspaceTest.java +++ b/independent-projects/bootstrap/maven-resolver/src/test/java/io/quarkus/bootstrap/resolver/maven/test/PreferPomsFromWorkspaceTest.java @@ -2,9 +2,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import io.quarkus.bootstrap.resolver.maven.BootstrapMavenContext; -import io.quarkus.bootstrap.resolver.maven.BootstrapMavenContextConfig; import java.util.List; + import org.eclipse.aether.artifact.Artifact; import org.eclipse.aether.artifact.DefaultArtifact; import org.eclipse.aether.graph.Dependency; @@ -12,6 +11,9 @@ import org.eclipse.aether.resolution.ArtifactDescriptorResult; import org.junit.jupiter.api.Test; +import io.quarkus.bootstrap.resolver.maven.BootstrapMavenContext; +import io.quarkus.bootstrap.resolver.maven.BootstrapMavenContextConfig; + public class PreferPomsFromWorkspaceTest extends BootstrapMavenContextTestBase { @Override diff --git a/independent-projects/bootstrap/maven-resolver/src/test/java/io/quarkus/bootstrap/resolver/maven/test/ProxyAndMirrorSettingsReposTest.java b/independent-projects/bootstrap/maven-resolver/src/test/java/io/quarkus/bootstrap/resolver/maven/test/ProxyAndMirrorSettingsReposTest.java index f7d8596081e0e..823d6fa16def3 100644 --- a/independent-projects/bootstrap/maven-resolver/src/test/java/io/quarkus/bootstrap/resolver/maven/test/ProxyAndMirrorSettingsReposTest.java +++ b/independent-projects/bootstrap/maven-resolver/src/test/java/io/quarkus/bootstrap/resolver/maven/test/ProxyAndMirrorSettingsReposTest.java @@ -4,12 +4,14 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import io.quarkus.bootstrap.resolver.maven.BootstrapMavenContext; import java.util.Arrays; import java.util.List; + import org.eclipse.aether.repository.RemoteRepository; import org.junit.jupiter.api.Test; +import io.quarkus.bootstrap.resolver.maven.BootstrapMavenContext; + public class ProxyAndMirrorSettingsReposTest extends BootstrapMavenContextTestBase { @Test diff --git a/independent-projects/bootstrap/maven-resolver/src/test/java/io/quarkus/bootstrap/resolver/maven/test/ProxyNoMirrorSettingsReposTest.java b/independent-projects/bootstrap/maven-resolver/src/test/java/io/quarkus/bootstrap/resolver/maven/test/ProxyNoMirrorSettingsReposTest.java index ccd9f11324021..c640f59a68038 100644 --- a/independent-projects/bootstrap/maven-resolver/src/test/java/io/quarkus/bootstrap/resolver/maven/test/ProxyNoMirrorSettingsReposTest.java +++ b/independent-projects/bootstrap/maven-resolver/src/test/java/io/quarkus/bootstrap/resolver/maven/test/ProxyNoMirrorSettingsReposTest.java @@ -4,11 +4,13 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import io.quarkus.bootstrap.resolver.maven.BootstrapMavenContext; import java.util.List; + import org.eclipse.aether.repository.RemoteRepository; import org.junit.jupiter.api.Test; +import io.quarkus.bootstrap.resolver.maven.BootstrapMavenContext; + public class ProxyNoMirrorSettingsReposTest extends BootstrapMavenContextTestBase { @Test diff --git a/independent-projects/bootstrap/maven-resolver/src/test/java/io/quarkus/bootstrap/resolver/maven/test/ResolveEmptyJarProjectArtifactTest.java b/independent-projects/bootstrap/maven-resolver/src/test/java/io/quarkus/bootstrap/resolver/maven/test/ResolveEmptyJarProjectArtifactTest.java index ff5007f28bcfe..9c31f1561af99 100644 --- a/independent-projects/bootstrap/maven-resolver/src/test/java/io/quarkus/bootstrap/resolver/maven/test/ResolveEmptyJarProjectArtifactTest.java +++ b/independent-projects/bootstrap/maven-resolver/src/test/java/io/quarkus/bootstrap/resolver/maven/test/ResolveEmptyJarProjectArtifactTest.java @@ -2,13 +2,14 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import io.quarkus.bootstrap.resolver.maven.BootstrapMavenContext; -import io.quarkus.bootstrap.resolver.maven.BootstrapMavenContextConfig; -import io.quarkus.bootstrap.resolver.maven.MavenArtifactResolver; import org.eclipse.aether.artifact.Artifact; import org.eclipse.aether.artifact.DefaultArtifact; import org.junit.jupiter.api.Test; +import io.quarkus.bootstrap.resolver.maven.BootstrapMavenContext; +import io.quarkus.bootstrap.resolver.maven.BootstrapMavenContextConfig; +import io.quarkus.bootstrap.resolver.maven.MavenArtifactResolver; + /** * This test makes sure that projects with packaging 'jar' that don't include any content * (i.e. neither classes nor resources) are still resolvable locally. diff --git a/independent-projects/bootstrap/maven-resolver/src/test/java/io/quarkus/bootstrap/resolver/maven/test/SettingsProfileReposAndPomReposEffectivePomTest.java b/independent-projects/bootstrap/maven-resolver/src/test/java/io/quarkus/bootstrap/resolver/maven/test/SettingsProfileReposAndPomReposEffectivePomTest.java index 7ba2d65514f1b..26d47a1758c0d 100644 --- a/independent-projects/bootstrap/maven-resolver/src/test/java/io/quarkus/bootstrap/resolver/maven/test/SettingsProfileReposAndPomReposEffectivePomTest.java +++ b/independent-projects/bootstrap/maven-resolver/src/test/java/io/quarkus/bootstrap/resolver/maven/test/SettingsProfileReposAndPomReposEffectivePomTest.java @@ -2,11 +2,13 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import io.quarkus.bootstrap.resolver.maven.BootstrapMavenContext; import java.nio.file.Files; import java.util.Arrays; + import org.junit.jupiter.api.Test; +import io.quarkus.bootstrap.resolver.maven.BootstrapMavenContext; + public class SettingsProfileReposAndPomReposEffectivePomTest extends BootstrapMavenContextTestBase { @Test diff --git a/independent-projects/bootstrap/maven-resolver/src/test/java/io/quarkus/bootstrap/resolver/maven/test/SubmodulePomReposEffectivePomTest.java b/independent-projects/bootstrap/maven-resolver/src/test/java/io/quarkus/bootstrap/resolver/maven/test/SubmodulePomReposEffectivePomTest.java index 4e9e849343632..e87c3f62c96cb 100644 --- a/independent-projects/bootstrap/maven-resolver/src/test/java/io/quarkus/bootstrap/resolver/maven/test/SubmodulePomReposEffectivePomTest.java +++ b/independent-projects/bootstrap/maven-resolver/src/test/java/io/quarkus/bootstrap/resolver/maven/test/SubmodulePomReposEffectivePomTest.java @@ -2,11 +2,13 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import io.quarkus.bootstrap.resolver.maven.BootstrapMavenContext; import java.nio.file.Files; import java.util.Arrays; + import org.junit.jupiter.api.Test; +import io.quarkus.bootstrap.resolver.maven.BootstrapMavenContext; + public class SubmodulePomReposEffectivePomTest extends BootstrapMavenContextTestBase { @Test diff --git a/independent-projects/bootstrap/maven-resolver/src/test/java/io/quarkus/bootstrap/workspace/test/LocalWorkspaceDiscoveryTest.java b/independent-projects/bootstrap/maven-resolver/src/test/java/io/quarkus/bootstrap/workspace/test/LocalWorkspaceDiscoveryTest.java index 9c4078eca342a..a9b07b0f2e160 100644 --- a/independent-projects/bootstrap/maven-resolver/src/test/java/io/quarkus/bootstrap/workspace/test/LocalWorkspaceDiscoveryTest.java +++ b/independent-projects/bootstrap/maven-resolver/src/test/java/io/quarkus/bootstrap/workspace/test/LocalWorkspaceDiscoveryTest.java @@ -9,14 +9,6 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; -import io.quarkus.bootstrap.resolver.maven.BootstrapMavenContext; -import io.quarkus.bootstrap.resolver.maven.workspace.LocalProject; -import io.quarkus.bootstrap.resolver.maven.workspace.LocalWorkspace; -import io.quarkus.bootstrap.util.IoUtils; -import io.quarkus.bootstrap.workspace.SourceDir; -import io.quarkus.bootstrap.workspace.WorkspaceModule; -import io.quarkus.maven.dependency.ArtifactKey; -import io.quarkus.paths.PathTree; import java.io.File; import java.net.URL; import java.nio.file.Files; @@ -25,6 +17,7 @@ import java.util.Collection; import java.util.Map; import java.util.Properties; + import org.apache.maven.model.Dependency; import org.apache.maven.model.Parent; import org.assertj.core.api.Assertions; @@ -34,6 +27,15 @@ import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; +import io.quarkus.bootstrap.resolver.maven.BootstrapMavenContext; +import io.quarkus.bootstrap.resolver.maven.workspace.LocalProject; +import io.quarkus.bootstrap.resolver.maven.workspace.LocalWorkspace; +import io.quarkus.bootstrap.util.IoUtils; +import io.quarkus.bootstrap.workspace.SourceDir; +import io.quarkus.bootstrap.workspace.WorkspaceModule; +import io.quarkus.maven.dependency.ArtifactKey; +import io.quarkus.paths.PathTree; + public class LocalWorkspaceDiscoveryTest { private static Dependency newDependency(String artifactId) { diff --git a/independent-projects/bootstrap/maven-resolver/src/test/java/io/quarkus/bootstrap/workspace/test/MvnProjectBuilder.java b/independent-projects/bootstrap/maven-resolver/src/test/java/io/quarkus/bootstrap/workspace/test/MvnProjectBuilder.java index 9b207e130e212..0fd24bdd6727b 100644 --- a/independent-projects/bootstrap/maven-resolver/src/test/java/io/quarkus/bootstrap/workspace/test/MvnProjectBuilder.java +++ b/independent-projects/bootstrap/maven-resolver/src/test/java/io/quarkus/bootstrap/workspace/test/MvnProjectBuilder.java @@ -3,17 +3,19 @@ */ package io.quarkus.bootstrap.workspace.test; -import io.quarkus.bootstrap.resolver.maven.workspace.ModelUtils; -import io.quarkus.bootstrap.util.IoUtils; import java.io.IOException; import java.nio.file.Path; import java.nio.file.Paths; import java.util.ArrayList; import java.util.List; + import org.apache.maven.model.Dependency; import org.apache.maven.model.Model; import org.apache.maven.model.Parent; +import io.quarkus.bootstrap.resolver.maven.workspace.ModelUtils; +import io.quarkus.bootstrap.util.IoUtils; + public class MvnProjectBuilder { public static final String DEFAULT_GROUP_ID = "io.quarkus.test"; diff --git a/independent-projects/bootstrap/pom.xml b/independent-projects/bootstrap/pom.xml index 5ecff6e16f033..83c9afe66e9d3 100644 --- a/independent-projects/bootstrap/pom.xml +++ b/independent-projects/bootstrap/pom.xml @@ -68,6 +68,8 @@ 7.5.1 0.0.9 0.1.1 + 2.20.0 + 1.7.0 bom @@ -152,10 +154,11 @@ MAVEN_OPTS + net.revelc.code.formatter formatter-maven-plugin - 2.20.0 + ${formatter-maven-plugin.version} quarkus-ide-config @@ -174,12 +177,14 @@ net.revelc.code impsort-maven-plugin - 1.7.0 + ${impsort-maven-plugin.version} .cache/impsort-maven-plugin-${impsort-maven-plugin.version} - true + java.,javax.,jakarta.,org.,com. + * ${format.skip} + true diff --git a/independent-projects/bootstrap/runner/src/main/java/io/quarkus/bootstrap/forkjoin/QuarkusForkJoinWorkerThread.java b/independent-projects/bootstrap/runner/src/main/java/io/quarkus/bootstrap/forkjoin/QuarkusForkJoinWorkerThread.java index 138d07635e93c..46e86e057e63f 100644 --- a/independent-projects/bootstrap/runner/src/main/java/io/quarkus/bootstrap/forkjoin/QuarkusForkJoinWorkerThread.java +++ b/independent-projects/bootstrap/runner/src/main/java/io/quarkus/bootstrap/forkjoin/QuarkusForkJoinWorkerThread.java @@ -1,9 +1,10 @@ package io.quarkus.bootstrap.forkjoin; -import io.quarkus.bootstrap.runner.RunnerClassLoader; import java.util.concurrent.ForkJoinPool; import java.util.concurrent.ForkJoinWorkerThread; +import io.quarkus.bootstrap.runner.RunnerClassLoader; + public class QuarkusForkJoinWorkerThread extends ForkJoinWorkerThread { private static volatile ClassLoader qClassloader; diff --git a/independent-projects/bootstrap/runner/src/main/java/io/quarkus/bootstrap/logging/InitialConfigurator.java b/independent-projects/bootstrap/runner/src/main/java/io/quarkus/bootstrap/logging/InitialConfigurator.java index f91ea6cc42536..d3600f38d1b17 100644 --- a/independent-projects/bootstrap/runner/src/main/java/io/quarkus/bootstrap/logging/InitialConfigurator.java +++ b/independent-projects/bootstrap/runner/src/main/java/io/quarkus/bootstrap/logging/InitialConfigurator.java @@ -1,12 +1,14 @@ package io.quarkus.bootstrap.logging; -import io.quarkus.bootstrap.graal.ImageInfo; import java.util.logging.Handler; import java.util.logging.Level; + import org.jboss.logmanager.EmbeddedConfigurator; import org.jboss.logmanager.formatters.PatternFormatter; import org.jboss.logmanager.handlers.ConsoleHandler; +import io.quarkus.bootstrap.graal.ImageInfo; + /** * */ diff --git a/independent-projects/bootstrap/runner/src/main/java/io/quarkus/bootstrap/logging/QuarkusDelayedHandler.java b/independent-projects/bootstrap/runner/src/main/java/io/quarkus/bootstrap/logging/QuarkusDelayedHandler.java index 18907fcf6c7e4..6f83b5721afed 100644 --- a/independent-projects/bootstrap/runner/src/main/java/io/quarkus/bootstrap/logging/QuarkusDelayedHandler.java +++ b/independent-projects/bootstrap/runner/src/main/java/io/quarkus/bootstrap/logging/QuarkusDelayedHandler.java @@ -31,6 +31,7 @@ import java.util.logging.Formatter; import java.util.logging.Handler; import java.util.logging.Logger; + import org.jboss.logmanager.ExtHandler; import org.jboss.logmanager.ExtLogRecord; import org.jboss.logmanager.Level; diff --git a/independent-projects/bootstrap/runner/src/main/java/io/quarkus/bootstrap/runner/DevModeMediator.java b/independent-projects/bootstrap/runner/src/main/java/io/quarkus/bootstrap/runner/DevModeMediator.java index a0876079b7e36..0cc428bf191f1 100644 --- a/independent-projects/bootstrap/runner/src/main/java/io/quarkus/bootstrap/runner/DevModeMediator.java +++ b/independent-projects/bootstrap/runner/src/main/java/io/quarkus/bootstrap/runner/DevModeMediator.java @@ -12,6 +12,7 @@ import java.util.List; import java.util.Timer; import java.util.TimerTask; + import org.jboss.logging.Logger; /** diff --git a/independent-projects/bootstrap/runner/src/main/java/io/quarkus/bootstrap/runner/JarResource.java b/independent-projects/bootstrap/runner/src/main/java/io/quarkus/bootstrap/runner/JarResource.java index 603f1f462067f..4bc3147fd37cf 100644 --- a/independent-projects/bootstrap/runner/src/main/java/io/quarkus/bootstrap/runner/JarResource.java +++ b/independent-projects/bootstrap/runner/src/main/java/io/quarkus/bootstrap/runner/JarResource.java @@ -1,7 +1,5 @@ package io.quarkus.bootstrap.runner; -import io.smallrye.common.io.jar.JarEntries; -import io.smallrye.common.io.jar.JarFiles; import java.io.IOException; import java.io.InputStream; import java.net.MalformedURLException; @@ -21,6 +19,9 @@ import java.util.zip.ZipEntry; import java.util.zip.ZipFile; +import io.smallrye.common.io.jar.JarEntries; +import io.smallrye.common.io.jar.JarFiles; + /** * A jar resource */ diff --git a/independent-projects/bootstrap/runner/src/main/java/io/quarkus/bootstrap/runner/QuarkusEntryPoint.java b/independent-projects/bootstrap/runner/src/main/java/io/quarkus/bootstrap/runner/QuarkusEntryPoint.java index 9f12fa8161067..ff651ae055547 100644 --- a/independent-projects/bootstrap/runner/src/main/java/io/quarkus/bootstrap/runner/QuarkusEntryPoint.java +++ b/independent-projects/bootstrap/runner/src/main/java/io/quarkus/bootstrap/runner/QuarkusEntryPoint.java @@ -1,7 +1,5 @@ package io.quarkus.bootstrap.runner; -import io.quarkus.bootstrap.forkjoin.QuarkusForkJoinWorkerThread; -import io.quarkus.bootstrap.logging.InitialConfigurator; import java.io.BufferedInputStream; import java.io.File; import java.io.IOException; @@ -16,6 +14,9 @@ import java.nio.file.Path; import java.util.List; +import io.quarkus.bootstrap.forkjoin.QuarkusForkJoinWorkerThread; +import io.quarkus.bootstrap.logging.InitialConfigurator; + public class QuarkusEntryPoint { public static final String QUARKUS_APPLICATION_DAT = "quarkus/quarkus-application.dat"; diff --git a/independent-projects/bootstrap/runner/src/main/java/io/quarkus/bootstrap/runner/RunnerClassLoader.java b/independent-projects/bootstrap/runner/src/main/java/io/quarkus/bootstrap/runner/RunnerClassLoader.java index 1fced46e0a7ea..f0047050d8d62 100644 --- a/independent-projects/bootstrap/runner/src/main/java/io/quarkus/bootstrap/runner/RunnerClassLoader.java +++ b/independent-projects/bootstrap/runner/src/main/java/io/quarkus/bootstrap/runner/RunnerClassLoader.java @@ -7,6 +7,7 @@ import java.util.List; import java.util.Map; import java.util.Set; + import org.crac.Context; import org.crac.Resource; diff --git a/independent-projects/bootstrap/runner/src/main/java/io/quarkus/bootstrap/runner/Timing.java b/independent-projects/bootstrap/runner/src/main/java/io/quarkus/bootstrap/runner/Timing.java index d0e2aef012100..cfb18a1a09c74 100644 --- a/independent-projects/bootstrap/runner/src/main/java/io/quarkus/bootstrap/runner/Timing.java +++ b/independent-projects/bootstrap/runner/src/main/java/io/quarkus/bootstrap/runner/Timing.java @@ -1,12 +1,14 @@ package io.quarkus.bootstrap.runner; -import io.quarkus.bootstrap.graal.ImageInfo; -import io.quarkus.bootstrap.logging.InitialConfigurator; import java.math.BigDecimal; import java.math.RoundingMode; import java.util.logging.Handler; + import org.jboss.logging.Logger; +import io.quarkus.bootstrap.graal.ImageInfo; +import io.quarkus.bootstrap.logging.InitialConfigurator; + /** * Class that is responsible for printing out timing results. *

diff --git a/independent-projects/bootstrap/runner/src/test/java/io/quarkus/bootstrap/runner/JarResourceTest.java b/independent-projects/bootstrap/runner/src/test/java/io/quarkus/bootstrap/runner/JarResourceTest.java index 6eff30ff84050..695428a2afaf3 100644 --- a/independent-projects/bootstrap/runner/src/test/java/io/quarkus/bootstrap/runner/JarResourceTest.java +++ b/independent-projects/bootstrap/runner/src/test/java/io/quarkus/bootstrap/runner/JarResourceTest.java @@ -7,6 +7,7 @@ import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; + import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.jboss.shrinkwrap.api.exporter.ZipExporter; diff --git a/independent-projects/enforcer-rules/pom.xml b/independent-projects/enforcer-rules/pom.xml index d6b8ea712e01f..2716db3d09727 100644 --- a/independent-projects/enforcer-rules/pom.xml +++ b/independent-projects/enforcer-rules/pom.xml @@ -136,8 +136,10 @@ .cache/impsort-maven-plugin-${impsort-maven-plugin.version} - true + java.,javax.,jakarta.,org.,com. + * ${format.skip} + true diff --git a/independent-projects/enforcer-rules/src/main/java/io/quarkus/enforcer/BansRuntimeDependency.java b/independent-projects/enforcer-rules/src/main/java/io/quarkus/enforcer/BansRuntimeDependency.java index 347f947368717..b38d6bfc4367f 100644 --- a/independent-projects/enforcer-rules/src/main/java/io/quarkus/enforcer/BansRuntimeDependency.java +++ b/independent-projects/enforcer-rules/src/main/java/io/quarkus/enforcer/BansRuntimeDependency.java @@ -3,6 +3,7 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; + import org.apache.maven.artifact.Artifact; import org.apache.maven.enforcer.rule.api.EnforcerRuleException; import org.apache.maven.model.Dependency; diff --git a/independent-projects/enforcer-rules/src/main/java/io/quarkus/enforcer/DeploymentDependencyRuleSupport.java b/independent-projects/enforcer-rules/src/main/java/io/quarkus/enforcer/DeploymentDependencyRuleSupport.java index 438b3aa97115d..73a2fa57ae9ea 100644 --- a/independent-projects/enforcer-rules/src/main/java/io/quarkus/enforcer/DeploymentDependencyRuleSupport.java +++ b/independent-projects/enforcer-rules/src/main/java/io/quarkus/enforcer/DeploymentDependencyRuleSupport.java @@ -14,6 +14,7 @@ import java.util.stream.Collectors; import java.util.zip.ZipEntry; import java.util.zip.ZipFile; + import org.apache.maven.artifact.Artifact; import org.apache.maven.enforcer.rule.api.EnforcerLevel; import org.apache.maven.enforcer.rule.api.EnforcerRule; diff --git a/independent-projects/enforcer-rules/src/main/java/io/quarkus/enforcer/RequiresMinimalDeploymentDependency.java b/independent-projects/enforcer-rules/src/main/java/io/quarkus/enforcer/RequiresMinimalDeploymentDependency.java index 8f73f2bf54203..94fc9dc82dbcf 100644 --- a/independent-projects/enforcer-rules/src/main/java/io/quarkus/enforcer/RequiresMinimalDeploymentDependency.java +++ b/independent-projects/enforcer-rules/src/main/java/io/quarkus/enforcer/RequiresMinimalDeploymentDependency.java @@ -8,6 +8,7 @@ import java.util.Optional; import java.util.Set; import java.util.stream.Collectors; + import org.apache.maven.artifact.Artifact; import org.apache.maven.enforcer.rule.api.EnforcerRuleException; import org.apache.maven.model.Dependency; diff --git a/independent-projects/extension-maven-plugin/pom.xml b/independent-projects/extension-maven-plugin/pom.xml index 82650cc4f4505..5f4b87169537c 100644 --- a/independent-projects/extension-maven-plugin/pom.xml +++ b/independent-projects/extension-maven-plugin/pom.xml @@ -132,8 +132,10 @@ .cache/impsort-maven-plugin-${impsort-maven-plugin.version} - true + java.,javax.,jakarta.,org.,com. + * ${format.skip} + true diff --git a/independent-projects/extension-maven-plugin/src/main/java/io/quarkus/maven/BootstrapWorkspaceProvider.java b/independent-projects/extension-maven-plugin/src/main/java/io/quarkus/maven/BootstrapWorkspaceProvider.java index a4a94477b5942..59b9190242ce2 100644 --- a/independent-projects/extension-maven-plugin/src/main/java/io/quarkus/maven/BootstrapWorkspaceProvider.java +++ b/independent-projects/extension-maven-plugin/src/main/java/io/quarkus/maven/BootstrapWorkspaceProvider.java @@ -1,14 +1,16 @@ package io.quarkus.maven; -import io.quarkus.bootstrap.resolver.maven.BootstrapMavenException; -import io.quarkus.bootstrap.resolver.maven.options.BootstrapMavenOptions; -import io.quarkus.bootstrap.resolver.maven.workspace.LocalProject; -import io.quarkus.bootstrap.resolver.maven.workspace.LocalWorkspace; import java.nio.file.Path; import java.nio.file.Paths; + import org.codehaus.plexus.component.annotations.Component; import org.jboss.logging.Logger; +import io.quarkus.bootstrap.resolver.maven.BootstrapMavenException; +import io.quarkus.bootstrap.resolver.maven.options.BootstrapMavenOptions; +import io.quarkus.bootstrap.resolver.maven.workspace.LocalProject; +import io.quarkus.bootstrap.resolver.maven.workspace.LocalWorkspace; + @Component(role = BootstrapWorkspaceProvider.class, instantiationStrategy = "singleton") public class BootstrapWorkspaceProvider { diff --git a/independent-projects/extension-maven-plugin/src/main/java/io/quarkus/maven/ExtensionDescriptorMojo.java b/independent-projects/extension-maven-plugin/src/main/java/io/quarkus/maven/ExtensionDescriptorMojo.java index e5bec82426192..b042d97ee30c6 100644 --- a/independent-projects/extension-maven-plugin/src/main/java/io/quarkus/maven/ExtensionDescriptorMojo.java +++ b/independent-projects/extension-maven-plugin/src/main/java/io/quarkus/maven/ExtensionDescriptorMojo.java @@ -1,30 +1,5 @@ package io.quarkus.maven; -import com.fasterxml.jackson.core.json.JsonReadFeature; -import com.fasterxml.jackson.core.util.DefaultIndenter; -import com.fasterxml.jackson.core.util.DefaultPrettyPrinter; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.PropertyNamingStrategies; -import com.fasterxml.jackson.databind.SerializationFeature; -import com.fasterxml.jackson.databind.json.JsonMapper; -import com.fasterxml.jackson.databind.node.ArrayNode; -import com.fasterxml.jackson.databind.node.ObjectNode; -import com.fasterxml.jackson.dataformat.yaml.YAMLFactory; -import io.quarkus.bootstrap.BootstrapConstants; -import io.quarkus.bootstrap.model.ApplicationModelBuilder; -import io.quarkus.bootstrap.resolver.maven.BootstrapMavenContext; -import io.quarkus.bootstrap.resolver.maven.BootstrapMavenException; -import io.quarkus.bootstrap.resolver.maven.MavenArtifactResolver; -import io.quarkus.bootstrap.resolver.maven.workspace.LocalProject; -import io.quarkus.bootstrap.resolver.maven.workspace.LocalWorkspace; -import io.quarkus.bootstrap.util.DependencyUtils; -import io.quarkus.fs.util.ZipUtils; -import io.quarkus.maven.capabilities.CapabilitiesConfig; -import io.quarkus.maven.capabilities.CapabilityConfig; -import io.quarkus.maven.dependency.ArtifactCoords; -import io.quarkus.maven.dependency.ArtifactKey; -import io.quarkus.maven.dependency.GACTV; import java.io.BufferedReader; import java.io.BufferedWriter; import java.io.File; @@ -43,6 +18,7 @@ import java.util.Properties; import java.util.Set; import java.util.concurrent.atomic.AtomicReference; + import org.apache.maven.artifact.Artifact; import org.apache.maven.execution.MavenSession; import org.apache.maven.plugin.AbstractMojo; @@ -72,6 +48,33 @@ import org.eclipse.aether.resolution.DependencyResult; import org.eclipse.aether.util.artifact.JavaScopes; +import com.fasterxml.jackson.core.json.JsonReadFeature; +import com.fasterxml.jackson.core.util.DefaultIndenter; +import com.fasterxml.jackson.core.util.DefaultPrettyPrinter; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.PropertyNamingStrategies; +import com.fasterxml.jackson.databind.SerializationFeature; +import com.fasterxml.jackson.databind.json.JsonMapper; +import com.fasterxml.jackson.databind.node.ArrayNode; +import com.fasterxml.jackson.databind.node.ObjectNode; +import com.fasterxml.jackson.dataformat.yaml.YAMLFactory; + +import io.quarkus.bootstrap.BootstrapConstants; +import io.quarkus.bootstrap.model.ApplicationModelBuilder; +import io.quarkus.bootstrap.resolver.maven.BootstrapMavenContext; +import io.quarkus.bootstrap.resolver.maven.BootstrapMavenException; +import io.quarkus.bootstrap.resolver.maven.MavenArtifactResolver; +import io.quarkus.bootstrap.resolver.maven.workspace.LocalProject; +import io.quarkus.bootstrap.resolver.maven.workspace.LocalWorkspace; +import io.quarkus.bootstrap.util.DependencyUtils; +import io.quarkus.fs.util.ZipUtils; +import io.quarkus.maven.capabilities.CapabilitiesConfig; +import io.quarkus.maven.capabilities.CapabilityConfig; +import io.quarkus.maven.dependency.ArtifactCoords; +import io.quarkus.maven.dependency.ArtifactKey; +import io.quarkus.maven.dependency.GACTV; + /** * Generates Quarkus extension descriptor for the runtime artifact. *

diff --git a/independent-projects/qute/core/src/main/java/io/quarkus/qute/EngineImpl.java b/independent-projects/qute/core/src/main/java/io/quarkus/qute/EngineImpl.java index c5aee97fa51af..408e134ca0a6a 100644 --- a/independent-projects/qute/core/src/main/java/io/quarkus/qute/EngineImpl.java +++ b/independent-projects/qute/core/src/main/java/io/quarkus/qute/EngineImpl.java @@ -1,8 +1,5 @@ package io.quarkus.qute; -import io.quarkus.qute.Parser.StringReader; -import io.quarkus.qute.TemplateInstance.Initializer; -import io.quarkus.qute.TemplateLocator.TemplateLocation; import java.io.BufferedReader; import java.io.IOException; import java.io.Reader; @@ -16,8 +13,13 @@ import java.util.concurrent.atomic.AtomicLong; import java.util.function.Function; import java.util.function.Predicate; + import org.jboss.logging.Logger; +import io.quarkus.qute.Parser.StringReader; +import io.quarkus.qute.TemplateInstance.Initializer; +import io.quarkus.qute.TemplateLocator.TemplateLocation; + class EngineImpl implements Engine { private static final Logger LOGGER = Logger.getLogger(EngineImpl.class); diff --git a/independent-projects/qute/core/src/main/java/io/quarkus/qute/EvalSectionHelper.java b/independent-projects/qute/core/src/main/java/io/quarkus/qute/EvalSectionHelper.java index 90da6cc22e8c4..3032ba8b3a3fc 100644 --- a/independent-projects/qute/core/src/main/java/io/quarkus/qute/EvalSectionHelper.java +++ b/independent-projects/qute/core/src/main/java/io/quarkus/qute/EvalSectionHelper.java @@ -2,7 +2,6 @@ import static io.quarkus.qute.Futures.evaluateParams; -import io.quarkus.qute.TemplateNode.Origin; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -10,6 +9,8 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionStage; +import io.quarkus.qute.TemplateNode.Origin; + public class EvalSectionHelper implements SectionHelper { private static final String TEMPLATE = "template"; diff --git a/independent-projects/qute/core/src/main/java/io/quarkus/qute/EvaluatorImpl.java b/independent-projects/qute/core/src/main/java/io/quarkus/qute/EvaluatorImpl.java index 352ef80030357..6a82b6dc7e05d 100644 --- a/independent-projects/qute/core/src/main/java/io/quarkus/qute/EvaluatorImpl.java +++ b/independent-projects/qute/core/src/main/java/io/quarkus/qute/EvaluatorImpl.java @@ -1,9 +1,5 @@ package io.quarkus.qute; -import io.quarkus.qute.Expression.Part; -import io.quarkus.qute.ExpressionImpl.PartImpl; -import io.quarkus.qute.Results.NotFound; -import io.smallrye.mutiny.Uni; import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; @@ -13,8 +9,14 @@ import java.util.Map; import java.util.Map.Entry; import java.util.concurrent.CompletionStage; + import org.jboss.logging.Logger; +import io.quarkus.qute.Expression.Part; +import io.quarkus.qute.ExpressionImpl.PartImpl; +import io.quarkus.qute.Results.NotFound; +import io.smallrye.mutiny.Uni; + class EvaluatorImpl implements Evaluator { private static final Logger LOGGER = Logger.getLogger(EvaluatorImpl.class); diff --git a/independent-projects/qute/core/src/main/java/io/quarkus/qute/Expression.java b/independent-projects/qute/core/src/main/java/io/quarkus/qute/Expression.java index 00a00094f9551..c330b2cd339a8 100644 --- a/independent-projects/qute/core/src/main/java/io/quarkus/qute/Expression.java +++ b/independent-projects/qute/core/src/main/java/io/quarkus/qute/Expression.java @@ -1,11 +1,12 @@ package io.quarkus.qute; -import io.quarkus.qute.TemplateNode.Origin; import java.util.List; import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionStage; import java.util.stream.Collectors; +import io.quarkus.qute.TemplateNode.Origin; + /** * Represents a value expression. It could be a literal such as {@code 'foo'}. It could have a namespace such as {@code data} * for {@code data:name}. It could have several parts such as {@code item} and {@code name} for {@code item.name}. diff --git a/independent-projects/qute/core/src/main/java/io/quarkus/qute/ExpressionImpl.java b/independent-projects/qute/core/src/main/java/io/quarkus/qute/ExpressionImpl.java index a69227a6d75ae..c45baa776bc86 100644 --- a/independent-projects/qute/core/src/main/java/io/quarkus/qute/ExpressionImpl.java +++ b/independent-projects/qute/core/src/main/java/io/quarkus/qute/ExpressionImpl.java @@ -1,6 +1,5 @@ package io.quarkus.qute; -import io.quarkus.qute.TemplateNode.Origin; import java.util.Collections; import java.util.Iterator; import java.util.List; @@ -8,6 +7,8 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionStage; +import io.quarkus.qute.TemplateNode.Origin; + final class ExpressionImpl implements Expression { static final ExpressionImpl EMPTY = new ExpressionImpl(0, null, Collections.emptyList(), Results.NotFound.EMPTY, null); diff --git a/independent-projects/qute/core/src/main/java/io/quarkus/qute/ExpressionNode.java b/independent-projects/qute/core/src/main/java/io/quarkus/qute/ExpressionNode.java index c8b9639798d68..0311ce8bd407a 100644 --- a/independent-projects/qute/core/src/main/java/io/quarkus/qute/ExpressionNode.java +++ b/independent-projects/qute/core/src/main/java/io/quarkus/qute/ExpressionNode.java @@ -4,6 +4,7 @@ import java.util.List; import java.util.concurrent.CompletionStage; import java.util.function.Function; + import org.jboss.logging.Logger; /** diff --git a/independent-projects/qute/core/src/main/java/io/quarkus/qute/Expressions.java b/independent-projects/qute/core/src/main/java/io/quarkus/qute/Expressions.java index a7554e5f1a2fa..0c3d8bd9eb5d1 100644 --- a/independent-projects/qute/core/src/main/java/io/quarkus/qute/Expressions.java +++ b/independent-projects/qute/core/src/main/java/io/quarkus/qute/Expressions.java @@ -1,10 +1,11 @@ package io.quarkus.qute; -import io.quarkus.qute.TemplateNode.Origin; import java.util.Collections; import java.util.List; import java.util.stream.Collectors; +import io.quarkus.qute.TemplateNode.Origin; + public final class Expressions { public static final String TYPECHECK_NAMESPACE_PLACEHOLDER = "$$namespace$$"; diff --git a/independent-projects/qute/core/src/main/java/io/quarkus/qute/HtmlEscaper.java b/independent-projects/qute/core/src/main/java/io/quarkus/qute/HtmlEscaper.java index f7405dc45d038..194720231f85e 100644 --- a/independent-projects/qute/core/src/main/java/io/quarkus/qute/HtmlEscaper.java +++ b/independent-projects/qute/core/src/main/java/io/quarkus/qute/HtmlEscaper.java @@ -1,10 +1,11 @@ package io.quarkus.qute; -import io.quarkus.qute.TemplateNode.Origin; import java.util.List; import java.util.Objects; import java.util.Optional; +import io.quarkus.qute.TemplateNode.Origin; + public class HtmlEscaper implements ResultMapper { private final List escapedContentTypes; diff --git a/independent-projects/qute/core/src/main/java/io/quarkus/qute/IfSectionHelper.java b/independent-projects/qute/core/src/main/java/io/quarkus/qute/IfSectionHelper.java index 8d535884e950e..6d7f7bdf8d055 100644 --- a/independent-projects/qute/core/src/main/java/io/quarkus/qute/IfSectionHelper.java +++ b/independent-projects/qute/core/src/main/java/io/quarkus/qute/IfSectionHelper.java @@ -2,7 +2,6 @@ import static io.quarkus.qute.Booleans.isFalsy; -import io.quarkus.qute.SectionHelperFactory.SectionInitContext; import java.math.BigDecimal; import java.math.BigInteger; import java.util.ArrayList; @@ -12,6 +11,8 @@ import java.util.Objects; import java.util.concurrent.CompletionStage; +import io.quarkus.qute.SectionHelperFactory.SectionInitContext; + /** * Basic {@code if} statement. */ diff --git a/independent-projects/qute/core/src/main/java/io/quarkus/qute/LiteralSupport.java b/independent-projects/qute/core/src/main/java/io/quarkus/qute/LiteralSupport.java index 79f686bd53b77..65afaf5eb21a0 100644 --- a/independent-projects/qute/core/src/main/java/io/quarkus/qute/LiteralSupport.java +++ b/independent-projects/qute/core/src/main/java/io/quarkus/qute/LiteralSupport.java @@ -1,6 +1,7 @@ package io.quarkus.qute; import java.util.regex.Pattern; + import org.jboss.logging.Logger; class LiteralSupport { diff --git a/independent-projects/qute/core/src/main/java/io/quarkus/qute/Locate.java b/independent-projects/qute/core/src/main/java/io/quarkus/qute/Locate.java index 28954de22bd73..1088b47234065 100644 --- a/independent-projects/qute/core/src/main/java/io/quarkus/qute/Locate.java +++ b/independent-projects/qute/core/src/main/java/io/quarkus/qute/Locate.java @@ -2,12 +2,13 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; -import io.quarkus.qute.Locate.Locates; import java.lang.annotation.ElementType; import java.lang.annotation.Repeatable; import java.lang.annotation.Retention; import java.lang.annotation.Target; +import io.quarkus.qute.Locate.Locates; + /** * A custom {@link TemplateLocator}s are not available during the build time, therefore {@link Template} located by * the locator must disable its validation by annotating the {@link TemplateLocator} with this annotation. If @@ -48,4 +49,4 @@ Locate[] value(); } -} \ No newline at end of file +} diff --git a/independent-projects/qute/core/src/main/java/io/quarkus/qute/LoopSectionHelper.java b/independent-projects/qute/core/src/main/java/io/quarkus/qute/LoopSectionHelper.java index 1f11ea46fe198..fd38411706353 100644 --- a/independent-projects/qute/core/src/main/java/io/quarkus/qute/LoopSectionHelper.java +++ b/independent-projects/qute/core/src/main/java/io/quarkus/qute/LoopSectionHelper.java @@ -2,7 +2,6 @@ import static io.quarkus.qute.Parameter.EMPTY; -import io.quarkus.qute.SectionHelperFactory.SectionInitContext; import java.lang.reflect.Array; import java.util.ArrayList; import java.util.Collection; @@ -15,6 +14,8 @@ import java.util.stream.IntStream; import java.util.stream.Stream; +import io.quarkus.qute.SectionHelperFactory.SectionInitContext; + /** * Basic sequential {@code loop} statement. */ diff --git a/independent-projects/qute/core/src/main/java/io/quarkus/qute/Parameter.java b/independent-projects/qute/core/src/main/java/io/quarkus/qute/Parameter.java index 4ef0ea61d4c1a..df1fbb7bbd2ac 100644 --- a/independent-projects/qute/core/src/main/java/io/quarkus/qute/Parameter.java +++ b/independent-projects/qute/core/src/main/java/io/quarkus/qute/Parameter.java @@ -1,9 +1,10 @@ package io.quarkus.qute; -import io.quarkus.qute.SectionHelperFactory.ParametersInfo; import java.util.Objects; import java.util.function.Predicate; +import io.quarkus.qute.SectionHelperFactory.ParametersInfo; + /** * Definition of a section factory parameter. * diff --git a/independent-projects/qute/core/src/main/java/io/quarkus/qute/Parser.java b/independent-projects/qute/core/src/main/java/io/quarkus/qute/Parser.java index ebcec90b079ac..820b7de816118 100644 --- a/independent-projects/qute/core/src/main/java/io/quarkus/qute/Parser.java +++ b/independent-projects/qute/core/src/main/java/io/quarkus/qute/Parser.java @@ -1,10 +1,5 @@ package io.quarkus.qute; -import io.quarkus.qute.Expression.Part; -import io.quarkus.qute.SectionHelperFactory.BlockInfo; -import io.quarkus.qute.SectionHelperFactory.ParametersInfo; -import io.quarkus.qute.SectionHelperFactory.ParserDelegate; -import io.quarkus.qute.TemplateNode.Origin; import java.io.IOException; import java.io.Reader; import java.nio.CharBuffer; @@ -28,8 +23,15 @@ import java.util.function.Function; import java.util.function.Predicate; import java.util.function.Supplier; + import org.jboss.logging.Logger; +import io.quarkus.qute.Expression.Part; +import io.quarkus.qute.SectionHelperFactory.BlockInfo; +import io.quarkus.qute.SectionHelperFactory.ParametersInfo; +import io.quarkus.qute.SectionHelperFactory.ParserDelegate; +import io.quarkus.qute.TemplateNode.Origin; + /** * Simple non-reusable parser. */ diff --git a/independent-projects/qute/core/src/main/java/io/quarkus/qute/SectionBlock.java b/independent-projects/qute/core/src/main/java/io/quarkus/qute/SectionBlock.java index ccbfeeffc8224..7200bab2b3506 100644 --- a/independent-projects/qute/core/src/main/java/io/quarkus/qute/SectionBlock.java +++ b/independent-projects/qute/core/src/main/java/io/quarkus/qute/SectionBlock.java @@ -1,7 +1,5 @@ package io.quarkus.qute; -import io.quarkus.qute.SectionHelperFactory.BlockInfo; -import io.quarkus.qute.TemplateNode.Origin; import java.util.ArrayList; import java.util.Collections; import java.util.LinkedHashMap; @@ -10,6 +8,9 @@ import java.util.Set; import java.util.function.Predicate; +import io.quarkus.qute.SectionHelperFactory.BlockInfo; +import io.quarkus.qute.TemplateNode.Origin; + /** * Each section consists of one or more blocks. The main block is always present. Additional blocks start with a label * definition: {#label param1}. diff --git a/independent-projects/qute/core/src/main/java/io/quarkus/qute/SectionHelperFactory.java b/independent-projects/qute/core/src/main/java/io/quarkus/qute/SectionHelperFactory.java index 78e902c149940..c34c026054ee8 100644 --- a/independent-projects/qute/core/src/main/java/io/quarkus/qute/SectionHelperFactory.java +++ b/independent-projects/qute/core/src/main/java/io/quarkus/qute/SectionHelperFactory.java @@ -1,6 +1,5 @@ package io.quarkus.qute; -import io.quarkus.qute.TemplateNode.Origin; import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; @@ -8,6 +7,8 @@ import java.util.List; import java.util.Map; +import io.quarkus.qute.TemplateNode.Origin; + /** * Factory to create a new {@link SectionHelper} based on the {@link SectionInitContextImpl}. * diff --git a/independent-projects/qute/core/src/main/java/io/quarkus/qute/SectionInitContextImpl.java b/independent-projects/qute/core/src/main/java/io/quarkus/qute/SectionInitContextImpl.java index 12f9796fcb9b6..5c9c23cbb18ef 100644 --- a/independent-projects/qute/core/src/main/java/io/quarkus/qute/SectionInitContextImpl.java +++ b/independent-projects/qute/core/src/main/java/io/quarkus/qute/SectionInitContextImpl.java @@ -1,10 +1,11 @@ package io.quarkus.qute; -import io.quarkus.qute.SectionHelperFactory.SectionInitContext; import java.util.Collections; import java.util.List; import java.util.Map; +import io.quarkus.qute.SectionHelperFactory.SectionInitContext; + final class SectionInitContextImpl implements SectionInitContext { private final EngineImpl engine; diff --git a/independent-projects/qute/core/src/main/java/io/quarkus/qute/SectionNode.java b/independent-projects/qute/core/src/main/java/io/quarkus/qute/SectionNode.java index a00d786e357be..e56841eb02ceb 100644 --- a/independent-projects/qute/core/src/main/java/io/quarkus/qute/SectionNode.java +++ b/independent-projects/qute/core/src/main/java/io/quarkus/qute/SectionNode.java @@ -1,6 +1,5 @@ package io.quarkus.qute; -import io.quarkus.qute.SectionHelper.SectionResolutionContext; import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -8,8 +7,11 @@ import java.util.Set; import java.util.concurrent.CompletionStage; import java.util.function.Predicate; + import org.jboss.logging.Logger; +import io.quarkus.qute.SectionHelper.SectionResolutionContext; + /** * Section node. */ diff --git a/independent-projects/qute/core/src/main/java/io/quarkus/qute/TemplateData.java b/independent-projects/qute/core/src/main/java/io/quarkus/qute/TemplateData.java index 5237770ed38f6..aea1a3ae70342 100644 --- a/independent-projects/qute/core/src/main/java/io/quarkus/qute/TemplateData.java +++ b/independent-projects/qute/core/src/main/java/io/quarkus/qute/TemplateData.java @@ -3,11 +3,12 @@ import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import io.quarkus.qute.TemplateData.Container; import java.lang.annotation.Repeatable; import java.lang.annotation.Retention; import java.lang.annotation.Target; +import io.quarkus.qute.TemplateData.Container; + /** * This annotation is used to mark a target type for which a value resolver should be automatically generated. Note that * non-public members, constructors, static initializers, static, synthetic and void methods are always ignored. diff --git a/independent-projects/qute/core/src/main/java/io/quarkus/qute/TemplateException.java b/independent-projects/qute/core/src/main/java/io/quarkus/qute/TemplateException.java index 300143335401a..2ef2f472a5370 100644 --- a/independent-projects/qute/core/src/main/java/io/quarkus/qute/TemplateException.java +++ b/independent-projects/qute/core/src/main/java/io/quarkus/qute/TemplateException.java @@ -1,11 +1,12 @@ package io.quarkus.qute; -import io.quarkus.qute.Qute.IndexedArgumentsParserHook; -import io.quarkus.qute.TemplateNode.Origin; import java.util.HashMap; import java.util.Map; import java.util.Optional; +import io.quarkus.qute.Qute.IndexedArgumentsParserHook; +import io.quarkus.qute.TemplateNode.Origin; + public class TemplateException extends RuntimeException { /** diff --git a/independent-projects/qute/core/src/main/java/io/quarkus/qute/TemplateImpl.java b/independent-projects/qute/core/src/main/java/io/quarkus/qute/TemplateImpl.java index 8e362c3d60565..42f62bcab0ead 100644 --- a/independent-projects/qute/core/src/main/java/io/quarkus/qute/TemplateImpl.java +++ b/independent-projects/qute/core/src/main/java/io/quarkus/qute/TemplateImpl.java @@ -2,8 +2,6 @@ import static io.quarkus.qute.Namespaces.DATA_NAMESPACE; -import io.smallrye.mutiny.Multi; -import io.smallrye.mutiny.Uni; import java.time.Duration; import java.util.List; import java.util.Optional; @@ -14,8 +12,12 @@ import java.util.concurrent.TimeoutException; import java.util.function.Consumer; import java.util.function.Predicate; + import org.jboss.logging.Logger; +import io.smallrye.mutiny.Multi; +import io.smallrye.mutiny.Uni; + class TemplateImpl implements Template { private static final Logger LOG = Logger.getLogger(TemplateImpl.class); diff --git a/independent-projects/qute/core/src/main/java/io/quarkus/qute/TemplateInstance.java b/independent-projects/qute/core/src/main/java/io/quarkus/qute/TemplateInstance.java index d046210465694..0fb3202c3e2c6 100644 --- a/independent-projects/qute/core/src/main/java/io/quarkus/qute/TemplateInstance.java +++ b/independent-projects/qute/core/src/main/java/io/quarkus/qute/TemplateInstance.java @@ -1,10 +1,11 @@ package io.quarkus.qute; -import io.smallrye.mutiny.Multi; -import io.smallrye.mutiny.Uni; import java.util.concurrent.CompletionStage; import java.util.function.Consumer; +import io.smallrye.mutiny.Multi; +import io.smallrye.mutiny.Uni; + /** * Represents an instance of {@link Template}. *

diff --git a/independent-projects/qute/core/src/main/java/io/quarkus/qute/TemplateInstanceBase.java b/independent-projects/qute/core/src/main/java/io/quarkus/qute/TemplateInstanceBase.java index 0a90ebec1279c..63494eb8c2279 100644 --- a/independent-projects/qute/core/src/main/java/io/quarkus/qute/TemplateInstanceBase.java +++ b/independent-projects/qute/core/src/main/java/io/quarkus/qute/TemplateInstanceBase.java @@ -5,6 +5,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; + import org.jboss.logging.Logger; public abstract class TemplateInstanceBase implements TemplateInstance { diff --git a/independent-projects/qute/core/src/main/java/io/quarkus/qute/WhenSectionHelper.java b/independent-projects/qute/core/src/main/java/io/quarkus/qute/WhenSectionHelper.java index fc4d1340a90ac..68adc618ff0e0 100644 --- a/independent-projects/qute/core/src/main/java/io/quarkus/qute/WhenSectionHelper.java +++ b/independent-projects/qute/core/src/main/java/io/quarkus/qute/WhenSectionHelper.java @@ -1,7 +1,5 @@ package io.quarkus.qute; -import io.quarkus.qute.IfSectionHelper.Operator; -import io.quarkus.qute.SectionHelperFactory.SectionInitContext; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; @@ -17,6 +15,9 @@ import java.util.function.Predicate; import java.util.stream.Collectors; +import io.quarkus.qute.IfSectionHelper.Operator; +import io.quarkus.qute.SectionHelperFactory.SectionInitContext; + /** * Basic {@code when/switch} statement. */ diff --git a/independent-projects/qute/core/src/main/java/io/quarkus/qute/WithSectionHelper.java b/independent-projects/qute/core/src/main/java/io/quarkus/qute/WithSectionHelper.java index dfe53994bb2f8..c54617ee9c6d4 100644 --- a/independent-projects/qute/core/src/main/java/io/quarkus/qute/WithSectionHelper.java +++ b/independent-projects/qute/core/src/main/java/io/quarkus/qute/WithSectionHelper.java @@ -1,9 +1,10 @@ package io.quarkus.qute; -import io.quarkus.qute.SectionHelperFactory.SectionInitContext; import java.util.List; import java.util.concurrent.CompletionStage; +import io.quarkus.qute.SectionHelperFactory.SectionInitContext; + /** * Basic {@code with} statement. */ diff --git a/independent-projects/qute/core/src/test/java/io/quarkus/qute/AsyncDataTest.java b/independent-projects/qute/core/src/test/java/io/quarkus/qute/AsyncDataTest.java index e0faf96317d86..634e71a79b948 100644 --- a/independent-projects/qute/core/src/test/java/io/quarkus/qute/AsyncDataTest.java +++ b/independent-projects/qute/core/src/test/java/io/quarkus/qute/AsyncDataTest.java @@ -6,6 +6,7 @@ import java.util.List; import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionStage; + import org.junit.jupiter.api.Test; public class AsyncDataTest { diff --git a/independent-projects/qute/core/src/test/java/io/quarkus/qute/BooleansTest.java b/independent-projects/qute/core/src/test/java/io/quarkus/qute/BooleansTest.java index 6c1cec270496f..0f1e1794fbe8c 100644 --- a/independent-projects/qute/core/src/test/java/io/quarkus/qute/BooleansTest.java +++ b/independent-projects/qute/core/src/test/java/io/quarkus/qute/BooleansTest.java @@ -12,6 +12,7 @@ import java.util.HashSet; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicLong; + import org.junit.jupiter.api.Test; public class BooleansTest { diff --git a/independent-projects/qute/core/src/test/java/io/quarkus/qute/CollectionResolverTest.java b/independent-projects/qute/core/src/test/java/io/quarkus/qute/CollectionResolverTest.java index b8ec7c611507f..55c3df56faa94 100644 --- a/independent-projects/qute/core/src/test/java/io/quarkus/qute/CollectionResolverTest.java +++ b/independent-projects/qute/core/src/test/java/io/quarkus/qute/CollectionResolverTest.java @@ -5,6 +5,7 @@ import java.util.ArrayList; import java.util.List; + import org.junit.jupiter.api.Test; public class CollectionResolverTest { diff --git a/independent-projects/qute/core/src/test/java/io/quarkus/qute/EngineTest.java b/independent-projects/qute/core/src/test/java/io/quarkus/qute/EngineTest.java index cb1a25ba6157d..59d4a203f22b2 100644 --- a/independent-projects/qute/core/src/test/java/io/quarkus/qute/EngineTest.java +++ b/independent-projects/qute/core/src/test/java/io/quarkus/qute/EngineTest.java @@ -2,9 +2,10 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import io.quarkus.qute.TemplateNode.Origin; import org.junit.jupiter.api.Test; +import io.quarkus.qute.TemplateNode.Origin; + public class EngineTest { @Test diff --git a/independent-projects/qute/core/src/test/java/io/quarkus/qute/EscaperTest.java b/independent-projects/qute/core/src/test/java/io/quarkus/qute/EscaperTest.java index 98ae98b7252af..c151642649102 100644 --- a/independent-projects/qute/core/src/test/java/io/quarkus/qute/EscaperTest.java +++ b/independent-projects/qute/core/src/test/java/io/quarkus/qute/EscaperTest.java @@ -2,10 +2,12 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import io.quarkus.qute.TemplateNode.Origin; import java.io.IOException; + import org.junit.jupiter.api.Test; +import io.quarkus.qute.TemplateNode.Origin; + /** * */ diff --git a/independent-projects/qute/core/src/test/java/io/quarkus/qute/EvaluatedParamsTest.java b/independent-projects/qute/core/src/test/java/io/quarkus/qute/EvaluatedParamsTest.java index 77ca4999169fd..7de584fdbf341 100644 --- a/independent-projects/qute/core/src/test/java/io/quarkus/qute/EvaluatedParamsTest.java +++ b/independent-projects/qute/core/src/test/java/io/quarkus/qute/EvaluatedParamsTest.java @@ -9,6 +9,7 @@ import java.util.concurrent.CompletionStage; import java.util.concurrent.ExecutionException; import java.util.function.Supplier; + import org.junit.jupiter.api.Test; public class EvaluatedParamsTest { diff --git a/independent-projects/qute/core/src/test/java/io/quarkus/qute/ExpressionTest.java b/independent-projects/qute/core/src/test/java/io/quarkus/qute/ExpressionTest.java index 9165decf7a431..698a29bff0037 100644 --- a/independent-projects/qute/core/src/test/java/io/quarkus/qute/ExpressionTest.java +++ b/independent-projects/qute/core/src/test/java/io/quarkus/qute/ExpressionTest.java @@ -5,12 +5,14 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; -import io.quarkus.qute.Expression.Part; import java.util.Arrays; import java.util.List; import java.util.concurrent.ExecutionException; + import org.junit.jupiter.api.Test; +import io.quarkus.qute.Expression.Part; + public class ExpressionTest { @Test diff --git a/independent-projects/qute/core/src/test/java/io/quarkus/qute/GlobalNamespaceResolverTest.java b/independent-projects/qute/core/src/test/java/io/quarkus/qute/GlobalNamespaceResolverTest.java index 5d7e24c38f217..7e974d99ca221 100644 --- a/independent-projects/qute/core/src/test/java/io/quarkus/qute/GlobalNamespaceResolverTest.java +++ b/independent-projects/qute/core/src/test/java/io/quarkus/qute/GlobalNamespaceResolverTest.java @@ -4,6 +4,7 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionStage; + import org.junit.jupiter.api.Test; public class GlobalNamespaceResolverTest { diff --git a/independent-projects/qute/core/src/test/java/io/quarkus/qute/HtmlEscaperTest.java b/independent-projects/qute/core/src/test/java/io/quarkus/qute/HtmlEscaperTest.java index c9418bac6967b..73d55b3843bc6 100644 --- a/independent-projects/qute/core/src/test/java/io/quarkus/qute/HtmlEscaperTest.java +++ b/independent-projects/qute/core/src/test/java/io/quarkus/qute/HtmlEscaperTest.java @@ -4,12 +4,14 @@ import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; -import io.quarkus.qute.TemplateNode.Origin; import java.io.IOException; import java.util.List; import java.util.Optional; + import org.junit.jupiter.api.Test; +import io.quarkus.qute.TemplateNode.Origin; + public class HtmlEscaperTest { @Test diff --git a/independent-projects/qute/core/src/test/java/io/quarkus/qute/IfSectionTest.java b/independent-projects/qute/core/src/test/java/io/quarkus/qute/IfSectionTest.java index 56964eb816fc6..d5d9538ff086f 100644 --- a/independent-projects/qute/core/src/test/java/io/quarkus/qute/IfSectionTest.java +++ b/independent-projects/qute/core/src/test/java/io/quarkus/qute/IfSectionTest.java @@ -3,14 +3,16 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.fail; -import io.quarkus.qute.IfSectionHelper.Operator; import java.util.Arrays; import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; + import org.junit.jupiter.api.Test; +import io.quarkus.qute.IfSectionHelper.Operator; + public class IfSectionTest { @Test diff --git a/independent-projects/qute/core/src/test/java/io/quarkus/qute/ImmutableListTest.java b/independent-projects/qute/core/src/test/java/io/quarkus/qute/ImmutableListTest.java index 0b422caa5cfc6..43d26aa6ae438 100644 --- a/independent-projects/qute/core/src/test/java/io/quarkus/qute/ImmutableListTest.java +++ b/independent-projects/qute/core/src/test/java/io/quarkus/qute/ImmutableListTest.java @@ -9,6 +9,7 @@ import java.util.List; import java.util.ListIterator; import java.util.NoSuchElementException; + import org.junit.jupiter.api.Test; public class ImmutableListTest { diff --git a/independent-projects/qute/core/src/test/java/io/quarkus/qute/IncludeTest.java b/independent-projects/qute/core/src/test/java/io/quarkus/qute/IncludeTest.java index fb4bc24fe586e..0ebb17c1d2fe7 100644 --- a/independent-projects/qute/core/src/test/java/io/quarkus/qute/IncludeTest.java +++ b/independent-projects/qute/core/src/test/java/io/quarkus/qute/IncludeTest.java @@ -5,6 +5,7 @@ import java.util.HashMap; import java.util.Map; + import org.junit.jupiter.api.Test; public class IncludeTest { diff --git a/independent-projects/qute/core/src/test/java/io/quarkus/qute/ListResolverTest.java b/independent-projects/qute/core/src/test/java/io/quarkus/qute/ListResolverTest.java index cf4ea75a7494c..bcac0c1416ab0 100644 --- a/independent-projects/qute/core/src/test/java/io/quarkus/qute/ListResolverTest.java +++ b/independent-projects/qute/core/src/test/java/io/quarkus/qute/ListResolverTest.java @@ -4,6 +4,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.List; + import org.junit.jupiter.api.Test; public class ListResolverTest { diff --git a/independent-projects/qute/core/src/test/java/io/quarkus/qute/LoopSectionTest.java b/independent-projects/qute/core/src/test/java/io/quarkus/qute/LoopSectionTest.java index 3783bed8ca053..e5046d20de327 100644 --- a/independent-projects/qute/core/src/test/java/io/quarkus/qute/LoopSectionTest.java +++ b/independent-projects/qute/core/src/test/java/io/quarkus/qute/LoopSectionTest.java @@ -12,6 +12,7 @@ import java.util.List; import java.util.Map; import java.util.concurrent.CompletionStage; + import org.junit.jupiter.api.Test; public class LoopSectionTest { diff --git a/independent-projects/qute/core/src/test/java/io/quarkus/qute/MapResolverTest.java b/independent-projects/qute/core/src/test/java/io/quarkus/qute/MapResolverTest.java index 936521773c8de..7cbf5275a49ee 100644 --- a/independent-projects/qute/core/src/test/java/io/quarkus/qute/MapResolverTest.java +++ b/independent-projects/qute/core/src/test/java/io/quarkus/qute/MapResolverTest.java @@ -4,6 +4,7 @@ import java.util.LinkedHashMap; import java.util.Map; + import org.junit.jupiter.api.Test; public class MapResolverTest { diff --git a/independent-projects/qute/core/src/test/java/io/quarkus/qute/MutinyTest.java b/independent-projects/qute/core/src/test/java/io/quarkus/qute/MutinyTest.java index a8a97eb3d55f8..a4733a7578a78 100644 --- a/independent-projects/qute/core/src/test/java/io/quarkus/qute/MutinyTest.java +++ b/independent-projects/qute/core/src/test/java/io/quarkus/qute/MutinyTest.java @@ -4,8 +4,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.fail; -import io.smallrye.mutiny.Multi; -import io.smallrye.mutiny.Uni; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -13,8 +11,12 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.TimeUnit; + import org.junit.jupiter.api.Test; +import io.smallrye.mutiny.Multi; +import io.smallrye.mutiny.Uni; + public class MutinyTest { @Test diff --git a/independent-projects/qute/core/src/test/java/io/quarkus/qute/NamespaceResolversTest.java b/independent-projects/qute/core/src/test/java/io/quarkus/qute/NamespaceResolversTest.java index 4a4306ab2c520..8cb6ded8874e4 100644 --- a/independent-projects/qute/core/src/test/java/io/quarkus/qute/NamespaceResolversTest.java +++ b/independent-projects/qute/core/src/test/java/io/quarkus/qute/NamespaceResolversTest.java @@ -5,6 +5,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.concurrent.CompletionStage; + import org.junit.jupiter.api.Test; public class NamespaceResolversTest { diff --git a/independent-projects/qute/core/src/test/java/io/quarkus/qute/NodeResolveTraceLoggingTest.java b/independent-projects/qute/core/src/test/java/io/quarkus/qute/NodeResolveTraceLoggingTest.java index 2c495403e27c1..0802bf039bbe0 100644 --- a/independent-projects/qute/core/src/test/java/io/quarkus/qute/NodeResolveTraceLoggingTest.java +++ b/independent-projects/qute/core/src/test/java/io/quarkus/qute/NodeResolveTraceLoggingTest.java @@ -10,6 +10,7 @@ import java.util.logging.Level; import java.util.logging.LogRecord; import java.util.logging.Logger; + import org.junit.jupiter.api.Test; public class NodeResolveTraceLoggingTest { diff --git a/independent-projects/qute/core/src/test/java/io/quarkus/qute/ParamDeclarationDefaultValueTest.java b/independent-projects/qute/core/src/test/java/io/quarkus/qute/ParamDeclarationDefaultValueTest.java index ed5872e058209..9c413fbe8da5e 100644 --- a/independent-projects/qute/core/src/test/java/io/quarkus/qute/ParamDeclarationDefaultValueTest.java +++ b/independent-projects/qute/core/src/test/java/io/quarkus/qute/ParamDeclarationDefaultValueTest.java @@ -4,6 +4,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import java.util.List; + import org.junit.jupiter.api.Test; public class ParamDeclarationDefaultValueTest { diff --git a/independent-projects/qute/core/src/test/java/io/quarkus/qute/ParserTest.java b/independent-projects/qute/core/src/test/java/io/quarkus/qute/ParserTest.java index a94a9f74b1ac2..f4cbc5777385e 100644 --- a/independent-projects/qute/core/src/test/java/io/quarkus/qute/ParserTest.java +++ b/independent-projects/qute/core/src/test/java/io/quarkus/qute/ParserTest.java @@ -6,9 +6,6 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; -import io.quarkus.qute.TemplateException.Builder; -import io.quarkus.qute.TemplateLocator.TemplateLocation; -import io.quarkus.qute.TemplateNode.Origin; import java.io.Reader; import java.io.StringReader; import java.util.ArrayList; @@ -19,8 +16,13 @@ import java.util.List; import java.util.Map; import java.util.Optional; + import org.junit.jupiter.api.Test; +import io.quarkus.qute.TemplateException.Builder; +import io.quarkus.qute.TemplateLocator.TemplateLocation; +import io.quarkus.qute.TemplateNode.Origin; + public class ParserTest { @Test diff --git a/independent-projects/qute/core/src/test/java/io/quarkus/qute/QuteTest.java b/independent-projects/qute/core/src/test/java/io/quarkus/qute/QuteTest.java index 287fafd4b25e8..0eebf205ed026 100644 --- a/independent-projects/qute/core/src/test/java/io/quarkus/qute/QuteTest.java +++ b/independent-projects/qute/core/src/test/java/io/quarkus/qute/QuteTest.java @@ -2,12 +2,14 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import io.quarkus.qute.Qute.Fmt; import java.util.List; import java.util.Map; import java.util.concurrent.atomic.AtomicInteger; + import org.junit.jupiter.api.Test; +import io.quarkus.qute.Qute.Fmt; + public class QuteTest { @Test diff --git a/independent-projects/qute/core/src/test/java/io/quarkus/qute/ReflectionResolverTest.java b/independent-projects/qute/core/src/test/java/io/quarkus/qute/ReflectionResolverTest.java index 9e38366ea014b..5ec2e3f47cf11 100644 --- a/independent-projects/qute/core/src/test/java/io/quarkus/qute/ReflectionResolverTest.java +++ b/independent-projects/qute/core/src/test/java/io/quarkus/qute/ReflectionResolverTest.java @@ -5,6 +5,7 @@ import java.util.Map; import java.util.TreeMap; import java.util.stream.IntStream; + import org.junit.jupiter.api.Test; public class ReflectionResolverTest { diff --git a/independent-projects/qute/core/src/test/java/io/quarkus/qute/SetSectionTest.java b/independent-projects/qute/core/src/test/java/io/quarkus/qute/SetSectionTest.java index 0d1e41316d097..b4a8c4059e8df 100644 --- a/independent-projects/qute/core/src/test/java/io/quarkus/qute/SetSectionTest.java +++ b/independent-projects/qute/core/src/test/java/io/quarkus/qute/SetSectionTest.java @@ -3,6 +3,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.List; + import org.junit.jupiter.api.Test; public class SetSectionTest { diff --git a/independent-projects/qute/core/src/test/java/io/quarkus/qute/SimpleTest.java b/independent-projects/qute/core/src/test/java/io/quarkus/qute/SimpleTest.java index 8f37ecb93e6f7..3e617c8229b88 100644 --- a/independent-projects/qute/core/src/test/java/io/quarkus/qute/SimpleTest.java +++ b/independent-projects/qute/core/src/test/java/io/quarkus/qute/SimpleTest.java @@ -3,8 +3,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.fail; -import io.quarkus.qute.Results.NotFound; -import io.quarkus.qute.TemplateNode.Origin; import java.util.Collection; import java.util.Collections; import java.util.HashMap; @@ -13,8 +11,12 @@ import java.util.Optional; import java.util.concurrent.CompletionStage; import java.util.concurrent.atomic.LongAdder; + import org.junit.jupiter.api.Test; +import io.quarkus.qute.Results.NotFound; +import io.quarkus.qute.TemplateNode.Origin; + public class SimpleTest { @Test diff --git a/independent-projects/qute/core/src/test/java/io/quarkus/qute/TemplateExceptionTest.java b/independent-projects/qute/core/src/test/java/io/quarkus/qute/TemplateExceptionTest.java index ad17509466703..ece97606749dd 100644 --- a/independent-projects/qute/core/src/test/java/io/quarkus/qute/TemplateExceptionTest.java +++ b/independent-projects/qute/core/src/test/java/io/quarkus/qute/TemplateExceptionTest.java @@ -3,6 +3,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.Map; + import org.junit.jupiter.api.Test; public class TemplateExceptionTest { diff --git a/independent-projects/qute/core/src/test/java/io/quarkus/qute/TemplateInstanceTest.java b/independent-projects/qute/core/src/test/java/io/quarkus/qute/TemplateInstanceTest.java index 6355eb07a39a3..8481acf73b882 100644 --- a/independent-projects/qute/core/src/test/java/io/quarkus/qute/TemplateInstanceTest.java +++ b/independent-projects/qute/core/src/test/java/io/quarkus/qute/TemplateInstanceTest.java @@ -4,6 +4,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.concurrent.atomic.AtomicBoolean; + import org.junit.jupiter.api.Test; public class TemplateInstanceTest { diff --git a/independent-projects/qute/core/src/test/java/io/quarkus/qute/TimeoutTest.java b/independent-projects/qute/core/src/test/java/io/quarkus/qute/TimeoutTest.java index e727e7b2e6e63..0de3ac47f4f8c 100644 --- a/independent-projects/qute/core/src/test/java/io/quarkus/qute/TimeoutTest.java +++ b/independent-projects/qute/core/src/test/java/io/quarkus/qute/TimeoutTest.java @@ -2,11 +2,13 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import io.smallrye.mutiny.Uni; import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutionException; + import org.junit.jupiter.api.Test; +import io.smallrye.mutiny.Uni; + public class TimeoutTest { @Test diff --git a/independent-projects/qute/core/src/test/java/io/quarkus/qute/UserTagTest.java b/independent-projects/qute/core/src/test/java/io/quarkus/qute/UserTagTest.java index a01bbdcaae21b..23a163190afc1 100644 --- a/independent-projects/qute/core/src/test/java/io/quarkus/qute/UserTagTest.java +++ b/independent-projects/qute/core/src/test/java/io/quarkus/qute/UserTagTest.java @@ -5,6 +5,7 @@ import java.util.Collections; import java.util.HashMap; import java.util.Map; + import org.junit.jupiter.api.Test; public class UserTagTest { diff --git a/independent-projects/qute/core/src/test/java/io/quarkus/qute/VirtualMethodParametersTest.java b/independent-projects/qute/core/src/test/java/io/quarkus/qute/VirtualMethodParametersTest.java index 43ef12b44b524..451f8fe7c30de 100644 --- a/independent-projects/qute/core/src/test/java/io/quarkus/qute/VirtualMethodParametersTest.java +++ b/independent-projects/qute/core/src/test/java/io/quarkus/qute/VirtualMethodParametersTest.java @@ -3,6 +3,7 @@ import java.math.BigDecimal; import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionStage; + import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/independent-projects/qute/core/src/test/java/io/quarkus/qute/WithSectionTest.java b/independent-projects/qute/core/src/test/java/io/quarkus/qute/WithSectionTest.java index 552da35e9da02..90c33e0ad2dcd 100644 --- a/independent-projects/qute/core/src/test/java/io/quarkus/qute/WithSectionTest.java +++ b/independent-projects/qute/core/src/test/java/io/quarkus/qute/WithSectionTest.java @@ -5,6 +5,7 @@ import java.util.HashMap; import java.util.Map; + import org.junit.jupiter.api.Test; public class WithSectionTest { diff --git a/independent-projects/qute/generator/src/main/java/io/quarkus/qute/generator/Descriptors.java b/independent-projects/qute/generator/src/main/java/io/quarkus/qute/generator/Descriptors.java index 430afd28c4bff..b0826982da99e 100644 --- a/independent-projects/qute/generator/src/main/java/io/quarkus/qute/generator/Descriptors.java +++ b/independent-projects/qute/generator/src/main/java/io/quarkus/qute/generator/Descriptors.java @@ -1,5 +1,13 @@ package io.quarkus.qute.generator; +import java.util.Collection; +import java.util.List; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.CompletionStage; +import java.util.function.BiConsumer; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + import io.quarkus.gizmo.FieldDescriptor; import io.quarkus.gizmo.MethodDescriptor; import io.quarkus.qute.CompletedStage; @@ -9,13 +17,6 @@ import io.quarkus.qute.Results; import io.quarkus.qute.Results.NotFound; import io.quarkus.qute.TemplateInstance; -import java.util.Collection; -import java.util.List; -import java.util.concurrent.CompletableFuture; -import java.util.concurrent.CompletionStage; -import java.util.function.BiConsumer; -import java.util.regex.Matcher; -import java.util.regex.Pattern; public final class Descriptors { diff --git a/independent-projects/qute/generator/src/main/java/io/quarkus/qute/generator/DotNames.java b/independent-projects/qute/generator/src/main/java/io/quarkus/qute/generator/DotNames.java index 61df03a094cf0..0eb4bc2013c8a 100644 --- a/independent-projects/qute/generator/src/main/java/io/quarkus/qute/generator/DotNames.java +++ b/independent-projects/qute/generator/src/main/java/io/quarkus/qute/generator/DotNames.java @@ -1,6 +1,7 @@ package io.quarkus.qute.generator; import java.util.concurrent.CompletionStage; + import org.jboss.jandex.DotName; final class DotNames { 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 e62ff90a800e0..e6da69c6ca21f 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 @@ -7,24 +7,6 @@ import static org.objectweb.asm.Opcodes.ACC_PRIVATE; import static org.objectweb.asm.Opcodes.ACC_PUBLIC; -import io.quarkus.gizmo.AssignableResultHandle; -import io.quarkus.gizmo.BranchResult; -import io.quarkus.gizmo.BytecodeCreator; -import io.quarkus.gizmo.CatchBlockCreator; -import io.quarkus.gizmo.ClassCreator; -import io.quarkus.gizmo.ClassOutput; -import io.quarkus.gizmo.FieldDescriptor; -import io.quarkus.gizmo.FunctionCreator; -import io.quarkus.gizmo.MethodCreator; -import io.quarkus.gizmo.MethodDescriptor; -import io.quarkus.gizmo.ResultHandle; -import io.quarkus.gizmo.TryBlock; -import io.quarkus.qute.EvalContext; -import io.quarkus.qute.EvaluatedParams; -import io.quarkus.qute.NamespaceResolver; -import io.quarkus.qute.TemplateException; -import io.quarkus.qute.TemplateExtension; -import io.quarkus.qute.ValueResolver; import java.lang.reflect.Modifier; import java.nio.charset.StandardCharsets; import java.security.MessageDigest; @@ -41,6 +23,7 @@ import java.util.concurrent.CompletionStage; import java.util.function.BiConsumer; import java.util.regex.Pattern; + import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.AnnotationValue; import org.jboss.jandex.ClassInfo; @@ -51,6 +34,25 @@ import org.jboss.jandex.Type; import org.jboss.jandex.Type.Kind; +import io.quarkus.gizmo.AssignableResultHandle; +import io.quarkus.gizmo.BranchResult; +import io.quarkus.gizmo.BytecodeCreator; +import io.quarkus.gizmo.CatchBlockCreator; +import io.quarkus.gizmo.ClassCreator; +import io.quarkus.gizmo.ClassOutput; +import io.quarkus.gizmo.FieldDescriptor; +import io.quarkus.gizmo.FunctionCreator; +import io.quarkus.gizmo.MethodCreator; +import io.quarkus.gizmo.MethodDescriptor; +import io.quarkus.gizmo.ResultHandle; +import io.quarkus.gizmo.TryBlock; +import io.quarkus.qute.EvalContext; +import io.quarkus.qute.EvaluatedParams; +import io.quarkus.qute.NamespaceResolver; +import io.quarkus.qute.TemplateException; +import io.quarkus.qute.TemplateExtension; +import io.quarkus.qute.ValueResolver; + /** * Generates value resolvers for static extension methods. * diff --git a/independent-projects/qute/generator/src/main/java/io/quarkus/qute/generator/TemplateGlobalGenerator.java b/independent-projects/qute/generator/src/main/java/io/quarkus/qute/generator/TemplateGlobalGenerator.java index ae76521c24ce6..e6a62d5122a37 100644 --- a/independent-projects/qute/generator/src/main/java/io/quarkus/qute/generator/TemplateGlobalGenerator.java +++ b/independent-projects/qute/generator/src/main/java/io/quarkus/qute/generator/TemplateGlobalGenerator.java @@ -5,19 +5,12 @@ import static io.quarkus.qute.generator.ValueResolverGenerator.simpleName; import static org.objectweb.asm.Opcodes.ACC_PUBLIC; -import io.quarkus.gizmo.ClassCreator; -import io.quarkus.gizmo.ClassOutput; -import io.quarkus.gizmo.FieldDescriptor; -import io.quarkus.gizmo.MethodCreator; -import io.quarkus.gizmo.MethodDescriptor; -import io.quarkus.gizmo.ResultHandle; -import io.quarkus.qute.TemplateGlobal; -import io.quarkus.qute.TemplateInstance; import java.lang.reflect.Modifier; import java.util.HashSet; import java.util.Map; import java.util.Map.Entry; import java.util.Set; + import org.jboss.jandex.AnnotationTarget; import org.jboss.jandex.ClassInfo; import org.jboss.jandex.DotName; @@ -25,6 +18,15 @@ import org.jboss.jandex.MethodInfo; import org.jboss.jandex.Type.Kind; +import io.quarkus.gizmo.ClassCreator; +import io.quarkus.gizmo.ClassOutput; +import io.quarkus.gizmo.FieldDescriptor; +import io.quarkus.gizmo.MethodCreator; +import io.quarkus.gizmo.MethodDescriptor; +import io.quarkus.gizmo.ResultHandle; +import io.quarkus.qute.TemplateGlobal; +import io.quarkus.qute.TemplateInstance; + /** * Generates {@link TemplateInstance.Initializer}s for {@link TemplateGlobal} annotations. */ 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 e4257de003936..8a2573b58ca7e 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 @@ -3,24 +3,6 @@ import static java.util.function.Predicate.not; import static org.objectweb.asm.Opcodes.ACC_PUBLIC; -import io.quarkus.gizmo.AssignableResultHandle; -import io.quarkus.gizmo.BranchResult; -import io.quarkus.gizmo.BytecodeCreator; -import io.quarkus.gizmo.CatchBlockCreator; -import io.quarkus.gizmo.ClassCreator; -import io.quarkus.gizmo.ClassOutput; -import io.quarkus.gizmo.DescriptorUtils; -import io.quarkus.gizmo.FieldDescriptor; -import io.quarkus.gizmo.FunctionCreator; -import io.quarkus.gizmo.MethodCreator; -import io.quarkus.gizmo.MethodDescriptor; -import io.quarkus.gizmo.ResultHandle; -import io.quarkus.gizmo.TryBlock; -import io.quarkus.qute.EvalContext; -import io.quarkus.qute.EvaluatedParams; -import io.quarkus.qute.NamespaceResolver; -import io.quarkus.qute.TemplateData; -import io.quarkus.qute.ValueResolver; import java.lang.reflect.Modifier; import java.util.ArrayList; import java.util.Arrays; @@ -39,6 +21,7 @@ import java.util.function.Function; import java.util.function.Predicate; import java.util.regex.Pattern; + import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.AnnotationTarget; import org.jboss.jandex.AnnotationTarget.Kind; @@ -52,6 +35,25 @@ import org.jboss.jandex.Type; import org.jboss.logging.Logger; +import io.quarkus.gizmo.AssignableResultHandle; +import io.quarkus.gizmo.BranchResult; +import io.quarkus.gizmo.BytecodeCreator; +import io.quarkus.gizmo.CatchBlockCreator; +import io.quarkus.gizmo.ClassCreator; +import io.quarkus.gizmo.ClassOutput; +import io.quarkus.gizmo.DescriptorUtils; +import io.quarkus.gizmo.FieldDescriptor; +import io.quarkus.gizmo.FunctionCreator; +import io.quarkus.gizmo.MethodCreator; +import io.quarkus.gizmo.MethodDescriptor; +import io.quarkus.gizmo.ResultHandle; +import io.quarkus.gizmo.TryBlock; +import io.quarkus.qute.EvalContext; +import io.quarkus.qute.EvaluatedParams; +import io.quarkus.qute.NamespaceResolver; +import io.quarkus.qute.TemplateData; +import io.quarkus.qute.ValueResolver; + /** * Generates value resolvers backed by classes. * diff --git a/independent-projects/qute/generator/src/test/java/io/quarkus/qute/generator/MethodKeyTest.java b/independent-projects/qute/generator/src/test/java/io/quarkus/qute/generator/MethodKeyTest.java index 2f84a6eec683b..f123dd9d8281f 100644 --- a/independent-projects/qute/generator/src/test/java/io/quarkus/qute/generator/MethodKeyTest.java +++ b/independent-projects/qute/generator/src/test/java/io/quarkus/qute/generator/MethodKeyTest.java @@ -2,11 +2,11 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import io.quarkus.qute.generator.ValueResolverGenerator.MethodKey; import java.io.IOException; import java.util.Arrays; import java.util.Collections; import java.util.List; + import org.jboss.jandex.ClassInfo; import org.jboss.jandex.DotName; import org.jboss.jandex.IndexView; @@ -15,6 +15,8 @@ import org.jboss.jandex.Type.Kind; import org.junit.jupiter.api.Test; +import io.quarkus.qute.generator.ValueResolverGenerator.MethodKey; + public class MethodKeyTest { @Test diff --git a/independent-projects/qute/generator/src/test/java/io/quarkus/qute/generator/MyService.java b/independent-projects/qute/generator/src/test/java/io/quarkus/qute/generator/MyService.java index 25c673f99a231..db5a78ca59a98 100644 --- a/independent-projects/qute/generator/src/test/java/io/quarkus/qute/generator/MyService.java +++ b/independent-projects/qute/generator/src/test/java/io/quarkus/qute/generator/MyService.java @@ -1,6 +1,5 @@ package io.quarkus.qute.generator; -import io.quarkus.qute.TemplateData; import java.util.Arrays; import java.util.Collections; import java.util.List; @@ -11,6 +10,8 @@ import java.util.stream.Collectors; import java.util.stream.Stream; +import io.quarkus.qute.TemplateData; + @TemplateData(ignore = "surname") public class MyService { diff --git a/independent-projects/qute/generator/src/test/java/io/quarkus/qute/generator/ParametersTest.java b/independent-projects/qute/generator/src/test/java/io/quarkus/qute/generator/ParametersTest.java index 486d1dda304bd..ae0cce9586426 100644 --- a/independent-projects/qute/generator/src/test/java/io/quarkus/qute/generator/ParametersTest.java +++ b/independent-projects/qute/generator/src/test/java/io/quarkus/qute/generator/ParametersTest.java @@ -6,9 +6,8 @@ import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import io.quarkus.qute.generator.ExtensionMethodGenerator.ParamKind; -import io.quarkus.qute.generator.ExtensionMethodGenerator.Parameters; import java.io.IOException; + import org.jboss.jandex.ClassInfo; import org.jboss.jandex.DotName; import org.jboss.jandex.IndexView; @@ -18,6 +17,9 @@ import org.jboss.jandex.Type.Kind; import org.junit.jupiter.api.Test; +import io.quarkus.qute.generator.ExtensionMethodGenerator.ParamKind; +import io.quarkus.qute.generator.ExtensionMethodGenerator.Parameters; + public class ParametersTest { @Test diff --git a/independent-projects/qute/generator/src/test/java/io/quarkus/qute/generator/SimpleGeneratorTest.java b/independent-projects/qute/generator/src/test/java/io/quarkus/qute/generator/SimpleGeneratorTest.java index e0a9a012fcc94..4c7f2722e7a2b 100644 --- a/independent-projects/qute/generator/src/test/java/io/quarkus/qute/generator/SimpleGeneratorTest.java +++ b/independent-projects/qute/generator/src/test/java/io/quarkus/qute/generator/SimpleGeneratorTest.java @@ -3,12 +3,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.fail; -import io.quarkus.qute.Engine; -import io.quarkus.qute.EngineBuilder; -import io.quarkus.qute.NamespaceResolver; -import io.quarkus.qute.Resolver; -import io.quarkus.qute.TestEvalContext; -import io.quarkus.qute.ValueResolver; import java.io.IOException; import java.io.InputStream; import java.lang.reflect.InvocationTargetException; @@ -18,6 +12,7 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionStage; import java.util.concurrent.TimeUnit; + import org.jboss.jandex.ClassInfo; import org.jboss.jandex.DotName; import org.jboss.jandex.Index; @@ -29,6 +24,13 @@ import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; +import io.quarkus.qute.Engine; +import io.quarkus.qute.EngineBuilder; +import io.quarkus.qute.NamespaceResolver; +import io.quarkus.qute.Resolver; +import io.quarkus.qute.TestEvalContext; +import io.quarkus.qute.ValueResolver; + public class SimpleGeneratorTest { static Set generatedTypes = new HashSet<>(); diff --git a/independent-projects/qute/generator/src/test/java/io/quarkus/qute/generator/TemplateGlobalGeneratorTest.java b/independent-projects/qute/generator/src/test/java/io/quarkus/qute/generator/TemplateGlobalGeneratorTest.java index abd1c0daec8b1..2479d97fd9a48 100644 --- a/independent-projects/qute/generator/src/test/java/io/quarkus/qute/generator/TemplateGlobalGeneratorTest.java +++ b/independent-projects/qute/generator/src/test/java/io/quarkus/qute/generator/TemplateGlobalGeneratorTest.java @@ -2,14 +2,16 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import io.quarkus.qute.TemplateGlobal; import java.io.IOException; + import org.jboss.jandex.ClassInfo; import org.jboss.jandex.DotName; import org.jboss.jandex.Index; import org.jboss.jandex.PrimitiveType; import org.junit.jupiter.api.Test; +import io.quarkus.qute.TemplateGlobal; + public class TemplateGlobalGeneratorTest { @Test diff --git a/independent-projects/qute/generator/src/test/java/io/quarkus/qute/generator/TestClassOutput.java b/independent-projects/qute/generator/src/test/java/io/quarkus/qute/generator/TestClassOutput.java index f0784cd22e271..5c82090afb20a 100644 --- a/independent-projects/qute/generator/src/test/java/io/quarkus/qute/generator/TestClassOutput.java +++ b/independent-projects/qute/generator/src/test/java/io/quarkus/qute/generator/TestClassOutput.java @@ -16,12 +16,13 @@ package io.quarkus.qute.generator; -import io.quarkus.gizmo.ClassOutput; import java.io.File; import java.io.IOException; import java.io.Writer; import java.nio.file.Files; +import io.quarkus.gizmo.ClassOutput; + public class TestClassOutput implements ClassOutput { @Override diff --git a/independent-projects/qute/pom.xml b/independent-projects/qute/pom.xml index 901b0e6b6dc9c..acc2086cfbdf3 100644 --- a/independent-projects/qute/pom.xml +++ b/independent-projects/qute/pom.xml @@ -189,8 +189,10 @@ .cache/impsort-maven-plugin-${impsort-maven-plugin.version} - true + java.,javax.,jakarta.,org.,com. + * ${format.skip} + true diff --git a/independent-projects/resteasy-reactive/build-support/src/main/java/org/jboss/resteasy/reactive/build/support/AllWriteableMessageBodyWriterByteBuddyPlugin.java b/independent-projects/resteasy-reactive/build-support/src/main/java/org/jboss/resteasy/reactive/build/support/AllWriteableMessageBodyWriterByteBuddyPlugin.java index 4bbbfcec02b8a..00da666a6c451 100644 --- a/independent-projects/resteasy-reactive/build-support/src/main/java/org/jboss/resteasy/reactive/build/support/AllWriteableMessageBodyWriterByteBuddyPlugin.java +++ b/independent-projects/resteasy-reactive/build-support/src/main/java/org/jboss/resteasy/reactive/build/support/AllWriteableMessageBodyWriterByteBuddyPlugin.java @@ -8,7 +8,11 @@ import java.io.IOException; import java.util.Optional; import java.util.concurrent.atomic.AtomicBoolean; + import javax.ws.rs.ext.MessageBodyWriter; + +import org.jboss.resteasy.reactive.common.types.AllWriteableMarker; + import net.bytebuddy.build.Plugin; import net.bytebuddy.description.type.TypeDescription; import net.bytebuddy.dynamic.ClassFileLocator; @@ -18,7 +22,6 @@ import net.bytebuddy.jar.asm.MethodVisitor; import net.bytebuddy.jar.asm.Opcodes; import net.bytebuddy.utility.OpenedClassReader; -import org.jboss.resteasy.reactive.common.types.AllWriteableMarker; public class AllWriteableMessageBodyWriterByteBuddyPlugin implements Plugin { diff --git a/independent-projects/resteasy-reactive/client/processor/src/main/java/org/jboss/resteasy/reactive/client/processor/beanparam/BeanParamParser.java b/independent-projects/resteasy-reactive/client/processor/src/main/java/org/jboss/resteasy/reactive/client/processor/beanparam/BeanParamParser.java index 086e5e07cd32c..3136f8fd2041c 100644 --- a/independent-projects/resteasy-reactive/client/processor/src/main/java/org/jboss/resteasy/reactive/client/processor/beanparam/BeanParamParser.java +++ b/independent-projects/resteasy-reactive/client/processor/src/main/java/org/jboss/resteasy/reactive/client/processor/beanparam/BeanParamParser.java @@ -14,6 +14,7 @@ import java.util.Set; import java.util.function.BiFunction; import java.util.stream.Collectors; + import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.AnnotationTarget; import org.jboss.jandex.ClassInfo; diff --git a/independent-projects/resteasy-reactive/client/processor/src/main/java/org/jboss/resteasy/reactive/client/processor/beanparam/ClientBeanParamInfo.java b/independent-projects/resteasy-reactive/client/processor/src/main/java/org/jboss/resteasy/reactive/client/processor/beanparam/ClientBeanParamInfo.java index 99a14353f3c3d..1a3f0087a381b 100644 --- a/independent-projects/resteasy-reactive/client/processor/src/main/java/org/jboss/resteasy/reactive/client/processor/beanparam/ClientBeanParamInfo.java +++ b/independent-projects/resteasy-reactive/client/processor/src/main/java/org/jboss/resteasy/reactive/client/processor/beanparam/ClientBeanParamInfo.java @@ -1,6 +1,7 @@ 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/independent-projects/resteasy-reactive/client/processor/src/main/java/org/jboss/resteasy/reactive/client/processor/beanparam/FieldExtractor.java b/independent-projects/resteasy-reactive/client/processor/src/main/java/org/jboss/resteasy/reactive/client/processor/beanparam/FieldExtractor.java index 2f1d0ee55934a..8ff1310b17847 100644 --- a/independent-projects/resteasy-reactive/client/processor/src/main/java/org/jboss/resteasy/reactive/client/processor/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,10 @@ package org.jboss.resteasy.reactive.client.processor.beanparam; +import org.jboss.resteasy.reactive.client.impl.ReflectionUtil; + import io.quarkus.gizmo.BytecodeCreator; import io.quarkus.gizmo.MethodDescriptor; import io.quarkus.gizmo.ResultHandle; -import org.jboss.resteasy.reactive.client.impl.ReflectionUtil; public class FieldExtractor extends ValueExtractor { diff --git a/independent-projects/resteasy-reactive/client/processor/src/main/java/org/jboss/resteasy/reactive/client/processor/beanparam/GetterExtractor.java b/independent-projects/resteasy-reactive/client/processor/src/main/java/org/jboss/resteasy/reactive/client/processor/beanparam/GetterExtractor.java index b112083c376dc..4a7d1373a7906 100644 --- a/independent-projects/resteasy-reactive/client/processor/src/main/java/org/jboss/resteasy/reactive/client/processor/beanparam/GetterExtractor.java +++ b/independent-projects/resteasy-reactive/client/processor/src/main/java/org/jboss/resteasy/reactive/client/processor/beanparam/GetterExtractor.java @@ -1,8 +1,9 @@ package org.jboss.resteasy.reactive.client.processor.beanparam; +import org.jboss.jandex.MethodInfo; + import io.quarkus.gizmo.BytecodeCreator; import io.quarkus.gizmo.ResultHandle; -import org.jboss.jandex.MethodInfo; public class GetterExtractor extends ValueExtractor { diff --git a/independent-projects/resteasy-reactive/client/processor/src/main/java/org/jboss/resteasy/reactive/client/processor/scanning/ClientEndpointIndexer.java b/independent-projects/resteasy-reactive/client/processor/src/main/java/org/jboss/resteasy/reactive/client/processor/scanning/ClientEndpointIndexer.java index 64896442d2aad..f3b2e27bfc172 100644 --- a/independent-projects/resteasy-reactive/client/processor/src/main/java/org/jboss/resteasy/reactive/client/processor/scanning/ClientEndpointIndexer.java +++ b/independent-projects/resteasy-reactive/client/processor/src/main/java/org/jboss/resteasy/reactive/client/processor/scanning/ClientEndpointIndexer.java @@ -11,7 +11,9 @@ 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; diff --git a/independent-projects/resteasy-reactive/client/processor/src/test/java/org/jboss/resteasy/reactive/client/processor/beanparam/BeanParamParserTest.java b/independent-projects/resteasy-reactive/client/processor/src/test/java/org/jboss/resteasy/reactive/client/processor/beanparam/BeanParamParserTest.java index 298fb78d8e4f4..12ea91cd1b266 100644 --- a/independent-projects/resteasy-reactive/client/processor/src/test/java/org/jboss/resteasy/reactive/client/processor/beanparam/BeanParamParserTest.java +++ b/independent-projects/resteasy-reactive/client/processor/src/test/java/org/jboss/resteasy/reactive/client/processor/beanparam/BeanParamParserTest.java @@ -8,12 +8,14 @@ import java.util.Iterator; import java.util.List; import java.util.function.Consumer; + import javax.ws.rs.BeanParam; import javax.ws.rs.CookieParam; import javax.ws.rs.FormParam; import javax.ws.rs.HeaderParam; import javax.ws.rs.PathParam; import javax.ws.rs.QueryParam; + import org.jboss.jandex.DotName; import org.jboss.jandex.Index; import org.junit.jupiter.api.Test; diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/AsyncResultUni.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/AsyncResultUni.java index da447c1a6b54b..3320deb9ba688 100644 --- a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/AsyncResultUni.java +++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/AsyncResultUni.java @@ -1,13 +1,14 @@ package org.jboss.resteasy.reactive.client; +import java.util.concurrent.atomic.AtomicBoolean; +import java.util.function.Consumer; + import io.smallrye.mutiny.Uni; import io.smallrye.mutiny.infrastructure.Infrastructure; import io.smallrye.mutiny.operators.AbstractUni; import io.smallrye.mutiny.subscription.UniSubscriber; import io.vertx.core.AsyncResult; import io.vertx.core.Handler; -import java.util.concurrent.atomic.AtomicBoolean; -import java.util.function.Consumer; public class AsyncResultUni extends AbstractUni implements Uni { private final Consumer>> subscriptionConsumer; diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/api/WebClientApplicationException.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/api/WebClientApplicationException.java index 04dc7a0679693..e23fb895f248a 100644 --- a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/api/WebClientApplicationException.java +++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/api/WebClientApplicationException.java @@ -6,6 +6,7 @@ import java.util.Locale; import java.util.Map; import java.util.Set; + import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.EntityTag; import javax.ws.rs.core.GenericType; @@ -14,6 +15,7 @@ import javax.ws.rs.core.MultivaluedMap; import javax.ws.rs.core.NewCookie; import javax.ws.rs.core.Response; + import org.jboss.resteasy.reactive.ResteasyReactiveClientProblem; import org.jboss.resteasy.reactive.common.jaxrs.StatusTypeImpl; diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/handlers/ClientRequestFilterRestHandler.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/handlers/ClientRequestFilterRestHandler.java index f0c811a5feb1f..fef67327899ca 100644 --- a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/handlers/ClientRequestFilterRestHandler.java +++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/handlers/ClientRequestFilterRestHandler.java @@ -2,6 +2,7 @@ import javax.ws.rs.ProcessingException; import javax.ws.rs.client.ClientRequestFilter; + import org.jboss.resteasy.reactive.client.impl.ClientRequestContextImpl; import org.jboss.resteasy.reactive.client.impl.RestClientRequestContext; import org.jboss.resteasy.reactive.client.spi.ClientRestHandler; diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/handlers/ClientResponseCompleteRestHandler.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/handlers/ClientResponseCompleteRestHandler.java index e4bb7b2e79ecf..44a28a884cbbb 100644 --- a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/handlers/ClientResponseCompleteRestHandler.java +++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/handlers/ClientResponseCompleteRestHandler.java @@ -1,8 +1,5 @@ package org.jboss.resteasy.reactive.client.handlers; -import io.netty.handler.codec.http.multipart.Attribute; -import io.netty.handler.codec.http.multipart.FileUpload; -import io.netty.handler.codec.http.multipart.InterfaceHttpData; import java.io.ByteArrayInputStream; import java.io.File; import java.io.IOException; @@ -12,10 +9,12 @@ import java.nio.file.Paths; import java.util.List; import java.util.Map; + import javax.ws.rs.core.GenericType; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.MultivaluedMap; import javax.ws.rs.core.Response; + import org.jboss.resteasy.reactive.client.impl.ClientResponseBuilderImpl; import org.jboss.resteasy.reactive.client.impl.ClientResponseContextImpl; import org.jboss.resteasy.reactive.client.impl.RestClientRequestContext; @@ -25,6 +24,10 @@ import org.jboss.resteasy.reactive.client.spi.MultipartResponseData; import org.jboss.resteasy.reactive.common.jaxrs.ResponseImpl; +import io.netty.handler.codec.http.multipart.Attribute; +import io.netty.handler.codec.http.multipart.FileUpload; +import io.netty.handler.codec.http.multipart.InterfaceHttpData; + public class ClientResponseCompleteRestHandler implements ClientRestHandler { @Override diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/handlers/ClientResponseFilterRestHandler.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/handlers/ClientResponseFilterRestHandler.java index 22bc77c1eba29..2a31416e2444b 100644 --- a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/handlers/ClientResponseFilterRestHandler.java +++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/handlers/ClientResponseFilterRestHandler.java @@ -3,6 +3,7 @@ import javax.ws.rs.ProcessingException; import javax.ws.rs.WebApplicationException; import javax.ws.rs.client.ClientResponseFilter; + import org.jboss.resteasy.reactive.client.impl.RestClientRequestContext; import org.jboss.resteasy.reactive.client.spi.ClientRestHandler; diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/handlers/ClientSendRequestHandler.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/handlers/ClientSendRequestHandler.java index 6fe7941f4cf53..8d1d7d62c3cbb 100644 --- a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/handlers/ClientSendRequestHandler.java +++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/handlers/ClientSendRequestHandler.java @@ -1,27 +1,5 @@ package org.jboss.resteasy.reactive.client.handlers; -import io.netty.handler.codec.http.LastHttpContent; -import io.netty.handler.codec.http.multipart.InterfaceHttpData; -import io.smallrye.mutiny.Multi; -import io.smallrye.mutiny.Uni; -import io.smallrye.stork.api.ServiceInstance; -import io.vertx.core.AsyncResult; -import io.vertx.core.Context; -import io.vertx.core.Future; -import io.vertx.core.Handler; -import io.vertx.core.MultiMap; -import io.vertx.core.Promise; -import io.vertx.core.Vertx; -import io.vertx.core.buffer.Buffer; -import io.vertx.core.file.AsyncFile; -import io.vertx.core.file.OpenOptions; -import io.vertx.core.http.HttpClient; -import io.vertx.core.http.HttpClientRequest; -import io.vertx.core.http.HttpClientResponse; -import io.vertx.core.http.HttpMethod; -import io.vertx.core.http.RequestOptions; -import io.vertx.core.streams.Pipe; -import io.vertx.core.streams.Pump; import java.io.ByteArrayInputStream; import java.io.File; import java.io.IOException; @@ -35,6 +13,7 @@ import java.util.concurrent.Executor; import java.util.function.Consumer; import java.util.function.Function; + import javax.ws.rs.InternalServerErrorException; import javax.ws.rs.ProcessingException; import javax.ws.rs.client.Entity; @@ -42,6 +21,7 @@ import javax.ws.rs.core.MediaType; import javax.ws.rs.core.MultivaluedMap; import javax.ws.rs.core.Variant; + import org.jboss.logging.Logger; import org.jboss.resteasy.reactive.client.AsyncResultUni; import org.jboss.resteasy.reactive.client.api.ClientLogger; @@ -59,6 +39,29 @@ import org.jboss.resteasy.reactive.common.core.Serialisers; import org.jboss.resteasy.reactive.common.util.MultivaluedTreeMap; +import io.netty.handler.codec.http.LastHttpContent; +import io.netty.handler.codec.http.multipart.InterfaceHttpData; +import io.smallrye.mutiny.Multi; +import io.smallrye.mutiny.Uni; +import io.smallrye.stork.api.ServiceInstance; +import io.vertx.core.AsyncResult; +import io.vertx.core.Context; +import io.vertx.core.Future; +import io.vertx.core.Handler; +import io.vertx.core.MultiMap; +import io.vertx.core.Promise; +import io.vertx.core.Vertx; +import io.vertx.core.buffer.Buffer; +import io.vertx.core.file.AsyncFile; +import io.vertx.core.file.OpenOptions; +import io.vertx.core.http.HttpClient; +import io.vertx.core.http.HttpClientRequest; +import io.vertx.core.http.HttpClientResponse; +import io.vertx.core.http.HttpMethod; +import io.vertx.core.http.RequestOptions; +import io.vertx.core.streams.Pipe; +import io.vertx.core.streams.Pump; + public class ClientSendRequestHandler implements ClientRestHandler { private static final Logger log = Logger.getLogger(ClientSendRequestHandler.class); public static final String CONTENT_TYPE = "Content-Type"; diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/handlers/ClientSetResponseEntityRestHandler.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/handlers/ClientSetResponseEntityRestHandler.java index d9bed6f09baeb..2b3ccf504efcb 100644 --- a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/handlers/ClientSetResponseEntityRestHandler.java +++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/handlers/ClientSetResponseEntityRestHandler.java @@ -1,13 +1,14 @@ package org.jboss.resteasy.reactive.client.handlers; -import io.vertx.core.buffer.Buffer; import java.io.ByteArrayInputStream; import java.io.IOException; + import javax.ws.rs.client.Entity; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.MultivaluedMap; import javax.ws.rs.core.Response; import javax.ws.rs.core.Response.StatusType; + import org.jboss.resteasy.reactive.client.api.WebClientApplicationException; import org.jboss.resteasy.reactive.client.impl.ClientRequestContextImpl; import org.jboss.resteasy.reactive.client.impl.ClientResponseContextImpl; @@ -16,6 +17,8 @@ import org.jboss.resteasy.reactive.common.core.Serialisers; import org.jboss.resteasy.reactive.common.jaxrs.StatusTypeImpl; +import io.vertx.core.buffer.Buffer; + public class ClientSetResponseEntityRestHandler implements ClientRestHandler { @Override diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/handlers/VertxClientInputStream.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/handlers/VertxClientInputStream.java index c48a65a144365..69fa50754a8a0 100644 --- a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/handlers/VertxClientInputStream.java +++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/handlers/VertxClientInputStream.java @@ -1,19 +1,21 @@ package org.jboss.resteasy.reactive.client.handlers; -import io.netty.buffer.ByteBuf; -import io.vertx.core.Context; -import io.vertx.core.Handler; -import io.vertx.core.buffer.Buffer; -import io.vertx.core.http.HttpClientResponse; -import io.vertx.core.http.HttpHeaders; import java.io.IOException; import java.io.InputStream; import java.io.InterruptedIOException; import java.util.ArrayDeque; import java.util.Deque; + import org.jboss.resteasy.reactive.client.impl.RestClientRequestContext; import org.jboss.resteasy.reactive.common.core.BlockingNotAllowedException; +import io.netty.buffer.ByteBuf; +import io.vertx.core.Context; +import io.vertx.core.Handler; +import io.vertx.core.buffer.Buffer; +import io.vertx.core.http.HttpClientResponse; +import io.vertx.core.http.HttpHeaders; + class VertxClientInputStream extends InputStream { public static final String MAX_REQUEST_SIZE_KEY = "io.quarkus.max-request-size"; diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/AbstractClientInterceptorContextImpl.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/AbstractClientInterceptorContextImpl.java index 6735403fade76..69143868b9737 100644 --- a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/AbstractClientInterceptorContextImpl.java +++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/AbstractClientInterceptorContextImpl.java @@ -6,6 +6,7 @@ import java.util.Collections; import java.util.Map; import java.util.Objects; + import javax.ws.rs.core.MediaType; import javax.ws.rs.ext.InterceptorContext; diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/AsyncInvokerImpl.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/AsyncInvokerImpl.java index b5ef7e9d2b3ec..64a44c7c08c48 100644 --- a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/AsyncInvokerImpl.java +++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/AsyncInvokerImpl.java @@ -1,7 +1,5 @@ package org.jboss.resteasy.reactive.client.impl; -import io.vertx.core.buffer.Buffer; -import io.vertx.core.http.HttpClient; import java.lang.reflect.Type; import java.net.URI; import java.util.HashMap; @@ -10,17 +8,22 @@ import java.util.concurrent.Future; import java.util.function.BiConsumer; import java.util.function.Function; + import javax.ws.rs.client.AsyncInvoker; import javax.ws.rs.client.CompletionStageRxInvoker; import javax.ws.rs.client.Entity; import javax.ws.rs.client.InvocationCallback; import javax.ws.rs.core.GenericType; import javax.ws.rs.core.Response; + import org.jboss.resteasy.reactive.RestResponse; import org.jboss.resteasy.reactive.common.jaxrs.ConfigurationImpl; import org.jboss.resteasy.reactive.common.util.types.Types; import org.jboss.resteasy.reactive.spi.ThreadSetupAction; +import io.vertx.core.buffer.Buffer; +import io.vertx.core.http.HttpClient; + public class AsyncInvokerImpl implements AsyncInvoker, CompletionStageRxInvoker { public static final Buffer EMPTY_BUFFER = Buffer.buffer(new byte[0]); diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientBuilderImpl.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientBuilderImpl.java index 6afe4fb4d6e52..9f6e50abe605d 100644 --- a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientBuilderImpl.java +++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientBuilderImpl.java @@ -3,10 +3,6 @@ import static org.jboss.resteasy.reactive.client.api.QuarkusRestClientProperties.CONNECT_TIMEOUT; import static org.jboss.resteasy.reactive.client.api.QuarkusRestClientProperties.READ_TIMEOUT; -import io.vertx.core.buffer.Buffer; -import io.vertx.core.http.HttpClientOptions; -import io.vertx.core.net.JksOptions; -import io.vertx.core.net.ProxyOptions; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.security.KeyStore; @@ -19,11 +15,13 @@ import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; import java.util.regex.Pattern; + import javax.net.ssl.HostnameVerifier; import javax.net.ssl.SSLContext; import javax.ws.rs.RuntimeType; import javax.ws.rs.client.ClientBuilder; import javax.ws.rs.core.Configuration; + import org.jboss.logging.Logger; import org.jboss.resteasy.reactive.client.api.ClientLogger; import org.jboss.resteasy.reactive.client.api.LoggingScope; @@ -32,6 +30,11 @@ import org.jboss.resteasy.reactive.common.jaxrs.ConfigurationImpl; import org.jboss.resteasy.reactive.common.jaxrs.MultiQueryParamMode; +import io.vertx.core.buffer.Buffer; +import io.vertx.core.http.HttpClientOptions; +import io.vertx.core.net.JksOptions; +import io.vertx.core.net.ProxyOptions; + public class ClientBuilderImpl extends ClientBuilder { private static final Logger log = Logger.getLogger(ClientBuilderImpl.class); diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientImpl.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientImpl.java index fd6d022224fc7..d0cf2b2261fbd 100644 --- a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientImpl.java +++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientImpl.java @@ -9,6 +9,33 @@ import static org.jboss.resteasy.reactive.client.api.QuarkusRestClientProperties.NAME; import static org.jboss.resteasy.reactive.client.api.QuarkusRestClientProperties.SHARED; +import java.net.URI; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Set; +import java.util.concurrent.TimeUnit; +import java.util.function.Function; +import java.util.function.Supplier; + +import javax.net.ssl.HostnameVerifier; +import javax.net.ssl.SSLContext; +import javax.ws.rs.RuntimeType; +import javax.ws.rs.client.Client; +import javax.ws.rs.client.Invocation; +import javax.ws.rs.client.Invocation.Builder; +import javax.ws.rs.client.WebTarget; +import javax.ws.rs.core.Link; +import javax.ws.rs.core.UriBuilder; + +import org.jboss.logging.Logger; +import org.jboss.resteasy.reactive.client.api.ClientLogger; +import org.jboss.resteasy.reactive.client.api.LoggingScope; +import org.jboss.resteasy.reactive.client.spi.ClientContext; +import org.jboss.resteasy.reactive.common.jaxrs.ConfigurationImpl; +import org.jboss.resteasy.reactive.common.jaxrs.MultiQueryParamMode; +import org.jboss.resteasy.reactive.common.jaxrs.UriBuilderImpl; + import io.netty.channel.EventLoopGroup; import io.vertx.core.AsyncResult; import io.vertx.core.Context; @@ -46,30 +73,6 @@ import io.vertx.core.net.NetServerOptions; import io.vertx.core.shareddata.SharedData; import io.vertx.core.spi.VerticleFactory; -import java.net.URI; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.Set; -import java.util.concurrent.TimeUnit; -import java.util.function.Function; -import java.util.function.Supplier; -import javax.net.ssl.HostnameVerifier; -import javax.net.ssl.SSLContext; -import javax.ws.rs.RuntimeType; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.Invocation; -import javax.ws.rs.client.Invocation.Builder; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.Link; -import javax.ws.rs.core.UriBuilder; -import org.jboss.logging.Logger; -import org.jboss.resteasy.reactive.client.api.ClientLogger; -import org.jboss.resteasy.reactive.client.api.LoggingScope; -import org.jboss.resteasy.reactive.client.spi.ClientContext; -import org.jboss.resteasy.reactive.common.jaxrs.ConfigurationImpl; -import org.jboss.resteasy.reactive.common.jaxrs.MultiQueryParamMode; -import org.jboss.resteasy.reactive.common.jaxrs.UriBuilderImpl; public class ClientImpl implements Client { diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientProxies.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientProxies.java index 0390e606269dc..88be8ed791c17 100644 --- a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientProxies.java +++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientProxies.java @@ -4,8 +4,10 @@ import java.util.List; import java.util.Map; import java.util.function.BiFunction; + import javax.ws.rs.client.WebTarget; import javax.ws.rs.ext.ParamConverterProvider; + import org.jboss.resteasy.reactive.client.api.InvalidRestClientDefinitionException; public class ClientProxies { diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientReaderInterceptorContextImpl.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientReaderInterceptorContextImpl.java index 004f63f0b258b..51a857e8b0474 100644 --- a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientReaderInterceptorContextImpl.java +++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientReaderInterceptorContextImpl.java @@ -6,6 +6,7 @@ import java.lang.reflect.Type; import java.util.List; import java.util.Map; + import javax.ws.rs.ProcessingException; import javax.ws.rs.RuntimeType; import javax.ws.rs.WebApplicationException; @@ -14,6 +15,7 @@ import javax.ws.rs.ext.MessageBodyReader; import javax.ws.rs.ext.ReaderInterceptor; import javax.ws.rs.ext.ReaderInterceptorContext; + import org.jboss.resteasy.reactive.client.spi.ClientRestHandler; import org.jboss.resteasy.reactive.common.core.Serialisers; import org.jboss.resteasy.reactive.common.jaxrs.ConfigurationImpl; diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientRequestContextImpl.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientRequestContextImpl.java index 57befd136fc2f..486e7e3d00dd4 100644 --- a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientRequestContextImpl.java +++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientRequestContextImpl.java @@ -3,10 +3,6 @@ import static java.util.Collections.emptyList; import static java.util.Collections.singletonList; -import io.smallrye.common.vertx.VertxContext; -import io.smallrye.stork.api.ServiceInstance; -import io.vertx.core.Context; -import io.vertx.core.Vertx; import java.io.OutputStream; import java.lang.annotation.Annotation; import java.lang.reflect.Type; @@ -25,6 +21,7 @@ import java.util.Set; import java.util.TreeSet; import java.util.concurrent.atomic.AtomicBoolean; + import javax.ws.rs.client.Client; import javax.ws.rs.client.Entity; import javax.ws.rs.core.Configuration; @@ -35,6 +32,7 @@ import javax.ws.rs.core.MediaType; import javax.ws.rs.core.MultivaluedMap; import javax.ws.rs.core.Response; + import org.jboss.resteasy.reactive.client.spi.ResteasyReactiveClientRequestContext; import org.jboss.resteasy.reactive.common.NotImplementedYet; import org.jboss.resteasy.reactive.common.core.Serialisers; @@ -42,6 +40,11 @@ import org.jboss.resteasy.reactive.common.jaxrs.ConfigurationImpl; import org.jboss.resteasy.reactive.common.util.CaseInsensitiveMap; +import io.smallrye.common.vertx.VertxContext; +import io.smallrye.stork.api.ServiceInstance; +import io.vertx.core.Context; +import io.vertx.core.Vertx; + public class ClientRequestContextImpl implements ResteasyReactiveClientRequestContext { private final Client client; diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientRequestHeaders.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientRequestHeaders.java index 6e5145b61644f..57502bcd796af 100644 --- a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientRequestHeaders.java +++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientRequestHeaders.java @@ -5,11 +5,13 @@ import java.util.Locale; import java.util.Map; import java.util.Set; + import javax.ws.rs.core.CacheControl; import javax.ws.rs.core.Cookie; import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.MultivaluedMap; + import org.jboss.resteasy.reactive.common.headers.HeaderUtil; import org.jboss.resteasy.reactive.common.jaxrs.ConfigurationImpl; import org.jboss.resteasy.reactive.common.util.CaseInsensitiveMap; diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientResponseBuilderImpl.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientResponseBuilderImpl.java index 667f440d8e3b4..d67012b3d084b 100644 --- a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientResponseBuilderImpl.java +++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientResponseBuilderImpl.java @@ -2,7 +2,9 @@ import java.io.InputStream; import java.net.URI; + import javax.ws.rs.core.Response; + import org.jboss.resteasy.reactive.common.NotImplementedYet; import org.jboss.resteasy.reactive.common.jaxrs.AbstractResponseBuilder; import org.jboss.resteasy.reactive.common.jaxrs.ResponseImpl; diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientResponseContextImpl.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientResponseContextImpl.java index 9833fe97616c6..4c8694d0f5bad 100644 --- a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientResponseContextImpl.java +++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientResponseContextImpl.java @@ -7,6 +7,7 @@ import java.util.Locale; import java.util.Map; import java.util.Set; + import javax.ws.rs.client.ClientResponseContext; import javax.ws.rs.core.EntityTag; import javax.ws.rs.core.Link; @@ -15,6 +16,7 @@ import javax.ws.rs.core.MultivaluedMap; import javax.ws.rs.core.NewCookie; import javax.ws.rs.core.Response.StatusType; + import org.jboss.resteasy.reactive.common.headers.HeaderUtil; import org.jboss.resteasy.reactive.common.headers.LinkHeaders; import org.jboss.resteasy.reactive.common.jaxrs.StatusTypeImpl; diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientResponseImpl.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientResponseImpl.java index 4026c2ffdf169..7c04c7e329a49 100644 --- a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientResponseImpl.java +++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientResponseImpl.java @@ -4,8 +4,10 @@ import java.io.InputStream; import java.lang.annotation.Annotation; import java.lang.reflect.Type; + import javax.ws.rs.ProcessingException; import javax.ws.rs.core.MediaType; + import org.jboss.resteasy.reactive.common.jaxrs.ResponseImpl; import org.jboss.resteasy.reactive.common.util.EmptyInputStream; diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientRestResponseBuilderImpl.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientRestResponseBuilderImpl.java index 58550652c4b88..892a0f21e8afd 100644 --- a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientRestResponseBuilderImpl.java +++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientRestResponseBuilderImpl.java @@ -2,6 +2,7 @@ import java.io.InputStream; import java.net.URI; + import org.jboss.resteasy.reactive.RestResponse; import org.jboss.resteasy.reactive.common.NotImplementedYet; import org.jboss.resteasy.reactive.common.jaxrs.AbstractRestResponseBuilder; diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientRestResponseImpl.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientRestResponseImpl.java index 56a6b7c22eda4..a20995e83766b 100644 --- a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientRestResponseImpl.java +++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientRestResponseImpl.java @@ -4,8 +4,10 @@ import java.io.InputStream; import java.lang.annotation.Annotation; import java.lang.reflect.Type; + import javax.ws.rs.ProcessingException; import javax.ws.rs.core.MediaType; + import org.jboss.resteasy.reactive.common.jaxrs.RestResponseImpl; import org.jboss.resteasy.reactive.common.util.EmptyInputStream; diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientSerialisers.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientSerialisers.java index d05ab1fadae2b..8a5b331cc04c8 100644 --- a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientSerialisers.java +++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientSerialisers.java @@ -1,6 +1,5 @@ package org.jboss.resteasy.reactive.client.impl; -import io.vertx.core.buffer.Buffer; import java.io.File; import java.io.IOException; import java.io.InputStream; @@ -10,6 +9,7 @@ import java.lang.reflect.Type; import java.util.Collections; import java.util.Map; + import javax.json.JsonArray; import javax.json.JsonObject; import javax.json.JsonValue; @@ -23,6 +23,7 @@ import javax.ws.rs.ext.MessageBodyWriter; import javax.ws.rs.ext.ReaderInterceptor; import javax.ws.rs.ext.WriterInterceptor; + import org.jboss.logging.Logger; import org.jboss.resteasy.reactive.client.providers.serialisers.ClientDefaultTextPlainBodyHandler; import org.jboss.resteasy.reactive.client.spi.ClientRestHandler; @@ -46,6 +47,8 @@ import org.jboss.resteasy.reactive.common.providers.serialisers.jsonp.JsonObjectHandler; import org.jboss.resteasy.reactive.common.providers.serialisers.jsonp.JsonValueHandler; +import io.vertx.core.buffer.Buffer; + public class ClientSerialisers extends Serialisers { private static final Logger log = Logger.getLogger(ClientSerialisers.class); diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientWriterInterceptorContextImpl.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientWriterInterceptorContextImpl.java index 594ee41bca455..56f636562aee9 100644 --- a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientWriterInterceptorContextImpl.java +++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientWriterInterceptorContextImpl.java @@ -1,6 +1,5 @@ package org.jboss.resteasy.reactive.client.impl; -import io.vertx.core.buffer.Buffer; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.OutputStream; @@ -8,6 +7,7 @@ import java.lang.reflect.Type; import java.util.List; import java.util.Map; + import javax.ws.rs.RuntimeType; import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.MediaType; @@ -15,10 +15,13 @@ import javax.ws.rs.ext.MessageBodyWriter; import javax.ws.rs.ext.WriterInterceptor; import javax.ws.rs.ext.WriterInterceptorContext; + import org.jboss.resteasy.reactive.client.spi.ClientRestHandler; import org.jboss.resteasy.reactive.common.core.Serialisers; import org.jboss.resteasy.reactive.common.jaxrs.ConfigurationImpl; +import io.vertx.core.buffer.Buffer; + public class ClientWriterInterceptorContextImpl extends AbstractClientInterceptorContextImpl implements WriterInterceptorContext { diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/DefaultClientContext.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/DefaultClientContext.java index add884e033d9f..7a36da34f33dd 100644 --- a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/DefaultClientContext.java +++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/DefaultClientContext.java @@ -1,15 +1,18 @@ package org.jboss.resteasy.reactive.client.impl; -import io.vertx.core.Vertx; import java.util.Collections; import java.util.Map; import java.util.function.Supplier; + import javax.ws.rs.RuntimeType; + import org.jboss.resteasy.reactive.client.spi.ClientContext; import org.jboss.resteasy.reactive.client.spi.ClientContextResolver; import org.jboss.resteasy.reactive.client.spi.MultipartResponseData; import org.jboss.resteasy.reactive.common.core.GenericTypeMapping; +import io.vertx.core.Vertx; + public class DefaultClientContext implements ClientContext { public static DefaultClientContext INSTANCE = new DefaultClientContext(); diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/HandlerChain.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/HandlerChain.java index 97b6a58b1ef44..55d448d7725fc 100644 --- a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/HandlerChain.java +++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/HandlerChain.java @@ -3,8 +3,10 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; + import javax.ws.rs.client.ClientRequestFilter; import javax.ws.rs.client.ClientResponseFilter; + import org.jboss.resteasy.reactive.client.api.ClientLogger; import org.jboss.resteasy.reactive.client.api.LoggingScope; import org.jboss.resteasy.reactive.client.handlers.ClientErrorHandler; diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/InboundSseEventImpl.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/InboundSseEventImpl.java index 0bf3593858970..947097eed0841 100644 --- a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/InboundSseEventImpl.java +++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/InboundSseEventImpl.java @@ -6,10 +6,12 @@ import java.io.UncheckedIOException; import java.nio.charset.StandardCharsets; import java.util.Objects; + import javax.ws.rs.core.GenericType; import javax.ws.rs.core.MediaType; import javax.ws.rs.sse.InboundSseEvent; import javax.ws.rs.sse.SseEvent; + import org.jboss.resteasy.reactive.common.core.Serialisers; import org.jboss.resteasy.reactive.common.jaxrs.ConfigurationImpl; diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/InvocationBuilderImpl.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/InvocationBuilderImpl.java index f9f25cf593cd0..e83834eb45dce 100644 --- a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/InvocationBuilderImpl.java +++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/InvocationBuilderImpl.java @@ -2,14 +2,13 @@ import static org.jboss.resteasy.reactive.client.api.QuarkusRestClientProperties.READ_TIMEOUT; -import io.vertx.core.Context; -import io.vertx.core.http.HttpClient; import java.net.URI; import java.util.HashMap; import java.util.Locale; import java.util.Map; import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutionException; + import javax.ws.rs.ProcessingException; import javax.ws.rs.WebApplicationException; import javax.ws.rs.client.CompletionStageRxInvoker; @@ -24,10 +23,14 @@ import javax.ws.rs.core.MediaType; import javax.ws.rs.core.MultivaluedMap; import javax.ws.rs.core.Response; + import org.jboss.resteasy.reactive.common.core.BlockingNotAllowedException; import org.jboss.resteasy.reactive.common.jaxrs.ConfigurationImpl; import org.jboss.resteasy.reactive.spi.ThreadSetupAction; +import io.vertx.core.Context; +import io.vertx.core.http.HttpClient; + public class InvocationBuilderImpl implements Invocation.Builder { private static final long DEFAULT_READ_TIMEOUT = 30_000L; diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/InvocationImpl.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/InvocationImpl.java index 983fe532ac6f9..b243a03d4053a 100644 --- a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/InvocationImpl.java +++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/InvocationImpl.java @@ -2,6 +2,7 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; + import javax.ws.rs.ProcessingException; import javax.ws.rs.WebApplicationException; import javax.ws.rs.client.Entity; diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/MultiInvoker.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/MultiInvoker.java index 6ae2a5109697d..c6edb7584aae4 100644 --- a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/MultiInvoker.java +++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/MultiInvoker.java @@ -1,21 +1,24 @@ package org.jboss.resteasy.reactive.client.impl; -import io.smallrye.mutiny.Multi; -import io.smallrye.mutiny.subscription.MultiEmitter; -import io.vertx.core.Handler; -import io.vertx.core.buffer.Buffer; -import io.vertx.core.http.HttpClientResponse; -import io.vertx.core.net.impl.ConnectionBase; import java.io.ByteArrayInputStream; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; + import javax.ws.rs.client.Entity; import javax.ws.rs.core.GenericType; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; + import org.jboss.resteasy.reactive.common.jaxrs.ResponseImpl; import org.jboss.resteasy.reactive.common.util.RestMediaType; +import io.smallrye.mutiny.Multi; +import io.smallrye.mutiny.subscription.MultiEmitter; +import io.vertx.core.Handler; +import io.vertx.core.buffer.Buffer; +import io.vertx.core.http.HttpClientResponse; +import io.vertx.core.net.impl.ConnectionBase; + public class MultiInvoker extends AbstractRxInvoker> { private final InvocationBuilderImpl invocationBuilder; diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/RestClientRequestContext.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/RestClientRequestContext.java index 24db57060dace..0872e5a31aa62 100644 --- a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/RestClientRequestContext.java +++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/RestClientRequestContext.java @@ -1,13 +1,5 @@ package org.jboss.resteasy.reactive.client.impl; -import io.netty.handler.codec.http.multipart.InterfaceHttpData; -import io.smallrye.stork.api.ServiceInstance; -import io.vertx.core.Context; -import io.vertx.core.MultiMap; -import io.vertx.core.buffer.Buffer; -import io.vertx.core.http.HttpClient; -import io.vertx.core.http.HttpClientRequest; -import io.vertx.core.http.HttpClientResponse; import java.io.File; import java.io.IOException; import java.io.InputStream; @@ -23,6 +15,7 @@ import java.util.Map; import java.util.concurrent.CompletableFuture; import java.util.concurrent.Executor; + import javax.ws.rs.RuntimeType; import javax.ws.rs.WebApplicationException; import javax.ws.rs.client.Entity; @@ -34,6 +27,7 @@ import javax.ws.rs.ext.MessageBodyWriter; import javax.ws.rs.ext.ReaderInterceptor; import javax.ws.rs.ext.WriterInterceptor; + import org.jboss.resteasy.reactive.ClientWebApplicationException; import org.jboss.resteasy.reactive.RestResponse; import org.jboss.resteasy.reactive.client.api.QuarkusRestClientProperties; @@ -47,6 +41,15 @@ import org.jboss.resteasy.reactive.common.util.CaseInsensitiveMap; import org.jboss.resteasy.reactive.spi.ThreadSetupAction; +import io.netty.handler.codec.http.multipart.InterfaceHttpData; +import io.smallrye.stork.api.ServiceInstance; +import io.vertx.core.Context; +import io.vertx.core.MultiMap; +import io.vertx.core.buffer.Buffer; +import io.vertx.core.http.HttpClient; +import io.vertx.core.http.HttpClientRequest; +import io.vertx.core.http.HttpClientResponse; + /** * This is a stateful invocation, you can't invoke it twice. */ diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/SseEventSourceBuilderImpl.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/SseEventSourceBuilderImpl.java index 0033a1c89d69a..932fd7971039d 100644 --- a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/SseEventSourceBuilderImpl.java +++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/SseEventSourceBuilderImpl.java @@ -2,6 +2,7 @@ import java.util.Objects; import java.util.concurrent.TimeUnit; + import javax.ws.rs.client.WebTarget; import javax.ws.rs.sse.SseEventSource; import javax.ws.rs.sse.SseEventSource.Builder; diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/SseEventSourceImpl.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/SseEventSourceImpl.java index 5a10e416f02da..4e667efd06451 100644 --- a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/SseEventSourceImpl.java +++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/SseEventSourceImpl.java @@ -1,22 +1,25 @@ package org.jboss.resteasy.reactive.client.impl; -import io.vertx.core.Handler; -import io.vertx.core.Vertx; -import io.vertx.core.http.HttpClientResponse; -import io.vertx.core.http.HttpConnection; -import io.vertx.core.net.impl.ConnectionBase; import java.util.ArrayList; import java.util.List; import java.util.Objects; import java.util.concurrent.TimeUnit; import java.util.function.Consumer; + import javax.ws.rs.client.Invocation; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; import javax.ws.rs.sse.InboundSseEvent; import javax.ws.rs.sse.SseEventSource; + import org.jboss.resteasy.reactive.common.util.CommonSseUtil; +import io.vertx.core.Handler; +import io.vertx.core.Vertx; +import io.vertx.core.http.HttpClientResponse; +import io.vertx.core.http.HttpConnection; +import io.vertx.core.net.impl.ConnectionBase; + public class SseEventSourceImpl implements SseEventSource, Handler { private TimeUnit reconnectUnit; diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/SseParser.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/SseParser.java index 336b87551ae8a..82e58490b60a3 100644 --- a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/SseParser.java +++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/SseParser.java @@ -1,11 +1,13 @@ package org.jboss.resteasy.reactive.client.impl; -import io.vertx.core.Handler; -import io.vertx.core.buffer.Buffer; import java.nio.charset.StandardCharsets; + import javax.ws.rs.core.MediaType; import javax.ws.rs.sse.SseEvent; +import io.vertx.core.Handler; +import io.vertx.core.buffer.Buffer; + public class SseParser implements Handler { private static final byte CR = '\r'; diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/StorkClientRequestFilter.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/StorkClientRequestFilter.java index eeb59d0e0ab5d..c81f86cb0fb87 100644 --- a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/StorkClientRequestFilter.java +++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/StorkClientRequestFilter.java @@ -1,19 +1,22 @@ package org.jboss.resteasy.reactive.client.impl; -import io.smallrye.mutiny.Multi; -import io.smallrye.mutiny.Uni; -import io.smallrye.stork.Stork; -import io.smallrye.stork.api.ServiceInstance; import java.net.URI; import java.net.URISyntaxException; + import javax.annotation.Priority; import javax.ws.rs.Priorities; import javax.ws.rs.core.GenericType; import javax.ws.rs.ext.Provider; + import org.jboss.logging.Logger; import org.jboss.resteasy.reactive.client.spi.ResteasyReactiveClientRequestContext; import org.jboss.resteasy.reactive.client.spi.ResteasyReactiveClientRequestFilter; +import io.smallrye.mutiny.Multi; +import io.smallrye.mutiny.Uni; +import io.smallrye.stork.Stork; +import io.smallrye.stork.api.ServiceInstance; + @Priority(Priorities.AUTHENTICATION) @Provider public class StorkClientRequestFilter implements ResteasyReactiveClientRequestFilter { diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/UniInvoker.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/UniInvoker.java index 85e34db423555..927262a55d57f 100644 --- a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/UniInvoker.java +++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/UniInvoker.java @@ -1,12 +1,14 @@ package org.jboss.resteasy.reactive.client.impl; -import io.smallrye.mutiny.Uni; import java.util.concurrent.CompletionStage; import java.util.function.Supplier; + import javax.ws.rs.client.Entity; import javax.ws.rs.core.GenericType; import javax.ws.rs.core.Response; +import io.smallrye.mutiny.Uni; + public class UniInvoker extends AbstractRxInvoker> { private InvocationBuilderImpl invocationBuilder; diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/VertxBufferOutputStream.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/VertxBufferOutputStream.java index d1ce9bf918648..d46ceb08705ee 100644 --- a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/VertxBufferOutputStream.java +++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/VertxBufferOutputStream.java @@ -1,9 +1,10 @@ package org.jboss.resteasy.reactive.client.impl; -import io.vertx.core.buffer.Buffer; import java.io.IOException; import java.io.OutputStream; +import io.vertx.core.buffer.Buffer; + public class VertxBufferOutputStream extends OutputStream { private final Buffer buffer; diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/WebTargetImpl.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/WebTargetImpl.java index faf2c4361d601..56fc7d2f4d0fc 100644 --- a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/WebTargetImpl.java +++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/WebTargetImpl.java @@ -1,23 +1,26 @@ package org.jboss.resteasy.reactive.client.impl; -import io.vertx.core.http.HttpClient; import java.net.URI; import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; + import javax.ws.rs.client.Invocation; import javax.ws.rs.client.WebTarget; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.MultivaluedMap; import javax.ws.rs.core.UriBuilder; import javax.ws.rs.ext.ParamConverterProvider; + import org.jboss.resteasy.reactive.client.spi.ClientRestHandler; import org.jboss.resteasy.reactive.common.core.Serialisers; import org.jboss.resteasy.reactive.common.jaxrs.ConfigurationImpl; import org.jboss.resteasy.reactive.common.jaxrs.UriBuilderImpl; import org.jboss.resteasy.reactive.spi.ThreadSetupAction; +import io.vertx.core.http.HttpClient; + public class WebTargetImpl implements WebTarget { protected UriBuilder uriBuilder; diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/multipart/FileDownloadImpl.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/multipart/FileDownloadImpl.java index d036a5171eb41..48cf29d59c8ef 100644 --- a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/multipart/FileDownloadImpl.java +++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/multipart/FileDownloadImpl.java @@ -1,10 +1,12 @@ package org.jboss.resteasy.reactive.client.impl.multipart; -import io.netty.handler.codec.http.multipart.FileUpload; import java.io.IOException; import java.nio.file.Path; + import org.jboss.resteasy.reactive.multipart.FileDownload; +import io.netty.handler.codec.http.multipart.FileUpload; + public class FileDownloadImpl implements FileDownload { // we're using netty's file upload to represent download too diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/multipart/MultiByteHttpData.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/multipart/MultiByteHttpData.java index 1a4c056c152b0..3223884280ba7 100644 --- a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/multipart/MultiByteHttpData.java +++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/multipart/MultiByteHttpData.java @@ -15,6 +15,16 @@ */ package org.jboss.resteasy.reactive.client.impl.multipart; +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.nio.charset.Charset; +import java.util.concurrent.Executor; +import java.util.function.Consumer; + +import org.jboss.logging.Logger; +import org.reactivestreams.Subscription; + import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import io.netty.handler.codec.http.HttpHeaderNames; @@ -27,14 +37,6 @@ import io.vertx.core.Context; import io.vertx.core.Vertx; import io.vertx.core.buffer.impl.VertxByteBufAllocator; -import java.io.File; -import java.io.IOException; -import java.io.InputStream; -import java.nio.charset.Charset; -import java.util.concurrent.Executor; -import java.util.function.Consumer; -import org.jboss.logging.Logger; -import org.reactivestreams.Subscription; /** * A FileUpload implementation that is responsible for sending Multi<Byte> as a file in a multipart message. diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/multipart/PausableHttpPostRequestEncoder.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/multipart/PausableHttpPostRequestEncoder.java index a03df06feef96..aa906aa19d8b6 100644 --- a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/multipart/PausableHttpPostRequestEncoder.java +++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/multipart/PausableHttpPostRequestEncoder.java @@ -19,6 +19,17 @@ import static io.netty.util.internal.ObjectUtil.checkNotNull; import static java.util.AbstractMap.SimpleImmutableEntry; +import java.io.File; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.URLEncoder; +import java.nio.charset.Charset; +import java.util.ArrayList; +import java.util.List; +import java.util.ListIterator; +import java.util.Map; +import java.util.regex.Pattern; + import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBufAllocator; import io.netty.channel.ChannelHandlerContext; @@ -45,16 +56,6 @@ import io.netty.util.internal.ObjectUtil; import io.netty.util.internal.PlatformDependent; import io.netty.util.internal.StringUtil; -import java.io.File; -import java.io.IOException; -import java.io.UnsupportedEncodingException; -import java.net.URLEncoder; -import java.nio.charset.Charset; -import java.util.ArrayList; -import java.util.List; -import java.util.ListIterator; -import java.util.Map; -import java.util.regex.Pattern; /** * A copy of {@link io.netty.handler.codec.http.multipart.HttpPostRequestEncoder} that supports pause/resume diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/multipart/QuarkusInternalAttribute.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/multipart/QuarkusInternalAttribute.java index d1727380edb80..25905398c73b0 100644 --- a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/multipart/QuarkusInternalAttribute.java +++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/multipart/QuarkusInternalAttribute.java @@ -15,14 +15,15 @@ */ package org.jboss.resteasy.reactive.client.impl.multipart; +import java.nio.charset.Charset; +import java.util.ArrayList; +import java.util.List; + import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import io.netty.handler.codec.http.multipart.InterfaceHttpData; import io.netty.util.AbstractReferenceCounted; import io.netty.util.internal.ObjectUtil; -import java.nio.charset.Charset; -import java.util.ArrayList; -import java.util.List; /** * A copy of Netty's InternalAttribute which is not public diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/multipart/QuarkusMultipartForm.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/multipart/QuarkusMultipartForm.java index 2a1fc60da25ac..55c8db8783ab6 100644 --- a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/multipart/QuarkusMultipartForm.java +++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/multipart/QuarkusMultipartForm.java @@ -1,7 +1,5 @@ package org.jboss.resteasy.reactive.client.impl.multipart; -import io.smallrye.mutiny.Multi; -import io.vertx.core.buffer.Buffer; import java.io.IOException; import java.lang.reflect.Type; import java.nio.charset.Charset; @@ -9,16 +7,21 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; + import javax.ws.rs.RuntimeType; import javax.ws.rs.client.Entity; import javax.ws.rs.core.GenericEntity; import javax.ws.rs.core.MultivaluedMap; import javax.ws.rs.ext.MessageBodyWriter; + import org.jboss.resteasy.reactive.client.impl.ClientSerialisers; import org.jboss.resteasy.reactive.client.impl.RestClientRequestContext; import org.jboss.resteasy.reactive.common.core.Serialisers; import org.jboss.resteasy.reactive.common.util.MultivaluedTreeMap; +import io.smallrye.mutiny.Multi; +import io.vertx.core.buffer.Buffer; + /** * based on {@link io.vertx.ext.web.multipart.MultipartForm} and {@link io.vertx.ext.web.multipart.impl.MultipartFormImpl} */ diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/multipart/QuarkusMultipartFormUpload.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/multipart/QuarkusMultipartFormUpload.java index afa17ac4f1757..eaf1af8765fbf 100644 --- a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/multipart/QuarkusMultipartFormUpload.java +++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/multipart/QuarkusMultipartFormUpload.java @@ -1,5 +1,9 @@ package org.jboss.resteasy.reactive.client.impl.multipart; +import java.io.File; +import java.nio.charset.Charset; +import java.util.concurrent.atomic.AtomicInteger; + import io.netty.buffer.ByteBuf; import io.netty.buffer.UnpooledByteBufAllocator; import io.netty.handler.codec.http.DefaultFullHttpRequest; @@ -19,9 +23,6 @@ import io.vertx.core.streams.Pipe; import io.vertx.core.streams.ReadStream; import io.vertx.core.streams.impl.InboundBuffer; -import java.io.File; -import java.nio.charset.Charset; -import java.util.concurrent.atomic.AtomicInteger; /** * based on {@link io.vertx.ext.web.client.impl.MultipartFormUpload} diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/multipart/QuarkusMultipartResponseDataFactory.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/multipart/QuarkusMultipartResponseDataFactory.java index 72758422c2950..bf1ded4f5336d 100644 --- a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/multipart/QuarkusMultipartResponseDataFactory.java +++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/multipart/QuarkusMultipartResponseDataFactory.java @@ -15,6 +15,16 @@ */ package org.jboss.resteasy.reactive.client.impl.multipart; +import java.io.IOException; +import java.nio.charset.Charset; +import java.util.ArrayList; +import java.util.Collections; +import java.util.IdentityHashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; + import io.netty.handler.codec.http.DefaultHttpRequest; import io.netty.handler.codec.http.HttpConstants; import io.netty.handler.codec.http.multipart.Attribute; @@ -27,15 +37,6 @@ import io.netty.handler.codec.http.multipart.MemoryAttribute; import io.netty.handler.codec.http.multipart.MixedAttribute; import io.vertx.core.http.HttpClientResponse; -import java.io.IOException; -import java.nio.charset.Charset; -import java.util.ArrayList; -import java.util.Collections; -import java.util.IdentityHashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; /** * based on {@link DefaultHttpDataFactory} but for responses, the original one is for requests only :( diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/multipart/QuarkusMultipartResponseDecoder.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/multipart/QuarkusMultipartResponseDecoder.java index 840823f3625a3..c0a8e189569e4 100644 --- a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/multipart/QuarkusMultipartResponseDecoder.java +++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/multipart/QuarkusMultipartResponseDecoder.java @@ -19,6 +19,17 @@ import static io.netty.util.internal.ObjectUtil.checkPositiveOrZero; import static org.jboss.resteasy.reactive.client.impl.multipart.QuarkusHttpPostBodyUtil.getMultipartDataBoundary; +import java.io.IOException; +import java.nio.charset.Charset; +import java.nio.charset.IllegalCharsetNameException; +import java.nio.charset.UnsupportedCharsetException; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.TreeMap; + +import org.jboss.resteasy.reactive.client.impl.multipart.QuarkusHttpPostBodyUtil.TransferEncodingMechanism; + import io.netty.buffer.ByteBuf; import io.netty.handler.codec.http.DefaultHttpContent; import io.netty.handler.codec.http.HttpConstants; @@ -40,15 +51,6 @@ import io.netty.util.internal.StringUtil; import io.vertx.core.buffer.Buffer; import io.vertx.core.http.HttpClientResponse; -import java.io.IOException; -import java.nio.charset.Charset; -import java.nio.charset.IllegalCharsetNameException; -import java.nio.charset.UnsupportedCharsetException; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.TreeMap; -import org.jboss.resteasy.reactive.client.impl.multipart.QuarkusHttpPostBodyUtil.TransferEncodingMechanism; /** * This decoder will decode response body. diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/multipart/RequestTrackingPipe.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/multipart/RequestTrackingPipe.java index 21de9d8b06da2..6b6b3f21d892e 100644 --- a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/multipart/RequestTrackingPipe.java +++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/multipart/RequestTrackingPipe.java @@ -1,5 +1,7 @@ package org.jboss.resteasy.reactive.client.impl.multipart; +import java.util.concurrent.atomic.AtomicLong; + import io.vertx.core.AsyncResult; import io.vertx.core.Future; import io.vertx.core.Handler; @@ -8,7 +10,6 @@ import io.vertx.core.streams.Pipe; import io.vertx.core.streams.ReadStream; import io.vertx.core.streams.WriteStream; -import java.util.concurrent.atomic.AtomicLong; /** * Based on {@link io.vertx.core.streams.impl.PipeImpl}. diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/logging/DefaultClientLogger.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/logging/DefaultClientLogger.java index 5e44e9224a2ca..2f5b9c632e98e 100644 --- a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/logging/DefaultClientLogger.java +++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/logging/DefaultClientLogger.java @@ -1,13 +1,15 @@ package org.jboss.resteasy.reactive.client.logging; +import java.util.Map; + +import org.jboss.logging.Logger; +import org.jboss.resteasy.reactive.client.api.ClientLogger; + import io.vertx.core.Handler; import io.vertx.core.MultiMap; import io.vertx.core.buffer.Buffer; import io.vertx.core.http.HttpClientRequest; import io.vertx.core.http.HttpClientResponse; -import java.util.Map; -import org.jboss.logging.Logger; -import org.jboss.resteasy.reactive.client.api.ClientLogger; public class DefaultClientLogger implements ClientLogger { private static final Logger log = Logger.getLogger(DefaultClientLogger.class); diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/providers/serialisers/ClientDefaultTextPlainBodyHandler.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/providers/serialisers/ClientDefaultTextPlainBodyHandler.java index 228002751a848..35f6cca4ec511 100644 --- a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/providers/serialisers/ClientDefaultTextPlainBodyHandler.java +++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/providers/serialisers/ClientDefaultTextPlainBodyHandler.java @@ -4,6 +4,7 @@ import javax.ws.rs.ProcessingException; import javax.ws.rs.core.NoContentException; import javax.ws.rs.ext.Provider; + import org.jboss.resteasy.reactive.common.providers.serialisers.DefaultTextPlainBodyHandler; @Provider diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/spi/ClientContext.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/spi/ClientContext.java index 51bd3b7e7fa7c..60e74a010c238 100644 --- a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/spi/ClientContext.java +++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/spi/ClientContext.java @@ -1,12 +1,14 @@ package org.jboss.resteasy.reactive.client.spi; -import io.vertx.core.Vertx; import java.util.Map; import java.util.function.Supplier; + import org.jboss.resteasy.reactive.client.impl.ClientProxies; import org.jboss.resteasy.reactive.common.core.GenericTypeMapping; import org.jboss.resteasy.reactive.common.core.Serialisers; +import io.vertx.core.Vertx; + public interface ClientContext { Serialisers getSerialisers(); diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/spi/ClientContextResolver.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/spi/ClientContextResolver.java index 50f205e594993..8273b29e1cde8 100644 --- a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/spi/ClientContextResolver.java +++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/spi/ClientContextResolver.java @@ -1,6 +1,7 @@ package org.jboss.resteasy.reactive.client.spi; import java.util.ServiceLoader; + import org.jboss.resteasy.reactive.client.impl.DefaultClientContext; public interface ClientContextResolver { diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/spi/FieldFiller.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/spi/FieldFiller.java index a1dadcc683e53..133b89dc5d3ce 100644 --- a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/spi/FieldFiller.java +++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/spi/FieldFiller.java @@ -2,7 +2,9 @@ import java.io.File; import java.nio.file.Path; + import javax.ws.rs.core.GenericType; + import org.jboss.resteasy.reactive.multipart.FileDownload; public abstract class FieldFiller { diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/spi/ResteasyReactiveClientRequestContext.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/spi/ResteasyReactiveClientRequestContext.java index 276287d33e68a..ddc89f45029ab 100644 --- a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/spi/ResteasyReactiveClientRequestContext.java +++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/spi/ResteasyReactiveClientRequestContext.java @@ -1,10 +1,11 @@ package org.jboss.resteasy.reactive.client.spi; -import io.smallrye.stork.api.ServiceInstance; -import io.vertx.core.Context; import javax.ws.rs.client.ClientRequestContext; import javax.ws.rs.core.GenericType; +import io.smallrye.stork.api.ServiceInstance; +import io.vertx.core.Context; + public interface ResteasyReactiveClientRequestContext extends ClientRequestContext { /** diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/spi/ResteasyReactiveClientRequestFilter.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/spi/ResteasyReactiveClientRequestFilter.java index 8e0bd1e801855..684f27c144285 100644 --- a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/spi/ResteasyReactiveClientRequestFilter.java +++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/spi/ResteasyReactiveClientRequestFilter.java @@ -1,6 +1,7 @@ package org.jboss.resteasy.reactive.client.spi; import java.io.IOException; + import javax.ws.rs.client.ClientRequestContext; import javax.ws.rs.client.ClientRequestFilter; diff --git a/independent-projects/resteasy-reactive/client/runtime/src/test/java/org/jboss/resteasy/reactive/client/impl/HandlerChainTest.java b/independent-projects/resteasy-reactive/client/runtime/src/test/java/org/jboss/resteasy/reactive/client/impl/HandlerChainTest.java index 6e82151cce9b8..529ad6ce5078d 100644 --- a/independent-projects/resteasy-reactive/client/runtime/src/test/java/org/jboss/resteasy/reactive/client/impl/HandlerChainTest.java +++ b/independent-projects/resteasy-reactive/client/runtime/src/test/java/org/jboss/resteasy/reactive/client/impl/HandlerChainTest.java @@ -4,9 +4,11 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.Collections; + import javax.ws.rs.RuntimeType; import javax.ws.rs.client.ClientRequestFilter; import javax.ws.rs.client.ClientResponseFilter; + import org.jboss.resteasy.reactive.client.api.LoggingScope; import org.jboss.resteasy.reactive.client.logging.DefaultClientLogger; import org.jboss.resteasy.reactive.client.spi.ClientRestHandler; diff --git a/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/AdditionalReaderWriter.java b/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/AdditionalReaderWriter.java index 762bad5dbfafa..99e95734367b9 100644 --- a/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/AdditionalReaderWriter.java +++ b/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/AdditionalReaderWriter.java @@ -1,6 +1,7 @@ package org.jboss.resteasy.reactive.common.processor; import java.util.Objects; + import javax.ws.rs.RuntimeType; public interface AdditionalReaderWriter { diff --git a/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/AdditionalReaderWriterCommon.java b/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/AdditionalReaderWriterCommon.java index 2132e8ec0ba47..251d019e22986 100644 --- a/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/AdditionalReaderWriterCommon.java +++ b/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/AdditionalReaderWriterCommon.java @@ -2,6 +2,7 @@ import java.util.ArrayList; import java.util.List; + import javax.ws.rs.RuntimeType; @SuppressWarnings({ "rawtypes" }) diff --git a/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/AsmUtil.java b/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/AsmUtil.java index cc3bc29b06939..d1f8e1c85a514 100644 --- a/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/AsmUtil.java +++ b/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/AsmUtil.java @@ -3,6 +3,7 @@ import java.lang.reflect.Method; import java.util.List; import java.util.function.Function; + import org.jboss.jandex.ArrayType; import org.jboss.jandex.ClassType; import org.jboss.jandex.MethodInfo; diff --git a/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/CalculatingIndexView.java b/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/CalculatingIndexView.java index 4fc548b128ebe..0eae18dd39388 100644 --- a/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/CalculatingIndexView.java +++ b/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/CalculatingIndexView.java @@ -15,6 +15,7 @@ import java.util.Queue; import java.util.Set; import java.util.stream.Collectors; + import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.ClassInfo; import org.jboss.jandex.DotName; diff --git a/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/DefaultProducesHandler.java b/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/DefaultProducesHandler.java index 41398e621554b..701260d3ae8f7 100644 --- a/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/DefaultProducesHandler.java +++ b/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/DefaultProducesHandler.java @@ -3,7 +3,9 @@ import java.util.Collections; import java.util.List; import java.util.Objects; + import javax.ws.rs.core.MediaType; + import org.jboss.jandex.DotName; import org.jboss.jandex.IndexView; import org.jboss.jandex.Type; 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 7d24c2046a693..072551ecfebc7 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 @@ -93,10 +93,12 @@ import java.util.Set; import java.util.function.Consumer; import java.util.function.Function; + import javax.enterprise.inject.spi.DeploymentException; import javax.ws.rs.container.AsyncResponse; import javax.ws.rs.core.MediaType; import javax.ws.rs.sse.SseEventSink; + import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.AnnotationTarget; import org.jboss.jandex.AnnotationValue; diff --git a/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/IndexedParameter.java b/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/IndexedParameter.java index 18d98c36bb535..7145fdb223c62 100644 --- a/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/IndexedParameter.java +++ b/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/IndexedParameter.java @@ -2,6 +2,7 @@ import java.util.Map; import java.util.Set; + import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.ClassInfo; import org.jboss.jandex.DotName; 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 62620bb36f6c1..fa40292c38698 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 @@ -15,6 +15,7 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.function.Consumer; import java.util.stream.Stream; + import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.ArrayType; import org.jboss.jandex.ClassInfo; diff --git a/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/NameBindingUtil.java b/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/NameBindingUtil.java index 95c29bd32018f..0b860c23b4cd2 100644 --- a/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/NameBindingUtil.java +++ b/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/NameBindingUtil.java @@ -10,6 +10,7 @@ import java.util.HashSet; import java.util.List; import java.util.Set; + import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.ClassInfo; import org.jboss.jandex.DotName; diff --git a/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/ResteasyReactiveDotNames.java b/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/ResteasyReactiveDotNames.java index a126eff7fa721..4b93c0722f5c9 100644 --- a/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/ResteasyReactiveDotNames.java +++ b/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/ResteasyReactiveDotNames.java @@ -1,10 +1,5 @@ package org.jboss.resteasy.reactive.common.processor; -import io.smallrye.common.annotation.Blocking; -import io.smallrye.common.annotation.NonBlocking; -import io.smallrye.common.annotation.RunOnVirtualThread; -import io.smallrye.mutiny.Multi; -import io.smallrye.mutiny.Uni; import java.io.InputStream; import java.io.OutputStream; import java.math.BigDecimal; @@ -26,6 +21,7 @@ import java.util.SortedSet; import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionStage; + import javax.annotation.Priority; import javax.enterprise.context.ApplicationScoped; import javax.enterprise.context.RequestScoped; @@ -80,6 +76,7 @@ import javax.ws.rs.ext.WriterInterceptor; import javax.ws.rs.sse.Sse; import javax.ws.rs.sse.SseEventSink; + import org.jboss.jandex.DotName; import org.jboss.resteasy.reactive.DummyElementType; import org.jboss.resteasy.reactive.MultipartForm; @@ -96,6 +93,12 @@ import org.jboss.resteasy.reactive.RestStreamElementType; import org.reactivestreams.Publisher; +import io.smallrye.common.annotation.Blocking; +import io.smallrye.common.annotation.NonBlocking; +import io.smallrye.common.annotation.RunOnVirtualThread; +import io.smallrye.mutiny.Multi; +import io.smallrye.mutiny.Uni; + public final class ResteasyReactiveDotNames { // injectable @Context types diff --git a/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/TypeArgMapper.java b/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/TypeArgMapper.java index 65c4f6a89f810..bba808ade6275 100644 --- a/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/TypeArgMapper.java +++ b/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/TypeArgMapper.java @@ -2,6 +2,7 @@ import java.util.List; import java.util.function.Function; + import org.jboss.jandex.ClassInfo; import org.jboss.jandex.IndexView; import org.jboss.jandex.Type; diff --git a/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/scanning/ApplicationScanningResult.java b/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/scanning/ApplicationScanningResult.java index f01abb8793525..ad8efda09f9af 100644 --- a/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/scanning/ApplicationScanningResult.java +++ b/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/scanning/ApplicationScanningResult.java @@ -1,7 +1,9 @@ package org.jboss.resteasy.reactive.common.processor.scanning; import java.util.Set; + import javax.ws.rs.core.Application; + import org.jboss.jandex.ClassInfo; import org.jboss.resteasy.reactive.common.processor.BlockingDefault; import org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames; diff --git a/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/scanning/ResourceScanningResult.java b/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/scanning/ResourceScanningResult.java index 1ee97904e8c38..1f6537fd056ef 100644 --- a/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/scanning/ResourceScanningResult.java +++ b/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/scanning/ResourceScanningResult.java @@ -3,6 +3,7 @@ import java.util.List; import java.util.Map; import java.util.Set; + import org.jboss.jandex.ClassInfo; import org.jboss.jandex.DotName; import org.jboss.jandex.IndexView; diff --git a/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/scanning/ResteasyReactiveInterceptorScanner.java b/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/scanning/ResteasyReactiveInterceptorScanner.java index cf2f5043637da..69247c0221324 100644 --- a/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/scanning/ResteasyReactiveInterceptorScanner.java +++ b/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/scanning/ResteasyReactiveInterceptorScanner.java @@ -5,6 +5,7 @@ import java.util.HashSet; import java.util.Set; import java.util.function.Function; + import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.ClassInfo; import org.jboss.jandex.IndexView; diff --git a/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/scanning/ResteasyReactiveScanner.java b/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/scanning/ResteasyReactiveScanner.java index 8423070830266..834d2092b84ba 100644 --- a/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/scanning/ResteasyReactiveScanner.java +++ b/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/scanning/ResteasyReactiveScanner.java @@ -23,10 +23,12 @@ import java.util.Map; import java.util.Set; import java.util.stream.Collectors; + import javax.enterprise.inject.spi.DeploymentException; import javax.ws.rs.Priorities; import javax.ws.rs.RuntimeType; import javax.ws.rs.core.Application; + import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.AnnotationTarget; import org.jboss.jandex.ClassInfo; diff --git a/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/scanning/ScannedSerializer.java b/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/scanning/ScannedSerializer.java index d607e21efb7b7..bc7f752edea1e 100644 --- a/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/scanning/ScannedSerializer.java +++ b/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/scanning/ScannedSerializer.java @@ -1,6 +1,7 @@ package org.jboss.resteasy.reactive.common.processor.scanning; import java.util.List; + import javax.ws.rs.Priorities; import javax.ws.rs.RuntimeType; diff --git a/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/transformation/AbstractAnnotationsTransformation.java b/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/transformation/AbstractAnnotationsTransformation.java index 6583bca0fce7b..35c86b2451cbd 100644 --- a/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/transformation/AbstractAnnotationsTransformation.java +++ b/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/transformation/AbstractAnnotationsTransformation.java @@ -5,6 +5,7 @@ import java.util.Collections; import java.util.function.Consumer; import java.util.function.Predicate; + import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.AnnotationTarget; import org.jboss.jandex.AnnotationValue; diff --git a/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/transformation/AnnotationStore.java b/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/transformation/AnnotationStore.java index 12c075bffc67b..6dfe16c923b85 100644 --- a/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/transformation/AnnotationStore.java +++ b/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/transformation/AnnotationStore.java @@ -8,6 +8,7 @@ import java.util.Objects; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; + import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.AnnotationTarget; import org.jboss.jandex.AnnotationTarget.Kind; diff --git a/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/transformation/Annotations.java b/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/transformation/Annotations.java index ec783d6ea5c5d..ecda964f1c85a 100644 --- a/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/transformation/Annotations.java +++ b/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/transformation/Annotations.java @@ -5,6 +5,7 @@ import java.util.HashSet; import java.util.Set; import java.util.function.Function; + import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.AnnotationTarget; import org.jboss.jandex.AnnotationTarget.Kind; diff --git a/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/transformation/AnnotationsTransformation.java b/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/transformation/AnnotationsTransformation.java index b426d547a7f2b..84c1ced7db4b4 100644 --- a/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/transformation/AnnotationsTransformation.java +++ b/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/transformation/AnnotationsTransformation.java @@ -3,6 +3,7 @@ import java.lang.annotation.Annotation; import java.util.Collection; import java.util.function.Predicate; + import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.AnnotationValue; import org.jboss.jandex.DotName; diff --git a/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/transformation/AnnotationsTransformationContext.java b/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/transformation/AnnotationsTransformationContext.java index cc934e5ac4dfc..9b1754893e9d2 100644 --- a/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/transformation/AnnotationsTransformationContext.java +++ b/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/transformation/AnnotationsTransformationContext.java @@ -1,6 +1,7 @@ package org.jboss.resteasy.reactive.common.processor.transformation; import java.util.Collection; + import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.AnnotationTarget; diff --git a/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/transformation/AnnotationsTransformer.java b/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/transformation/AnnotationsTransformer.java index 3710838c6ac48..922467543fc84 100644 --- a/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/transformation/AnnotationsTransformer.java +++ b/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/transformation/AnnotationsTransformer.java @@ -8,6 +8,7 @@ import java.util.function.Consumer; import java.util.function.Predicate; import java.util.stream.Collectors; + import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.AnnotationTarget; import org.jboss.jandex.AnnotationTarget.Kind; diff --git a/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/transformation/Transformation.java b/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/transformation/Transformation.java index 3da074d05b686..d0536f4358706 100644 --- a/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/transformation/Transformation.java +++ b/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/transformation/Transformation.java @@ -2,6 +2,7 @@ import java.util.Collection; import java.util.function.Consumer; + import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.AnnotationTarget; diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/ResponseHeader.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/ResponseHeader.java index 86be101fa0690..ab22ae902963a 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/ResponseHeader.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/ResponseHeader.java @@ -5,6 +5,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; + import javax.ws.rs.core.Response; /** diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/ResponseStatus.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/ResponseStatus.java index 81f35b3285c30..78e25f00d3c56 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/ResponseStatus.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/ResponseStatus.java @@ -4,6 +4,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; + import javax.ws.rs.core.Response; /** diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/RestResponse.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/RestResponse.java index f125ea979ccf3..b1412b20a4e29 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/RestResponse.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/RestResponse.java @@ -8,6 +8,7 @@ import java.util.Locale; import java.util.Map; import java.util.Set; + import javax.ws.rs.ProcessingException; import javax.ws.rs.core.CacheControl; import javax.ws.rs.core.EntityTag; diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/core/AbstractResteasyReactiveContext.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/core/AbstractResteasyReactiveContext.java index 19f98396b6824..036336a490382 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/core/AbstractResteasyReactiveContext.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/core/AbstractResteasyReactiveContext.java @@ -8,8 +8,10 @@ import java.util.List; import java.util.Map; import java.util.concurrent.Executor; + import javax.ws.rs.container.CompletionCallback; import javax.ws.rs.container.ConnectionCallback; + import org.jboss.logging.Logger; import org.jboss.resteasy.reactive.common.PreserveTargetException; import org.jboss.resteasy.reactive.spi.RestHandler; diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/core/GenericTypeMapping.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/core/GenericTypeMapping.java index 819f9385bc489..957d9f1db49e8 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/core/GenericTypeMapping.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/core/GenericTypeMapping.java @@ -2,6 +2,7 @@ import java.util.HashMap; import java.util.Map; + import javax.ws.rs.client.InvocationCallback; public class GenericTypeMapping { diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/core/LazyUnmanagedBeanFactory.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/core/LazyUnmanagedBeanFactory.java index 1f46c570b8fd4..fe4a949d92be4 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/core/LazyUnmanagedBeanFactory.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/core/LazyUnmanagedBeanFactory.java @@ -1,6 +1,7 @@ package org.jboss.resteasy.reactive.common.core; import java.util.function.Supplier; + import org.jboss.resteasy.reactive.spi.BeanFactory; public class LazyUnmanagedBeanFactory implements BeanFactory { diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/core/ResponseBuilderFactory.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/core/ResponseBuilderFactory.java index ed673e45e0160..b6578c524df0a 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/core/ResponseBuilderFactory.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/core/ResponseBuilderFactory.java @@ -1,6 +1,7 @@ package org.jboss.resteasy.reactive.common.core; import javax.ws.rs.core.Response; + import org.jboss.resteasy.reactive.RestResponse; public interface ResponseBuilderFactory { diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/core/Serialisers.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/core/Serialisers.java index e543e7cf976cb..3f0b755be1ab0 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/core/Serialisers.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/core/Serialisers.java @@ -11,6 +11,7 @@ import java.util.List; import java.util.Map; import java.util.Set; + import javax.ws.rs.RuntimeType; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.MultivaluedMap; @@ -19,6 +20,7 @@ import javax.ws.rs.ext.MessageBodyWriter; import javax.ws.rs.ext.ReaderInterceptor; import javax.ws.rs.ext.WriterInterceptor; + import org.jboss.resteasy.reactive.common.jaxrs.ConfigurationImpl; import org.jboss.resteasy.reactive.common.model.ResourceReader; import org.jboss.resteasy.reactive.common.model.ResourceWriter; diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/core/SingletonBeanFactory.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/core/SingletonBeanFactory.java index 1a4b5273015f8..40cc826c41196 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/core/SingletonBeanFactory.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/core/SingletonBeanFactory.java @@ -2,6 +2,7 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; + import org.jboss.resteasy.reactive.spi.BeanFactory; public class SingletonBeanFactory implements BeanFactory { diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/headers/CacheControlDelegate.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/headers/CacheControlDelegate.java index 10e436c1c63d4..904a8010b2a48 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/headers/CacheControlDelegate.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/headers/CacheControlDelegate.java @@ -1,8 +1,10 @@ package org.jboss.resteasy.reactive.common.headers; import java.util.List; + import javax.ws.rs.core.CacheControl; import javax.ws.rs.ext.RuntimeDelegate; + import org.jboss.resteasy.reactive.common.util.ExtendedCacheControl; /** diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/headers/CookieHeaderDelegate.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/headers/CookieHeaderDelegate.java index f4f70248f14e4..eed42b0f1658b 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/headers/CookieHeaderDelegate.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/headers/CookieHeaderDelegate.java @@ -2,6 +2,7 @@ import javax.ws.rs.core.Cookie; import javax.ws.rs.ext.RuntimeDelegate; + import org.jboss.resteasy.reactive.common.util.CookieParser; /** diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/headers/DateDelegate.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/headers/DateDelegate.java index fda5a162aeae3..ff0f26ff762df 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/headers/DateDelegate.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/headers/DateDelegate.java @@ -1,7 +1,9 @@ package org.jboss.resteasy.reactive.common.headers; import java.util.Date; + import javax.ws.rs.ext.RuntimeDelegate; + import org.jboss.resteasy.reactive.common.util.DateUtil; /** diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/headers/HeaderUtil.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/headers/HeaderUtil.java index 5a62bddfb6c3b..7d07da8ecaff8 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/headers/HeaderUtil.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/headers/HeaderUtil.java @@ -13,6 +13,7 @@ import java.util.Map; import java.util.Set; import java.util.StringTokenizer; + import javax.ws.rs.core.Cookie; import javax.ws.rs.core.EntityTag; import javax.ws.rs.core.HttpHeaders; @@ -20,6 +21,7 @@ import javax.ws.rs.core.MultivaluedMap; import javax.ws.rs.core.NewCookie; import javax.ws.rs.ext.RuntimeDelegate; + import org.jboss.resteasy.reactive.common.util.CookieParser; import org.jboss.resteasy.reactive.common.util.DateUtil; import org.jboss.resteasy.reactive.common.util.MediaTypeHelper; diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/headers/LinkDelegate.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/headers/LinkDelegate.java index 7e450b3fbc64b..dc33bf02f41a0 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/headers/LinkDelegate.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/headers/LinkDelegate.java @@ -2,9 +2,11 @@ import java.util.List; import java.util.Map; + import javax.ws.rs.core.Link; import javax.ws.rs.core.MultivaluedMap; import javax.ws.rs.ext.RuntimeDelegate; + import org.jboss.resteasy.reactive.common.jaxrs.LinkBuilderImpl; import org.jboss.resteasy.reactive.common.util.QuarkusMultivaluedHashMap; diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/headers/LinkHeaders.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/headers/LinkHeaders.java index d9d7785c49720..901076b74aea8 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/headers/LinkHeaders.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/headers/LinkHeaders.java @@ -4,6 +4,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; + import javax.ws.rs.core.Link; import javax.ws.rs.core.MultivaluedMap; diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/headers/LocaleDelegate.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/headers/LocaleDelegate.java index e3a51c33aa72a..63184f7bc908a 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/headers/LocaleDelegate.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/headers/LocaleDelegate.java @@ -1,7 +1,9 @@ package org.jboss.resteasy.reactive.common.headers; import java.util.Locale; + import javax.ws.rs.ext.RuntimeDelegate; + import org.jboss.resteasy.reactive.common.util.LocaleHelper; /** diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/headers/MediaTypeHeaderDelegate.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/headers/MediaTypeHeaderDelegate.java index cbe8b2fb02cce..0441048397da8 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/headers/MediaTypeHeaderDelegate.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/headers/MediaTypeHeaderDelegate.java @@ -3,8 +3,10 @@ import java.util.HashMap; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; + import javax.ws.rs.core.MediaType; import javax.ws.rs.ext.RuntimeDelegate; + import org.jboss.resteasy.reactive.common.util.HeaderParameterParser; /** diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/headers/NewCookieHeaderDelegate.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/headers/NewCookieHeaderDelegate.java index 5d55aa238d561..67eb1a4c8c0c8 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/headers/NewCookieHeaderDelegate.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/headers/NewCookieHeaderDelegate.java @@ -5,8 +5,10 @@ import java.util.Date; import java.util.Locale; import java.util.Map; + import javax.ws.rs.core.NewCookie; import javax.ws.rs.ext.RuntimeDelegate; + import org.jboss.resteasy.reactive.common.util.DateUtil; import org.jboss.resteasy.reactive.common.util.OrderedParameterParser; diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/headers/ObjectToStringDelegate.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/headers/ObjectToStringDelegate.java index 274b0fefd048f..d9cddc7dea2ae 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/headers/ObjectToStringDelegate.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/headers/ObjectToStringDelegate.java @@ -1,6 +1,7 @@ package org.jboss.resteasy.reactive.common.headers; import java.util.Objects; + import javax.ws.rs.ext.RuntimeDelegate; public class ObjectToStringDelegate implements RuntimeDelegate.HeaderDelegate { diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/jaxrs/AbstractResponseBuilder.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/jaxrs/AbstractResponseBuilder.java index bd21e3780b5a9..591867ed4b82f 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/jaxrs/AbstractResponseBuilder.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/jaxrs/AbstractResponseBuilder.java @@ -11,6 +11,7 @@ import java.util.Map; import java.util.Set; import java.util.TimeZone; + import javax.ws.rs.core.CacheControl; import javax.ws.rs.core.EntityTag; import javax.ws.rs.core.HttpHeaders; @@ -20,6 +21,7 @@ import javax.ws.rs.core.NewCookie; import javax.ws.rs.core.Response; import javax.ws.rs.core.Variant; + import org.jboss.resteasy.reactive.common.headers.HeaderUtil; import org.jboss.resteasy.reactive.common.util.CaseInsensitiveMap; import org.jboss.resteasy.reactive.common.util.MultivaluedTreeMap; diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/jaxrs/AbstractRestResponseBuilder.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/jaxrs/AbstractRestResponseBuilder.java index df452fb053219..62bf5678b37e1 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/jaxrs/AbstractRestResponseBuilder.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/jaxrs/AbstractRestResponseBuilder.java @@ -12,6 +12,7 @@ import java.util.Map; import java.util.Set; import java.util.TimeZone; + import javax.ws.rs.core.CacheControl; import javax.ws.rs.core.EntityTag; import javax.ws.rs.core.HttpHeaders; @@ -20,6 +21,7 @@ import javax.ws.rs.core.MultivaluedMap; import javax.ws.rs.core.NewCookie; import javax.ws.rs.core.Variant; + import org.jboss.resteasy.reactive.RestResponse; import org.jboss.resteasy.reactive.RestResponse.ResponseBuilder; import org.jboss.resteasy.reactive.common.headers.HeaderUtil; diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/jaxrs/ConfigurationImpl.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/jaxrs/ConfigurationImpl.java index e9e897bf57966..d3887b548a248 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/jaxrs/ConfigurationImpl.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/jaxrs/ConfigurationImpl.java @@ -10,6 +10,7 @@ import java.util.List; import java.util.Map; import java.util.Set; + import javax.annotation.Priority; import javax.ws.rs.ConstrainedTo; import javax.ws.rs.Consumes; @@ -29,6 +30,7 @@ import javax.ws.rs.ext.MessageBodyWriter; import javax.ws.rs.ext.ReaderInterceptor; import javax.ws.rs.ext.WriterInterceptor; + import org.jboss.resteasy.reactive.common.core.UnmanagedBeanFactory; import org.jboss.resteasy.reactive.common.model.ResourceReader; import org.jboss.resteasy.reactive.common.model.ResourceWriter; diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/jaxrs/LinkBuilderImpl.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/jaxrs/LinkBuilderImpl.java index 4947cc46f884b..1c2ed3ed16851 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/jaxrs/LinkBuilderImpl.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/jaxrs/LinkBuilderImpl.java @@ -3,6 +3,7 @@ import java.net.URI; import java.util.HashMap; import java.util.Map; + import javax.ws.rs.core.Link; import javax.ws.rs.core.UriBuilder; import javax.ws.rs.core.UriBuilderException; diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/jaxrs/LinkImpl.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/jaxrs/LinkImpl.java index b62edfd47187d..6c0fb23e6b593 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/jaxrs/LinkImpl.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/jaxrs/LinkImpl.java @@ -6,6 +6,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; + import javax.ws.rs.core.Link; import javax.ws.rs.core.UriBuilder; import javax.ws.rs.ext.RuntimeDelegate; diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/jaxrs/ResponseImpl.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/jaxrs/ResponseImpl.java index d63929be8b7ec..5d9adc0bfda10 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/jaxrs/ResponseImpl.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/jaxrs/ResponseImpl.java @@ -15,6 +15,7 @@ import java.util.Locale; import java.util.Map; import java.util.Set; + import javax.ws.rs.ProcessingException; import javax.ws.rs.core.EntityTag; import javax.ws.rs.core.GenericEntity; @@ -25,6 +26,7 @@ import javax.ws.rs.core.MultivaluedMap; import javax.ws.rs.core.NewCookie; import javax.ws.rs.core.Response; + import org.jboss.resteasy.reactive.common.headers.HeaderUtil; import org.jboss.resteasy.reactive.common.headers.LinkHeaders; import org.jboss.resteasy.reactive.common.util.CaseInsensitiveMap; diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/jaxrs/RestResponseImpl.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/jaxrs/RestResponseImpl.java index 9edff393c8574..c6c3ff28e9593 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/jaxrs/RestResponseImpl.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/jaxrs/RestResponseImpl.java @@ -15,6 +15,7 @@ import java.util.Locale; import java.util.Map; import java.util.Set; + import javax.ws.rs.ProcessingException; import javax.ws.rs.core.EntityTag; import javax.ws.rs.core.GenericEntity; @@ -25,6 +26,7 @@ import javax.ws.rs.core.MultivaluedMap; import javax.ws.rs.core.NewCookie; import javax.ws.rs.core.Response; + import org.jboss.resteasy.reactive.RestResponse; import org.jboss.resteasy.reactive.common.headers.HeaderUtil; import org.jboss.resteasy.reactive.common.headers.LinkHeaders; diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/jaxrs/RuntimeDelegateImpl.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/jaxrs/RuntimeDelegateImpl.java index 06501635c1579..7381900547fc5 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/jaxrs/RuntimeDelegateImpl.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/jaxrs/RuntimeDelegateImpl.java @@ -3,6 +3,7 @@ import java.util.Date; import java.util.Locale; import java.util.ServiceLoader; + import javax.ws.rs.core.Application; import javax.ws.rs.core.CacheControl; import javax.ws.rs.core.Cookie; @@ -14,6 +15,7 @@ import javax.ws.rs.core.UriBuilder; import javax.ws.rs.core.Variant; import javax.ws.rs.ext.RuntimeDelegate; + import org.jboss.resteasy.reactive.RestResponse; import org.jboss.resteasy.reactive.RestResponse.ResponseBuilder; import org.jboss.resteasy.reactive.common.core.ResponseBuilderFactory; diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/jaxrs/StatusTypeImpl.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/jaxrs/StatusTypeImpl.java index c2cf7dd646287..4364ff3a840cf 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/jaxrs/StatusTypeImpl.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/jaxrs/StatusTypeImpl.java @@ -1,6 +1,7 @@ package org.jboss.resteasy.reactive.common.jaxrs; import java.util.Objects; + import javax.ws.rs.core.Response; import javax.ws.rs.core.Response.Status.Family; import javax.ws.rs.core.Response.StatusType; diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/jaxrs/UriBuilderImpl.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/jaxrs/UriBuilderImpl.java index dff2c2d4eedb5..5a08cdc9a4672 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/jaxrs/UriBuilderImpl.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/jaxrs/UriBuilderImpl.java @@ -9,11 +9,13 @@ import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; + import javax.ws.rs.Path; import javax.ws.rs.core.MultivaluedMap; import javax.ws.rs.core.UriBuilder; import javax.ws.rs.core.UriBuilderException; import javax.ws.rs.ext.RuntimeDelegate; + import org.jboss.resteasy.reactive.common.util.Encode; import org.jboss.resteasy.reactive.common.util.PathHelper; import org.jboss.resteasy.reactive.common.util.QuarkusMultivaluedHashMap; diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/jaxrs/VariantListBuilderImpl.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/jaxrs/VariantListBuilderImpl.java index 9367864192052..523d1318719b0 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/jaxrs/VariantListBuilderImpl.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/jaxrs/VariantListBuilderImpl.java @@ -4,6 +4,7 @@ import java.util.Arrays; import java.util.List; import java.util.Locale; + import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Variant; diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/InterceptorContainer.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/InterceptorContainer.java index 64d2ac7e13025..b6d52e624ed96 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/InterceptorContainer.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/InterceptorContainer.java @@ -4,6 +4,7 @@ import java.util.Collections; import java.util.List; import java.util.function.Function; + import org.jboss.resteasy.reactive.spi.BeanFactory; public class InterceptorContainer { diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/PreMatchInterceptorContainer.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/PreMatchInterceptorContainer.java index caa059d0ae82d..79d53eea628d2 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/PreMatchInterceptorContainer.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/PreMatchInterceptorContainer.java @@ -4,6 +4,7 @@ import java.util.Collections; import java.util.List; import java.util.function.Function; + import org.jboss.resteasy.reactive.spi.BeanFactory; public class PreMatchInterceptorContainer extends InterceptorContainer { diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/ResourceClass.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/ResourceClass.java index 73fec493fa967..1a473a065e113 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/ResourceClass.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/ResourceClass.java @@ -8,7 +8,9 @@ import java.util.Map; import java.util.Set; import java.util.function.Supplier; + import javax.ws.rs.ext.ExceptionMapper; + import org.jboss.resteasy.reactive.common.core.LazyUnmanagedBeanFactory; import org.jboss.resteasy.reactive.common.util.URLUtils; import org.jboss.resteasy.reactive.spi.BeanFactory; diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/ResourceContextResolver.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/ResourceContextResolver.java index 1b57eb9fdc30d..5651b4d38dae0 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/ResourceContextResolver.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/ResourceContextResolver.java @@ -3,8 +3,10 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; + import javax.ws.rs.core.MediaType; import javax.ws.rs.ext.ContextResolver; + import org.jboss.resteasy.reactive.spi.BeanFactory; public class ResourceContextResolver { diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/ResourceDynamicFeature.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/ResourceDynamicFeature.java index e9dc109db3c0c..4d011392619f5 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/ResourceDynamicFeature.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/ResourceDynamicFeature.java @@ -1,6 +1,7 @@ package org.jboss.resteasy.reactive.common.model; import javax.ws.rs.container.DynamicFeature; + import org.jboss.resteasy.reactive.spi.BeanFactory; public class ResourceDynamicFeature { diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/ResourceExceptionMapper.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/ResourceExceptionMapper.java index d5a72e7429ac9..2d695d3c645ab 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/ResourceExceptionMapper.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/ResourceExceptionMapper.java @@ -2,6 +2,7 @@ import javax.ws.rs.Priorities; import javax.ws.rs.ext.ExceptionMapper; + import org.jboss.resteasy.reactive.spi.BeanFactory; public class ResourceExceptionMapper { diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/ResourceFeature.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/ResourceFeature.java index b0aa841825e4f..93c30f86187ce 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/ResourceFeature.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/ResourceFeature.java @@ -1,6 +1,7 @@ package org.jboss.resteasy.reactive.common.model; import javax.ws.rs.core.Feature; + import org.jboss.resteasy.reactive.spi.BeanFactory; public class ResourceFeature { diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/ResourceInterceptor.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/ResourceInterceptor.java index dbecf0386e7b1..bdaac4767062a 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/ResourceInterceptor.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/ResourceInterceptor.java @@ -2,7 +2,9 @@ import java.util.Collections; import java.util.Set; + import javax.ws.rs.Priorities; + import org.jboss.resteasy.reactive.spi.BeanFactory; public class ResourceInterceptor diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/ResourceInterceptors.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/ResourceInterceptors.java index 97e12ebc3e897..6d7d3ae2fbb1d 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/ResourceInterceptors.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/ResourceInterceptors.java @@ -1,10 +1,12 @@ package org.jboss.resteasy.reactive.common.model; import java.util.function.Function; + import javax.ws.rs.container.ContainerRequestFilter; import javax.ws.rs.container.ContainerResponseFilter; import javax.ws.rs.ext.ReaderInterceptor; import javax.ws.rs.ext.WriterInterceptor; + import org.jboss.resteasy.reactive.spi.BeanFactory; public class ResourceInterceptors { diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/ResourceMethod.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/ResourceMethod.java index 2936dd1aef2b7..5c53c010a61b4 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/ResourceMethod.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/ResourceMethod.java @@ -3,8 +3,10 @@ import java.util.Collections; import java.util.List; import java.util.Set; + import javax.ws.rs.Consumes; import javax.ws.rs.Produces; + import org.jboss.resteasy.reactive.RestSseElementType; import org.jboss.resteasy.reactive.RestStreamElementType; diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/ResourceParamConverterProvider.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/ResourceParamConverterProvider.java index 0237c67b2ce1b..075203646d35c 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/ResourceParamConverterProvider.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/ResourceParamConverterProvider.java @@ -2,6 +2,7 @@ import javax.ws.rs.Priorities; import javax.ws.rs.ext.ParamConverterProvider; + import org.jboss.resteasy.reactive.spi.BeanFactory; public class ResourceParamConverterProvider implements Comparable { diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/ResourceReader.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/ResourceReader.java index ca73e22378d91..aed58a6bbf319 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/ResourceReader.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/ResourceReader.java @@ -4,10 +4,12 @@ import java.util.Collections; import java.util.Comparator; import java.util.List; + import javax.ws.rs.Priorities; import javax.ws.rs.RuntimeType; import javax.ws.rs.core.MediaType; import javax.ws.rs.ext.MessageBodyReader; + import org.jboss.resteasy.reactive.common.util.MediaTypeHelper; import org.jboss.resteasy.reactive.spi.BeanFactory; diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/ResourceWriter.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/ResourceWriter.java index 381c363b60667..be8d9dd5a1e00 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/ResourceWriter.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/ResourceWriter.java @@ -5,10 +5,12 @@ import java.util.Collections; import java.util.Comparator; import java.util.List; + import javax.ws.rs.Priorities; import javax.ws.rs.RuntimeType; import javax.ws.rs.core.MediaType; import javax.ws.rs.ext.MessageBodyWriter; + import org.jboss.resteasy.reactive.common.util.MediaTypeHelper; import org.jboss.resteasy.reactive.common.util.ServerMediaType; import org.jboss.resteasy.reactive.spi.BeanFactory; diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/RestClientInterface.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/RestClientInterface.java index 0221faf3b5af6..cdbcb3e63c7c8 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/RestClientInterface.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/RestClientInterface.java @@ -4,6 +4,7 @@ import java.util.HashSet; import java.util.List; import java.util.Set; + import org.jboss.resteasy.reactive.common.util.URLUtils; public class RestClientInterface { diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/SettableResourceInterceptor.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/SettableResourceInterceptor.java index a3d7082317cf0..9ade424ae4702 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/SettableResourceInterceptor.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/SettableResourceInterceptor.java @@ -1,6 +1,7 @@ package org.jboss.resteasy.reactive.common.model; import java.util.Set; + import org.jboss.resteasy.reactive.spi.BeanFactory; public interface SettableResourceInterceptor { diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/AbstractJsonMessageBodyReader.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/AbstractJsonMessageBodyReader.java index 5048ee079e8fe..165817e5eff28 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/AbstractJsonMessageBodyReader.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/AbstractJsonMessageBodyReader.java @@ -2,6 +2,7 @@ import java.lang.annotation.Annotation; import java.lang.reflect.Type; + import javax.ws.rs.core.MediaType; import javax.ws.rs.ext.MessageBodyReader; diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/BooleanMessageBodyHandler.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/BooleanMessageBodyHandler.java index aee1e581bf9f1..ef6abaa701d69 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/BooleanMessageBodyHandler.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/BooleanMessageBodyHandler.java @@ -4,6 +4,7 @@ import java.io.InputStream; import java.lang.annotation.Annotation; import java.lang.reflect.Type; + import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.MultivaluedMap; diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/ByteArrayMessageBodyHandler.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/ByteArrayMessageBodyHandler.java index a1b9544dde41b..abb3a72d04745 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/ByteArrayMessageBodyHandler.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/ByteArrayMessageBodyHandler.java @@ -5,6 +5,7 @@ import java.io.OutputStream; import java.lang.annotation.Annotation; import java.lang.reflect.Type; + import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.MultivaluedMap; diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/CharArrayMessageBodyHandler.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/CharArrayMessageBodyHandler.java index 08034b8f57717..a745668295661 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/CharArrayMessageBodyHandler.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/CharArrayMessageBodyHandler.java @@ -6,6 +6,7 @@ import java.lang.annotation.Annotation; import java.lang.reflect.Type; import java.nio.charset.StandardCharsets; + import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.MultivaluedMap; diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/CharacterMessageBodyHandler.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/CharacterMessageBodyHandler.java index e5df390933f09..b645ded0b5b81 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/CharacterMessageBodyHandler.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/CharacterMessageBodyHandler.java @@ -4,6 +4,7 @@ import java.io.InputStream; import java.lang.annotation.Annotation; import java.lang.reflect.Type; + import javax.ws.rs.BadRequestException; import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.MediaType; diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/DefaultTextPlainBodyHandler.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/DefaultTextPlainBodyHandler.java index 520adb4c749da..a5dfea4312a8e 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/DefaultTextPlainBodyHandler.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/DefaultTextPlainBodyHandler.java @@ -4,11 +4,13 @@ import java.io.InputStream; import java.lang.annotation.Annotation; import java.lang.reflect.Type; + import javax.ws.rs.ProcessingException; import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.MultivaluedMap; import javax.ws.rs.ext.MessageBodyReader; + import org.jboss.resteasy.reactive.common.util.TypeConverter; /** diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/FileBodyHandler.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/FileBodyHandler.java index de2b80663a2f7..e8cc9f3fbcf04 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/FileBodyHandler.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/FileBodyHandler.java @@ -10,11 +10,13 @@ import java.io.OutputStream; import java.lang.annotation.Annotation; import java.lang.reflect.Type; + import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.MultivaluedMap; import javax.ws.rs.ext.MessageBodyReader; import javax.ws.rs.ext.MessageBodyWriter; + import org.jboss.resteasy.reactive.common.headers.HeaderUtil; public class FileBodyHandler implements MessageBodyReader, MessageBodyWriter { diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/FilePartBodyHandler.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/FilePartBodyHandler.java index 5e1439551943b..77bd8fe70ecbf 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/FilePartBodyHandler.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/FilePartBodyHandler.java @@ -6,10 +6,12 @@ import java.io.OutputStream; import java.lang.annotation.Annotation; import java.lang.reflect.Type; + import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.MultivaluedMap; import javax.ws.rs.ext.MessageBodyWriter; + import org.jboss.resteasy.reactive.FilePart; public class FilePartBodyHandler implements MessageBodyWriter { diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/FormUrlEncodedProvider.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/FormUrlEncodedProvider.java index 95f0b2aa84e1b..d2df81406562d 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/FormUrlEncodedProvider.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/FormUrlEncodedProvider.java @@ -9,12 +9,14 @@ import java.net.URLEncoder; import java.util.List; import java.util.Map; + import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.Form; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.MultivaluedMap; import javax.ws.rs.ext.MessageBodyReader; import javax.ws.rs.ext.MessageBodyWriter; + import org.jboss.resteasy.reactive.common.util.Encode; import org.jboss.resteasy.reactive.common.util.QuarkusMultivaluedHashMap; diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/InputStreamMessageBodyHandler.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/InputStreamMessageBodyHandler.java index 383464b513a18..fe1465847e923 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/InputStreamMessageBodyHandler.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/InputStreamMessageBodyHandler.java @@ -5,6 +5,7 @@ import java.io.OutputStream; import java.lang.annotation.Annotation; import java.lang.reflect.Type; + import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.MultivaluedMap; diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/MapAsFormUrlEncodedProvider.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/MapAsFormUrlEncodedProvider.java index 1b392f6c56f9f..2ca465a244bb1 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/MapAsFormUrlEncodedProvider.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/MapAsFormUrlEncodedProvider.java @@ -9,11 +9,13 @@ import java.net.URLEncoder; import java.util.List; import java.util.Map; + import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.MultivaluedMap; import javax.ws.rs.ext.MessageBodyReader; import javax.ws.rs.ext.MessageBodyWriter; + import org.jboss.resteasy.reactive.common.util.Encode; import org.jboss.resteasy.reactive.common.util.QuarkusMultivaluedHashMap; diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/MessageReaderUtil.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/MessageReaderUtil.java index 5c23090d69801..c2707999f0aa8 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/MessageReaderUtil.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/MessageReaderUtil.java @@ -3,6 +3,7 @@ import java.io.IOException; import java.io.InputStream; import java.nio.charset.StandardCharsets; + import javax.ws.rs.core.MediaType; public class MessageReaderUtil { diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/NumberMessageBodyHandler.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/NumberMessageBodyHandler.java index 12ff0055ea58f..e5ea969392294 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/NumberMessageBodyHandler.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/NumberMessageBodyHandler.java @@ -6,6 +6,7 @@ import java.lang.reflect.Type; import java.math.BigDecimal; import java.math.BigInteger; + import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.MultivaluedMap; diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/PathBodyHandler.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/PathBodyHandler.java index f1e66eed21abc..9e3153fe490f0 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/PathBodyHandler.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/PathBodyHandler.java @@ -5,6 +5,7 @@ import java.lang.annotation.Annotation; import java.lang.reflect.Type; import java.nio.file.Files; + import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.MultivaluedMap; diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/PathPartBodyHandler.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/PathPartBodyHandler.java index 484459a03dffb..0fc70f05f2626 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/PathPartBodyHandler.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/PathPartBodyHandler.java @@ -6,10 +6,12 @@ import java.lang.annotation.Annotation; import java.lang.reflect.Type; import java.nio.file.Files; + import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.MultivaluedMap; import javax.ws.rs.ext.MessageBodyWriter; + import org.jboss.resteasy.reactive.PathPart; public class PathPartBodyHandler implements MessageBodyWriter { diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/PrimitiveBodyHandler.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/PrimitiveBodyHandler.java index 2844e145617f9..c72228d0e4414 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/PrimitiveBodyHandler.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/PrimitiveBodyHandler.java @@ -5,6 +5,7 @@ import java.io.IOException; import java.io.InputStream; import java.nio.charset.StandardCharsets; + import javax.ws.rs.core.NoContentException; public abstract class PrimitiveBodyHandler { diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/ReaderBodyHandler.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/ReaderBodyHandler.java index 48ade5a1f7c5b..21077e042d7dc 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/ReaderBodyHandler.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/ReaderBodyHandler.java @@ -7,6 +7,7 @@ import java.io.Reader; import java.lang.annotation.Annotation; import java.lang.reflect.Type; + import javax.ws.rs.core.MediaType; import javax.ws.rs.core.MultivaluedMap; import javax.ws.rs.ext.MessageBodyReader; diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/StringMessageBodyHandler.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/StringMessageBodyHandler.java index 44455e38b904d..3b1f261ac9413 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/StringMessageBodyHandler.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/StringMessageBodyHandler.java @@ -6,6 +6,7 @@ import java.lang.annotation.Annotation; import java.lang.reflect.Type; import java.nio.charset.StandardCharsets; + import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.MultivaluedMap; diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/jsonp/JsonArrayHandler.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/jsonp/JsonArrayHandler.java index a9bd0af2d66ff..21b104506dab1 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/jsonp/JsonArrayHandler.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/jsonp/JsonArrayHandler.java @@ -5,6 +5,7 @@ import java.io.OutputStream; import java.lang.annotation.Annotation; import java.lang.reflect.Type; + import javax.json.JsonArray; import javax.json.JsonWriter; import javax.ws.rs.WebApplicationException; diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/jsonp/JsonObjectHandler.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/jsonp/JsonObjectHandler.java index fdcf8b2d0b287..8741492eeced6 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/jsonp/JsonObjectHandler.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/jsonp/JsonObjectHandler.java @@ -5,6 +5,7 @@ import java.io.OutputStream; import java.lang.annotation.Annotation; import java.lang.reflect.Type; + import javax.json.JsonObject; import javax.json.JsonWriter; import javax.ws.rs.WebApplicationException; diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/jsonp/JsonStructureHandler.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/jsonp/JsonStructureHandler.java index 3d84fd8028986..16b9b29735125 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/jsonp/JsonStructureHandler.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/jsonp/JsonStructureHandler.java @@ -5,6 +5,7 @@ import java.io.OutputStream; import java.lang.annotation.Annotation; import java.lang.reflect.Type; + import javax.json.JsonObject; import javax.json.JsonStructure; import javax.json.JsonWriter; diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/jsonp/JsonValueHandler.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/jsonp/JsonValueHandler.java index f4861375e00d3..42c0d670a2bd6 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/jsonp/JsonValueHandler.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/jsonp/JsonValueHandler.java @@ -5,6 +5,7 @@ import java.io.OutputStream; import java.lang.annotation.Annotation; import java.lang.reflect.Type; + import javax.json.JsonValue; import javax.json.JsonWriter; import javax.ws.rs.WebApplicationException; diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/jsonp/JsonpUtil.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/jsonp/JsonpUtil.java index 3134103713137..71df60d2e6440 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/jsonp/JsonpUtil.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/jsonp/JsonpUtil.java @@ -3,12 +3,14 @@ import java.io.InputStream; import java.io.OutputStream; import java.nio.charset.Charset; + import javax.json.Json; import javax.json.JsonReader; import javax.json.JsonReaderFactory; import javax.json.JsonWriter; import javax.json.JsonWriterFactory; import javax.ws.rs.core.MediaType; + import org.jboss.resteasy.reactive.common.providers.serialisers.MessageReaderUtil; public final class JsonpUtil { diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/reflection/ReflectionBeanFactoryCreator.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/reflection/ReflectionBeanFactoryCreator.java index 0382424a116f6..7332392d8fc6d 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/reflection/ReflectionBeanFactoryCreator.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/reflection/ReflectionBeanFactoryCreator.java @@ -1,6 +1,7 @@ package org.jboss.resteasy.reactive.common.reflection; import java.util.function.Function; + import org.jboss.resteasy.reactive.spi.BeanFactory; public class ReflectionBeanFactoryCreator implements Function> { diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/CookieParser.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/CookieParser.java index d44c70f82d50f..cea93637af53f 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/CookieParser.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/CookieParser.java @@ -2,6 +2,7 @@ import java.util.ArrayList; import java.util.List; + import javax.ws.rs.core.Cookie; public class CookieParser { diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/DeploymentUtils.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/DeploymentUtils.java index 46ef3fd183945..16ac21ebbe4d6 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/DeploymentUtils.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/DeploymentUtils.java @@ -3,6 +3,7 @@ import java.util.Collections; import java.util.HashMap; import java.util.Map; + import org.jboss.resteasy.reactive.common.core.Serialisers; import org.jboss.resteasy.reactive.common.model.ResourceReader; import org.jboss.resteasy.reactive.common.model.ResourceWriter; diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/Encode.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/Encode.java index 950cc0bf64e90..cb171a629f86d 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/Encode.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/Encode.java @@ -12,6 +12,7 @@ import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; + import javax.ws.rs.core.MultivaluedMap; /** diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/MediaTypeHelper.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/MediaTypeHelper.java index 6167efa7495ef..df5d50ab6f21d 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/MediaTypeHelper.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/MediaTypeHelper.java @@ -7,6 +7,7 @@ import java.util.List; import java.util.Map; import java.util.regex.Pattern; + import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/MultiCollectors.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/MultiCollectors.java index 7813299954946..8a1eb8aac2843 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/MultiCollectors.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/MultiCollectors.java @@ -1,8 +1,9 @@ package org.jboss.resteasy.reactive.common.util; +import java.util.stream.Collectors; + import io.smallrye.mutiny.Multi; import io.smallrye.mutiny.Uni; -import java.util.stream.Collectors; /** * Set of convenient collectors for dealing with {@link Multi} return types. diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/MultivaluedTreeMap.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/MultivaluedTreeMap.java index aef6650684b89..47cce256d5087 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/MultivaluedTreeMap.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/MultivaluedTreeMap.java @@ -9,6 +9,7 @@ import java.util.Set; import java.util.TreeMap; import java.util.function.BiConsumer; + import javax.ws.rs.core.MultivaluedMap; /** diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/PathSegmentImpl.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/PathSegmentImpl.java index 09e9856043bdc..d354ec8261946 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/PathSegmentImpl.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/PathSegmentImpl.java @@ -2,6 +2,7 @@ import java.util.ArrayList; import java.util.List; + import javax.ws.rs.core.MultivaluedMap; import javax.ws.rs.core.PathSegment; diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/QuarkusMultivaluedHashMap.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/QuarkusMultivaluedHashMap.java index 28ee93896903f..328b4ae2112c5 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/QuarkusMultivaluedHashMap.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/QuarkusMultivaluedHashMap.java @@ -3,6 +3,7 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; + import javax.ws.rs.core.MultivaluedHashMap; /** diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/QuarkusMultivaluedMap.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/QuarkusMultivaluedMap.java index 9495fe6a57a55..501b2914a0bce 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/QuarkusMultivaluedMap.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/QuarkusMultivaluedMap.java @@ -1,6 +1,7 @@ package org.jboss.resteasy.reactive.common.util; import java.util.List; + import javax.ws.rs.core.MultivaluedMap; /** diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/ServerMediaType.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/ServerMediaType.java index 97ba2d2f174be..226c05613a608 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/ServerMediaType.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/ServerMediaType.java @@ -7,6 +7,7 @@ import java.util.List; import java.util.Map; import java.util.Objects; + import javax.ws.rs.core.MediaType; /** diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/URLUtils.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/URLUtils.java index 853aec49f1055..a23cc99023ec5 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/URLUtils.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/URLUtils.java @@ -22,6 +22,7 @@ import java.nio.charset.Charset; import java.util.Set; import java.util.regex.Pattern; + import javax.ws.rs.core.MultivaluedMap; /** diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/UnmodifiableMultivaluedMap.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/UnmodifiableMultivaluedMap.java index e77c3fb66cd7a..a7b67dbbe998f 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/UnmodifiableMultivaluedMap.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/UnmodifiableMultivaluedMap.java @@ -6,6 +6,7 @@ import java.util.List; import java.util.Map; import java.util.Set; + import javax.ws.rs.core.MultivaluedMap; /** diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/WeightedLanguage.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/WeightedLanguage.java index 2ece300039122..279bdccb98ebf 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/WeightedLanguage.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/WeightedLanguage.java @@ -3,6 +3,7 @@ import java.util.HashMap; import java.util.Locale; import java.util.Map; + import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.Response; diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/types/Types.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/types/Types.java index 4747198d12f2b..c347a46697d44 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/types/Types.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/types/Types.java @@ -1,7 +1,5 @@ package org.jboss.resteasy.reactive.common.util.types; -import io.smallrye.mutiny.Multi; -import io.smallrye.mutiny.Uni; import java.lang.reflect.GenericArrayType; import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; @@ -10,8 +8,12 @@ import java.util.HashMap; import java.util.Map; import java.util.concurrent.CompletionStage; + import org.jboss.resteasy.reactive.RestResponse; +import io.smallrye.mutiny.Multi; +import io.smallrye.mutiny.Uni; + /** * Type conversions and generic type manipulations * diff --git a/independent-projects/resteasy-reactive/common/runtime/src/test/java/org/jboss/resteasy/reactive/common/jaxrs/StatusTypeImplTest.java b/independent-projects/resteasy-reactive/common/runtime/src/test/java/org/jboss/resteasy/reactive/common/jaxrs/StatusTypeImplTest.java index 6899510f35fc6..41bde08867470 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/test/java/org/jboss/resteasy/reactive/common/jaxrs/StatusTypeImplTest.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/test/java/org/jboss/resteasy/reactive/common/jaxrs/StatusTypeImplTest.java @@ -4,6 +4,7 @@ import static org.junit.jupiter.api.Assertions.assertNotEquals; import javax.ws.rs.core.Response; + import org.junit.jupiter.api.Test; public class StatusTypeImplTest { diff --git a/independent-projects/resteasy-reactive/pom.xml b/independent-projects/resteasy-reactive/pom.xml index 4646f48c9758e..0f7cbcc96c044 100644 --- a/independent-projects/resteasy-reactive/pom.xml +++ b/independent-projects/resteasy-reactive/pom.xml @@ -455,8 +455,10 @@ .cache/impsort-maven-plugin-${impsort-maven-plugin.version} - true + java.,javax.,jakarta.,org.,com. + * ${format.skip} + true @@ -641,6 +643,11 @@ + + .cache/impsort-maven-plugin-${impsort-maven-plugin.version} + java.,javax.,jakarta.,org.,com. + * + ${format.skip} true diff --git a/independent-projects/resteasy-reactive/server/jackson/src/main/java/org/jboss/resteasy/reactive/server/jackson/JacksonBasicMessageBodyReader.java b/independent-projects/resteasy-reactive/server/jackson/src/main/java/org/jboss/resteasy/reactive/server/jackson/JacksonBasicMessageBodyReader.java index 7d69829382754..f20abb80ac7e4 100644 --- a/independent-projects/resteasy-reactive/server/jackson/src/main/java/org/jboss/resteasy/reactive/server/jackson/JacksonBasicMessageBodyReader.java +++ b/independent-projects/resteasy-reactive/server/jackson/src/main/java/org/jboss/resteasy/reactive/server/jackson/JacksonBasicMessageBodyReader.java @@ -1,20 +1,23 @@ package org.jboss.resteasy.reactive.server.jackson; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.ObjectReader; -import com.fasterxml.jackson.databind.exc.MismatchedInputException; import java.io.IOException; import java.io.InputStream; import java.lang.annotation.Annotation; import java.lang.reflect.Type; + import javax.inject.Inject; import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.MultivaluedMap; import javax.ws.rs.core.Response; + import org.jboss.resteasy.reactive.common.providers.serialisers.AbstractJsonMessageBodyReader; import org.jboss.resteasy.reactive.common.util.EmptyInputStream; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.ObjectReader; +import com.fasterxml.jackson.databind.exc.MismatchedInputException; + public class JacksonBasicMessageBodyReader extends AbstractJsonMessageBodyReader { protected final ObjectReader defaultReader; diff --git a/independent-projects/resteasy-reactive/server/jackson/src/main/java/org/jboss/resteasy/reactive/server/jackson/JacksonMessageBodyWriterUtil.java b/independent-projects/resteasy-reactive/server/jackson/src/main/java/org/jboss/resteasy/reactive/server/jackson/JacksonMessageBodyWriterUtil.java index ee0591631288b..4b84d785a6c03 100644 --- a/independent-projects/resteasy-reactive/server/jackson/src/main/java/org/jboss/resteasy/reactive/server/jackson/JacksonMessageBodyWriterUtil.java +++ b/independent-projects/resteasy-reactive/server/jackson/src/main/java/org/jboss/resteasy/reactive/server/jackson/JacksonMessageBodyWriterUtil.java @@ -2,18 +2,21 @@ import static org.jboss.resteasy.reactive.common.providers.serialisers.JsonMessageBodyWriterUtil.setContentTypeIfNecessary; -import com.fasterxml.jackson.annotation.JsonView; -import com.fasterxml.jackson.core.JsonFactory; -import com.fasterxml.jackson.core.JsonGenerator; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.ObjectWriter; import java.io.IOException; import java.io.OutputStream; import java.lang.annotation.Annotation; import java.nio.charset.StandardCharsets; + import javax.ws.rs.core.MultivaluedMap; + import org.jboss.resteasy.reactive.server.StreamingOutputStream; +import com.fasterxml.jackson.annotation.JsonView; +import com.fasterxml.jackson.core.JsonFactory; +import com.fasterxml.jackson.core.JsonGenerator; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.ObjectWriter; + public final class JacksonMessageBodyWriterUtil { private JacksonMessageBodyWriterUtil() { diff --git a/independent-projects/resteasy-reactive/server/jsonb/src/main/java/org/jboss/resteasy/reactive/server/jsonb/JsonbMessageBodyReader.java b/independent-projects/resteasy-reactive/server/jsonb/src/main/java/org/jboss/resteasy/reactive/server/jsonb/JsonbMessageBodyReader.java index 985e8304be3b9..196fb2cd05b2b 100644 --- a/independent-projects/resteasy-reactive/server/jsonb/src/main/java/org/jboss/resteasy/reactive/server/jsonb/JsonbMessageBodyReader.java +++ b/independent-projects/resteasy-reactive/server/jsonb/src/main/java/org/jboss/resteasy/reactive/server/jsonb/JsonbMessageBodyReader.java @@ -4,12 +4,14 @@ import java.io.InputStream; import java.lang.annotation.Annotation; import java.lang.reflect.Type; + import javax.inject.Inject; import javax.json.bind.Jsonb; import javax.json.bind.JsonbException; import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.MultivaluedMap; + import org.jboss.resteasy.reactive.common.providers.serialisers.AbstractJsonMessageBodyReader; import org.jboss.resteasy.reactive.common.util.StreamUtil; import org.jboss.resteasy.reactive.server.spi.ResteasyReactiveResourceInfo; diff --git a/independent-projects/resteasy-reactive/server/jsonb/src/main/java/org/jboss/resteasy/reactive/server/jsonb/JsonbMessageBodyWriter.java b/independent-projects/resteasy-reactive/server/jsonb/src/main/java/org/jboss/resteasy/reactive/server/jsonb/JsonbMessageBodyWriter.java index 7a51eeab7b6cf..7c92d8ce15425 100644 --- a/independent-projects/resteasy-reactive/server/jsonb/src/main/java/org/jboss/resteasy/reactive/server/jsonb/JsonbMessageBodyWriter.java +++ b/independent-projects/resteasy-reactive/server/jsonb/src/main/java/org/jboss/resteasy/reactive/server/jsonb/JsonbMessageBodyWriter.java @@ -5,11 +5,13 @@ import java.lang.annotation.Annotation; import java.lang.reflect.Type; import java.nio.charset.StandardCharsets; + import javax.inject.Inject; import javax.json.bind.Jsonb; import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.MultivaluedMap; + import org.jboss.resteasy.reactive.common.providers.serialisers.JsonMessageBodyWriterUtil; import org.jboss.resteasy.reactive.server.StreamingOutputStream; import org.jboss.resteasy.reactive.server.spi.ServerMessageBodyWriter; diff --git a/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/EndpointInvokerFactory.java b/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/EndpointInvokerFactory.java index 538028e49251d..145f75e26be18 100644 --- a/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/EndpointInvokerFactory.java +++ b/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/EndpointInvokerFactory.java @@ -1,6 +1,7 @@ package org.jboss.resteasy.reactive.server.processor; import java.util.function.Supplier; + import org.jboss.jandex.ClassInfo; import org.jboss.jandex.MethodInfo; import org.jboss.resteasy.reactive.common.model.ResourceMethod; diff --git a/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/ReflectionEndpointInvokerFactory.java b/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/ReflectionEndpointInvokerFactory.java index 1b81de00c8ade..56be0d41bc0ba 100644 --- a/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/ReflectionEndpointInvokerFactory.java +++ b/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/ReflectionEndpointInvokerFactory.java @@ -4,6 +4,7 @@ import java.lang.reflect.Method; import java.util.List; import java.util.function.Supplier; + import org.jboss.jandex.ClassInfo; import org.jboss.jandex.MethodInfo; import org.jboss.jandex.PrimitiveType; diff --git a/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/ResteasyReactiveDeploymentManager.java b/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/ResteasyReactiveDeploymentManager.java index e493ec14bd182..bea36bfcf31fa 100644 --- a/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/ResteasyReactiveDeploymentManager.java +++ b/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/ResteasyReactiveDeploymentManager.java @@ -16,7 +16,9 @@ import java.util.function.BiFunction; import java.util.function.Function; import java.util.function.Supplier; + import javax.ws.rs.core.Application; + import org.jboss.jandex.ClassInfo; import org.jboss.jandex.DotName; import org.jboss.jandex.IndexView; diff --git a/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/ScannedApplication.java b/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/ScannedApplication.java index 7388d992c4c90..da06ca25501f9 100644 --- a/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/ScannedApplication.java +++ b/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/ScannedApplication.java @@ -1,6 +1,7 @@ package org.jboss.resteasy.reactive.server.processor; import java.util.List; + import org.jboss.resteasy.reactive.common.model.ResourceClass; import org.jboss.resteasy.reactive.common.model.ResourceInterceptors; import org.jboss.resteasy.reactive.common.processor.AdditionalReaders; diff --git a/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/ServerEndpointIndexer.java b/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/ServerEndpointIndexer.java index c0db121284283..b64b2b9ddab57 100644 --- a/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/ServerEndpointIndexer.java +++ b/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/ServerEndpointIndexer.java @@ -33,9 +33,11 @@ import java.util.Set; import java.util.function.Supplier; import java.util.regex.PatternSyntaxException; + import javax.enterprise.inject.spi.DeploymentException; import javax.ws.rs.core.MultivaluedMap; import javax.ws.rs.core.PathSegment; + import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.AnnotationTarget; import org.jboss.jandex.AnnotationValue; diff --git a/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/generation/AbstractFeatureScanner.java b/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/generation/AbstractFeatureScanner.java index dafe2b46731ed..42a81a55c2d4a 100644 --- a/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/generation/AbstractFeatureScanner.java +++ b/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/generation/AbstractFeatureScanner.java @@ -4,6 +4,7 @@ import java.util.List; import java.util.Map; import java.util.function.BiFunction; + import org.jboss.jandex.IndexView; import org.jboss.resteasy.reactive.server.processor.ScannedApplication; import org.jboss.resteasy.reactive.server.processor.scanning.FeatureScanner; diff --git a/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/generation/converters/GeneratedConverterIndexerExtension.java b/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/generation/converters/GeneratedConverterIndexerExtension.java index a2483c722e79d..f806979ed27de 100644 --- a/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/generation/converters/GeneratedConverterIndexerExtension.java +++ b/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/generation/converters/GeneratedConverterIndexerExtension.java @@ -2,14 +2,10 @@ import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.STRING; -import io.quarkus.gizmo.ClassCreator; -import io.quarkus.gizmo.ClassOutput; -import io.quarkus.gizmo.MethodCreator; -import io.quarkus.gizmo.MethodDescriptor; -import io.quarkus.gizmo.ResultHandle; import java.lang.reflect.Modifier; import java.util.Map; import java.util.function.Function; + import org.jboss.jandex.ClassInfo; import org.jboss.jandex.DotName; import org.jboss.jandex.IndexView; @@ -21,6 +17,12 @@ import org.jboss.resteasy.reactive.server.core.parameters.converters.RuntimeResolvedConverter; import org.jboss.resteasy.reactive.server.processor.ServerEndpointIndexer; +import io.quarkus.gizmo.ClassCreator; +import io.quarkus.gizmo.ClassOutput; +import io.quarkus.gizmo.MethodCreator; +import io.quarkus.gizmo.MethodDescriptor; +import io.quarkus.gizmo.ResultHandle; + public class GeneratedConverterIndexerExtension implements ServerEndpointIndexer.ConverterSupplierIndexerExtension { final Function classOutput; diff --git a/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/generation/exceptionmappers/ServerExceptionMapperGenerator.java b/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/generation/exceptionmappers/ServerExceptionMapperGenerator.java index 94eb05bbffd5e..c5ac16bb7d8c6 100644 --- a/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/generation/exceptionmappers/ServerExceptionMapperGenerator.java +++ b/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/generation/exceptionmappers/ServerExceptionMapperGenerator.java @@ -17,15 +17,6 @@ import static org.jboss.resteasy.reactive.server.processor.util.ResteasyReactiveServerDotNames.QUARKUS_REST_CONTAINER_REQUEST_CONTEXT; import static org.jboss.resteasy.reactive.server.processor.util.ResteasyReactiveServerDotNames.SIMPLIFIED_RESOURCE_INFO; -import io.quarkus.gizmo.AssignableResultHandle; -import io.quarkus.gizmo.BranchResult; -import io.quarkus.gizmo.ClassCreator; -import io.quarkus.gizmo.ClassOutput; -import io.quarkus.gizmo.FieldDescriptor; -import io.quarkus.gizmo.MethodCreator; -import io.quarkus.gizmo.MethodDescriptor; -import io.quarkus.gizmo.ResultHandle; -import io.smallrye.mutiny.Uni; import java.lang.reflect.Modifier; import java.util.Arrays; import java.util.HashMap; @@ -33,10 +24,12 @@ import java.util.Map; import java.util.Set; import java.util.function.BiFunction; + import javax.inject.Inject; import javax.inject.Singleton; import javax.ws.rs.container.ResourceInfo; import javax.ws.rs.core.Response; + import org.jboss.jandex.AnnotationValue; import org.jboss.jandex.ClassInfo; import org.jboss.jandex.DotName; @@ -56,6 +49,16 @@ import org.jboss.resteasy.reactive.server.spi.ResteasyReactiveResourceInfo; import org.jboss.resteasy.reactive.server.spi.ServerRequestContext; +import io.quarkus.gizmo.AssignableResultHandle; +import io.quarkus.gizmo.BranchResult; +import io.quarkus.gizmo.ClassCreator; +import io.quarkus.gizmo.ClassOutput; +import io.quarkus.gizmo.FieldDescriptor; +import io.quarkus.gizmo.MethodCreator; +import io.quarkus.gizmo.MethodDescriptor; +import io.quarkus.gizmo.ResultHandle; +import io.smallrye.mutiny.Uni; + public final class ServerExceptionMapperGenerator { private static final DotName THROWABLE = DotName.createSimple(Throwable.class.getName()); diff --git a/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/generation/exceptionmappers/ServerExceptionMappingFeature.java b/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/generation/exceptionmappers/ServerExceptionMappingFeature.java index d872b9734b220..ef2e8ce4c1ae3 100644 --- a/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/generation/exceptionmappers/ServerExceptionMappingFeature.java +++ b/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/generation/exceptionmappers/ServerExceptionMappingFeature.java @@ -4,6 +4,7 @@ import java.util.List; import java.util.Map; import java.util.Set; + import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.AnnotationTarget; import org.jboss.jandex.AnnotationValue; diff --git a/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/generation/filters/CustomFilterGenerator.java b/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/generation/filters/CustomFilterGenerator.java index c1d94888b187a..734804776609a 100644 --- a/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/generation/filters/CustomFilterGenerator.java +++ b/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/generation/filters/CustomFilterGenerator.java @@ -13,19 +13,11 @@ import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.URI_INFO; import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.VOID; -import io.quarkus.gizmo.AssignableResultHandle; -import io.quarkus.gizmo.BranchResult; -import io.quarkus.gizmo.ClassCreator; -import io.quarkus.gizmo.ClassOutput; -import io.quarkus.gizmo.FieldDescriptor; -import io.quarkus.gizmo.MethodCreator; -import io.quarkus.gizmo.MethodDescriptor; -import io.quarkus.gizmo.ResultHandle; -import io.smallrye.mutiny.Uni; import java.lang.reflect.Modifier; import java.util.List; import java.util.Optional; import java.util.Set; + import javax.enterprise.context.ApplicationScoped; import javax.enterprise.context.RequestScoped; import javax.inject.Inject; @@ -36,6 +28,7 @@ import javax.ws.rs.container.ContainerResponseFilter; import javax.ws.rs.container.ResourceInfo; import javax.ws.rs.core.Response; + import org.jboss.jandex.ClassInfo; import org.jboss.jandex.DotName; import org.jboss.jandex.FieldInfo; @@ -61,6 +54,16 @@ import org.jboss.resteasy.reactive.server.spi.ResteasyReactiveResourceInfo; import org.jboss.resteasy.reactive.server.spi.ServerRequestContext; +import io.quarkus.gizmo.AssignableResultHandle; +import io.quarkus.gizmo.BranchResult; +import io.quarkus.gizmo.ClassCreator; +import io.quarkus.gizmo.ClassOutput; +import io.quarkus.gizmo.FieldDescriptor; +import io.quarkus.gizmo.MethodCreator; +import io.quarkus.gizmo.MethodDescriptor; +import io.quarkus.gizmo.ResultHandle; +import io.smallrye.mutiny.Uni; + /** * Generates the actual implementation of a provider that allows user code using annotations like * {@link ServerRequestFilter} and {@link ServerResponseFilter} to work seamlessly diff --git a/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/generation/filters/FilterFeature.java b/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/generation/filters/FilterFeature.java index 82d0f0d70de5b..9ab190b5315eb 100644 --- a/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/generation/filters/FilterFeature.java +++ b/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/generation/filters/FilterFeature.java @@ -3,8 +3,10 @@ import java.util.ArrayList; import java.util.List; import java.util.Set; + import javax.ws.rs.container.ContainerRequestFilter; import javax.ws.rs.container.ContainerResponseFilter; + import org.jboss.jandex.DotName; import org.jboss.jandex.IndexView; import org.jboss.resteasy.reactive.common.model.ResourceInterceptor; diff --git a/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/generation/filters/FilterGeneration.java b/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/generation/filters/FilterGeneration.java index c5a4116334765..f4549970645e5 100644 --- a/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/generation/filters/FilterGeneration.java +++ b/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/generation/filters/FilterGeneration.java @@ -7,6 +7,7 @@ import java.util.HashSet; import java.util.List; import java.util.Set; + import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.AnnotationTarget; import org.jboss.jandex.AnnotationValue; diff --git a/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/generation/injection/FieldInjectionFeature.java b/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/generation/injection/FieldInjectionFeature.java index d86fabd9fddcf..80c7b21e89343 100644 --- a/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/generation/injection/FieldInjectionFeature.java +++ b/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/generation/injection/FieldInjectionFeature.java @@ -3,6 +3,7 @@ import java.lang.reflect.Method; import java.util.ArrayList; import java.util.List; + import org.jboss.jandex.IndexView; import org.jboss.resteasy.reactive.server.core.Deployment; import org.jboss.resteasy.reactive.server.processor.ServerEndpointIndexer; diff --git a/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/generation/injection/TransformedFieldInjectionIndexerExtension.java b/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/generation/injection/TransformedFieldInjectionIndexerExtension.java index ead4a2356dede..54cae9faad2ba 100644 --- a/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/generation/injection/TransformedFieldInjectionIndexerExtension.java +++ b/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/generation/injection/TransformedFieldInjectionIndexerExtension.java @@ -4,6 +4,7 @@ import java.util.function.BiConsumer; import java.util.function.BiFunction; import java.util.function.Consumer; + import org.jboss.jandex.FieldInfo; import org.jboss.resteasy.reactive.server.processor.ServerEndpointIndexer; import org.jboss.resteasy.reactive.server.processor.ServerIndexedParameter; diff --git a/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/generation/multipart/DotNames.java b/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/generation/multipart/DotNames.java index fa617919eaccf..d1fdb5c0ed9ba 100644 --- a/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/generation/multipart/DotNames.java +++ b/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/generation/multipart/DotNames.java @@ -4,6 +4,7 @@ import java.io.InputStream; import java.io.InputStreamReader; import java.nio.file.Path; + import org.jboss.jandex.DotName; import org.jboss.resteasy.reactive.multipart.FileUpload; diff --git a/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/generation/multipart/FormDataOutputMapperGenerator.java b/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/generation/multipart/FormDataOutputMapperGenerator.java index 0b0bc232023c8..7374f891a8fd4 100644 --- a/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/generation/multipart/FormDataOutputMapperGenerator.java +++ b/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/generation/multipart/FormDataOutputMapperGenerator.java @@ -3,17 +3,12 @@ import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.FORM_PARAM; import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.REST_FORM_PARAM; -import io.quarkus.gizmo.AssignableResultHandle; -import io.quarkus.gizmo.ClassCreator; -import io.quarkus.gizmo.ClassOutput; -import io.quarkus.gizmo.FieldDescriptor; -import io.quarkus.gizmo.MethodCreator; -import io.quarkus.gizmo.MethodDescriptor; -import io.quarkus.gizmo.ResultHandle; import java.lang.reflect.Modifier; import java.util.ArrayList; import java.util.List; + import javax.ws.rs.core.MediaType; + import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.AnnotationValue; import org.jboss.jandex.ClassInfo; @@ -29,6 +24,14 @@ import org.jboss.resteasy.reactive.server.core.multipart.PartItem; import org.jboss.resteasy.reactive.server.processor.util.JavaBeanUtil; +import io.quarkus.gizmo.AssignableResultHandle; +import io.quarkus.gizmo.ClassCreator; +import io.quarkus.gizmo.ClassOutput; +import io.quarkus.gizmo.FieldDescriptor; +import io.quarkus.gizmo.MethodCreator; +import io.quarkus.gizmo.MethodDescriptor; +import io.quarkus.gizmo.ResultHandle; + final class FormDataOutputMapperGenerator { private static final Logger LOGGER = Logger.getLogger(FormDataOutputMapperGenerator.class); diff --git a/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/generation/multipart/GeneratedHandlerMultipartReturnTypeIndexerExtension.java b/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/generation/multipart/GeneratedHandlerMultipartReturnTypeIndexerExtension.java index f073394077b8c..629d204176390 100644 --- a/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/generation/multipart/GeneratedHandlerMultipartReturnTypeIndexerExtension.java +++ b/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/generation/multipart/GeneratedHandlerMultipartReturnTypeIndexerExtension.java @@ -1,15 +1,18 @@ package org.jboss.resteasy.reactive.server.processor.generation.multipart; -import io.quarkus.gizmo.ClassOutput; import java.util.HashMap; import java.util.Map; + import javax.ws.rs.core.MediaType; + import org.jboss.jandex.ClassInfo; import org.jboss.jandex.IndexView; import org.jboss.resteasy.reactive.common.processor.AdditionalWriters; import org.jboss.resteasy.reactive.common.processor.EndpointIndexer; import org.jboss.resteasy.reactive.server.core.multipart.MultipartMessageBodyWriter; +import io.quarkus.gizmo.ClassOutput; + public class GeneratedHandlerMultipartReturnTypeIndexerExtension implements EndpointIndexer.MultipartReturnTypeIndexerExtension { private final Map multipartOutputGeneratedPopulators = new HashMap<>(); diff --git a/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/generation/multipart/GeneratedMultipartParamIndexerExtension.java b/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/generation/multipart/GeneratedMultipartParamIndexerExtension.java index caf5439c697f7..8c6accfa304c7 100644 --- a/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/generation/multipart/GeneratedMultipartParamIndexerExtension.java +++ b/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/generation/multipart/GeneratedMultipartParamIndexerExtension.java @@ -1,16 +1,18 @@ package org.jboss.resteasy.reactive.server.processor.generation.multipart; -import io.quarkus.gizmo.ClassOutput; import java.util.HashMap; import java.util.Map; import java.util.function.BiConsumer; import java.util.function.BiFunction; + import org.jboss.jandex.ClassInfo; import org.jboss.jandex.DotName; import org.jboss.jandex.IndexView; import org.jboss.resteasy.reactive.common.processor.EndpointIndexer; import org.objectweb.asm.ClassVisitor; +import io.quarkus.gizmo.ClassOutput; + public class GeneratedMultipartParamIndexerExtension implements EndpointIndexer.MultipartParameterIndexerExtension { private final Map multipartInputGeneratedPopulators = new HashMap<>(); final BiConsumer> transformations; diff --git a/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/generation/multipart/GeneratorUtils.java b/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/generation/multipart/GeneratorUtils.java index 57b6b2a882113..4444f2e7b5b96 100644 --- a/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/generation/multipart/GeneratorUtils.java +++ b/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/generation/multipart/GeneratorUtils.java @@ -2,12 +2,13 @@ import static io.quarkus.gizmo.MethodDescriptor.ofMethod; -import io.quarkus.gizmo.MethodCreator; -import io.quarkus.gizmo.ResultHandle; import org.jboss.jandex.DotName; import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext; import org.jboss.resteasy.reactive.server.mapping.RuntimeResource; +import io.quarkus.gizmo.MethodCreator; +import io.quarkus.gizmo.ResultHandle; + public final class GeneratorUtils { private GeneratorUtils() { diff --git a/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/generation/multipart/MultipartPopulatorGenerator.java b/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/generation/multipart/MultipartPopulatorGenerator.java index 68418ada79c43..59817cd67691a 100644 --- a/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/generation/multipart/MultipartPopulatorGenerator.java +++ b/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/generation/multipart/MultipartPopulatorGenerator.java @@ -3,15 +3,6 @@ import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.FORM_PARAM; import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.REST_FORM_PARAM; -import io.quarkus.gizmo.AssignableResultHandle; -import io.quarkus.gizmo.BranchResult; -import io.quarkus.gizmo.BytecodeCreator; -import io.quarkus.gizmo.ClassCreator; -import io.quarkus.gizmo.ClassOutput; -import io.quarkus.gizmo.FieldDescriptor; -import io.quarkus.gizmo.MethodCreator; -import io.quarkus.gizmo.MethodDescriptor; -import io.quarkus.gizmo.ResultHandle; import java.io.File; import java.io.InputStream; import java.lang.reflect.Modifier; @@ -20,7 +11,9 @@ import java.util.Collection; import java.util.Iterator; import java.util.List; + import javax.ws.rs.core.MediaType; + import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.AnnotationValue; import org.jboss.jandex.ClassInfo; @@ -43,6 +36,16 @@ import org.jboss.resteasy.reactive.server.processor.util.JavaBeanUtil; import org.jboss.resteasy.reactive.server.spi.ServerHttpRequest; +import io.quarkus.gizmo.AssignableResultHandle; +import io.quarkus.gizmo.BranchResult; +import io.quarkus.gizmo.BytecodeCreator; +import io.quarkus.gizmo.ClassCreator; +import io.quarkus.gizmo.ClassOutput; +import io.quarkus.gizmo.FieldDescriptor; +import io.quarkus.gizmo.MethodCreator; +import io.quarkus.gizmo.MethodDescriptor; +import io.quarkus.gizmo.ResultHandle; + public final class MultipartPopulatorGenerator { private static final Logger LOGGER = Logger.getLogger(MultipartPopulatorGenerator.class); diff --git a/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/generation/multipart/MultipartTransformer.java b/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/generation/multipart/MultipartTransformer.java index b765f342d069b..136a806f84e9c 100644 --- a/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/generation/multipart/MultipartTransformer.java +++ b/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/generation/multipart/MultipartTransformer.java @@ -1,7 +1,7 @@ package org.jboss.resteasy.reactive.server.processor.generation.multipart; -import io.quarkus.gizmo.Gizmo; import java.util.function.BiFunction; + import org.jboss.resteasy.reactive.server.injection.ResteasyReactiveInjectionContext; import org.jboss.resteasy.reactive.server.injection.ResteasyReactiveInjectionTarget; import org.objectweb.asm.ClassVisitor; @@ -9,6 +9,8 @@ import org.objectweb.asm.MethodVisitor; import org.objectweb.asm.Opcodes; +import io.quarkus.gizmo.Gizmo; + public class MultipartTransformer implements BiFunction { static final String POPULATE_METHOD_NAME = "populate"; diff --git a/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/reflection/ReflectionConverterIndexerExtension.java b/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/reflection/ReflectionConverterIndexerExtension.java index 0e80f754bd622..c9addac1a10a9 100644 --- a/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/reflection/ReflectionConverterIndexerExtension.java +++ b/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/reflection/ReflectionConverterIndexerExtension.java @@ -4,6 +4,7 @@ import java.lang.reflect.Modifier; import java.util.Map; + import org.jboss.jandex.ClassInfo; import org.jboss.jandex.DotName; import org.jboss.jandex.IndexView; diff --git a/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/scanning/AsyncReturnTypeScanner.java b/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/scanning/AsyncReturnTypeScanner.java index 132202bfa5146..493c22798e486 100644 --- a/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/scanning/AsyncReturnTypeScanner.java +++ b/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/scanning/AsyncReturnTypeScanner.java @@ -9,6 +9,7 @@ import java.util.Collections; import java.util.List; import java.util.Map; + import org.jboss.jandex.ClassInfo; import org.jboss.jandex.DotName; import org.jboss.jandex.MethodInfo; diff --git a/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/scanning/CacheControlScanner.java b/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/scanning/CacheControlScanner.java index 5323b6268f87f..42515769cea4f 100644 --- a/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/scanning/CacheControlScanner.java +++ b/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/scanning/CacheControlScanner.java @@ -4,6 +4,7 @@ import java.util.Collections; import java.util.List; import java.util.Map; + import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.AnnotationValue; import org.jboss.jandex.ClassInfo; 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 0612350b0c85e..212ebfa4489ca 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 @@ -1,12 +1,13 @@ package org.jboss.resteasy.reactive.server.processor.scanning; -import io.quarkus.gizmo.Gizmo; import java.util.Map; import java.util.Map.Entry; import java.util.function.BiFunction; + import javax.ws.rs.BadRequestException; import javax.ws.rs.NotFoundException; import javax.ws.rs.WebApplicationException; + import org.jboss.jandex.FieldInfo; import org.jboss.jandex.Type.Kind; import org.jboss.resteasy.reactive.common.processor.AsmUtil; @@ -27,6 +28,8 @@ import org.objectweb.asm.Opcodes; import org.objectweb.asm.Type; +import io.quarkus.gizmo.Gizmo; + public class ClassInjectorTransformer implements BiFunction { private static final String WEB_APPLICATION_EXCEPTION_BINARY_NAME = WebApplicationException.class.getName().replace('.', diff --git a/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/scanning/FeatureScanner.java b/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/scanning/FeatureScanner.java index 8db8817e84f88..594a86809b2b9 100644 --- a/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/scanning/FeatureScanner.java +++ b/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/scanning/FeatureScanner.java @@ -4,6 +4,7 @@ import java.util.List; import java.util.Map; import java.util.function.BiFunction; + import org.jboss.jandex.IndexView; import org.jboss.resteasy.reactive.server.processor.ScannedApplication; import org.jboss.resteasy.reactive.server.processor.ServerEndpointIndexer; diff --git a/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/scanning/MethodScanner.java b/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/scanning/MethodScanner.java index d62bc8c7116cd..cb273fe6cd536 100644 --- a/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/scanning/MethodScanner.java +++ b/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/scanning/MethodScanner.java @@ -3,6 +3,7 @@ import java.util.Collections; import java.util.List; import java.util.Map; + import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.ClassInfo; import org.jboss.jandex.DotName; diff --git a/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/scanning/ResponseHeaderMethodScanner.java b/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/scanning/ResponseHeaderMethodScanner.java index 0aafabbc818e0..134da3b3e3196 100644 --- a/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/scanning/ResponseHeaderMethodScanner.java +++ b/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/scanning/ResponseHeaderMethodScanner.java @@ -6,6 +6,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; + import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.AnnotationValue; import org.jboss.jandex.ClassInfo; diff --git a/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/scanning/ResponseStatusMethodScanner.java b/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/scanning/ResponseStatusMethodScanner.java index 60741ce5f409d..70e7f9ab9fd40 100644 --- a/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/scanning/ResponseStatusMethodScanner.java +++ b/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/scanning/ResponseStatusMethodScanner.java @@ -3,6 +3,7 @@ import java.util.Collections; import java.util.List; import java.util.Map; + import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.AnnotationValue; import org.jboss.jandex.ClassInfo; diff --git a/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/scanning/ResteasyReactiveContextResolverScanner.java b/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/scanning/ResteasyReactiveContextResolverScanner.java index 7980d315b88af..a97d8ac090ba6 100644 --- a/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/scanning/ResteasyReactiveContextResolverScanner.java +++ b/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/scanning/ResteasyReactiveContextResolverScanner.java @@ -5,6 +5,7 @@ import java.util.Collections; import java.util.List; import java.util.function.Function; + import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.ClassInfo; import org.jboss.jandex.DotName; diff --git a/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/scanning/ResteasyReactiveExceptionMappingScanner.java b/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/scanning/ResteasyReactiveExceptionMappingScanner.java index f74f2ac95953b..44d5ebdf54a0b 100644 --- a/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/scanning/ResteasyReactiveExceptionMappingScanner.java +++ b/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/scanning/ResteasyReactiveExceptionMappingScanner.java @@ -3,7 +3,9 @@ import java.util.Collection; import java.util.List; import java.util.function.Function; + import javax.ws.rs.Priorities; + import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.ClassInfo; import org.jboss.jandex.DotName; diff --git a/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/scanning/ResteasyReactiveFeatureScanner.java b/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/scanning/ResteasyReactiveFeatureScanner.java index 9303fe37f9b69..503fe2bda9b91 100644 --- a/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/scanning/ResteasyReactiveFeatureScanner.java +++ b/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/scanning/ResteasyReactiveFeatureScanner.java @@ -4,8 +4,10 @@ import java.util.HashSet; import java.util.Set; import java.util.function.Function; + import javax.ws.rs.container.DynamicFeature; import javax.ws.rs.core.Feature; + import org.jboss.jandex.ClassInfo; import org.jboss.jandex.IndexView; import org.jboss.resteasy.reactive.common.model.ResourceDynamicFeature; diff --git a/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/scanning/ResteasyReactiveParamConverterScanner.java b/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/scanning/ResteasyReactiveParamConverterScanner.java index 3fdbcdf4eff16..648ff420151dc 100644 --- a/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/scanning/ResteasyReactiveParamConverterScanner.java +++ b/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/scanning/ResteasyReactiveParamConverterScanner.java @@ -2,7 +2,9 @@ import java.util.Collection; import java.util.function.Function; + import javax.ws.rs.Priorities; + import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.ClassInfo; import org.jboss.jandex.IndexView; diff --git a/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/util/GeneratedClassOutput.java b/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/util/GeneratedClassOutput.java index 73e29add81b43..ad6672ca92c56 100644 --- a/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/util/GeneratedClassOutput.java +++ b/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/util/GeneratedClassOutput.java @@ -1,9 +1,10 @@ package org.jboss.resteasy.reactive.server.processor.util; -import io.quarkus.gizmo.ClassOutput; import java.util.ArrayList; import java.util.List; +import io.quarkus.gizmo.ClassOutput; + public class GeneratedClassOutput implements ClassOutput { final List output = new ArrayList<>(); diff --git a/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/util/KotlinUtils.java b/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/util/KotlinUtils.java index bf6315f8f449e..ce8a1258dceca 100644 --- a/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/util/KotlinUtils.java +++ b/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/util/KotlinUtils.java @@ -1,6 +1,7 @@ package org.jboss.resteasy.reactive.server.processor.util; import java.util.List; + import org.jboss.jandex.MethodInfo; import org.jboss.jandex.Type; import org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames; diff --git a/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/util/ResteasyReactiveServerDotNames.java b/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/util/ResteasyReactiveServerDotNames.java index 22f12377e4975..4fbe147aae4f3 100644 --- a/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/util/ResteasyReactiveServerDotNames.java +++ b/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/util/ResteasyReactiveServerDotNames.java @@ -1,6 +1,7 @@ package org.jboss.resteasy.reactive.server.processor.util; import javax.ws.rs.core.Context; + import org.jboss.jandex.DotName; import org.jboss.resteasy.reactive.server.ServerRequestFilter; import org.jboss.resteasy.reactive.server.ServerResponseFilter; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/ServerExceptionMapper.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/ServerExceptionMapper.java index a03860a9e0b66..00744a8ba2dd1 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/ServerExceptionMapper.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/ServerExceptionMapper.java @@ -4,6 +4,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; + import javax.ws.rs.Priorities; import javax.ws.rs.container.ContainerRequestContext; import javax.ws.rs.container.ResourceInfo; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/ServerRequestFilter.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/ServerRequestFilter.java index 1363ae238eaf0..bb8a6c2379d24 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/ServerRequestFilter.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/ServerRequestFilter.java @@ -1,10 +1,10 @@ package org.jboss.resteasy.reactive.server; -import io.smallrye.common.annotation.Blocking; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; + import javax.ws.rs.Priorities; import javax.ws.rs.container.ContainerRequestContext; import javax.ws.rs.container.ContainerRequestFilter; @@ -13,6 +13,8 @@ import javax.ws.rs.core.Request; import javax.ws.rs.core.UriInfo; +import io.smallrye.common.annotation.Blocking; + /** * When used on a method, then an implementation of {@link javax.ws.rs.container.ContainerRequestFilter} is generated * that calls the annotated method with the proper arguments diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/ServerResponseFilter.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/ServerResponseFilter.java index 4247098221019..79058d909f7d4 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/ServerResponseFilter.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/ServerResponseFilter.java @@ -4,6 +4,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; + import javax.ws.rs.Priorities; import javax.ws.rs.container.ContainerRequestContext; import javax.ws.rs.container.ContainerResponseContext; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/SimpleResourceInfo.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/SimpleResourceInfo.java index 5d1eef319caa1..0077806d0053c 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/SimpleResourceInfo.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/SimpleResourceInfo.java @@ -1,6 +1,7 @@ package org.jboss.resteasy.reactive.server; import java.lang.reflect.Method; + import javax.ws.rs.container.ResourceInfo; /** diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/AsyncExceptionMapperContextImpl.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/AsyncExceptionMapperContextImpl.java index 0826a7fccdb34..e621d5d8b0bde 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/AsyncExceptionMapperContextImpl.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/AsyncExceptionMapperContextImpl.java @@ -1,6 +1,7 @@ package org.jboss.resteasy.reactive.server.core; import javax.ws.rs.core.Response; + import org.jboss.resteasy.reactive.server.spi.AsyncExceptionMapperContext; import org.jboss.resteasy.reactive.server.spi.ServerRequestContext; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/CloseRunnable.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/CloseRunnable.java index f48983f138b76..5c745da8eef1a 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/CloseRunnable.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/CloseRunnable.java @@ -2,6 +2,7 @@ import java.io.Closeable; import java.io.IOException; + import org.jboss.logging.Logger; public class CloseRunnable implements Runnable { diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/Deployment.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/Deployment.java index 7760c0e0fccc8..419ea57f39002 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/Deployment.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/Deployment.java @@ -7,9 +7,11 @@ import java.util.Collection; import java.util.List; import java.util.function.Supplier; + import javax.ws.rs.core.Application; import javax.ws.rs.ext.ParamConverter; import javax.ws.rs.ext.ParamConverterProvider; + import org.jboss.resteasy.reactive.common.ResteasyReactiveConfig; import org.jboss.resteasy.reactive.common.jaxrs.ConfigurationImpl; import org.jboss.resteasy.reactive.common.model.ResourceParamConverterProvider; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/DeploymentInfo.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/DeploymentInfo.java index bc3362b69bc95..94de9f5156324 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/DeploymentInfo.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/DeploymentInfo.java @@ -4,7 +4,9 @@ import java.util.List; import java.util.function.Function; import java.util.function.Supplier; + import javax.ws.rs.core.Application; + import org.jboss.resteasy.reactive.common.ResteasyReactiveConfig; import org.jboss.resteasy.reactive.common.model.ResourceClass; import org.jboss.resteasy.reactive.common.model.ResourceInterceptors; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/EncodedMediaType.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/EncodedMediaType.java index 4613525e18f99..e033783ef1d5e 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/EncodedMediaType.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/EncodedMediaType.java @@ -2,7 +2,9 @@ import java.nio.charset.StandardCharsets; import java.util.Objects; + import javax.ws.rs.core.MediaType; + import org.jboss.resteasy.reactive.server.spi.ContentType; /** diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/ExceptionMapping.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/ExceptionMapping.java index 51a21d4a5fd77..680cd22425ae2 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/ExceptionMapping.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/ExceptionMapping.java @@ -8,6 +8,7 @@ import java.util.Set; import java.util.function.Function; import java.util.function.Predicate; + import org.jboss.resteasy.reactive.common.model.ResourceExceptionMapper; import org.jboss.resteasy.reactive.spi.BeanFactory; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/ResteasyReactiveRequestContext.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/ResteasyReactiveRequestContext.java index 5a071585efe96..b732d92e289ee 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/ResteasyReactiveRequestContext.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/ResteasyReactiveRequestContext.java @@ -16,6 +16,7 @@ import java.util.List; import java.util.concurrent.Executor; import java.util.regex.Matcher; + import javax.ws.rs.core.Cookie; import javax.ws.rs.core.GenericEntity; import javax.ws.rs.core.MediaType; @@ -26,6 +27,7 @@ import javax.ws.rs.core.UriInfo; import javax.ws.rs.ext.ReaderInterceptor; import javax.ws.rs.ext.WriterInterceptor; + import org.jboss.resteasy.reactive.common.core.AbstractResteasyReactiveContext; import org.jboss.resteasy.reactive.common.util.Encode; import org.jboss.resteasy.reactive.common.util.PathSegmentImpl; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/RuntimeExceptionMapper.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/RuntimeExceptionMapper.java index 92a4b42d6aa60..04be9002bf53b 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/RuntimeExceptionMapper.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/RuntimeExceptionMapper.java @@ -1,7 +1,5 @@ package org.jboss.resteasy.reactive.server.core; -import io.smallrye.common.annotation.Blocking; -import io.smallrye.common.annotation.NonBlocking; import java.io.IOException; import java.util.AbstractMap; import java.util.ArrayList; @@ -14,9 +12,11 @@ import java.util.Set; import java.util.function.Predicate; import java.util.stream.Collectors; + import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.Application; import javax.ws.rs.core.Response; + import org.jboss.logging.Logger; import org.jboss.resteasy.reactive.ResteasyReactiveClientProblem; import org.jboss.resteasy.reactive.common.model.ResourceExceptionMapper; @@ -24,6 +24,9 @@ import org.jboss.resteasy.reactive.server.spi.ResteasyReactiveAsyncExceptionMapper; import org.jboss.resteasy.reactive.server.spi.ResteasyReactiveExceptionMapper; +import io.smallrye.common.annotation.Blocking; +import io.smallrye.common.annotation.NonBlocking; + public class RuntimeExceptionMapper { private static final Logger log = Logger.getLogger(RuntimeExceptionMapper.class); diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/ServerResponseBuilderFactory.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/ServerResponseBuilderFactory.java index e0ca951ed75df..37ed188de5536 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/ServerResponseBuilderFactory.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/ServerResponseBuilderFactory.java @@ -1,6 +1,7 @@ package org.jboss.resteasy.reactive.server.core; import javax.ws.rs.core.Response; + import org.jboss.resteasy.reactive.RestResponse; import org.jboss.resteasy.reactive.common.core.ResponseBuilderFactory; import org.jboss.resteasy.reactive.server.jaxrs.ResponseBuilderImpl; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/ServerSerialisers.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/ServerSerialisers.java index c67ed708a4dfb..7959c0f364e06 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/ServerSerialisers.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/ServerSerialisers.java @@ -20,6 +20,7 @@ import java.util.concurrent.ConcurrentMap; import java.util.function.Consumer; import java.util.function.Function; + import javax.ws.rs.RuntimeType; import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.HttpHeaders; @@ -30,6 +31,7 @@ import javax.ws.rs.ext.MessageBodyReader; import javax.ws.rs.ext.MessageBodyWriter; import javax.ws.rs.ext.WriterInterceptor; + import org.jboss.resteasy.reactive.FilePart; import org.jboss.resteasy.reactive.PathPart; import org.jboss.resteasy.reactive.common.PreserveTargetException; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/SseUtil.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/SseUtil.java index a174746523971..b0969d595fc1b 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/SseUtil.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/SseUtil.java @@ -8,12 +8,14 @@ import java.util.List; import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionStage; + import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; import javax.ws.rs.ext.MessageBodyWriter; import javax.ws.rs.sse.OutboundSseEvent; import javax.ws.rs.sse.SseEvent; + import org.jboss.resteasy.reactive.common.core.Serialisers; import org.jboss.resteasy.reactive.common.util.CommonSseUtil; import org.jboss.resteasy.reactive.server.handlers.PublisherResponseHandler; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/StreamingUtil.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/StreamingUtil.java index 4c9f359669a6b..8f31bd6bbbe4e 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/StreamingUtil.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/StreamingUtil.java @@ -6,11 +6,13 @@ import java.util.List; import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionStage; + import javax.ws.rs.RuntimeType; import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; import javax.ws.rs.ext.MessageBodyWriter; + import org.jboss.resteasy.reactive.common.core.Serialisers; import org.jboss.resteasy.reactive.server.StreamingOutputStream; import org.jboss.resteasy.reactive.server.handlers.PublisherResponseHandler; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/multipart/DefaultFileUpload.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/multipart/DefaultFileUpload.java index ca89b80771250..cb3bc68ef4273 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/multipart/DefaultFileUpload.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/multipart/DefaultFileUpload.java @@ -2,7 +2,9 @@ import java.io.IOException; import java.nio.file.Path; + import javax.ws.rs.core.HttpHeaders; + import org.jboss.resteasy.reactive.common.headers.HeaderUtil; import org.jboss.resteasy.reactive.multipart.FileUpload; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/multipart/FormData.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/multipart/FormData.java index 6c8933df5bb02..d0f1ae1992fb2 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/multipart/FormData.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/multipart/FormData.java @@ -13,6 +13,7 @@ import java.util.Iterator; import java.util.LinkedHashMap; import java.util.Map; + import org.jboss.logging.Logger; import org.jboss.resteasy.reactive.common.util.CaseInsensitiveMap; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/multipart/FormDataParser.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/multipart/FormDataParser.java index 39fc2116fa769..86e342d7c1f67 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/multipart/FormDataParser.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/multipart/FormDataParser.java @@ -2,6 +2,7 @@ import java.io.Closeable; import java.io.IOException; + import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext; /** diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/multipart/FormEncodedDataDefinition.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/multipart/FormEncodedDataDefinition.java index 1e2ec790529e1..4829909c40610 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/multipart/FormEncodedDataDefinition.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/multipart/FormEncodedDataDefinition.java @@ -5,9 +5,11 @@ import java.nio.ByteBuffer; import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; + import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.Response; + import org.jboss.logging.Logger; import org.jboss.resteasy.reactive.common.headers.HeaderUtil; import org.jboss.resteasy.reactive.common.util.URLUtils; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/multipart/FormParserFactory.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/multipart/FormParserFactory.java index c83442401d2b0..7fa20a50e5584 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/multipart/FormParserFactory.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/multipart/FormParserFactory.java @@ -5,6 +5,7 @@ import java.util.List; import java.util.concurrent.Executor; import java.util.function.Supplier; + import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext; /** diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/multipart/MultiPartParserDefinition.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/multipart/MultiPartParserDefinition.java index f03cdf0598aed..216da2f1965f6 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/multipart/MultiPartParserDefinition.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/multipart/MultiPartParserDefinition.java @@ -18,10 +18,12 @@ import java.util.List; import java.util.concurrent.Executor; import java.util.function.Supplier; + import javax.ws.rs.WebApplicationException; import javax.ws.rs.container.CompletionCallback; import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.Response; + import org.jboss.logging.Logger; import org.jboss.resteasy.reactive.common.headers.HeaderUtil; import org.jboss.resteasy.reactive.common.util.CaseInsensitiveMap; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/multipart/MultipartMessageBodyWriter.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/multipart/MultipartMessageBodyWriter.java index 9515d359ffa84..b963504d5cd5b 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/multipart/MultipartMessageBodyWriter.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/multipart/MultipartMessageBodyWriter.java @@ -10,12 +10,14 @@ import java.util.Collections; import java.util.List; import java.util.UUID; + import javax.ws.rs.RuntimeType; import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.MultivaluedMap; import javax.ws.rs.ext.MessageBodyWriter; + import org.jboss.resteasy.reactive.common.core.Serialisers; import org.jboss.resteasy.reactive.common.reflection.ReflectionBeanFactoryCreator; import org.jboss.resteasy.reactive.multipart.FileDownload; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/multipart/MultipartParser.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/multipart/MultipartParser.java index 76cfd1f46cd10..78fe4ab62f5bf 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/multipart/MultipartParser.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/multipart/MultipartParser.java @@ -6,6 +6,7 @@ import java.nio.ByteBuffer; import java.util.Base64; import java.util.Collections; + import org.jboss.resteasy.reactive.common.util.CaseInsensitiveMap; /** diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/multipart/MultipartSupport.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/multipart/MultipartSupport.java index 5af3b1b30a7d5..8a97d461d9544 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/multipart/MultipartSupport.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/multipart/MultipartSupport.java @@ -15,11 +15,13 @@ import java.util.Collection; import java.util.Collections; import java.util.List; + import javax.ws.rs.BadRequestException; import javax.ws.rs.NotSupportedException; import javax.ws.rs.RuntimeType; import javax.ws.rs.core.MediaType; import javax.ws.rs.ext.MessageBodyReader; + import org.jboss.logging.Logger; import org.jboss.resteasy.reactive.multipart.FileUpload; import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/ContextParamExtractor.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/ContextParamExtractor.java index f87a8f8642953..501f9fda27b0b 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/ContextParamExtractor.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/ContextParamExtractor.java @@ -14,6 +14,7 @@ import javax.ws.rs.ext.Providers; import javax.ws.rs.sse.Sse; import javax.ws.rs.sse.SseEventSink; + import org.jboss.resteasy.reactive.server.SimpleResourceInfo; import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext; import org.jboss.resteasy.reactive.server.jaxrs.AsyncResponseImpl; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/InjectParamExtractor.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/InjectParamExtractor.java index 2be168398e880..d641487472487 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/InjectParamExtractor.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/InjectParamExtractor.java @@ -1,6 +1,7 @@ package org.jboss.resteasy.reactive.server.core.parameters; import javax.ws.rs.container.CompletionCallback; + import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext; import org.jboss.resteasy.reactive.server.injection.ResteasyReactiveInjectionTarget; import org.jboss.resteasy.reactive.spi.BeanFactory; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/ParameterExtractor.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/ParameterExtractor.java index 78fdc01282c92..2b04c1b4614bf 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/ParameterExtractor.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/ParameterExtractor.java @@ -1,6 +1,7 @@ package org.jboss.resteasy.reactive.server.core.parameters; import java.util.function.BiConsumer; + import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext; public interface ParameterExtractor { diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/PathParamExtractor.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/PathParamExtractor.java index 60d592571dba9..ccfa99edca5c3 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/PathParamExtractor.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/PathParamExtractor.java @@ -1,6 +1,7 @@ package org.jboss.resteasy.reactive.server.core.parameters; import java.util.List; + import org.jboss.resteasy.reactive.common.util.Encode; import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/converters/ArrayConverter.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/converters/ArrayConverter.java index d38e04b15cad5..65d94c40e0944 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/converters/ArrayConverter.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/converters/ArrayConverter.java @@ -4,6 +4,7 @@ import java.lang.reflect.Array; import java.lang.reflect.Type; import java.util.List; + import org.jboss.resteasy.reactive.common.util.DeploymentUtils; import org.jboss.resteasy.reactive.server.model.ParamConverterProviders; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/converters/ListConverter.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/converters/ListConverter.java index c6b8ed73f260b..028c222291a1b 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/converters/ListConverter.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/converters/ListConverter.java @@ -5,6 +5,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; + import org.jboss.resteasy.reactive.server.model.ParamConverterProviders; public class ListConverter implements ParameterConverter { diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/converters/NoopParameterConverter.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/converters/NoopParameterConverter.java index 5958994b519a2..560001b2b9275 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/converters/NoopParameterConverter.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/converters/NoopParameterConverter.java @@ -2,6 +2,7 @@ import java.lang.annotation.Annotation; import java.lang.reflect.Type; + import org.jboss.resteasy.reactive.server.model.ParamConverterProviders; public class NoopParameterConverter implements ParameterConverter { diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/converters/OptionalConverter.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/converters/OptionalConverter.java index 2cd7ad96cb420..3af7f3e8cb5bd 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/converters/OptionalConverter.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/converters/OptionalConverter.java @@ -4,6 +4,7 @@ import java.lang.reflect.Type; import java.util.Collection; import java.util.Optional; + import org.jboss.resteasy.reactive.server.model.ParamConverterProviders; public class OptionalConverter implements ParameterConverter { diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/converters/ParameterConverter.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/converters/ParameterConverter.java index b6fa2947c3623..ed40f64e2dbb2 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/converters/ParameterConverter.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/converters/ParameterConverter.java @@ -2,6 +2,7 @@ import java.lang.annotation.Annotation; import java.lang.reflect.Type; + import org.jboss.resteasy.reactive.server.model.ParamConverterProviders; public interface ParameterConverter { diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/converters/PathSegmentParamConverter.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/converters/PathSegmentParamConverter.java index 7b55e141e58dd..f452160a88a98 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/converters/PathSegmentParamConverter.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/converters/PathSegmentParamConverter.java @@ -2,6 +2,7 @@ import java.lang.annotation.Annotation; import java.lang.reflect.Type; + import org.jboss.resteasy.reactive.common.util.PathSegmentImpl; import org.jboss.resteasy.reactive.server.model.ParamConverterProviders; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/converters/RuntimeParameterConverter.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/converters/RuntimeParameterConverter.java index 269c26cac6c83..c80d860de8eb7 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/converters/RuntimeParameterConverter.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/converters/RuntimeParameterConverter.java @@ -2,7 +2,9 @@ import java.lang.annotation.Annotation; import java.lang.reflect.Type; + import javax.ws.rs.ext.ParamConverter; + import org.jboss.resteasy.reactive.server.model.ParamConverterProviders; public class RuntimeParameterConverter implements ParameterConverter { diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/converters/RuntimeResolvedConverter.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/converters/RuntimeResolvedConverter.java index 3eb4519c6a826..c91eb749a5df6 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/converters/RuntimeResolvedConverter.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/converters/RuntimeResolvedConverter.java @@ -2,8 +2,10 @@ import java.lang.annotation.Annotation; import java.lang.reflect.Type; + import javax.ws.rs.ext.ParamConverter; import javax.ws.rs.ext.ParamConverterProvider; + import org.jboss.resteasy.reactive.common.model.ResourceParamConverterProvider; import org.jboss.resteasy.reactive.server.model.ParamConverterProviders; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/converters/SetConverter.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/converters/SetConverter.java index 9aed9ccbd2c65..96d920b1eb605 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/converters/SetConverter.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/converters/SetConverter.java @@ -6,6 +6,7 @@ import java.util.HashSet; import java.util.List; import java.util.Set; + import org.jboss.resteasy.reactive.server.model.ParamConverterProviders; public class SetConverter implements ParameterConverter { diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/converters/SortedSetConverter.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/converters/SortedSetConverter.java index b77d8214613d4..9d53e9e8c5947 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/converters/SortedSetConverter.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/converters/SortedSetConverter.java @@ -6,6 +6,7 @@ import java.util.List; import java.util.SortedSet; import java.util.TreeSet; + import org.jboss.resteasy.reactive.server.model.ParamConverterProviders; public class SortedSetConverter implements ParameterConverter { diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/converters/TemporalParamConverter.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/converters/TemporalParamConverter.java index 716afd2560e4d..6d327fbd5cf2f 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/converters/TemporalParamConverter.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/converters/TemporalParamConverter.java @@ -4,6 +4,7 @@ import java.lang.reflect.Type; import java.time.format.DateTimeFormatter; import java.time.temporal.Temporal; + import org.jboss.resteasy.reactive.DateFormat; import org.jboss.resteasy.reactive.server.model.ParamConverterProviders; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/reflection/ReflectionConstructorParameterConverter.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/reflection/ReflectionConstructorParameterConverter.java index 1ba691f95ab90..a3d32a5dd4232 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/reflection/ReflectionConstructorParameterConverter.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/reflection/ReflectionConstructorParameterConverter.java @@ -4,6 +4,7 @@ import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Type; + import org.jboss.resteasy.reactive.server.core.parameters.converters.ParameterConverter; import org.jboss.resteasy.reactive.server.model.ParamConverterProviders; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/reflection/ReflectionValueOfParameterConverter.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/reflection/ReflectionValueOfParameterConverter.java index 10a518432b0cc..3b2e296bea78a 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/reflection/ReflectionValueOfParameterConverter.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/reflection/ReflectionValueOfParameterConverter.java @@ -4,6 +4,7 @@ import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.lang.reflect.Type; + import org.jboss.resteasy.reactive.server.core.parameters.converters.ParameterConverter; import org.jboss.resteasy.reactive.server.model.ParamConverterProviders; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/reflection/ReflectiveContextInjectedBeanFactory.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/reflection/ReflectiveContextInjectedBeanFactory.java index 2779e038cc57c..0ec8ebb55c27b 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/reflection/ReflectiveContextInjectedBeanFactory.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/reflection/ReflectiveContextInjectedBeanFactory.java @@ -13,10 +13,12 @@ import java.util.Map; import java.util.function.Function; import java.util.function.Supplier; + import javax.inject.Inject; import javax.ws.rs.HeaderParam; import javax.ws.rs.QueryParam; import javax.ws.rs.core.Context; + import org.jboss.resteasy.reactive.server.core.CurrentRequestManager; import org.jboss.resteasy.reactive.server.core.parameters.ContextParamExtractor; import org.jboss.resteasy.reactive.spi.BeanFactory; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/request/AcceptHeaders.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/request/AcceptHeaders.java index 833580d9cf080..81d5a538ef116 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/request/AcceptHeaders.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/request/AcceptHeaders.java @@ -5,6 +5,7 @@ import java.util.Locale; import java.util.Map; import java.util.Map.Entry; + import javax.ws.rs.BadRequestException; import javax.ws.rs.core.MediaType; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/request/ServerDrivenNegotiation.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/request/ServerDrivenNegotiation.java index 455c8ce40f7c9..5619f2d2515ba 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/request/ServerDrivenNegotiation.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/request/ServerDrivenNegotiation.java @@ -4,6 +4,7 @@ import java.util.List; import java.util.Locale; import java.util.Map; + import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Variant; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/request/VariantQuality.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/request/VariantQuality.java index 63cb5a6991eca..3c33a226520b4 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/request/VariantQuality.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/request/VariantQuality.java @@ -2,6 +2,7 @@ import java.math.BigDecimal; import java.math.MathContext; + import javax.ws.rs.core.MediaType; /** diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/serialization/DynamicEntityWriter.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/serialization/DynamicEntityWriter.java index 929017cdc6bd7..46660abb8a303 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/serialization/DynamicEntityWriter.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/serialization/DynamicEntityWriter.java @@ -2,12 +2,14 @@ import java.io.IOException; import java.util.List; + import javax.ws.rs.InternalServerErrorException; import javax.ws.rs.RuntimeType; import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; import javax.ws.rs.ext.MessageBodyWriter; + import org.jboss.resteasy.reactive.common.util.MediaTypeHelper; import org.jboss.resteasy.reactive.server.core.EncodedMediaType; import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/serialization/EntityWriter.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/serialization/EntityWriter.java index 594daa2edb7e5..48c1e7ee3bb9b 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/serialization/EntityWriter.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/serialization/EntityWriter.java @@ -1,6 +1,7 @@ package org.jboss.resteasy.reactive.server.core.serialization; import java.io.IOException; + import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext; /** diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/serialization/FixedEntityWriter.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/serialization/FixedEntityWriter.java index 8f3e284615ff4..6a8559633eeb2 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/serialization/FixedEntityWriter.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/serialization/FixedEntityWriter.java @@ -1,9 +1,11 @@ package org.jboss.resteasy.reactive.server.core.serialization; import java.io.IOException; + import javax.ws.rs.InternalServerErrorException; import javax.ws.rs.core.Response; import javax.ws.rs.ext.MessageBodyWriter; + import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext; import org.jboss.resteasy.reactive.server.core.ServerSerialisers; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/serialization/FixedEntityWriterArray.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/serialization/FixedEntityWriterArray.java index 375ae48b5faf5..8aa3d27ab8f9a 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/serialization/FixedEntityWriterArray.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/serialization/FixedEntityWriterArray.java @@ -1,9 +1,11 @@ package org.jboss.resteasy.reactive.server.core.serialization; import java.io.IOException; + import javax.ws.rs.InternalServerErrorException; import javax.ws.rs.core.Response; import javax.ws.rs.ext.MessageBodyWriter; + import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext; import org.jboss.resteasy.reactive.server.core.ServerSerialisers; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/serialization/MediaTypeDelegatingEntityWriter.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/serialization/MediaTypeDelegatingEntityWriter.java index e46b79171a730..7e1704ccb9c1f 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/serialization/MediaTypeDelegatingEntityWriter.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/serialization/MediaTypeDelegatingEntityWriter.java @@ -2,9 +2,11 @@ import java.io.IOException; import java.util.Map; + import javax.ws.rs.InternalServerErrorException; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; + import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext; /** diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/serialization/TypeDelegatingEntityWriter.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/serialization/TypeDelegatingEntityWriter.java index 2fd3e3dc581d8..397abf08f071f 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/serialization/TypeDelegatingEntityWriter.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/serialization/TypeDelegatingEntityWriter.java @@ -2,8 +2,10 @@ import java.io.IOException; import java.util.Map; + import javax.ws.rs.InternalServerErrorException; import javax.ws.rs.core.Response; + import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext; /** diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/startup/RuntimeDeploymentManager.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/startup/RuntimeDeploymentManager.java index e2d80a613e00d..2bbf88ef559e9 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/startup/RuntimeDeploymentManager.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/startup/RuntimeDeploymentManager.java @@ -12,10 +12,12 @@ import java.util.function.Consumer; import java.util.function.Function; import java.util.function.Supplier; + import javax.ws.rs.RuntimeType; import javax.ws.rs.container.ContainerRequestFilter; import javax.ws.rs.core.Application; import javax.ws.rs.core.Feature; + import org.jboss.resteasy.reactive.common.jaxrs.ConfigurationImpl; import org.jboss.resteasy.reactive.common.model.ResourceClass; import org.jboss.resteasy.reactive.common.model.ResourceFeature; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/startup/RuntimeInterceptorDeployment.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/startup/RuntimeInterceptorDeployment.java index e96926d370729..719a87bbc61e5 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/startup/RuntimeInterceptorDeployment.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/startup/RuntimeInterceptorDeployment.java @@ -9,11 +9,13 @@ import java.util.Map; import java.util.TreeMap; import java.util.function.Consumer; + import javax.ws.rs.container.ContainerRequestFilter; import javax.ws.rs.container.ContainerResponseFilter; import javax.ws.rs.container.DynamicFeature; import javax.ws.rs.ext.ReaderInterceptor; import javax.ws.rs.ext.WriterInterceptor; + import org.jboss.resteasy.reactive.common.jaxrs.ConfigurationImpl; import org.jboss.resteasy.reactive.common.model.HasPriority; import org.jboss.resteasy.reactive.common.model.ResourceDynamicFeature; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/startup/RuntimeMappingDeployment.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/startup/RuntimeMappingDeployment.java index 1232813411f3d..4faca46c9a7ae 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/startup/RuntimeMappingDeployment.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/startup/RuntimeMappingDeployment.java @@ -7,6 +7,7 @@ import java.util.Map; import java.util.SortedMap; import java.util.TreeMap; + import org.jboss.resteasy.reactive.common.model.ResourceMethod; import org.jboss.resteasy.reactive.server.handlers.MediaTypeMapper; import org.jboss.resteasy.reactive.server.mapping.RequestMapper; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/startup/RuntimeResourceDeployment.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/startup/RuntimeResourceDeployment.java index 45f83539204ce..6b71932e32a42 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/startup/RuntimeResourceDeployment.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/startup/RuntimeResourceDeployment.java @@ -21,11 +21,13 @@ import java.util.Set; import java.util.concurrent.Executor; import java.util.function.Supplier; + import javax.ws.rs.RuntimeType; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.MultivaluedMap; import javax.ws.rs.core.Response; import javax.ws.rs.ext.MessageBodyWriter; + import org.jboss.logging.Logger; import org.jboss.resteasy.reactive.common.ResteasyReactiveConfig; import org.jboss.resteasy.reactive.common.model.MethodParameter; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/exceptionmappers/AsyncExceptionMappingUtil.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/exceptionmappers/AsyncExceptionMappingUtil.java index 94961cc1d6b3f..d24d14efad005 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/exceptionmappers/AsyncExceptionMappingUtil.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/exceptionmappers/AsyncExceptionMappingUtil.java @@ -1,14 +1,17 @@ package org.jboss.resteasy.reactive.server.exceptionmappers; -import io.smallrye.mutiny.Uni; import java.util.function.Consumer; import java.util.function.Function; + import javax.ws.rs.core.Response; + import org.jboss.logging.Logger; import org.jboss.resteasy.reactive.RestResponse; import org.jboss.resteasy.reactive.server.ServerExceptionMapper; import org.jboss.resteasy.reactive.server.spi.AsyncExceptionMapperContext; +import io.smallrye.mutiny.Uni; + /** * This class is used by the exception mappers that are generated as a result of the use of {@link ServerExceptionMapper} * with a {@link Uni} response type. diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/filters/FilterUtil.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/filters/FilterUtil.java index 3c384a987f068..14d71f7c9b4e3 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/filters/FilterUtil.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/filters/FilterUtil.java @@ -1,15 +1,18 @@ package org.jboss.resteasy.reactive.server.filters; -import io.smallrye.mutiny.Uni; import java.util.Optional; import java.util.function.Consumer; import java.util.function.Function; + import javax.ws.rs.core.Response; + import org.jboss.resteasy.reactive.RestResponse; import org.jboss.resteasy.reactive.server.ServerRequestFilter; import org.jboss.resteasy.reactive.server.ServerResponseFilter; import org.jboss.resteasy.reactive.server.spi.ResteasyReactiveContainerRequestContext; +import io.smallrye.mutiny.Uni; + /** * This class is used by the filters that are generated as a result of the use of {@link ServerRequestFilter} or * {@link ServerResponseFilter} on methods diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/filters/PreventAbortResteasyReactiveContainerRequestContext.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/filters/PreventAbortResteasyReactiveContainerRequestContext.java index 52a9edebb7b5b..31addad5355cf 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/filters/PreventAbortResteasyReactiveContainerRequestContext.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/filters/PreventAbortResteasyReactiveContainerRequestContext.java @@ -7,6 +7,7 @@ import java.util.List; import java.util.Locale; import java.util.Map; + import javax.ws.rs.container.ContainerRequestContext; import javax.ws.rs.core.Cookie; import javax.ws.rs.core.MediaType; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/BlockingHandler.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/BlockingHandler.java index 3179b5911f41c..ca41fb81fcb51 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/BlockingHandler.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/BlockingHandler.java @@ -2,6 +2,7 @@ import java.util.concurrent.Executor; import java.util.function.Supplier; + import org.jboss.resteasy.reactive.server.core.BlockingOperationSupport; import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext; import org.jboss.resteasy.reactive.server.spi.ServerRestHandler; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/CacheControlHandler.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/CacheControlHandler.java index 93b2b814244b0..305a344bf062d 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/CacheControlHandler.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/CacheControlHandler.java @@ -1,6 +1,7 @@ package org.jboss.resteasy.reactive.server.handlers; import javax.ws.rs.core.HttpHeaders; + import org.jboss.resteasy.reactive.common.util.ExtendedCacheControl; import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext; import org.jboss.resteasy.reactive.server.spi.ServerRestHandler; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/ClassRoutingHandler.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/ClassRoutingHandler.java index 8815d6bf8de66..7ebef12cfbdba 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/ClassRoutingHandler.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/ClassRoutingHandler.java @@ -7,6 +7,7 @@ import java.util.List; import java.util.Map; import java.util.Set; + import javax.ws.rs.HttpMethod; import javax.ws.rs.NotAcceptableException; import javax.ws.rs.NotAllowedException; @@ -15,6 +16,7 @@ import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; + import org.jboss.resteasy.reactive.common.headers.MediaTypeHeaderDelegate; import org.jboss.resteasy.reactive.common.util.MediaTypeHelper; import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/CompletionStageResponseHandler.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/CompletionStageResponseHandler.java index 78730e984c11d..f1af73d80a1e8 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/CompletionStageResponseHandler.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/CompletionStageResponseHandler.java @@ -1,6 +1,7 @@ package org.jboss.resteasy.reactive.server.handlers; import java.util.concurrent.CompletionStage; + import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext; import org.jboss.resteasy.reactive.server.spi.ServerRestHandler; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/FixedProducesHandler.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/FixedProducesHandler.java index 503ecb988190b..361ae89e90315 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/FixedProducesHandler.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/FixedProducesHandler.java @@ -2,11 +2,13 @@ import java.util.List; import java.util.Locale; + import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; import javax.ws.rs.core.Variant; + import org.jboss.resteasy.reactive.server.core.EncodedMediaType; import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext; import org.jboss.resteasy.reactive.server.core.serialization.EntityWriter; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/FormBodyHandler.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/FormBodyHandler.java index f9b59b2dcc294..51e9d8589f79b 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/FormBodyHandler.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/FormBodyHandler.java @@ -10,6 +10,7 @@ import java.nio.file.Paths; import java.util.concurrent.Executor; import java.util.function.Supplier; + import org.jboss.resteasy.reactive.server.core.BlockingOperationSupport; import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext; import org.jboss.resteasy.reactive.server.core.multipart.FormData; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/InputHandler.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/InputHandler.java index 0546fbe55e943..8b1aa72fb1502 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/InputHandler.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/InputHandler.java @@ -6,7 +6,9 @@ import java.util.List; import java.util.concurrent.Executor; import java.util.function.Supplier; + import javax.ws.rs.HttpMethod; + import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext; import org.jboss.resteasy.reactive.server.spi.ServerHttpRequest; import org.jboss.resteasy.reactive.server.spi.ServerRestHandler; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/InterceptorHandler.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/InterceptorHandler.java index 463ad286591f0..af3635aa26a7b 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/InterceptorHandler.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/InterceptorHandler.java @@ -2,6 +2,7 @@ import javax.ws.rs.ext.ReaderInterceptor; import javax.ws.rs.ext.WriterInterceptor; + import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext; import org.jboss.resteasy.reactive.server.spi.ServerRestHandler; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/MediaTypeMapper.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/MediaTypeMapper.java index a77db34a0d847..480d342920cbb 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/MediaTypeMapper.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/MediaTypeMapper.java @@ -6,10 +6,12 @@ import java.util.HashMap; import java.util.List; import java.util.Map; + import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; + import org.jboss.resteasy.reactive.common.util.MediaTypeHelper; import org.jboss.resteasy.reactive.common.util.ServerMediaType; import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/ParameterHandler.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/ParameterHandler.java index c0de25f63561f..37e6dbf5ec419 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/ParameterHandler.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/ParameterHandler.java @@ -2,9 +2,11 @@ import java.util.Collection; import java.util.function.BiConsumer; + import javax.ws.rs.BadRequestException; import javax.ws.rs.NotFoundException; import javax.ws.rs.WebApplicationException; + import org.jboss.logging.Logger; import org.jboss.resteasy.reactive.common.model.ParameterType; import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/PerRequestInstanceHandler.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/PerRequestInstanceHandler.java index 533b912b63985..46518a452d4af 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/PerRequestInstanceHandler.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/PerRequestInstanceHandler.java @@ -1,7 +1,9 @@ package org.jboss.resteasy.reactive.server.handlers; import java.util.function.Function; + import javax.ws.rs.container.CompletionCallback; + import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext; import org.jboss.resteasy.reactive.server.injection.ResteasyReactiveInjectionTarget; import org.jboss.resteasy.reactive.server.spi.ServerRestHandler; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/PublisherResponseHandler.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/PublisherResponseHandler.java index a0d71ceaaca92..3ac1f35a6deb3 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/PublisherResponseHandler.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/PublisherResponseHandler.java @@ -9,7 +9,9 @@ import java.util.function.BiConsumer; import java.util.function.BiFunction; import java.util.function.Consumer; + import javax.ws.rs.core.MediaType; + import org.jboss.logging.Logger; import org.jboss.resteasy.reactive.common.util.RestMediaType; import org.jboss.resteasy.reactive.common.util.ServerMediaType; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/RequestDeserializeHandler.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/RequestDeserializeHandler.java index c0f10779766c2..0203a0285b238 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/RequestDeserializeHandler.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/RequestDeserializeHandler.java @@ -4,6 +4,7 @@ import java.lang.annotation.Annotation; import java.lang.reflect.Type; import java.util.List; + import javax.ws.rs.BadRequestException; import javax.ws.rs.NotSupportedException; import javax.ws.rs.RuntimeType; @@ -14,6 +15,7 @@ import javax.ws.rs.core.Response; import javax.ws.rs.ext.MessageBodyReader; import javax.ws.rs.ext.ReaderInterceptor; + import org.jboss.logging.Logger; import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext; import org.jboss.resteasy.reactive.server.core.ServerSerialisers; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/ResourceLocatorHandler.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/ResourceLocatorHandler.java index d00b76422ce70..1ff95d24be177 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/ResourceLocatorHandler.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/ResourceLocatorHandler.java @@ -8,9 +8,11 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.function.Function; + import javax.ws.rs.WebApplicationException; import javax.ws.rs.container.CompletionCallback; import javax.ws.rs.core.Response; + import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext; import org.jboss.resteasy.reactive.server.mapping.RequestMapper; import org.jboss.resteasy.reactive.server.mapping.RuntimeResource; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/ResourceRequestFilterHandler.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/ResourceRequestFilterHandler.java index 6026a0c418e35..7fbdca4e10962 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/ResourceRequestFilterHandler.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/ResourceRequestFilterHandler.java @@ -1,6 +1,7 @@ package org.jboss.resteasy.reactive.server.handlers; import javax.ws.rs.container.ContainerRequestFilter; + import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext; import org.jboss.resteasy.reactive.server.jaxrs.ContainerRequestContextImpl; import org.jboss.resteasy.reactive.server.spi.ServerRestHandler; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/ResourceResponseFilterHandler.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/ResourceResponseFilterHandler.java index 536468260f5d2..f98b0238e65f3 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/ResourceResponseFilterHandler.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/ResourceResponseFilterHandler.java @@ -2,6 +2,7 @@ import javax.ws.rs.container.ContainerResponseContext; import javax.ws.rs.container.ContainerResponseFilter; + import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext; import org.jboss.resteasy.reactive.server.jaxrs.ContainerRequestContextImpl; import org.jboss.resteasy.reactive.server.spi.ServerRestHandler; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/ResponseHandler.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/ResponseHandler.java index a9669694c6976..5b1fd6b44ac4d 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/ResponseHandler.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/ResponseHandler.java @@ -4,9 +4,11 @@ import java.util.Collections; import java.util.List; import java.util.Map; + import javax.ws.rs.core.GenericEntity; import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.Response; + import org.jboss.resteasy.reactive.RestResponse; import org.jboss.resteasy.reactive.common.jaxrs.ResponseImpl; import org.jboss.resteasy.reactive.common.jaxrs.RestResponseImpl; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/ResponseWriterHandler.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/ResponseWriterHandler.java index 113c3255884e0..bfbd917ee9547 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/ResponseWriterHandler.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/ResponseWriterHandler.java @@ -2,6 +2,7 @@ import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.Response; + import org.jboss.resteasy.reactive.common.util.ServerMediaType; import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext; import org.jboss.resteasy.reactive.server.core.ServerSerialisers; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/RestInitialHandler.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/RestInitialHandler.java index 3524f57beebe2..c169188a70af9 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/RestInitialHandler.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/RestInitialHandler.java @@ -1,7 +1,9 @@ package org.jboss.resteasy.reactive.server.handlers; import java.util.List; + import javax.ws.rs.NotFoundException; + import org.jboss.resteasy.reactive.server.core.Deployment; import org.jboss.resteasy.reactive.server.core.RequestContextFactory; import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/UniResponseHandler.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/UniResponseHandler.java index b4e720adbc52a..027bb09290b7a 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/UniResponseHandler.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/UniResponseHandler.java @@ -1,10 +1,12 @@ package org.jboss.resteasy.reactive.server.handlers; -import io.smallrye.mutiny.Uni; import java.util.function.Consumer; + import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext; import org.jboss.resteasy.reactive.server.spi.ServerRestHandler; +import io.smallrye.mutiny.Uni; + public class UniResponseHandler implements ServerRestHandler { @Override diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/VariableProducesHandler.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/VariableProducesHandler.java index 8f7cda69de651..90b717466b668 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/VariableProducesHandler.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/VariableProducesHandler.java @@ -1,6 +1,7 @@ package org.jboss.resteasy.reactive.server.handlers; import java.util.List; + import javax.ws.rs.NotAcceptableException; import javax.ws.rs.RuntimeType; import javax.ws.rs.WebApplicationException; @@ -9,6 +10,7 @@ import javax.ws.rs.core.Response; import javax.ws.rs.core.Variant; import javax.ws.rs.ext.MessageBodyWriter; + import org.jboss.resteasy.reactive.common.util.MediaTypeHelper; import org.jboss.resteasy.reactive.common.util.ServerMediaType; import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/VirtualThreadNonBlockingHandler.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/VirtualThreadNonBlockingHandler.java index 1d0295671411a..5fb5748fe8b69 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/VirtualThreadNonBlockingHandler.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/VirtualThreadNonBlockingHandler.java @@ -2,6 +2,7 @@ import java.lang.reflect.Constructor; import java.util.concurrent.*; + import org.jboss.resteasy.reactive.server.core.BlockingOperationSupport; import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext; import org.jboss.resteasy.reactive.server.spi.ServerRestHandler; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/injection/ContextProducers.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/injection/ContextProducers.java index 74c67f3822420..b59440035ffbc 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/injection/ContextProducers.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/injection/ContextProducers.java @@ -14,6 +14,7 @@ import javax.ws.rs.core.UriInfo; import javax.ws.rs.ext.Providers; import javax.ws.rs.sse.Sse; + import org.jboss.resteasy.reactive.server.SimpleResourceInfo; import org.jboss.resteasy.reactive.server.core.CurrentRequestManager; import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/AbstractInterceptorContext.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/AbstractInterceptorContext.java index 02c99fe76b02c..34d606c08fcb6 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/AbstractInterceptorContext.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/AbstractInterceptorContext.java @@ -4,8 +4,10 @@ import java.lang.reflect.Type; import java.util.Collection; import java.util.Objects; + import javax.ws.rs.core.MediaType; import javax.ws.rs.ext.InterceptorContext; + import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext; import org.jboss.resteasy.reactive.server.core.ServerSerialisers; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/AsyncResponseImpl.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/AsyncResponseImpl.java index d2afc3560aa42..07ababd9e8ad0 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/AsyncResponseImpl.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/AsyncResponseImpl.java @@ -9,6 +9,7 @@ import java.util.Map; import java.util.Objects; import java.util.concurrent.TimeUnit; + import javax.ws.rs.ServiceUnavailableException; import javax.ws.rs.container.AsyncResponse; import javax.ws.rs.container.CompletionCallback; @@ -17,6 +18,7 @@ import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.Response; import javax.ws.rs.core.Response.ResponseBuilder; + import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext; public class AsyncResponseImpl implements AsyncResponse, Runnable { diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/ContainerRequestContextImpl.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/ContainerRequestContextImpl.java index 0cf028c56f53f..d893b93f6416e 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/ContainerRequestContextImpl.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/ContainerRequestContextImpl.java @@ -7,6 +7,7 @@ import java.util.List; import java.util.Locale; import java.util.Map; + import javax.ws.rs.core.Cookie; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.MultivaluedMap; @@ -14,6 +15,7 @@ import javax.ws.rs.core.Response; import javax.ws.rs.core.SecurityContext; import javax.ws.rs.core.UriInfo; + import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext; import org.jboss.resteasy.reactive.server.spi.ResteasyReactiveContainerRequestContext; import org.jboss.resteasy.reactive.server.spi.ServerRequestContext; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/ContainerResponseContextImpl.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/ContainerResponseContextImpl.java index 991c0455eec26..7c8cee24a508d 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/ContainerResponseContextImpl.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/ContainerResponseContextImpl.java @@ -8,6 +8,7 @@ import java.util.Locale; import java.util.Map; import java.util.Set; + import javax.ws.rs.container.ContainerResponseContext; import javax.ws.rs.core.EntityTag; import javax.ws.rs.core.GenericEntity; @@ -18,6 +19,7 @@ import javax.ws.rs.core.NewCookie; import javax.ws.rs.core.Response; import javax.ws.rs.core.Response.StatusType; + import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext; public class ContainerResponseContextImpl implements ContainerResponseContext { diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/ContextResolverDelegate.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/ContextResolverDelegate.java index d484b11940058..2e575e65ba3f6 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/ContextResolverDelegate.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/ContextResolverDelegate.java @@ -1,6 +1,7 @@ package org.jboss.resteasy.reactive.server.jaxrs; import java.util.Collection; + import javax.ws.rs.ext.ContextResolver; public class ContextResolverDelegate implements ContextResolver { diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/DynamicFeatureContext.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/DynamicFeatureContext.java index 8d1050bad4ebc..a570e9d11b291 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/DynamicFeatureContext.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/DynamicFeatureContext.java @@ -1,8 +1,10 @@ package org.jboss.resteasy.reactive.server.jaxrs; import java.util.function.Function; + import javax.ws.rs.container.ContainerRequestFilter; import javax.ws.rs.container.ContainerResponseFilter; + import org.jboss.resteasy.reactive.common.jaxrs.ConfigurationImpl; import org.jboss.resteasy.reactive.common.model.InterceptorContainer; import org.jboss.resteasy.reactive.common.model.ResourceInterceptor; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/FeatureContextImpl.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/FeatureContextImpl.java index 025c4ad0c0741..5142ed59ca227 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/FeatureContextImpl.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/FeatureContextImpl.java @@ -7,6 +7,7 @@ import java.util.Map; import java.util.Set; import java.util.function.Function; + import javax.annotation.Priority; import javax.ws.rs.NameBinding; import javax.ws.rs.container.ContainerRequestFilter; @@ -17,6 +18,7 @@ import javax.ws.rs.ext.ExceptionMapper; import javax.ws.rs.ext.ReaderInterceptor; import javax.ws.rs.ext.WriterInterceptor; + import org.jboss.resteasy.reactive.common.core.UnmanagedBeanFactory; import org.jboss.resteasy.reactive.common.jaxrs.ConfigurationImpl; import org.jboss.resteasy.reactive.common.model.InterceptorContainer; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/HttpHeadersImpl.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/HttpHeadersImpl.java index 990d6ce66dc7c..8177b3e08c51c 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/HttpHeadersImpl.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/HttpHeadersImpl.java @@ -5,10 +5,12 @@ import java.util.List; import java.util.Locale; import java.util.Map; + import javax.ws.rs.core.Cookie; import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.MultivaluedMap; + import org.jboss.resteasy.reactive.common.headers.HeaderUtil; import org.jboss.resteasy.reactive.common.util.CaseInsensitiveMap; import org.jboss.resteasy.reactive.common.util.UnmodifiableMultivaluedMap; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/OutboundSseEventImpl.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/OutboundSseEventImpl.java index 72137a4632817..0b2705f1a2759 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/OutboundSseEventImpl.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/OutboundSseEventImpl.java @@ -2,6 +2,7 @@ import java.lang.reflect.Type; import java.util.Objects; + import javax.ws.rs.core.GenericEntity; import javax.ws.rs.core.GenericType; import javax.ws.rs.core.MediaType; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/ProvidersImpl.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/ProvidersImpl.java index 9e1c0298d1864..ac7e8a9a4de4d 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/ProvidersImpl.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/ProvidersImpl.java @@ -4,6 +4,7 @@ import java.lang.reflect.Type; import java.util.List; import java.util.Map; + import javax.ws.rs.RuntimeType; import javax.ws.rs.core.MediaType; import javax.ws.rs.ext.ContextResolver; @@ -11,6 +12,7 @@ import javax.ws.rs.ext.MessageBodyReader; import javax.ws.rs.ext.MessageBodyWriter; import javax.ws.rs.ext.Providers; + import org.jboss.resteasy.reactive.server.core.Deployment; public class ProvidersImpl implements Providers { diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/ReaderInterceptorContextImpl.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/ReaderInterceptorContextImpl.java index 6110eab50d810..26573557b73ae 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/ReaderInterceptorContextImpl.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/ReaderInterceptorContextImpl.java @@ -5,6 +5,7 @@ import java.lang.annotation.Annotation; import java.lang.reflect.Type; import java.util.List; + import javax.ws.rs.NotSupportedException; import javax.ws.rs.RuntimeType; import javax.ws.rs.WebApplicationException; @@ -13,6 +14,7 @@ import javax.ws.rs.ext.MessageBodyReader; import javax.ws.rs.ext.ReaderInterceptor; import javax.ws.rs.ext.ReaderInterceptorContext; + import org.jboss.resteasy.reactive.common.util.CaseInsensitiveMap; import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext; import org.jboss.resteasy.reactive.server.core.ServerSerialisers; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/RequestImpl.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/RequestImpl.java index 0f7763f13066a..d00022cf00c00 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/RequestImpl.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/RequestImpl.java @@ -3,12 +3,14 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; + import javax.ws.rs.core.EntityTag; import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.MultivaluedMap; import javax.ws.rs.core.Request; import javax.ws.rs.core.Response; import javax.ws.rs.core.Variant; + import org.jboss.resteasy.reactive.common.jaxrs.AbstractResponseBuilder; import org.jboss.resteasy.reactive.common.util.DateUtil; import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/ResponseBuilderImpl.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/ResponseBuilderImpl.java index e89a66a885e00..1c63e1cd14415 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/ResponseBuilderImpl.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/ResponseBuilderImpl.java @@ -2,8 +2,10 @@ import java.net.URI; import java.net.URISyntaxException; + import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.Response; + import org.jboss.resteasy.reactive.common.jaxrs.AbstractResponseBuilder; import org.jboss.resteasy.reactive.server.core.CurrentRequestManager; import org.jboss.resteasy.reactive.server.core.Deployment; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/RestResponseBuilderImpl.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/RestResponseBuilderImpl.java index 0afea0a790248..54aff4e66ecaf 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/RestResponseBuilderImpl.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/RestResponseBuilderImpl.java @@ -2,7 +2,9 @@ import java.net.URI; import java.net.URISyntaxException; + import javax.ws.rs.core.HttpHeaders; + import org.jboss.resteasy.reactive.RestResponse; import org.jboss.resteasy.reactive.common.jaxrs.AbstractRestResponseBuilder; import org.jboss.resteasy.reactive.server.core.CurrentRequestManager; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/SseBroadcasterImpl.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/SseBroadcasterImpl.java index 77d9db7142966..1a5b77c30badc 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/SseBroadcasterImpl.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/SseBroadcasterImpl.java @@ -7,6 +7,7 @@ import java.util.concurrent.CompletionStage; import java.util.function.BiConsumer; import java.util.function.Consumer; + import javax.ws.rs.sse.OutboundSseEvent; import javax.ws.rs.sse.SseBroadcaster; import javax.ws.rs.sse.SseEventSink; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/SseEventSinkImpl.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/SseEventSinkImpl.java index 48735ac388c20..faed79cdc9788 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/SseEventSinkImpl.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/SseEventSinkImpl.java @@ -3,8 +3,10 @@ import java.util.Collections; import java.util.concurrent.CompletionStage; import java.util.function.Consumer; + import javax.ws.rs.sse.OutboundSseEvent; import javax.ws.rs.sse.SseEventSink; + import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext; import org.jboss.resteasy.reactive.server.core.SseUtil; import org.jboss.resteasy.reactive.server.spi.ServerHttpResponse; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/UriInfoImpl.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/UriInfoImpl.java index fd224ab2efc45..f6a55ea04f3cd 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/UriInfoImpl.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/UriInfoImpl.java @@ -7,10 +7,12 @@ import java.util.Collections; import java.util.List; import java.util.Map.Entry; + import javax.ws.rs.core.MultivaluedMap; import javax.ws.rs.core.PathSegment; import javax.ws.rs.core.UriBuilder; import javax.ws.rs.core.UriInfo; + import org.jboss.resteasy.reactive.common.jaxrs.UriBuilderImpl; import org.jboss.resteasy.reactive.common.util.PathSegmentImpl; import org.jboss.resteasy.reactive.common.util.QuarkusMultivaluedHashMap; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/WriterInterceptorContextImpl.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/WriterInterceptorContextImpl.java index c43fb6347c9f1..f822e44002d6e 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/WriterInterceptorContextImpl.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/WriterInterceptorContextImpl.java @@ -5,6 +5,7 @@ import java.lang.annotation.Annotation; import java.lang.reflect.Type; import java.util.List; + import javax.ws.rs.InternalServerErrorException; import javax.ws.rs.RuntimeType; import javax.ws.rs.WebApplicationException; @@ -14,6 +15,7 @@ import javax.ws.rs.ext.MessageBodyWriter; import javax.ws.rs.ext.WriterInterceptor; import javax.ws.rs.ext.WriterInterceptorContext; + import org.jboss.resteasy.reactive.common.util.CaseInsensitiveMap; import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext; import org.jboss.resteasy.reactive.server.core.ServerSerialisers; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/mapping/RequestMapper.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/mapping/RequestMapper.java index d291f4ad1799a..331e30f1b0505 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/mapping/RequestMapper.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/mapping/RequestMapper.java @@ -7,6 +7,7 @@ import java.util.List; import java.util.Map; import java.util.regex.Matcher; + import org.jboss.resteasy.reactive.common.util.URIDecoder; public class RequestMapper { diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/mapping/RuntimeResource.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/mapping/RuntimeResource.java index 7cf24c36dd226..1af8e2ef6c0bb 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/mapping/RuntimeResource.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/mapping/RuntimeResource.java @@ -3,7 +3,9 @@ import java.lang.reflect.Type; import java.util.List; import java.util.Map; + import javax.ws.rs.core.MediaType; + import org.jboss.resteasy.reactive.common.model.ResourceExceptionMapper; import org.jboss.resteasy.reactive.common.util.ServerMediaType; import org.jboss.resteasy.reactive.server.SimpleResourceInfo; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/model/ContextResolvers.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/model/ContextResolvers.java index 3dd46fc36f170..c67ade81d73af 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/model/ContextResolvers.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/model/ContextResolvers.java @@ -6,8 +6,10 @@ import java.util.List; import java.util.Map; import java.util.function.Function; + import javax.ws.rs.core.MediaType; import javax.ws.rs.ext.ContextResolver; + import org.jboss.resteasy.reactive.common.model.ResourceContextResolver; import org.jboss.resteasy.reactive.common.util.MediaTypeHelper; import org.jboss.resteasy.reactive.server.jaxrs.ContextResolverDelegate; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/model/DynamicFeatures.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/model/DynamicFeatures.java index 78375bf3dc37b..930ec633e64ae 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/model/DynamicFeatures.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/model/DynamicFeatures.java @@ -3,7 +3,9 @@ import java.util.ArrayList; import java.util.List; import java.util.function.Function; + import javax.ws.rs.container.DynamicFeature; + import org.jboss.resteasy.reactive.common.model.ResourceDynamicFeature; import org.jboss.resteasy.reactive.spi.BeanFactory; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/model/Features.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/model/Features.java index 3c7e599f4cbbc..bf46d48c59d3e 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/model/Features.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/model/Features.java @@ -3,7 +3,9 @@ import java.util.ArrayList; import java.util.List; import java.util.function.Function; + import javax.ws.rs.core.Feature; + import org.jboss.resteasy.reactive.common.model.ResourceFeature; import org.jboss.resteasy.reactive.spi.BeanFactory; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/model/FixedHandlerChainCustomizer.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/model/FixedHandlerChainCustomizer.java index 015b4962c3933..d292698cf30a7 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/model/FixedHandlerChainCustomizer.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/model/FixedHandlerChainCustomizer.java @@ -2,6 +2,7 @@ import java.util.Collections; import java.util.List; + import org.jboss.resteasy.reactive.common.model.ResourceClass; import org.jboss.resteasy.reactive.server.spi.ServerRestHandler; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/model/FixedHandlersChainCustomizer.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/model/FixedHandlersChainCustomizer.java index 94fc00779f09e..be844a7465322 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/model/FixedHandlersChainCustomizer.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/model/FixedHandlersChainCustomizer.java @@ -2,6 +2,7 @@ import java.util.Collections; import java.util.List; + import org.jboss.resteasy.reactive.common.model.ResourceClass; import org.jboss.resteasy.reactive.server.spi.ServerRestHandler; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/model/HandlerChainCustomizer.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/model/HandlerChainCustomizer.java index ba82360ad8927..b86547d71ff15 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/model/HandlerChainCustomizer.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/model/HandlerChainCustomizer.java @@ -3,8 +3,10 @@ import java.util.Collections; import java.util.List; import java.util.function.Supplier; + import javax.ws.rs.core.Response; import javax.ws.rs.core.Response.ResponseBuilder; + import org.jboss.resteasy.reactive.RestResponse; import org.jboss.resteasy.reactive.common.model.ResourceClass; import org.jboss.resteasy.reactive.server.handlers.PublisherResponseHandler; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/model/ParamConverterProviders.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/model/ParamConverterProviders.java index d2c3dd95a8f25..e2b510467e183 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/model/ParamConverterProviders.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/model/ParamConverterProviders.java @@ -4,7 +4,9 @@ import java.util.Collections; import java.util.List; import java.util.function.Function; + import javax.ws.rs.ext.ParamConverterProvider; + import org.jboss.resteasy.reactive.common.model.ResourceParamConverterProvider; import org.jboss.resteasy.reactive.spi.BeanFactory; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/model/ServerMethodParameter.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/model/ServerMethodParameter.java index b502d94579bfe..82ffe380fe9e9 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/model/ServerMethodParameter.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/model/ServerMethodParameter.java @@ -1,6 +1,7 @@ package org.jboss.resteasy.reactive.server.model; import java.util.Objects; + import org.jboss.resteasy.reactive.common.model.MethodParameter; import org.jboss.resteasy.reactive.common.model.ParameterType; import org.jboss.resteasy.reactive.server.core.parameters.ParameterExtractor; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/model/ServerResourceMethod.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/model/ServerResourceMethod.java index e1719217f365b..8775cd8eb7980 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/model/ServerResourceMethod.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/model/ServerResourceMethod.java @@ -4,6 +4,7 @@ import java.util.List; import java.util.Set; import java.util.function.Supplier; + import org.jboss.resteasy.reactive.common.model.MethodParameter; import org.jboss.resteasy.reactive.common.model.ResourceMethod; import org.jboss.resteasy.reactive.server.core.parameters.ParameterExtractor; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerBooleanMessageBodyHandler.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerBooleanMessageBodyHandler.java index 5923cf08ced2d..57c631c833a27 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerBooleanMessageBodyHandler.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerBooleanMessageBodyHandler.java @@ -2,9 +2,11 @@ import java.io.IOException; import java.lang.reflect.Type; + import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.MediaType; import javax.ws.rs.ext.Provider; + import org.jboss.resteasy.reactive.common.providers.serialisers.BooleanMessageBodyHandler; import org.jboss.resteasy.reactive.server.spi.ResteasyReactiveResourceInfo; import org.jboss.resteasy.reactive.server.spi.ServerMessageBodyReader; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerByteArrayMessageBodyHandler.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerByteArrayMessageBodyHandler.java index dc2d6e98612b3..179b7ad9d40a1 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerByteArrayMessageBodyHandler.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerByteArrayMessageBodyHandler.java @@ -2,9 +2,11 @@ import java.io.IOException; import java.lang.reflect.Type; + import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.MediaType; import javax.ws.rs.ext.Provider; + import org.jboss.resteasy.reactive.common.providers.serialisers.ByteArrayMessageBodyHandler; import org.jboss.resteasy.reactive.common.providers.serialisers.MessageReaderUtil; import org.jboss.resteasy.reactive.server.spi.ResteasyReactiveResourceInfo; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerCharArrayMessageBodyHandler.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerCharArrayMessageBodyHandler.java index 7fb4e97fdf1fb..d853248c25e62 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerCharArrayMessageBodyHandler.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerCharArrayMessageBodyHandler.java @@ -2,9 +2,11 @@ import java.io.IOException; import java.lang.reflect.Type; + import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.MediaType; import javax.ws.rs.ext.Provider; + import org.jboss.resteasy.reactive.common.providers.serialisers.CharArrayMessageBodyHandler; import org.jboss.resteasy.reactive.common.providers.serialisers.MessageReaderUtil; import org.jboss.resteasy.reactive.server.spi.ResteasyReactiveResourceInfo; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerCharacterMessageBodyHandler.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerCharacterMessageBodyHandler.java index 26958fd737e68..5b7bbef52b761 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerCharacterMessageBodyHandler.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerCharacterMessageBodyHandler.java @@ -2,9 +2,11 @@ import java.io.IOException; import java.lang.reflect.Type; + import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.MediaType; import javax.ws.rs.ext.Provider; + import org.jboss.resteasy.reactive.common.providers.serialisers.CharacterMessageBodyHandler; import org.jboss.resteasy.reactive.server.spi.ResteasyReactiveResourceInfo; import org.jboss.resteasy.reactive.server.spi.ServerMessageBodyReader; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerDefaultTextPlainBodyHandler.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerDefaultTextPlainBodyHandler.java index 97169acf86363..9bf58af235dad 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerDefaultTextPlainBodyHandler.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerDefaultTextPlainBodyHandler.java @@ -2,6 +2,7 @@ import java.io.IOException; import java.lang.reflect.Type; + import javax.ws.rs.BadRequestException; import javax.ws.rs.Consumes; import javax.ws.rs.ProcessingException; @@ -9,6 +10,7 @@ import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; import javax.ws.rs.ext.Provider; + import org.jboss.resteasy.reactive.common.providers.serialisers.DefaultTextPlainBodyHandler; import org.jboss.resteasy.reactive.server.spi.ResteasyReactiveResourceInfo; import org.jboss.resteasy.reactive.server.spi.ServerMessageBodyReader; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerFileBodyHandler.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerFileBodyHandler.java index 4cc98c58c3c9b..96a9280a5db8b 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerFileBodyHandler.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerFileBodyHandler.java @@ -3,11 +3,13 @@ import java.io.File; import java.lang.annotation.Annotation; import java.lang.reflect.Type; + import javax.ws.rs.Consumes; import javax.ws.rs.Produces; import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.MediaType; import javax.ws.rs.ext.Provider; + import org.jboss.resteasy.reactive.common.providers.serialisers.FileBodyHandler; import org.jboss.resteasy.reactive.server.spi.ResteasyReactiveResourceInfo; import org.jboss.resteasy.reactive.server.spi.ServerMessageBodyWriter; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerFilePartBodyHandler.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerFilePartBodyHandler.java index fcf169fb58f7a..ed08a6b5c1e28 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerFilePartBodyHandler.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerFilePartBodyHandler.java @@ -2,11 +2,13 @@ import java.lang.annotation.Annotation; import java.lang.reflect.Type; + import javax.ws.rs.Consumes; import javax.ws.rs.Produces; import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.MediaType; import javax.ws.rs.ext.Provider; + import org.jboss.resteasy.reactive.FilePart; import org.jboss.resteasy.reactive.common.providers.serialisers.FilePartBodyHandler; import org.jboss.resteasy.reactive.server.spi.ResteasyReactiveResourceInfo; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerFormUrlEncodedProvider.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerFormUrlEncodedProvider.java index e80d1f21ce29c..8816b553e3098 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerFormUrlEncodedProvider.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerFormUrlEncodedProvider.java @@ -3,6 +3,7 @@ import java.io.IOException; import java.io.UnsupportedEncodingException; import java.lang.reflect.Type; + import javax.ws.rs.ConstrainedTo; import javax.ws.rs.Consumes; import javax.ws.rs.Produces; @@ -11,6 +12,7 @@ import javax.ws.rs.core.MediaType; import javax.ws.rs.core.MultivaluedMap; import javax.ws.rs.ext.Provider; + import org.jboss.resteasy.reactive.common.providers.serialisers.MapAsFormUrlEncodedProvider; import org.jboss.resteasy.reactive.common.providers.serialisers.MessageReaderUtil; import org.jboss.resteasy.reactive.server.spi.ResteasyReactiveResourceInfo; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerInputStreamMessageBodyHandler.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerInputStreamMessageBodyHandler.java index 6424d3fce6c83..279eea052b6b6 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerInputStreamMessageBodyHandler.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerInputStreamMessageBodyHandler.java @@ -4,9 +4,11 @@ import java.io.InputStream; import java.lang.annotation.Annotation; import java.lang.reflect.Type; + import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.MediaType; import javax.ws.rs.ext.Provider; + import org.jboss.resteasy.reactive.common.providers.serialisers.InputStreamMessageBodyHandler; import org.jboss.resteasy.reactive.server.spi.ResteasyReactiveResourceInfo; import org.jboss.resteasy.reactive.server.spi.ServerMessageBodyReader; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerNumberMessageBodyHandler.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerNumberMessageBodyHandler.java index 8163240ccdafb..35819c4697228 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerNumberMessageBodyHandler.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerNumberMessageBodyHandler.java @@ -2,9 +2,11 @@ import java.io.IOException; import java.lang.reflect.Type; + import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.MediaType; import javax.ws.rs.ext.Provider; + import org.jboss.resteasy.reactive.common.providers.serialisers.NumberMessageBodyHandler; import org.jboss.resteasy.reactive.server.spi.ResteasyReactiveResourceInfo; import org.jboss.resteasy.reactive.server.spi.ServerMessageBodyReader; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerPathBodyHandler.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerPathBodyHandler.java index 38c4b7278d207..7183a8c02d856 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerPathBodyHandler.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerPathBodyHandler.java @@ -5,10 +5,12 @@ import java.lang.annotation.Annotation; import java.lang.reflect.Type; import java.nio.file.Files; + import javax.ws.rs.Produces; import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.MediaType; import javax.ws.rs.ext.Provider; + import org.jboss.resteasy.reactive.common.providers.serialisers.PathBodyHandler; import org.jboss.resteasy.reactive.server.spi.ResteasyReactiveResourceInfo; import org.jboss.resteasy.reactive.server.spi.ServerHttpResponse; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerPathPartBodyHandler.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerPathPartBodyHandler.java index bd586839c22df..ff2cfcaa5f5cc 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerPathPartBodyHandler.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerPathPartBodyHandler.java @@ -5,10 +5,12 @@ import java.lang.annotation.Annotation; import java.lang.reflect.Type; import java.nio.file.Files; + import javax.ws.rs.Produces; import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.MediaType; import javax.ws.rs.ext.Provider; + import org.jboss.resteasy.reactive.PathPart; import org.jboss.resteasy.reactive.common.providers.serialisers.PathPartBodyHandler; import org.jboss.resteasy.reactive.server.spi.ResteasyReactiveResourceInfo; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerReaderBodyHandler.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerReaderBodyHandler.java index 789bf1d5229be..e1b6e2c8dc886 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerReaderBodyHandler.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerReaderBodyHandler.java @@ -5,8 +5,10 @@ import java.io.Reader; import java.lang.annotation.Annotation; import java.lang.reflect.Type; + import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.MediaType; + import org.jboss.resteasy.reactive.common.providers.serialisers.MessageReaderUtil; import org.jboss.resteasy.reactive.common.providers.serialisers.ReaderBodyHandler; import org.jboss.resteasy.reactive.server.spi.ResteasyReactiveResourceInfo; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerStringMessageBodyHandler.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerStringMessageBodyHandler.java index 55d250874d185..f4dbf1898226d 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerStringMessageBodyHandler.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerStringMessageBodyHandler.java @@ -2,9 +2,11 @@ import java.io.IOException; import java.lang.reflect.Type; + import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.MediaType; import javax.ws.rs.ext.Provider; + import org.jboss.resteasy.reactive.common.providers.serialisers.StringMessageBodyHandler; import org.jboss.resteasy.reactive.server.spi.ResteasyReactiveResourceInfo; import org.jboss.resteasy.reactive.server.spi.ServerMessageBodyReader; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/jsonp/ServerJsonArrayHandler.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/jsonp/ServerJsonArrayHandler.java index 94a6ac374b457..bf05713943b1c 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/jsonp/ServerJsonArrayHandler.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/jsonp/ServerJsonArrayHandler.java @@ -2,10 +2,12 @@ import java.io.ByteArrayOutputStream; import java.lang.reflect.Type; + import javax.json.JsonArray; import javax.json.JsonWriter; import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.MediaType; + import org.jboss.resteasy.reactive.common.providers.serialisers.jsonp.JsonArrayHandler; import org.jboss.resteasy.reactive.common.providers.serialisers.jsonp.JsonpUtil; import org.jboss.resteasy.reactive.server.spi.ResteasyReactiveResourceInfo; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/jsonp/ServerJsonObjectHandler.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/jsonp/ServerJsonObjectHandler.java index 0fb229a16cfef..db5d1edac36cb 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/jsonp/ServerJsonObjectHandler.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/jsonp/ServerJsonObjectHandler.java @@ -2,10 +2,12 @@ import java.io.ByteArrayOutputStream; import java.lang.reflect.Type; + import javax.json.JsonObject; import javax.json.JsonWriter; import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.MediaType; + import org.jboss.resteasy.reactive.common.providers.serialisers.jsonp.JsonObjectHandler; import org.jboss.resteasy.reactive.common.providers.serialisers.jsonp.JsonpUtil; import org.jboss.resteasy.reactive.server.spi.ResteasyReactiveResourceInfo; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/jsonp/ServerJsonStructureHandler.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/jsonp/ServerJsonStructureHandler.java index 8e3fe16ddbbed..02d18b294ac33 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/jsonp/ServerJsonStructureHandler.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/jsonp/ServerJsonStructureHandler.java @@ -2,11 +2,13 @@ import java.io.ByteArrayOutputStream; import java.lang.reflect.Type; + import javax.json.JsonObject; import javax.json.JsonStructure; import javax.json.JsonWriter; import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.MediaType; + import org.jboss.resteasy.reactive.common.providers.serialisers.jsonp.JsonStructureHandler; import org.jboss.resteasy.reactive.common.providers.serialisers.jsonp.JsonpUtil; import org.jboss.resteasy.reactive.server.spi.ResteasyReactiveResourceInfo; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/jsonp/ServerJsonValueHandler.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/jsonp/ServerJsonValueHandler.java index 9623eaa903311..0dfc64efef638 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/jsonp/ServerJsonValueHandler.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/jsonp/ServerJsonValueHandler.java @@ -2,10 +2,12 @@ import java.io.ByteArrayOutputStream; import java.lang.reflect.Type; + import javax.json.JsonValue; import javax.json.JsonWriter; import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.MediaType; + import org.jboss.resteasy.reactive.common.providers.serialisers.jsonp.JsonValueHandler; import org.jboss.resteasy.reactive.common.providers.serialisers.jsonp.JsonpUtil; import org.jboss.resteasy.reactive.server.spi.ResteasyReactiveResourceInfo; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/spi/ResteasyReactiveContainerRequestFilter.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/spi/ResteasyReactiveContainerRequestFilter.java index 1d632ce9ee687..0df3b8685329f 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/spi/ResteasyReactiveContainerRequestFilter.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/spi/ResteasyReactiveContainerRequestFilter.java @@ -1,6 +1,7 @@ package org.jboss.resteasy.reactive.server.spi; import java.io.IOException; + import javax.ws.rs.container.ContainerRequestContext; import javax.ws.rs.container.ContainerRequestFilter; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/spi/ResteasyReactiveResourceInfo.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/spi/ResteasyReactiveResourceInfo.java index 4d9da9f5e0f15..f0505af02c6dd 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/spi/ResteasyReactiveResourceInfo.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/spi/ResteasyReactiveResourceInfo.java @@ -4,7 +4,9 @@ import java.lang.reflect.Method; import java.lang.reflect.Type; import java.util.Set; + import javax.ws.rs.container.ResourceInfo; + import org.jboss.resteasy.reactive.server.util.MethodId; /** diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/spi/ServerHttpRequest.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/spi/ServerHttpRequest.java index 1a06d63fc467c..53c2d6ea0c05a 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/spi/ServerHttpRequest.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/spi/ServerHttpRequest.java @@ -5,6 +5,7 @@ import java.util.Collection; import java.util.List; import java.util.Map; + import org.jboss.resteasy.reactive.server.core.multipart.FormData; public interface ServerHttpRequest { diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/spi/ServerHttpResponse.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/spi/ServerHttpResponse.java index 575f65089505c..69ab2839b7512 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/spi/ServerHttpResponse.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/spi/ServerHttpResponse.java @@ -4,6 +4,7 @@ import java.util.Map; import java.util.concurrent.CompletionStage; import java.util.function.Consumer; + import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext; public interface ServerHttpResponse extends StreamingResponse { diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/spi/ServerMessageBodyReader.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/spi/ServerMessageBodyReader.java index 956232859e503..0a71553cda9a0 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/spi/ServerMessageBodyReader.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/spi/ServerMessageBodyReader.java @@ -2,6 +2,7 @@ import java.io.IOException; import java.lang.reflect.Type; + import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.MediaType; import javax.ws.rs.ext.MessageBodyReader; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/spi/ServerMessageBodyWriter.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/spi/ServerMessageBodyWriter.java index de57e5ce14fb2..2ed5d0a0bd9a4 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/spi/ServerMessageBodyWriter.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/spi/ServerMessageBodyWriter.java @@ -3,9 +3,11 @@ import java.io.IOException; import java.lang.annotation.Annotation; import java.lang.reflect.Type; + import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.MediaType; import javax.ws.rs.ext.MessageBodyWriter; + import org.jboss.resteasy.reactive.common.types.AllWriteableMarker; /** diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/spi/ServerRequestContext.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/spi/ServerRequestContext.java index f0f0d51cd21dc..00b4b0afa342c 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/spi/ServerRequestContext.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/spi/ServerRequestContext.java @@ -2,8 +2,10 @@ import java.io.InputStream; import java.io.OutputStream; + import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; + import org.jboss.resteasy.reactive.common.core.ResteasyReactiveCallbackContext; public interface ServerRequestContext extends ResteasyReactiveCallbackContext { diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/util/RuntimeResourceVisitor.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/util/RuntimeResourceVisitor.java index ede9bfd7425df..5746334a40581 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/util/RuntimeResourceVisitor.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/util/RuntimeResourceVisitor.java @@ -2,6 +2,7 @@ import java.util.List; import java.util.Map; + import org.jboss.resteasy.reactive.server.handlers.ClassRoutingHandler; import org.jboss.resteasy.reactive.server.handlers.RestInitialHandler; import org.jboss.resteasy.reactive.server.mapping.RequestMapper; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/util/ScoreSystem.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/util/ScoreSystem.java index 03edbd9570d92..99463f7a71be2 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/util/ScoreSystem.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/util/ScoreSystem.java @@ -6,8 +6,10 @@ import java.util.List; import java.util.Map; import java.util.Map.Entry; + import javax.ws.rs.core.MediaType; import javax.ws.rs.ext.MessageBodyWriter; + import org.jboss.resteasy.reactive.common.util.ServerMediaType; import org.jboss.resteasy.reactive.server.handlers.ResourceRequestFilterHandler; import org.jboss.resteasy.reactive.server.mapping.RuntimeResource; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/test/java/org/jboss/resteasy/reactive/server/handlers/FormBodyHandlerTest.java b/independent-projects/resteasy-reactive/server/runtime/src/test/java/org/jboss/resteasy/reactive/server/handlers/FormBodyHandlerTest.java index 420b69a90c8a7..251d8c8976238 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/test/java/org/jboss/resteasy/reactive/server/handlers/FormBodyHandlerTest.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/test/java/org/jboss/resteasy/reactive/server/handlers/FormBodyHandlerTest.java @@ -5,6 +5,7 @@ import java.io.ByteArrayInputStream; import java.io.IOException; + import org.junit.jupiter.api.Test; public class FormBodyHandlerTest { diff --git a/independent-projects/resteasy-reactive/server/vertx/src/main/java/org/jboss/resteasy/reactive/server/vertx/ResteasyReactiveOutputStream.java b/independent-projects/resteasy-reactive/server/vertx/src/main/java/org/jboss/resteasy/reactive/server/vertx/ResteasyReactiveOutputStream.java index d982f0eb20cec..7d8b00d4faaee 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/main/java/org/jboss/resteasy/reactive/server/vertx/ResteasyReactiveOutputStream.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/main/java/org/jboss/resteasy/reactive/server/vertx/ResteasyReactiveOutputStream.java @@ -1,23 +1,26 @@ package org.jboss.resteasy.reactive.server.vertx; -import io.netty.buffer.ByteBuf; -import io.netty.buffer.PooledByteBufAllocator; -import io.netty.handler.codec.http.HttpHeaderNames; -import io.vertx.core.AsyncResult; -import io.vertx.core.Context; -import io.vertx.core.Handler; -import io.vertx.core.buffer.Buffer; -import io.vertx.core.http.HttpServerRequest; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InterruptedIOException; import java.io.OutputStream; + import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.MultivaluedMap; + import org.jboss.logging.Logger; import org.jboss.resteasy.reactive.server.core.LazyResponse; import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext; +import io.netty.buffer.ByteBuf; +import io.netty.buffer.PooledByteBufAllocator; +import io.netty.handler.codec.http.HttpHeaderNames; +import io.vertx.core.AsyncResult; +import io.vertx.core.Context; +import io.vertx.core.Handler; +import io.vertx.core.buffer.Buffer; +import io.vertx.core.http.HttpServerRequest; + public class ResteasyReactiveOutputStream extends OutputStream { private static final Logger log = Logger.getLogger("org.jboss.resteasy.reactive.server.vertx.ResteasyReactiveOutputStream"); diff --git a/independent-projects/resteasy-reactive/server/vertx/src/main/java/org/jboss/resteasy/reactive/server/vertx/ResteasyReactiveVertxHandler.java b/independent-projects/resteasy-reactive/server/vertx/src/main/java/org/jboss/resteasy/reactive/server/vertx/ResteasyReactiveVertxHandler.java index 3ff1635e2aa96..b34cb703cf8ae 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/main/java/org/jboss/resteasy/reactive/server/vertx/ResteasyReactiveVertxHandler.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/main/java/org/jboss/resteasy/reactive/server/vertx/ResteasyReactiveVertxHandler.java @@ -1,8 +1,9 @@ package org.jboss.resteasy.reactive.server.vertx; +import org.jboss.resteasy.reactive.server.handlers.RestInitialHandler; + import io.vertx.core.Handler; import io.vertx.ext.web.RoutingContext; -import org.jboss.resteasy.reactive.server.handlers.RestInitialHandler; public class ResteasyReactiveVertxHandler implements Handler { diff --git a/independent-projects/resteasy-reactive/server/vertx/src/main/java/org/jboss/resteasy/reactive/server/vertx/VertxBufferImpl.java b/independent-projects/resteasy-reactive/server/vertx/src/main/java/org/jboss/resteasy/reactive/server/vertx/VertxBufferImpl.java index 70aa066a7087b..0d5970c086308 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/main/java/org/jboss/resteasy/reactive/server/vertx/VertxBufferImpl.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/main/java/org/jboss/resteasy/reactive/server/vertx/VertxBufferImpl.java @@ -1,5 +1,10 @@ package org.jboss.resteasy.reactive.server.vertx; +import java.nio.ByteBuffer; +import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; +import java.util.Objects; + import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import io.netty.util.CharsetUtil; @@ -7,10 +12,6 @@ import io.vertx.core.impl.Arguments; import io.vertx.core.json.JsonArray; import io.vertx.core.json.JsonObject; -import java.nio.ByteBuffer; -import java.nio.charset.Charset; -import java.nio.charset.StandardCharsets; -import java.util.Objects; public class VertxBufferImpl implements Buffer { diff --git a/independent-projects/resteasy-reactive/server/vertx/src/main/java/org/jboss/resteasy/reactive/server/vertx/VertxInputStream.java b/independent-projects/resteasy-reactive/server/vertx/src/main/java/org/jboss/resteasy/reactive/server/vertx/VertxInputStream.java index 61529391d38b1..c30afb92de7ba 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/main/java/org/jboss/resteasy/reactive/server/vertx/VertxInputStream.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/main/java/org/jboss/resteasy/reactive/server/vertx/VertxInputStream.java @@ -1,5 +1,14 @@ package org.jboss.resteasy.reactive.server.vertx; +import java.io.IOException; +import java.io.InputStream; +import java.io.InterruptedIOException; +import java.nio.channels.ClosedChannelException; +import java.util.ArrayDeque; +import java.util.Deque; + +import org.jboss.resteasy.reactive.common.core.BlockingNotAllowedException; + import io.netty.buffer.ByteBuf; import io.netty.handler.codec.http.HttpHeaderNames; import io.netty.handler.codec.http.HttpResponseStatus; @@ -11,13 +20,6 @@ import io.vertx.core.http.HttpServerResponse; import io.vertx.core.net.impl.ConnectionBase; import io.vertx.ext.web.RoutingContext; -import java.io.IOException; -import java.io.InputStream; -import java.io.InterruptedIOException; -import java.nio.channels.ClosedChannelException; -import java.util.ArrayDeque; -import java.util.Deque; -import org.jboss.resteasy.reactive.common.core.BlockingNotAllowedException; public class VertxInputStream extends InputStream { diff --git a/independent-projects/resteasy-reactive/server/vertx/src/main/java/org/jboss/resteasy/reactive/server/vertx/VertxRequestContextFactory.java b/independent-projects/resteasy-reactive/server/vertx/src/main/java/org/jboss/resteasy/reactive/server/vertx/VertxRequestContextFactory.java index 3352eb2967945..b4d9f77f6c274 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/main/java/org/jboss/resteasy/reactive/server/vertx/VertxRequestContextFactory.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/main/java/org/jboss/resteasy/reactive/server/vertx/VertxRequestContextFactory.java @@ -1,6 +1,5 @@ package org.jboss.resteasy.reactive.server.vertx; -import io.vertx.ext.web.RoutingContext; import org.jboss.resteasy.reactive.server.core.Deployment; import org.jboss.resteasy.reactive.server.core.RequestContextFactory; import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext; @@ -8,6 +7,8 @@ import org.jboss.resteasy.reactive.server.spi.ServerRestHandler; import org.jboss.resteasy.reactive.spi.ThreadSetupAction; +import io.vertx.ext.web.RoutingContext; + public class VertxRequestContextFactory implements RequestContextFactory { @Override public ResteasyReactiveRequestContext createContext(Deployment deployment, diff --git a/independent-projects/resteasy-reactive/server/vertx/src/main/java/org/jboss/resteasy/reactive/server/vertx/VertxResteasyReactiveRequestContext.java b/independent-projects/resteasy-reactive/server/vertx/src/main/java/org/jboss/resteasy/reactive/server/vertx/VertxResteasyReactiveRequestContext.java index b65849dfd66a0..8d09ae9be4a98 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/main/java/org/jboss/resteasy/reactive/server/vertx/VertxResteasyReactiveRequestContext.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/main/java/org/jboss/resteasy/reactive/server/vertx/VertxResteasyReactiveRequestContext.java @@ -1,19 +1,5 @@ package org.jboss.resteasy.reactive.server.vertx; -import io.netty.buffer.Unpooled; -import io.netty.channel.EventLoop; -import io.netty.handler.codec.http.HttpHeaderNames; -import io.netty.util.concurrent.ScheduledFuture; -import io.vertx.core.AsyncResult; -import io.vertx.core.Context; -import io.vertx.core.Handler; -import io.vertx.core.Vertx; -import io.vertx.core.buffer.Buffer; -import io.vertx.core.http.HttpServerRequest; -import io.vertx.core.http.HttpServerResponse; -import io.vertx.core.http.impl.Http1xServerResponse; -import io.vertx.core.net.impl.ConnectionBase; -import io.vertx.ext.web.RoutingContext; import java.io.ByteArrayInputStream; import java.io.InputStream; import java.io.OutputStream; @@ -27,7 +13,9 @@ import java.util.concurrent.Executor; import java.util.concurrent.TimeUnit; import java.util.function.Consumer; + import javax.ws.rs.core.HttpHeaders; + import org.jboss.resteasy.reactive.common.util.CaseInsensitiveMap; import org.jboss.resteasy.reactive.server.core.Deployment; import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext; @@ -38,6 +26,21 @@ import org.jboss.resteasy.reactive.server.spi.ServerRestHandler; import org.jboss.resteasy.reactive.spi.ThreadSetupAction; +import io.netty.buffer.Unpooled; +import io.netty.channel.EventLoop; +import io.netty.handler.codec.http.HttpHeaderNames; +import io.netty.util.concurrent.ScheduledFuture; +import io.vertx.core.AsyncResult; +import io.vertx.core.Context; +import io.vertx.core.Handler; +import io.vertx.core.Vertx; +import io.vertx.core.buffer.Buffer; +import io.vertx.core.http.HttpServerRequest; +import io.vertx.core.http.HttpServerResponse; +import io.vertx.core.http.impl.Http1xServerResponse; +import io.vertx.core.net.impl.ConnectionBase; +import io.vertx.ext.web.RoutingContext; + public class VertxResteasyReactiveRequestContext extends ResteasyReactiveRequestContext implements ServerHttpRequest, ServerHttpResponse, Handler { diff --git a/independent-projects/resteasy-reactive/server/vertx/src/main/java/org/jboss/resteasy/reactive/server/vertx/serializers/ServerMutinyAsyncFileMessageBodyWriter.java b/independent-projects/resteasy-reactive/server/vertx/src/main/java/org/jboss/resteasy/reactive/server/vertx/serializers/ServerMutinyAsyncFileMessageBodyWriter.java index 37e5e3a6f0203..8b9f63fefff88 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/main/java/org/jboss/resteasy/reactive/server/vertx/serializers/ServerMutinyAsyncFileMessageBodyWriter.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/main/java/org/jboss/resteasy/reactive/server/vertx/serializers/ServerMutinyAsyncFileMessageBodyWriter.java @@ -1,21 +1,24 @@ package org.jboss.resteasy.reactive.server.vertx.serializers; -import io.vertx.mutiny.core.file.AsyncFile; import java.io.IOException; import java.io.OutputStream; import java.lang.annotation.Annotation; import java.lang.reflect.Type; + import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.MultivaluedMap; import javax.ws.rs.ext.Provider; + import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext; import org.jboss.resteasy.reactive.server.spi.ResteasyReactiveResourceInfo; import org.jboss.resteasy.reactive.server.spi.ServerHttpResponse; import org.jboss.resteasy.reactive.server.spi.ServerMessageBodyWriter; import org.jboss.resteasy.reactive.server.spi.ServerRequestContext; +import io.vertx.mutiny.core.file.AsyncFile; + @Provider public class ServerMutinyAsyncFileMessageBodyWriter implements ServerMessageBodyWriter { diff --git a/independent-projects/resteasy-reactive/server/vertx/src/main/java/org/jboss/resteasy/reactive/server/vertx/serializers/ServerMutinyBufferMessageBodyWriter.java b/independent-projects/resteasy-reactive/server/vertx/src/main/java/org/jboss/resteasy/reactive/server/vertx/serializers/ServerMutinyBufferMessageBodyWriter.java index 3976618044f6d..e2fbfccb92c26 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/main/java/org/jboss/resteasy/reactive/server/vertx/serializers/ServerMutinyBufferMessageBodyWriter.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/main/java/org/jboss/resteasy/reactive/server/vertx/serializers/ServerMutinyBufferMessageBodyWriter.java @@ -1,18 +1,21 @@ package org.jboss.resteasy.reactive.server.vertx.serializers; -import io.vertx.mutiny.core.buffer.Buffer; import java.io.IOException; import java.io.OutputStream; import java.lang.annotation.Annotation; import java.lang.reflect.Type; + import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.MultivaluedMap; import javax.ws.rs.ext.Provider; + import org.jboss.resteasy.reactive.server.spi.ResteasyReactiveResourceInfo; import org.jboss.resteasy.reactive.server.spi.ServerMessageBodyWriter; import org.jboss.resteasy.reactive.server.spi.ServerRequestContext; +import io.vertx.mutiny.core.buffer.Buffer; + @Provider public class ServerMutinyBufferMessageBodyWriter implements ServerMessageBodyWriter { diff --git a/independent-projects/resteasy-reactive/server/vertx/src/main/java/org/jboss/resteasy/reactive/server/vertx/serializers/ServerVertxAsyncFileMessageBodyWriter.java b/independent-projects/resteasy-reactive/server/vertx/src/main/java/org/jboss/resteasy/reactive/server/vertx/serializers/ServerVertxAsyncFileMessageBodyWriter.java index 699b06cf1ef72..b498dcbcd397b 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/main/java/org/jboss/resteasy/reactive/server/vertx/serializers/ServerVertxAsyncFileMessageBodyWriter.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/main/java/org/jboss/resteasy/reactive/server/vertx/serializers/ServerVertxAsyncFileMessageBodyWriter.java @@ -1,22 +1,25 @@ package org.jboss.resteasy.reactive.server.vertx.serializers; -import io.vertx.core.Handler; -import io.vertx.core.file.AsyncFile; import java.io.IOException; import java.io.OutputStream; import java.lang.annotation.Annotation; import java.lang.reflect.Type; + import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.MultivaluedMap; import javax.ws.rs.ext.Provider; + import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext; import org.jboss.resteasy.reactive.server.spi.ResteasyReactiveResourceInfo; import org.jboss.resteasy.reactive.server.spi.ServerHttpResponse; import org.jboss.resteasy.reactive.server.spi.ServerMessageBodyWriter; import org.jboss.resteasy.reactive.server.spi.ServerRequestContext; +import io.vertx.core.Handler; +import io.vertx.core.file.AsyncFile; + @Provider public class ServerVertxAsyncFileMessageBodyWriter implements ServerMessageBodyWriter { diff --git a/independent-projects/resteasy-reactive/server/vertx/src/main/java/org/jboss/resteasy/reactive/server/vertx/serializers/ServerVertxBufferMessageBodyWriter.java b/independent-projects/resteasy-reactive/server/vertx/src/main/java/org/jboss/resteasy/reactive/server/vertx/serializers/ServerVertxBufferMessageBodyWriter.java index 56115741c38a8..91bd04e398a24 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/main/java/org/jboss/resteasy/reactive/server/vertx/serializers/ServerVertxBufferMessageBodyWriter.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/main/java/org/jboss/resteasy/reactive/server/vertx/serializers/ServerVertxBufferMessageBodyWriter.java @@ -1,18 +1,21 @@ package org.jboss.resteasy.reactive.server.vertx.serializers; -import io.vertx.core.buffer.Buffer; import java.io.IOException; import java.io.OutputStream; import java.lang.annotation.Annotation; import java.lang.reflect.Type; + import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.MultivaluedMap; import javax.ws.rs.ext.Provider; + import org.jboss.resteasy.reactive.server.spi.ResteasyReactiveResourceInfo; import org.jboss.resteasy.reactive.server.spi.ServerMessageBodyWriter; import org.jboss.resteasy.reactive.server.spi.ServerRequestContext; +import io.vertx.core.buffer.Buffer; + @Provider public class ServerVertxBufferMessageBodyWriter implements ServerMessageBodyWriter { diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/BothBlockingAndNonBlockingOnApplicationTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/BothBlockingAndNonBlockingOnApplicationTest.java index 252fa9708fa4f..897194c8354e5 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/BothBlockingAndNonBlockingOnApplicationTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/BothBlockingAndNonBlockingOnApplicationTest.java @@ -2,19 +2,22 @@ import static org.junit.jupiter.api.Assertions.fail; -import io.smallrye.common.annotation.Blocking; -import io.smallrye.common.annotation.NonBlocking; import java.util.function.Supplier; + import javax.enterprise.inject.spi.DeploymentException; import javax.ws.rs.ApplicationPath; import javax.ws.rs.Path; import javax.ws.rs.core.Application; + import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.smallrye.common.annotation.Blocking; +import io.smallrye.common.annotation.NonBlocking; + public class BothBlockingAndNonBlockingOnApplicationTest { @RegisterExtension diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/BothBlockingAndNonBlockingOnClassTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/BothBlockingAndNonBlockingOnClassTest.java index ab87e4e5ea2bf..8775571568798 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/BothBlockingAndNonBlockingOnClassTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/BothBlockingAndNonBlockingOnClassTest.java @@ -2,17 +2,20 @@ import static org.junit.jupiter.api.Assertions.fail; -import io.smallrye.common.annotation.Blocking; -import io.smallrye.common.annotation.NonBlocking; import java.util.function.Supplier; + import javax.enterprise.inject.spi.DeploymentException; import javax.ws.rs.Path; + import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.smallrye.common.annotation.Blocking; +import io.smallrye.common.annotation.NonBlocking; + public class BothBlockingAndNonBlockingOnClassTest { @RegisterExtension diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/BothBlockingAndNonBlockingOnMethodTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/BothBlockingAndNonBlockingOnMethodTest.java index a596845ff91b4..1e68cde0e3352 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/BothBlockingAndNonBlockingOnMethodTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/BothBlockingAndNonBlockingOnMethodTest.java @@ -2,17 +2,20 @@ import static org.junit.jupiter.api.Assertions.fail; -import io.smallrye.common.annotation.Blocking; -import io.smallrye.common.annotation.NonBlocking; import java.util.function.Supplier; + import javax.enterprise.inject.spi.DeploymentException; import javax.ws.rs.Path; + import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.smallrye.common.annotation.Blocking; +import io.smallrye.common.annotation.NonBlocking; + public class BothBlockingAndNonBlockingOnMethodTest { @RegisterExtension diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/InnerClassTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/InnerClassTest.java index cb0d801561d1e..23df043ec3399 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/InnerClassTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/InnerClassTest.java @@ -2,16 +2,19 @@ import static org.junit.jupiter.api.Assertions.fail; -import io.smallrye.common.annotation.Blocking; import java.util.function.Supplier; + import javax.enterprise.inject.spi.DeploymentException; import javax.ws.rs.Path; + import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.smallrye.common.annotation.Blocking; + public class InnerClassTest { @RegisterExtension diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/MultipleHttpAnnotationsTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/MultipleHttpAnnotationsTest.java index be82716f3e4c5..558bbc21755ff 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/MultipleHttpAnnotationsTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/MultipleHttpAnnotationsTest.java @@ -3,10 +3,12 @@ import static org.junit.jupiter.api.Assertions.fail; import java.util.function.Supplier; + import javax.enterprise.inject.spi.DeploymentException; import javax.ws.rs.GET; import javax.ws.rs.POST; import javax.ws.rs.Path; + import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/SimpleVertxResteasyReactiveTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/SimpleVertxResteasyReactiveTest.java index 242ed46cf6116..6b4feb64a1e4d 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/SimpleVertxResteasyReactiveTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/SimpleVertxResteasyReactiveTest.java @@ -2,14 +2,16 @@ import static org.hamcrest.Matchers.equalTo; -import io.restassured.RestAssured; import java.util.function.Supplier; + import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.restassured.RestAssured; + public class SimpleVertxResteasyReactiveTest { @RegisterExtension diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/cache/CacheOnClassAndMethodsTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/cache/CacheOnClassAndMethodsTest.java index 615884281b322..500d8d5f93573 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/cache/CacheOnClassAndMethodsTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/cache/CacheOnClassAndMethodsTest.java @@ -2,11 +2,12 @@ import static org.hamcrest.CoreMatchers.equalTo; -import io.restassured.RestAssured; import java.util.function.Consumer; import java.util.function.Supplier; + import javax.ws.rs.GET; import javax.ws.rs.Path; + import org.jboss.resteasy.reactive.Cache; import org.jboss.resteasy.reactive.server.processor.ResteasyReactiveDeploymentManager; import org.jboss.resteasy.reactive.server.processor.scanning.CacheControlScanner; @@ -16,6 +17,8 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.restassured.RestAssured; + public class CacheOnClassAndMethodsTest { @RegisterExtension diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/cache/CacheOnMethodsTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/cache/CacheOnMethodsTest.java index d7020673a031f..c3f5930891abe 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/cache/CacheOnMethodsTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/cache/CacheOnMethodsTest.java @@ -3,11 +3,12 @@ import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.Matchers.nullValue; -import io.restassured.RestAssured; import java.util.function.Consumer; import java.util.function.Supplier; + import javax.ws.rs.GET; import javax.ws.rs.Path; + import org.jboss.resteasy.reactive.Cache; import org.jboss.resteasy.reactive.server.processor.ResteasyReactiveDeploymentManager; import org.jboss.resteasy.reactive.server.processor.scanning.CacheControlScanner; @@ -17,6 +18,8 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.restassured.RestAssured; + public class CacheOnMethodsTest { @RegisterExtension diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/cache/NoCacheOnClassAndMethodsTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/cache/NoCacheOnClassAndMethodsTest.java index ffca2705938ef..48afad37bc61a 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/cache/NoCacheOnClassAndMethodsTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/cache/NoCacheOnClassAndMethodsTest.java @@ -2,11 +2,12 @@ import static org.hamcrest.CoreMatchers.equalTo; -import io.restassured.RestAssured; import java.util.function.Consumer; import java.util.function.Supplier; + import javax.ws.rs.GET; import javax.ws.rs.Path; + import org.jboss.resteasy.reactive.NoCache; import org.jboss.resteasy.reactive.server.processor.ResteasyReactiveDeploymentManager; import org.jboss.resteasy.reactive.server.processor.scanning.CacheControlScanner; @@ -16,6 +17,8 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.restassured.RestAssured; + public class NoCacheOnClassAndMethodsTest { @RegisterExtension diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/cache/NoCacheOnMethodsTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/cache/NoCacheOnMethodsTest.java index c3fd787744cea..91b06978cd5dc 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/cache/NoCacheOnMethodsTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/cache/NoCacheOnMethodsTest.java @@ -3,11 +3,12 @@ import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.Matchers.nullValue; -import io.restassured.RestAssured; import java.util.function.Consumer; import java.util.function.Supplier; + import javax.ws.rs.GET; import javax.ws.rs.Path; + import org.jboss.resteasy.reactive.NoCache; import org.jboss.resteasy.reactive.server.processor.ResteasyReactiveDeploymentManager; import org.jboss.resteasy.reactive.server.processor.scanning.CacheControlScanner; @@ -17,6 +18,8 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.restassured.RestAssured; + public class NoCacheOnMethodsTest { @RegisterExtension diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customexceptions/CustomExceptionMappersTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customexceptions/CustomExceptionMappersTest.java index 6aa46576da34e..d56e74e70b673 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customexceptions/CustomExceptionMappersTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customexceptions/CustomExceptionMappersTest.java @@ -1,7 +1,7 @@ package org.jboss.resteasy.reactive.server.vertx.test.customexceptions; -import io.restassured.RestAssured; import java.util.function.Supplier; + import org.hamcrest.Matchers; import org.jboss.resteasy.reactive.server.vertx.test.ExceptionUtil; import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; @@ -10,6 +10,8 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.restassured.RestAssured; + public class CustomExceptionMappersTest { @RegisterExtension diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customexceptions/FirstResource.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customexceptions/FirstResource.java index e2771286e8ff9..6f75fc56aafa6 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customexceptions/FirstResource.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customexceptions/FirstResource.java @@ -2,8 +2,6 @@ import static org.jboss.resteasy.reactive.server.vertx.test.ExceptionUtil.removeStackTrace; -import io.smallrye.mutiny.Uni; -import io.vertx.core.http.HttpServerRequest; import javax.ws.rs.GET; import javax.ws.rs.Path; import javax.ws.rs.Produces; @@ -12,10 +10,14 @@ import javax.ws.rs.core.Request; import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; + import org.jboss.resteasy.reactive.RestQuery; import org.jboss.resteasy.reactive.server.ServerExceptionMapper; import org.jboss.resteasy.reactive.server.SimpleResourceInfo; +import io.smallrye.mutiny.Uni; +import io.vertx.core.http.HttpServerRequest; + @Path("first") public class FirstResource { diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customexceptions/GlobalThrowableExceptionMapperTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customexceptions/GlobalThrowableExceptionMapperTest.java index 57805de411fc6..0761fa41eced3 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customexceptions/GlobalThrowableExceptionMapperTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customexceptions/GlobalThrowableExceptionMapperTest.java @@ -3,12 +3,13 @@ import static org.jboss.resteasy.reactive.server.vertx.test.ExceptionUtil.*; import static org.jboss.resteasy.reactive.server.vertx.test.ExceptionUtil.removeStackTrace; -import io.restassured.RestAssured; import java.util.function.Supplier; + import javax.ws.rs.GET; import javax.ws.rs.Path; import javax.ws.rs.Produces; import javax.ws.rs.core.Response; + import org.jboss.resteasy.reactive.server.ServerExceptionMapper; import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; import org.jboss.shrinkwrap.api.ShrinkWrap; @@ -16,6 +17,8 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.restassured.RestAssured; + public class GlobalThrowableExceptionMapperTest { @RegisterExtension diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customexceptions/MyOtherExceptionMapper.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customexceptions/MyOtherExceptionMapper.java index 2c635ed1afd91..395e4ed0fb5d3 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customexceptions/MyOtherExceptionMapper.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customexceptions/MyOtherExceptionMapper.java @@ -1,10 +1,12 @@ package org.jboss.resteasy.reactive.server.vertx.test.customexceptions; -import io.vertx.ext.web.RoutingContext; import javax.ws.rs.core.Response; + import org.jboss.resteasy.reactive.server.ServerExceptionMapper; import org.jboss.resteasy.reactive.server.SimpleResourceInfo; +import io.vertx.ext.web.RoutingContext; + public class MyOtherExceptionMapper { private final SomeBean someBean; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customexceptions/PerClassThrowableExceptionMapperTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customexceptions/PerClassThrowableExceptionMapperTest.java index 726682f20f946..69d01d4d2f750 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customexceptions/PerClassThrowableExceptionMapperTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customexceptions/PerClassThrowableExceptionMapperTest.java @@ -2,12 +2,13 @@ import static org.jboss.resteasy.reactive.server.vertx.test.ExceptionUtil.removeStackTrace; -import io.restassured.RestAssured; import java.util.function.Supplier; + import javax.ws.rs.GET; import javax.ws.rs.Path; import javax.ws.rs.Produces; import javax.ws.rs.core.Response; + import org.jboss.resteasy.reactive.server.ServerExceptionMapper; import org.jboss.resteasy.reactive.server.vertx.test.ExceptionUtil; import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; @@ -16,6 +17,8 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.restassured.RestAssured; + public class PerClassThrowableExceptionMapperTest { @RegisterExtension diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customexceptions/UniExceptionMapper.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customexceptions/UniExceptionMapper.java index 707d9e91325fc..a7786814c3388 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customexceptions/UniExceptionMapper.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customexceptions/UniExceptionMapper.java @@ -1,9 +1,11 @@ package org.jboss.resteasy.reactive.server.vertx.test.customexceptions; -import io.smallrye.mutiny.Uni; import javax.ws.rs.core.Response; + import org.jboss.resteasy.reactive.server.ServerExceptionMapper; +import io.smallrye.mutiny.Uni; + public class UniExceptionMapper { @ServerExceptionMapper({ UniException.class, OtherUniException.class }) diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customexceptions/UnwrappedExceptionTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customexceptions/UnwrappedExceptionTest.java index 330a31f100061..143a827249bb2 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customexceptions/UnwrappedExceptionTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customexceptions/UnwrappedExceptionTest.java @@ -2,12 +2,13 @@ import static org.jboss.resteasy.reactive.server.vertx.test.ExceptionUtil.removeStackTrace; -import io.restassured.RestAssured; import java.util.List; import java.util.function.Consumer; import java.util.function.Supplier; + import javax.ws.rs.Path; import javax.ws.rs.core.Response; + import org.jboss.jandex.IndexView; import org.jboss.resteasy.reactive.server.ServerExceptionMapper; import org.jboss.resteasy.reactive.server.processor.ResteasyReactiveDeploymentManager; @@ -20,6 +21,8 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.restassured.RestAssured; + public class UnwrappedExceptionTest { @RegisterExtension diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/AbortingFiltersTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/AbortingFiltersTest.java index 38c55655b03cb..89384d8c3a01b 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/AbortingFiltersTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/AbortingFiltersTest.java @@ -2,14 +2,16 @@ import static org.hamcrest.Matchers.containsString; -import io.restassured.RestAssured; import java.util.function.Supplier; + import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.restassured.RestAssured; + public class AbortingFiltersTest { @RegisterExtension diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/AnotherValidNonBlockingFiltersTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/AnotherValidNonBlockingFiltersTest.java index 8c5ad3d21fda9..5140a4f6cf344 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/AnotherValidNonBlockingFiltersTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/AnotherValidNonBlockingFiltersTest.java @@ -2,12 +2,9 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import io.restassured.RestAssured; -import io.restassured.http.Headers; -import io.smallrye.common.annotation.Blocking; -import io.smallrye.common.annotation.NonBlocking; import java.io.IOException; import java.util.function.Supplier; + import javax.annotation.Priority; import javax.ws.rs.GET; import javax.ws.rs.Path; @@ -20,6 +17,7 @@ import javax.ws.rs.core.MultivaluedMap; import javax.ws.rs.core.Response; import javax.ws.rs.ext.Provider; + import org.jboss.resteasy.reactive.server.ServerRequestFilter; import org.jboss.resteasy.reactive.server.core.BlockingOperationSupport; import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; @@ -28,6 +26,11 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.restassured.RestAssured; +import io.restassured.http.Headers; +import io.smallrye.common.annotation.Blocking; +import io.smallrye.common.annotation.NonBlocking; + public class AnotherValidNonBlockingFiltersTest { @RegisterExtension diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/AssertContainerFilter.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/AssertContainerFilter.java index c002527b8c757..bf97b5eba3281 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/AssertContainerFilter.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/AssertContainerFilter.java @@ -3,13 +3,13 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import io.vertx.core.http.HttpServerRequest; -import io.vertx.ext.web.RoutingContext; import java.util.List; + import javax.ws.rs.container.ContainerRequestContext; import javax.ws.rs.container.ContainerResponseContext; import javax.ws.rs.container.ResourceInfo; import javax.ws.rs.core.Request; + import org.jboss.resteasy.reactive.server.ServerRequestFilter; import org.jboss.resteasy.reactive.server.ServerResponseFilter; import org.jboss.resteasy.reactive.server.SimpleResourceInfo; @@ -19,6 +19,9 @@ import org.jboss.resteasy.reactive.server.spi.ResteasyReactiveContainerRequestContext; import org.jboss.resteasy.reactive.server.spi.ResteasyReactiveResourceInfo; +import io.vertx.core.http.HttpServerRequest; +import io.vertx.ext.web.RoutingContext; + /** * Used only to ensure that the proper types are passed to the method and that CDI integrations work properly */ diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/CustomContainerRequestFilter.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/CustomContainerRequestFilter.java index 23346c25b4111..21a320893f1bd 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/CustomContainerRequestFilter.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/CustomContainerRequestFilter.java @@ -3,6 +3,7 @@ import javax.ws.rs.container.ContainerRequestContext; import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.UriInfo; + import org.jboss.resteasy.reactive.server.ServerRequestFilter; public class CustomContainerRequestFilter { diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/CustomContainerResponseFilter.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/CustomContainerResponseFilter.java index 8e2730eb8dd56..bb4d89f917e71 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/CustomContainerResponseFilter.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/CustomContainerResponseFilter.java @@ -5,6 +5,7 @@ import javax.ws.rs.container.ContainerRequestContext; import javax.ws.rs.container.ContainerResponseContext; + import org.jboss.resteasy.reactive.server.ServerResponseFilter; import org.jboss.resteasy.reactive.server.SimpleResourceInfo; import org.jboss.resteasy.reactive.server.filters.PreventAbortResteasyReactiveContainerRequestContext; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/CustomFiltersTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/CustomFiltersTest.java index e09d0e06f0aa0..2a80026ae45ee 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/CustomFiltersTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/CustomFiltersTest.java @@ -2,9 +2,8 @@ import static org.assertj.core.api.Assertions.assertThat; -import io.restassured.RestAssured; -import io.restassured.http.Headers; import java.util.function.Supplier; + import org.hamcrest.Matchers; import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; import org.jboss.shrinkwrap.api.ShrinkWrap; @@ -12,6 +11,9 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.restassured.RestAssured; +import io.restassured.http.Headers; + public class CustomFiltersTest { @RegisterExtension diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/FilterWithPathParamsTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/FilterWithPathParamsTest.java index 80363c53a397c..4c38e9a8e0eb3 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/FilterWithPathParamsTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/FilterWithPathParamsTest.java @@ -4,12 +4,13 @@ import static io.restassured.RestAssured.when; import static org.hamcrest.CoreMatchers.is; -import io.smallrye.mutiny.Uni; import java.util.function.Supplier; + import javax.ws.rs.GET; import javax.ws.rs.Path; import javax.ws.rs.container.ContainerResponseContext; import javax.ws.rs.core.Response; + import org.jboss.resteasy.reactive.server.ServerRequestFilter; import org.jboss.resteasy.reactive.server.ServerResponseFilter; import org.jboss.resteasy.reactive.server.spi.ResteasyReactiveContainerRequestContext; @@ -19,6 +20,8 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.smallrye.mutiny.Uni; + public class FilterWithPathParamsTest { @RegisterExtension diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/InvalidNonBlockingFiltersTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/InvalidNonBlockingFiltersTest.java index 942fd22a68bda..7e69adc59bd09 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/InvalidNonBlockingFiltersTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/InvalidNonBlockingFiltersTest.java @@ -2,10 +2,9 @@ import static org.junit.jupiter.api.Assertions.fail; -import io.smallrye.common.annotation.Blocking; -import io.smallrye.common.annotation.NonBlocking; import java.io.IOException; import java.util.function.Supplier; + import javax.annotation.Priority; import javax.ws.rs.GET; import javax.ws.rs.Path; @@ -14,6 +13,7 @@ import javax.ws.rs.container.ContainerRequestFilter; import javax.ws.rs.core.Response; import javax.ws.rs.ext.Provider; + import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; @@ -21,6 +21,9 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.smallrye.common.annotation.Blocking; +import io.smallrye.common.annotation.NonBlocking; + public class InvalidNonBlockingFiltersTest { @RegisterExtension diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/Metal.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/Metal.java index fe1b3b83f03bf..de598d5d4b31e 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/Metal.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/Metal.java @@ -4,6 +4,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; + import javax.ws.rs.NameBinding; @NameBinding diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/MetalFilter.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/MetalFilter.java index efd50e1f24dd3..29cdb516803ca 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/MetalFilter.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/MetalFilter.java @@ -1,6 +1,7 @@ package org.jboss.resteasy.reactive.server.vertx.test.customproviders; import javax.ws.rs.container.ContainerRequestContext; + import org.jboss.resteasy.reactive.server.ServerRequestFilter; public class MetalFilter { diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/NoTargetTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/NoTargetTest.java index cac4df032f8a3..5c1933464c720 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/NoTargetTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/NoTargetTest.java @@ -2,10 +2,9 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import io.restassured.RestAssured; -import io.restassured.http.Headers; import java.io.IOException; import java.util.function.Supplier; + import javax.ws.rs.GET; import javax.ws.rs.Path; import javax.ws.rs.container.ContainerRequestContext; @@ -16,6 +15,7 @@ import javax.ws.rs.core.Response; import javax.ws.rs.ext.ExceptionMapper; import javax.ws.rs.ext.Provider; + import org.jboss.resteasy.reactive.server.ServerResponseFilter; import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; import org.jboss.shrinkwrap.api.ShrinkWrap; @@ -23,6 +23,9 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.restassured.RestAssured; +import io.restassured.http.Headers; + public class NoTargetTest { @RegisterExtension diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/OptionalRequestFilter.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/OptionalRequestFilter.java index 9e2a83d37e49f..c78781457f526 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/OptionalRequestFilter.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/OptionalRequestFilter.java @@ -1,8 +1,10 @@ package org.jboss.resteasy.reactive.server.vertx.test.customproviders; import java.util.Optional; + import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.Response; + import org.jboss.resteasy.reactive.server.ServerRequestFilter; public class OptionalRequestFilter { diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/ResponseFilter.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/ResponseFilter.java index 127790e4edc9f..62931637e24df 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/ResponseFilter.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/ResponseFilter.java @@ -2,6 +2,7 @@ import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.Response; + import org.jboss.resteasy.reactive.server.ServerRequestFilter; public class ResponseFilter { diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/UniFiltersTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/UniFiltersTest.java index ce7612149cef1..3558801fb833b 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/UniFiltersTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/UniFiltersTest.java @@ -2,9 +2,8 @@ import static org.assertj.core.api.Assertions.assertThat; -import io.restassured.RestAssured; -import io.restassured.http.Headers; import java.util.function.Supplier; + import org.hamcrest.Matchers; import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; import org.jboss.shrinkwrap.api.ShrinkWrap; @@ -12,6 +11,9 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.restassured.RestAssured; +import io.restassured.http.Headers; + public class UniFiltersTest { @RegisterExtension diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/UniResponseFilter.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/UniResponseFilter.java index 88b56eeb1044d..921b55283c692 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/UniResponseFilter.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/UniResponseFilter.java @@ -1,10 +1,12 @@ package org.jboss.resteasy.reactive.server.vertx.test.customproviders; -import io.smallrye.mutiny.Uni; import javax.ws.rs.container.ContainerResponseContext; + import org.jboss.resteasy.reactive.server.ServerResponseFilter; import org.jboss.resteasy.reactive.server.SimpleResourceInfo; +import io.smallrye.mutiny.Uni; + public class UniResponseFilter { @ServerResponseFilter diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/UniResponseRequestFilter.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/UniResponseRequestFilter.java index 6028a9333aebd..baf0fe6fcace4 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/UniResponseRequestFilter.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/UniResponseRequestFilter.java @@ -1,12 +1,14 @@ package org.jboss.resteasy.reactive.server.vertx.test.customproviders; -import io.smallrye.mutiny.Uni; import javax.ws.rs.container.ContainerRequestContext; import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; + import org.jboss.resteasy.reactive.server.ServerRequestFilter; +import io.smallrye.mutiny.Uni; + public class UniResponseRequestFilter { @ServerRequestFilter diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/UniVoidRequestFilter.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/UniVoidRequestFilter.java index 55ed95e3fbb48..e07a5c1956d6a 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/UniVoidRequestFilter.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/UniVoidRequestFilter.java @@ -1,11 +1,13 @@ package org.jboss.resteasy.reactive.server.vertx.test.customproviders; -import io.smallrye.mutiny.Uni; import javax.ws.rs.container.ContainerRequestContext; import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.UriInfo; + import org.jboss.resteasy.reactive.server.ServerRequestFilter; +import io.smallrye.mutiny.Uni; + public class UniVoidRequestFilter { @ServerRequestFilter diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/ValidNonBlockingFiltersTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/ValidNonBlockingFiltersTest.java index a8e0a4cc39dda..5da56eba85a7b 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/ValidNonBlockingFiltersTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/ValidNonBlockingFiltersTest.java @@ -2,13 +2,9 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import io.restassured.RestAssured; -import io.restassured.http.Headers; -import io.smallrye.common.annotation.Blocking; -import io.smallrye.common.annotation.NonBlocking; -import io.smallrye.mutiny.Uni; import java.io.IOException; import java.util.function.Supplier; + import javax.annotation.Priority; import javax.ws.rs.GET; import javax.ws.rs.Path; @@ -20,6 +16,7 @@ import javax.ws.rs.core.MultivaluedMap; import javax.ws.rs.core.Response; import javax.ws.rs.ext.Provider; + import org.jboss.resteasy.reactive.server.ServerRequestFilter; import org.jboss.resteasy.reactive.server.core.BlockingOperationSupport; import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; @@ -28,6 +25,12 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.restassured.RestAssured; +import io.restassured.http.Headers; +import io.smallrye.common.annotation.Blocking; +import io.smallrye.common.annotation.NonBlocking; +import io.smallrye.mutiny.Uni; + public class ValidNonBlockingFiltersTest { @RegisterExtension diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/form/FormUrlencodedCorruptionTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/form/FormUrlencodedCorruptionTest.java index ecbad7e5c27ad..7606472896cd1 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/form/FormUrlencodedCorruptionTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/form/FormUrlencodedCorruptionTest.java @@ -3,19 +3,22 @@ import static java.nio.charset.StandardCharsets.UTF_8; import static org.hamcrest.Matchers.is; -import io.restassured.RestAssured; import java.net.URLEncoder; + import javax.ws.rs.Consumes; import javax.ws.rs.POST; import javax.ws.rs.Path; import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.MultivaluedMap; + import org.jboss.resteasy.reactive.RestForm; import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.restassured.RestAssured; + public class FormUrlencodedCorruptionTest { @RegisterExtension static ResteasyReactiveUnitTest TEST = new ResteasyReactiveUnitTest() diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/framework/ResteasyReactiveTestClassLoader.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/framework/ResteasyReactiveTestClassLoader.java index dee47ac54c6c6..b78f6e1f98a76 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/framework/ResteasyReactiveTestClassLoader.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/framework/ResteasyReactiveTestClassLoader.java @@ -8,6 +8,7 @@ import java.util.List; import java.util.Map; import java.util.function.BiFunction; + import org.jboss.resteasy.reactive.server.processor.util.GeneratedClass; import org.objectweb.asm.ClassReader; import org.objectweb.asm.ClassVisitor; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/framework/ResteasyReactiveUnitTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/framework/ResteasyReactiveUnitTest.java index ce6d60f2fb9a5..13cdeffa5d403 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/framework/ResteasyReactiveUnitTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/framework/ResteasyReactiveUnitTest.java @@ -2,19 +2,6 @@ import static org.junit.jupiter.api.Assertions.assertTrue; -import io.vertx.core.AsyncResult; -import io.vertx.core.Context; -import io.vertx.core.DeploymentOptions; -import io.vertx.core.Promise; -import io.vertx.core.Verticle; -import io.vertx.core.Vertx; -import io.vertx.core.http.HttpServer; -import io.vertx.core.http.HttpServerRequest; -import io.vertx.core.http.HttpServerResponse; -import io.vertx.ext.web.Route; -import io.vertx.ext.web.Router; -import io.vertx.ext.web.RoutingContext; -import io.vertx.mutiny.core.file.AsyncFile; import java.io.Closeable; import java.io.IOException; import java.lang.reflect.InvocationTargetException; @@ -48,7 +35,9 @@ import java.util.logging.LogManager; import java.util.logging.LogRecord; import java.util.logging.Logger; + import javax.ws.rs.core.MediaType; + import org.jboss.jandex.DotName; import org.jboss.jandex.IndexView; import org.jboss.resteasy.reactive.common.processor.JandexUtil; @@ -80,6 +69,20 @@ import org.junit.jupiter.api.extension.InvocationInterceptor; import org.junit.jupiter.api.extension.ReflectiveInvocationContext; +import io.vertx.core.AsyncResult; +import io.vertx.core.Context; +import io.vertx.core.DeploymentOptions; +import io.vertx.core.Promise; +import io.vertx.core.Verticle; +import io.vertx.core.Vertx; +import io.vertx.core.http.HttpServer; +import io.vertx.core.http.HttpServerRequest; +import io.vertx.core.http.HttpServerResponse; +import io.vertx.ext.web.Route; +import io.vertx.ext.web.Router; +import io.vertx.ext.web.RoutingContext; +import io.vertx.mutiny.core.file.AsyncFile; + public class ResteasyReactiveUnitTest implements BeforeAllCallback, AfterAllCallback, InvocationInterceptor { public static final int SERVER_PORT = 8080; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/headers/Dummy.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/headers/Dummy.java index c1b3b1431ce73..8538b75f860eb 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/headers/Dummy.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/headers/Dummy.java @@ -2,6 +2,7 @@ import javax.ws.rs.GET; import javax.ws.rs.Path; + import org.jboss.resteasy.reactive.ResponseHeader; import org.jboss.resteasy.reactive.ResponseStatus; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/headers/ResponseHeaderTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/headers/ResponseHeaderTest.java index a71176a9f1d0f..0f178310db20d 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/headers/ResponseHeaderTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/headers/ResponseHeaderTest.java @@ -2,22 +2,25 @@ import static org.junit.jupiter.api.Assertions.assertFalse; -import io.restassured.RestAssured; -import io.restassured.http.Headers; -import io.smallrye.mutiny.Multi; -import io.smallrye.mutiny.Uni; import java.util.Collections; import java.util.Map; import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionStage; + import javax.ws.rs.GET; import javax.ws.rs.Path; + import org.jboss.resteasy.reactive.ResponseHeader; import org.jboss.resteasy.reactive.ResponseStatus; import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.restassured.RestAssured; +import io.restassured.http.Headers; +import io.smallrye.mutiny.Multi; +import io.smallrye.mutiny.Uni; + public class ResponseHeaderTest { @RegisterExtension diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/matching/EndingSlashTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/matching/EndingSlashTest.java index bc5acf3159124..268d38265e89d 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/matching/EndingSlashTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/matching/EndingSlashTest.java @@ -4,10 +4,12 @@ import static org.hamcrest.Matchers.equalTo; import java.util.function.Supplier; + import javax.ws.rs.GET; import javax.ws.rs.Path; import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; + import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/matching/MultipleProducesTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/matching/MultipleProducesTest.java index 38500b83ade1d..6ebae6c90f795 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/matching/MultipleProducesTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/matching/MultipleProducesTest.java @@ -9,6 +9,7 @@ import java.lang.reflect.Type; import java.nio.charset.StandardCharsets; import java.util.function.Supplier; + import javax.ws.rs.GET; import javax.ws.rs.Path; import javax.ws.rs.Produces; @@ -18,6 +19,7 @@ import javax.ws.rs.core.Response; import javax.ws.rs.ext.MessageBodyWriter; import javax.ws.rs.ext.Provider; + import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/matching/RegexMatchTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/matching/RegexMatchTest.java index 2f1c51ed9cbf6..869dddcdd8cd0 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/matching/RegexMatchTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/matching/RegexMatchTest.java @@ -2,14 +2,16 @@ import static org.hamcrest.Matchers.equalTo; -import io.restassured.RestAssured; import java.util.function.Supplier; + import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.restassured.RestAssured; + public class RegexMatchTest { @RegisterExtension diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/matching/StemMatchTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/matching/StemMatchTest.java index 432c5e6cb0c5f..e2393438e75fd 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/matching/StemMatchTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/matching/StemMatchTest.java @@ -4,6 +4,7 @@ import static org.hamcrest.CoreMatchers.is; import java.util.function.Supplier; + import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/matching/SubresourceCustomRegexTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/matching/SubresourceCustomRegexTest.java index b3444981b9c71..ab9c9fd11b168 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/matching/SubresourceCustomRegexTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/matching/SubresourceCustomRegexTest.java @@ -4,10 +4,12 @@ import static org.hamcrest.CoreMatchers.is; import java.util.function.Supplier; + import javax.ws.rs.GET; import javax.ws.rs.Path; import javax.ws.rs.PathParam; import javax.ws.rs.Produces; + import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/mediatype/CharsetTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/mediatype/CharsetTest.java index c21a45dcae2c0..e27abf4620632 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/mediatype/CharsetTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/mediatype/CharsetTest.java @@ -5,10 +5,12 @@ import java.nio.charset.StandardCharsets; import java.util.function.Supplier; + import javax.ws.rs.GET; import javax.ws.rs.Path; import javax.ws.rs.Produces; import javax.ws.rs.core.Response; + import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/mediatype/ContentTypeCaseTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/mediatype/ContentTypeCaseTest.java index 29257c6211fb6..cc6e1c4586653 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/mediatype/ContentTypeCaseTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/mediatype/ContentTypeCaseTest.java @@ -4,11 +4,13 @@ import static org.hamcrest.Matchers.is; import java.util.function.Supplier; + import javax.ws.rs.GET; import javax.ws.rs.HeaderParam; import javax.ws.rs.Path; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; + import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/mediatype/InvalidContentTypeTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/mediatype/InvalidContentTypeTest.java index 17eab9b56d4fa..148417f66a6d6 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/mediatype/InvalidContentTypeTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/mediatype/InvalidContentTypeTest.java @@ -4,17 +4,20 @@ import static io.restassured.RestAssured.given; import static io.restassured.config.EncoderConfig.encoderConfig; -import io.restassured.http.ContentType; import java.util.function.Supplier; + import javax.ws.rs.Consumes; import javax.ws.rs.POST; import javax.ws.rs.Path; + import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.restassured.http.ContentType; + public class InvalidContentTypeTest { @RegisterExtension diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/mediatype/MessageBodyWriteTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/mediatype/MessageBodyWriteTest.java index 5f50e2a83cc40..ad510c836e2d0 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/mediatype/MessageBodyWriteTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/mediatype/MessageBodyWriteTest.java @@ -10,6 +10,7 @@ import java.nio.charset.StandardCharsets; import java.util.Map; import java.util.function.Supplier; + import javax.ws.rs.GET; import javax.ws.rs.Path; import javax.ws.rs.Produces; @@ -18,6 +19,7 @@ import javax.ws.rs.core.Response; import javax.ws.rs.ext.MessageBodyWriter; import javax.ws.rs.ext.Provider; + import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/mediatype/NoAcceptMultipleProducesTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/mediatype/NoAcceptMultipleProducesTest.java index 33d283771f300..1a68b3cd6f8e8 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/mediatype/NoAcceptMultipleProducesTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/mediatype/NoAcceptMultipleProducesTest.java @@ -3,7 +3,6 @@ import static io.restassured.RestAssured.when; import static org.hamcrest.CoreMatchers.is; -import io.restassured.http.ContentType; import java.io.IOException; import java.io.OutputStream; import java.lang.annotation.Annotation; @@ -12,6 +11,7 @@ import java.util.Collections; import java.util.Map; import java.util.function.Supplier; + import javax.ws.rs.GET; import javax.ws.rs.Path; import javax.ws.rs.Produces; @@ -19,6 +19,7 @@ import javax.ws.rs.core.MediaType; import javax.ws.rs.core.MultivaluedMap; import javax.ws.rs.ext.Provider; + import org.jboss.resteasy.reactive.server.spi.ServerMessageBodyWriter; import org.jboss.resteasy.reactive.server.spi.ServerRequestContext; import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; @@ -27,6 +28,8 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.restassured.http.ContentType; + public class NoAcceptMultipleProducesTest { @RegisterExtension diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/EchoResource.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/EchoResource.java index fdcb847ca4d20..8afe63dd5133f 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/EchoResource.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/EchoResource.java @@ -1,13 +1,15 @@ package org.jboss.resteasy.reactive.server.vertx.test.multipart; -import io.smallrye.common.annotation.NonBlocking; import java.nio.charset.StandardCharsets; + import javax.ws.rs.Consumes; import javax.ws.rs.POST; import javax.ws.rs.Path; import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; +import io.smallrye.common.annotation.NonBlocking; + @Path("/echo") public class EchoResource { diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/ErroneousFieldMultipartInputTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/ErroneousFieldMultipartInputTest.java index 42d24b39f456a..818f77381e57b 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/ErroneousFieldMultipartInputTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/ErroneousFieldMultipartInputTest.java @@ -3,11 +3,13 @@ import static org.junit.jupiter.api.Assertions.fail; import java.util.function.Supplier; + import javax.ws.rs.Consumes; import javax.ws.rs.POST; import javax.ws.rs.Path; import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; + import org.jboss.resteasy.reactive.MultipartForm; import org.jboss.resteasy.reactive.RestForm; import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/FormData.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/FormData.java index a897ef0229072..5f57aa010d1ac 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/FormData.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/FormData.java @@ -2,7 +2,9 @@ import java.io.File; import java.nio.file.Path; + import javax.ws.rs.core.MediaType; + import org.jboss.resteasy.reactive.PartType; import org.jboss.resteasy.reactive.RestForm; import org.jboss.resteasy.reactive.multipart.FileUpload; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/FormDataBase.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/FormDataBase.java index 46eb49ef5b0c5..0aa6e50467ae3 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/FormDataBase.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/FormDataBase.java @@ -1,6 +1,7 @@ package org.jboss.resteasy.reactive.server.vertx.test.multipart; import javax.ws.rs.core.MediaType; + import org.jboss.resteasy.reactive.PartType; import org.jboss.resteasy.reactive.RestForm; import org.jboss.resteasy.reactive.server.vertx.test.multipart.other.OtherPackageFormDataBase; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/FormDataSameFileName.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/FormDataSameFileName.java index 050b2abd7f350..d7c3580ce749e 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/FormDataSameFileName.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/FormDataSameFileName.java @@ -3,7 +3,9 @@ import java.io.File; import java.nio.file.Path; import java.util.List; + import javax.ws.rs.core.MediaType; + import org.jboss.resteasy.reactive.PartType; import org.jboss.resteasy.reactive.RestForm; import org.jboss.resteasy.reactive.multipart.FileUpload; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/FormDataWithAllUploads.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/FormDataWithAllUploads.java index 7d5027e2dd78f..4f389d8cdd044 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/FormDataWithAllUploads.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/FormDataWithAllUploads.java @@ -1,7 +1,9 @@ package org.jboss.resteasy.reactive.server.vertx.test.multipart; import java.util.List; + import javax.ws.rs.core.MediaType; + import org.jboss.resteasy.reactive.PartType; import org.jboss.resteasy.reactive.RestForm; import org.jboss.resteasy.reactive.multipart.FileUpload; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/InvalidEncodingTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/InvalidEncodingTest.java index 7456a2e6528dc..5dba8ce032c51 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/InvalidEncodingTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/InvalidEncodingTest.java @@ -2,22 +2,25 @@ import static org.hamcrest.CoreMatchers.not; -import io.restassured.RestAssured; -import io.restassured.builder.MultiPartSpecBuilder; -import io.restassured.specification.MultiPartSpecification; import java.net.URISyntaxException; import java.nio.charset.StandardCharsets; + import javax.ws.rs.Consumes; import javax.ws.rs.POST; import javax.ws.rs.Path; import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; + import org.jboss.resteasy.reactive.MultipartForm; import org.jboss.resteasy.reactive.RestForm; import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.restassured.RestAssured; +import io.restassured.builder.MultiPartSpecBuilder; +import io.restassured.specification.MultiPartSpecification; + public class InvalidEncodingTest { private static final String TEXT_WITH_ACCENTED_CHARACTERS = "Text with UTF-8 accented characters: é à è"; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/LargerThanDefaultFormAttributeMultipartFormInputTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/LargerThanDefaultFormAttributeMultipartFormInputTest.java index 3e72ca81ea4a9..37d3346559f12 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/LargerThanDefaultFormAttributeMultipartFormInputTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/LargerThanDefaultFormAttributeMultipartFormInputTest.java @@ -3,19 +3,19 @@ import static io.restassured.RestAssured.given; import static org.hamcrest.Matchers.equalTo; -import io.restassured.http.ContentType; -import io.vertx.core.http.HttpServerOptions; import java.io.File; import java.io.IOException; import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.util.function.Supplier; + import javax.ws.rs.Consumes; import javax.ws.rs.FormParam; import javax.ws.rs.POST; import javax.ws.rs.Path; import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; + import org.jboss.resteasy.reactive.MultipartForm; import org.jboss.resteasy.reactive.PartType; import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; @@ -25,6 +25,9 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.restassured.http.ContentType; +import io.vertx.core.http.HttpServerOptions; + public class LargerThanDefaultFormAttributeMultipartFormInputTest { @RegisterExtension diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/MultipartInputBodyHandlerTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/MultipartInputBodyHandlerTest.java index 7f6f4fbca6765..da834569957b0 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/MultipartInputBodyHandlerTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/MultipartInputBodyHandlerTest.java @@ -3,14 +3,13 @@ import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.not; -import io.restassured.RestAssured; -import io.vertx.ext.web.handler.BodyHandler; import java.io.File; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; import java.util.function.Supplier; + import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; import org.jboss.resteasy.reactive.server.vertx.test.multipart.other.OtherPackageFormDataBase; import org.jboss.shrinkwrap.api.ShrinkWrap; @@ -21,6 +20,9 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.restassured.RestAssured; +import io.vertx.ext.web.handler.BodyHandler; + public class MultipartInputBodyHandlerTest extends AbstractMultipartTest { private static final Path uploadDir = Paths.get("file-uploads"); diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/MultipartInputTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/MultipartInputTest.java index 9bdeb6d295b8a..224ab93c6ce04 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/MultipartInputTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/MultipartInputTest.java @@ -3,13 +3,13 @@ import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.not; -import io.restassured.RestAssured; import java.io.File; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; import java.util.function.Supplier; + import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; import org.jboss.resteasy.reactive.server.vertx.test.multipart.other.OtherPackageFormDataBase; import org.jboss.shrinkwrap.api.ShrinkWrap; @@ -20,6 +20,8 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.restassured.RestAssured; + public class MultipartInputTest extends AbstractMultipartTest { private static final Path uploadDir = Paths.get("file-uploads"); diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/MultipartInputWithAllUploadsTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/MultipartInputWithAllUploadsTest.java index b4feec3607b1b..fa89cf9233401 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/MultipartInputWithAllUploadsTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/MultipartInputWithAllUploadsTest.java @@ -2,12 +2,12 @@ import static org.hamcrest.CoreMatchers.equalTo; -import io.restassured.RestAssured; import java.io.File; import java.io.IOException; import java.nio.file.Path; import java.nio.file.Paths; import java.util.function.Supplier; + import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; import org.jboss.resteasy.reactive.server.vertx.test.multipart.other.OtherPackageFormDataBase; import org.jboss.shrinkwrap.api.ShrinkWrap; @@ -18,6 +18,8 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.restassured.RestAssured; + public class MultipartInputWithAllUploadsTest extends AbstractMultipartTest { private static final Path uploadDir = Paths.get("file-uploads"); diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/MultipartOptionalInputTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/MultipartOptionalInputTest.java index 0e0fda80a5e73..1b7a5db2f2695 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/MultipartOptionalInputTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/MultipartOptionalInputTest.java @@ -2,11 +2,11 @@ import static org.hamcrest.CoreMatchers.equalTo; -import io.restassured.RestAssured; import java.io.File; import java.nio.file.Path; import java.nio.file.Paths; import java.util.function.Supplier; + import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; import org.jboss.resteasy.reactive.server.vertx.test.multipart.other.OtherPackageFormDataBase; import org.jboss.shrinkwrap.api.ShrinkWrap; @@ -17,6 +17,8 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.restassured.RestAssured; + public class MultipartOptionalInputTest extends AbstractMultipartTest { private static final Path uploadDir = Paths.get("file-uploads"); diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/MultipartOutputFileResponse.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/MultipartOutputFileResponse.java index ac46715d4631a..e024c8c65da9a 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/MultipartOutputFileResponse.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/MultipartOutputFileResponse.java @@ -1,7 +1,9 @@ package org.jboss.resteasy.reactive.server.vertx.test.multipart; import java.io.File; + import javax.ws.rs.core.MediaType; + import org.jboss.resteasy.reactive.PartType; import org.jboss.resteasy.reactive.RestForm; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/MultipartOutputResource.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/MultipartOutputResource.java index 89264e3b4f04a..8dcfe45abb88f 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/MultipartOutputResource.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/MultipartOutputResource.java @@ -2,6 +2,7 @@ import java.io.File; import java.util.List; + import javax.ws.rs.GET; import javax.ws.rs.Path; import javax.ws.rs.Produces; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/MultipartOutputResponse.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/MultipartOutputResponse.java index bff70fa9e5d23..e2ab7b14919cf 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/MultipartOutputResponse.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/MultipartOutputResponse.java @@ -1,8 +1,10 @@ package org.jboss.resteasy.reactive.server.vertx.test.multipart; import java.util.List; + import javax.ws.rs.FormParam; import javax.ws.rs.core.MediaType; + import org.jboss.resteasy.reactive.PartType; import org.jboss.resteasy.reactive.RestForm; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/MultipartOutputUsingBlockingEndpointsTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/MultipartOutputUsingBlockingEndpointsTest.java index a4899ee7b1101..ace8b84d8a096 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/MultipartOutputUsingBlockingEndpointsTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/MultipartOutputUsingBlockingEndpointsTest.java @@ -3,9 +3,8 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.hamcrest.Matchers.equalTo; -import io.restassured.RestAssured; -import io.restassured.http.ContentType; import javax.ws.rs.core.MediaType; + import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; import org.jboss.resteasy.reactive.server.vertx.test.multipart.other.OtherPackageFormDataBase; import org.jboss.shrinkwrap.api.ShrinkWrap; @@ -13,6 +12,9 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.restassured.RestAssured; +import io.restassured.http.ContentType; + public class MultipartOutputUsingBlockingEndpointsTest extends AbstractMultipartTest { private static final String EXPECTED_CONTENT_DISPOSITION_PART = "Content-Disposition: form-data; name=\"%s\""; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/MultipartOutputUsingReactiveEndpointTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/MultipartOutputUsingReactiveEndpointTest.java index 8b0124d7548f2..f707508849656 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/MultipartOutputUsingReactiveEndpointTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/MultipartOutputUsingReactiveEndpointTest.java @@ -2,12 +2,12 @@ import static org.junit.jupiter.api.Assertions.fail; -import io.smallrye.mutiny.Multi; import javax.enterprise.inject.spi.DeploymentException; import javax.ws.rs.GET; import javax.ws.rs.Path; import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; + import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; import org.jboss.resteasy.reactive.server.vertx.test.multipart.other.OtherPackageFormDataBase; import org.jboss.shrinkwrap.api.ShrinkWrap; @@ -15,6 +15,8 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.smallrye.mutiny.Multi; + /** * Using '@Produces(MediaType.MULTIPART_FORM_DATA)' is not compatible with Non Blocking endpoints. */ diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/MultipartResource.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/MultipartResource.java index 48f4592f02fca..85b118bcd809b 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/MultipartResource.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/MultipartResource.java @@ -1,9 +1,8 @@ package org.jboss.resteasy.reactive.server.vertx.test.multipart; -import io.smallrye.common.annotation.Blocking; -import io.smallrye.common.annotation.NonBlocking; import java.io.IOException; import java.nio.file.Files; + import javax.ws.rs.Consumes; import javax.ws.rs.DefaultValue; import javax.ws.rs.POST; @@ -11,10 +10,14 @@ import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; + import org.jboss.resteasy.reactive.MultipartForm; import org.jboss.resteasy.reactive.RestQuery; import org.jboss.resteasy.reactive.server.core.BlockingOperationSupport; +import io.smallrye.common.annotation.Blocking; +import io.smallrye.common.annotation.NonBlocking; + @Path("/multipart") public class MultipartResource { diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/MultipartResourceWithAllUploads.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/MultipartResourceWithAllUploads.java index 5f9bb6368f6ac..00d1e61830779 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/MultipartResourceWithAllUploads.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/MultipartResourceWithAllUploads.java @@ -1,15 +1,17 @@ package org.jboss.resteasy.reactive.server.vertx.test.multipart; -import io.smallrye.common.annotation.NonBlocking; import javax.ws.rs.Consumes; import javax.ws.rs.POST; import javax.ws.rs.Path; import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; + import org.jboss.resteasy.reactive.MultipartForm; import org.jboss.resteasy.reactive.multipart.FileUpload; import org.jboss.resteasy.reactive.server.core.BlockingOperationSupport; +import io.smallrye.common.annotation.NonBlocking; + @Path("/multipart-all") public class MultipartResourceWithAllUploads { diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/OtherMultipartResource.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/OtherMultipartResource.java index 3eccd6d7980f3..ef632b8f8d15e 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/OtherMultipartResource.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/OtherMultipartResource.java @@ -5,6 +5,7 @@ import javax.ws.rs.Path; import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; + import org.jboss.resteasy.reactive.MultipartForm; @Path("/otherMultipart") diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/RawMultipartTestCase.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/RawMultipartTestCase.java index 48be56812af03..ceaa5b49dd796 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/RawMultipartTestCase.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/RawMultipartTestCase.java @@ -1,7 +1,7 @@ package org.jboss.resteasy.reactive.server.vertx.test.multipart; -import io.restassured.RestAssured; import java.util.function.Supplier; + import org.hamcrest.Matchers; import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; import org.jboss.shrinkwrap.api.ShrinkWrap; @@ -9,6 +9,8 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.restassured.RestAssured; + public class RawMultipartTestCase { @RegisterExtension diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/TooLargeFormAttributeMultipartFormInputTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/TooLargeFormAttributeMultipartFormInputTest.java index 03bd9bb0cd5f2..3935e4d6e3eaf 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/TooLargeFormAttributeMultipartFormInputTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/TooLargeFormAttributeMultipartFormInputTest.java @@ -2,18 +2,19 @@ import static io.restassured.RestAssured.given; -import io.vertx.core.http.HttpServerOptions; import java.io.File; import java.io.IOException; import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Paths; import java.util.function.Supplier; + import javax.ws.rs.Consumes; import javax.ws.rs.POST; import javax.ws.rs.Path; import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; + import org.jboss.resteasy.reactive.MultipartForm; import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; import org.jboss.resteasy.reactive.server.vertx.test.multipart.other.OtherPackageFormDataBase; @@ -25,6 +26,8 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.vertx.core.http.HttpServerOptions; + public class TooLargeFormAttributeMultipartFormInputTest extends AbstractMultipartTest { private static final java.nio.file.Path uploadDir = Paths.get("file-uploads"); diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/other/OtherPackageFormDataBase.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/other/OtherPackageFormDataBase.java index f74ffe5b46211..d07ba706aebe7 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/other/OtherPackageFormDataBase.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/other/OtherPackageFormDataBase.java @@ -1,6 +1,7 @@ package org.jboss.resteasy.reactive.server.vertx.test.multipart.other; import javax.ws.rs.core.MediaType; + import org.jboss.resteasy.reactive.PartType; import org.jboss.resteasy.reactive.RestForm; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/path/HelloResource.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/path/HelloResource.java index 6cdce093de9de..d25c9babfb75b 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/path/HelloResource.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/path/HelloResource.java @@ -1,6 +1,7 @@ package org.jboss.resteasy.reactive.server.vertx.test.path; import java.util.List; + import javax.ws.rs.GET; import javax.ws.rs.Path; import javax.ws.rs.PathParam; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/path/RestPathTestCase.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/path/RestPathTestCase.java index e7261aeac94c9..259e5968cd5cf 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/path/RestPathTestCase.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/path/RestPathTestCase.java @@ -1,13 +1,15 @@ package org.jboss.resteasy.reactive.server.vertx.test.path; -import io.restassured.RestAssured; import java.util.function.Consumer; + import org.hamcrest.Matchers; import org.jboss.resteasy.reactive.server.processor.ResteasyReactiveDeploymentManager; import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.restassured.RestAssured; + public class RestPathTestCase { @RegisterExtension diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/path/WhitespaceInPathTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/path/WhitespaceInPathTest.java index 0f1e3a265eb9a..2f4a928cd6749 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/path/WhitespaceInPathTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/path/WhitespaceInPathTest.java @@ -1,13 +1,15 @@ package org.jboss.resteasy.reactive.server.vertx.test.path; -import io.restassured.RestAssured; import javax.ws.rs.GET; import javax.ws.rs.Path; + import org.hamcrest.Matchers; import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.restassured.RestAssured; + public class WhitespaceInPathTest { @RegisterExtension diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/providers/FileResource.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/providers/FileResource.java index 47426c8f734b2..eb8aa22d0608d 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/providers/FileResource.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/providers/FileResource.java @@ -1,16 +1,19 @@ package org.jboss.resteasy.reactive.server.vertx.test.providers; -import io.smallrye.mutiny.Uni; -import io.vertx.core.file.AsyncFile; -import io.vertx.core.file.OpenOptions; -import io.vertx.ext.web.RoutingContext; import java.io.File; import java.nio.file.Paths; + import javax.ws.rs.GET; import javax.ws.rs.Path; + import org.jboss.resteasy.reactive.FilePart; import org.jboss.resteasy.reactive.PathPart; +import io.smallrye.mutiny.Uni; +import io.vertx.core.file.AsyncFile; +import io.vertx.core.file.OpenOptions; +import io.vertx.ext.web.RoutingContext; + @Path("providers/file") public class FileResource { diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/providers/FileTestCase.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/providers/FileTestCase.java index bc62dedbe9ea3..c0b98dbdb896f 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/providers/FileTestCase.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/providers/FileTestCase.java @@ -1,12 +1,13 @@ package org.jboss.resteasy.reactive.server.vertx.test.providers; -import io.restassured.RestAssured; import java.io.File; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; + import javax.ws.rs.core.HttpHeaders; + import org.hamcrest.Matchers; import org.jboss.resteasy.reactive.FilePart; import org.jboss.resteasy.reactive.PathPart; @@ -15,6 +16,8 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.restassured.RestAssured; + public class FileTestCase { private static final String FILE = "src/test/resources/lorem.txt"; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/providers/InvalidFileResource.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/providers/InvalidFileResource.java index 8664c9d15b10f..450b957d3ddf2 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/providers/InvalidFileResource.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/providers/InvalidFileResource.java @@ -1,10 +1,11 @@ package org.jboss.resteasy.reactive.server.vertx.test.providers; -import io.vertx.core.file.AsyncFile; -import io.vertx.ext.web.RoutingContext; import javax.ws.rs.GET; import javax.ws.rs.Path; +import io.vertx.core.file.AsyncFile; +import io.vertx.ext.web.RoutingContext; + @Path("providers/file-invalid") public class InvalidFileResource { diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/providers/WithWriterInterceptor.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/providers/WithWriterInterceptor.java index b7ce54a4860f9..9e17b971fec0b 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/providers/WithWriterInterceptor.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/providers/WithWriterInterceptor.java @@ -4,6 +4,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; + import javax.ws.rs.NameBinding; @NameBinding diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/providers/WriterInterceptor.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/providers/WriterInterceptor.java index d968761919d1a..27ac91942b55a 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/providers/WriterInterceptor.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/providers/WriterInterceptor.java @@ -1,6 +1,7 @@ package org.jboss.resteasy.reactive.server.vertx.test.providers; import java.io.IOException; + import javax.ws.rs.WebApplicationException; import javax.ws.rs.ext.Provider; import javax.ws.rs.ext.WriterInterceptorContext; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/AbortFilterWithLargePayloadTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/AbortFilterWithLargePayloadTest.java index 23e85869da4b8..6b93f16015512 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/AbortFilterWithLargePayloadTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/AbortFilterWithLargePayloadTest.java @@ -1,8 +1,8 @@ package org.jboss.resteasy.reactive.server.vertx.test.resource.basic; -import io.restassured.RestAssured; import java.io.IOException; import java.util.function.Supplier; + import javax.ws.rs.GET; import javax.ws.rs.Path; import javax.ws.rs.container.ContainerRequestContext; @@ -11,6 +11,7 @@ import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; import javax.ws.rs.ext.Provider; + import org.hamcrest.Matchers; import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; import org.jboss.shrinkwrap.api.ShrinkWrap; @@ -19,6 +20,8 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.restassured.RestAssured; + public class AbortFilterWithLargePayloadTest { @RegisterExtension diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/AbortingRequestFilter.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/AbortingRequestFilter.java index 1aa645ebf3357..2b744118207eb 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/AbortingRequestFilter.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/AbortingRequestFilter.java @@ -1,6 +1,7 @@ package org.jboss.resteasy.reactive.server.vertx.test.resource.basic; import java.io.IOException; + import javax.ws.rs.container.ContainerRequestContext; import javax.ws.rs.container.ContainerRequestFilter; import javax.ws.rs.core.Response; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/AbortingRequestFilterTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/AbortingRequestFilterTest.java index 6f827eb6b781d..f526eb0f45c99 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/AbortingRequestFilterTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/AbortingRequestFilterTest.java @@ -1,7 +1,7 @@ package org.jboss.resteasy.reactive.server.vertx.test.resource.basic; -import io.restassured.RestAssured; import java.util.function.Supplier; + import org.hamcrest.Matchers; import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; import org.jboss.resteasy.reactive.server.vertx.test.resource.basic.resource.ClassLevelMediaTypeResource; @@ -10,6 +10,8 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.restassured.RestAssured; + public class AbortingRequestFilterTest { @RegisterExtension diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/BasicGenericTypesHandlingTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/BasicGenericTypesHandlingTest.java index 7457e6be83b3f..e78e3bb05f348 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/BasicGenericTypesHandlingTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/BasicGenericTypesHandlingTest.java @@ -1,6 +1,5 @@ package org.jboss.resteasy.reactive.server.vertx.test.resource.basic; -import io.restassured.RestAssured; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; @@ -8,6 +7,7 @@ import java.lang.reflect.Type; import java.nio.charset.StandardCharsets; import java.util.function.Supplier; + import javax.ws.rs.Consumes; import javax.ws.rs.POST; import javax.ws.rs.Path; @@ -16,6 +16,7 @@ import javax.ws.rs.core.MediaType; import javax.ws.rs.core.MultivaluedMap; import javax.ws.rs.ext.Provider; + import org.hamcrest.Matchers; import org.jboss.resteasy.reactive.common.providers.serialisers.MessageReaderUtil; import org.jboss.resteasy.reactive.server.spi.ResteasyReactiveResourceInfo; @@ -28,6 +29,8 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.restassured.RestAssured; + public class BasicGenericTypesHandlingTest { @RegisterExtension diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/ClassLevelMediaTypeTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/ClassLevelMediaTypeTest.java index a302b4673d8b2..03189c70debf2 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/ClassLevelMediaTypeTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/ClassLevelMediaTypeTest.java @@ -1,10 +1,12 @@ package org.jboss.resteasy.reactive.server.vertx.test.resource.basic; import java.util.function.Supplier; + import javax.ws.rs.client.Client; import javax.ws.rs.client.ClientBuilder; import javax.ws.rs.client.WebTarget; import javax.ws.rs.core.Response; + import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; import org.jboss.resteasy.reactive.server.vertx.test.resource.basic.resource.ClassLevelMediaTypeResource; import org.jboss.resteasy.reactive.server.vertx.test.simple.PortProviderUtil; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/CollectionDefaultValueTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/CollectionDefaultValueTest.java index 814c7faa5afa4..89d7caa9bf46e 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/CollectionDefaultValueTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/CollectionDefaultValueTest.java @@ -1,9 +1,11 @@ package org.jboss.resteasy.reactive.server.vertx.test.resource.basic; import java.util.function.Supplier; + import javax.ws.rs.client.Client; import javax.ws.rs.client.ClientBuilder; import javax.ws.rs.core.Response; + import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; import org.jboss.resteasy.reactive.server.vertx.test.resource.basic.resource.CollectionDefaultValueResource; import org.jboss.resteasy.reactive.server.vertx.test.simple.PortProviderUtil; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/CovariantReturnSubresourceLocatorsTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/CovariantReturnSubresourceLocatorsTest.java index 0e5a38b8fd607..5a543020896ba 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/CovariantReturnSubresourceLocatorsTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/CovariantReturnSubresourceLocatorsTest.java @@ -1,9 +1,11 @@ package org.jboss.resteasy.reactive.server.vertx.test.resource.basic; import java.util.function.Supplier; + import javax.ws.rs.client.Client; import javax.ws.rs.client.ClientBuilder; import javax.ws.rs.core.Response; + import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; import org.jboss.resteasy.reactive.server.vertx.test.resource.basic.resource.CovariantReturnSubresourceLocatorsRootProxy; import org.jboss.resteasy.reactive.server.vertx.test.resource.basic.resource.CovariantReturnSubresourceLocatorsSubProxy; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/DefaultMediaTypeTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/DefaultMediaTypeTest.java index fe73d2faa6019..0dcc843024768 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/DefaultMediaTypeTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/DefaultMediaTypeTest.java @@ -2,12 +2,14 @@ import java.io.ByteArrayOutputStream; import java.util.function.Supplier; + import javax.ws.rs.client.Client; import javax.ws.rs.client.ClientBuilder; import javax.ws.rs.client.Entity; import javax.ws.rs.client.WebTarget; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; + import org.jboss.logging.Logger; import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; import org.jboss.resteasy.reactive.server.vertx.test.resource.basic.resource.DefaultMediaTypeCustomObject; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/GenericEntityTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/GenericEntityTest.java index d4e2d083ebd67..6af2b64a8a902 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/GenericEntityTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/GenericEntityTest.java @@ -1,10 +1,12 @@ package org.jboss.resteasy.reactive.server.vertx.test.resource.basic; import java.util.function.Supplier; + import javax.ws.rs.client.Client; import javax.ws.rs.client.ClientBuilder; import javax.ws.rs.client.WebTarget; import javax.ws.rs.core.Response; + import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; import org.jboss.resteasy.reactive.server.vertx.test.resource.basic.resource.GenericEntityDoubleWriter; import org.jboss.resteasy.reactive.server.vertx.test.resource.basic.resource.GenericEntityFloatWriter; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/GenericResourceTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/GenericResourceTest.java index 0ba0fb3427ade..269fa72d3a05e 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/GenericResourceTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/GenericResourceTest.java @@ -1,8 +1,10 @@ package org.jboss.resteasy.reactive.server.vertx.test.resource.basic; import java.util.function.Supplier; + import javax.ws.rs.client.ClientBuilder; import javax.ws.rs.client.WebTarget; + import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; import org.jboss.resteasy.reactive.server.vertx.test.resource.basic.resource.GenericResourceCrudResource; import org.jboss.resteasy.reactive.server.vertx.test.resource.basic.resource.GenericResourceStudent; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/HttpHeadersTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/HttpHeadersTest.java index 0584d4120730f..3e415b6ae6267 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/HttpHeadersTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/HttpHeadersTest.java @@ -1,9 +1,11 @@ package org.jboss.resteasy.reactive.server.vertx.test.resource.basic; import java.util.function.Supplier; + import javax.ws.rs.client.Client; import javax.ws.rs.client.ClientBuilder; import javax.ws.rs.core.Response; + import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; import org.jboss.resteasy.reactive.server.vertx.test.resource.basic.resource.HttpHeadersResource; import org.jboss.resteasy.reactive.server.vertx.test.simple.PortProviderUtil; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/InheritanceTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/InheritanceTest.java index 65148a35c90cd..90c0e09bb9573 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/InheritanceTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/InheritanceTest.java @@ -1,10 +1,12 @@ package org.jboss.resteasy.reactive.server.vertx.test.resource.basic; import java.util.function.Supplier; + import javax.ws.rs.client.Client; import javax.ws.rs.client.ClientBuilder; import javax.ws.rs.client.Invocation.Builder; import javax.ws.rs.core.Response; + import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; import org.jboss.resteasy.reactive.server.vertx.test.resource.basic.resource.InheritenceParentResource; import org.jboss.resteasy.reactive.server.vertx.test.resource.basic.resource.InheritenceParentResourceImpl; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/MatchedResourceTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/MatchedResourceTest.java index 838872a75541e..827be5f0a9c1c 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/MatchedResourceTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/MatchedResourceTest.java @@ -1,11 +1,13 @@ package org.jboss.resteasy.reactive.server.vertx.test.resource.basic; import java.util.function.Supplier; + import javax.ws.rs.client.Client; import javax.ws.rs.client.ClientBuilder; import javax.ws.rs.client.Entity; import javax.ws.rs.client.WebTarget; import javax.ws.rs.core.Response; + import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; import org.jboss.resteasy.reactive.server.vertx.test.resource.basic.resource.MatchedResource; import org.jboss.resteasy.reactive.server.vertx.test.simple.PortProviderUtil; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/MediaTypeFromMessageBodyWriterTestMultiple.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/MediaTypeFromMessageBodyWriterTestMultiple.java index 8068b62cc53e8..b900614da4a48 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/MediaTypeFromMessageBodyWriterTestMultiple.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/MediaTypeFromMessageBodyWriterTestMultiple.java @@ -3,10 +3,12 @@ import java.util.ArrayList; import java.util.Collection; import java.util.function.Supplier; + import javax.ws.rs.client.Client; import javax.ws.rs.client.ClientBuilder; import javax.ws.rs.client.WebTarget; import javax.ws.rs.core.Response; + import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; import org.jboss.resteasy.reactive.server.vertx.test.resource.basic.resource.MediaTypeFromMessageBodyWriterListAsText; import org.jboss.resteasy.reactive.server.vertx.test.resource.basic.resource.MediaTypeFromMessageBodyWriterListAsXML; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/MediaTypeNegotiationClientQualityTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/MediaTypeNegotiationClientQualityTest.java index 870e823dd88b1..2b1e344a39120 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/MediaTypeNegotiationClientQualityTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/MediaTypeNegotiationClientQualityTest.java @@ -5,6 +5,7 @@ import java.lang.annotation.Annotation; import java.lang.reflect.Type; import java.util.function.Supplier; + import javax.ws.rs.GET; import javax.ws.rs.Path; import javax.ws.rs.Produces; @@ -18,6 +19,7 @@ import javax.ws.rs.core.Response.Status; import javax.ws.rs.ext.MessageBodyWriter; import javax.ws.rs.ext.Provider; + import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; import org.jboss.resteasy.reactive.server.vertx.test.simple.PortProviderUtil; import org.jboss.shrinkwrap.api.ShrinkWrap; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/MediaTypeNegotiationServerQualityTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/MediaTypeNegotiationServerQualityTest.java index ac1f59096b261..43b81a7f448e8 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/MediaTypeNegotiationServerQualityTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/MediaTypeNegotiationServerQualityTest.java @@ -5,6 +5,7 @@ import java.lang.annotation.Annotation; import java.lang.reflect.Type; import java.util.function.Supplier; + import javax.ws.rs.GET; import javax.ws.rs.NotFoundException; import javax.ws.rs.Path; @@ -20,6 +21,7 @@ import javax.ws.rs.ext.ExceptionMapper; import javax.ws.rs.ext.MessageBodyWriter; import javax.ws.rs.ext.Provider; + import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; import org.jboss.resteasy.reactive.server.vertx.test.simple.PortProviderUtil; import org.jboss.shrinkwrap.api.ShrinkWrap; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/MultiInterfaceResLocatorTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/MultiInterfaceResLocatorTest.java index 459f5289d9838..f144f5188f657 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/MultiInterfaceResLocatorTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/MultiInterfaceResLocatorTest.java @@ -1,9 +1,11 @@ package org.jboss.resteasy.reactive.server.vertx.test.resource.basic; import java.util.function.Supplier; + import javax.ws.rs.client.Client; import javax.ws.rs.client.ClientBuilder; import javax.ws.rs.core.Response; + import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; import org.jboss.resteasy.reactive.server.vertx.test.resource.basic.resource.MultiInterfaceResLocatorIntf1; import org.jboss.resteasy.reactive.server.vertx.test.resource.basic.resource.MultiInterfaceResLocatorIntf2; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/MultipleAcceptHeaderTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/MultipleAcceptHeaderTest.java index cae2b7109e6ed..2358d3fbb6c14 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/MultipleAcceptHeaderTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/MultipleAcceptHeaderTest.java @@ -1,10 +1,12 @@ package org.jboss.resteasy.reactive.server.vertx.test.resource.basic; import java.util.function.Supplier; + import javax.ws.rs.GET; import javax.ws.rs.Path; import javax.ws.rs.Produces; import javax.ws.rs.client.ClientBuilder; + import org.jboss.resteasy.reactive.client.impl.ClientImpl; import org.jboss.resteasy.reactive.client.impl.WebTargetImpl; import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/ParameterSubResTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/ParameterSubResTest.java index 11a9211c286f5..8bab7888cb7db 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/ParameterSubResTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/ParameterSubResTest.java @@ -1,9 +1,11 @@ package org.jboss.resteasy.reactive.server.vertx.test.resource.basic; import java.util.function.Supplier; + import javax.ws.rs.client.Client; import javax.ws.rs.client.ClientBuilder; import javax.ws.rs.core.Response; + import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; import org.jboss.resteasy.reactive.server.vertx.test.resource.basic.resource.ApplicationScopeObject; import org.jboss.resteasy.reactive.server.vertx.test.resource.basic.resource.MultiInterfaceResLocatorIntf1; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/ReponseInfoTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/ReponseInfoTest.java index 4fe7a96c6ac2a..fc7123fba6ba3 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/ReponseInfoTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/ReponseInfoTest.java @@ -1,10 +1,12 @@ package org.jboss.resteasy.reactive.server.vertx.test.resource.basic; import java.util.function.Supplier; + import javax.ws.rs.client.Client; import javax.ws.rs.client.ClientBuilder; import javax.ws.rs.client.WebTarget; import javax.ws.rs.core.Response; + import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; import org.jboss.resteasy.reactive.server.vertx.test.resource.basic.resource.ResponseInfoResource; import org.jboss.resteasy.reactive.server.vertx.test.simple.PortProviderUtil; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/ResourceLocatorTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/ResourceLocatorTest.java index 97e5b7a7eddde..68f61411c14f2 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/ResourceLocatorTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/ResourceLocatorTest.java @@ -4,6 +4,7 @@ import static org.hamcrest.Matchers.is; import java.util.function.Supplier; + import javax.ws.rs.client.Client; import javax.ws.rs.client.ClientBuilder; import javax.ws.rs.client.Entity; @@ -11,6 +12,7 @@ import javax.ws.rs.client.WebTarget; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; + import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; import org.jboss.resteasy.reactive.server.vertx.test.resource.basic.resource.ResourceLocatorAbstractAnnotationFreeResouce; import org.jboss.resteasy.reactive.server.vertx.test.resource.basic.resource.ResourceLocatorAnnotationFreeSubResource; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/SpecialResourceTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/SpecialResourceTest.java index 741506ecd11c3..f7e63ffb618b0 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/SpecialResourceTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/SpecialResourceTest.java @@ -2,12 +2,14 @@ import java.io.IOException; import java.util.function.Supplier; + import javax.ws.rs.client.Client; import javax.ws.rs.client.ClientBuilder; import javax.ws.rs.client.Entity; import javax.ws.rs.client.WebTarget; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; + import org.apache.http.HttpResponse; import org.apache.http.client.HttpClient; import org.apache.http.client.methods.HttpPut; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/SubResourceLocatorTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/SubResourceLocatorTest.java index 7979ddacc9dcb..df7be4a8892b8 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/SubResourceLocatorTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/SubResourceLocatorTest.java @@ -1,10 +1,12 @@ package org.jboss.resteasy.reactive.server.vertx.test.resource.basic; import java.util.function.Supplier; + import javax.ws.rs.client.Client; import javax.ws.rs.client.ClientBuilder; import javax.ws.rs.client.WebTarget; import javax.ws.rs.core.Response; + import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; import org.jboss.resteasy.reactive.server.vertx.test.resource.basic.resource.SubResourceLocatorBaseCrudService; import org.jboss.resteasy.reactive.server.vertx.test.resource.basic.resource.SubResourceLocatorBaseService; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/SubResourceRequestFilterTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/SubResourceRequestFilterTest.java index fdb87ec484796..47b751960803c 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/SubResourceRequestFilterTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/SubResourceRequestFilterTest.java @@ -1,8 +1,8 @@ package org.jboss.resteasy.reactive.server.vertx.test.resource.basic; -import io.restassured.RestAssured; import java.io.IOException; import java.util.function.Supplier; + import javax.enterprise.context.ApplicationScoped; import javax.inject.Inject; import javax.ws.rs.GET; @@ -12,6 +12,7 @@ import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.Response; import javax.ws.rs.ext.Provider; + import org.hamcrest.Matchers; import org.jboss.resteasy.reactive.RestPath; import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; @@ -20,6 +21,8 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.restassured.RestAssured; + public class SubResourceRequestFilterTest { @RegisterExtension diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/UriInfoTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/UriInfoTest.java index 319cebe605c9d..5fd078f5a8140 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/UriInfoTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/UriInfoTest.java @@ -1,12 +1,13 @@ package org.jboss.resteasy.reactive.server.vertx.test.resource.basic; -import io.restassured.RestAssured; import java.util.function.Supplier; + import javax.ws.rs.client.Client; import javax.ws.rs.client.ClientBuilder; import javax.ws.rs.client.WebTarget; import javax.ws.rs.core.Response; import javax.ws.rs.core.UriBuilder; + import org.hamcrest.Matchers; import org.jboss.logging.Logger; import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; @@ -30,6 +31,8 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.restassured.RestAssured; + /** * @tpSubChapter Resources * @tpChapter Integration tests diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/WiderMappingNegativeTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/WiderMappingNegativeTest.java index a3c7b6bf19546..ae5d749fc4926 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/WiderMappingNegativeTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/WiderMappingNegativeTest.java @@ -1,9 +1,11 @@ package org.jboss.resteasy.reactive.server.vertx.test.resource.basic; import java.util.function.Supplier; + import javax.ws.rs.client.Client; import javax.ws.rs.client.ClientBuilder; import javax.ws.rs.core.Response; + import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; import org.jboss.resteasy.reactive.server.vertx.test.resource.basic.resource.WiderMappingDefaultOptions; import org.jboss.resteasy.reactive.server.vertx.test.resource.basic.resource.WiderMappingResource; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ApplicationScopeObject.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ApplicationScopeObject.java index 0e1de2de19028..fc2a685a2ffb2 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ApplicationScopeObject.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ApplicationScopeObject.java @@ -1,6 +1,7 @@ package org.jboss.resteasy.reactive.server.vertx.test.resource.basic.resource; import java.util.concurrent.atomic.AtomicInteger; + import javax.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/CollectionDefaultValueResource.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/CollectionDefaultValueResource.java index 2d7d644e4038d..b9c14ee7090bf 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/CollectionDefaultValueResource.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/CollectionDefaultValueResource.java @@ -1,12 +1,14 @@ package org.jboss.resteasy.reactive.server.vertx.test.resource.basic.resource; import java.util.List; + import javax.ws.rs.BeanParam; import javax.ws.rs.DefaultValue; import javax.ws.rs.GET; import javax.ws.rs.Path; import javax.ws.rs.Produces; import javax.ws.rs.QueryParam; + import org.junit.jupiter.api.Assertions; @Path("/collection") diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/DefaultMediaTypeResource.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/DefaultMediaTypeResource.java index 84be4e69c23e5..993cb9f9a6eff 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/DefaultMediaTypeResource.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/DefaultMediaTypeResource.java @@ -1,12 +1,14 @@ package org.jboss.resteasy.reactive.server.vertx.test.resource.basic.resource; import java.util.Date; + import javax.ws.rs.Consumes; import javax.ws.rs.POST; import javax.ws.rs.Path; import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; + import org.jboss.logging.Logger; @Path("/") diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ExtensionResource.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ExtensionResource.java index 54f00d58f852b..6039a0b417d94 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ExtensionResource.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ExtensionResource.java @@ -2,12 +2,14 @@ import java.util.List; import java.util.Locale; + import javax.ws.rs.GET; import javax.ws.rs.Path; import javax.ws.rs.Produces; import javax.ws.rs.core.Context; import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.MediaType; + import org.junit.jupiter.api.Assertions; @Path("/extension") diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/GenericEntityDoubleWriter.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/GenericEntityDoubleWriter.java index 9fdd19dd018f3..b9358b474e4f9 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/GenericEntityDoubleWriter.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/GenericEntityDoubleWriter.java @@ -6,12 +6,14 @@ import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; import java.util.List; + import javax.ws.rs.Produces; import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.MultivaluedMap; import javax.ws.rs.ext.MessageBodyWriter; import javax.ws.rs.ext.Provider; + import org.jboss.logging.Logger; @Provider diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/GenericEntityFloatWriter.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/GenericEntityFloatWriter.java index 61a9bf06b9d29..70fc9b7f6d76f 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/GenericEntityFloatWriter.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/GenericEntityFloatWriter.java @@ -6,12 +6,14 @@ import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; import java.util.List; + import javax.ws.rs.Produces; import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.MultivaluedMap; import javax.ws.rs.ext.MessageBodyWriter; import javax.ws.rs.ext.Provider; + import org.jboss.logging.Logger; @Provider diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/GenericEntityIntegerServerMessageBodyWriter.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/GenericEntityIntegerServerMessageBodyWriter.java index 6704da6448491..21d7182c3f628 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/GenericEntityIntegerServerMessageBodyWriter.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/GenericEntityIntegerServerMessageBodyWriter.java @@ -6,11 +6,13 @@ import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; import java.util.List; + import javax.ws.rs.Produces; import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.MultivaluedMap; import javax.ws.rs.ext.Provider; + import org.jboss.logging.Logger; import org.jboss.resteasy.reactive.server.spi.ResteasyReactiveResourceInfo; import org.jboss.resteasy.reactive.server.spi.ServerMessageBodyWriter; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/GenericEntityResource.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/GenericEntityResource.java index fab5e20ad2e97..98928024c5f40 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/GenericEntityResource.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/GenericEntityResource.java @@ -2,6 +2,7 @@ import java.util.ArrayList; import java.util.List; + import javax.ws.rs.GET; import javax.ws.rs.Path; import javax.ws.rs.core.GenericEntity; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/GenericResourceStudentCrudResource.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/GenericResourceStudentCrudResource.java index 7956a604a713b..ddae9aceae291 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/GenericResourceStudentCrudResource.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/GenericResourceStudentCrudResource.java @@ -2,6 +2,7 @@ import java.util.HashMap; import java.util.Map; + import javax.ws.rs.Consumes; import javax.ws.rs.Path; import javax.ws.rs.Produces; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/GenericResourceStudentReader.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/GenericResourceStudentReader.java index 9a3081137401e..0b6c6773903f8 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/GenericResourceStudentReader.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/GenericResourceStudentReader.java @@ -6,6 +6,7 @@ import java.io.InputStreamReader; import java.lang.annotation.Annotation; import java.lang.reflect.Type; + import javax.ws.rs.Consumes; import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.MediaType; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/GenericResourceStudentWriter.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/GenericResourceStudentWriter.java index 36fdc8944333a..4d365c5a7aa5c 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/GenericResourceStudentWriter.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/GenericResourceStudentWriter.java @@ -5,6 +5,7 @@ import java.io.OutputStreamWriter; import java.lang.annotation.Annotation; import java.lang.reflect.Type; + import javax.ws.rs.Produces; import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.MediaType; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/HttpHeadersResource.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/HttpHeadersResource.java index 47498720076b6..180dc846a5144 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/HttpHeadersResource.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/HttpHeadersResource.java @@ -7,6 +7,7 @@ import java.util.Locale; import java.util.Map; import java.util.Set; + import javax.ws.rs.GET; import javax.ws.rs.PUT; import javax.ws.rs.Path; @@ -15,6 +16,7 @@ import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.MultivaluedMap; + import org.jboss.logging.Logger; @Path(value = "/HeadersTest") diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/MediaTypeFromMessageBodyWriterListAsText.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/MediaTypeFromMessageBodyWriterListAsText.java index 270020fa18f76..c24c12342c9a3 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/MediaTypeFromMessageBodyWriterListAsText.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/MediaTypeFromMessageBodyWriterListAsText.java @@ -5,6 +5,7 @@ import java.lang.annotation.Annotation; import java.lang.reflect.Type; import java.util.Collection; + import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.MultivaluedMap; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/MediaTypeFromMessageBodyWriterListAsXML.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/MediaTypeFromMessageBodyWriterListAsXML.java index 341aba566bf35..1bdb2e90346dd 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/MediaTypeFromMessageBodyWriterListAsXML.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/MediaTypeFromMessageBodyWriterListAsXML.java @@ -5,6 +5,7 @@ import java.lang.annotation.Annotation; import java.lang.reflect.Type; import java.util.Collection; + import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.MultivaluedMap; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/MediaTypeFromMessageBodyWriterResource.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/MediaTypeFromMessageBodyWriterResource.java index 02429f7737873..641f53dfc5216 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/MediaTypeFromMessageBodyWriterResource.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/MediaTypeFromMessageBodyWriterResource.java @@ -2,6 +2,7 @@ import java.util.Arrays; import java.util.List; + import javax.ws.rs.DefaultValue; import javax.ws.rs.GET; import javax.ws.rs.HeaderParam; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/MultipleGetResource.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/MultipleGetResource.java index d738eb488493a..379d0e99c2c47 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/MultipleGetResource.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/MultipleGetResource.java @@ -2,6 +2,7 @@ import java.util.ArrayList; import java.util.List; + import javax.ws.rs.Consumes; import javax.ws.rs.GET; import javax.ws.rs.Path; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ParameterSubResClassSub.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ParameterSubResClassSub.java index 33688dfdddeff..3ff891ae86fc2 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ParameterSubResClassSub.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ParameterSubResClassSub.java @@ -5,6 +5,7 @@ import javax.ws.rs.core.Context; import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.UriInfo; + import org.junit.jupiter.api.Assertions; public class ParameterSubResClassSub { diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ParameterSubResGenericInterface.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ParameterSubResGenericInterface.java index 7bff02a92a49b..33801508ac5a2 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ParameterSubResGenericInterface.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ParameterSubResGenericInterface.java @@ -1,6 +1,7 @@ package org.jboss.resteasy.reactive.server.vertx.test.resource.basic.resource; import java.util.List; + import javax.ws.rs.GET; import javax.ws.rs.QueryParam; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ParameterSubResGenericSub.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ParameterSubResGenericSub.java index a4c21c9e4f73c..5684b4c99166d 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ParameterSubResGenericSub.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ParameterSubResGenericSub.java @@ -4,6 +4,7 @@ import java.lang.reflect.Method; import java.lang.reflect.Proxy; import java.util.List; + import javax.ws.rs.Path; @Path("generic") diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/RequestScopedObject.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/RequestScopedObject.java index f1a6281185194..415a044b1cece 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/RequestScopedObject.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/RequestScopedObject.java @@ -1,6 +1,7 @@ package org.jboss.resteasy.reactive.server.vertx.test.resource.basic.resource; import java.util.concurrent.atomic.AtomicInteger; + import javax.enterprise.context.RequestScoped; @RequestScoped diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ResourceInfoInjectionFilter.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ResourceInfoInjectionFilter.java index 6c641cf47ace0..c45e5aa2385ea 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ResourceInfoInjectionFilter.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ResourceInfoInjectionFilter.java @@ -2,6 +2,7 @@ import java.io.IOException; import java.lang.reflect.Method; + import javax.ws.rs.container.ContainerRequestContext; import javax.ws.rs.container.ContainerResponseContext; import javax.ws.rs.container.ContainerResponseFilter; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ResourceLocatorBaseResource.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ResourceLocatorBaseResource.java index d568506e54f29..17aa256b6b129 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ResourceLocatorBaseResource.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ResourceLocatorBaseResource.java @@ -4,10 +4,12 @@ import java.lang.reflect.Method; import java.lang.reflect.Proxy; import java.util.List; + import javax.ws.rs.Path; import javax.ws.rs.PathParam; import javax.ws.rs.core.Context; import javax.ws.rs.core.UriInfo; + import org.jboss.logging.Logger; import org.junit.jupiter.api.Assertions; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ResourceLocatorSubresource.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ResourceLocatorSubresource.java index 11d94d51b7e8b..b793f9dc6ea3f 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ResourceLocatorSubresource.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ResourceLocatorSubresource.java @@ -1,12 +1,14 @@ package org.jboss.resteasy.reactive.server.vertx.test.resource.basic.resource; import java.util.List; + import javax.ws.rs.BeanParam; import javax.ws.rs.GET; import javax.ws.rs.Path; import javax.ws.rs.QueryParam; import javax.ws.rs.core.Context; import javax.ws.rs.core.UriInfo; + import org.jboss.logging.Logger; import org.jboss.resteasy.reactive.RestPath; import org.junit.jupiter.api.Assertions; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ResourceLocatorSubresource2.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ResourceLocatorSubresource2.java index ab6520b3f2343..83206d4f57f83 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ResourceLocatorSubresource2.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ResourceLocatorSubresource2.java @@ -5,6 +5,7 @@ import javax.ws.rs.PathParam; import javax.ws.rs.core.Context; import javax.ws.rs.core.UriInfo; + import org.jboss.logging.Logger; import org.junit.jupiter.api.Assertions; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ResourceLocatorSubresource3.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ResourceLocatorSubresource3.java index d8c81b8e841ec..8ca7754953e6d 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ResourceLocatorSubresource3.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ResourceLocatorSubresource3.java @@ -1,6 +1,7 @@ package org.jboss.resteasy.reactive.server.vertx.test.resource.basic.resource; import java.util.List; + import org.junit.jupiter.api.Assertions; public class ResourceLocatorSubresource3 implements ResourceLocatorSubresource3Interface { diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ResourceLocatorSubresource3Interface.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ResourceLocatorSubresource3Interface.java index f86a0a636eea0..1417ed22e3476 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ResourceLocatorSubresource3Interface.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ResourceLocatorSubresource3Interface.java @@ -1,6 +1,7 @@ package org.jboss.resteasy.reactive.server.vertx.test.resource.basic.resource; import java.util.List; + import javax.ws.rs.GET; import javax.ws.rs.Path; import javax.ws.rs.QueryParam; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ResponseInfoResource.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ResponseInfoResource.java index a0c333f3a2e56..b966fc7e5df27 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ResponseInfoResource.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ResponseInfoResource.java @@ -1,11 +1,13 @@ package org.jboss.resteasy.reactive.server.vertx.test.resource.basic.resource; import java.net.URI; + import javax.ws.rs.GET; import javax.ws.rs.Path; import javax.ws.rs.QueryParam; import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.Response; + import org.jboss.logging.Logger; import org.jboss.resteasy.reactive.server.vertx.test.simple.PortProviderUtil; import org.junit.jupiter.api.Assertions; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/SpecialResourceApiResource.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/SpecialResourceApiResource.java index 2f4654a48f6c5..1d172f1ef20db 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/SpecialResourceApiResource.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/SpecialResourceApiResource.java @@ -6,6 +6,7 @@ import javax.ws.rs.Produces; import javax.ws.rs.core.Context; import javax.ws.rs.core.HttpHeaders; + import org.jboss.logging.Logger; import org.junit.jupiter.api.Assertions; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/SpecialResourceDeleteResource.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/SpecialResourceDeleteResource.java index e6b8d9035ad6f..2daf91d9b3b1a 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/SpecialResourceDeleteResource.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/SpecialResourceDeleteResource.java @@ -3,6 +3,7 @@ import javax.ws.rs.Consumes; import javax.ws.rs.DELETE; import javax.ws.rs.Path; + import org.junit.jupiter.api.Assertions; @Path("/delete") diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/SpecialResourceStreamResource.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/SpecialResourceStreamResource.java index b73d78fc66b38..fdcd16ee35eb4 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/SpecialResourceStreamResource.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/SpecialResourceStreamResource.java @@ -2,6 +2,7 @@ import java.io.IOException; import java.io.InputStream; + import javax.ws.rs.POST; import javax.ws.rs.Path; import javax.ws.rs.PathParam; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/SubResourceLocatorBaseCrudService.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/SubResourceLocatorBaseCrudService.java index 6b7084b29aa66..3875fd3e41edf 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/SubResourceLocatorBaseCrudService.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/SubResourceLocatorBaseCrudService.java @@ -1,6 +1,7 @@ package org.jboss.resteasy.reactive.server.vertx.test.resource.basic.resource; import java.util.List; + import javax.ws.rs.Consumes; import javax.ws.rs.DELETE; import javax.ws.rs.GET; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/SubResourceLocatorPlatformServiceImpl.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/SubResourceLocatorPlatformServiceImpl.java index 562df24b703b9..aa85808cc854b 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/SubResourceLocatorPlatformServiceImpl.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/SubResourceLocatorPlatformServiceImpl.java @@ -1,6 +1,7 @@ package org.jboss.resteasy.reactive.server.vertx.test.resource.basic.resource; import java.util.List; + import javax.ws.rs.PathParam; import javax.ws.rs.QueryParam; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/SubResourceLocatorUserResource.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/SubResourceLocatorUserResource.java index 430349797879b..a990b3c9b8045 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/SubResourceLocatorUserResource.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/SubResourceLocatorUserResource.java @@ -1,6 +1,7 @@ package org.jboss.resteasy.reactive.server.vertx.test.resource.basic.resource; import java.util.List; + import javax.ws.rs.Consumes; import javax.ws.rs.DELETE; import javax.ws.rs.GET; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/UriInfoEncodedQueryResource.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/UriInfoEncodedQueryResource.java index 52af9c3b93831..1f01af4f575f4 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/UriInfoEncodedQueryResource.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/UriInfoEncodedQueryResource.java @@ -5,6 +5,7 @@ import javax.ws.rs.QueryParam; import javax.ws.rs.core.Context; import javax.ws.rs.core.UriInfo; + import org.junit.jupiter.api.Assertions; @Path("UriInfoEncodedQueryResource/query") diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/UriInfoEncodedTemplateResource.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/UriInfoEncodedTemplateResource.java index 0cd03563f7637..58a7f6367e341 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/UriInfoEncodedTemplateResource.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/UriInfoEncodedTemplateResource.java @@ -1,12 +1,14 @@ package org.jboss.resteasy.reactive.server.vertx.test.resource.basic.resource; import java.util.List; + import javax.ws.rs.GET; import javax.ws.rs.Path; import javax.ws.rs.PathParam; import javax.ws.rs.core.Context; import javax.ws.rs.core.PathSegment; import javax.ws.rs.core.UriInfo; + import org.junit.jupiter.api.Assertions; @Path("UriInfoEncodedTemplateResource/{a}/{b}") diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/UriInfoEscapedMatrParamResource.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/UriInfoEscapedMatrParamResource.java index 89c0e45c741f1..f091f0e2920f1 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/UriInfoEscapedMatrParamResource.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/UriInfoEscapedMatrParamResource.java @@ -3,6 +3,7 @@ import javax.ws.rs.GET; import javax.ws.rs.MatrixParam; import javax.ws.rs.Path; + import org.junit.jupiter.api.Assertions; @Path("UriInfoEscapedMatrParamResource/queryEscapedMatrParam") diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/UriInfoQueryParamsResource.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/UriInfoQueryParamsResource.java index 56c40ca8498c7..660299d8c1eca 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/UriInfoQueryParamsResource.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/UriInfoQueryParamsResource.java @@ -3,12 +3,14 @@ import java.util.Collections; import java.util.List; import java.util.Map; + import javax.ws.rs.GET; import javax.ws.rs.Path; import javax.ws.rs.QueryParam; import javax.ws.rs.core.Context; import javax.ws.rs.core.MultivaluedMap; import javax.ws.rs.core.UriInfo; + import org.junit.jupiter.api.Assertions; @Path("UriInfoQueryParamsResource/queryParams") diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/UriInfoRelativizeResource.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/UriInfoRelativizeResource.java index a8dd736128339..a69feaa3d3e92 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/UriInfoRelativizeResource.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/UriInfoRelativizeResource.java @@ -1,6 +1,7 @@ package org.jboss.resteasy.reactive.server.vertx.test.resource.basic.resource; import java.net.URI; + import javax.ws.rs.GET; import javax.ws.rs.Path; import javax.ws.rs.Produces; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/UriInfoResolveResource.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/UriInfoResolveResource.java index 7ebd6efe492c6..b2d9db1fdb3b8 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/UriInfoResolveResource.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/UriInfoResolveResource.java @@ -1,6 +1,7 @@ package org.jboss.resteasy.reactive.server.vertx.test.resource.basic.resource; import java.net.URI; + import javax.ws.rs.GET; import javax.ws.rs.Path; import javax.ws.rs.Produces; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/UriInfoSimpleResource.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/UriInfoSimpleResource.java index c3f2236f6a6ac..6465d1784a349 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/UriInfoSimpleResource.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/UriInfoSimpleResource.java @@ -1,11 +1,13 @@ package org.jboss.resteasy.reactive.server.vertx.test.resource.basic.resource; import java.net.URI; + import javax.ws.rs.GET; import javax.ws.rs.Path; import javax.ws.rs.QueryParam; import javax.ws.rs.core.Context; import javax.ws.rs.core.UriInfo; + import org.jboss.logging.Logger; import org.jboss.resteasy.reactive.server.vertx.test.simple.PortProviderUtil; import org.junit.jupiter.api.Assertions; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/UriInfoSimpleSingletonResource.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/UriInfoSimpleSingletonResource.java index 639f8aeb2f5da..c556a3859fa10 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/UriInfoSimpleSingletonResource.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/UriInfoSimpleSingletonResource.java @@ -1,11 +1,13 @@ package org.jboss.resteasy.reactive.server.vertx.test.resource.basic.resource; import java.net.URI; + import javax.ws.rs.GET; import javax.ws.rs.Path; import javax.ws.rs.QueryParam; import javax.ws.rs.core.Context; import javax.ws.rs.core.UriInfo; + import org.jboss.logging.Logger; import org.jboss.resteasy.reactive.server.vertx.test.simple.PortProviderUtil; import org.junit.jupiter.api.Assertions; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/response/ContentLengthTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/response/ContentLengthTest.java index 3b2088f806a04..2dd2b688a1896 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/response/ContentLengthTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/response/ContentLengthTest.java @@ -8,12 +8,14 @@ import java.nio.charset.StandardCharsets; import java.util.Collections; import java.util.UUID; + import javax.ws.rs.GET; import javax.ws.rs.Path; import javax.ws.rs.Produces; import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; + import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/response/CustomHeadersAndWriterInterceptorTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/response/CustomHeadersAndWriterInterceptorTest.java index d7750b6db05e8..902ca5da4688c 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/response/CustomHeadersAndWriterInterceptorTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/response/CustomHeadersAndWriterInterceptorTest.java @@ -4,9 +4,9 @@ import static org.assertj.core.api.Assertions.*; import static org.hamcrest.Matchers.is; -import io.restassured.http.Headers; import java.io.IOException; import java.util.Date; + import javax.ws.rs.GET; import javax.ws.rs.Path; import javax.ws.rs.Produces; @@ -16,10 +16,13 @@ import javax.ws.rs.ext.Provider; import javax.ws.rs.ext.WriterInterceptor; import javax.ws.rs.ext.WriterInterceptorContext; + import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.restassured.http.Headers; + public class CustomHeadersAndWriterInterceptorTest { @RegisterExtension diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/response/ExceptionInWriterTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/response/ExceptionInWriterTest.java index 4926f8e0f41e0..d69d5180503c8 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/response/ExceptionInWriterTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/response/ExceptionInWriterTest.java @@ -8,6 +8,7 @@ import java.lang.annotation.Annotation; import java.lang.reflect.Type; import java.nio.charset.StandardCharsets; + import javax.ws.rs.GET; import javax.ws.rs.Path; import javax.ws.rs.Produces; @@ -17,6 +18,7 @@ import javax.ws.rs.core.Response; import javax.ws.rs.ext.ExceptionMapper; import javax.ws.rs.ext.Provider; + import org.jboss.resteasy.reactive.server.spi.ResteasyReactiveResourceInfo; import org.jboss.resteasy.reactive.server.spi.ServerMessageBodyWriter; import org.jboss.resteasy.reactive.server.spi.ServerRequestContext; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/response/NullHeaderTestCase.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/response/NullHeaderTestCase.java index 26511b99f43b3..7f12bf0d0d74d 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/response/NullHeaderTestCase.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/response/NullHeaderTestCase.java @@ -3,6 +3,7 @@ import static io.restassured.RestAssured.when; import java.io.IOException; + import javax.ws.rs.GET; import javax.ws.rs.Path; import javax.ws.rs.container.ContainerRequestContext; @@ -10,6 +11,7 @@ import javax.ws.rs.container.ContainerResponseFilter; import javax.ws.rs.core.Response; import javax.ws.rs.ext.Provider; + import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/response/ResponseTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/response/ResponseTest.java index 9c8dfaf2f34e2..93a4dcc19168d 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/response/ResponseTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/response/ResponseTest.java @@ -2,6 +2,7 @@ import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.Response; + import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/response/RestResponseResource.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/response/RestResponseResource.java index 286b0e1be476c..7a8c7079fe229 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/response/RestResponseResource.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/response/RestResponseResource.java @@ -1,12 +1,12 @@ package org.jboss.resteasy.reactive.server.vertx.test.response; -import io.smallrye.mutiny.Uni; import java.net.URI; import java.net.URISyntaxException; import java.time.Instant; import java.util.Date; import java.util.Locale; import java.util.Optional; + import javax.ws.rs.GET; import javax.ws.rs.Path; import javax.ws.rs.container.ContainerRequestContext; @@ -14,10 +14,13 @@ import javax.ws.rs.core.NewCookie; import javax.ws.rs.core.Response; import javax.ws.rs.core.Variant; + import org.jboss.resteasy.reactive.RestResponse; import org.jboss.resteasy.reactive.server.ServerExceptionMapper; import org.jboss.resteasy.reactive.server.ServerRequestFilter; +import io.smallrye.mutiny.Uni; + @Path("") public class RestResponseResource { @GET diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/response/RestResponseTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/response/RestResponseTest.java index cb65e91ce3f6f..faea3d3351c65 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/response/RestResponseTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/response/RestResponseTest.java @@ -1,7 +1,7 @@ package org.jboss.resteasy.reactive.server.vertx.test.response; -import io.restassured.RestAssured; import java.util.function.Supplier; + import org.hamcrest.Matchers; import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; import org.jboss.shrinkwrap.api.ShrinkWrap; @@ -9,6 +9,8 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.restassured.RestAssured; + public class RestResponseTest { @RegisterExtension static ResteasyReactiveUnitTest test = new ResteasyReactiveUnitTest() diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resteasy/async/filters/AsyncRequestFilter.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resteasy/async/filters/AsyncRequestFilter.java index 1c5476469f163..be081580ae35e 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resteasy/async/filters/AsyncRequestFilter.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resteasy/async/filters/AsyncRequestFilter.java @@ -3,7 +3,9 @@ import java.util.Objects; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; + import javax.ws.rs.core.Response; + import org.jboss.logging.Logger; import org.jboss.resteasy.reactive.server.spi.ResteasyReactiveContainerRequestContext; import org.jboss.resteasy.reactive.server.spi.ResteasyReactiveContainerRequestFilter; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resteasy/async/filters/AsyncRequestFilterResource.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resteasy/async/filters/AsyncRequestFilterResource.java index 6d12e50b2b973..a19d730967ebb 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resteasy/async/filters/AsyncRequestFilterResource.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resteasy/async/filters/AsyncRequestFilterResource.java @@ -4,12 +4,14 @@ import java.util.concurrent.CompletionStage; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; + import javax.ws.rs.DefaultValue; import javax.ws.rs.GET; import javax.ws.rs.HeaderParam; import javax.ws.rs.Path; import javax.ws.rs.core.Context; import javax.ws.rs.core.Response; + import org.jboss.logging.Logger; import org.jboss.resteasy.reactive.server.spi.ServerRequestContext; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resteasy/async/filters/AsyncRequestFilterTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resteasy/async/filters/AsyncRequestFilterTest.java index 30de60f7325ec..96b53b1dcb39b 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resteasy/async/filters/AsyncRequestFilterTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resteasy/async/filters/AsyncRequestFilterTest.java @@ -3,11 +3,13 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.function.Supplier; + import javax.ws.rs.client.Client; import javax.ws.rs.client.ClientBuilder; import javax.ws.rs.client.WebTarget; import javax.ws.rs.core.Response; import javax.ws.rs.core.Response.Status; + import org.jboss.logging.Logger; import org.jboss.resteasy.reactive.server.vertx.test.ExceptionUtil; import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resteasy/async/filters/AsyncResource.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resteasy/async/filters/AsyncResource.java index 8463637001587..def6ed60875af 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resteasy/async/filters/AsyncResource.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resteasy/async/filters/AsyncResource.java @@ -3,6 +3,7 @@ import java.io.PrintWriter; import java.io.StringWriter; import java.util.concurrent.TimeUnit; + import javax.ws.rs.GET; import javax.ws.rs.Path; import javax.ws.rs.Produces; @@ -10,6 +11,7 @@ import javax.ws.rs.container.Suspended; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; + import org.jboss.logging.Logger; /** diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resteasy/async/filters/AsyncResponseFilter.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resteasy/async/filters/AsyncResponseFilter.java index 8b17078824ece..2bf66257f3d78 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resteasy/async/filters/AsyncResponseFilter.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resteasy/async/filters/AsyncResponseFilter.java @@ -5,7 +5,9 @@ import java.util.Objects; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; + import javax.ws.rs.container.ContainerResponseContext; + import org.jboss.logging.Logger; import org.jboss.resteasy.reactive.server.spi.ResteasyReactiveContainerRequestContext; import org.jboss.resteasy.reactive.server.spi.ResteasyReactiveContainerResponseFilter; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/ApplicationPathTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/ApplicationPathTest.java index f16ceb774f25b..c72a8f849ae52 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/ApplicationPathTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/ApplicationPathTest.java @@ -1,11 +1,12 @@ package org.jboss.resteasy.reactive.server.vertx.test.simple; -import io.restassured.RestAssured; import java.util.function.Supplier; + import javax.ws.rs.ApplicationPath; import javax.ws.rs.GET; import javax.ws.rs.Path; import javax.ws.rs.core.Application; + import org.hamcrest.Matchers; import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; import org.jboss.shrinkwrap.api.ShrinkWrap; @@ -13,6 +14,8 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.restassured.RestAssured; + public class ApplicationPathTest { @RegisterExtension diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/ApplicationTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/ApplicationTest.java index 42bda188b902d..fea2bd8580f0e 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/ApplicationTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/ApplicationTest.java @@ -8,6 +8,7 @@ import java.util.Arrays; import java.util.HashSet; import java.util.Set; + import javax.ws.rs.GET; import javax.ws.rs.Path; import javax.ws.rs.container.ContainerRequestContext; @@ -21,6 +22,7 @@ import javax.ws.rs.core.Response; import javax.ws.rs.ext.ExceptionMapper; import javax.ws.rs.ext.Provider; + import org.hamcrest.Matchers; import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; import org.junit.jupiter.api.DisplayName; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/ApplicationWithBlockingTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/ApplicationWithBlockingTest.java index 80c8dd544ca62..b97ea03e1cd4d 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/ApplicationWithBlockingTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/ApplicationWithBlockingTest.java @@ -1,12 +1,11 @@ package org.jboss.resteasy.reactive.server.vertx.test.simple; -import io.restassured.RestAssured; -import io.smallrye.common.annotation.Blocking; -import io.smallrye.common.annotation.NonBlocking; import java.util.function.Supplier; + import javax.ws.rs.GET; import javax.ws.rs.Path; import javax.ws.rs.core.Application; + import org.hamcrest.Matchers; import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; import org.jboss.shrinkwrap.api.ShrinkWrap; @@ -14,6 +13,10 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.restassured.RestAssured; +import io.smallrye.common.annotation.Blocking; +import io.smallrye.common.annotation.NonBlocking; + public class ApplicationWithBlockingTest { @RegisterExtension diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/Bar.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/Bar.java index 977fab5136a73..0af26aa80a7f0 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/Bar.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/Bar.java @@ -4,6 +4,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; + import javax.ws.rs.NameBinding; @NameBinding diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/BeanParamEmptySubclassTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/BeanParamEmptySubclassTest.java index 3d467742ef913..0b3eb2d21771c 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/BeanParamEmptySubclassTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/BeanParamEmptySubclassTest.java @@ -1,6 +1,5 @@ package org.jboss.resteasy.reactive.server.vertx.test.simple; -import io.restassured.RestAssured; import javax.ws.rs.BeanParam; import javax.ws.rs.FormParam; import javax.ws.rs.POST; @@ -8,11 +7,14 @@ import javax.ws.rs.Produces; import javax.ws.rs.QueryParam; import javax.ws.rs.core.MediaType; + import org.hamcrest.Matchers; import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.restassured.RestAssured; + public class BeanParamEmptySubclassTest { @RegisterExtension diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/BeanParamSubClass.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/BeanParamSubClass.java index 48922b257e5bc..e8c5d2107b79f 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/BeanParamSubClass.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/BeanParamSubClass.java @@ -1,6 +1,7 @@ package org.jboss.resteasy.reactive.server.vertx.test.simple; import javax.ws.rs.QueryParam; + import org.junit.jupiter.api.Assertions; public class BeanParamSubClass extends BeanParamSuperClass { diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/BeanParamSuperClass.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/BeanParamSuperClass.java index 8b2c406a126b6..fc087fbe35586 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/BeanParamSuperClass.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/BeanParamSuperClass.java @@ -1,10 +1,12 @@ package org.jboss.resteasy.reactive.server.vertx.test.simple; import java.util.List; + import javax.ws.rs.BeanParam; import javax.ws.rs.DefaultValue; import javax.ws.rs.HeaderParam; import javax.ws.rs.QueryParam; + import org.junit.jupiter.api.Assertions; public class BeanParamSuperClass { diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/BeanParamWithLocalDateTimeTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/BeanParamWithLocalDateTimeTest.java index 20371dd0d3941..b321c2e34d0f6 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/BeanParamWithLocalDateTimeTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/BeanParamWithLocalDateTimeTest.java @@ -1,12 +1,13 @@ package org.jboss.resteasy.reactive.server.vertx.test.simple; -import io.restassured.RestAssured; import java.time.LocalDateTime; import java.util.function.Supplier; + import javax.ws.rs.BeanParam; import javax.ws.rs.GET; import javax.ws.rs.Path; import javax.ws.rs.QueryParam; + import org.hamcrest.Matchers; import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; import org.jboss.shrinkwrap.api.ShrinkWrap; @@ -14,6 +15,8 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.restassured.RestAssured; + public class BeanParamWithLocalDateTimeTest { @RegisterExtension diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/BlockingWithFilterTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/BlockingWithFilterTest.java index 2eb2965250249..e969be0164cbe 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/BlockingWithFilterTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/BlockingWithFilterTest.java @@ -4,14 +4,14 @@ import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; -import io.restassured.RestAssured; -import io.smallrye.common.annotation.Blocking; import java.util.function.Supplier; + import javax.ws.rs.GET; import javax.ws.rs.Path; import javax.ws.rs.container.ContainerRequestContext; import javax.ws.rs.core.Context; import javax.ws.rs.core.HttpHeaders; + import org.jboss.resteasy.reactive.server.ServerRequestFilter; import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; import org.jboss.shrinkwrap.api.ShrinkWrap; @@ -19,6 +19,9 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.restassured.RestAssured; +import io.smallrye.common.annotation.Blocking; + public class BlockingWithFilterTest { @RegisterExtension diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/DynamicFeatureRequestFilterWithLowPriority.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/DynamicFeatureRequestFilterWithLowPriority.java index ccd08d1c5429d..345c04ef9027d 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/DynamicFeatureRequestFilterWithLowPriority.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/DynamicFeatureRequestFilterWithLowPriority.java @@ -1,6 +1,7 @@ package org.jboss.resteasy.reactive.server.vertx.test.simple; import java.io.IOException; + import javax.annotation.Priority; import javax.ws.rs.Priorities; import javax.ws.rs.container.ContainerRequestContext; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/FeatureMappedExceptionMapper.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/FeatureMappedExceptionMapper.java index 48335027382d7..0e61faeea1e5e 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/FeatureMappedExceptionMapper.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/FeatureMappedExceptionMapper.java @@ -1,6 +1,7 @@ package org.jboss.resteasy.reactive.server.vertx.test.simple; import java.io.Serializable; + import javax.ws.rs.core.Response; import javax.ws.rs.ext.ExceptionMapper; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/FeatureRequestFilterWithHighestPriority.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/FeatureRequestFilterWithHighestPriority.java index 4a1feef73d52d..0f1472dc7a1ff 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/FeatureRequestFilterWithHighestPriority.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/FeatureRequestFilterWithHighestPriority.java @@ -1,6 +1,7 @@ package org.jboss.resteasy.reactive.server.vertx.test.simple; import java.io.IOException; + import javax.annotation.Priority; import javax.ws.rs.Priorities; import javax.ws.rs.container.ContainerRequestContext; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/FeatureRequestFilterWithNormalPriority.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/FeatureRequestFilterWithNormalPriority.java index 4a7457b5804ec..0853242d792a0 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/FeatureRequestFilterWithNormalPriority.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/FeatureRequestFilterWithNormalPriority.java @@ -1,6 +1,7 @@ package org.jboss.resteasy.reactive.server.vertx.test.simple; import java.io.IOException; + import javax.ws.rs.container.ContainerRequestContext; import javax.ws.rs.container.ContainerRequestFilter; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/FeatureResponseFilter.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/FeatureResponseFilter.java index 2a1f0f50a3300..55eb704288fab 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/FeatureResponseFilter.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/FeatureResponseFilter.java @@ -1,6 +1,7 @@ package org.jboss.resteasy.reactive.server.vertx.test.simple; import java.io.IOException; + import javax.ws.rs.container.ContainerRequestContext; import javax.ws.rs.container.ContainerResponseContext; import javax.ws.rs.container.ContainerResponseFilter; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/FieldInjectedResource.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/FieldInjectedResource.java index 8348c36369bc8..e29f66774c765 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/FieldInjectedResource.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/FieldInjectedResource.java @@ -7,6 +7,7 @@ import javax.ws.rs.QueryParam; import javax.ws.rs.core.Context; import javax.ws.rs.core.UriInfo; + import org.junit.jupiter.api.Assertions; @Path("injection") diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/FieldInjectedSubClassResource.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/FieldInjectedSubClassResource.java index dacc5a575c770..e0c9a2200d50c 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/FieldInjectedSubClassResource.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/FieldInjectedSubClassResource.java @@ -8,6 +8,7 @@ import javax.ws.rs.QueryParam; import javax.ws.rs.core.Context; import javax.ws.rs.core.UriInfo; + import org.junit.jupiter.api.Assertions; @Path("injection-subclass") diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/Foo.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/Foo.java index 2edc877ff8df4..f785a82655ee4 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/Foo.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/Foo.java @@ -4,6 +4,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; + import javax.ws.rs.NameBinding; @NameBinding diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/HelloService.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/HelloService.java index 355b2d7887d3a..2d23570a5db03 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/HelloService.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/HelloService.java @@ -1,10 +1,12 @@ package org.jboss.resteasy.reactive.server.vertx.test.simple; -import io.vertx.ext.web.RoutingContext; import java.util.Objects; + import javax.enterprise.context.RequestScoped; import javax.ws.rs.core.Context; +import io.vertx.ext.web.RoutingContext; + @RequestScoped public class HelloService { diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/IllegalClassExceptionMapper.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/IllegalClassExceptionMapper.java index 32518e5709deb..c3dfbeb19f5aa 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/IllegalClassExceptionMapper.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/IllegalClassExceptionMapper.java @@ -1,14 +1,15 @@ package org.jboss.resteasy.reactive.server.vertx.test.simple; -import io.quarkus.gizmo.Gizmo; import java.io.InputStream; import java.io.PrintWriter; import java.io.StringWriter; import java.util.regex.Matcher; import java.util.regex.Pattern; + import javax.ws.rs.core.Response; import javax.ws.rs.ext.ExceptionMapper; import javax.ws.rs.ext.Provider; + import org.objectweb.asm.ClassReader; import org.objectweb.asm.ClassVisitor; import org.objectweb.asm.MethodVisitor; @@ -17,6 +18,8 @@ import org.objectweb.asm.util.TraceClassVisitor; import org.objectweb.asm.util.TraceMethodVisitor; +import io.quarkus.gizmo.Gizmo; + @Provider public class IllegalClassExceptionMapper implements ExceptionMapper { diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/InstantParamTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/InstantParamTest.java index d5452293af97d..f242b1186b784 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/InstantParamTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/InstantParamTest.java @@ -1,10 +1,11 @@ package org.jboss.resteasy.reactive.server.vertx.test.simple; -import io.restassured.RestAssured; import java.time.Duration; import java.time.Instant; + import javax.ws.rs.GET; import javax.ws.rs.Path; + import org.hamcrest.Matchers; import org.jboss.resteasy.reactive.RestQuery; import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; @@ -13,6 +14,8 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.restassured.RestAssured; + public class InstantParamTest { @RegisterExtension diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/InterfaceWithImplTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/InterfaceWithImplTest.java index a7290c6baa850..34e8179df65f8 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/InterfaceWithImplTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/InterfaceWithImplTest.java @@ -1,18 +1,20 @@ package org.jboss.resteasy.reactive.server.vertx.test.simple; -import io.restassured.RestAssured; -import io.smallrye.common.annotation.Blocking; -import io.smallrye.common.annotation.NonBlocking; import javax.ws.rs.GET; import javax.ws.rs.Path; import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; + import org.hamcrest.Matchers; import org.jboss.resteasy.reactive.server.core.BlockingOperationSupport; import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.restassured.RestAssured; +import io.smallrye.common.annotation.Blocking; +import io.smallrye.common.annotation.NonBlocking; + public class InterfaceWithImplTest { @RegisterExtension diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/LocalDateCustomParamConverterProviderTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/LocalDateCustomParamConverterProviderTest.java index 017b91f7ac61b..4a4afc2abba5d 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/LocalDateCustomParamConverterProviderTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/LocalDateCustomParamConverterProviderTest.java @@ -1,10 +1,10 @@ package org.jboss.resteasy.reactive.server.vertx.test.simple; -import io.restassured.RestAssured; import java.lang.annotation.Annotation; import java.lang.reflect.Type; import java.time.LocalDate; import java.time.format.DateTimeFormatter; + import javax.ws.rs.GET; import javax.ws.rs.Path; import javax.ws.rs.PathParam; @@ -12,11 +12,14 @@ import javax.ws.rs.ext.ParamConverter; import javax.ws.rs.ext.ParamConverterProvider; import javax.ws.rs.ext.Provider; + import org.hamcrest.Matchers; import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.restassured.RestAssured; + public class LocalDateCustomParamConverterProviderTest { @RegisterExtension diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/LocalDateParamTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/LocalDateParamTest.java index 5a7717eb7c228..6305daacea016 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/LocalDateParamTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/LocalDateParamTest.java @@ -1,20 +1,23 @@ package org.jboss.resteasy.reactive.server.vertx.test.simple; -import io.restassured.RestAssured; import java.time.LocalDate; import java.time.format.DateTimeFormatter; + import javax.ws.rs.FormParam; import javax.ws.rs.GET; import javax.ws.rs.POST; import javax.ws.rs.Path; import javax.ws.rs.PathParam; import javax.ws.rs.QueryParam; + import org.hamcrest.Matchers; import org.jboss.resteasy.reactive.DateFormat; import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.restassured.RestAssured; + public class LocalDateParamTest { @RegisterExtension diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/LocalDateTimeParamTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/LocalDateTimeParamTest.java index f9bbef0af9bf3..3e79191243710 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/LocalDateTimeParamTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/LocalDateTimeParamTest.java @@ -1,13 +1,14 @@ package org.jboss.resteasy.reactive.server.vertx.test.simple; -import io.restassured.RestAssured; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.util.Optional; + import javax.ws.rs.FormParam; import javax.ws.rs.GET; import javax.ws.rs.POST; import javax.ws.rs.Path; + import org.hamcrest.Matchers; import org.jboss.resteasy.reactive.DateFormat; import org.jboss.resteasy.reactive.RestPath; @@ -18,6 +19,8 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.restassured.RestAssured; + public class LocalDateTimeParamTest { @RegisterExtension diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/MultipleAcceptHeadersTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/MultipleAcceptHeadersTest.java index 84ffa58a4a3d2..15830b6156107 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/MultipleAcceptHeadersTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/MultipleAcceptHeadersTest.java @@ -2,19 +2,22 @@ import static org.assertj.core.api.Assertions.assertThat; -import io.vertx.core.Vertx; -import io.vertx.ext.web.client.WebClient; import java.util.List; import java.util.concurrent.TimeUnit; + import javax.ws.rs.GET; import javax.ws.rs.Path; import javax.ws.rs.Produces; + import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.vertx.core.Vertx; +import io.vertx.ext.web.client.WebClient; + public class MultipleAcceptHeadersTest { private static final String BODY = "{\"message\": \"hello world\"}"; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/MyParameterProvider.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/MyParameterProvider.java index a45687f698aae..355c66c89e04e 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/MyParameterProvider.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/MyParameterProvider.java @@ -2,6 +2,7 @@ import java.lang.annotation.Annotation; import java.lang.reflect.Type; + import javax.ws.rs.ext.ParamConverter; import javax.ws.rs.ext.ParamConverterProvider; import javax.ws.rs.ext.Provider; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/NameBindingWithInterfaceTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/NameBindingWithInterfaceTest.java index a239b55335cdf..10661e08b36d2 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/NameBindingWithInterfaceTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/NameBindingWithInterfaceTest.java @@ -3,9 +3,9 @@ import static io.restassured.RestAssured.*; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import io.smallrye.mutiny.Uni; import java.io.IOException; import java.lang.annotation.Retention; + import javax.ws.rs.GET; import javax.ws.rs.NameBinding; import javax.ws.rs.Path; @@ -15,6 +15,7 @@ import javax.ws.rs.container.ContainerResponseFilter; import javax.ws.rs.core.MediaType; import javax.ws.rs.ext.Provider; + import org.hamcrest.Matchers; import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; import org.jboss.shrinkwrap.api.ShrinkWrap; @@ -22,6 +23,8 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.smallrye.mutiny.Uni; + public class NameBindingWithInterfaceTest { @RegisterExtension diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/NewParamsRestResource.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/NewParamsRestResource.java index 906791b969044..d30b7d363e1f8 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/NewParamsRestResource.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/NewParamsRestResource.java @@ -1,9 +1,7 @@ package org.jboss.resteasy.reactive.server.vertx.test.simple; -import io.smallrye.common.annotation.Blocking; -import io.vertx.core.http.HttpServerRequest; -import io.vertx.core.http.HttpServerResponse; import java.util.Optional; + import javax.ws.rs.GET; import javax.ws.rs.POST; import javax.ws.rs.Path; @@ -18,6 +16,7 @@ import javax.ws.rs.ext.Providers; import javax.ws.rs.sse.Sse; import javax.ws.rs.sse.SseEventSink; + import org.jboss.resteasy.reactive.RestCookie; import org.jboss.resteasy.reactive.RestForm; import org.jboss.resteasy.reactive.RestHeader; @@ -29,6 +28,10 @@ import org.jboss.resteasy.reactive.server.spi.ServerRequestContext; import org.junit.jupiter.api.Assertions; +import io.smallrye.common.annotation.Blocking; +import io.vertx.core.http.HttpServerRequest; +import io.vertx.core.http.HttpServerResponse; + @Path("/new-params/{klass}/{regex:[^/]+}") public class NewParamsRestResource { diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/OtherBeanParam.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/OtherBeanParam.java index 8994c6fdb1b58..d30f1f3c04b88 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/OtherBeanParam.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/OtherBeanParam.java @@ -2,6 +2,7 @@ import javax.ws.rs.HeaderParam; import javax.ws.rs.QueryParam; + import org.junit.jupiter.api.Assertions; public class OtherBeanParam { diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/OtherJavaTimeParamTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/OtherJavaTimeParamTest.java index 0aee996e20fdf..c688200094073 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/OtherJavaTimeParamTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/OtherJavaTimeParamTest.java @@ -1,13 +1,14 @@ package org.jboss.resteasy.reactive.server.vertx.test.simple; -import io.restassured.RestAssured; import java.time.LocalTime; import java.time.OffsetDateTime; import java.time.OffsetTime; import java.time.ZonedDateTime; + import javax.ws.rs.GET; import javax.ws.rs.Path; import javax.ws.rs.QueryParam; + import org.hamcrest.Matchers; import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; import org.jboss.shrinkwrap.api.ShrinkWrap; @@ -15,6 +16,8 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.restassured.RestAssured; + public class OtherJavaTimeParamTest { @RegisterExtension diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/RawListQueryParamTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/RawListQueryParamTest.java index 0a8c7ef776af8..b73d2ba238a53 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/RawListQueryParamTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/RawListQueryParamTest.java @@ -1,15 +1,18 @@ package org.jboss.resteasy.reactive.server.vertx.test.simple; -import io.restassured.RestAssured; import java.util.List; + import javax.ws.rs.GET; import javax.ws.rs.Path; + import org.hamcrest.Matchers; import org.jboss.resteasy.reactive.RestQuery; import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.restassured.RestAssured; + public class RawListQueryParamTest { @RegisterExtension diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/ResourceInfoInjectingFilter.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/ResourceInfoInjectingFilter.java index 4f2a05cb5dbee..7a3481e75e4ca 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/ResourceInfoInjectingFilter.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/ResourceInfoInjectingFilter.java @@ -1,6 +1,7 @@ package org.jboss.resteasy.reactive.server.vertx.test.simple; import java.io.IOException; + import javax.ws.rs.container.ContainerRequestContext; import javax.ws.rs.container.ContainerRequestFilter; import javax.ws.rs.container.ResourceInfo; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/SimpleBeanParam.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/SimpleBeanParam.java index 4914d832f7dc2..d8d72459a1d16 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/SimpleBeanParam.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/SimpleBeanParam.java @@ -2,10 +2,12 @@ import java.util.List; import java.util.Optional; + import javax.ws.rs.BeanParam; import javax.ws.rs.DefaultValue; import javax.ws.rs.HeaderParam; import javax.ws.rs.QueryParam; + import org.junit.jupiter.api.Assertions; public class SimpleBeanParam { diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/SimpleQuarkusRestResource.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/SimpleQuarkusRestResource.java index d97c027fd7673..5570f23f853ee 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/SimpleQuarkusRestResource.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/SimpleQuarkusRestResource.java @@ -1,15 +1,11 @@ package org.jboss.resteasy.reactive.server.vertx.test.simple; -import io.smallrye.common.annotation.Blocking; -import io.smallrye.mutiny.Uni; -import io.vertx.core.buffer.Buffer; -import io.vertx.core.http.HttpServerRequest; -import io.vertx.core.http.HttpServerResponse; import java.math.BigDecimal; import java.util.Arrays; import java.util.List; import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionStage; + import javax.inject.Inject; import javax.json.JsonArray; import javax.json.JsonObject; @@ -36,10 +32,17 @@ import javax.ws.rs.core.Request; import javax.ws.rs.core.Response; import javax.ws.rs.ext.Providers; + import org.jboss.resteasy.reactive.RestHeader; import org.jboss.resteasy.reactive.server.SimpleResourceInfo; import org.jboss.resteasy.reactive.server.core.BlockingOperationSupport; +import io.smallrye.common.annotation.Blocking; +import io.smallrye.mutiny.Uni; +import io.vertx.core.buffer.Buffer; +import io.vertx.core.http.HttpServerRequest; +import io.vertx.core.http.HttpServerResponse; + @Path("/simple") public class SimpleQuarkusRestResource { diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/SimpleQuarkusRestTestCase.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/SimpleQuarkusRestTestCase.java index 8f3ee303e637a..6c008d01aa74e 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/SimpleQuarkusRestTestCase.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/SimpleQuarkusRestTestCase.java @@ -3,9 +3,8 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.hamcrest.Matchers.emptyString; -import io.restassured.RestAssured; -import io.restassured.http.Headers; import java.util.function.Supplier; + import org.hamcrest.Matchers; import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; import org.jboss.shrinkwrap.api.ShrinkWrap; @@ -16,6 +15,9 @@ import org.junit.jupiter.api.condition.OS; import org.junit.jupiter.api.extension.RegisterExtension; +import io.restassured.RestAssured; +import io.restassured.http.Headers; + public class SimpleQuarkusRestTestCase { @RegisterExtension diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/TRACE.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/TRACE.java index 150c80bde9563..72a5cc97b5f8a 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/TRACE.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/TRACE.java @@ -4,6 +4,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; + import javax.ws.rs.HttpMethod; @HttpMethod("TRACE") diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/TestBarRequestFilter.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/TestBarRequestFilter.java index 5275c17fda7f6..7a7ac0404cb63 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/TestBarRequestFilter.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/TestBarRequestFilter.java @@ -1,6 +1,7 @@ package org.jboss.resteasy.reactive.server.vertx.test.simple; import java.io.IOException; + import javax.annotation.Priority; import javax.ws.rs.Priorities; import javax.ws.rs.container.ContainerRequestContext; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/TestBarResponseFilter.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/TestBarResponseFilter.java index 16c515d0e7fb5..b01c6c899748c 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/TestBarResponseFilter.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/TestBarResponseFilter.java @@ -1,6 +1,7 @@ package org.jboss.resteasy.reactive.server.vertx.test.simple; import java.io.IOException; + import javax.annotation.Priority; import javax.ws.rs.Priorities; import javax.ws.rs.container.ContainerRequestContext; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/TestFooBarRequestFilter.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/TestFooBarRequestFilter.java index badff4695cc72..de56a4975e195 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/TestFooBarRequestFilter.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/TestFooBarRequestFilter.java @@ -1,6 +1,7 @@ package org.jboss.resteasy.reactive.server.vertx.test.simple; import java.io.IOException; + import javax.annotation.Priority; import javax.ws.rs.Priorities; import javax.ws.rs.container.ContainerRequestContext; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/TestFooBarResponseFilter.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/TestFooBarResponseFilter.java index 66ca755ff6dfd..a5791a67f9f72 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/TestFooBarResponseFilter.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/TestFooBarResponseFilter.java @@ -1,6 +1,7 @@ package org.jboss.resteasy.reactive.server.vertx.test.simple; import java.io.IOException; + import javax.annotation.Priority; import javax.ws.rs.Priorities; import javax.ws.rs.container.ContainerRequestContext; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/TestFooRequestFilter.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/TestFooRequestFilter.java index dfeaeb1da0707..572df6cec0011 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/TestFooRequestFilter.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/TestFooRequestFilter.java @@ -1,7 +1,7 @@ package org.jboss.resteasy.reactive.server.vertx.test.simple; -import io.vertx.core.http.HttpServerRequest; import java.io.IOException; + import javax.annotation.Priority; import javax.ws.rs.Priorities; import javax.ws.rs.container.ContainerRequestContext; @@ -9,6 +9,8 @@ import javax.ws.rs.core.Context; import javax.ws.rs.ext.Provider; +import io.vertx.core.http.HttpServerRequest; + @Provider @Foo @Priority(Priorities.USER - 1) diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/TestFooResponseFilter.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/TestFooResponseFilter.java index cc3d6b7b05c2f..64a9a724ab824 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/TestFooResponseFilter.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/TestFooResponseFilter.java @@ -1,6 +1,7 @@ package org.jboss.resteasy.reactive.server.vertx.test.simple; import java.io.IOException; + import javax.annotation.Priority; import javax.ws.rs.Priorities; import javax.ws.rs.container.ContainerRequestContext; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/TestPreMatchRequestFilter.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/TestPreMatchRequestFilter.java index 6a1761fb5f005..eef9f625b140f 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/TestPreMatchRequestFilter.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/TestPreMatchRequestFilter.java @@ -1,6 +1,7 @@ package org.jboss.resteasy.reactive.server.vertx.test.simple; import java.io.IOException; + import javax.ws.rs.container.ContainerRequestContext; import javax.ws.rs.container.ContainerRequestFilter; import javax.ws.rs.container.PreMatching; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/TestRequestFilter.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/TestRequestFilter.java index 79d0ef3987617..ed1bb1ca467de 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/TestRequestFilter.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/TestRequestFilter.java @@ -1,6 +1,7 @@ package org.jboss.resteasy.reactive.server.vertx.test.simple; import java.io.IOException; + import javax.ws.rs.container.ContainerRequestContext; import javax.ws.rs.container.ContainerRequestFilter; import javax.ws.rs.ext.Provider; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/TestRequestFilterWithHighPriority.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/TestRequestFilterWithHighPriority.java index 1a8d3672347f0..de12212bb6902 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/TestRequestFilterWithHighPriority.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/TestRequestFilterWithHighPriority.java @@ -1,6 +1,7 @@ package org.jboss.resteasy.reactive.server.vertx.test.simple; import java.io.IOException; + import javax.annotation.Priority; import javax.ws.rs.Priorities; import javax.ws.rs.container.ContainerRequestContext; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/TestRequestFilterWithHighestPriority.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/TestRequestFilterWithHighestPriority.java index e84c7deb58d37..b7b5ba0aa0378 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/TestRequestFilterWithHighestPriority.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/TestRequestFilterWithHighestPriority.java @@ -1,6 +1,7 @@ package org.jboss.resteasy.reactive.server.vertx.test.simple; import java.io.IOException; + import javax.annotation.Priority; import javax.ws.rs.Priorities; import javax.ws.rs.container.ContainerRequestContext; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/TestResponseFilter.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/TestResponseFilter.java index 4cec319455d1d..32ff944a251a8 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/TestResponseFilter.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/TestResponseFilter.java @@ -1,6 +1,7 @@ package org.jboss.resteasy.reactive.server.vertx.test.simple; import java.io.IOException; + import javax.ws.rs.container.ContainerRequestContext; import javax.ws.rs.container.ContainerResponseContext; import javax.ws.rs.container.ContainerResponseFilter; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/TestUtil.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/TestUtil.java index 6c4b2fbb8ae63..1d869c71a6e08 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/TestUtil.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/TestUtil.java @@ -10,7 +10,9 @@ import java.util.List; import java.util.Map; import java.util.Set; + import javax.ws.rs.core.Application; + import org.jboss.logging.Logger; import org.jboss.shrinkwrap.api.Archive; import org.jboss.shrinkwrap.api.ArchivePath; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/TestWriter.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/TestWriter.java index 758b528058804..18f8a2194846f 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/TestWriter.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/TestWriter.java @@ -5,6 +5,7 @@ import java.lang.annotation.Annotation; import java.lang.reflect.Type; import java.nio.charset.StandardCharsets; + import javax.ws.rs.Produces; import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.MediaType; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/status/ResponseStatusTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/status/ResponseStatusTest.java index 16025a64d2b26..8a06ff17841bf 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/status/ResponseStatusTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/status/ResponseStatusTest.java @@ -1,17 +1,20 @@ package org.jboss.resteasy.reactive.server.vertx.test.status; -import io.restassured.RestAssured; -import io.smallrye.mutiny.Multi; -import io.smallrye.mutiny.Uni; import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionStage; + import javax.ws.rs.GET; import javax.ws.rs.Path; + import org.jboss.resteasy.reactive.ResponseStatus; import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.restassured.RestAssured; +import io.smallrye.mutiny.Multi; +import io.smallrye.mutiny.Uni; + public class ResponseStatusTest { @RegisterExtension diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/stream/StreamResource.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/stream/StreamResource.java index d9b872dbdb7f3..ce95c5eccc8c6 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/stream/StreamResource.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/stream/StreamResource.java @@ -1,20 +1,23 @@ package org.jboss.resteasy.reactive.server.vertx.test.stream; -import io.smallrye.mutiny.Multi; -import io.smallrye.mutiny.Uni; -import io.smallrye.mutiny.infrastructure.Infrastructure; -import io.vertx.core.buffer.Buffer; import java.util.Date; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; + import javax.ws.rs.GET; import javax.ws.rs.Path; import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; + import org.jboss.resteasy.reactive.common.util.MultiCollectors; import org.reactivestreams.Publisher; +import io.smallrye.mutiny.Multi; +import io.smallrye.mutiny.Uni; +import io.smallrye.mutiny.infrastructure.Infrastructure; +import io.vertx.core.buffer.Buffer; + @Path("stream") public class StreamResource { diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/stream/StreamTestCase.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/stream/StreamTestCase.java index 83dd8edebd638..70a59d21cde79 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/stream/StreamTestCase.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/stream/StreamTestCase.java @@ -1,14 +1,5 @@ package org.jboss.resteasy.reactive.server.vertx.test.stream; -import io.restassured.RestAssured; -import io.smallrye.mutiny.Multi; -import io.smallrye.mutiny.subscription.Cancellable; -import io.vertx.core.Handler; -import io.vertx.core.Vertx; -import io.vertx.core.http.HttpClient; -import io.vertx.core.http.HttpClientOptions; -import io.vertx.core.http.HttpClientRequest; -import io.vertx.core.http.HttpMethod; import java.nio.charset.StandardCharsets; import java.time.Duration; import java.util.Arrays; @@ -17,10 +8,12 @@ import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; + import javax.ws.rs.client.Client; import javax.ws.rs.client.ClientBuilder; import javax.ws.rs.client.WebTarget; import javax.ws.rs.sse.SseEventSource; + import org.hamcrest.Matchers; import org.jboss.resteasy.reactive.client.impl.MultiInvoker; import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; @@ -32,6 +25,16 @@ import org.junit.jupiter.api.condition.OS; import org.junit.jupiter.api.extension.RegisterExtension; +import io.restassured.RestAssured; +import io.smallrye.mutiny.Multi; +import io.smallrye.mutiny.subscription.Cancellable; +import io.vertx.core.Handler; +import io.vertx.core.Vertx; +import io.vertx.core.http.HttpClient; +import io.vertx.core.http.HttpClientOptions; +import io.vertx.core.http.HttpClientRequest; +import io.vertx.core.http.HttpMethod; + @DisabledOnOs(OS.WINDOWS) @Disabled("quarkus") public class StreamTestCase { diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/stress/SuspendResumeStressTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/stress/SuspendResumeStressTest.java index b0a6623dfada0..4d83f9a4e9015 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/stress/SuspendResumeStressTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/stress/SuspendResumeStressTest.java @@ -1,6 +1,5 @@ package org.jboss.resteasy.reactive.server.vertx.test.stress; -import io.restassured.RestAssured; import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -8,8 +7,10 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.function.Consumer; + import javax.ws.rs.GET; import javax.ws.rs.Path; + import org.hamcrest.Matchers; import org.jboss.jandex.ClassInfo; import org.jboss.jandex.MethodInfo; @@ -24,6 +25,8 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.restassured.RestAssured; + /** * Tests lots of suspends/resumes per request */ diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/transformation/AnnotationTransformationTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/transformation/AnnotationTransformationTest.java index b79e8830b2039..135afcafb34e8 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/transformation/AnnotationTransformationTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/transformation/AnnotationTransformationTest.java @@ -11,8 +11,10 @@ import java.lang.annotation.Target; import java.util.Collections; import java.util.function.Consumer; + import javax.ws.rs.DefaultValue; import javax.ws.rs.Path; + import org.hamcrest.Matchers; import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.AnnotationTarget; diff --git a/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/Codestart.java b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/Codestart.java index 78eedc3781b94..31fba77276708 100644 --- a/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/Codestart.java +++ b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/Codestart.java @@ -1,7 +1,5 @@ package io.quarkus.devtools.codestarts; -import io.quarkus.devtools.codestarts.core.CodestartSpec; -import io.quarkus.devtools.codestarts.utils.NestedMaps; import java.util.HashMap; import java.util.Map; import java.util.Objects; @@ -9,6 +7,9 @@ import java.util.function.Consumer; import java.util.stream.Stream; +import io.quarkus.devtools.codestarts.core.CodestartSpec; +import io.quarkus.devtools.codestarts.utils.NestedMaps; + public final class Codestart { public static final String BASE_LANGUAGE = "base"; private final CodestartResourceAllocator readerProvider; diff --git a/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/CodestartCatalogLoader.java b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/CodestartCatalogLoader.java index 0d5dd2a469e95..920c2ad027fec 100644 --- a/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/CodestartCatalogLoader.java +++ b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/CodestartCatalogLoader.java @@ -2,12 +2,6 @@ import static io.quarkus.devtools.codestarts.Codestart.BASE_LANGUAGE; -import com.fasterxml.jackson.databind.DeserializationFeature; -import com.fasterxml.jackson.databind.MapperFeature; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.dataformat.yaml.YAMLFactory; -import io.quarkus.devtools.codestarts.core.CodestartSpec; -import io.quarkus.devtools.codestarts.core.GenericCodestartCatalog; import java.io.BufferedWriter; import java.io.IOException; import java.io.UncheckedIOException; @@ -24,6 +18,14 @@ import java.util.stream.Collectors; import java.util.stream.Stream; +import com.fasterxml.jackson.databind.DeserializationFeature; +import com.fasterxml.jackson.databind.MapperFeature; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.dataformat.yaml.YAMLFactory; + +import io.quarkus.devtools.codestarts.core.CodestartSpec; +import io.quarkus.devtools.codestarts.core.GenericCodestartCatalog; + public final class CodestartCatalogLoader { private static final ObjectMapper YAML_MAPPER = new ObjectMapper(new YAMLFactory()) diff --git a/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/CodestartProjectInput.java b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/CodestartProjectInput.java index f1ce7a62fc8fa..3379723ce2327 100644 --- a/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/CodestartProjectInput.java +++ b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/CodestartProjectInput.java @@ -2,11 +2,12 @@ import static java.util.Objects.requireNonNull; -import io.quarkus.devtools.codestarts.utils.NestedMaps; -import io.quarkus.devtools.messagewriter.MessageWriter; import java.util.Collection; import java.util.Map; +import io.quarkus.devtools.codestarts.utils.NestedMaps; +import io.quarkus.devtools.messagewriter.MessageWriter; + public class CodestartProjectInput { private final Collection dependencies; private final Collection boms; diff --git a/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/CodestartProjectInputBuilder.java b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/CodestartProjectInputBuilder.java index 0dea8726973a3..6829f48b27eac 100644 --- a/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/CodestartProjectInputBuilder.java +++ b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/CodestartProjectInputBuilder.java @@ -1,12 +1,13 @@ package io.quarkus.devtools.codestarts; -import io.quarkus.devtools.messagewriter.MessageWriter; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.HashMap; import java.util.Map; +import io.quarkus.devtools.messagewriter.MessageWriter; + public class CodestartProjectInputBuilder { Collection dependencies = new ArrayList<>(); Collection boms = new ArrayList<>(); diff --git a/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/CodestartResource.java b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/CodestartResource.java index f3e0138c49b29..5cb1ced4c04ef 100644 --- a/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/CodestartResource.java +++ b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/CodestartResource.java @@ -9,6 +9,7 @@ import java.util.Optional; import java.util.stream.Collectors; import java.util.stream.Stream; + import org.apache.commons.io.FilenameUtils; public interface CodestartResource { diff --git a/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/CodestartCatalogs.java b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/CodestartCatalogs.java index 122fe33f72307..191326c44f05d 100644 --- a/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/CodestartCatalogs.java +++ b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/CodestartCatalogs.java @@ -1,10 +1,5 @@ package io.quarkus.devtools.codestarts.core; -import io.quarkus.devtools.codestarts.Codestart; -import io.quarkus.devtools.codestarts.CodestartException; -import io.quarkus.devtools.codestarts.CodestartProjectInput; -import io.quarkus.devtools.codestarts.CodestartStructureException; -import io.quarkus.devtools.codestarts.CodestartType; import java.util.ArrayList; import java.util.Collection; import java.util.List; @@ -12,6 +7,12 @@ import java.util.Set; import java.util.stream.Collectors; +import io.quarkus.devtools.codestarts.Codestart; +import io.quarkus.devtools.codestarts.CodestartException; +import io.quarkus.devtools.codestarts.CodestartProjectInput; +import io.quarkus.devtools.codestarts.CodestartStructureException; +import io.quarkus.devtools.codestarts.CodestartType; + public final class CodestartCatalogs { private CodestartCatalogs() { diff --git a/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/CodestartData.java b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/CodestartData.java index 9fd9d3d380c65..e4a2b3dea1a50 100644 --- a/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/CodestartData.java +++ b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/CodestartData.java @@ -1,9 +1,5 @@ package io.quarkus.devtools.codestarts.core; -import io.quarkus.devtools.codestarts.Codestart; -import io.quarkus.devtools.codestarts.CodestartType; -import io.quarkus.devtools.codestarts.core.CodestartSpec.CodestartDep; -import io.quarkus.devtools.codestarts.utils.NestedMaps; import java.util.Collection; import java.util.Collections; import java.util.HashMap; @@ -14,6 +10,11 @@ import java.util.stream.Collectors; import java.util.stream.Stream; +import io.quarkus.devtools.codestarts.Codestart; +import io.quarkus.devtools.codestarts.CodestartType; +import io.quarkus.devtools.codestarts.core.CodestartSpec.CodestartDep; +import io.quarkus.devtools.codestarts.utils.NestedMaps; + public final class CodestartData { public static final String INPUT_BASE_CODESTART_KEY_PREFIX = "input.base-codestart."; diff --git a/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/CodestartPathProcessor.java b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/CodestartPathProcessor.java index 862720a8240b3..f91cde1872cd1 100644 --- a/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/CodestartPathProcessor.java +++ b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/CodestartPathProcessor.java @@ -1,11 +1,12 @@ package io.quarkus.devtools.codestarts.core; -import io.quarkus.devtools.codestarts.CodestartStructureException; -import io.quarkus.devtools.codestarts.utils.NestedMaps; import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; +import io.quarkus.devtools.codestarts.CodestartStructureException; +import io.quarkus.devtools.codestarts.utils.NestedMaps; + final class CodestartPathProcessor { private static final String PACKAGE_NAME_KEY = "package-name"; diff --git a/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/CodestartProcessor.java b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/CodestartProcessor.java index 9517b2c9e7b50..0e60b00fed9a6 100644 --- a/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/CodestartProcessor.java +++ b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/CodestartProcessor.java @@ -2,16 +2,6 @@ import static io.quarkus.devtools.codestarts.Codestart.BASE_LANGUAGE; -import io.quarkus.devtools.codestarts.Codestart; -import io.quarkus.devtools.codestarts.CodestartResource; -import io.quarkus.devtools.codestarts.CodestartResource.Source; -import io.quarkus.devtools.codestarts.CodestartStructureException; -import io.quarkus.devtools.codestarts.core.reader.CodestartFileReader; -import io.quarkus.devtools.codestarts.core.reader.TargetFile; -import io.quarkus.devtools.codestarts.core.strategy.CodestartFileStrategy; -import io.quarkus.devtools.codestarts.core.strategy.CodestartFileStrategyHandler; -import io.quarkus.devtools.codestarts.core.strategy.DefaultCodestartFileStrategyHandler; -import io.quarkus.devtools.messagewriter.MessageWriter; import java.io.IOException; import java.io.UncheckedIOException; import java.nio.file.Files; @@ -25,6 +15,17 @@ import java.util.Optional; import java.util.stream.Stream; +import io.quarkus.devtools.codestarts.Codestart; +import io.quarkus.devtools.codestarts.CodestartResource; +import io.quarkus.devtools.codestarts.CodestartResource.Source; +import io.quarkus.devtools.codestarts.CodestartStructureException; +import io.quarkus.devtools.codestarts.core.reader.CodestartFileReader; +import io.quarkus.devtools.codestarts.core.reader.TargetFile; +import io.quarkus.devtools.codestarts.core.strategy.CodestartFileStrategy; +import io.quarkus.devtools.codestarts.core.strategy.CodestartFileStrategyHandler; +import io.quarkus.devtools.codestarts.core.strategy.DefaultCodestartFileStrategyHandler; +import io.quarkus.devtools.messagewriter.MessageWriter; + final class CodestartProcessor { private final MessageWriter log; diff --git a/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/CodestartProjectGeneration.java b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/CodestartProjectGeneration.java index 1eea467c6ebf0..206dfb4d69d90 100644 --- a/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/CodestartProjectGeneration.java +++ b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/CodestartProjectGeneration.java @@ -2,12 +2,6 @@ import static io.quarkus.devtools.codestarts.core.CodestartProcessor.buildStrategies; -import io.quarkus.devtools.codestarts.Codestart; -import io.quarkus.devtools.codestarts.CodestartProjectDefinition; -import io.quarkus.devtools.codestarts.CodestartType; -import io.quarkus.devtools.codestarts.core.strategy.CodestartFileStrategy; -import io.quarkus.devtools.codestarts.utils.NestedMaps; -import io.quarkus.devtools.messagewriter.MessageWriter; import java.io.IOException; import java.nio.file.Path; import java.util.List; @@ -15,6 +9,13 @@ import java.util.stream.Collectors; import java.util.stream.Stream; +import io.quarkus.devtools.codestarts.Codestart; +import io.quarkus.devtools.codestarts.CodestartProjectDefinition; +import io.quarkus.devtools.codestarts.CodestartType; +import io.quarkus.devtools.codestarts.core.strategy.CodestartFileStrategy; +import io.quarkus.devtools.codestarts.utils.NestedMaps; +import io.quarkus.devtools.messagewriter.MessageWriter; + final class CodestartProjectGeneration { private CodestartProjectGeneration() { diff --git a/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/CodestartSpec.java b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/CodestartSpec.java index 2f3f6714f6d7a..91c1706efefb1 100644 --- a/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/CodestartSpec.java +++ b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/CodestartSpec.java @@ -2,10 +2,6 @@ import static java.util.Objects.requireNonNull; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import io.quarkus.devtools.codestarts.CodestartType; import java.util.Collections; import java.util.HashMap; import java.util.List; @@ -13,6 +9,12 @@ import java.util.Objects; import java.util.Set; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; + +import io.quarkus.devtools.codestarts.CodestartType; + @JsonInclude(JsonInclude.Include.NON_DEFAULT) public final class CodestartSpec { diff --git a/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/DefaultCodestartProjectDefinition.java b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/DefaultCodestartProjectDefinition.java index faa1914925ce9..a2fa4e3996f72 100644 --- a/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/DefaultCodestartProjectDefinition.java +++ b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/DefaultCodestartProjectDefinition.java @@ -6,11 +6,6 @@ import static io.quarkus.devtools.codestarts.core.CodestartData.buildDependenciesData; import static java.util.Objects.requireNonNull; -import io.quarkus.devtools.codestarts.Codestart; -import io.quarkus.devtools.codestarts.CodestartProjectDefinition; -import io.quarkus.devtools.codestarts.CodestartProjectInput; -import io.quarkus.devtools.codestarts.CodestartType; -import io.quarkus.devtools.codestarts.utils.NestedMaps; import java.io.IOException; import java.nio.file.Path; import java.util.Collection; @@ -21,6 +16,12 @@ import java.util.stream.Collectors; import java.util.stream.Stream; +import io.quarkus.devtools.codestarts.Codestart; +import io.quarkus.devtools.codestarts.CodestartProjectDefinition; +import io.quarkus.devtools.codestarts.CodestartProjectInput; +import io.quarkus.devtools.codestarts.CodestartType; +import io.quarkus.devtools.codestarts.utils.NestedMaps; + public final class DefaultCodestartProjectDefinition implements CodestartProjectDefinition { private static final Comparator PROCESSING_ORDER = Comparator.comparingInt(Codestart::getTypeOrder) diff --git a/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/GenericCodestartCatalog.java b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/GenericCodestartCatalog.java index dd7eeaaf14130..3acbb91343d41 100644 --- a/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/GenericCodestartCatalog.java +++ b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/GenericCodestartCatalog.java @@ -1,10 +1,11 @@ package io.quarkus.devtools.codestarts.core; +import java.util.Collection; + import io.quarkus.devtools.codestarts.Codestart; import io.quarkus.devtools.codestarts.CodestartCatalog; import io.quarkus.devtools.codestarts.CodestartProjectDefinition; import io.quarkus.devtools.codestarts.CodestartProjectInput; -import java.util.Collection; public class GenericCodestartCatalog implements CodestartCatalog { diff --git a/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/reader/CodestartFileReader.java b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/reader/CodestartFileReader.java index 067e4d8fea3d3..0bdb2af729bf9 100644 --- a/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/reader/CodestartFileReader.java +++ b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/reader/CodestartFileReader.java @@ -1,12 +1,13 @@ package io.quarkus.devtools.codestarts.core.reader; -import io.quarkus.devtools.codestarts.CodestartResource; -import io.quarkus.devtools.codestarts.CodestartResource.Source; import java.io.IOException; import java.util.List; import java.util.Map; import java.util.Optional; +import io.quarkus.devtools.codestarts.CodestartResource; +import io.quarkus.devtools.codestarts.CodestartResource.Source; + public interface CodestartFileReader { CodestartFileReader DEFAULT = new DefaultCodestartFileReader(); diff --git a/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/reader/IgnoreCodestartFileReader.java b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/reader/IgnoreCodestartFileReader.java index d13b80d21b4ea..bee0571b2583b 100644 --- a/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/reader/IgnoreCodestartFileReader.java +++ b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/reader/IgnoreCodestartFileReader.java @@ -1,13 +1,14 @@ package io.quarkus.devtools.codestarts.core.reader; -import io.quarkus.devtools.codestarts.CodestartResource; -import io.quarkus.devtools.codestarts.CodestartResource.Source; import java.io.IOException; import java.util.Collections; import java.util.Map; import java.util.Optional; import java.util.Set; +import io.quarkus.devtools.codestarts.CodestartResource; +import io.quarkus.devtools.codestarts.CodestartResource.Source; + final class IgnoreCodestartFileReader implements CodestartFileReader { private static final Set TO_IGNORE = Collections.singleton(".gitkeep"); diff --git a/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/reader/QuteCodestartFileReader.java b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/reader/QuteCodestartFileReader.java index f2d6a56d50e3a..d26b1ec9774c9 100644 --- a/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/reader/QuteCodestartFileReader.java +++ b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/reader/QuteCodestartFileReader.java @@ -1,5 +1,14 @@ package io.quarkus.devtools.codestarts.core.reader; +import java.io.IOException; +import java.io.Reader; +import java.io.StringReader; +import java.util.Map; +import java.util.Optional; +import java.util.concurrent.CompletionStage; + +import org.apache.commons.io.FilenameUtils; + import io.quarkus.devtools.codestarts.CodestartException; import io.quarkus.devtools.codestarts.CodestartResource; import io.quarkus.devtools.codestarts.CodestartResource.Source; @@ -14,13 +23,6 @@ import io.quarkus.qute.TemplateNode; import io.quarkus.qute.ValueResolver; import io.quarkus.qute.Variant; -import java.io.IOException; -import java.io.Reader; -import java.io.StringReader; -import java.util.Map; -import java.util.Optional; -import java.util.concurrent.CompletionStage; -import org.apache.commons.io.FilenameUtils; final class QuteCodestartFileReader implements CodestartFileReader { diff --git a/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/strategy/AppendCodestartFileStrategyHandler.java b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/strategy/AppendCodestartFileStrategyHandler.java index 8f290d27ed061..35ad8e982eac8 100644 --- a/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/strategy/AppendCodestartFileStrategyHandler.java +++ b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/strategy/AppendCodestartFileStrategyHandler.java @@ -1,12 +1,13 @@ package io.quarkus.devtools.codestarts.core.strategy; -import io.quarkus.devtools.codestarts.core.reader.TargetFile; import java.io.IOException; import java.nio.file.Path; import java.util.List; import java.util.Map; import java.util.stream.Collectors; +import io.quarkus.devtools.codestarts.core.reader.TargetFile; + final class AppendCodestartFileStrategyHandler implements CodestartFileStrategyHandler { @Override diff --git a/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/strategy/CodestartFileStrategyHandler.java b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/strategy/CodestartFileStrategyHandler.java index 1b92484732c04..56af40804f4e1 100644 --- a/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/strategy/CodestartFileStrategyHandler.java +++ b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/strategy/CodestartFileStrategyHandler.java @@ -1,7 +1,5 @@ package io.quarkus.devtools.codestarts.core.strategy; -import io.quarkus.devtools.codestarts.CodestartStructureException; -import io.quarkus.devtools.codestarts.core.reader.TargetFile; import java.io.IOException; import java.nio.charset.StandardCharsets; import java.nio.file.Files; @@ -12,6 +10,9 @@ import java.util.stream.Collectors; import java.util.stream.Stream; +import io.quarkus.devtools.codestarts.CodestartStructureException; +import io.quarkus.devtools.codestarts.core.reader.TargetFile; + public interface CodestartFileStrategyHandler { DefaultCodestartFileStrategyHandler DEFAULT_STRATEGY = new FailOnDuplicateCodestartFileStrategyHandler(); diff --git a/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/strategy/ContentMergeCodestartFileStrategyHandler.java b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/strategy/ContentMergeCodestartFileStrategyHandler.java index 9b9743131b426..ab80c50ededb0 100644 --- a/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/strategy/ContentMergeCodestartFileStrategyHandler.java +++ b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/strategy/ContentMergeCodestartFileStrategyHandler.java @@ -1,13 +1,14 @@ package io.quarkus.devtools.codestarts.core.strategy; -import io.quarkus.devtools.codestarts.CodestartStructureException; -import io.quarkus.devtools.codestarts.core.reader.TargetFile; import java.io.IOException; import java.nio.file.Path; import java.util.List; import java.util.Map; import java.util.Optional; +import io.quarkus.devtools.codestarts.CodestartStructureException; +import io.quarkus.devtools.codestarts.core.reader.TargetFile; + final class ContentMergeCodestartFileStrategyHandler implements CodestartFileStrategyHandler { static final String NAME = "content-merge"; diff --git a/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/strategy/DefaultCodestartFileStrategyHandler.java b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/strategy/DefaultCodestartFileStrategyHandler.java index f2387e0f7e978..f9b0eaacad483 100644 --- a/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/strategy/DefaultCodestartFileStrategyHandler.java +++ b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/strategy/DefaultCodestartFileStrategyHandler.java @@ -1,9 +1,10 @@ package io.quarkus.devtools.codestarts.core.strategy; -import io.quarkus.devtools.codestarts.CodestartResource.Source; import java.io.IOException; import java.nio.file.Path; +import io.quarkus.devtools.codestarts.CodestartResource.Source; + public interface DefaultCodestartFileStrategyHandler extends CodestartFileStrategyHandler { void copyStaticFile(Source source, Path targetPath) throws IOException; diff --git a/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/strategy/ExecutableFileStrategyHandler.java b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/strategy/ExecutableFileStrategyHandler.java index 14b2c9e90c1d9..c458ebbe65037 100644 --- a/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/strategy/ExecutableFileStrategyHandler.java +++ b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/strategy/ExecutableFileStrategyHandler.java @@ -1,13 +1,14 @@ package io.quarkus.devtools.codestarts.core.strategy; -import io.quarkus.devtools.codestarts.CodestartStructureException; -import io.quarkus.devtools.codestarts.core.reader.TargetFile; import java.io.File; import java.io.IOException; import java.nio.file.Path; import java.util.List; import java.util.Map; +import io.quarkus.devtools.codestarts.CodestartStructureException; +import io.quarkus.devtools.codestarts.core.reader.TargetFile; + final class ExecutableFileStrategyHandler implements CodestartFileStrategyHandler { @Override diff --git a/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/strategy/FailOnDuplicateCodestartFileStrategyHandler.java b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/strategy/FailOnDuplicateCodestartFileStrategyHandler.java index e70f6d6a40a23..c3b30e9e9ab24 100644 --- a/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/strategy/FailOnDuplicateCodestartFileStrategyHandler.java +++ b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/strategy/FailOnDuplicateCodestartFileStrategyHandler.java @@ -1,14 +1,15 @@ package io.quarkus.devtools.codestarts.core.strategy; -import io.quarkus.devtools.codestarts.CodestartResource.Source; -import io.quarkus.devtools.codestarts.CodestartStructureException; -import io.quarkus.devtools.codestarts.core.reader.TargetFile; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; import java.util.List; import java.util.Map; +import io.quarkus.devtools.codestarts.CodestartResource.Source; +import io.quarkus.devtools.codestarts.CodestartStructureException; +import io.quarkus.devtools.codestarts.core.reader.TargetFile; + final class FailOnDuplicateCodestartFileStrategyHandler implements DefaultCodestartFileStrategyHandler { static final String NAME = "fail-on-duplicate"; diff --git a/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/strategy/ForbiddenCodestartFileStrategyHandler.java b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/strategy/ForbiddenCodestartFileStrategyHandler.java index 90c51667270d4..fef387af7d2d6 100644 --- a/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/strategy/ForbiddenCodestartFileStrategyHandler.java +++ b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/strategy/ForbiddenCodestartFileStrategyHandler.java @@ -1,12 +1,13 @@ package io.quarkus.devtools.codestarts.core.strategy; -import io.quarkus.devtools.codestarts.CodestartStructureException; -import io.quarkus.devtools.codestarts.core.reader.TargetFile; import java.io.IOException; import java.nio.file.Path; import java.util.List; import java.util.Map; +import io.quarkus.devtools.codestarts.CodestartStructureException; +import io.quarkus.devtools.codestarts.core.reader.TargetFile; + final class ForbiddenCodestartFileStrategyHandler implements CodestartFileStrategyHandler { @Override public String name() { diff --git a/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/strategy/ReplaceCodestartFileStrategyHandler.java b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/strategy/ReplaceCodestartFileStrategyHandler.java index 5b5bc90f45b64..c6fa190166262 100644 --- a/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/strategy/ReplaceCodestartFileStrategyHandler.java +++ b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/strategy/ReplaceCodestartFileStrategyHandler.java @@ -1,7 +1,5 @@ package io.quarkus.devtools.codestarts.core.strategy; -import io.quarkus.devtools.codestarts.CodestartResource.Source; -import io.quarkus.devtools.codestarts.core.reader.TargetFile; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; @@ -9,6 +7,9 @@ import java.util.List; import java.util.Map; +import io.quarkus.devtools.codestarts.CodestartResource.Source; +import io.quarkus.devtools.codestarts.core.reader.TargetFile; + final class ReplaceCodestartFileStrategyHandler implements DefaultCodestartFileStrategyHandler { @Override diff --git a/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/strategy/SmartConfigMergeCodestartFileStrategyHandler.java b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/strategy/SmartConfigMergeCodestartFileStrategyHandler.java index b725d3fc3bc30..e7e6439c3a628 100644 --- a/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/strategy/SmartConfigMergeCodestartFileStrategyHandler.java +++ b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/strategy/SmartConfigMergeCodestartFileStrategyHandler.java @@ -1,20 +1,22 @@ package io.quarkus.devtools.codestarts.core.strategy; +import java.io.IOException; +import java.nio.file.Path; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Optional; + import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.dataformat.yaml.YAMLFactory; import com.fasterxml.jackson.dataformat.yaml.YAMLGenerator; + import io.quarkus.devtools.codestarts.CodestartException; import io.quarkus.devtools.codestarts.CodestartType; import io.quarkus.devtools.codestarts.core.CodestartData; import io.quarkus.devtools.codestarts.core.reader.TargetFile; import io.quarkus.devtools.codestarts.utils.NestedMaps; -import java.io.IOException; -import java.nio.file.Path; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.Optional; final class SmartConfigMergeCodestartFileStrategyHandler implements CodestartFileStrategyHandler { diff --git a/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/strategy/SmartPackageFileStrategyHandler.java b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/strategy/SmartPackageFileStrategyHandler.java index 4e2cb685a6572..ad5468f989fa6 100644 --- a/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/strategy/SmartPackageFileStrategyHandler.java +++ b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/strategy/SmartPackageFileStrategyHandler.java @@ -1,9 +1,5 @@ package io.quarkus.devtools.codestarts.core.strategy; -import io.quarkus.devtools.codestarts.CodestartStructureException; -import io.quarkus.devtools.codestarts.core.CodestartData; -import io.quarkus.devtools.codestarts.core.reader.TargetFile; -import io.quarkus.devtools.codestarts.utils.NestedMaps; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; @@ -12,6 +8,11 @@ import java.util.Objects; import java.util.Optional; +import io.quarkus.devtools.codestarts.CodestartStructureException; +import io.quarkus.devtools.codestarts.core.CodestartData; +import io.quarkus.devtools.codestarts.core.reader.TargetFile; +import io.quarkus.devtools.codestarts.utils.NestedMaps; + final class SmartPackageFileStrategyHandler implements CodestartFileStrategyHandler { private static final String DEFAULT_PACKAGE_DIR = "org/acme"; diff --git a/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/strategy/SmartPomMergeCodestartFileStrategyHandler.java b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/strategy/SmartPomMergeCodestartFileStrategyHandler.java index f2bc99d58c194..288b86af36d9a 100644 --- a/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/strategy/SmartPomMergeCodestartFileStrategyHandler.java +++ b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/strategy/SmartPomMergeCodestartFileStrategyHandler.java @@ -1,10 +1,5 @@ package io.quarkus.devtools.codestarts.core.strategy; -import io.fabric8.maven.Maven; -import io.fabric8.maven.merge.SmartModelMerger; -import io.quarkus.devtools.codestarts.CodestartStructureException; -import io.quarkus.devtools.codestarts.core.CodestartData; -import io.quarkus.devtools.codestarts.core.reader.TargetFile; import java.io.IOException; import java.io.StringReader; import java.nio.file.Path; @@ -12,8 +7,15 @@ import java.util.ListIterator; import java.util.Map; import java.util.Objects; + import org.apache.maven.model.Model; +import io.fabric8.maven.Maven; +import io.fabric8.maven.merge.SmartModelMerger; +import io.quarkus.devtools.codestarts.CodestartStructureException; +import io.quarkus.devtools.codestarts.core.CodestartData; +import io.quarkus.devtools.codestarts.core.reader.TargetFile; + final class SmartPomMergeCodestartFileStrategyHandler implements CodestartFileStrategyHandler { @Override diff --git a/independent-projects/tools/codestarts/src/test/java/io/quarkus/devtools/codestarts/CodestartCatalogLoaderTest.java b/independent-projects/tools/codestarts/src/test/java/io/quarkus/devtools/codestarts/CodestartCatalogLoaderTest.java index 98d0610697e44..3e3d49448785a 100644 --- a/independent-projects/tools/codestarts/src/test/java/io/quarkus/devtools/codestarts/CodestartCatalogLoaderTest.java +++ b/independent-projects/tools/codestarts/src/test/java/io/quarkus/devtools/codestarts/CodestartCatalogLoaderTest.java @@ -7,16 +7,18 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import io.quarkus.devtools.codestarts.core.CodestartSpec; -import io.quarkus.devtools.codestarts.utils.NestedMaps; import java.io.IOException; import java.nio.charset.StandardCharsets; import java.nio.file.Paths; import java.util.Set; + import org.assertj.core.api.InstanceOfAssertFactories; import org.junit.jupiter.api.Test; import org.mockito.internal.util.collections.Sets; +import io.quarkus.devtools.codestarts.core.CodestartSpec; +import io.quarkus.devtools.codestarts.utils.NestedMaps; + class CodestartCatalogLoaderTest { private TestCodestartResourceLoader resourceLoader = new TestCodestartResourceLoader(); diff --git a/independent-projects/tools/codestarts/src/test/java/io/quarkus/devtools/codestarts/CodestartProjectGenerationTest.java b/independent-projects/tools/codestarts/src/test/java/io/quarkus/devtools/codestarts/CodestartProjectGenerationTest.java index 855fd44371411..bc4841c209948 100644 --- a/independent-projects/tools/codestarts/src/test/java/io/quarkus/devtools/codestarts/CodestartProjectGenerationTest.java +++ b/independent-projects/tools/codestarts/src/test/java/io/quarkus/devtools/codestarts/CodestartProjectGenerationTest.java @@ -7,6 +7,7 @@ import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; + import org.apache.commons.io.FileUtils; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.BeforeEach; diff --git a/independent-projects/tools/codestarts/src/test/java/io/quarkus/devtools/codestarts/core/CodestartDataTest.java b/independent-projects/tools/codestarts/src/test/java/io/quarkus/devtools/codestarts/core/CodestartDataTest.java index 30b4f79142c79..1ddfb89c5a8ac 100644 --- a/independent-projects/tools/codestarts/src/test/java/io/quarkus/devtools/codestarts/core/CodestartDataTest.java +++ b/independent-projects/tools/codestarts/src/test/java/io/quarkus/devtools/codestarts/core/CodestartDataTest.java @@ -3,16 +3,18 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.*; -import io.quarkus.devtools.codestarts.CodestartCatalog; -import io.quarkus.devtools.codestarts.CodestartProjectGenerationTest; -import io.quarkus.devtools.codestarts.CodestartProjectInput; import java.io.IOException; import java.util.Map; import java.util.Set; + import org.assertj.core.util.Lists; import org.assertj.core.util.Sets; import org.junit.jupiter.api.Test; +import io.quarkus.devtools.codestarts.CodestartCatalog; +import io.quarkus.devtools.codestarts.CodestartProjectGenerationTest; +import io.quarkus.devtools.codestarts.CodestartProjectInput; + class CodestartDataTest { @Test @SuppressWarnings("unchecked") diff --git a/independent-projects/tools/codestarts/src/test/java/io/quarkus/devtools/codestarts/core/CodestartPathProcessorTest.java b/independent-projects/tools/codestarts/src/test/java/io/quarkus/devtools/codestarts/core/CodestartPathProcessorTest.java index 12c7ac14e86b2..bb4954267a396 100644 --- a/independent-projects/tools/codestarts/src/test/java/io/quarkus/devtools/codestarts/core/CodestartPathProcessorTest.java +++ b/independent-projects/tools/codestarts/src/test/java/io/quarkus/devtools/codestarts/core/CodestartPathProcessorTest.java @@ -4,11 +4,13 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import io.quarkus.devtools.codestarts.CodestartStructureException; import java.util.HashMap; import java.util.Map; + import org.junit.jupiter.api.Test; +import io.quarkus.devtools.codestarts.CodestartStructureException; + class CodestartPathProcessorTest { @Test diff --git a/independent-projects/tools/codestarts/src/test/java/io/quarkus/devtools/codestarts/core/CodestartProcessorTest.java b/independent-projects/tools/codestarts/src/test/java/io/quarkus/devtools/codestarts/core/CodestartProcessorTest.java index 25d0c4117b91d..3fc71c03dea02 100644 --- a/independent-projects/tools/codestarts/src/test/java/io/quarkus/devtools/codestarts/core/CodestartProcessorTest.java +++ b/independent-projects/tools/codestarts/src/test/java/io/quarkus/devtools/codestarts/core/CodestartProcessorTest.java @@ -2,14 +2,16 @@ import static org.assertj.core.api.Assertions.assertThat; -import io.quarkus.devtools.codestarts.core.strategy.CodestartFileStrategyHandler; -import io.quarkus.devtools.messagewriter.MessageWriter; import java.nio.file.Paths; import java.util.Collections; import java.util.HashMap; import java.util.Map; + import org.junit.jupiter.api.Test; +import io.quarkus.devtools.codestarts.core.strategy.CodestartFileStrategyHandler; +import io.quarkus.devtools.messagewriter.MessageWriter; + class CodestartProcessorTest { @Test diff --git a/independent-projects/tools/codestarts/src/test/java/io/quarkus/devtools/codestarts/core/strategy/SmartConfigMergeCodestartFileStrategyHandlerTest.java b/independent-projects/tools/codestarts/src/test/java/io/quarkus/devtools/codestarts/core/strategy/SmartConfigMergeCodestartFileStrategyHandlerTest.java index d637e00e7175f..e31232214ec98 100644 --- a/independent-projects/tools/codestarts/src/test/java/io/quarkus/devtools/codestarts/core/strategy/SmartConfigMergeCodestartFileStrategyHandlerTest.java +++ b/independent-projects/tools/codestarts/src/test/java/io/quarkus/devtools/codestarts/core/strategy/SmartConfigMergeCodestartFileStrategyHandlerTest.java @@ -3,6 +3,7 @@ import static org.assertj.core.api.Assertions.assertThat; import java.util.HashMap; + import org.junit.jupiter.api.Test; class SmartConfigMergeCodestartFileStrategyHandlerTest { diff --git a/independent-projects/tools/codestarts/src/test/java/io/quarkus/devtools/codestarts/utils/NestedMapsTest.java b/independent-projects/tools/codestarts/src/test/java/io/quarkus/devtools/codestarts/utils/NestedMapsTest.java index e5c8a970b2830..4cdabe751a989 100644 --- a/independent-projects/tools/codestarts/src/test/java/io/quarkus/devtools/codestarts/utils/NestedMapsTest.java +++ b/independent-projects/tools/codestarts/src/test/java/io/quarkus/devtools/codestarts/utils/NestedMapsTest.java @@ -3,8 +3,6 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatIllegalStateException; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.dataformat.yaml.YAMLFactory; import java.io.IOException; import java.io.UncheckedIOException; import java.util.Arrays; @@ -14,8 +12,12 @@ import java.util.LinkedHashMap; import java.util.Map; import java.util.stream.Stream; + import org.junit.jupiter.api.Test; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.dataformat.yaml.YAMLFactory; + class NestedMapsTest { private static final ObjectMapper YAML_MAPPER = new ObjectMapper(new YAMLFactory()); diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/codestarts/CodestartResourceLoader.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/codestarts/CodestartResourceLoader.java index 65016929e6c74..5ffa3960845ea 100644 --- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/codestarts/CodestartResourceLoader.java +++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/codestarts/CodestartResourceLoader.java @@ -1,12 +1,13 @@ package io.quarkus.devtools.codestarts; -import io.quarkus.platform.descriptor.loader.json.ResourceLoader; import java.io.IOException; import java.util.Collection; import java.util.HashMap; import java.util.List; import java.util.Map; +import io.quarkus.platform.descriptor.loader.json.ResourceLoader; + public final class CodestartResourceLoader implements CodestartPathLoader { private ResourceLoader resourceLoader; diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/codestarts/extension/QuarkusExtensionCodestartCatalog.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/codestarts/extension/QuarkusExtensionCodestartCatalog.java index e8af1d8697dad..9575a522ba100 100644 --- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/codestarts/extension/QuarkusExtensionCodestartCatalog.java +++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/codestarts/extension/QuarkusExtensionCodestartCatalog.java @@ -3,15 +3,16 @@ import static io.quarkus.devtools.codestarts.CodestartResourceLoader.loadCodestartsFromResources; import static io.quarkus.devtools.project.CodestartResourceLoadersBuilder.getCodestartResourceLoaders; -import io.quarkus.devtools.codestarts.Codestart; -import io.quarkus.devtools.codestarts.DataKey; -import io.quarkus.devtools.codestarts.core.GenericCodestartCatalog; import java.io.IOException; import java.util.ArrayList; import java.util.Collection; import java.util.List; import java.util.Map; +import io.quarkus.devtools.codestarts.Codestart; +import io.quarkus.devtools.codestarts.DataKey; +import io.quarkus.devtools.codestarts.core.GenericCodestartCatalog; + public final class QuarkusExtensionCodestartCatalog extends GenericCodestartCatalog { public static final String QUARKUS_EXTENSION_CODESTARTS_DIR = "codestarts/quarkus-extension"; diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/codestarts/extension/QuarkusExtensionCodestartProjectInputBuilder.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/codestarts/extension/QuarkusExtensionCodestartProjectInputBuilder.java index 1963a3ec048ca..5129bedd058d9 100644 --- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/codestarts/extension/QuarkusExtensionCodestartProjectInputBuilder.java +++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/codestarts/extension/QuarkusExtensionCodestartProjectInputBuilder.java @@ -1,10 +1,11 @@ package io.quarkus.devtools.codestarts.extension; +import java.util.Collection; +import java.util.Map; + import io.quarkus.devtools.codestarts.CodestartProjectInputBuilder; import io.quarkus.devtools.codestarts.extension.QuarkusExtensionCodestartCatalog.QuarkusExtensionData; import io.quarkus.devtools.messagewriter.MessageWriter; -import java.util.Collection; -import java.util.Map; public class QuarkusExtensionCodestartProjectInputBuilder extends CodestartProjectInputBuilder { boolean withoutIntegrationTests; diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/codestarts/jbang/QuarkusJBangCodestartCatalog.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/codestarts/jbang/QuarkusJBangCodestartCatalog.java index 6ea32601f0f02..ad195eb11669b 100644 --- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/codestarts/jbang/QuarkusJBangCodestartCatalog.java +++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/codestarts/jbang/QuarkusJBangCodestartCatalog.java @@ -3,16 +3,17 @@ import static io.quarkus.devtools.codestarts.CodestartResourceLoader.loadCodestartsFromResources; import static io.quarkus.devtools.project.CodestartResourceLoadersBuilder.getCodestartResourceLoaders; -import io.quarkus.devtools.codestarts.Codestart; -import io.quarkus.devtools.codestarts.DataKey; -import io.quarkus.devtools.codestarts.core.GenericCodestartCatalog; -import io.quarkus.platform.descriptor.loader.json.ResourceLoader; import java.io.IOException; import java.util.ArrayList; import java.util.Collection; import java.util.List; import java.util.Map; +import io.quarkus.devtools.codestarts.Codestart; +import io.quarkus.devtools.codestarts.DataKey; +import io.quarkus.devtools.codestarts.core.GenericCodestartCatalog; +import io.quarkus.platform.descriptor.loader.json.ResourceLoader; + public final class QuarkusJBangCodestartCatalog extends GenericCodestartCatalog { public static final String QUARKUS_JBANG_CODESTARTS_DIR = "codestarts/quarkus-jbang"; diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/codestarts/jbang/QuarkusJBangCodestartProjectInput.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/codestarts/jbang/QuarkusJBangCodestartProjectInput.java index 29ad652ac1b22..22a1eb1461bab 100644 --- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/codestarts/jbang/QuarkusJBangCodestartProjectInput.java +++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/codestarts/jbang/QuarkusJBangCodestartProjectInput.java @@ -1,8 +1,9 @@ package io.quarkus.devtools.codestarts.jbang; +import java.util.Collection; + import io.quarkus.devtools.codestarts.CodestartProjectInput; import io.quarkus.maven.dependency.ArtifactCoords; -import java.util.Collection; public final class QuarkusJBangCodestartProjectInput extends CodestartProjectInput { private final Collection extensions; diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/codestarts/jbang/QuarkusJBangCodestartProjectInputBuilder.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/codestarts/jbang/QuarkusJBangCodestartProjectInputBuilder.java index d80fe85dac061..1bd1336c59300 100644 --- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/codestarts/jbang/QuarkusJBangCodestartProjectInputBuilder.java +++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/codestarts/jbang/QuarkusJBangCodestartProjectInputBuilder.java @@ -1,5 +1,11 @@ package io.quarkus.devtools.codestarts.jbang; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.Map; +import java.util.stream.Collectors; + import io.quarkus.devtools.codestarts.CodestartProjectInputBuilder; import io.quarkus.devtools.codestarts.DataKey; import io.quarkus.devtools.codestarts.utils.NestedMaps; @@ -8,11 +14,6 @@ import io.quarkus.devtools.project.extensions.Extensions; import io.quarkus.maven.dependency.ArtifactCoords; import io.quarkus.maven.dependency.ArtifactKey; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.Map; -import java.util.stream.Collectors; public class QuarkusJBangCodestartProjectInputBuilder extends CodestartProjectInputBuilder { public Collection extensions = new ArrayList<>(); diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/codestarts/quarkus/QuarkusCodestartCatalog.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/codestarts/quarkus/QuarkusCodestartCatalog.java index 5adadd4f604b7..634e26525639e 100644 --- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/codestarts/quarkus/QuarkusCodestartCatalog.java +++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/codestarts/quarkus/QuarkusCodestartCatalog.java @@ -6,20 +6,6 @@ import static io.quarkus.devtools.project.CodestartResourceLoadersBuilder.getCodestartResourceLoaders; import static io.quarkus.platform.catalog.processor.ExtensionProcessor.getGuide; -import io.quarkus.devtools.codestarts.Codestart; -import io.quarkus.devtools.codestarts.CodestartCatalogLoader; -import io.quarkus.devtools.codestarts.CodestartException; -import io.quarkus.devtools.codestarts.CodestartStructureException; -import io.quarkus.devtools.codestarts.CodestartType; -import io.quarkus.devtools.codestarts.DataKey; -import io.quarkus.devtools.codestarts.core.GenericCodestartCatalog; -import io.quarkus.devtools.project.extensions.Extensions; -import io.quarkus.maven.dependency.ArtifactCoords; -import io.quarkus.platform.catalog.processor.ExtensionProcessor; -import io.quarkus.platform.descriptor.loader.json.ResourceLoader; -import io.quarkus.registry.catalog.Extension; -import io.quarkus.registry.catalog.ExtensionCatalog; -import io.smallrye.common.version.VersionScheme; import java.io.IOException; import java.nio.file.Path; import java.util.ArrayList; @@ -35,6 +21,21 @@ import java.util.stream.Collectors; import java.util.stream.Stream; +import io.quarkus.devtools.codestarts.Codestart; +import io.quarkus.devtools.codestarts.CodestartCatalogLoader; +import io.quarkus.devtools.codestarts.CodestartException; +import io.quarkus.devtools.codestarts.CodestartStructureException; +import io.quarkus.devtools.codestarts.CodestartType; +import io.quarkus.devtools.codestarts.DataKey; +import io.quarkus.devtools.codestarts.core.GenericCodestartCatalog; +import io.quarkus.devtools.project.extensions.Extensions; +import io.quarkus.maven.dependency.ArtifactCoords; +import io.quarkus.platform.catalog.processor.ExtensionProcessor; +import io.quarkus.platform.descriptor.loader.json.ResourceLoader; +import io.quarkus.registry.catalog.Extension; +import io.quarkus.registry.catalog.ExtensionCatalog; +import io.smallrye.common.version.VersionScheme; + public final class QuarkusCodestartCatalog extends GenericCodestartCatalog { public static final String QUARKUS_CODESTARTS_DIR = "codestarts/quarkus"; diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/codestarts/quarkus/QuarkusCodestartProjectInput.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/codestarts/quarkus/QuarkusCodestartProjectInput.java index 27a474908e8ae..41222ba6cf44f 100644 --- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/codestarts/quarkus/QuarkusCodestartProjectInput.java +++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/codestarts/quarkus/QuarkusCodestartProjectInput.java @@ -2,12 +2,13 @@ import static java.util.Objects.requireNonNull; +import java.util.Collection; +import java.util.Set; + import io.quarkus.devtools.codestarts.CodestartProjectInput; import io.quarkus.devtools.codestarts.quarkus.QuarkusCodestartCatalog.AppContent; import io.quarkus.devtools.project.BuildTool; import io.quarkus.maven.dependency.ArtifactCoords; -import java.util.Collection; -import java.util.Set; public final class QuarkusCodestartProjectInput extends CodestartProjectInput { private final BuildTool buildTool; diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/codestarts/quarkus/QuarkusCodestartProjectInputBuilder.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/codestarts/quarkus/QuarkusCodestartProjectInputBuilder.java index 25c7502e25a7a..452f45a939c89 100644 --- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/codestarts/quarkus/QuarkusCodestartProjectInputBuilder.java +++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/codestarts/quarkus/QuarkusCodestartProjectInputBuilder.java @@ -1,13 +1,5 @@ package io.quarkus.devtools.codestarts.quarkus; -import io.quarkus.devtools.codestarts.CodestartProjectInputBuilder; -import io.quarkus.devtools.codestarts.DataKey; -import io.quarkus.devtools.codestarts.quarkus.QuarkusCodestartCatalog.AppContent; -import io.quarkus.devtools.messagewriter.MessageWriter; -import io.quarkus.devtools.project.BuildTool; -import io.quarkus.devtools.project.extensions.Extensions; -import io.quarkus.maven.dependency.ArtifactCoords; -import io.quarkus.maven.dependency.ArtifactKey; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; @@ -18,6 +10,15 @@ import java.util.Set; import java.util.stream.Collectors; +import io.quarkus.devtools.codestarts.CodestartProjectInputBuilder; +import io.quarkus.devtools.codestarts.DataKey; +import io.quarkus.devtools.codestarts.quarkus.QuarkusCodestartCatalog.AppContent; +import io.quarkus.devtools.messagewriter.MessageWriter; +import io.quarkus.devtools.project.BuildTool; +import io.quarkus.devtools.project.extensions.Extensions; +import io.quarkus.maven.dependency.ArtifactCoords; +import io.quarkus.maven.dependency.ArtifactKey; + public class QuarkusCodestartProjectInputBuilder extends CodestartProjectInputBuilder { private static final List FULL_CONTENT = Arrays.asList(AppContent.values()); diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/AddExtensions.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/AddExtensions.java index 487aa952bc9ff..7ac919b2afa62 100644 --- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/AddExtensions.java +++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/AddExtensions.java @@ -2,6 +2,9 @@ import static java.util.Objects.requireNonNull; +import java.util.HashMap; +import java.util.Set; + import io.quarkus.devtools.commands.data.QuarkusCommandException; import io.quarkus.devtools.commands.data.QuarkusCommandInvocation; import io.quarkus.devtools.commands.data.QuarkusCommandOutcome; @@ -9,8 +12,6 @@ import io.quarkus.devtools.messagewriter.MessageWriter; import io.quarkus.devtools.project.QuarkusProject; import io.quarkus.devtools.project.extensions.ExtensionManager; -import java.util.HashMap; -import java.util.Set; /** * Instances of this class are not thread-safe. They are created per single invocation. diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/CreateExtension.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/CreateExtension.java index e45baba446fd1..44bd3c7a8c5f2 100644 --- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/CreateExtension.java +++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/CreateExtension.java @@ -5,15 +5,6 @@ import static java.util.Objects.requireNonNull; import static org.apache.commons.lang3.StringUtils.isEmpty; -import io.quarkus.devtools.codestarts.extension.QuarkusExtensionCodestartCatalog; -import io.quarkus.devtools.codestarts.extension.QuarkusExtensionCodestartCatalog.QuarkusExtensionData; -import io.quarkus.devtools.codestarts.extension.QuarkusExtensionCodestartProjectInput; -import io.quarkus.devtools.codestarts.extension.QuarkusExtensionCodestartProjectInputBuilder; -import io.quarkus.devtools.commands.data.QuarkusCommandException; -import io.quarkus.devtools.commands.data.QuarkusCommandOutcome; -import io.quarkus.devtools.commands.handlers.CreateExtensionCommandHandler; -import io.quarkus.devtools.messagewriter.MessageWriter; -import io.quarkus.maven.utilities.MojoUtils; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; @@ -23,11 +14,23 @@ import java.util.Locale; import java.util.Optional; import java.util.stream.Collectors; + import javax.lang.model.SourceVersion; + import org.apache.commons.lang3.StringUtils; import org.apache.maven.artifact.versioning.DefaultArtifactVersion; import org.apache.maven.model.Model; +import io.quarkus.devtools.codestarts.extension.QuarkusExtensionCodestartCatalog; +import io.quarkus.devtools.codestarts.extension.QuarkusExtensionCodestartCatalog.QuarkusExtensionData; +import io.quarkus.devtools.codestarts.extension.QuarkusExtensionCodestartProjectInput; +import io.quarkus.devtools.codestarts.extension.QuarkusExtensionCodestartProjectInputBuilder; +import io.quarkus.devtools.commands.data.QuarkusCommandException; +import io.quarkus.devtools.commands.data.QuarkusCommandOutcome; +import io.quarkus.devtools.commands.handlers.CreateExtensionCommandHandler; +import io.quarkus.devtools.messagewriter.MessageWriter; +import io.quarkus.maven.utilities.MojoUtils; + /** * Instances of this class are not thread-safe. They are created per invocation. */ diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/CreateJBangProject.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/CreateJBangProject.java index 2f9ed67d62255..0d381591770e1 100644 --- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/CreateJBangProject.java +++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/CreateJBangProject.java @@ -3,16 +3,17 @@ import static io.quarkus.devtools.commands.CreateProjectHelper.computeJavaVersion; import static java.util.Objects.requireNonNull; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; + import io.quarkus.devtools.commands.CreateProject.CreateProjectKey; import io.quarkus.devtools.commands.data.QuarkusCommandException; import io.quarkus.devtools.commands.data.QuarkusCommandInvocation; import io.quarkus.devtools.commands.data.QuarkusCommandOutcome; import io.quarkus.devtools.commands.handlers.CreateJBangProjectCommandHandler; import io.quarkus.devtools.project.QuarkusProject; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; public class CreateJBangProject { public interface CreateJBangProjectKey { diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/CreateProject.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/CreateProject.java index 6ee39ddf512ca..fe7c27c5f0154 100644 --- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/CreateProject.java +++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/CreateProject.java @@ -6,6 +6,14 @@ import static io.quarkus.devtools.commands.handlers.CreateProjectCodestartDataConverter.PlatformPropertiesKey.QUARKUS_MAVEN_PLUGIN_VERSION; import static java.util.Objects.requireNonNull; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; + +import org.apache.commons.lang3.StringUtils; + import io.quarkus.devtools.commands.data.QuarkusCommandException; import io.quarkus.devtools.commands.data.QuarkusCommandInvocation; import io.quarkus.devtools.commands.data.QuarkusCommandOutcome; @@ -13,12 +21,6 @@ import io.quarkus.devtools.project.BuildTool; import io.quarkus.devtools.project.QuarkusProject; import io.quarkus.platform.tools.ToolsUtils; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; -import org.apache.commons.lang3.StringUtils; /** * Instances of this class are not thread-safe. They are created per invocation. diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/CreateProjectHelper.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/CreateProjectHelper.java index a901a8121ae73..9b27022349325 100644 --- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/CreateProjectHelper.java +++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/CreateProjectHelper.java @@ -2,14 +2,6 @@ import static java.util.Objects.requireNonNull; -import io.quarkus.bootstrap.BootstrapConstants; -import io.quarkus.bootstrap.resolver.maven.BootstrapMavenException; -import io.quarkus.bootstrap.resolver.maven.MavenArtifactResolver; -import io.quarkus.devtools.commands.CreateProject.CreateProjectKey; -import io.quarkus.maven.dependency.ArtifactCoords; -import io.quarkus.paths.PathTree; -import io.quarkus.registry.catalog.Extension; -import io.quarkus.registry.catalog.ExtensionCatalog; import java.io.File; import java.io.IOException; import java.nio.file.Files; @@ -24,9 +16,20 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.stream.Collectors; + import javax.lang.model.SourceVersion; + import org.eclipse.aether.artifact.DefaultArtifact; +import io.quarkus.bootstrap.BootstrapConstants; +import io.quarkus.bootstrap.resolver.maven.BootstrapMavenException; +import io.quarkus.bootstrap.resolver.maven.MavenArtifactResolver; +import io.quarkus.devtools.commands.CreateProject.CreateProjectKey; +import io.quarkus.maven.dependency.ArtifactCoords; +import io.quarkus.paths.PathTree; +import io.quarkus.registry.catalog.Extension; +import io.quarkus.registry.catalog.ExtensionCatalog; + public class CreateProjectHelper { // ordering is important here, so let's keep them ordered diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/ListCategories.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/ListCategories.java index 8185a476cc4fb..f95ad8047c452 100644 --- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/ListCategories.java +++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/ListCategories.java @@ -1,12 +1,13 @@ package io.quarkus.devtools.commands; +import java.util.HashMap; + import io.quarkus.devtools.commands.data.QuarkusCommandException; import io.quarkus.devtools.commands.data.QuarkusCommandInvocation; import io.quarkus.devtools.commands.data.QuarkusCommandOutcome; import io.quarkus.devtools.commands.handlers.ListCategoriesCommandHandler; import io.quarkus.devtools.messagewriter.MessageWriter; import io.quarkus.devtools.project.QuarkusProject; -import java.util.HashMap; /** * Instances of this class are not thread-safe. They are created per single invocation. diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/ListExtensions.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/ListExtensions.java index 09ed868b3fb70..8485e73f865db 100644 --- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/ListExtensions.java +++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/ListExtensions.java @@ -2,6 +2,8 @@ import static java.util.Objects.requireNonNull; +import java.util.HashMap; + import io.quarkus.devtools.commands.data.QuarkusCommandException; import io.quarkus.devtools.commands.data.QuarkusCommandInvocation; import io.quarkus.devtools.commands.data.QuarkusCommandOutcome; @@ -9,7 +11,6 @@ import io.quarkus.devtools.messagewriter.MessageWriter; import io.quarkus.devtools.project.QuarkusProject; import io.quarkus.devtools.project.extensions.ExtensionManager; -import java.util.HashMap; /** * Instances of this class are not thread-safe. They are created per single invocation. diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/ListPlatforms.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/ListPlatforms.java index 191c93b6a1e23..5b99af02ef28b 100644 --- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/ListPlatforms.java +++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/ListPlatforms.java @@ -1,12 +1,13 @@ package io.quarkus.devtools.commands; +import java.util.HashMap; + import io.quarkus.devtools.commands.data.QuarkusCommandException; import io.quarkus.devtools.commands.data.QuarkusCommandInvocation; import io.quarkus.devtools.commands.data.QuarkusCommandOutcome; import io.quarkus.devtools.commands.handlers.ListPlatformsCommandHandler; import io.quarkus.devtools.messagewriter.MessageWriter; import io.quarkus.devtools.project.QuarkusProject; -import java.util.HashMap; public class ListPlatforms { diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/RemoveExtensions.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/RemoveExtensions.java index 7fe1dc5be2197..1ed18394fa4fb 100644 --- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/RemoveExtensions.java +++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/RemoveExtensions.java @@ -2,6 +2,9 @@ import static java.util.Objects.requireNonNull; +import java.util.HashMap; +import java.util.Set; + import io.quarkus.devtools.commands.data.QuarkusCommandException; import io.quarkus.devtools.commands.data.QuarkusCommandInvocation; import io.quarkus.devtools.commands.data.QuarkusCommandOutcome; @@ -9,8 +12,6 @@ import io.quarkus.devtools.messagewriter.MessageWriter; import io.quarkus.devtools.project.QuarkusProject; import io.quarkus.devtools.project.extensions.ExtensionManager; -import java.util.HashMap; -import java.util.Set; /** * Instances of this class are not thread-safe. They are created per single invocation. diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/data/QuarkusCommandInvocation.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/data/QuarkusCommandInvocation.java index 77fa3890296ad..45e99a5fbbff1 100644 --- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/data/QuarkusCommandInvocation.java +++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/data/QuarkusCommandInvocation.java @@ -2,11 +2,12 @@ import static java.util.Objects.requireNonNull; +import java.util.HashMap; +import java.util.Map; + import io.quarkus.devtools.messagewriter.MessageWriter; import io.quarkus.devtools.project.QuarkusProject; import io.quarkus.registry.catalog.ExtensionCatalog; -import java.util.HashMap; -import java.util.Map; public final class QuarkusCommandInvocation extends ValueMap { diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/data/SelectionResult.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/data/SelectionResult.java index 4ab793f86aa21..f04f9610203ee 100644 --- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/data/SelectionResult.java +++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/data/SelectionResult.java @@ -1,10 +1,11 @@ package io.quarkus.devtools.commands.data; -import io.quarkus.registry.catalog.Extension; import java.util.Collection; import java.util.Collections; import java.util.Iterator; +import io.quarkus.registry.catalog.Extension; + public class SelectionResult implements Iterable { private final Collection extensions; diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/handlers/AddExtensionsCommandHandler.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/handlers/AddExtensionsCommandHandler.java index 73099e2f64e3b..c158480bd0929 100644 --- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/handlers/AddExtensionsCommandHandler.java +++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/handlers/AddExtensionsCommandHandler.java @@ -4,6 +4,15 @@ import static io.quarkus.devtools.messagewriter.MessageIcons.ERROR_ICON; import static io.quarkus.devtools.messagewriter.MessageIcons.NOK_ICON; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.List; +import java.util.Set; + +import org.apache.commons.lang3.StringUtils; + import io.quarkus.devtools.commands.AddExtensions; import io.quarkus.devtools.commands.data.QuarkusCommandException; import io.quarkus.devtools.commands.data.QuarkusCommandInvocation; @@ -18,13 +27,6 @@ import io.quarkus.registry.catalog.Extension; import io.quarkus.registry.catalog.ExtensionCatalog; import io.quarkus.registry.catalog.ExtensionOrigin; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.List; -import java.util.Set; -import org.apache.commons.lang3.StringUtils; /** * This class is thread-safe. It extracts extensions to be added to the project from an instance of diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/handlers/CreateExtensionCommandHandler.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/handlers/CreateExtensionCommandHandler.java index 3d4ae4fb0d244..37c0679726487 100644 --- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/handlers/CreateExtensionCommandHandler.java +++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/handlers/CreateExtensionCommandHandler.java @@ -1,14 +1,5 @@ package io.quarkus.devtools.commands.handlers; -import io.quarkus.devtools.codestarts.extension.QuarkusExtensionCodestartCatalog; -import io.quarkus.devtools.codestarts.extension.QuarkusExtensionCodestartProjectInput; -import io.quarkus.devtools.commands.data.QuarkusCommandException; -import io.quarkus.devtools.commands.data.QuarkusCommandInvocation; -import io.quarkus.devtools.commands.data.QuarkusCommandOutcome; -import io.quarkus.devtools.messagewriter.MessageIcons; -import io.quarkus.devtools.messagewriter.MessageWriter; -import io.quarkus.maven.utilities.MojoUtils; -import io.quarkus.maven.utilities.PomTransformer; import java.io.IOException; import java.nio.charset.StandardCharsets; import java.nio.file.Files; @@ -17,9 +8,20 @@ import java.util.Collections; import java.util.List; import java.util.Map; + import org.apache.commons.io.FileUtils; import org.apache.maven.model.Model; +import io.quarkus.devtools.codestarts.extension.QuarkusExtensionCodestartCatalog; +import io.quarkus.devtools.codestarts.extension.QuarkusExtensionCodestartProjectInput; +import io.quarkus.devtools.commands.data.QuarkusCommandException; +import io.quarkus.devtools.commands.data.QuarkusCommandInvocation; +import io.quarkus.devtools.commands.data.QuarkusCommandOutcome; +import io.quarkus.devtools.messagewriter.MessageIcons; +import io.quarkus.devtools.messagewriter.MessageWriter; +import io.quarkus.maven.utilities.MojoUtils; +import io.quarkus.maven.utilities.PomTransformer; + /** * Instances of this class are thread-safe. They create a new project extracting all the necessary properties from an instance * of {@link QuarkusCommandInvocation}. diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/handlers/CreateJBangProjectCommandHandler.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/handlers/CreateJBangProjectCommandHandler.java index 687182d6d0d44..3a7a188464e1b 100644 --- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/handlers/CreateJBangProjectCommandHandler.java +++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/handlers/CreateJBangProjectCommandHandler.java @@ -4,6 +4,13 @@ import static io.quarkus.devtools.commands.handlers.CreateProjectCodestartDataConverter.toCodestartData; import static io.quarkus.devtools.commands.handlers.QuarkusCommandHandlers.computeCoordsFromQuery; +import java.io.IOException; +import java.nio.file.Path; +import java.util.Collections; +import java.util.List; +import java.util.Set; +import java.util.stream.Collectors; + import io.quarkus.devtools.codestarts.jbang.QuarkusJBangCodestartCatalog; import io.quarkus.devtools.codestarts.jbang.QuarkusJBangCodestartProjectInput; import io.quarkus.devtools.codestarts.jbang.QuarkusJBangCodestartProjectInputBuilder; @@ -16,12 +23,6 @@ import io.quarkus.devtools.project.QuarkusProject; import io.quarkus.maven.dependency.ArtifactCoords; import io.quarkus.registry.catalog.ExtensionCatalog; -import java.io.IOException; -import java.nio.file.Path; -import java.util.Collections; -import java.util.List; -import java.util.Set; -import java.util.stream.Collectors; public class CreateJBangProjectCommandHandler implements QuarkusCommandHandler { @Override diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/handlers/CreateProjectCodestartDataConverter.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/handlers/CreateProjectCodestartDataConverter.java index 7230807001235..a9fee0dfdaf63 100644 --- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/handlers/CreateProjectCodestartDataConverter.java +++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/handlers/CreateProjectCodestartDataConverter.java @@ -1,9 +1,5 @@ package io.quarkus.devtools.commands.handlers; -import io.quarkus.devtools.codestarts.DataKey; -import io.quarkus.devtools.codestarts.quarkus.QuarkusCodestartData; -import io.quarkus.devtools.codestarts.utils.NestedMaps; -import io.quarkus.devtools.commands.CreateProject.CreateProjectKey; import java.util.Collections; import java.util.HashMap; import java.util.Map; @@ -11,6 +7,11 @@ import java.util.stream.Collectors; import java.util.stream.Stream; +import io.quarkus.devtools.codestarts.DataKey; +import io.quarkus.devtools.codestarts.quarkus.QuarkusCodestartData; +import io.quarkus.devtools.codestarts.utils.NestedMaps; +import io.quarkus.devtools.commands.CreateProject.CreateProjectKey; + public enum CreateProjectCodestartDataConverter implements DataKey { PROJECT_GROUP_ID(CreateProjectKey.PROJECT_GROUP_ID), PROJECT_ARTIFACT_ID(CreateProjectKey.PROJECT_ARTIFACT_ID), diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/handlers/CreateProjectCommandHandler.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/handlers/CreateProjectCommandHandler.java index ccf0b9868b84c..ee77d4f09ba05 100644 --- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/handlers/CreateProjectCommandHandler.java +++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/handlers/CreateProjectCommandHandler.java @@ -14,6 +14,17 @@ import static io.quarkus.devtools.commands.handlers.QuarkusCommandHandlers.computeExtensionsFromQuery; import static io.quarkus.devtools.messagewriter.MessageIcons.ERROR_ICON; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.Properties; +import java.util.Set; +import java.util.stream.Collectors; + import io.quarkus.devtools.codestarts.CodestartProjectDefinition; import io.quarkus.devtools.codestarts.CodestartType; import io.quarkus.devtools.codestarts.quarkus.QuarkusCodestartCatalog; @@ -35,16 +46,6 @@ import io.quarkus.registry.catalog.selection.OriginCombination; import io.quarkus.registry.catalog.selection.OriginPreference; import io.quarkus.registry.catalog.selection.OriginSelector; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.Properties; -import java.util.Set; -import java.util.stream.Collectors; /** * Instances of this class are thread-safe. They create a new project extracting all the necessary properties from an instance diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/handlers/InfoCommandHandler.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/handlers/InfoCommandHandler.java index 7d50d0f2dad3b..99a566d96bb2a 100644 --- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/handlers/InfoCommandHandler.java +++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/handlers/InfoCommandHandler.java @@ -1,5 +1,15 @@ package io.quarkus.devtools.commands.handlers; +import java.nio.file.Path; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.Iterator; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; + import io.quarkus.bootstrap.model.ApplicationModel; import io.quarkus.bootstrap.workspace.WorkspaceModule; import io.quarkus.bootstrap.workspace.WorkspaceModuleId; @@ -18,15 +28,6 @@ import io.quarkus.maven.dependency.ResolvedDependency; import io.quarkus.registry.catalog.ExtensionCatalog; import io.quarkus.registry.catalog.ExtensionOrigin; -import java.nio.file.Path; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.Iterator; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; public class InfoCommandHandler implements QuarkusCommandHandler { diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/handlers/ListCategoriesCommandHandler.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/handlers/ListCategoriesCommandHandler.java index 846125966af21..e7a6a5f6ae4c3 100644 --- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/handlers/ListCategoriesCommandHandler.java +++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/handlers/ListCategoriesCommandHandler.java @@ -1,14 +1,15 @@ package io.quarkus.devtools.commands.handlers; +import java.util.Collection; +import java.util.Comparator; +import java.util.function.BiConsumer; + import io.quarkus.devtools.commands.ListCategories; import io.quarkus.devtools.commands.data.QuarkusCommandException; import io.quarkus.devtools.commands.data.QuarkusCommandInvocation; import io.quarkus.devtools.commands.data.QuarkusCommandOutcome; import io.quarkus.devtools.messagewriter.MessageWriter; import io.quarkus.registry.catalog.Category; -import java.util.Collection; -import java.util.Comparator; -import java.util.function.BiConsumer; /** * Instances of this class are thread-safe. It lists extension categories according to the options passed in as properties of diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/handlers/ListExtensionsCommandHandler.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/handlers/ListExtensionsCommandHandler.java index 165d5d052407a..8efdbd1e04068 100644 --- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/handlers/ListExtensionsCommandHandler.java +++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/handlers/ListExtensionsCommandHandler.java @@ -4,17 +4,6 @@ import static io.quarkus.platform.catalog.processor.ExtensionProcessor.getGuide; import static java.util.stream.Collectors.toMap; -import io.quarkus.devtools.commands.ListExtensions; -import io.quarkus.devtools.commands.data.QuarkusCommandException; -import io.quarkus.devtools.commands.data.QuarkusCommandInvocation; -import io.quarkus.devtools.commands.data.QuarkusCommandOutcome; -import io.quarkus.devtools.messagewriter.MessageWriter; -import io.quarkus.devtools.project.extensions.ExtensionManager; -import io.quarkus.maven.dependency.ArtifactCoords; -import io.quarkus.maven.dependency.ArtifactKey; -import io.quarkus.platform.catalog.processor.ExtensionProcessor; -import io.quarkus.registry.catalog.Extension; -import io.quarkus.registry.catalog.ExtensionOrigin; import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; @@ -27,6 +16,18 @@ import java.util.function.Predicate; import java.util.stream.Collectors; +import io.quarkus.devtools.commands.ListExtensions; +import io.quarkus.devtools.commands.data.QuarkusCommandException; +import io.quarkus.devtools.commands.data.QuarkusCommandInvocation; +import io.quarkus.devtools.commands.data.QuarkusCommandOutcome; +import io.quarkus.devtools.messagewriter.MessageWriter; +import io.quarkus.devtools.project.extensions.ExtensionManager; +import io.quarkus.maven.dependency.ArtifactCoords; +import io.quarkus.maven.dependency.ArtifactKey; +import io.quarkus.platform.catalog.processor.ExtensionProcessor; +import io.quarkus.registry.catalog.Extension; +import io.quarkus.registry.catalog.ExtensionOrigin; + /** * Instances of this class are thread-safe. It lists extensions according to the options passed in as properties of * {@link QuarkusCommandInvocation} diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/handlers/MultipleExtensionsFoundException.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/handlers/MultipleExtensionsFoundException.java index 571d1ebfba405..921e558119d0c 100644 --- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/handlers/MultipleExtensionsFoundException.java +++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/handlers/MultipleExtensionsFoundException.java @@ -1,9 +1,10 @@ package io.quarkus.devtools.commands.handlers; -import io.quarkus.registry.catalog.Extension; import java.util.Collection; import java.util.Objects; +import io.quarkus.registry.catalog.Extension; + /** * Thrown when multiple extensions are found for a given installation plan */ diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/handlers/QuarkusCommandHandlers.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/handlers/QuarkusCommandHandlers.java index 013268e02532f..d081d107a019e 100644 --- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/handlers/QuarkusCommandHandlers.java +++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/handlers/QuarkusCommandHandlers.java @@ -5,14 +5,6 @@ import static io.quarkus.platform.catalog.processor.ExtensionProcessor.getShortName; import static io.quarkus.platform.catalog.processor.ExtensionProcessor.isUnlisted; -import io.quarkus.devtools.commands.data.QuarkusCommandInvocation; -import io.quarkus.devtools.commands.data.SelectionResult; -import io.quarkus.devtools.messagewriter.MessageWriter; -import io.quarkus.devtools.project.extensions.Extensions; -import io.quarkus.maven.dependency.ArtifactCoords; -import io.quarkus.maven.dependency.ArtifactKey; -import io.quarkus.registry.catalog.Extension; -import io.quarkus.registry.catalog.ExtensionCatalog; import java.util.ArrayList; import java.util.Collection; import java.util.LinkedHashMap; @@ -22,8 +14,18 @@ import java.util.regex.Pattern; import java.util.regex.PatternSyntaxException; import java.util.stream.Collectors; + import org.apache.commons.lang3.StringUtils; +import io.quarkus.devtools.commands.data.QuarkusCommandInvocation; +import io.quarkus.devtools.commands.data.SelectionResult; +import io.quarkus.devtools.messagewriter.MessageWriter; +import io.quarkus.devtools.project.extensions.Extensions; +import io.quarkus.maven.dependency.ArtifactCoords; +import io.quarkus.maven.dependency.ArtifactKey; +import io.quarkus.registry.catalog.Extension; +import io.quarkus.registry.catalog.ExtensionCatalog; + final class QuarkusCommandHandlers { private QuarkusCommandHandlers() { diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/handlers/RemoveExtensionsCommandHandler.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/handlers/RemoveExtensionsCommandHandler.java index 0c06eacbc399f..7fff1fbf6559e 100644 --- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/handlers/RemoveExtensionsCommandHandler.java +++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/handlers/RemoveExtensionsCommandHandler.java @@ -3,6 +3,12 @@ import static io.quarkus.devtools.commands.RemoveExtensions.EXTENSION_MANAGER; import static io.quarkus.devtools.commands.handlers.QuarkusCommandHandlers.computeCoordsFromQuery; +import java.io.IOException; +import java.util.Collections; +import java.util.List; +import java.util.Set; +import java.util.stream.Collectors; + import io.quarkus.devtools.commands.RemoveExtensions; import io.quarkus.devtools.commands.data.QuarkusCommandException; import io.quarkus.devtools.commands.data.QuarkusCommandInvocation; @@ -12,11 +18,6 @@ import io.quarkus.devtools.project.extensions.ExtensionManager.UninstallResult; import io.quarkus.maven.dependency.ArtifactCoords; import io.quarkus.maven.dependency.ArtifactKey; -import java.io.IOException; -import java.util.Collections; -import java.util.List; -import java.util.Set; -import java.util.stream.Collectors; /** * This class is thread-safe. It extracts extensions to be removed from the project from an instance of diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/handlers/UpdateCommandHandler.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/handlers/UpdateCommandHandler.java index 5f16b291e36d7..1ce5f9895b124 100644 --- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/handlers/UpdateCommandHandler.java +++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/handlers/UpdateCommandHandler.java @@ -1,5 +1,14 @@ package io.quarkus.devtools.commands.handlers; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + import io.quarkus.bootstrap.model.ApplicationModel; import io.quarkus.devtools.commands.data.QuarkusCommandException; import io.quarkus.devtools.commands.data.QuarkusCommandInvocation; @@ -19,14 +28,6 @@ import io.quarkus.registry.catalog.selection.OriginCombination; import io.quarkus.registry.catalog.selection.OriginPreference; import io.quarkus.registry.catalog.selection.OriginSelector; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; public class UpdateCommandHandler implements QuarkusCommandHandler { diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/BuildTool.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/BuildTool.java index 2d59c2ddf3b7e..90ced65464d5d 100644 --- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/BuildTool.java +++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/BuildTool.java @@ -1,13 +1,14 @@ package io.quarkus.devtools.project; +import java.nio.file.Path; +import java.util.Arrays; +import java.util.Locale; + import io.quarkus.devtools.project.buildfile.GroovyGradleBuildFile; import io.quarkus.devtools.project.buildfile.KotlinGradleBuildFile; import io.quarkus.devtools.project.buildfile.MavenBuildFile; import io.quarkus.devtools.project.extensions.ExtensionManager; import io.quarkus.registry.catalog.ExtensionCatalog; -import java.nio.file.Path; -import java.util.Arrays; -import java.util.Locale; /** * An enum of build tools, such as Maven and Gradle. diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/CodestartResourceLoadersBuilder.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/CodestartResourceLoadersBuilder.java index d48dfe43d9c63..33abb7b9bba2c 100644 --- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/CodestartResourceLoadersBuilder.java +++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/CodestartResourceLoadersBuilder.java @@ -5,12 +5,6 @@ import static io.quarkus.platform.descriptor.loader.json.ResourceLoaders.resolveFileResourceLoader; import static java.util.Objects.requireNonNull; -import io.quarkus.bootstrap.resolver.maven.MavenArtifactResolver; -import io.quarkus.bootstrap.util.DependencyUtils; -import io.quarkus.platform.descriptor.loader.json.ResourceLoader; -import io.quarkus.registry.catalog.Extension; -import io.quarkus.registry.catalog.ExtensionCatalog; -import io.quarkus.registry.config.PropertiesUtil; import java.io.File; import java.io.IOException; import java.io.InputStream; @@ -20,8 +14,16 @@ import java.util.List; import java.util.Map; import java.util.Properties; + import org.eclipse.aether.artifact.Artifact; +import io.quarkus.bootstrap.resolver.maven.MavenArtifactResolver; +import io.quarkus.bootstrap.util.DependencyUtils; +import io.quarkus.platform.descriptor.loader.json.ResourceLoader; +import io.quarkus.registry.catalog.Extension; +import io.quarkus.registry.catalog.ExtensionCatalog; +import io.quarkus.registry.config.PropertiesUtil; + public final class CodestartResourceLoadersBuilder { private static final String BASE_CODESTARTS_ARTIFACT_PROPERTY = "quarkus-base-codestart-artifact"; private static final String BASE_CODESTARTS_ARTIFACT_PROPERTIES_NAME = "/quarkus-devtools-base-codestarts.properties"; diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/QuarkusProject.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/QuarkusProject.java index 85849563ceb38..153aa5b1d6329 100644 --- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/QuarkusProject.java +++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/QuarkusProject.java @@ -2,12 +2,13 @@ import static java.util.Objects.requireNonNull; +import java.nio.file.Path; +import java.util.List; + import io.quarkus.devtools.messagewriter.MessageWriter; import io.quarkus.devtools.project.extensions.ExtensionManager; import io.quarkus.platform.descriptor.loader.json.ResourceLoader; import io.quarkus.registry.catalog.ExtensionCatalog; -import java.nio.file.Path; -import java.util.List; public final class QuarkusProject { diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/QuarkusProjectHelper.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/QuarkusProjectHelper.java index b171b8429aade..09502599e3ee4 100644 --- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/QuarkusProjectHelper.java +++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/QuarkusProjectHelper.java @@ -2,6 +2,8 @@ import static io.quarkus.devtools.project.CodestartResourceLoadersBuilder.getCodestartResourceLoaders; +import java.nio.file.Path; + import io.quarkus.bootstrap.resolver.maven.BootstrapMavenException; import io.quarkus.bootstrap.resolver.maven.MavenArtifactResolver; import io.quarkus.devtools.messagewriter.MessageWriter; @@ -12,7 +14,6 @@ import io.quarkus.registry.RegistryResolutionException; import io.quarkus.registry.catalog.ExtensionCatalog; import io.quarkus.registry.config.RegistriesConfig; -import java.nio.file.Path; public class QuarkusProjectHelper { diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/buildfile/AbstractGradleBuildFile.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/buildfile/AbstractGradleBuildFile.java index 1051f2baa364e..dba8d5bd5a341 100644 --- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/buildfile/AbstractGradleBuildFile.java +++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/buildfile/AbstractGradleBuildFile.java @@ -1,8 +1,5 @@ package io.quarkus.devtools.project.buildfile; -import io.quarkus.maven.dependency.ArtifactCoords; -import io.quarkus.maven.dependency.ArtifactKey; -import io.quarkus.registry.catalog.ExtensionCatalog; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -16,6 +13,10 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; +import io.quarkus.maven.dependency.ArtifactCoords; +import io.quarkus.maven.dependency.ArtifactKey; +import io.quarkus.registry.catalog.ExtensionCatalog; + // We keep it here to take advantage of the abstract tests abstract class AbstractGradleBuildFile extends BuildFile { diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/buildfile/AbstractGradleBuildFilesCreator.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/buildfile/AbstractGradleBuildFilesCreator.java index 39ad2fdae19a8..5d6ad5618536f 100644 --- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/buildfile/AbstractGradleBuildFilesCreator.java +++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/buildfile/AbstractGradleBuildFilesCreator.java @@ -1,10 +1,5 @@ package io.quarkus.devtools.project.buildfile; -import io.quarkus.devtools.project.QuarkusProject; -import io.quarkus.devtools.project.buildfile.AbstractGradleBuildFile.Model; -import io.quarkus.maven.dependency.ArtifactCoords; -import io.quarkus.platform.tools.ToolsUtils; -import io.quarkus.registry.catalog.ExtensionCatalog; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -16,6 +11,12 @@ import java.util.Properties; import java.util.concurrent.atomic.AtomicReference; +import io.quarkus.devtools.project.QuarkusProject; +import io.quarkus.devtools.project.buildfile.AbstractGradleBuildFile.Model; +import io.quarkus.maven.dependency.ArtifactCoords; +import io.quarkus.platform.tools.ToolsUtils; +import io.quarkus.registry.catalog.ExtensionCatalog; + abstract class AbstractGradleBuildFilesCreator { private static final String GRADLE_PROPERTIES_PATH = "gradle.properties"; diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/buildfile/AbstractGroovyGradleBuildFile.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/buildfile/AbstractGroovyGradleBuildFile.java index 6696a5f5fd23f..7c9ad0222cfb3 100644 --- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/buildfile/AbstractGroovyGradleBuildFile.java +++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/buildfile/AbstractGroovyGradleBuildFile.java @@ -1,9 +1,10 @@ package io.quarkus.devtools.project.buildfile; +import java.nio.file.Path; + import io.quarkus.devtools.project.BuildTool; import io.quarkus.maven.dependency.ArtifactCoords; import io.quarkus.registry.catalog.ExtensionCatalog; -import java.nio.file.Path; public abstract class AbstractGroovyGradleBuildFile extends AbstractGradleBuildFile { diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/buildfile/BuildFile.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/buildfile/BuildFile.java index 56eb3f10757fc..a05d32b9e103a 100644 --- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/buildfile/BuildFile.java +++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/buildfile/BuildFile.java @@ -3,13 +3,6 @@ import static java.util.Objects.requireNonNull; import static java.util.stream.Collectors.toList; -import io.quarkus.devtools.project.extensions.ExtensionInstallPlan; -import io.quarkus.devtools.project.extensions.ExtensionManager; -import io.quarkus.devtools.project.extensions.Extensions; -import io.quarkus.maven.dependency.ArtifactCoords; -import io.quarkus.maven.dependency.ArtifactKey; -import io.quarkus.registry.catalog.Extension; -import io.quarkus.registry.catalog.ExtensionCatalog; import java.io.IOException; import java.io.UncheckedIOException; import java.nio.file.Files; @@ -21,6 +14,14 @@ import java.util.Set; import java.util.stream.Collectors; +import io.quarkus.devtools.project.extensions.ExtensionInstallPlan; +import io.quarkus.devtools.project.extensions.ExtensionManager; +import io.quarkus.devtools.project.extensions.Extensions; +import io.quarkus.maven.dependency.ArtifactCoords; +import io.quarkus.maven.dependency.ArtifactKey; +import io.quarkus.registry.catalog.Extension; +import io.quarkus.registry.catalog.ExtensionCatalog; + public abstract class BuildFile implements ExtensionManager { private final Path projectDirPath; diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/buildfile/GenericGradleBuildFile.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/buildfile/GenericGradleBuildFile.java index 79fea9325d679..27cdc0f657e52 100644 --- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/buildfile/GenericGradleBuildFile.java +++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/buildfile/GenericGradleBuildFile.java @@ -1,11 +1,12 @@ package io.quarkus.devtools.project.buildfile; +import java.io.IOException; +import java.util.Collection; + import io.quarkus.devtools.project.extensions.ExtensionInstallPlan; import io.quarkus.devtools.project.extensions.ExtensionManager; import io.quarkus.maven.dependency.ArtifactCoords; import io.quarkus.maven.dependency.ArtifactKey; -import java.io.IOException; -import java.util.Collection; /** * TODO We need to find a way to use the gradle api outside of a gradle plugin diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/buildfile/GroovyGradleBuildFilesCreator.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/buildfile/GroovyGradleBuildFilesCreator.java index 3cfa4801d89d3..deeb0b2144c15 100644 --- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/buildfile/GroovyGradleBuildFilesCreator.java +++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/buildfile/GroovyGradleBuildFilesCreator.java @@ -1,8 +1,9 @@ package io.quarkus.devtools.project.buildfile; +import java.io.IOException; + import io.quarkus.devtools.project.QuarkusProject; import io.quarkus.maven.dependency.ArtifactCoords; -import java.io.IOException; public final class GroovyGradleBuildFilesCreator extends AbstractGradleBuildFilesCreator { diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/buildfile/KotlinGradleBuildFilesCreator.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/buildfile/KotlinGradleBuildFilesCreator.java index 3e6232bc0e472..26dd8254c0128 100644 --- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/buildfile/KotlinGradleBuildFilesCreator.java +++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/buildfile/KotlinGradleBuildFilesCreator.java @@ -1,9 +1,10 @@ package io.quarkus.devtools.project.buildfile; +import java.io.IOException; + import io.quarkus.devtools.project.QuarkusProject; import io.quarkus.devtools.project.buildfile.AbstractGradleBuildFile.Model; import io.quarkus.maven.dependency.ArtifactCoords; -import java.io.IOException; public class KotlinGradleBuildFilesCreator extends AbstractGradleBuildFilesCreator { diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/buildfile/MavenBuildFile.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/buildfile/MavenBuildFile.java index 56e5ffe2a3b77..94c94449e72ef 100644 --- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/buildfile/MavenBuildFile.java +++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/buildfile/MavenBuildFile.java @@ -2,14 +2,6 @@ import static io.quarkus.devtools.project.extensions.Extensions.toKey; -import io.quarkus.devtools.project.BuildTool; -import io.quarkus.devtools.project.extensions.Extensions; -import io.quarkus.maven.dependency.ArtifactCoords; -import io.quarkus.maven.dependency.ArtifactKey; -import io.quarkus.maven.utilities.MojoUtils; -import io.quarkus.registry.Constants; -import io.quarkus.registry.catalog.ExtensionCatalog; -import io.quarkus.registry.util.PlatformArtifacts; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -24,10 +16,20 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.stream.Collectors; + import org.apache.maven.model.Dependency; import org.apache.maven.model.DependencyManagement; import org.apache.maven.model.Model; +import io.quarkus.devtools.project.BuildTool; +import io.quarkus.devtools.project.extensions.Extensions; +import io.quarkus.maven.dependency.ArtifactCoords; +import io.quarkus.maven.dependency.ArtifactKey; +import io.quarkus.maven.utilities.MojoUtils; +import io.quarkus.registry.Constants; +import io.quarkus.registry.catalog.ExtensionCatalog; +import io.quarkus.registry.util.PlatformArtifacts; + /** * {@link io.quarkus.devtools.project.buildfile.MavenProjectBuildFile} should be used in place of this class. */ diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/buildfile/MavenProjectBuildFile.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/buildfile/MavenProjectBuildFile.java index 90d8757ac9043..9758736e8e320 100644 --- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/buildfile/MavenProjectBuildFile.java +++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/buildfile/MavenProjectBuildFile.java @@ -3,24 +3,6 @@ import static io.quarkus.devtools.project.CodestartResourceLoadersBuilder.codestartLoadersBuilder; import static io.quarkus.devtools.project.extensions.Extensions.toKey; -import io.quarkus.bootstrap.resolver.maven.BootstrapMavenException; -import io.quarkus.bootstrap.resolver.maven.MavenArtifactResolver; -import io.quarkus.bootstrap.resolver.maven.workspace.LocalProject; -import io.quarkus.bootstrap.resolver.maven.workspace.ModelUtils; -import io.quarkus.devtools.messagewriter.MessageWriter; -import io.quarkus.devtools.project.BuildTool; -import io.quarkus.devtools.project.QuarkusProject; -import io.quarkus.devtools.project.QuarkusProjectHelper; -import io.quarkus.maven.dependency.ArtifactCoords; -import io.quarkus.maven.dependency.ArtifactKey; -import io.quarkus.maven.utilities.MojoUtils; -import io.quarkus.platform.descriptor.loader.json.ResourceLoader; -import io.quarkus.platform.tools.ToolsUtils; -import io.quarkus.registry.ExtensionCatalogResolver; -import io.quarkus.registry.RegistryResolutionException; -import io.quarkus.registry.catalog.ExtensionCatalog; -import io.quarkus.registry.config.RegistriesConfig; -import io.quarkus.registry.util.PlatformArtifacts; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.nio.file.Files; @@ -35,6 +17,7 @@ import java.util.function.Supplier; import java.util.regex.Matcher; import java.util.regex.Pattern; + import org.apache.maven.model.Dependency; import org.apache.maven.model.DependencyManagement; import org.apache.maven.model.Model; @@ -42,6 +25,25 @@ import org.eclipse.aether.artifact.DefaultArtifact; import org.eclipse.aether.resolution.ArtifactDescriptorResult; +import io.quarkus.bootstrap.resolver.maven.BootstrapMavenException; +import io.quarkus.bootstrap.resolver.maven.MavenArtifactResolver; +import io.quarkus.bootstrap.resolver.maven.workspace.LocalProject; +import io.quarkus.bootstrap.resolver.maven.workspace.ModelUtils; +import io.quarkus.devtools.messagewriter.MessageWriter; +import io.quarkus.devtools.project.BuildTool; +import io.quarkus.devtools.project.QuarkusProject; +import io.quarkus.devtools.project.QuarkusProjectHelper; +import io.quarkus.maven.dependency.ArtifactCoords; +import io.quarkus.maven.dependency.ArtifactKey; +import io.quarkus.maven.utilities.MojoUtils; +import io.quarkus.platform.descriptor.loader.json.ResourceLoader; +import io.quarkus.platform.tools.ToolsUtils; +import io.quarkus.registry.ExtensionCatalogResolver; +import io.quarkus.registry.RegistryResolutionException; +import io.quarkus.registry.catalog.ExtensionCatalog; +import io.quarkus.registry.config.RegistriesConfig; +import io.quarkus.registry.util.PlatformArtifacts; + public class MavenProjectBuildFile extends BuildFile { private static final Pattern PROPERTY_PATTERN = Pattern.compile("\\$\\{(.+)}"); diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/compress/QuarkusProjectCompress.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/compress/QuarkusProjectCompress.java index 081899d2133ab..c247156fbb27e 100644 --- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/compress/QuarkusProjectCompress.java +++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/compress/QuarkusProjectCompress.java @@ -6,6 +6,7 @@ import java.nio.file.Path; import java.util.List; import java.util.stream.Stream; + import org.apache.commons.compress.archivers.zip.UnixStat; import org.apache.commons.compress.archivers.zip.X5455_ExtendedTimestamp; import org.apache.commons.compress.archivers.zip.ZipArchiveEntry; diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/extensions/ExtensionInstallPlan.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/extensions/ExtensionInstallPlan.java index 0b3f0615053d5..6f4398153760d 100644 --- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/extensions/ExtensionInstallPlan.java +++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/extensions/ExtensionInstallPlan.java @@ -1,12 +1,13 @@ package io.quarkus.devtools.project.extensions; -import io.quarkus.maven.dependency.ArtifactCoords; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.LinkedHashSet; import java.util.Set; +import io.quarkus.maven.dependency.ArtifactCoords; + public class ExtensionInstallPlan { public static final ExtensionInstallPlan EMPTY = new ExtensionInstallPlan( diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/extensions/ExtensionManager.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/extensions/ExtensionManager.java index 86641a592d5c6..b5cf1e7003df0 100644 --- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/extensions/ExtensionManager.java +++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/extensions/ExtensionManager.java @@ -1,12 +1,13 @@ package io.quarkus.devtools.project.extensions; -import io.quarkus.devtools.project.BuildTool; -import io.quarkus.maven.dependency.ArtifactCoords; -import io.quarkus.maven.dependency.ArtifactKey; import java.io.IOException; import java.util.Collection; import java.util.Objects; +import io.quarkus.devtools.project.BuildTool; +import io.quarkus.maven.dependency.ArtifactCoords; +import io.quarkus.maven.dependency.ArtifactKey; + /** * This interface defines a high level way of managing (read/write) extensions in any QuarkusProject */ diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/extensions/Extensions.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/extensions/Extensions.java index db89e2004b5d8..40a8e17b17136 100644 --- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/extensions/Extensions.java +++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/extensions/Extensions.java @@ -1,13 +1,15 @@ package io.quarkus.devtools.project.extensions; -import io.quarkus.maven.dependency.ArtifactCoords; -import io.quarkus.maven.dependency.ArtifactKey; -import io.quarkus.registry.catalog.Extension; import java.util.Collection; import java.util.Objects; import java.util.Optional; + import org.apache.maven.model.Dependency; +import io.quarkus.maven.dependency.ArtifactCoords; +import io.quarkus.maven.dependency.ArtifactKey; +import io.quarkus.registry.catalog.Extension; + public final class Extensions { private Extensions() { } diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/state/ExtensionProvider.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/state/ExtensionProvider.java index 66ade68d18567..1c78c8a0600ad 100644 --- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/state/ExtensionProvider.java +++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/state/ExtensionProvider.java @@ -1,12 +1,13 @@ package io.quarkus.devtools.project.state; +import java.util.Collection; +import java.util.LinkedHashMap; +import java.util.Map; + import io.quarkus.maven.dependency.ArtifactCoords; import io.quarkus.maven.dependency.ArtifactKey; import io.quarkus.maven.dependency.GACTV; import io.quarkus.registry.catalog.ExtensionOrigin; -import java.util.Collection; -import java.util.LinkedHashMap; -import java.util.Map; public class ExtensionProvider { diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/state/ModuleState.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/state/ModuleState.java index 236c99a5e3043..668675af6217b 100644 --- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/state/ModuleState.java +++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/state/ModuleState.java @@ -1,9 +1,5 @@ package io.quarkus.devtools.project.state; -import io.quarkus.bootstrap.workspace.WorkspaceModule; -import io.quarkus.bootstrap.workspace.WorkspaceModuleId; -import io.quarkus.maven.dependency.ArtifactCoords; -import io.quarkus.maven.dependency.ArtifactKey; import java.nio.file.Path; import java.util.Collection; import java.util.LinkedHashMap; @@ -11,6 +7,11 @@ import java.util.Map; import java.util.Set; +import io.quarkus.bootstrap.workspace.WorkspaceModule; +import io.quarkus.bootstrap.workspace.WorkspaceModuleId; +import io.quarkus.maven.dependency.ArtifactCoords; +import io.quarkus.maven.dependency.ArtifactKey; + /** * Represents a state of a module of a Quarkus project focusing primarily on Quarkus-specific information, such as * imported Quarkus platform BOMs, extensions and their origins. diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/state/ProjectState.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/state/ProjectState.java index f8226d4e4106b..53f30832754ab 100644 --- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/state/ProjectState.java +++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/state/ProjectState.java @@ -1,14 +1,15 @@ package io.quarkus.devtools.project.state; -import io.quarkus.bootstrap.workspace.WorkspaceModuleId; -import io.quarkus.maven.dependency.ArtifactCoords; -import io.quarkus.maven.dependency.ArtifactKey; import java.util.ArrayList; import java.util.Collection; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; +import io.quarkus.bootstrap.workspace.WorkspaceModuleId; +import io.quarkus.maven.dependency.ArtifactCoords; +import io.quarkus.maven.dependency.ArtifactKey; + /** * Represents a Quarkus project state focusing primarily on Quarkus-specific information, such as * imported Quarkus platform BOMs, extensions and their origins. diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/state/TopExtensionDependency.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/state/TopExtensionDependency.java index 06cc93aabb39f..6be48c63d7baf 100644 --- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/state/TopExtensionDependency.java +++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/state/TopExtensionDependency.java @@ -1,5 +1,8 @@ package io.quarkus.devtools.project.state; +import java.io.IOException; +import java.io.UncheckedIOException; + import io.quarkus.bootstrap.BootstrapConstants; import io.quarkus.maven.dependency.ArtifactCoords; import io.quarkus.maven.dependency.ArtifactKey; @@ -7,8 +10,6 @@ import io.quarkus.maven.dependency.ResolvedDependency; import io.quarkus.registry.catalog.Extension; import io.quarkus.registry.catalog.ExtensionOrigin; -import java.io.IOException; -import java.io.UncheckedIOException; public class TopExtensionDependency { diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/maven/utilities/MojoUtils.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/maven/utilities/MojoUtils.java index c1ce7c276bed4..089e63a1e45e5 100644 --- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/maven/utilities/MojoUtils.java +++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/maven/utilities/MojoUtils.java @@ -12,6 +12,7 @@ import java.nio.file.Path; import java.nio.file.Paths; import java.util.*; + import org.apache.maven.cli.transfer.QuietMavenTransferListener; import org.apache.maven.model.Dependency; import org.apache.maven.model.Model; diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/maven/utilities/PomTransformer.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/maven/utilities/PomTransformer.java index ca19830d9d913..c18679e965378 100644 --- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/maven/utilities/PomTransformer.java +++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/maven/utilities/PomTransformer.java @@ -1,7 +1,5 @@ package io.quarkus.maven.utilities; -import io.quarkus.maven.dependency.ArtifactCoords; -import io.quarkus.maven.dependency.Dependency; import java.io.IOException; import java.io.StringReader; import java.io.StringWriter; @@ -14,6 +12,7 @@ import java.util.function.Supplier; import java.util.regex.Matcher; import java.util.regex.Pattern; + import javax.xml.transform.Transformer; import javax.xml.transform.TransformerException; import javax.xml.transform.TransformerFactory; @@ -26,12 +25,16 @@ import javax.xml.xpath.XPathConstants; import javax.xml.xpath.XPathExpressionException; import javax.xml.xpath.XPathFactory; + import org.apache.maven.model.Plugin; import org.w3c.dom.DOMException; import org.w3c.dom.Document; import org.w3c.dom.Node; import org.w3c.dom.NodeList; +import io.quarkus.maven.dependency.ArtifactCoords; +import io.quarkus.maven.dependency.Dependency; + /** * A utility to transform {@code pom.xml} files on the DOM level while keeping the original comments and formatting also * on places where common {@code javax.xml.transform.Transformer} or {@code javax.xml.parsers.DocumentBuilder} based diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/maven/utilities/QuarkusDependencyPredicate.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/maven/utilities/QuarkusDependencyPredicate.java index 74e31be9689c8..3b138c6952f57 100644 --- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/maven/utilities/QuarkusDependencyPredicate.java +++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/maven/utilities/QuarkusDependencyPredicate.java @@ -1,6 +1,7 @@ package io.quarkus.maven.utilities; import java.util.function.Predicate; + import org.apache.maven.model.Dependency; public class QuarkusDependencyPredicate implements Predicate { diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/platform/catalog/compatibility/ExtensionCatalogCompatibility.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/platform/catalog/compatibility/ExtensionCatalogCompatibility.java index e83745ed5d428..9c8ece82f1c73 100644 --- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/platform/catalog/compatibility/ExtensionCatalogCompatibility.java +++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/platform/catalog/compatibility/ExtensionCatalogCompatibility.java @@ -1,8 +1,5 @@ package io.quarkus.platform.catalog.compatibility; -import io.quarkus.maven.dependency.ArtifactKey; -import io.quarkus.registry.catalog.Extension; -import io.quarkus.registry.catalog.ExtensionCatalog; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -12,6 +9,10 @@ import java.util.Objects; import java.util.stream.Collectors; +import io.quarkus.maven.dependency.ArtifactKey; +import io.quarkus.registry.catalog.Extension; +import io.quarkus.registry.catalog.ExtensionCatalog; + /** * Extension catalog compatibility info. */ diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/platform/catalog/compatibility/ExtensionCompatibility.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/platform/catalog/compatibility/ExtensionCompatibility.java index 6cee67665278e..ae2b63a07a902 100644 --- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/platform/catalog/compatibility/ExtensionCompatibility.java +++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/platform/catalog/compatibility/ExtensionCompatibility.java @@ -1,11 +1,12 @@ package io.quarkus.platform.catalog.compatibility; -import io.quarkus.maven.dependency.ArtifactKey; -import io.quarkus.registry.catalog.Extension; import java.util.Collection; import java.util.Map; import java.util.Objects; +import io.quarkus.maven.dependency.ArtifactKey; +import io.quarkus.registry.catalog.Extension; + /** * Extension compatibility info. */ diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/platform/catalog/predicate/ExtensionPredicate.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/platform/catalog/predicate/ExtensionPredicate.java index 6a46efe64f97a..54e6111286a61 100644 --- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/platform/catalog/predicate/ExtensionPredicate.java +++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/platform/catalog/predicate/ExtensionPredicate.java @@ -2,14 +2,15 @@ import static io.quarkus.platform.catalog.processor.ExtensionProcessor.getShortName; -import io.quarkus.platform.catalog.processor.ExtensionProcessor; -import io.quarkus.registry.catalog.Extension; import java.util.List; import java.util.Objects; import java.util.function.Predicate; import java.util.regex.Pattern; import java.util.regex.PatternSyntaxException; +import io.quarkus.platform.catalog.processor.ExtensionProcessor; +import io.quarkus.registry.catalog.Extension; + /** * A {@link Predicate} implementation that will test a keyword against an {@link Extension} */ diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/platform/catalog/processor/CatalogProcessor.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/platform/catalog/processor/CatalogProcessor.java index 2abbc62c09e16..4905ade770495 100644 --- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/platform/catalog/processor/CatalogProcessor.java +++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/platform/catalog/processor/CatalogProcessor.java @@ -2,10 +2,11 @@ import static io.quarkus.platform.catalog.processor.ExtensionProcessor.isUnlisted; +import java.util.*; + import io.quarkus.registry.catalog.Category; import io.quarkus.registry.catalog.Extension; import io.quarkus.registry.catalog.ExtensionCatalog; -import java.util.*; public class CatalogProcessor { private static final String CODESTART_ARTIFACTS = "codestarts-artifacts"; diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/platform/catalog/processor/ExtendedKeywords.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/platform/catalog/processor/ExtendedKeywords.java index ff72be909bb8d..be68f4a81091a 100644 --- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/platform/catalog/processor/ExtendedKeywords.java +++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/platform/catalog/processor/ExtendedKeywords.java @@ -11,6 +11,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.stream.Collectors; + import org.apache.commons.lang3.StringUtils; public final class ExtendedKeywords { diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/platform/catalog/processor/ExtensionProcessor.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/platform/catalog/processor/ExtensionProcessor.java index fa3b6dd578c00..985b983499bd7 100644 --- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/platform/catalog/processor/ExtensionProcessor.java +++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/platform/catalog/processor/ExtensionProcessor.java @@ -3,8 +3,6 @@ import static io.quarkus.registry.catalog.Extension.*; import static java.util.stream.Collectors.toMap; -import io.quarkus.maven.dependency.ArtifactCoords; -import io.quarkus.registry.catalog.Extension; import java.util.AbstractMap; import java.util.ArrayList; import java.util.Collection; @@ -15,6 +13,9 @@ import java.util.Optional; import java.util.Set; +import io.quarkus.maven.dependency.ArtifactCoords; +import io.quarkus.registry.catalog.Extension; + public final class ExtensionProcessor { private static final String QUARKUS_BOM_ARTIFACT_ID = "quarkus-bom"; diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/platform/catalog/processor/ProcessedCategory.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/platform/catalog/processor/ProcessedCategory.java index ac99f796a0e32..1a63bf957ec15 100644 --- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/platform/catalog/processor/ProcessedCategory.java +++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/platform/catalog/processor/ProcessedCategory.java @@ -2,14 +2,15 @@ import static io.quarkus.registry.catalog.Category.MD_PINNED; -import io.quarkus.registry.catalog.Category; -import io.quarkus.registry.catalog.Extension; import java.util.Collection; import java.util.Comparator; import java.util.List; import java.util.Objects; import java.util.stream.Collectors; +import io.quarkus.registry.catalog.Category; +import io.quarkus.registry.catalog.Extension; + public final class ProcessedCategory { private final Category category; private final Collection extensions; diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/platform/descriptor/loader/json/ResourceLoaders.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/platform/descriptor/loader/json/ResourceLoaders.java index d4a4d287c4acf..ebef52d21b387 100644 --- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/platform/descriptor/loader/json/ResourceLoaders.java +++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/platform/descriptor/loader/json/ResourceLoaders.java @@ -1,6 +1,5 @@ package io.quarkus.platform.descriptor.loader.json; -import io.quarkus.fs.util.ZipUtils; import java.io.File; import java.io.IOException; import java.io.UncheckedIOException; @@ -12,8 +11,11 @@ import java.nio.file.Paths; import java.util.Objects; import java.util.function.Function; + import org.apache.commons.io.FilenameUtils; +import io.quarkus.fs.util.ZipUtils; + public final class ResourceLoaders { private static final String FILE = "file"; diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/platform/descriptor/loader/json/ZipResourceLoader.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/platform/descriptor/loader/json/ZipResourceLoader.java index ec6366260200c..f1a363fb3e0ab 100644 --- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/platform/descriptor/loader/json/ZipResourceLoader.java +++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/platform/descriptor/loader/json/ZipResourceLoader.java @@ -1,11 +1,12 @@ package io.quarkus.platform.descriptor.loader.json; -import io.quarkus.fs.util.ZipUtils; import java.io.IOException; import java.nio.file.FileSystem; import java.nio.file.Files; import java.nio.file.Path; +import io.quarkus.fs.util.ZipUtils; + public class ZipResourceLoader implements ResourceLoader { private final Path zip; diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/platform/tools/ToolsUtils.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/platform/tools/ToolsUtils.java index 14cf2d44fa4fd..7156237985f9f 100644 --- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/platform/tools/ToolsUtils.java +++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/platform/tools/ToolsUtils.java @@ -1,15 +1,5 @@ package io.quarkus.platform.tools; -import io.quarkus.bootstrap.BootstrapConstants; -import io.quarkus.bootstrap.resolver.AppModelResolver; -import io.quarkus.bootstrap.resolver.BootstrapAppModelResolver; -import io.quarkus.bootstrap.resolver.maven.MavenArtifactResolver; -import io.quarkus.devtools.messagewriter.MessageWriter; -import io.quarkus.maven.dependency.ArtifactCoords; -import io.quarkus.registry.CatalogMergeUtility; -import io.quarkus.registry.catalog.ExtensionCatalog; -import io.quarkus.registry.catalog.selection.OriginPreference; -import io.quarkus.registry.util.PlatformArtifacts; import java.io.IOException; import java.nio.file.Path; import java.util.ArrayList; @@ -19,10 +9,22 @@ import java.util.List; import java.util.Map; import java.util.Properties; + import org.apache.commons.lang3.StringUtils; import org.eclipse.aether.artifact.Artifact; import org.eclipse.aether.artifact.DefaultArtifact; +import io.quarkus.bootstrap.BootstrapConstants; +import io.quarkus.bootstrap.resolver.AppModelResolver; +import io.quarkus.bootstrap.resolver.BootstrapAppModelResolver; +import io.quarkus.bootstrap.resolver.maven.MavenArtifactResolver; +import io.quarkus.devtools.messagewriter.MessageWriter; +import io.quarkus.maven.dependency.ArtifactCoords; +import io.quarkus.registry.CatalogMergeUtility; +import io.quarkus.registry.catalog.ExtensionCatalog; +import io.quarkus.registry.catalog.selection.OriginPreference; +import io.quarkus.registry.util.PlatformArtifacts; + public class ToolsUtils { public static String requireProperty(String name) { diff --git a/independent-projects/tools/devtools-common/src/test/java/io/quarkus/maven/utilities/PomTransformerTest.java b/independent-projects/tools/devtools-common/src/test/java/io/quarkus/maven/utilities/PomTransformerTest.java index fdcd67666c6b5..7c5bdda14775d 100644 --- a/independent-projects/tools/devtools-common/src/test/java/io/quarkus/maven/utilities/PomTransformerTest.java +++ b/independent-projects/tools/devtools-common/src/test/java/io/quarkus/maven/utilities/PomTransformerTest.java @@ -1,11 +1,10 @@ package io.quarkus.maven.utilities; -import io.quarkus.maven.utilities.PomTransformer.Gavtcs; -import io.quarkus.maven.utilities.PomTransformer.Transformation; import java.io.StringReader; import java.nio.file.Paths; import java.util.Collection; import java.util.Collections; + import javax.xml.transform.TransformerConfigurationException; import javax.xml.transform.TransformerException; import javax.xml.transform.TransformerFactory; @@ -14,10 +13,14 @@ import javax.xml.transform.stream.StreamSource; import javax.xml.xpath.XPath; import javax.xml.xpath.XPathFactory; + import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.w3c.dom.Node; +import io.quarkus.maven.utilities.PomTransformer.Gavtcs; +import io.quarkus.maven.utilities.PomTransformer.Transformation; + public class PomTransformerTest { @Test diff --git a/independent-projects/tools/devtools-common/src/test/java/io/quarkus/platform/catalog/compatibility/ExtensionCatalogCompatibilityTest.java b/independent-projects/tools/devtools-common/src/test/java/io/quarkus/platform/catalog/compatibility/ExtensionCatalogCompatibilityTest.java index 925ba43e23aa0..2d1034adfa64f 100644 --- a/independent-projects/tools/devtools-common/src/test/java/io/quarkus/platform/catalog/compatibility/ExtensionCatalogCompatibilityTest.java +++ b/independent-projects/tools/devtools-common/src/test/java/io/quarkus/platform/catalog/compatibility/ExtensionCatalogCompatibilityTest.java @@ -5,9 +5,6 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import io.quarkus.maven.dependency.ArtifactCoords; -import io.quarkus.registry.catalog.Extension; -import io.quarkus.registry.catalog.ExtensionCatalog; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -17,9 +14,14 @@ import java.util.Map; import java.util.Set; import java.util.stream.Collectors; + import org.assertj.core.util.Arrays; import org.junit.jupiter.api.Test; +import io.quarkus.maven.dependency.ArtifactCoords; +import io.quarkus.registry.catalog.Extension; +import io.quarkus.registry.catalog.ExtensionCatalog; + public class ExtensionCatalogCompatibilityTest { @Test diff --git a/independent-projects/tools/devtools-common/src/test/java/io/quarkus/platform/catalog/predicate/ExtensionPredicateTest.java b/independent-projects/tools/devtools-common/src/test/java/io/quarkus/platform/catalog/predicate/ExtensionPredicateTest.java index 80223a8bc5cf3..5b853545acbaf 100644 --- a/independent-projects/tools/devtools-common/src/test/java/io/quarkus/platform/catalog/predicate/ExtensionPredicateTest.java +++ b/independent-projects/tools/devtools-common/src/test/java/io/quarkus/platform/catalog/predicate/ExtensionPredicateTest.java @@ -2,11 +2,13 @@ import static org.assertj.core.api.Assertions.assertThat; -import io.quarkus.maven.dependency.ArtifactCoords; -import io.quarkus.registry.catalog.Extension; import java.util.Arrays; + import org.junit.jupiter.api.Test; +import io.quarkus.maven.dependency.ArtifactCoords; +import io.quarkus.registry.catalog.Extension; + class ExtensionPredicateTest { @Test diff --git a/independent-projects/tools/devtools-common/src/test/java/io/quarkus/platform/catalog/processor/ProcessedCategoryTest.java b/independent-projects/tools/devtools-common/src/test/java/io/quarkus/platform/catalog/processor/ProcessedCategoryTest.java index 915087f662700..5e2a7680fde13 100644 --- a/independent-projects/tools/devtools-common/src/test/java/io/quarkus/platform/catalog/processor/ProcessedCategoryTest.java +++ b/independent-projects/tools/devtools-common/src/test/java/io/quarkus/platform/catalog/processor/ProcessedCategoryTest.java @@ -2,11 +2,13 @@ import static org.assertj.core.api.Assertions.assertThat; -import io.quarkus.registry.catalog.Category; -import io.quarkus.registry.catalog.Extension; import java.util.List; + import org.junit.jupiter.api.Test; +import io.quarkus.registry.catalog.Category; +import io.quarkus.registry.catalog.Extension; + class ProcessedCategoryTest { @Test diff --git a/independent-projects/tools/devtools-testing/src/main/java/io/quarkus/devtools/testing/FakeExtensionCatalog.java b/independent-projects/tools/devtools-testing/src/main/java/io/quarkus/devtools/testing/FakeExtensionCatalog.java index 623a132af768f..d03d08d91ece0 100644 --- a/independent-projects/tools/devtools-testing/src/main/java/io/quarkus/devtools/testing/FakeExtensionCatalog.java +++ b/independent-projects/tools/devtools-testing/src/main/java/io/quarkus/devtools/testing/FakeExtensionCatalog.java @@ -1,11 +1,12 @@ package io.quarkus.devtools.testing; -import io.quarkus.devtools.codestarts.quarkus.QuarkusCodestartCatalog; -import io.quarkus.registry.catalog.ExtensionCatalog; import java.io.IOException; import java.io.InputStream; import java.io.UncheckedIOException; +import io.quarkus.devtools.codestarts.quarkus.QuarkusCodestartCatalog; +import io.quarkus.registry.catalog.ExtensionCatalog; + public final class FakeExtensionCatalog { private static final String FAKE_EXTENSION_CATALOG_PATH = "/fake-catalog.json"; diff --git a/independent-projects/tools/devtools-testing/src/main/java/io/quarkus/devtools/testing/PlatformAwareTestBase.java b/independent-projects/tools/devtools-testing/src/main/java/io/quarkus/devtools/testing/PlatformAwareTestBase.java index 09e0b86a9c73e..0df745c109208 100644 --- a/independent-projects/tools/devtools-testing/src/main/java/io/quarkus/devtools/testing/PlatformAwareTestBase.java +++ b/independent-projects/tools/devtools-testing/src/main/java/io/quarkus/devtools/testing/PlatformAwareTestBase.java @@ -2,13 +2,15 @@ import static io.quarkus.devtools.project.CodestartResourceLoadersBuilder.getCodestartResourceLoaders; +import java.util.List; +import java.util.Properties; + +import org.junit.jupiter.api.extension.RegisterExtension; + import io.quarkus.devtools.project.QuarkusProjectHelper; import io.quarkus.platform.descriptor.loader.json.ResourceLoader; import io.quarkus.platform.tools.ToolsUtils; import io.quarkus.registry.catalog.ExtensionCatalog; -import java.util.List; -import java.util.Properties; -import org.junit.jupiter.api.extension.RegisterExtension; public class PlatformAwareTestBase { diff --git a/independent-projects/tools/devtools-testing/src/main/java/io/quarkus/devtools/testing/RegistryClientTestHelper.java b/independent-projects/tools/devtools-testing/src/main/java/io/quarkus/devtools/testing/RegistryClientTestHelper.java index d5bc3f8f97260..c708b5be43d61 100644 --- a/independent-projects/tools/devtools-testing/src/main/java/io/quarkus/devtools/testing/RegistryClientTestHelper.java +++ b/independent-projects/tools/devtools-testing/src/main/java/io/quarkus/devtools/testing/RegistryClientTestHelper.java @@ -1,14 +1,15 @@ package io.quarkus.devtools.testing; -import io.quarkus.devtools.project.QuarkusProjectHelper; -import io.quarkus.devtools.testing.registry.client.TestRegistryClientBuilder; -import io.quarkus.maven.dependency.ArtifactCoords; -import io.quarkus.registry.config.RegistriesConfigLocator; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; import java.util.Properties; +import io.quarkus.devtools.project.QuarkusProjectHelper; +import io.quarkus.devtools.testing.registry.client.TestRegistryClientBuilder; +import io.quarkus.maven.dependency.ArtifactCoords; +import io.quarkus.registry.config.RegistriesConfigLocator; + public class RegistryClientTestHelper { public static void enableRegistryClientTestConfig(String quarkusBomGroupId, String quarkusBomVersion) { diff --git a/independent-projects/tools/devtools-testing/src/main/java/io/quarkus/devtools/testing/SnapshotTesting.java b/independent-projects/tools/devtools-testing/src/main/java/io/quarkus/devtools/testing/SnapshotTesting.java index 6e19c702aa46b..bea70ac28e81c 100644 --- a/independent-projects/tools/devtools-testing/src/main/java/io/quarkus/devtools/testing/SnapshotTesting.java +++ b/independent-projects/tools/devtools-testing/src/main/java/io/quarkus/devtools/testing/SnapshotTesting.java @@ -3,9 +3,6 @@ import static java.util.stream.Collectors.toList; import static org.assertj.core.api.Assertions.assertThat; -import io.quarkus.paths.MultiRootPathTree; -import io.quarkus.paths.OpenPathTree; -import io.quarkus.paths.PathTree; import java.io.File; import java.io.IOException; import java.io.UncheckedIOException; @@ -20,12 +17,17 @@ import java.util.Optional; import java.util.function.Consumer; import java.util.function.Function; + import org.apache.commons.io.FileUtils; import org.assertj.core.api.AbstractPathAssert; import org.assertj.core.api.ListAssert; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.TestInfo; +import io.quarkus.paths.MultiRootPathTree; +import io.quarkus.paths.OpenPathTree; +import io.quarkus.paths.PathTree; + /** * Test file content and directory tree to make sure they are valid by comparing them to their snapshots. * The snapshots files can easily be updated when necessary and reviewed to confirm they are consistent with the changes. diff --git a/independent-projects/tools/devtools-testing/src/main/java/io/quarkus/devtools/testing/WrapperRunner.java b/independent-projects/tools/devtools-testing/src/main/java/io/quarkus/devtools/testing/WrapperRunner.java index f503b72eb5c00..770fd9a2e3e80 100644 --- a/independent-projects/tools/devtools-testing/src/main/java/io/quarkus/devtools/testing/WrapperRunner.java +++ b/independent-projects/tools/devtools-testing/src/main/java/io/quarkus/devtools/testing/WrapperRunner.java @@ -1,6 +1,5 @@ package io.quarkus.devtools.testing; -import io.quarkus.bootstrap.resolver.maven.options.BootstrapMavenOptions; import java.io.BufferedReader; import java.io.File; import java.io.IOException; @@ -18,6 +17,8 @@ import java.util.Locale; import java.util.concurrent.TimeUnit; +import io.quarkus.bootstrap.resolver.maven.options.BootstrapMavenOptions; + public final class WrapperRunner { public enum Wrapper { diff --git a/independent-projects/tools/devtools-testing/src/main/java/io/quarkus/devtools/testing/codestarts/QuarkusCodestartTest.java b/independent-projects/tools/devtools-testing/src/main/java/io/quarkus/devtools/testing/codestarts/QuarkusCodestartTest.java index 5c10abfd59555..985a14a5105ed 100644 --- a/independent-projects/tools/devtools-testing/src/main/java/io/quarkus/devtools/testing/codestarts/QuarkusCodestartTest.java +++ b/independent-projects/tools/devtools-testing/src/main/java/io/quarkus/devtools/testing/codestarts/QuarkusCodestartTest.java @@ -11,16 +11,6 @@ import static io.quarkus.devtools.testing.codestarts.QuarkusCodestartTesting.getMockedTestInputData; import static io.quarkus.devtools.testing.codestarts.QuarkusCodestartTesting.getRealTestInputData; -import io.quarkus.devtools.codestarts.quarkus.QuarkusCodestartCatalog; -import io.quarkus.devtools.codestarts.quarkus.QuarkusCodestartCatalog.Language; -import io.quarkus.devtools.codestarts.quarkus.QuarkusCodestartProjectInput; -import io.quarkus.devtools.project.BuildTool; -import io.quarkus.devtools.project.QuarkusProjectHelper; -import io.quarkus.devtools.testing.SnapshotTesting; -import io.quarkus.devtools.testing.WrapperRunner; -import io.quarkus.maven.dependency.ArtifactCoords; -import io.quarkus.platform.descriptor.loader.json.ResourceLoader; -import io.quarkus.registry.catalog.ExtensionCatalog; import java.io.IOException; import java.nio.file.Path; import java.nio.file.Paths; @@ -36,6 +26,7 @@ import java.util.function.Function; import java.util.stream.Collectors; import java.util.stream.Stream; + import org.assertj.core.api.AbstractPathAssert; import org.assertj.core.api.Assertions; import org.assertj.core.api.ListAssert; @@ -45,6 +36,17 @@ import org.junit.jupiter.api.extension.BeforeEachCallback; import org.junit.jupiter.api.extension.ExtensionContext; +import io.quarkus.devtools.codestarts.quarkus.QuarkusCodestartCatalog; +import io.quarkus.devtools.codestarts.quarkus.QuarkusCodestartCatalog.Language; +import io.quarkus.devtools.codestarts.quarkus.QuarkusCodestartProjectInput; +import io.quarkus.devtools.project.BuildTool; +import io.quarkus.devtools.project.QuarkusProjectHelper; +import io.quarkus.devtools.testing.SnapshotTesting; +import io.quarkus.devtools.testing.WrapperRunner; +import io.quarkus.maven.dependency.ArtifactCoords; +import io.quarkus.platform.descriptor.loader.json.ResourceLoader; +import io.quarkus.registry.catalog.ExtensionCatalog; + /** * This extension helps test a Quarkus extension codestart. It provides a way to test: *
    diff --git a/independent-projects/tools/devtools-testing/src/main/java/io/quarkus/devtools/testing/codestarts/QuarkusCodestartTestBuilder.java b/independent-projects/tools/devtools-testing/src/main/java/io/quarkus/devtools/testing/codestarts/QuarkusCodestartTestBuilder.java index 345c74bb325de..dd01c2fc77fb2 100644 --- a/independent-projects/tools/devtools-testing/src/main/java/io/quarkus/devtools/testing/codestarts/QuarkusCodestartTestBuilder.java +++ b/independent-projects/tools/devtools-testing/src/main/java/io/quarkus/devtools/testing/codestarts/QuarkusCodestartTestBuilder.java @@ -2,16 +2,6 @@ import static io.quarkus.platform.catalog.processor.ExtensionProcessor.getBuiltWithQuarkusCore; -import io.quarkus.devtools.codestarts.DataKey; -import io.quarkus.devtools.codestarts.quarkus.QuarkusCodestartCatalog; -import io.quarkus.devtools.codestarts.quarkus.QuarkusCodestartCatalog.Language; -import io.quarkus.devtools.project.BuildTool; -import io.quarkus.devtools.project.extensions.Extensions; -import io.quarkus.maven.dependency.ArtifactCoords; -import io.quarkus.maven.dependency.ArtifactKey; -import io.quarkus.platform.descriptor.loader.json.ResourceLoaders; -import io.quarkus.registry.catalog.Extension; -import io.quarkus.registry.catalog.ExtensionCatalog; import java.io.IOException; import java.io.UncheckedIOException; import java.net.URL; @@ -25,6 +15,17 @@ import java.util.Objects; import java.util.Set; +import io.quarkus.devtools.codestarts.DataKey; +import io.quarkus.devtools.codestarts.quarkus.QuarkusCodestartCatalog; +import io.quarkus.devtools.codestarts.quarkus.QuarkusCodestartCatalog.Language; +import io.quarkus.devtools.project.BuildTool; +import io.quarkus.devtools.project.extensions.Extensions; +import io.quarkus.maven.dependency.ArtifactCoords; +import io.quarkus.maven.dependency.ArtifactKey; +import io.quarkus.platform.descriptor.loader.json.ResourceLoaders; +import io.quarkus.registry.catalog.Extension; +import io.quarkus.registry.catalog.ExtensionCatalog; + /** * Builder for {@link QuarkusCodestartTest} */ diff --git a/independent-projects/tools/devtools-testing/src/main/java/io/quarkus/devtools/testing/codestarts/QuarkusCodestartTesting.java b/independent-projects/tools/devtools-testing/src/main/java/io/quarkus/devtools/testing/codestarts/QuarkusCodestartTesting.java index 77cd60e193f4a..4f86ced09d98a 100644 --- a/independent-projects/tools/devtools-testing/src/main/java/io/quarkus/devtools/testing/codestarts/QuarkusCodestartTesting.java +++ b/independent-projects/tools/devtools-testing/src/main/java/io/quarkus/devtools/testing/codestarts/QuarkusCodestartTesting.java @@ -2,17 +2,18 @@ import static io.quarkus.devtools.codestarts.quarkus.QuarkusCodestartData.QuarkusDataKey.*; -import io.quarkus.devtools.codestarts.quarkus.QuarkusCodestartData.QuarkusDataKey; -import io.quarkus.maven.dependency.ArtifactCoords; -import io.quarkus.platform.tools.ToolsConstants; -import io.quarkus.platform.tools.ToolsUtils; -import io.quarkus.registry.catalog.ExtensionCatalog; import java.util.Collection; import java.util.Collections; import java.util.HashMap; import java.util.Map; import java.util.Properties; +import io.quarkus.devtools.codestarts.quarkus.QuarkusCodestartData.QuarkusDataKey; +import io.quarkus.maven.dependency.ArtifactCoords; +import io.quarkus.platform.tools.ToolsConstants; +import io.quarkus.platform.tools.ToolsUtils; +import io.quarkus.registry.catalog.ExtensionCatalog; + public class QuarkusCodestartTesting { public static Collection getPlatformBoms() { diff --git a/independent-projects/tools/devtools-testing/src/main/java/io/quarkus/devtools/testing/registry/client/TestRegistryClient.java b/independent-projects/tools/devtools-testing/src/main/java/io/quarkus/devtools/testing/registry/client/TestRegistryClient.java index 94f85b220e3f7..ab1889a691e1b 100644 --- a/independent-projects/tools/devtools-testing/src/main/java/io/quarkus/devtools/testing/registry/client/TestRegistryClient.java +++ b/independent-projects/tools/devtools-testing/src/main/java/io/quarkus/devtools/testing/registry/client/TestRegistryClient.java @@ -1,5 +1,11 @@ package io.quarkus.devtools.testing.registry.client; +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; + +import org.eclipse.aether.artifact.DefaultArtifact; + import io.quarkus.bootstrap.resolver.maven.BootstrapMavenException; import io.quarkus.bootstrap.resolver.maven.MavenArtifactResolver; import io.quarkus.devtools.messagewriter.MessageWriter; @@ -12,10 +18,6 @@ import io.quarkus.registry.config.RegistriesConfigLocator; import io.quarkus.registry.config.RegistryConfig; import io.quarkus.registry.util.PlatformArtifacts; -import java.io.IOException; -import java.nio.file.Files; -import java.nio.file.Path; -import org.eclipse.aether.artifact.DefaultArtifact; public class TestRegistryClient implements RegistryClient { diff --git a/independent-projects/tools/devtools-testing/src/main/java/io/quarkus/devtools/testing/registry/client/TestRegistryClientBuilder.java b/independent-projects/tools/devtools-testing/src/main/java/io/quarkus/devtools/testing/registry/client/TestRegistryClientBuilder.java index 74663920eb08d..d0af9207e9072 100644 --- a/independent-projects/tools/devtools-testing/src/main/java/io/quarkus/devtools/testing/registry/client/TestRegistryClientBuilder.java +++ b/independent-projects/tools/devtools-testing/src/main/java/io/quarkus/devtools/testing/registry/client/TestRegistryClientBuilder.java @@ -1,5 +1,28 @@ package io.quarkus.devtools.testing.registry.client; +import java.io.BufferedWriter; +import java.io.IOException; +import java.io.UncheckedIOException; +import java.nio.file.FileSystem; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Properties; +import java.util.Set; +import java.util.StringJoiner; + +import org.apache.maven.model.Dependency; +import org.apache.maven.model.DependencyManagement; +import org.apache.maven.model.Model; +import org.eclipse.aether.artifact.DefaultArtifact; + import io.quarkus.bootstrap.BootstrapConstants; import io.quarkus.bootstrap.resolver.maven.BootstrapMavenContext; import io.quarkus.bootstrap.resolver.maven.BootstrapMavenException; @@ -26,27 +49,6 @@ import io.quarkus.registry.config.RegistryPlatformsConfig; import io.quarkus.registry.config.RegistryQuarkusVersionsConfig; import io.quarkus.registry.util.PlatformArtifacts; -import java.io.BufferedWriter; -import java.io.IOException; -import java.io.UncheckedIOException; -import java.nio.file.FileSystem; -import java.nio.file.Files; -import java.nio.file.Path; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.Properties; -import java.util.Set; -import java.util.StringJoiner; -import org.apache.maven.model.Dependency; -import org.apache.maven.model.DependencyManagement; -import org.apache.maven.model.Model; -import org.eclipse.aether.artifact.DefaultArtifact; public class TestRegistryClientBuilder { diff --git a/independent-projects/tools/devtools-testing/src/test/java/io/quarkus/devtools/codestarts/extension/QuarkusExtensionCodestartGenerationTest.java b/independent-projects/tools/devtools-testing/src/test/java/io/quarkus/devtools/codestarts/extension/QuarkusExtensionCodestartGenerationTest.java index 5a2e6f4eca0e0..0d32e3e9dcba5 100644 --- a/independent-projects/tools/devtools-testing/src/test/java/io/quarkus/devtools/codestarts/extension/QuarkusExtensionCodestartGenerationTest.java +++ b/independent-projects/tools/devtools-testing/src/test/java/io/quarkus/devtools/codestarts/extension/QuarkusExtensionCodestartGenerationTest.java @@ -2,15 +2,17 @@ import static io.quarkus.devtools.testing.SnapshotTesting.assertThatDirectoryTreeMatchSnapshots; -import io.quarkus.devtools.codestarts.extension.QuarkusExtensionCodestartCatalog.QuarkusExtensionData; -import io.quarkus.devtools.testing.SnapshotTesting; import java.io.IOException; import java.nio.file.Path; import java.nio.file.Paths; + import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInfo; +import io.quarkus.devtools.codestarts.extension.QuarkusExtensionCodestartCatalog.QuarkusExtensionData; +import io.quarkus.devtools.testing.SnapshotTesting; + class QuarkusExtensionCodestartGenerationTest { private static final Path testDirPath = Paths.get("target/extension-codestart-gen-test"); diff --git a/independent-projects/tools/devtools-testing/src/test/java/io/quarkus/devtools/codestarts/jbang/QuarkusJBangCodestartGenerationTest.java b/independent-projects/tools/devtools-testing/src/test/java/io/quarkus/devtools/codestarts/jbang/QuarkusJBangCodestartGenerationTest.java index 4c36f4f26dbe4..89630945bdbce 100644 --- a/independent-projects/tools/devtools-testing/src/test/java/io/quarkus/devtools/codestarts/jbang/QuarkusJBangCodestartGenerationTest.java +++ b/independent-projects/tools/devtools-testing/src/test/java/io/quarkus/devtools/codestarts/jbang/QuarkusJBangCodestartGenerationTest.java @@ -6,16 +6,18 @@ import static io.quarkus.devtools.testing.SnapshotTesting.assertThatDirectoryTreeMatchSnapshots; import static io.quarkus.devtools.testing.SnapshotTesting.assertThatMatchSnapshot; -import io.quarkus.devtools.codestarts.utils.NestedMaps; -import io.quarkus.devtools.testing.SnapshotTesting; import java.io.IOException; import java.nio.file.Path; import java.nio.file.Paths; import java.util.Map; + import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInfo; +import io.quarkus.devtools.codestarts.utils.NestedMaps; +import io.quarkus.devtools.testing.SnapshotTesting; + class QuarkusJBangCodestartGenerationTest { private static final Path testDirPath = Paths.get("target/jbang-codestart-gen-test"); diff --git a/independent-projects/tools/devtools-testing/src/test/java/io/quarkus/devtools/codestarts/quarkus/QuarkusCodestartCatalogTest.java b/independent-projects/tools/devtools-testing/src/test/java/io/quarkus/devtools/codestarts/quarkus/QuarkusCodestartCatalogTest.java index ab251811ec53c..848146a408d72 100644 --- a/independent-projects/tools/devtools-testing/src/test/java/io/quarkus/devtools/codestarts/quarkus/QuarkusCodestartCatalogTest.java +++ b/independent-projects/tools/devtools-testing/src/test/java/io/quarkus/devtools/codestarts/quarkus/QuarkusCodestartCatalogTest.java @@ -3,17 +3,19 @@ import static io.quarkus.devtools.testing.FakeExtensionCatalog.FAKE_QUARKUS_CODESTART_CATALOG; import static org.assertj.core.api.Assertions.assertThat; +import java.io.IOException; +import java.nio.file.Path; +import java.nio.file.Paths; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + import io.quarkus.devtools.codestarts.Codestart; import io.quarkus.devtools.codestarts.CodestartProjectDefinition; import io.quarkus.devtools.codestarts.CodestartType; import io.quarkus.devtools.project.BuildTool; import io.quarkus.devtools.testing.SnapshotTesting; import io.quarkus.maven.dependency.ArtifactKey; -import java.io.IOException; -import java.nio.file.Path; -import java.nio.file.Paths; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; class QuarkusCodestartCatalogTest { diff --git a/independent-projects/tools/devtools-testing/src/test/java/io/quarkus/devtools/codestarts/quarkus/QuarkusCodestartGenerationTest.java b/independent-projects/tools/devtools-testing/src/test/java/io/quarkus/devtools/codestarts/quarkus/QuarkusCodestartGenerationTest.java index f173f39153d31..b0a167d704e74 100644 --- a/independent-projects/tools/devtools-testing/src/test/java/io/quarkus/devtools/codestarts/quarkus/QuarkusCodestartGenerationTest.java +++ b/independent-projects/tools/devtools-testing/src/test/java/io/quarkus/devtools/codestarts/quarkus/QuarkusCodestartGenerationTest.java @@ -9,19 +9,21 @@ import static io.quarkus.devtools.testing.SnapshotTesting.checkNotContains; import static org.assertj.core.api.Assertions.assertThat; -import io.quarkus.devtools.project.BuildTool; -import io.quarkus.devtools.testing.SnapshotTesting; -import io.quarkus.devtools.testing.codestarts.QuarkusCodestartTesting; -import io.quarkus.maven.dependency.ArtifactCoords; -import io.quarkus.maven.dependency.ArtifactKey; import java.nio.file.Path; import java.nio.file.Paths; import java.util.Collections; import java.util.Map; + import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInfo; +import io.quarkus.devtools.project.BuildTool; +import io.quarkus.devtools.testing.SnapshotTesting; +import io.quarkus.devtools.testing.codestarts.QuarkusCodestartTesting; +import io.quarkus.maven.dependency.ArtifactCoords; +import io.quarkus.maven.dependency.ArtifactKey; + class QuarkusCodestartGenerationTest { private static final Path testDirPath = Paths.get("target/quarkus-codestart-gen-test"); diff --git a/independent-projects/tools/devtools-testing/src/test/java/io/quarkus/devtools/codestarts/quarkus/RESTEasyCodestartTest.java b/independent-projects/tools/devtools-testing/src/test/java/io/quarkus/devtools/codestarts/quarkus/RESTEasyCodestartTest.java index 59117f986e0b8..43e56f92d5039 100644 --- a/independent-projects/tools/devtools-testing/src/test/java/io/quarkus/devtools/codestarts/quarkus/RESTEasyCodestartTest.java +++ b/independent-projects/tools/devtools-testing/src/test/java/io/quarkus/devtools/codestarts/quarkus/RESTEasyCodestartTest.java @@ -6,10 +6,11 @@ import static io.quarkus.devtools.testing.FakeExtensionCatalog.FAKE_EXTENSION_CATALOG; import static io.quarkus.devtools.testing.FakeExtensionCatalog.FAKE_QUARKUS_CODESTART_CATALOG; -import io.quarkus.devtools.testing.codestarts.QuarkusCodestartTest; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.devtools.testing.codestarts.QuarkusCodestartTest; + class RESTEasyCodestartTest { @RegisterExtension diff --git a/independent-projects/tools/devtools-testing/src/test/java/io/quarkus/devtools/codestarts/quarkus/RESTEasyReactiveCodestartTest.java b/independent-projects/tools/devtools-testing/src/test/java/io/quarkus/devtools/codestarts/quarkus/RESTEasyReactiveCodestartTest.java index b1b74f84e00d3..988501871706d 100644 --- a/independent-projects/tools/devtools-testing/src/test/java/io/quarkus/devtools/codestarts/quarkus/RESTEasyReactiveCodestartTest.java +++ b/independent-projects/tools/devtools-testing/src/test/java/io/quarkus/devtools/codestarts/quarkus/RESTEasyReactiveCodestartTest.java @@ -6,10 +6,11 @@ import static io.quarkus.devtools.testing.FakeExtensionCatalog.FAKE_EXTENSION_CATALOG; import static io.quarkus.devtools.testing.FakeExtensionCatalog.FAKE_QUARKUS_CODESTART_CATALOG; -import io.quarkus.devtools.testing.codestarts.QuarkusCodestartTest; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.devtools.testing.codestarts.QuarkusCodestartTest; + class RESTEasyReactiveCodestartTest { @RegisterExtension diff --git a/independent-projects/tools/devtools-testing/src/test/java/io/quarkus/devtools/codestarts/quarkus/SpringWebCodestartTest.java b/independent-projects/tools/devtools-testing/src/test/java/io/quarkus/devtools/codestarts/quarkus/SpringWebCodestartTest.java index ba4dd08e4f8cb..2d3771ac81152 100644 --- a/independent-projects/tools/devtools-testing/src/test/java/io/quarkus/devtools/codestarts/quarkus/SpringWebCodestartTest.java +++ b/independent-projects/tools/devtools-testing/src/test/java/io/quarkus/devtools/codestarts/quarkus/SpringWebCodestartTest.java @@ -6,10 +6,11 @@ import static io.quarkus.devtools.testing.FakeExtensionCatalog.FAKE_EXTENSION_CATALOG; import static io.quarkus.devtools.testing.FakeExtensionCatalog.FAKE_QUARKUS_CODESTART_CATALOG; -import io.quarkus.devtools.testing.codestarts.QuarkusCodestartTest; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.devtools.testing.codestarts.QuarkusCodestartTest; + class SpringWebCodestartTest { @RegisterExtension diff --git a/independent-projects/tools/devtools-testing/src/test/java/io/quarkus/devtools/project/create/ArchivedStreamTest.java b/independent-projects/tools/devtools-testing/src/test/java/io/quarkus/devtools/project/create/ArchivedStreamTest.java index a8108f8e03411..7e23afff22785 100644 --- a/independent-projects/tools/devtools-testing/src/test/java/io/quarkus/devtools/project/create/ArchivedStreamTest.java +++ b/independent-projects/tools/devtools-testing/src/test/java/io/quarkus/devtools/project/create/ArchivedStreamTest.java @@ -1,13 +1,15 @@ package io.quarkus.devtools.project.create; -import io.quarkus.devtools.testing.registry.client.TestRegistryClientBuilder; -import io.quarkus.maven.dependency.ArtifactCoords; -import io.quarkus.registry.catalog.PlatformStreamCoords; import java.nio.file.Path; import java.util.List; + import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; +import io.quarkus.devtools.testing.registry.client.TestRegistryClientBuilder; +import io.quarkus.maven.dependency.ArtifactCoords; +import io.quarkus.registry.catalog.PlatformStreamCoords; + public class ArchivedStreamTest extends MultiplePlatformBomsTestBase { private static final String PLATFORM_KEY = "io.test.platform"; diff --git a/independent-projects/tools/devtools-testing/src/test/java/io/quarkus/devtools/project/create/ExtensionCatalogFromProvidedPlatformsTest.java b/independent-projects/tools/devtools-testing/src/test/java/io/quarkus/devtools/project/create/ExtensionCatalogFromProvidedPlatformsTest.java index b8c79911f47d8..172e8e7a277ca 100644 --- a/independent-projects/tools/devtools-testing/src/test/java/io/quarkus/devtools/project/create/ExtensionCatalogFromProvidedPlatformsTest.java +++ b/independent-projects/tools/devtools-testing/src/test/java/io/quarkus/devtools/project/create/ExtensionCatalogFromProvidedPlatformsTest.java @@ -2,22 +2,24 @@ import static org.assertj.core.api.Assertions.assertThat; -import io.quarkus.bootstrap.resolver.maven.workspace.ModelUtils; -import io.quarkus.devtools.testing.registry.client.TestRegistryClientBuilder; -import io.quarkus.maven.dependency.ArtifactCoords; -import io.quarkus.registry.ExtensionCatalogResolver; -import io.quarkus.registry.catalog.ExtensionCatalog; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; import java.util.Collections; import java.util.stream.Collectors; + import org.apache.maven.model.Dependency; import org.apache.maven.model.Model; import org.assertj.core.util.Arrays; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; +import io.quarkus.bootstrap.resolver.maven.workspace.ModelUtils; +import io.quarkus.devtools.testing.registry.client.TestRegistryClientBuilder; +import io.quarkus.maven.dependency.ArtifactCoords; +import io.quarkus.registry.ExtensionCatalogResolver; +import io.quarkus.registry.catalog.ExtensionCatalog; + public class ExtensionCatalogFromProvidedPlatformsTest extends MultiplePlatformBomsTestBase { private static final String MAIN_PLATFORM_KEY = "org.acme.platform"; diff --git a/independent-projects/tools/devtools-testing/src/test/java/io/quarkus/devtools/project/create/ExtensionsAppearingInPlatformAndNonPlatformCatalogsTest.java b/independent-projects/tools/devtools-testing/src/test/java/io/quarkus/devtools/project/create/ExtensionsAppearingInPlatformAndNonPlatformCatalogsTest.java index 8bbe4bd9ace10..43aff9a5c4224 100644 --- a/independent-projects/tools/devtools-testing/src/test/java/io/quarkus/devtools/project/create/ExtensionsAppearingInPlatformAndNonPlatformCatalogsTest.java +++ b/independent-projects/tools/devtools-testing/src/test/java/io/quarkus/devtools/project/create/ExtensionsAppearingInPlatformAndNonPlatformCatalogsTest.java @@ -2,23 +2,25 @@ import static org.assertj.core.api.Assertions.assertThat; -import io.quarkus.devtools.commands.CreateProject; -import io.quarkus.devtools.project.BuildTool; -import io.quarkus.devtools.project.QuarkusProject; -import io.quarkus.devtools.project.QuarkusProjectHelper; -import io.quarkus.devtools.testing.registry.client.TestRegistryClientBuilder; -import io.quarkus.maven.dependency.ArtifactCoords; -import io.quarkus.registry.catalog.ExtensionCatalog; -import io.quarkus.registry.catalog.ExtensionOrigin; import java.nio.file.Path; import java.util.ArrayList; import java.util.Arrays; import java.util.HashSet; import java.util.List; import java.util.Set; + import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; +import io.quarkus.devtools.commands.CreateProject; +import io.quarkus.devtools.project.BuildTool; +import io.quarkus.devtools.project.QuarkusProject; +import io.quarkus.devtools.project.QuarkusProjectHelper; +import io.quarkus.devtools.testing.registry.client.TestRegistryClientBuilder; +import io.quarkus.maven.dependency.ArtifactCoords; +import io.quarkus.registry.catalog.ExtensionCatalog; +import io.quarkus.registry.catalog.ExtensionOrigin; + /** * The catalogs used in this test do not clearly separate platform from non-platform extensions. * Which should not be happening in the reality but still may happen because of an oversight or something. diff --git a/independent-projects/tools/devtools-testing/src/test/java/io/quarkus/devtools/project/create/MavenProjectImportingMultipleBomsFromMultiplePlatformsTest.java b/independent-projects/tools/devtools-testing/src/test/java/io/quarkus/devtools/project/create/MavenProjectImportingMultipleBomsFromMultiplePlatformsTest.java index 232caabe23ee1..bc4ece76933dd 100644 --- a/independent-projects/tools/devtools-testing/src/test/java/io/quarkus/devtools/project/create/MavenProjectImportingMultipleBomsFromMultiplePlatformsTest.java +++ b/independent-projects/tools/devtools-testing/src/test/java/io/quarkus/devtools/project/create/MavenProjectImportingMultipleBomsFromMultiplePlatformsTest.java @@ -1,13 +1,15 @@ package io.quarkus.devtools.project.create; -import io.quarkus.devtools.testing.registry.client.TestRegistryClientBuilder; -import io.quarkus.maven.dependency.ArtifactCoords; import java.nio.file.Path; import java.util.Arrays; import java.util.List; + import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; +import io.quarkus.devtools.testing.registry.client.TestRegistryClientBuilder; +import io.quarkus.maven.dependency.ArtifactCoords; + public class MavenProjectImportingMultipleBomsFromMultiplePlatformsTest extends MultiplePlatformBomsTestBase { private static final String MAIN_PLATFORM_KEY = "io.other.platform"; diff --git a/independent-projects/tools/devtools-testing/src/test/java/io/quarkus/devtools/project/create/MavenProjectImportingMultipleBomsFromSinglePlatformTest.java b/independent-projects/tools/devtools-testing/src/test/java/io/quarkus/devtools/project/create/MavenProjectImportingMultipleBomsFromSinglePlatformTest.java index 2228089fac652..52e337e57c4b8 100644 --- a/independent-projects/tools/devtools-testing/src/test/java/io/quarkus/devtools/project/create/MavenProjectImportingMultipleBomsFromSinglePlatformTest.java +++ b/independent-projects/tools/devtools-testing/src/test/java/io/quarkus/devtools/project/create/MavenProjectImportingMultipleBomsFromSinglePlatformTest.java @@ -2,23 +2,25 @@ import static org.assertj.core.api.Assertions.assertThat; -import io.quarkus.devtools.commands.CreateProject; -import io.quarkus.devtools.project.BuildTool; -import io.quarkus.devtools.project.QuarkusProject; -import io.quarkus.devtools.project.QuarkusProjectHelper; -import io.quarkus.devtools.testing.registry.client.TestRegistryClientBuilder; -import io.quarkus.maven.dependency.ArtifactCoords; -import io.quarkus.registry.catalog.ExtensionCatalog; -import io.quarkus.registry.catalog.ExtensionOrigin; import java.nio.file.Path; import java.util.ArrayList; import java.util.Arrays; import java.util.HashSet; import java.util.List; import java.util.Set; + import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; +import io.quarkus.devtools.commands.CreateProject; +import io.quarkus.devtools.project.BuildTool; +import io.quarkus.devtools.project.QuarkusProject; +import io.quarkus.devtools.project.QuarkusProjectHelper; +import io.quarkus.devtools.testing.registry.client.TestRegistryClientBuilder; +import io.quarkus.maven.dependency.ArtifactCoords; +import io.quarkus.registry.catalog.ExtensionCatalog; +import io.quarkus.registry.catalog.ExtensionOrigin; + public class MavenProjectImportingMultipleBomsFromSinglePlatformTest extends MultiplePlatformBomsTestBase { private static final String MAIN_PLATFORM_KEY = "org.acme.platform"; diff --git a/independent-projects/tools/devtools-testing/src/test/java/io/quarkus/devtools/project/create/MultiplePlatformBomsTestBase.java b/independent-projects/tools/devtools-testing/src/test/java/io/quarkus/devtools/project/create/MultiplePlatformBomsTestBase.java index cb576db18c5b4..075cba1594506 100644 --- a/independent-projects/tools/devtools-testing/src/test/java/io/quarkus/devtools/project/create/MultiplePlatformBomsTestBase.java +++ b/independent-projects/tools/devtools-testing/src/test/java/io/quarkus/devtools/project/create/MultiplePlatformBomsTestBase.java @@ -2,6 +2,20 @@ import static org.assertj.core.api.Assertions.assertThat; +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashSet; +import java.util.List; +import java.util.stream.Collectors; + +import org.apache.maven.model.Model; +import org.apache.maven.model.Repository; +import org.junit.jupiter.api.AfterAll; + import io.quarkus.bootstrap.resolver.maven.workspace.ModelUtils; import io.quarkus.bootstrap.util.IoUtils; import io.quarkus.devtools.commands.AddExtensions; @@ -16,18 +30,6 @@ import io.quarkus.registry.RegistryResolutionException; import io.quarkus.registry.catalog.PlatformStreamCoords; import io.quarkus.registry.config.RegistriesConfigLocator; -import java.io.IOException; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.Paths; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashSet; -import java.util.List; -import java.util.stream.Collectors; -import org.apache.maven.model.Model; -import org.apache.maven.model.Repository; -import org.junit.jupiter.api.AfterAll; public abstract class MultiplePlatformBomsTestBase { diff --git a/independent-projects/tools/devtools-testing/src/test/java/io/quarkus/devtools/project/create/QuarkusPlatformReferencingArchivedUpstreamVersionTest.java b/independent-projects/tools/devtools-testing/src/test/java/io/quarkus/devtools/project/create/QuarkusPlatformReferencingArchivedUpstreamVersionTest.java index 74e419cab050f..8e48c3b487769 100644 --- a/independent-projects/tools/devtools-testing/src/test/java/io/quarkus/devtools/project/create/QuarkusPlatformReferencingArchivedUpstreamVersionTest.java +++ b/independent-projects/tools/devtools-testing/src/test/java/io/quarkus/devtools/project/create/QuarkusPlatformReferencingArchivedUpstreamVersionTest.java @@ -1,14 +1,16 @@ package io.quarkus.devtools.project.create; -import io.quarkus.devtools.testing.registry.client.TestRegistryClientBuilder; -import io.quarkus.maven.dependency.ArtifactCoords; -import io.quarkus.registry.catalog.PlatformStreamCoords; import java.nio.file.Path; import java.util.Arrays; import java.util.List; + import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; +import io.quarkus.devtools.testing.registry.client.TestRegistryClientBuilder; +import io.quarkus.maven.dependency.ArtifactCoords; +import io.quarkus.registry.catalog.PlatformStreamCoords; + public class QuarkusPlatformReferencingArchivedUpstreamVersionTest extends MultiplePlatformBomsTestBase { private static final String DOWNSTREAM_PLATFORM_KEY = "io.downstream.platform"; diff --git a/independent-projects/tools/devtools-testing/src/test/java/io/quarkus/devtools/project/create/QuarkusPlatformReferencingUpstreamVersionTest.java b/independent-projects/tools/devtools-testing/src/test/java/io/quarkus/devtools/project/create/QuarkusPlatformReferencingUpstreamVersionTest.java index 093d7225f0f3c..43bf9dd197bbe 100644 --- a/independent-projects/tools/devtools-testing/src/test/java/io/quarkus/devtools/project/create/QuarkusPlatformReferencingUpstreamVersionTest.java +++ b/independent-projects/tools/devtools-testing/src/test/java/io/quarkus/devtools/project/create/QuarkusPlatformReferencingUpstreamVersionTest.java @@ -1,13 +1,15 @@ package io.quarkus.devtools.project.create; -import io.quarkus.devtools.testing.registry.client.TestRegistryClientBuilder; -import io.quarkus.maven.dependency.ArtifactCoords; import java.nio.file.Path; import java.util.Arrays; import java.util.List; + import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; +import io.quarkus.devtools.testing.registry.client.TestRegistryClientBuilder; +import io.quarkus.maven.dependency.ArtifactCoords; + public class QuarkusPlatformReferencingUpstreamVersionTest extends MultiplePlatformBomsTestBase { private static final String DOWNSTREAM_PLATFORM_KEY = "io.downstream.platform"; diff --git a/independent-projects/tools/devtools-testing/src/test/java/io/quarkus/devtools/project/create/UpstreamStreamCoordsWithNullPlatformKeyTest.java b/independent-projects/tools/devtools-testing/src/test/java/io/quarkus/devtools/project/create/UpstreamStreamCoordsWithNullPlatformKeyTest.java index feb799735c9ab..414f05ae45e83 100644 --- a/independent-projects/tools/devtools-testing/src/test/java/io/quarkus/devtools/project/create/UpstreamStreamCoordsWithNullPlatformKeyTest.java +++ b/independent-projects/tools/devtools-testing/src/test/java/io/quarkus/devtools/project/create/UpstreamStreamCoordsWithNullPlatformKeyTest.java @@ -1,13 +1,15 @@ package io.quarkus.devtools.project.create; -import io.quarkus.devtools.testing.registry.client.TestRegistryClientBuilder; -import io.quarkus.maven.dependency.ArtifactCoords; -import io.quarkus.registry.catalog.PlatformStreamCoords; import java.nio.file.Path; import java.util.List; + import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; +import io.quarkus.devtools.testing.registry.client.TestRegistryClientBuilder; +import io.quarkus.maven.dependency.ArtifactCoords; +import io.quarkus.registry.catalog.PlatformStreamCoords; + public class UpstreamStreamCoordsWithNullPlatformKeyTest extends MultiplePlatformBomsTestBase { private static final String DOWNSTREAM_PLATFORM_KEY = "io.downstream.platform"; diff --git a/independent-projects/tools/pom.xml b/independent-projects/tools/pom.xml index 0fc166cbc22a1..b7f805aef06ee 100644 --- a/independent-projects/tools/pom.xml +++ b/independent-projects/tools/pom.xml @@ -305,8 +305,10 @@ .cache/impsort-maven-plugin-${impsort-maven-plugin.version} - true + java.,javax.,jakarta.,org.,com. + * ${format.skip} + true diff --git a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/CatalogMergeUtility.java b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/CatalogMergeUtility.java index d6b9c21c49b7f..e4f3bb3be8a66 100644 --- a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/CatalogMergeUtility.java +++ b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/CatalogMergeUtility.java @@ -1,5 +1,13 @@ package io.quarkus.registry; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; + import io.quarkus.maven.dependency.ArtifactKey; import io.quarkus.registry.catalog.Category; import io.quarkus.registry.catalog.Extension; @@ -10,13 +18,6 @@ import io.quarkus.registry.catalog.PlatformRelease; import io.quarkus.registry.catalog.PlatformStream; import io.quarkus.registry.json.JsonBuilder; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.HashSet; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; /** * Utility for merging catalog data. diff --git a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/ExtensionCatalogResolver.java b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/ExtensionCatalogResolver.java index 71e3048c5a795..ce568498fc92d 100644 --- a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/ExtensionCatalogResolver.java +++ b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/ExtensionCatalogResolver.java @@ -1,5 +1,25 @@ package io.quarkus.registry; +import java.io.File; +import java.net.MalformedURLException; +import java.net.URL; +import java.net.URLClassLoader; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.ServiceLoader; +import java.util.Set; +import java.util.function.Function; + +import org.eclipse.aether.artifact.DefaultArtifact; + import io.quarkus.bootstrap.resolver.maven.BootstrapMavenException; import io.quarkus.bootstrap.resolver.maven.MavenArtifactResolver; import io.quarkus.devtools.messagewriter.MessageWriter; @@ -20,24 +40,6 @@ import io.quarkus.registry.config.RegistriesConfigLocator; import io.quarkus.registry.config.RegistryConfig; import io.quarkus.registry.util.PlatformArtifacts; -import java.io.File; -import java.net.MalformedURLException; -import java.net.URL; -import java.net.URLClassLoader; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.ServiceLoader; -import java.util.Set; -import java.util.function.Function; -import org.eclipse.aether.artifact.DefaultArtifact; public class ExtensionCatalogResolver { diff --git a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/RegistryExtensionResolver.java b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/RegistryExtensionResolver.java index 62c252ef028c4..fa85265a2a834 100644 --- a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/RegistryExtensionResolver.java +++ b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/RegistryExtensionResolver.java @@ -1,5 +1,10 @@ package io.quarkus.registry; +import java.util.Collection; +import java.util.Collections; +import java.util.Objects; +import java.util.regex.Pattern; + import io.quarkus.devtools.messagewriter.MessageWriter; import io.quarkus.maven.dependency.ArtifactCoords; import io.quarkus.registry.catalog.ExtensionCatalog; @@ -8,10 +13,6 @@ import io.quarkus.registry.client.RegistryClient; import io.quarkus.registry.config.RegistryConfig; import io.quarkus.util.GlobUtil; -import java.util.Collection; -import java.util.Collections; -import java.util.Objects; -import java.util.regex.Pattern; class RegistryExtensionResolver { diff --git a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/CatalogMapperHelper.java b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/CatalogMapperHelper.java index d838b89fc86fa..15c5ef2ccc489 100644 --- a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/CatalogMapperHelper.java +++ b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/CatalogMapperHelper.java @@ -1,13 +1,5 @@ package io.quarkus.registry.catalog; -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.databind.DeserializationFeature; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.PropertyNamingStrategies; -import com.fasterxml.jackson.databind.SerializationFeature; -import com.fasterxml.jackson.dataformat.yaml.YAMLFactory; -import io.quarkus.maven.dependency.ArtifactCoords; -import io.quarkus.registry.json.JsonArtifactCoordsMixin; import java.io.BufferedReader; import java.io.BufferedWriter; import java.io.IOException; @@ -17,6 +9,16 @@ import java.nio.file.Files; import java.nio.file.Path; +import com.fasterxml.jackson.core.JsonParser; +import com.fasterxml.jackson.databind.DeserializationFeature; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.PropertyNamingStrategies; +import com.fasterxml.jackson.databind.SerializationFeature; +import com.fasterxml.jackson.dataformat.yaml.YAMLFactory; + +import io.quarkus.maven.dependency.ArtifactCoords; +import io.quarkus.registry.json.JsonArtifactCoordsMixin; + public class CatalogMapperHelper { private static ObjectMapper mapper; diff --git a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/Category.java b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/Category.java index eeb2a6fd801f3..7f9d48bad8edf 100644 --- a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/Category.java +++ b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/Category.java @@ -1,8 +1,9 @@ package io.quarkus.registry.catalog; -import io.quarkus.registry.json.JsonBuilder; import java.util.Map; +import io.quarkus.registry.json.JsonBuilder; + public interface Category { String MD_PINNED = "pinned"; diff --git a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/CategoryImpl.java b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/CategoryImpl.java index 9b5029dc7181d..039e437091de9 100644 --- a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/CategoryImpl.java +++ b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/CategoryImpl.java @@ -1,12 +1,14 @@ package io.quarkus.registry.catalog; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import io.quarkus.registry.json.JsonBuilder; import java.util.HashMap; import java.util.Map; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; + +import io.quarkus.registry.json.JsonBuilder; + /** * Asymmetric data manipulation: * Deserialization always uses the builder; diff --git a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/Extension.java b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/Extension.java index d1e1cabc05bb8..c0a6c0c1dff1f 100644 --- a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/Extension.java +++ b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/Extension.java @@ -1,12 +1,13 @@ package io.quarkus.registry.catalog; -import io.quarkus.maven.dependency.ArtifactCoords; -import io.quarkus.registry.json.JsonBuilder; import java.io.IOException; import java.nio.file.Path; import java.util.List; import java.util.Map; +import io.quarkus.maven.dependency.ArtifactCoords; +import io.quarkus.registry.json.JsonBuilder; + public interface Extension { String MD_SHORT_NAME = "short-name"; diff --git a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/ExtensionCatalog.java b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/ExtensionCatalog.java index e10f11fc3318c..2bcdb7eef419a 100644 --- a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/ExtensionCatalog.java +++ b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/ExtensionCatalog.java @@ -1,6 +1,5 @@ package io.quarkus.registry.catalog; -import io.quarkus.maven.dependency.ArtifactCoords; import java.io.IOException; import java.io.InputStream; import java.nio.file.Path; @@ -8,6 +7,8 @@ import java.util.List; import java.util.Map; +import io.quarkus.maven.dependency.ArtifactCoords; + public interface ExtensionCatalog extends ExtensionOrigin { /** diff --git a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/ExtensionCatalogImpl.java b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/ExtensionCatalogImpl.java index c9175df1a156e..e5999bece0c83 100644 --- a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/ExtensionCatalogImpl.java +++ b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/ExtensionCatalogImpl.java @@ -1,11 +1,5 @@ package io.quarkus.registry.catalog; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.quarkus.maven.dependency.ArtifactCoords; -import io.quarkus.registry.json.JsonBuilder; import java.io.InputStream; import java.nio.file.Path; import java.util.ArrayList; @@ -13,6 +7,14 @@ import java.util.List; import java.util.Map; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; + +import io.quarkus.maven.dependency.ArtifactCoords; +import io.quarkus.registry.json.JsonBuilder; + /** * Asymmetric data manipulation: * Deserialization always uses the builder; diff --git a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/ExtensionImpl.java b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/ExtensionImpl.java index 631226ad7bda8..8a3091985596a 100644 --- a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/ExtensionImpl.java +++ b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/ExtensionImpl.java @@ -1,12 +1,5 @@ package io.quarkus.registry.catalog; -import com.fasterxml.jackson.annotation.JsonIdentityReference; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import io.quarkus.maven.dependency.ArtifactCoords; -import io.quarkus.registry.json.JsonBuilder; import java.io.IOException; import java.nio.file.Path; import java.util.ArrayList; @@ -17,6 +10,15 @@ import java.util.Objects; import java.util.stream.Collectors; +import com.fasterxml.jackson.annotation.JsonIdentityReference; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; + +import io.quarkus.maven.dependency.ArtifactCoords; +import io.quarkus.registry.json.JsonBuilder; + /** * Asymmetric data manipulation: * Deserialization always uses the builder; diff --git a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/ExtensionOrigin.java b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/ExtensionOrigin.java index 07ab04c24ed96..cfc9f1597c428 100644 --- a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/ExtensionOrigin.java +++ b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/ExtensionOrigin.java @@ -1,8 +1,9 @@ package io.quarkus.registry.catalog; +import java.util.Map; + import io.quarkus.maven.dependency.ArtifactCoords; import io.quarkus.registry.json.JsonBuilder; -import java.util.Map; public interface ExtensionOrigin { diff --git a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/ExtensionOriginImpl.java b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/ExtensionOriginImpl.java index f9702d8105a58..cec366c192ec6 100644 --- a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/ExtensionOriginImpl.java +++ b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/ExtensionOriginImpl.java @@ -1,15 +1,17 @@ package io.quarkus.registry.catalog; +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; +import java.util.Objects; + import com.fasterxml.jackson.annotation.JsonIdentityInfo; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.ObjectIdGenerators; + import io.quarkus.maven.dependency.ArtifactCoords; import io.quarkus.registry.json.JsonBuilder; -import java.util.Collections; -import java.util.HashMap; -import java.util.Map; -import java.util.Objects; /** * Asymmetric data manipulation: diff --git a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/Platform.java b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/Platform.java index 949fc02c79d58..905f1ee62e0ab 100644 --- a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/Platform.java +++ b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/Platform.java @@ -1,10 +1,12 @@ package io.quarkus.registry.catalog; -import com.fasterxml.jackson.annotation.JsonIgnore; -import io.quarkus.registry.json.JsonBuilder; import java.util.Collection; import java.util.Map; +import com.fasterxml.jackson.annotation.JsonIgnore; + +import io.quarkus.registry.json.JsonBuilder; + public interface Platform { String getPlatformKey(); diff --git a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/PlatformCatalog.java b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/PlatformCatalog.java index 1245712322798..8bf032bc842b0 100644 --- a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/PlatformCatalog.java +++ b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/PlatformCatalog.java @@ -1,12 +1,14 @@ package io.quarkus.registry.catalog; -import com.fasterxml.jackson.annotation.JsonIgnore; -import io.quarkus.registry.json.JsonBuilder; import java.io.IOException; import java.nio.file.Path; import java.util.Collection; import java.util.Map; +import com.fasterxml.jackson.annotation.JsonIgnore; + +import io.quarkus.registry.json.JsonBuilder; + public interface PlatformCatalog { Collection getPlatforms(); diff --git a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/PlatformCatalogImpl.java b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/PlatformCatalogImpl.java index 9db8287e28151..3ab3c4cfef260 100644 --- a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/PlatformCatalogImpl.java +++ b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/PlatformCatalogImpl.java @@ -1,11 +1,5 @@ package io.quarkus.registry.catalog; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import io.quarkus.registry.json.JsonBuilder; -import io.quarkus.registry.json.JsonEntityWithAnySupport; import java.nio.file.Path; import java.util.Collection; import java.util.Collections; @@ -13,6 +7,14 @@ import java.util.Map; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; + +import io.quarkus.registry.json.JsonBuilder; +import io.quarkus.registry.json.JsonEntityWithAnySupport; + /** * Asymmetric data manipulation: * Deserialization always uses the builder; diff --git a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/PlatformImpl.java b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/PlatformImpl.java index db5dce97e2624..c48d183bb791a 100644 --- a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/PlatformImpl.java +++ b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/PlatformImpl.java @@ -1,16 +1,18 @@ package io.quarkus.registry.catalog; +import java.util.Collection; +import java.util.Collections; +import java.util.LinkedHashMap; +import java.util.Map; +import java.util.Objects; + import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; + import io.quarkus.registry.json.JsonBuilder; import io.quarkus.registry.json.JsonEntityWithAnySupport; -import java.util.Collection; -import java.util.Collections; -import java.util.LinkedHashMap; -import java.util.Map; -import java.util.Objects; /** * Asymmetric data manipulation: diff --git a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/PlatformRelease.java b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/PlatformRelease.java index 589b51e1c8113..c9e677e1be1ec 100644 --- a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/PlatformRelease.java +++ b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/PlatformRelease.java @@ -1,10 +1,11 @@ package io.quarkus.registry.catalog; -import io.quarkus.maven.dependency.ArtifactCoords; -import io.quarkus.registry.json.JsonBuilder; import java.util.Collection; import java.util.Map; +import io.quarkus.maven.dependency.ArtifactCoords; +import io.quarkus.registry.json.JsonBuilder; + /** * Platform release */ diff --git a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/PlatformReleaseImpl.java b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/PlatformReleaseImpl.java index 4dcf0ec69c7ee..f05a27886ee42 100644 --- a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/PlatformReleaseImpl.java +++ b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/PlatformReleaseImpl.java @@ -1,16 +1,18 @@ package io.quarkus.registry.catalog; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import io.quarkus.maven.dependency.ArtifactCoords; -import io.quarkus.registry.json.JsonBuilder; -import io.quarkus.registry.json.JsonEntityWithAnySupport; import java.util.ArrayList; import java.util.Collection; import java.util.List; import java.util.Map; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; + +import io.quarkus.maven.dependency.ArtifactCoords; +import io.quarkus.registry.json.JsonBuilder; +import io.quarkus.registry.json.JsonEntityWithAnySupport; + /** * Asymmetric data manipulation: * Deserialization always uses the builder; diff --git a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/PlatformReleaseVersion.java b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/PlatformReleaseVersion.java index 17706f2475531..c59dc9af6d330 100644 --- a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/PlatformReleaseVersion.java +++ b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/PlatformReleaseVersion.java @@ -1,5 +1,8 @@ package io.quarkus.registry.catalog; +import java.io.IOException; +import java.util.Objects; + import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.databind.DeserializationContext; @@ -8,8 +11,6 @@ import com.fasterxml.jackson.databind.SerializerProvider; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import java.io.IOException; -import java.util.Objects; /** * Representation of Quarkus Platform release. diff --git a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/PlatformStream.java b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/PlatformStream.java index 3b457c598cb6d..c17d4c85496c2 100644 --- a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/PlatformStream.java +++ b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/PlatformStream.java @@ -1,10 +1,12 @@ package io.quarkus.registry.catalog; -import com.fasterxml.jackson.annotation.JsonIgnore; -import io.quarkus.registry.json.JsonBuilder; import java.util.Collection; import java.util.Map; +import com.fasterxml.jackson.annotation.JsonIgnore; + +import io.quarkus.registry.json.JsonBuilder; + public interface PlatformStream { String getId(); diff --git a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/PlatformStreamImpl.java b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/PlatformStreamImpl.java index deb5e5ad3532b..cb3d8ccf5f487 100644 --- a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/PlatformStreamImpl.java +++ b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/PlatformStreamImpl.java @@ -1,16 +1,18 @@ package io.quarkus.registry.catalog; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.quarkus.registry.json.JsonBuilder; -import io.quarkus.registry.json.JsonEntityWithAnySupport; import java.util.Collection; import java.util.Collections; import java.util.LinkedHashMap; import java.util.Map; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; + +import io.quarkus.registry.json.JsonBuilder; +import io.quarkus.registry.json.JsonEntityWithAnySupport; + /** * Asymmetric data manipulation: * Deserialization always uses the builder; diff --git a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/selection/DefaultOriginSelector.java b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/selection/DefaultOriginSelector.java index 48d82320f5d48..0186a3ca4e513 100644 --- a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/selection/DefaultOriginSelector.java +++ b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/selection/DefaultOriginSelector.java @@ -1,6 +1,5 @@ package io.quarkus.registry.catalog.selection; -import io.quarkus.maven.dependency.ArtifactKey; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -11,6 +10,8 @@ import java.util.Set; import java.util.TreeMap; +import io.quarkus.maven.dependency.ArtifactKey; + public class DefaultOriginSelector implements OriginSelector { private OriginCombination recommended; diff --git a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/selection/ExtensionOrigins.java b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/selection/ExtensionOrigins.java index d906b75ba79dd..888365a956c76 100644 --- a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/selection/ExtensionOrigins.java +++ b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/selection/ExtensionOrigins.java @@ -1,11 +1,12 @@ package io.quarkus.registry.catalog.selection; -import io.quarkus.maven.dependency.ArtifactKey; -import io.quarkus.registry.catalog.ExtensionCatalog; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; +import io.quarkus.maven.dependency.ArtifactKey; +import io.quarkus.registry.catalog.ExtensionCatalog; + public class ExtensionOrigins { public static Builder builder(ArtifactKey extKey) { diff --git a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/selection/OriginCombination.java b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/selection/OriginCombination.java index a6e40871358b0..f8f968e9c1a32 100644 --- a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/selection/OriginCombination.java +++ b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/selection/OriginCombination.java @@ -1,6 +1,5 @@ package io.quarkus.registry.catalog.selection; -import io.quarkus.maven.dependency.ArtifactKey; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; @@ -8,6 +7,8 @@ import java.util.Comparator; import java.util.List; +import io.quarkus.maven.dependency.ArtifactKey; + public class OriginCombination { static double calculateScore(OriginCombination s, int highestRegistryPreference, int originsTotal) { diff --git a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/client/RegistryClientDispatcher.java b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/client/RegistryClientDispatcher.java index 972075912f03b..fa585fa7a0242 100644 --- a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/client/RegistryClientDispatcher.java +++ b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/client/RegistryClientDispatcher.java @@ -1,11 +1,12 @@ package io.quarkus.registry.client; +import java.util.Objects; + import io.quarkus.maven.dependency.ArtifactCoords; import io.quarkus.registry.RegistryResolutionException; import io.quarkus.registry.catalog.ExtensionCatalog; import io.quarkus.registry.catalog.PlatformCatalog; import io.quarkus.registry.config.RegistryConfig; -import java.util.Objects; public class RegistryClientDispatcher implements RegistryClient { diff --git a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/client/maven/MavenNonPlatformExtensionsResolver.java b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/client/maven/MavenNonPlatformExtensionsResolver.java index 1a8c9f8e0a715..0822555af242f 100644 --- a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/client/maven/MavenNonPlatformExtensionsResolver.java +++ b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/client/maven/MavenNonPlatformExtensionsResolver.java @@ -1,15 +1,17 @@ package io.quarkus.registry.client.maven; +import java.nio.file.Path; +import java.util.Objects; + +import org.eclipse.aether.artifact.Artifact; +import org.eclipse.aether.artifact.DefaultArtifact; + import io.quarkus.devtools.messagewriter.MessageWriter; import io.quarkus.maven.dependency.ArtifactCoords; import io.quarkus.registry.RegistryResolutionException; import io.quarkus.registry.catalog.ExtensionCatalog; import io.quarkus.registry.client.RegistryNonPlatformExtensionsResolver; import io.quarkus.registry.config.RegistryNonPlatformExtensionsConfig; -import java.nio.file.Path; -import java.util.Objects; -import org.eclipse.aether.artifact.Artifact; -import org.eclipse.aether.artifact.DefaultArtifact; public class MavenNonPlatformExtensionsResolver implements RegistryNonPlatformExtensionsResolver { diff --git a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/client/maven/MavenPlatformExtensionsResolver.java b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/client/maven/MavenPlatformExtensionsResolver.java index 8a619e70f42ef..34a72aea46ed9 100644 --- a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/client/maven/MavenPlatformExtensionsResolver.java +++ b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/client/maven/MavenPlatformExtensionsResolver.java @@ -1,20 +1,22 @@ package io.quarkus.registry.client.maven; -import io.quarkus.devtools.messagewriter.MessageWriter; -import io.quarkus.maven.dependency.ArtifactCoords; -import io.quarkus.registry.RegistryResolutionException; -import io.quarkus.registry.catalog.ExtensionCatalog; -import io.quarkus.registry.client.RegistryPlatformExtensionsResolver; -import io.quarkus.registry.util.PlatformArtifacts; import java.io.IOException; import java.nio.file.Path; import java.util.List; import java.util.Objects; + import org.eclipse.aether.artifact.Artifact; import org.eclipse.aether.artifact.DefaultArtifact; import org.eclipse.aether.repository.RemoteRepository; import org.eclipse.aether.transfer.ArtifactNotFoundException; +import io.quarkus.devtools.messagewriter.MessageWriter; +import io.quarkus.maven.dependency.ArtifactCoords; +import io.quarkus.registry.RegistryResolutionException; +import io.quarkus.registry.catalog.ExtensionCatalog; +import io.quarkus.registry.client.RegistryPlatformExtensionsResolver; +import io.quarkus.registry.util.PlatformArtifacts; + public class MavenPlatformExtensionsResolver implements RegistryPlatformExtensionsResolver { private final MavenRegistryArtifactResolver artifactResolver; diff --git a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/client/maven/MavenPlatformsResolver.java b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/client/maven/MavenPlatformsResolver.java index a0b23e1e99d98..e8171e2dde601 100644 --- a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/client/maven/MavenPlatformsResolver.java +++ b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/client/maven/MavenPlatformsResolver.java @@ -1,20 +1,22 @@ package io.quarkus.registry.client.maven; -import io.quarkus.devtools.messagewriter.MessageWriter; -import io.quarkus.maven.dependency.ArtifactCoords; -import io.quarkus.registry.Constants; -import io.quarkus.registry.RegistryResolutionException; -import io.quarkus.registry.catalog.PlatformCatalog; -import io.quarkus.registry.client.RegistryPlatformsResolver; -import io.quarkus.registry.config.RegistryPlatformsConfig; import java.io.IOException; import java.nio.file.Path; import java.util.Objects; + import org.apache.maven.artifact.repository.metadata.Metadata; import org.eclipse.aether.artifact.Artifact; import org.eclipse.aether.artifact.DefaultArtifact; import org.eclipse.aether.resolution.ArtifactResult; +import io.quarkus.devtools.messagewriter.MessageWriter; +import io.quarkus.maven.dependency.ArtifactCoords; +import io.quarkus.registry.Constants; +import io.quarkus.registry.RegistryResolutionException; +import io.quarkus.registry.catalog.PlatformCatalog; +import io.quarkus.registry.client.RegistryPlatformsResolver; +import io.quarkus.registry.config.RegistryPlatformsConfig; + public class MavenPlatformsResolver implements RegistryPlatformsResolver { private final RegistryPlatformsConfig config; diff --git a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/client/maven/MavenRegistryArtifactResolver.java b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/client/maven/MavenRegistryArtifactResolver.java index 0634d3e719e2c..a2b18d8a880a8 100644 --- a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/client/maven/MavenRegistryArtifactResolver.java +++ b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/client/maven/MavenRegistryArtifactResolver.java @@ -1,11 +1,13 @@ package io.quarkus.registry.client.maven; -import io.quarkus.bootstrap.resolver.maven.BootstrapMavenException; import java.nio.file.Path; + import org.apache.maven.artifact.repository.metadata.Metadata; import org.eclipse.aether.artifact.Artifact; import org.eclipse.aether.resolution.ArtifactResult; +import io.quarkus.bootstrap.resolver.maven.BootstrapMavenException; + public interface MavenRegistryArtifactResolver { default Path resolve(Artifact artifact) throws BootstrapMavenException { diff --git a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/client/maven/MavenRegistryArtifactResolverWithCleanup.java b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/client/maven/MavenRegistryArtifactResolverWithCleanup.java index c0ea6eca30a8c..eed5e23354b23 100644 --- a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/client/maven/MavenRegistryArtifactResolverWithCleanup.java +++ b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/client/maven/MavenRegistryArtifactResolverWithCleanup.java @@ -1,7 +1,5 @@ package io.quarkus.registry.client.maven; -import io.quarkus.bootstrap.resolver.maven.BootstrapMavenException; -import io.quarkus.bootstrap.resolver.maven.MavenArtifactResolver; import java.io.BufferedReader; import java.io.File; import java.nio.file.Path; @@ -9,6 +7,7 @@ import java.util.Collections; import java.util.List; import java.util.Objects; + import org.apache.maven.artifact.repository.metadata.io.xpp3.MetadataXpp3Reader; import org.eclipse.aether.artifact.Artifact; import org.eclipse.aether.metadata.DefaultMetadata; @@ -20,6 +19,9 @@ import org.eclipse.aether.resolution.MetadataRequest; import org.eclipse.aether.resolution.MetadataResult; +import io.quarkus.bootstrap.resolver.maven.BootstrapMavenException; +import io.quarkus.bootstrap.resolver.maven.MavenArtifactResolver; + public class MavenRegistryArtifactResolverWithCleanup implements MavenRegistryArtifactResolver { private final MavenArtifactResolver resolver; diff --git a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/client/maven/MavenRegistryCache.java b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/client/maven/MavenRegistryCache.java index 445c86f8dffd7..a31ce04d67940 100644 --- a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/client/maven/MavenRegistryCache.java +++ b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/client/maven/MavenRegistryCache.java @@ -1,11 +1,5 @@ package io.quarkus.registry.client.maven; -import io.quarkus.bootstrap.resolver.maven.BootstrapMavenException; -import io.quarkus.devtools.messagewriter.MessageWriter; -import io.quarkus.maven.dependency.ArtifactCoords; -import io.quarkus.registry.RegistryResolutionException; -import io.quarkus.registry.client.RegistryCache; -import io.quarkus.registry.config.RegistryConfig; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; @@ -14,8 +8,16 @@ import java.util.List; import java.util.Objects; import java.util.stream.Stream; + import org.eclipse.aether.artifact.DefaultArtifact; +import io.quarkus.bootstrap.resolver.maven.BootstrapMavenException; +import io.quarkus.devtools.messagewriter.MessageWriter; +import io.quarkus.maven.dependency.ArtifactCoords; +import io.quarkus.registry.RegistryResolutionException; +import io.quarkus.registry.client.RegistryCache; +import io.quarkus.registry.config.RegistryConfig; + public class MavenRegistryCache implements RegistryCache { private final RegistryConfig config; diff --git a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/client/maven/MavenRegistryClientFactory.java b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/client/maven/MavenRegistryClientFactory.java index 9a509b14d5a1c..246a76397fb18 100644 --- a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/client/maven/MavenRegistryClientFactory.java +++ b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/client/maven/MavenRegistryClientFactory.java @@ -1,23 +1,5 @@ package io.quarkus.registry.client.maven; -import io.quarkus.bootstrap.resolver.maven.BootstrapMavenContext; -import io.quarkus.bootstrap.resolver.maven.BootstrapMavenException; -import io.quarkus.bootstrap.resolver.maven.MavenArtifactResolver; -import io.quarkus.devtools.messagewriter.MessageWriter; -import io.quarkus.maven.dependency.ArtifactCoords; -import io.quarkus.registry.RegistryResolutionException; -import io.quarkus.registry.client.RegistryClient; -import io.quarkus.registry.client.RegistryClientDispatcher; -import io.quarkus.registry.client.RegistryClientFactory; -import io.quarkus.registry.client.RegistryNonPlatformExtensionsResolver; -import io.quarkus.registry.client.RegistryPlatformsResolver; -import io.quarkus.registry.config.RegistryArtifactConfig; -import io.quarkus.registry.config.RegistryConfig; -import io.quarkus.registry.config.RegistryDescriptorConfig; -import io.quarkus.registry.config.RegistryMavenConfig; -import io.quarkus.registry.config.RegistryMavenRepoConfig; -import io.quarkus.registry.config.RegistryNonPlatformExtensionsConfig; -import io.quarkus.registry.config.RegistryPlatformsConfig; import java.io.BufferedWriter; import java.io.IOException; import java.io.StringWriter; @@ -26,6 +8,7 @@ import java.util.Collections; import java.util.List; import java.util.Objects; + import org.eclipse.aether.DefaultRepositorySystemSession; import org.eclipse.aether.RepositorySystemSession; import org.eclipse.aether.artifact.Artifact; @@ -37,6 +20,25 @@ import org.eclipse.aether.transfer.TransferEvent; import org.eclipse.aether.transfer.TransferListener; +import io.quarkus.bootstrap.resolver.maven.BootstrapMavenContext; +import io.quarkus.bootstrap.resolver.maven.BootstrapMavenException; +import io.quarkus.bootstrap.resolver.maven.MavenArtifactResolver; +import io.quarkus.devtools.messagewriter.MessageWriter; +import io.quarkus.maven.dependency.ArtifactCoords; +import io.quarkus.registry.RegistryResolutionException; +import io.quarkus.registry.client.RegistryClient; +import io.quarkus.registry.client.RegistryClientDispatcher; +import io.quarkus.registry.client.RegistryClientFactory; +import io.quarkus.registry.client.RegistryNonPlatformExtensionsResolver; +import io.quarkus.registry.client.RegistryPlatformsResolver; +import io.quarkus.registry.config.RegistryArtifactConfig; +import io.quarkus.registry.config.RegistryConfig; +import io.quarkus.registry.config.RegistryDescriptorConfig; +import io.quarkus.registry.config.RegistryMavenConfig; +import io.quarkus.registry.config.RegistryMavenRepoConfig; +import io.quarkus.registry.config.RegistryNonPlatformExtensionsConfig; +import io.quarkus.registry.config.RegistryPlatformsConfig; + public class MavenRegistryClientFactory implements RegistryClientFactory { private static final String CLEANUP_TIMESTAMPED_ARTIFACTS = "cleanup-timestamped-artifacts"; diff --git a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/RegistriesConfig.java b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/RegistriesConfig.java index 50853735b09e9..561abe44794fa 100644 --- a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/RegistriesConfig.java +++ b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/RegistriesConfig.java @@ -1,10 +1,11 @@ package io.quarkus.registry.config; -import io.quarkus.registry.json.JsonBuilder; import java.io.IOException; import java.nio.file.Path; import java.util.List; +import io.quarkus.registry.json.JsonBuilder; + /** * Registry client configuration. Consists of a list of registry configurations that will be * providing platform and extension information to the client. diff --git a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/RegistriesConfigImpl.java b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/RegistriesConfigImpl.java index 495e8f3827e3e..6eca7b7ae6c3f 100644 --- a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/RegistriesConfigImpl.java +++ b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/RegistriesConfigImpl.java @@ -1,5 +1,12 @@ package io.quarkus.registry.config; +import java.io.IOException; +import java.nio.file.Path; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Objects; + import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.core.JsonGenerator; @@ -14,13 +21,8 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.dataformat.yaml.YAMLGenerator; + import io.quarkus.registry.json.JsonBuilder; -import java.io.IOException; -import java.nio.file.Path; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Objects; /** * Top of the config hierarchy. Holder of the rest of the things. diff --git a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/RegistriesConfigMapperHelper.java b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/RegistriesConfigMapperHelper.java index 1c60a9f26577e..1d794a200ae72 100644 --- a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/RegistriesConfigMapperHelper.java +++ b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/RegistriesConfigMapperHelper.java @@ -1,12 +1,5 @@ package io.quarkus.registry.config; -import com.fasterxml.jackson.databind.DeserializationFeature; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.PropertyNamingStrategies; -import com.fasterxml.jackson.databind.SerializationFeature; -import com.fasterxml.jackson.dataformat.yaml.YAMLFactory; -import io.quarkus.maven.dependency.ArtifactCoords; -import io.quarkus.registry.json.JsonArtifactCoordsMixin; import java.io.BufferedReader; import java.io.BufferedWriter; import java.io.IOException; @@ -16,6 +9,15 @@ import java.nio.file.Files; import java.nio.file.Path; +import com.fasterxml.jackson.databind.DeserializationFeature; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.PropertyNamingStrategies; +import com.fasterxml.jackson.databind.SerializationFeature; +import com.fasterxml.jackson.dataformat.yaml.YAMLFactory; + +import io.quarkus.maven.dependency.ArtifactCoords; +import io.quarkus.registry.json.JsonArtifactCoordsMixin; + public class RegistriesConfigMapperHelper { private static ObjectMapper yamlMapper; diff --git a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/RegistryArtifactConfigImpl.java b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/RegistryArtifactConfigImpl.java index ea6b44d38e3cf..c799f68134cd2 100644 --- a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/RegistryArtifactConfigImpl.java +++ b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/RegistryArtifactConfigImpl.java @@ -1,10 +1,12 @@ package io.quarkus.registry.config; +import java.util.Objects; + import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonInclude; + import io.quarkus.maven.dependency.ArtifactCoords; import io.quarkus.registry.json.JsonBuilder; -import java.util.Objects; /** * Asymmetric data manipulation: diff --git a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/RegistryConfig.java b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/RegistryConfig.java index b24a470b274be..56794816ee26c 100644 --- a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/RegistryConfig.java +++ b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/RegistryConfig.java @@ -1,10 +1,11 @@ package io.quarkus.registry.config; -import io.quarkus.registry.json.JsonBuilder; import java.io.IOException; import java.nio.file.Path; import java.util.Map; +import io.quarkus.registry.json.JsonBuilder; + /** * Client side registry configuration containing information how to * communicate and resolve various catalogs from the registry. diff --git a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/RegistryConfigImpl.java b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/RegistryConfigImpl.java index a957bac42331a..2d2520534e4e2 100644 --- a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/RegistryConfigImpl.java +++ b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/RegistryConfigImpl.java @@ -1,5 +1,14 @@ package io.quarkus.registry.config; +import java.io.IOException; +import java.nio.file.Path; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.function.Function; + import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -14,18 +23,11 @@ import com.fasterxml.jackson.databind.SerializerProvider; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; + import io.quarkus.maven.dependency.ArtifactCoords; import io.quarkus.registry.Constants; import io.quarkus.registry.json.JsonBooleanTrueFilter; import io.quarkus.registry.json.JsonBuilder; -import java.io.IOException; -import java.nio.file.Path; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.function.Function; /** * Asymmetric data manipulation: diff --git a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/RegistryDescriptorConfigImpl.java b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/RegistryDescriptorConfigImpl.java index 0b45398e4ecad..ab61b807d50a9 100644 --- a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/RegistryDescriptorConfigImpl.java +++ b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/RegistryDescriptorConfigImpl.java @@ -1,10 +1,12 @@ package io.quarkus.registry.config; +import java.util.Objects; + import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonInclude; + import io.quarkus.maven.dependency.ArtifactCoords; import io.quarkus.registry.json.JsonBuilder; -import java.util.Objects; /** * Asymmetric data manipulation: diff --git a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/RegistryMavenConfigImpl.java b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/RegistryMavenConfigImpl.java index a8a981f80c92a..4f1fddef687ea 100644 --- a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/RegistryMavenConfigImpl.java +++ b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/RegistryMavenConfigImpl.java @@ -1,10 +1,12 @@ package io.quarkus.registry.config; +import java.util.Objects; + import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; + import io.quarkus.registry.json.JsonBuilder; -import java.util.Objects; /** * Asymmetric data manipulation: diff --git a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/RegistryMavenRepoConfigImpl.java b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/RegistryMavenRepoConfigImpl.java index 0f985f6b8d8a6..5e8b3d7e8eae3 100644 --- a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/RegistryMavenRepoConfigImpl.java +++ b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/RegistryMavenRepoConfigImpl.java @@ -1,9 +1,11 @@ package io.quarkus.registry.config; +import java.util.Objects; + import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonInclude; + import io.quarkus.registry.json.JsonBuilder; -import java.util.Objects; /** * Asymmetric data manipulation: diff --git a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/RegistryNonPlatformExtensionsConfigImpl.java b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/RegistryNonPlatformExtensionsConfigImpl.java index 854e8cc2a0e97..8fb6c9c07e94a 100644 --- a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/RegistryNonPlatformExtensionsConfigImpl.java +++ b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/RegistryNonPlatformExtensionsConfigImpl.java @@ -2,6 +2,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonInclude; + import io.quarkus.maven.dependency.ArtifactCoords; import io.quarkus.registry.json.JsonBuilder; diff --git a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/RegistryPlatformsConfigImpl.java b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/RegistryPlatformsConfigImpl.java index 63515fcab4cef..079091d6a415f 100644 --- a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/RegistryPlatformsConfigImpl.java +++ b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/RegistryPlatformsConfigImpl.java @@ -1,10 +1,12 @@ package io.quarkus.registry.config; +import java.util.Objects; + import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonInclude; + import io.quarkus.maven.dependency.ArtifactCoords; import io.quarkus.registry.json.JsonBuilder; -import java.util.Objects; /** * Asymmetric data manipulation: diff --git a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/RegistryQuarkusVersionsConfig.java b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/RegistryQuarkusVersionsConfig.java index 254c941b3d361..41ed921835780 100644 --- a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/RegistryQuarkusVersionsConfig.java +++ b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/RegistryQuarkusVersionsConfig.java @@ -1,8 +1,9 @@ package io.quarkus.registry.config; -import io.quarkus.registry.json.JsonBuilder; import java.util.Collection; +import io.quarkus.registry.json.JsonBuilder; + /** * A registry may be configured to accept requests only for the Quarkus versions * it recognizes. This may avoid unnecessary remote registry requests from the client. diff --git a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/RegistryQuarkusVersionsConfigImpl.java b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/RegistryQuarkusVersionsConfigImpl.java index 80b1afa761fe3..767e07e2f9799 100644 --- a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/RegistryQuarkusVersionsConfigImpl.java +++ b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/RegistryQuarkusVersionsConfigImpl.java @@ -1,12 +1,14 @@ package io.quarkus.registry.config; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import io.quarkus.registry.json.JsonBuilder; import java.util.ArrayList; import java.util.Collection; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; + +import io.quarkus.registry.json.JsonBuilder; + /** * Asymmetric data manipulation: * Deserialization always uses the builder; diff --git a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/json/JsonArtifactCoordsDeserializer.java b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/json/JsonArtifactCoordsDeserializer.java index 43f23ad1448a5..c103eb258cf6c 100644 --- a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/json/JsonArtifactCoordsDeserializer.java +++ b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/json/JsonArtifactCoordsDeserializer.java @@ -1,10 +1,12 @@ package io.quarkus.registry.json; +import java.io.IOException; + import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.databind.DeserializationContext; import com.fasterxml.jackson.databind.JsonDeserializer; + import io.quarkus.maven.dependency.ArtifactCoords; -import java.io.IOException; /** * Serialization detail. Not part of the Catalog or Config API. diff --git a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/json/JsonArtifactCoordsMixin.java b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/json/JsonArtifactCoordsMixin.java index c37e53d304386..9b3a8a7711982 100644 --- a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/json/JsonArtifactCoordsMixin.java +++ b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/json/JsonArtifactCoordsMixin.java @@ -3,6 +3,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; + import io.quarkus.maven.dependency.ArtifactKey; /** diff --git a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/json/JsonArtifactCoordsSerializer.java b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/json/JsonArtifactCoordsSerializer.java index 92fc10098628e..4a4254717f88c 100644 --- a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/json/JsonArtifactCoordsSerializer.java +++ b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/json/JsonArtifactCoordsSerializer.java @@ -1,10 +1,12 @@ package io.quarkus.registry.json; +import java.io.IOException; + import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.SerializerProvider; + import io.quarkus.maven.dependency.ArtifactCoords; -import java.io.IOException; /** * Serialization detail. Not part of the Catalog or Config API. diff --git a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/json/JsonBuilder.java b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/json/JsonBuilder.java index 4d917ecb90384..a773611488b6e 100644 --- a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/json/JsonBuilder.java +++ b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/json/JsonBuilder.java @@ -1,5 +1,13 @@ package io.quarkus.registry.json; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.function.Supplier; + import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonToken; @@ -7,14 +15,8 @@ import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.SerializerProvider; import com.fasterxml.jackson.databind.exc.InvalidFormatException; + import io.quarkus.registry.config.RegistryConfigImpl; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.function.Supplier; /** * Serialization detail. Not part of the Catalog or Config API. diff --git a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/json/JsonEntityWithAnySupport.java b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/json/JsonEntityWithAnySupport.java index 91609a3197ba9..b01bd40e1681b 100644 --- a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/json/JsonEntityWithAnySupport.java +++ b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/json/JsonEntityWithAnySupport.java @@ -1,11 +1,12 @@ package io.quarkus.registry.json; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; import java.util.Collections; import java.util.HashMap; import java.util.Map; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; + /** * Serialization detail. Not part of the Catalog or Config API. */ diff --git a/independent-projects/tools/registry-client/src/test/java/io/quarkus/devtools/registry/util/PlatformArtifactsTest.java b/independent-projects/tools/registry-client/src/test/java/io/quarkus/devtools/registry/util/PlatformArtifactsTest.java index 7c078124ff11a..944f864dfa7ba 100644 --- a/independent-projects/tools/registry-client/src/test/java/io/quarkus/devtools/registry/util/PlatformArtifactsTest.java +++ b/independent-projects/tools/registry-client/src/test/java/io/quarkus/devtools/registry/util/PlatformArtifactsTest.java @@ -4,10 +4,11 @@ import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; +import org.junit.jupiter.api.Test; + import io.quarkus.maven.dependency.ArtifactCoords; import io.quarkus.registry.Constants; import io.quarkus.registry.util.PlatformArtifacts; -import org.junit.jupiter.api.Test; public class PlatformArtifactsTest { diff --git a/independent-projects/tools/registry-client/src/test/java/io/quarkus/registry/CatalogMergeUtilityTest.java b/independent-projects/tools/registry-client/src/test/java/io/quarkus/registry/CatalogMergeUtilityTest.java index cf5cf76b1dad8..7188a8fc53062 100644 --- a/independent-projects/tools/registry-client/src/test/java/io/quarkus/registry/CatalogMergeUtilityTest.java +++ b/independent-projects/tools/registry-client/src/test/java/io/quarkus/registry/CatalogMergeUtilityTest.java @@ -2,19 +2,21 @@ import static org.assertj.core.api.Assertions.assertThat; -import io.quarkus.maven.dependency.ArtifactCoords; -import io.quarkus.registry.catalog.Platform; -import io.quarkus.registry.catalog.PlatformCatalog; -import io.quarkus.registry.catalog.PlatformRelease; -import io.quarkus.registry.catalog.PlatformReleaseVersion; -import io.quarkus.registry.catalog.PlatformStream; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.Iterator; import java.util.List; + import org.junit.jupiter.api.Test; +import io.quarkus.maven.dependency.ArtifactCoords; +import io.quarkus.registry.catalog.Platform; +import io.quarkus.registry.catalog.PlatformCatalog; +import io.quarkus.registry.catalog.PlatformRelease; +import io.quarkus.registry.catalog.PlatformReleaseVersion; +import io.quarkus.registry.catalog.PlatformStream; + /** * Verify package-private functionality to merge extension catalogs */ diff --git a/independent-projects/tools/registry-client/src/test/java/io/quarkus/registry/catalog/ExtensionCatalogSerializationTest.java b/independent-projects/tools/registry-client/src/test/java/io/quarkus/registry/catalog/ExtensionCatalogSerializationTest.java index bc1f6235b0cda..b529f433b73f3 100644 --- a/independent-projects/tools/registry-client/src/test/java/io/quarkus/registry/catalog/ExtensionCatalogSerializationTest.java +++ b/independent-projects/tools/registry-client/src/test/java/io/quarkus/registry/catalog/ExtensionCatalogSerializationTest.java @@ -2,7 +2,6 @@ import static org.assertj.core.api.Assertions.assertThat; -import io.quarkus.maven.dependency.ArtifactCoords; import java.io.BufferedReader; import java.io.IOException; import java.nio.file.Files; @@ -12,10 +11,13 @@ import java.util.Collections; import java.util.HashMap; import java.util.Map; + import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; +import io.quarkus.maven.dependency.ArtifactCoords; + public class ExtensionCatalogSerializationTest { static Path baseDir = Paths.get(System.getProperty("user.dir")).toAbsolutePath() .resolve("src/test/resources/catalog-config"); diff --git a/independent-projects/tools/registry-client/src/test/java/io/quarkus/registry/catalog/ExtensionTest.java b/independent-projects/tools/registry-client/src/test/java/io/quarkus/registry/catalog/ExtensionTest.java index d9382ddefc60a..e268d34e8d108 100644 --- a/independent-projects/tools/registry-client/src/test/java/io/quarkus/registry/catalog/ExtensionTest.java +++ b/independent-projects/tools/registry-client/src/test/java/io/quarkus/registry/catalog/ExtensionTest.java @@ -2,12 +2,14 @@ import static org.assertj.core.api.Assertions.assertThat; -import io.quarkus.maven.dependency.ArtifactCoords; import java.nio.file.Path; import java.nio.file.Paths; import java.util.Map; + import org.junit.jupiter.api.Test; +import io.quarkus.maven.dependency.ArtifactCoords; + public class ExtensionTest { static Path baseDir = Paths.get(System.getProperty("user.dir")).toAbsolutePath() diff --git a/independent-projects/tools/registry-client/src/test/java/io/quarkus/registry/catalog/platform/PlatformCatalogLastUpdatedTest.java b/independent-projects/tools/registry-client/src/test/java/io/quarkus/registry/catalog/platform/PlatformCatalogLastUpdatedTest.java index 38a99397d4b90..d8f9da7d3ff15 100644 --- a/independent-projects/tools/registry-client/src/test/java/io/quarkus/registry/catalog/platform/PlatformCatalogLastUpdatedTest.java +++ b/independent-projects/tools/registry-client/src/test/java/io/quarkus/registry/catalog/platform/PlatformCatalogLastUpdatedTest.java @@ -2,21 +2,6 @@ import static org.assertj.core.api.Assertions.assertThat; -import io.quarkus.bootstrap.resolver.maven.MavenArtifactResolver; -import io.quarkus.maven.dependency.ArtifactCoords; -import io.quarkus.registry.Constants; -import io.quarkus.registry.ExtensionCatalogResolver; -import io.quarkus.registry.catalog.CatalogMapperHelper; -import io.quarkus.registry.catalog.Platform; -import io.quarkus.registry.catalog.PlatformCatalog; -import io.quarkus.registry.catalog.PlatformRelease; -import io.quarkus.registry.catalog.PlatformReleaseVersion; -import io.quarkus.registry.catalog.PlatformStream; -import io.quarkus.registry.config.RegistriesConfig; -import io.quarkus.registry.config.RegistriesConfigMapperHelper; -import io.quarkus.registry.config.RegistryConfig; -import io.quarkus.registry.config.RegistryDescriptorConfig; -import io.quarkus.registry.config.RegistryPlatformsConfig; import java.io.Reader; import java.io.Writer; import java.nio.file.Files; @@ -24,6 +9,7 @@ import java.nio.file.Paths; import java.util.Collections; import java.util.Iterator; + import org.apache.maven.artifact.repository.metadata.Metadata; import org.apache.maven.artifact.repository.metadata.SnapshotVersion; import org.apache.maven.artifact.repository.metadata.Versioning; @@ -35,6 +21,22 @@ import org.eclipse.aether.metadata.Metadata.Nature; import org.junit.jupiter.api.Test; +import io.quarkus.bootstrap.resolver.maven.MavenArtifactResolver; +import io.quarkus.maven.dependency.ArtifactCoords; +import io.quarkus.registry.Constants; +import io.quarkus.registry.ExtensionCatalogResolver; +import io.quarkus.registry.catalog.CatalogMapperHelper; +import io.quarkus.registry.catalog.Platform; +import io.quarkus.registry.catalog.PlatformCatalog; +import io.quarkus.registry.catalog.PlatformRelease; +import io.quarkus.registry.catalog.PlatformReleaseVersion; +import io.quarkus.registry.catalog.PlatformStream; +import io.quarkus.registry.config.RegistriesConfig; +import io.quarkus.registry.config.RegistriesConfigMapperHelper; +import io.quarkus.registry.config.RegistryConfig; +import io.quarkus.registry.config.RegistryDescriptorConfig; +import io.quarkus.registry.config.RegistryPlatformsConfig; + public class PlatformCatalogLastUpdatedTest { @Test diff --git a/independent-projects/tools/registry-client/src/test/java/io/quarkus/registry/client/maven/MavenRegistryClientCompleteConfigTest.java b/independent-projects/tools/registry-client/src/test/java/io/quarkus/registry/client/maven/MavenRegistryClientCompleteConfigTest.java index 1aba2fabdada8..437dd63a93afa 100644 --- a/independent-projects/tools/registry-client/src/test/java/io/quarkus/registry/client/maven/MavenRegistryClientCompleteConfigTest.java +++ b/independent-projects/tools/registry-client/src/test/java/io/quarkus/registry/client/maven/MavenRegistryClientCompleteConfigTest.java @@ -2,11 +2,12 @@ import static org.assertj.core.api.Assertions.assertThat; +import org.junit.jupiter.api.Test; + import io.quarkus.maven.dependency.ArtifactCoords; import io.quarkus.registry.config.RegistryConfig; import io.quarkus.registry.config.RegistryDescriptorConfig; import io.quarkus.registry.config.RegistryPlatformsConfig; -import org.junit.jupiter.api.Test; public class MavenRegistryClientCompleteConfigTest { diff --git a/independent-projects/tools/registry-client/src/test/java/io/quarkus/registry/config/DevToolsConfigSerializationTest.java b/independent-projects/tools/registry-client/src/test/java/io/quarkus/registry/config/DevToolsConfigSerializationTest.java index ee7381b2f2dc8..f542167f50632 100644 --- a/independent-projects/tools/registry-client/src/test/java/io/quarkus/registry/config/DevToolsConfigSerializationTest.java +++ b/independent-projects/tools/registry-client/src/test/java/io/quarkus/registry/config/DevToolsConfigSerializationTest.java @@ -2,7 +2,6 @@ import static org.assertj.core.api.Assertions.assertThat; -import io.quarkus.maven.dependency.ArtifactCoords; import java.io.BufferedReader; import java.io.BufferedWriter; import java.io.IOException; @@ -15,8 +14,11 @@ import java.util.Collections; import java.util.List; import java.util.Objects; + import org.junit.jupiter.api.Test; +import io.quarkus.maven.dependency.ArtifactCoords; + /** * TODO: compare set *.json.DevToolsConfigSerializationTest */ diff --git a/independent-projects/tools/registry-client/src/test/java/io/quarkus/registry/config/RegistriesConfigLocatorTest.java b/independent-projects/tools/registry-client/src/test/java/io/quarkus/registry/config/RegistriesConfigLocatorTest.java index 7eaed658bb88c..dd7ae5be2bcff 100644 --- a/independent-projects/tools/registry-client/src/test/java/io/quarkus/registry/config/RegistriesConfigLocatorTest.java +++ b/independent-projects/tools/registry-client/src/test/java/io/quarkus/registry/config/RegistriesConfigLocatorTest.java @@ -2,14 +2,16 @@ import static org.assertj.core.api.Assertions.assertThat; -import io.quarkus.maven.dependency.ArtifactCoords; import java.io.StringReader; import java.io.StringWriter; import java.util.Collections; import java.util.HashMap; import java.util.Map; + import org.junit.jupiter.api.Test; +import io.quarkus.maven.dependency.ArtifactCoords; + public class RegistriesConfigLocatorTest { @Test