[ci] Sort imports now that 'edu' known by impsort

hazendaz · May 31, 2024 · 7752094 · 7752094
1 parent 8c8025f
commit 7752094
Show file tree

Hide file tree

Showing 286 changed files with 762 additions and 750 deletions.
diff --git a/coverageTests/src/test/java/integrationTests/CoverageTest.java b/coverageTests/src/test/java/integrationTests/CoverageTest.java
@@ -8,6 +8,9 @@
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
+import edu.umd.cs.findbugs.annotations.NonNull;
+import edu.umd.cs.findbugs.annotations.Nullable;
+
 import java.lang.reflect.Field;
 import java.util.List;
 import java.util.Map;
@@ -25,9 +28,6 @@
 import org.checkerframework.checker.index.qual.NonNegative;
 import org.junit.jupiter.api.BeforeEach;
 
-import edu.umd.cs.findbugs.annotations.NonNull;
-import edu.umd.cs.findbugs.annotations.Nullable;
-
 @SuppressWarnings("JUnitTestCaseWithNoTests")
 public class CoverageTest {
     @Nullable

diff --git a/main/src/main/java/mockit/Deencapsulation.java b/main/src/main/java/mockit/Deencapsulation.java
@@ -4,13 +4,13 @@
  */
 package mockit;
 
+import edu.umd.cs.findbugs.annotations.NonNull;
+import edu.umd.cs.findbugs.annotations.Nullable;
+
 import mockit.internal.reflection.FieldReflection;
 import mockit.internal.reflection.MethodReflection;
 import mockit.internal.util.ClassLoad;
 
-import edu.umd.cs.findbugs.annotations.NonNull;
-import edu.umd.cs.findbugs.annotations.Nullable;
-
 /**
  * Provides utility methods that enable access to ("de-encapsulate") otherwise non-accessible fields.
  *

diff --git a/main/src/main/java/mockit/Expectations.java b/main/src/main/java/mockit/Expectations.java
@@ -4,6 +4,9 @@
  */
 package mockit;
 
+import edu.umd.cs.findbugs.annotations.NonNull;
+import edu.umd.cs.findbugs.annotations.Nullable;
+
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
@@ -12,9 +15,6 @@
 import mockit.internal.expectations.RecordAndReplayExecution;
 import mockit.internal.expectations.RecordPhase;
 
-import edu.umd.cs.findbugs.annotations.NonNull;
-import edu.umd.cs.findbugs.annotations.Nullable;
-
 /**
  * Used to <em>record</em> expectations on {@linkplain Mocked mocked} types and their instances.
  * <p>

diff --git a/main/src/main/java/mockit/Invocation.java b/main/src/main/java/mockit/Invocation.java
@@ -4,15 +4,15 @@
  */
 package mockit;
 
+import edu.umd.cs.findbugs.annotations.NonNull;
+import edu.umd.cs.findbugs.annotations.Nullable;
+
 import java.lang.reflect.Member;
 
 import mockit.internal.BaseInvocation;
 
 import org.checkerframework.checker.index.qual.NonNegative;
 
-import edu.umd.cs.findbugs.annotations.NonNull;
-import edu.umd.cs.findbugs.annotations.Nullable;
-
 /**
  * A context object representing the current invocation to a mocked or faked method/constructor, to be passed as the
  * <em>first</em> parameter of the corresponding delegate/fake method implementation.

diff --git a/main/src/main/java/mockit/Invocations.java b/main/src/main/java/mockit/Invocations.java
@@ -4,6 +4,9 @@
  */
 package mockit;
 
+import edu.umd.cs.findbugs.annotations.NonNull;
+import edu.umd.cs.findbugs.annotations.Nullable;
+
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
 import java.util.List;
@@ -33,9 +36,6 @@
 import org.checkerframework.checker.index.qual.NonNegative;
 import org.hamcrest.Matcher;
 
-import edu.umd.cs.findbugs.annotations.NonNull;
-import edu.umd.cs.findbugs.annotations.Nullable;
-
 /**
  * Provides common API for use inside {@linkplain Expectations expectation} and {@linkplain Verifications verification}
  * blocks.

diff --git a/main/src/main/java/mockit/MockUp.java b/main/src/main/java/mockit/MockUp.java
@@ -8,6 +8,9 @@
 
 import static mockit.internal.util.GeneratedClasses.isGeneratedImplementationClassName;
 
+import edu.umd.cs.findbugs.annotations.NonNull;
+import edu.umd.cs.findbugs.annotations.Nullable;
+
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Proxy;
 import java.lang.reflect.Type;
@@ -23,9 +26,6 @@
 import mockit.internal.startup.Startup;
 import mockit.internal.state.TestRun;
 
-import edu.umd.cs.findbugs.annotations.NonNull;
-import edu.umd.cs.findbugs.annotations.Nullable;
-
 /**
  * A base class used in the creation of a <em>fake</em> for an <em>external</em> type, which is usually a class from
  * some library or component used from the <em>internal</em> codebase of the system under test (SUT). Such fake classes

diff --git a/main/src/main/java/mockit/Verifications.java b/main/src/main/java/mockit/Verifications.java
@@ -4,16 +4,16 @@
  */
 package mockit;
 
+import edu.umd.cs.findbugs.annotations.NonNull;
+import edu.umd.cs.findbugs.annotations.Nullable;
+
 import java.util.List;
 
 import mockit.internal.expectations.BaseVerificationPhase;
 import mockit.internal.expectations.RecordAndReplayExecution;
 import mockit.internal.expectations.argumentMatching.AlwaysTrueMatcher;
 import mockit.internal.state.TestRun;
 
-import edu.umd.cs.findbugs.annotations.NonNull;
-import edu.umd.cs.findbugs.annotations.Nullable;
-
 /**
  * Used to <em>verify</em> a set of expectations on available {@linkplain Mocked mocked} types and/or instances, against
  * the invocations which actually occurred during the test. As such, these verifications can only appear <em>after</em>

diff --git a/main/src/main/java/mockit/asm/AnnotatedReader.java b/main/src/main/java/mockit/asm/AnnotatedReader.java
@@ -1,15 +1,15 @@
 package mockit.asm;
 
+import edu.umd.cs.findbugs.annotations.NonNull;
+import edu.umd.cs.findbugs.annotations.Nullable;
+
 import mockit.asm.annotations.AnnotationReader;
 import mockit.asm.annotations.AnnotationVisitor;
 import mockit.asm.jvmConstants.Access;
 import mockit.asm.util.BytecodeReader;
 
 import org.checkerframework.checker.index.qual.NonNegative;
 
-import edu.umd.cs.findbugs.annotations.NonNull;
-import edu.umd.cs.findbugs.annotations.Nullable;
-
 /**
  * A bytecode reader for reading common elements (signature, annotations) of a class, field, or method.
  */

diff --git a/main/src/main/java/mockit/asm/BaseWriter.java b/main/src/main/java/mockit/asm/BaseWriter.java
@@ -1,5 +1,8 @@
 package mockit.asm;
 
+import edu.umd.cs.findbugs.annotations.NonNull;
+import edu.umd.cs.findbugs.annotations.Nullable;
+
 import java.util.List;
 
 import mockit.asm.annotations.AnnotationVisitor;
@@ -9,9 +12,6 @@
 
 import org.checkerframework.checker.index.qual.NonNegative;
 
-import edu.umd.cs.findbugs.annotations.NonNull;
-import edu.umd.cs.findbugs.annotations.Nullable;
-
 public class BaseWriter {
     /**
      * The dynamically generated constant pool of the class being built/modified.

diff --git a/main/src/main/java/mockit/asm/SignatureWriter.java b/main/src/main/java/mockit/asm/SignatureWriter.java
@@ -1,13 +1,13 @@
 package mockit.asm;
 
+import edu.umd.cs.findbugs.annotations.NonNull;
+
 import mockit.asm.constantPool.AttributeWriter;
 import mockit.asm.constantPool.ConstantPoolGeneration;
 import mockit.asm.util.ByteVector;
 
 import org.checkerframework.checker.index.qual.NonNegative;
 
-import edu.umd.cs.findbugs.annotations.NonNull;
-
 public final class SignatureWriter extends AttributeWriter {
     @NonNegative
     private final int signatureIndex;

diff --git a/main/src/main/java/mockit/asm/annotations/AnnotationReader.java b/main/src/main/java/mockit/asm/annotations/AnnotationReader.java
@@ -1,5 +1,8 @@
 package mockit.asm.annotations;
 
+import edu.umd.cs.findbugs.annotations.NonNull;
+import edu.umd.cs.findbugs.annotations.Nullable;
+
 import java.lang.reflect.Array;
 
 import mockit.asm.types.JavaType;
@@ -8,9 +11,6 @@
 
 import org.checkerframework.checker.index.qual.NonNegative;
 
-import edu.umd.cs.findbugs.annotations.NonNull;
-import edu.umd.cs.findbugs.annotations.Nullable;
-
 public final class AnnotationReader extends BytecodeReader {
     public AnnotationReader(@NonNull BytecodeReader br) {
         super(br);

diff --git a/main/src/main/java/mockit/asm/annotations/AnnotationVisitor.java b/main/src/main/java/mockit/asm/annotations/AnnotationVisitor.java
@@ -1,5 +1,8 @@
 package mockit.asm.annotations;
 
+import edu.umd.cs.findbugs.annotations.NonNull;
+import edu.umd.cs.findbugs.annotations.Nullable;
+
 import java.lang.reflect.Array;
 
 import mockit.asm.constantPool.ConstantPoolGeneration;
@@ -9,9 +12,6 @@
 
 import org.checkerframework.checker.index.qual.NonNegative;
 
-import edu.umd.cs.findbugs.annotations.NonNull;
-import edu.umd.cs.findbugs.annotations.Nullable;
-
 /**
  * A visitor to visit a Java annotation, in the following order: (<code>visit</code> | <code>visitEnum</code> |
  * <code>visitAnnotation</code> | <code>visitArray</code>)* <code>visitEnd</code>.

diff --git a/main/src/main/java/mockit/asm/classes/BootstrapMethodsWriter.java b/main/src/main/java/mockit/asm/classes/BootstrapMethodsWriter.java
@@ -2,6 +2,8 @@
 
 import static mockit.asm.jvmConstants.ConstantPoolTypes.INVOKE_DYNAMIC;
 
+import edu.umd.cs.findbugs.annotations.NonNull;
+
 import mockit.asm.constantPool.AttributeWriter;
 import mockit.asm.constantPool.BootstrapMethodItem;
 import mockit.asm.constantPool.ConstantPoolGeneration;
@@ -13,8 +15,6 @@
 
 import org.checkerframework.checker.index.qual.NonNegative;
 
-import edu.umd.cs.findbugs.annotations.NonNull;
-
 /**
  * Generates the "BootstrapMethods" attribute in a class file being written by a {@link ClassWriter}.
  */

diff --git a/main/src/main/java/mockit/asm/classes/ClassReader.java b/main/src/main/java/mockit/asm/classes/ClassReader.java
@@ -1,5 +1,8 @@
 package mockit.asm.classes;
 
+import edu.umd.cs.findbugs.annotations.NonNull;
+import edu.umd.cs.findbugs.annotations.Nullable;
+
 import mockit.asm.AnnotatedReader;
 import mockit.asm.fields.FieldReader;
 import mockit.asm.jvmConstants.Access;
@@ -8,9 +11,6 @@
 
 import org.checkerframework.checker.index.qual.NonNegative;
 
-import edu.umd.cs.findbugs.annotations.NonNull;
-import edu.umd.cs.findbugs.annotations.Nullable;
-
 /**
  * A Java class parser to make a {@link ClassVisitor} visit an existing class.
  * <p>

diff --git a/main/src/main/java/mockit/asm/classes/ClassVisitor.java b/main/src/main/java/mockit/asm/classes/ClassVisitor.java
@@ -1,15 +1,15 @@
 package mockit.asm.classes;
 
+import edu.umd.cs.findbugs.annotations.NonNull;
+import edu.umd.cs.findbugs.annotations.Nullable;
+
 import mockit.asm.BaseWriter;
 import mockit.asm.fields.FieldVisitor;
 import mockit.asm.jvmConstants.Access;
 import mockit.asm.jvmConstants.Opcodes;
 import mockit.asm.methods.MethodVisitor;
 import mockit.asm.types.JavaType;
 
-import edu.umd.cs.findbugs.annotations.NonNull;
-import edu.umd.cs.findbugs.annotations.Nullable;
-
 /**
  * A visitor to visit a Java class, in the following order:<br>
  * <code>visit</code> (<code>visitAnnotation</code>)* (<code>visitInnerClass</code> | <code>visitField</code> |

diff --git a/main/src/main/java/mockit/asm/classes/ClassWriter.java b/main/src/main/java/mockit/asm/classes/ClassWriter.java
@@ -1,5 +1,8 @@
 package mockit.asm.classes;
 
+import edu.umd.cs.findbugs.annotations.NonNull;
+import edu.umd.cs.findbugs.annotations.Nullable;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -17,9 +20,6 @@
 
 import org.checkerframework.checker.index.qual.NonNegative;
 
-import edu.umd.cs.findbugs.annotations.NonNull;
-import edu.umd.cs.findbugs.annotations.Nullable;
-
 /**
  * A {@link ClassVisitor} that generates classes in bytecode form, that is, a byte array conforming to the
  * <a href="https://docs.oracle.com/javase/specs/jvms/se11/html/jvms-4.html">Java class file format</a>.

diff --git a/main/src/main/java/mockit/asm/classes/ConstantPoolCopying.java b/main/src/main/java/mockit/asm/classes/ConstantPoolCopying.java
@@ -18,6 +18,9 @@
 import static mockit.asm.jvmConstants.ConstantPoolTypes.STRING;
 import static mockit.asm.jvmConstants.ConstantPoolTypes.UTF8;
 
+import edu.umd.cs.findbugs.annotations.NonNull;
+import edu.umd.cs.findbugs.annotations.Nullable;
+
 import mockit.asm.constantPool.ClassMemberItem;
 import mockit.asm.constantPool.DoubleItem;
 import mockit.asm.constantPool.DynamicItem;
@@ -34,9 +37,6 @@
 
 import org.checkerframework.checker.index.qual.NonNegative;
 
-import edu.umd.cs.findbugs.annotations.NonNull;
-import edu.umd.cs.findbugs.annotations.Nullable;
-
 /**
  * Copies the constant pool data from a {@link ClassReader} into a {@link ClassWriter}.
  */

diff --git a/main/src/main/java/mockit/asm/classes/InnerClassesWriter.java b/main/src/main/java/mockit/asm/classes/InnerClassesWriter.java
@@ -1,14 +1,14 @@
 package mockit.asm.classes;
 
+import edu.umd.cs.findbugs.annotations.NonNull;
+import edu.umd.cs.findbugs.annotations.Nullable;
+
 import mockit.asm.constantPool.AttributeWriter;
 import mockit.asm.constantPool.ConstantPoolGeneration;
 import mockit.asm.util.ByteVector;
 
 import org.checkerframework.checker.index.qual.NonNegative;
 
-import edu.umd.cs.findbugs.annotations.NonNull;
-import edu.umd.cs.findbugs.annotations.Nullable;
-
 final class InnerClassesWriter extends AttributeWriter {
     @NonNull
     private final ByteVector innerClasses;

diff --git a/main/src/main/java/mockit/asm/classes/InterfaceWriter.java b/main/src/main/java/mockit/asm/classes/InterfaceWriter.java
@@ -1,11 +1,11 @@
 package mockit.asm.classes;
 
+import edu.umd.cs.findbugs.annotations.NonNull;
+
 import mockit.asm.constantPool.AttributeWriter;
 import mockit.asm.constantPool.ConstantPoolGeneration;
 import mockit.asm.util.ByteVector;
 
-import edu.umd.cs.findbugs.annotations.NonNull;
-
 /**
  * Writes out the interfaces implemented or extended by the class or interface being written.
  */

diff --git a/main/src/main/java/mockit/asm/classes/NestHostWriter.java b/main/src/main/java/mockit/asm/classes/NestHostWriter.java
@@ -1,13 +1,13 @@
 package mockit.asm.classes;
 
+import edu.umd.cs.findbugs.annotations.NonNull;
+
 import mockit.asm.constantPool.AttributeWriter;
 import mockit.asm.constantPool.ConstantPoolGeneration;
 import mockit.asm.util.ByteVector;
 
 import org.checkerframework.checker.index.qual.NonNegative;
 
-import edu.umd.cs.findbugs.annotations.NonNull;
-
 final class NestHostWriter extends AttributeWriter {
     @NonNegative
     private final int hostClassNameIndex;

diff --git a/main/src/main/java/mockit/asm/classes/NestMembersWriter.java b/main/src/main/java/mockit/asm/classes/NestMembersWriter.java
@@ -1,13 +1,13 @@
 package mockit.asm.classes;
 
+import edu.umd.cs.findbugs.annotations.NonNull;
+
 import mockit.asm.constantPool.AttributeWriter;
 import mockit.asm.constantPool.ConstantPoolGeneration;
 import mockit.asm.util.ByteVector;
 
 import org.checkerframework.checker.index.qual.NonNegative;
 
-import edu.umd.cs.findbugs.annotations.NonNull;
-
 final class NestMembersWriter extends AttributeWriter {
     @NonNegative
     private final int[] memberClassNameIndices;