Merge pull request quarkusio#28170 from holly-cummins/2.13-impsort-fix

Backport to 2.13: Align impsort settings across whole repo (for consistency with IDE settings)
gsmet · Sep 23, 2022 · 56b5e44 · 56b5e44
2 parents a94e22a + fe30e4e
commit 56b5e44
Show file tree

Hide file tree

Showing 1,399 changed files with 5,075 additions and 2,653 deletions.
diff --git a/independent-projects/arc/pom.xml b/independent-projects/arc/pom.xml
@@ -264,6 +264,8 @@
                     <configuration>
                         <!-- store outside of target to speed up formatting when mvn clean is used -->
                         <cachedir>.cache/impsort-maven-plugin-${impsort-maven-plugin.version}</cachedir>
+                        <groups>java.,javax.,jakarta.,org.,com.</groups>
+                        <staticGroups>*</staticGroups>
                         <removeUnused>true</removeUnused>
                         <skip>${format.skip}</skip>
                     </configuration>

diff --git a/...c/processor/src/main/java/io/quarkus/arc/processor/AbstractAnnotationsTransformation.java b/...c/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/...dent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/AbstractGenerator.java b/...dent-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/...-projects/arc/processor/src/main/java/io/quarkus/arc/processor/AlternativePriorities.java b/...-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/...ects/arc/processor/src/main/java/io/quarkus/arc/processor/AnnotationLiteralGenerator.java b/...ects/arc/processor/src/main/java/io/quarkus/arc/processor/AnnotationLiteralGenerator.java
@@ -5,30 +5,33 @@
 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;
 import java.util.Set;
 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/...ects/arc/processor/src/main/java/io/quarkus/arc/processor/AnnotationLiteralProcessor.java b/...ects/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/...endent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/AnnotationStore.java b/...endent-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,13 +8,17 @@
 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;
 import org.jboss.jandex.DotName;
 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
@@ -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/...jects/arc/processor/src/main/java/io/quarkus/arc/processor/AnnotationsTransformation.java b/...jects/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/...rc/processor/src/main/java/io/quarkus/arc/processor/AnnotationsTransformationContext.java b/...rc/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/...projects/arc/processor/src/main/java/io/quarkus/arc/processor/AnnotationsTransformer.java b/...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
@@ -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/...ent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/AssignabilityCheck.java b/...ent-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
@@ -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;
@@ -19,6 +12,7 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
+
 import javax.enterprise.context.BeforeDestroyed;
 import javax.enterprise.context.Destroyed;
 import javax.enterprise.context.Initialized;
@@ -28,6 +22,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;
@@ -39,6 +34,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/...ndent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanConfigurator.java b/...ndent-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/...t-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanConfiguratorBase.java b/...t-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/...pendent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanDeployment.java b/...pendent-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/...rojects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanDeploymentValidator.java b/...rojects/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;
 
 /**
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,6 +2,7 @@ @@
     import java.util.Collection;
     import java.util.List;
     import javax.enterprise.inject.spi.DeploymentException;
     /**
@@ Expand Down @@