You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by re...@apache.org on 2022/02/10 13:41:30 UTC
[uima-uimaj] branch refactoring/UIMA-6373-Format-UIMA-Core-Java-SDK-codebase created (now 4ccf319)
This is an automated email from the ASF dual-hosted git repository.
rec pushed a change to branch refactoring/UIMA-6373-Format-UIMA-Core-Java-SDK-codebase
in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git.
at 4ccf319 [UIMA-6373] Format UIMA Core Java SDK codebase
This branch includes the following new commits:
new 4ccf319 [UIMA-6373] Format UIMA Core Java SDK codebase
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[uima-uimaj] 01/01: [UIMA-6373] Format UIMA Core Java SDK codebase
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rec pushed a commit to branch refactoring/UIMA-6373-Format-UIMA-Core-Java-SDK-codebase
in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git
commit 4ccf31933d32898e947bebea010da1c61431eeb4
Author: Richard Eckart de Castilho <re...@apache.org>
AuthorDate: Thu Feb 10 14:41:26 2022 +0100
[UIMA-6373] Format UIMA Core Java SDK codebase
- Auto-format
- Organize imports
---
.../java/org/apache/uima/cas/impl/FSClassRegistry.java | 6 +++---
.../apache/uima/examples/SourceDocumentInformation.java | 4 +---
.../java/org/apache/uima/jcas/cas/FSLinkedHashSet.java | 16 ----------------
uimaj-core/src/test/java/aa/AbstractType.java | 4 +---
uimaj-core/src/test/java/aa/ConcreteType.java | 2 +-
uimaj-core/src/test/java/aa/MissingFeatureInCas.java | 4 +---
uimaj-core/src/test/java/aa/MissingInCas.java | 8 +-------
uimaj-core/src/test/java/aa/Root.java | 12 +++++-------
uimaj-core/src/test/java/aa/T.java | 4 +---
.../src/test/java/org/apache/lang/LanguagePair.java | 4 +---
.../java/org/apache/uima/cas/test/CrossAnnotation.java | 4 +---
.../java/org/apache/uima/cas/test/EnrichedEntity.java | 6 +++---
.../test/java/org/apache/uima/cas/test/FeatureMap.java | 14 +++++++-------
.../java/org/apache/uima/cas/test/FeatureRecord.java | 6 +++---
.../src/test/java/org/apache/uima/cas/test/Level_2.java | 6 +-----
.../src/test/java/org/apache/uima/cas/test/Level_3.java | 6 +-----
.../src/test/java/org/apache/uima/cas/test/Level_4.java | 6 +-----
.../src/test/java/org/apache/uima/cas/test/Level_5.java | 6 +-----
.../src/test/java/org/apache/uima/cas/test/Level_6.java | 6 +-----
.../src/test/java/org/apache/uima/cas/test/Sentence.java | 8 +-------
.../apache/uima/cas/test/StringSubtypeAnnotation.java | 4 +---
.../src/test/java/org/apache/uima/cas/test/Token.java | 8 +-------
.../org/apache/uima/testTypeSystem_arrays/OfShorts.java | 4 +---
.../org/apache/uima/testTypeSystem_arrays/OfStrings.java | 4 +---
.../org/apache/uima/util/impl/JSR47Logger_implTest.java | 1 -
uimaj-core/src/test/java/sofa/test/CrossAnnotation.java | 4 +---
uimaj-core/src/test/java/x/y/z/Sentence.java | 4 +---
uimaj-core/src/test/java/x/y/z/Separator.java | 6 +-----
uimaj-core/src/test/java/x/y/z/Token.java | 4 +---
uimaj-core/src/test/java/x/y/z/TokenType.java | 8 +-------
uimaj-core/src/test/java/x/y/z/Word.java | 6 +-----
31 files changed, 45 insertions(+), 140 deletions(-)
diff --git a/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSClassRegistry.java b/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSClassRegistry.java
index 5f4e918..ee98243 100644
--- a/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSClassRegistry.java
+++ b/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSClassRegistry.java
@@ -122,7 +122,7 @@ public abstract class FSClassRegistry { // abstract to prevent instantiating; th
static final String LOG_JCAS_CLASSLOADERS_ON_SHUTDOWN = "uima.log_jcas_classloaders_on_shutdown";
static final boolean IS_LOG_JCAS_CLASSLOADERS_ON_SHUTDOWN = Misc
.getNoValueSystemProperty(LOG_JCAS_CLASSLOADERS_ON_SHUTDOWN);
-
+
// private static final boolean IS_TRACE_AUGMENT_TS = false;
// private static final boolean IS_TIME_AUGMENT_FEATURES = false;
/* ========================================================= */
@@ -1533,7 +1533,7 @@ public abstract class FSClassRegistry { // abstract to prevent instantiating; th
if (v != null) {
return false;
}
- }
+ }
return true;
}
@@ -1622,7 +1622,7 @@ public abstract class FSClassRegistry { // abstract to prevent instantiating; th
Misc.internalError(e); // never happen
}
}
-
+
/**
* For internal use only!
*/
diff --git a/uimaj-core/src/main/java/org/apache/uima/examples/SourceDocumentInformation.java b/uimaj-core/src/main/java/org/apache/uima/examples/SourceDocumentInformation.java
index cce1450..438db85 100644
--- a/uimaj-core/src/main/java/org/apache/uima/examples/SourceDocumentInformation.java
+++ b/uimaj-core/src/main/java/org/apache/uima/examples/SourceDocumentInformation.java
@@ -27,10 +27,8 @@ import java.lang.invoke.MethodHandle;
import org.apache.uima.cas.impl.CASImpl;
import org.apache.uima.cas.impl.TypeImpl;
import org.apache.uima.cas.impl.TypeSystemImpl;
-import org.apache.uima.jcas.JCas;
+import org.apache.uima.jcas.JCas;
import org.apache.uima.jcas.JCasRegistry;
-
-
import org.apache.uima.jcas.tcas.Annotation;
diff --git a/uimaj-core/src/main/java/org/apache/uima/jcas/cas/FSLinkedHashSet.java b/uimaj-core/src/main/java/org/apache/uima/jcas/cas/FSLinkedHashSet.java
index 28e3707..b17a321 100644
--- a/uimaj-core/src/main/java/org/apache/uima/jcas/cas/FSLinkedHashSet.java
+++ b/uimaj-core/src/main/java/org/apache/uima/jcas/cas/FSLinkedHashSet.java
@@ -21,28 +21,12 @@
package org.apache.uima.jcas.cas;
-import java.lang.invoke.CallSite;
-import java.lang.invoke.MethodHandle;
-import java.lang.reflect.Array;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Iterator;
import java.util.LinkedHashSet;
-import java.util.RandomAccess;
-import java.util.Set;
-import java.util.Spliterator;
-import org.apache.uima.UimaSerializableFSs;
import org.apache.uima.cas.impl.CASImpl;
-import org.apache.uima.cas.impl.FeatureStructureImplC;
import org.apache.uima.cas.impl.TypeImpl;
-import org.apache.uima.cas.impl.TypeSystemImpl;
import org.apache.uima.jcas.JCas;
import org.apache.uima.jcas.JCasRegistry;
-import org.apache.uima.util.impl.Constants;
/** a hash set of Feature Structures
diff --git a/uimaj-core/src/test/java/aa/AbstractType.java b/uimaj-core/src/test/java/aa/AbstractType.java
index b9fa400..309c8d8 100644
--- a/uimaj-core/src/test/java/aa/AbstractType.java
+++ b/uimaj-core/src/test/java/aa/AbstractType.java
@@ -27,10 +27,8 @@ import java.lang.invoke.MethodHandle;
import org.apache.uima.cas.impl.CASImpl;
import org.apache.uima.cas.impl.TypeImpl;
import org.apache.uima.cas.impl.TypeSystemImpl;
-import org.apache.uima.jcas.JCas;
+import org.apache.uima.jcas.JCas;
import org.apache.uima.jcas.JCasRegistry;
-
-
import org.apache.uima.jcas.cas.TOP;
diff --git a/uimaj-core/src/test/java/aa/ConcreteType.java b/uimaj-core/src/test/java/aa/ConcreteType.java
index c06e2ae..5e838f4 100644
--- a/uimaj-core/src/test/java/aa/ConcreteType.java
+++ b/uimaj-core/src/test/java/aa/ConcreteType.java
@@ -27,7 +27,7 @@ import java.lang.invoke.MethodHandle;
import org.apache.uima.cas.impl.CASImpl;
import org.apache.uima.cas.impl.TypeImpl;
import org.apache.uima.cas.impl.TypeSystemImpl;
-import org.apache.uima.jcas.JCas;
+import org.apache.uima.jcas.JCas;
import org.apache.uima.jcas.JCasRegistry;
diff --git a/uimaj-core/src/test/java/aa/MissingFeatureInCas.java b/uimaj-core/src/test/java/aa/MissingFeatureInCas.java
index 383f253..5d4f1bf 100644
--- a/uimaj-core/src/test/java/aa/MissingFeatureInCas.java
+++ b/uimaj-core/src/test/java/aa/MissingFeatureInCas.java
@@ -27,10 +27,8 @@ import java.lang.invoke.MethodHandle;
import org.apache.uima.cas.impl.CASImpl;
import org.apache.uima.cas.impl.TypeImpl;
import org.apache.uima.cas.impl.TypeSystemImpl;
-import org.apache.uima.jcas.JCas;
+import org.apache.uima.jcas.JCas;
import org.apache.uima.jcas.JCasRegistry;
-
-
import org.apache.uima.jcas.cas.TOP;
diff --git a/uimaj-core/src/test/java/aa/MissingInCas.java b/uimaj-core/src/test/java/aa/MissingInCas.java
index 6decfe3..1bc15e1 100644
--- a/uimaj-core/src/test/java/aa/MissingInCas.java
+++ b/uimaj-core/src/test/java/aa/MissingInCas.java
@@ -21,16 +21,10 @@
package aa;
-import java.lang.invoke.CallSite;
-import java.lang.invoke.MethodHandle;
-
import org.apache.uima.cas.impl.CASImpl;
import org.apache.uima.cas.impl.TypeImpl;
-import org.apache.uima.cas.impl.TypeSystemImpl;
-import org.apache.uima.jcas.JCas;
+import org.apache.uima.jcas.JCas;
import org.apache.uima.jcas.JCasRegistry;
-
-
import org.apache.uima.jcas.cas.TOP;
diff --git a/uimaj-core/src/test/java/aa/Root.java b/uimaj-core/src/test/java/aa/Root.java
index 7906300..2859a2f 100644
--- a/uimaj-core/src/test/java/aa/Root.java
+++ b/uimaj-core/src/test/java/aa/Root.java
@@ -27,17 +27,15 @@ import java.lang.invoke.MethodHandle;
import org.apache.uima.cas.impl.CASImpl;
import org.apache.uima.cas.impl.TypeImpl;
import org.apache.uima.cas.impl.TypeSystemImpl;
-import org.apache.uima.jcas.JCas;
+import org.apache.uima.jcas.JCas;
import org.apache.uima.jcas.JCasRegistry;
-
-
-import org.apache.uima.jcas.cas.LongArray;
+import org.apache.uima.jcas.cas.DoubleArray;
import org.apache.uima.jcas.cas.FSArray;
import org.apache.uima.jcas.cas.FloatArray;
-import org.apache.uima.jcas.cas.TOP;
-import org.apache.uima.jcas.cas.StringArray;
-import org.apache.uima.jcas.cas.DoubleArray;
import org.apache.uima.jcas.cas.IntegerArray;
+import org.apache.uima.jcas.cas.LongArray;
+import org.apache.uima.jcas.cas.StringArray;
+import org.apache.uima.jcas.cas.TOP;
/**
diff --git a/uimaj-core/src/test/java/aa/T.java b/uimaj-core/src/test/java/aa/T.java
index 115f06a..5fbca51 100644
--- a/uimaj-core/src/test/java/aa/T.java
+++ b/uimaj-core/src/test/java/aa/T.java
@@ -9,10 +9,8 @@ import java.lang.invoke.MethodHandle;
import org.apache.uima.cas.impl.CASImpl;
import org.apache.uima.cas.impl.TypeImpl;
import org.apache.uima.cas.impl.TypeSystemImpl;
-import org.apache.uima.jcas.JCas;
+import org.apache.uima.jcas.JCas;
import org.apache.uima.jcas.JCasRegistry;
-
-
import org.apache.uima.jcas.cas.TOP;
diff --git a/uimaj-core/src/test/java/org/apache/lang/LanguagePair.java b/uimaj-core/src/test/java/org/apache/lang/LanguagePair.java
index 6d21211..ba0c85c 100644
--- a/uimaj-core/src/test/java/org/apache/lang/LanguagePair.java
+++ b/uimaj-core/src/test/java/org/apache/lang/LanguagePair.java
@@ -9,10 +9,8 @@ import java.lang.invoke.MethodHandle;
import org.apache.uima.cas.impl.CASImpl;
import org.apache.uima.cas.impl.TypeImpl;
import org.apache.uima.cas.impl.TypeSystemImpl;
-import org.apache.uima.jcas.JCas;
+import org.apache.uima.jcas.JCas;
import org.apache.uima.jcas.JCasRegistry;
-
-
import org.apache.uima.jcas.cas.TOP;
diff --git a/uimaj-core/src/test/java/org/apache/uima/cas/test/CrossAnnotation.java b/uimaj-core/src/test/java/org/apache/uima/cas/test/CrossAnnotation.java
index 06f24e6..32084f2 100644
--- a/uimaj-core/src/test/java/org/apache/uima/cas/test/CrossAnnotation.java
+++ b/uimaj-core/src/test/java/org/apache/uima/cas/test/CrossAnnotation.java
@@ -27,10 +27,8 @@ import java.lang.invoke.MethodHandle;
import org.apache.uima.cas.impl.CASImpl;
import org.apache.uima.cas.impl.TypeImpl;
import org.apache.uima.cas.impl.TypeSystemImpl;
-import org.apache.uima.jcas.JCas;
+import org.apache.uima.jcas.JCas;
import org.apache.uima.jcas.JCasRegistry;
-
-
import org.apache.uima.jcas.tcas.Annotation;
diff --git a/uimaj-core/src/test/java/org/apache/uima/cas/test/EnrichedEntity.java b/uimaj-core/src/test/java/org/apache/uima/cas/test/EnrichedEntity.java
index 26b020e..ecaa2fe 100644
--- a/uimaj-core/src/test/java/org/apache/uima/cas/test/EnrichedEntity.java
+++ b/uimaj-core/src/test/java/org/apache/uima/cas/test/EnrichedEntity.java
@@ -22,6 +22,9 @@
package org.apache.uima.cas.test;
+import java.lang.invoke.CallSite;
+import java.lang.invoke.MethodHandle;
+
import org.apache.uima.cas.impl.CASImpl;
import org.apache.uima.cas.impl.TypeImpl;
import org.apache.uima.cas.impl.TypeSystemImpl;
@@ -29,9 +32,6 @@ import org.apache.uima.jcas.JCas;
import org.apache.uima.jcas.JCasRegistry;
import org.apache.uima.jcas.tcas.Annotation;
-import java.lang.invoke.CallSite;
-import java.lang.invoke.MethodHandle;
-
/** Used in testing FeatureMap serialization.
* Updated by JCasGen Fri Dec 04 14:44:18 CET 2020
diff --git a/uimaj-core/src/test/java/org/apache/uima/cas/test/FeatureMap.java b/uimaj-core/src/test/java/org/apache/uima/cas/test/FeatureMap.java
index f12eeed..0e1b47c 100644
--- a/uimaj-core/src/test/java/org/apache/uima/cas/test/FeatureMap.java
+++ b/uimaj-core/src/test/java/org/apache/uima/cas/test/FeatureMap.java
@@ -22,6 +22,13 @@
package org.apache.uima.cas.test;
+import java.lang.invoke.CallSite;
+import java.lang.invoke.MethodHandle;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.stream.Collectors;
+
import org.apache.uima.UimaSerializableFSs;
import org.apache.uima.cas.impl.CASImpl;
import org.apache.uima.cas.impl.FeatureStructureImplC;
@@ -32,13 +39,6 @@ import org.apache.uima.jcas.JCasRegistry;
import org.apache.uima.jcas.cas.FSArray;
import org.apache.uima.jcas.cas.TOP;
-import java.lang.invoke.CallSite;
-import java.lang.invoke.MethodHandle;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.stream.Collectors;
-
/**
* Holds the FSArray of the feature type that will be changed
diff --git a/uimaj-core/src/test/java/org/apache/uima/cas/test/FeatureRecord.java b/uimaj-core/src/test/java/org/apache/uima/cas/test/FeatureRecord.java
index cb9c43c..d9006ab 100644
--- a/uimaj-core/src/test/java/org/apache/uima/cas/test/FeatureRecord.java
+++ b/uimaj-core/src/test/java/org/apache/uima/cas/test/FeatureRecord.java
@@ -22,6 +22,9 @@
package org.apache.uima.cas.test;
+import java.lang.invoke.CallSite;
+import java.lang.invoke.MethodHandle;
+
import org.apache.uima.cas.impl.CASImpl;
import org.apache.uima.cas.impl.TypeImpl;
import org.apache.uima.cas.impl.TypeSystemImpl;
@@ -29,9 +32,6 @@ import org.apache.uima.jcas.JCas;
import org.apache.uima.jcas.JCasRegistry;
import org.apache.uima.jcas.cas.TOP;
-import java.lang.invoke.CallSite;
-import java.lang.invoke.MethodHandle;
-
/** Feature record holding name and real value of named feature.
* Updated by JCasGen Fri Dec 04 14:44:18 CET 2020
diff --git a/uimaj-core/src/test/java/org/apache/uima/cas/test/Level_2.java b/uimaj-core/src/test/java/org/apache/uima/cas/test/Level_2.java
index ef6d131..2a62c91 100644
--- a/uimaj-core/src/test/java/org/apache/uima/cas/test/Level_2.java
+++ b/uimaj-core/src/test/java/org/apache/uima/cas/test/Level_2.java
@@ -21,13 +21,9 @@ package org.apache.uima.cas.test;
import org.apache.uima.cas.impl.CASImpl;
import org.apache.uima.cas.impl.TypeImpl;
-import org.apache.uima.cas.impl.TypeSystemImpl;
-import org.apache.uima.jcas.JCas;
+import org.apache.uima.jcas.JCas;
import org.apache.uima.jcas.JCasRegistry;
-
-import org.apache.uima.jcas.tcas.Annotation;
-
public class Level_2 extends Level_1 {
@SuppressWarnings ("hiding")
diff --git a/uimaj-core/src/test/java/org/apache/uima/cas/test/Level_3.java b/uimaj-core/src/test/java/org/apache/uima/cas/test/Level_3.java
index 327c594..70da4fb 100644
--- a/uimaj-core/src/test/java/org/apache/uima/cas/test/Level_3.java
+++ b/uimaj-core/src/test/java/org/apache/uima/cas/test/Level_3.java
@@ -21,13 +21,9 @@ package org.apache.uima.cas.test;
import org.apache.uima.cas.impl.CASImpl;
import org.apache.uima.cas.impl.TypeImpl;
-import org.apache.uima.cas.impl.TypeSystemImpl;
-import org.apache.uima.jcas.JCas;
+import org.apache.uima.jcas.JCas;
import org.apache.uima.jcas.JCasRegistry;
-
-import org.apache.uima.jcas.tcas.Annotation;
-
public class Level_3 extends Level_2 {
@SuppressWarnings ("hiding")
diff --git a/uimaj-core/src/test/java/org/apache/uima/cas/test/Level_4.java b/uimaj-core/src/test/java/org/apache/uima/cas/test/Level_4.java
index b347ed8..7c9cebd 100644
--- a/uimaj-core/src/test/java/org/apache/uima/cas/test/Level_4.java
+++ b/uimaj-core/src/test/java/org/apache/uima/cas/test/Level_4.java
@@ -21,13 +21,9 @@ package org.apache.uima.cas.test;
import org.apache.uima.cas.impl.CASImpl;
import org.apache.uima.cas.impl.TypeImpl;
-import org.apache.uima.cas.impl.TypeSystemImpl;
-import org.apache.uima.jcas.JCas;
+import org.apache.uima.jcas.JCas;
import org.apache.uima.jcas.JCasRegistry;
-
-import org.apache.uima.jcas.tcas.Annotation;
-
public class Level_4 extends Level_3 {
@SuppressWarnings ("hiding")
diff --git a/uimaj-core/src/test/java/org/apache/uima/cas/test/Level_5.java b/uimaj-core/src/test/java/org/apache/uima/cas/test/Level_5.java
index 9f3b12b..411351d 100644
--- a/uimaj-core/src/test/java/org/apache/uima/cas/test/Level_5.java
+++ b/uimaj-core/src/test/java/org/apache/uima/cas/test/Level_5.java
@@ -21,13 +21,9 @@ package org.apache.uima.cas.test;
import org.apache.uima.cas.impl.CASImpl;
import org.apache.uima.cas.impl.TypeImpl;
-import org.apache.uima.cas.impl.TypeSystemImpl;
-import org.apache.uima.jcas.JCas;
+import org.apache.uima.jcas.JCas;
import org.apache.uima.jcas.JCasRegistry;
-
-import org.apache.uima.jcas.tcas.Annotation;
-
public class Level_5 extends Level_4 {
@SuppressWarnings ("hiding")
diff --git a/uimaj-core/src/test/java/org/apache/uima/cas/test/Level_6.java b/uimaj-core/src/test/java/org/apache/uima/cas/test/Level_6.java
index 33191b9..84996dc 100644
--- a/uimaj-core/src/test/java/org/apache/uima/cas/test/Level_6.java
+++ b/uimaj-core/src/test/java/org/apache/uima/cas/test/Level_6.java
@@ -21,13 +21,9 @@ package org.apache.uima.cas.test;
import org.apache.uima.cas.impl.CASImpl;
import org.apache.uima.cas.impl.TypeImpl;
-import org.apache.uima.cas.impl.TypeSystemImpl;
-import org.apache.uima.jcas.JCas;
+import org.apache.uima.jcas.JCas;
import org.apache.uima.jcas.JCasRegistry;
-
-import org.apache.uima.jcas.tcas.Annotation;
-
public class Level_6 extends Level_5 {
@SuppressWarnings ("hiding")
diff --git a/uimaj-core/src/test/java/org/apache/uima/cas/test/Sentence.java b/uimaj-core/src/test/java/org/apache/uima/cas/test/Sentence.java
index 4cfce49..2b0a7e5 100644
--- a/uimaj-core/src/test/java/org/apache/uima/cas/test/Sentence.java
+++ b/uimaj-core/src/test/java/org/apache/uima/cas/test/Sentence.java
@@ -3,16 +3,10 @@
package org.apache.uima.cas.test;
-import java.lang.invoke.CallSite;
-import java.lang.invoke.MethodHandle;
-
import org.apache.uima.cas.impl.CASImpl;
import org.apache.uima.cas.impl.TypeImpl;
-import org.apache.uima.cas.impl.TypeSystemImpl;
-import org.apache.uima.jcas.JCas;
+import org.apache.uima.jcas.JCas;
import org.apache.uima.jcas.JCasRegistry;
-
-
import org.apache.uima.jcas.tcas.Annotation;
diff --git a/uimaj-core/src/test/java/org/apache/uima/cas/test/StringSubtypeAnnotation.java b/uimaj-core/src/test/java/org/apache/uima/cas/test/StringSubtypeAnnotation.java
index 7553c47..6ff7165 100644
--- a/uimaj-core/src/test/java/org/apache/uima/cas/test/StringSubtypeAnnotation.java
+++ b/uimaj-core/src/test/java/org/apache/uima/cas/test/StringSubtypeAnnotation.java
@@ -27,10 +27,8 @@ import java.lang.invoke.MethodHandle;
import org.apache.uima.cas.impl.CASImpl;
import org.apache.uima.cas.impl.TypeImpl;
import org.apache.uima.cas.impl.TypeSystemImpl;
-import org.apache.uima.jcas.JCas;
+import org.apache.uima.jcas.JCas;
import org.apache.uima.jcas.JCasRegistry;
-
-
import org.apache.uima.jcas.tcas.Annotation;
diff --git a/uimaj-core/src/test/java/org/apache/uima/cas/test/Token.java b/uimaj-core/src/test/java/org/apache/uima/cas/test/Token.java
index 5478737..19d7415 100644
--- a/uimaj-core/src/test/java/org/apache/uima/cas/test/Token.java
+++ b/uimaj-core/src/test/java/org/apache/uima/cas/test/Token.java
@@ -3,16 +3,10 @@
package org.apache.uima.cas.test;
-import java.lang.invoke.CallSite;
-import java.lang.invoke.MethodHandle;
-
import org.apache.uima.cas.impl.CASImpl;
import org.apache.uima.cas.impl.TypeImpl;
-import org.apache.uima.cas.impl.TypeSystemImpl;
-import org.apache.uima.jcas.JCas;
+import org.apache.uima.jcas.JCas;
import org.apache.uima.jcas.JCasRegistry;
-
-
import org.apache.uima.jcas.tcas.Annotation;
diff --git a/uimaj-core/src/test/java/org/apache/uima/testTypeSystem_arrays/OfShorts.java b/uimaj-core/src/test/java/org/apache/uima/testTypeSystem_arrays/OfShorts.java
index d959a47..c0fe20b 100644
--- a/uimaj-core/src/test/java/org/apache/uima/testTypeSystem_arrays/OfShorts.java
+++ b/uimaj-core/src/test/java/org/apache/uima/testTypeSystem_arrays/OfShorts.java
@@ -27,10 +27,8 @@ import java.lang.invoke.MethodHandle;
import org.apache.uima.cas.impl.CASImpl;
import org.apache.uima.cas.impl.TypeImpl;
import org.apache.uima.cas.impl.TypeSystemImpl;
-import org.apache.uima.jcas.JCas;
+import org.apache.uima.jcas.JCas;
import org.apache.uima.jcas.JCasRegistry;
-
-
import org.apache.uima.jcas.cas.ShortArray;
import org.apache.uima.jcas.tcas.Annotation;
diff --git a/uimaj-core/src/test/java/org/apache/uima/testTypeSystem_arrays/OfStrings.java b/uimaj-core/src/test/java/org/apache/uima/testTypeSystem_arrays/OfStrings.java
index 5cc6ec3..234d18e 100644
--- a/uimaj-core/src/test/java/org/apache/uima/testTypeSystem_arrays/OfStrings.java
+++ b/uimaj-core/src/test/java/org/apache/uima/testTypeSystem_arrays/OfStrings.java
@@ -27,10 +27,8 @@ import java.lang.invoke.MethodHandle;
import org.apache.uima.cas.impl.CASImpl;
import org.apache.uima.cas.impl.TypeImpl;
import org.apache.uima.cas.impl.TypeSystemImpl;
-import org.apache.uima.jcas.JCas;
+import org.apache.uima.jcas.JCas;
import org.apache.uima.jcas.JCasRegistry;
-
-
import org.apache.uima.jcas.cas.StringArray;
import org.apache.uima.jcas.tcas.Annotation;
diff --git a/uimaj-core/src/test/java/org/apache/uima/util/impl/JSR47Logger_implTest.java b/uimaj-core/src/test/java/org/apache/uima/util/impl/JSR47Logger_implTest.java
index 9ca1ad3..3bd53cc 100644
--- a/uimaj-core/src/test/java/org/apache/uima/util/impl/JSR47Logger_implTest.java
+++ b/uimaj-core/src/test/java/org/apache/uima/util/impl/JSR47Logger_implTest.java
@@ -23,7 +23,6 @@ import java.util.logging.Logger;
import org.apache.uima.util.Level;
import org.junit.Assert;
-
import org.junit.jupiter.api.Test;
/**
diff --git a/uimaj-core/src/test/java/sofa/test/CrossAnnotation.java b/uimaj-core/src/test/java/sofa/test/CrossAnnotation.java
index 8780a19..d49f14e 100644
--- a/uimaj-core/src/test/java/sofa/test/CrossAnnotation.java
+++ b/uimaj-core/src/test/java/sofa/test/CrossAnnotation.java
@@ -26,10 +26,8 @@ import java.lang.invoke.MethodHandle;
import org.apache.uima.cas.impl.CASImpl;
import org.apache.uima.cas.impl.TypeImpl;
import org.apache.uima.cas.impl.TypeSystemImpl;
-import org.apache.uima.jcas.JCas;
+import org.apache.uima.jcas.JCas;
import org.apache.uima.jcas.JCasRegistry;
-
-
import org.apache.uima.jcas.tcas.Annotation;
diff --git a/uimaj-core/src/test/java/x/y/z/Sentence.java b/uimaj-core/src/test/java/x/y/z/Sentence.java
index 0f25a48..ed7724e 100644
--- a/uimaj-core/src/test/java/x/y/z/Sentence.java
+++ b/uimaj-core/src/test/java/x/y/z/Sentence.java
@@ -9,10 +9,8 @@ import java.lang.invoke.MethodHandle;
import org.apache.uima.cas.impl.CASImpl;
import org.apache.uima.cas.impl.TypeImpl;
import org.apache.uima.cas.impl.TypeSystemImpl;
-import org.apache.uima.jcas.JCas;
+import org.apache.uima.jcas.JCas;
import org.apache.uima.jcas.JCasRegistry;
-
-
import org.apache.uima.jcas.tcas.Annotation;
diff --git a/uimaj-core/src/test/java/x/y/z/Separator.java b/uimaj-core/src/test/java/x/y/z/Separator.java
index c72b4a0..67dfdbc 100644
--- a/uimaj-core/src/test/java/x/y/z/Separator.java
+++ b/uimaj-core/src/test/java/x/y/z/Separator.java
@@ -3,13 +3,9 @@
package x.y.z;
-import java.lang.invoke.CallSite;
-import java.lang.invoke.MethodHandle;
-
import org.apache.uima.cas.impl.CASImpl;
import org.apache.uima.cas.impl.TypeImpl;
-import org.apache.uima.cas.impl.TypeSystemImpl;
-import org.apache.uima.jcas.JCas;
+import org.apache.uima.jcas.JCas;
import org.apache.uima.jcas.JCasRegistry;
diff --git a/uimaj-core/src/test/java/x/y/z/Token.java b/uimaj-core/src/test/java/x/y/z/Token.java
index 363f9a9..8ce36a8 100644
--- a/uimaj-core/src/test/java/x/y/z/Token.java
+++ b/uimaj-core/src/test/java/x/y/z/Token.java
@@ -9,10 +9,8 @@ import java.lang.invoke.MethodHandle;
import org.apache.uima.cas.impl.CASImpl;
import org.apache.uima.cas.impl.TypeImpl;
import org.apache.uima.cas.impl.TypeSystemImpl;
-import org.apache.uima.jcas.JCas;
+import org.apache.uima.jcas.JCas;
import org.apache.uima.jcas.JCasRegistry;
-
-
import org.apache.uima.jcas.cas.StringArray;
import org.apache.uima.jcas.tcas.Annotation;
diff --git a/uimaj-core/src/test/java/x/y/z/TokenType.java b/uimaj-core/src/test/java/x/y/z/TokenType.java
index 593658d..565a93e 100644
--- a/uimaj-core/src/test/java/x/y/z/TokenType.java
+++ b/uimaj-core/src/test/java/x/y/z/TokenType.java
@@ -3,16 +3,10 @@
package x.y.z;
-import java.lang.invoke.CallSite;
-import java.lang.invoke.MethodHandle;
-
import org.apache.uima.cas.impl.CASImpl;
import org.apache.uima.cas.impl.TypeImpl;
-import org.apache.uima.cas.impl.TypeSystemImpl;
-import org.apache.uima.jcas.JCas;
+import org.apache.uima.jcas.JCas;
import org.apache.uima.jcas.JCasRegistry;
-
-
import org.apache.uima.jcas.cas.TOP;
diff --git a/uimaj-core/src/test/java/x/y/z/Word.java b/uimaj-core/src/test/java/x/y/z/Word.java
index fec1301..1a1b708 100644
--- a/uimaj-core/src/test/java/x/y/z/Word.java
+++ b/uimaj-core/src/test/java/x/y/z/Word.java
@@ -3,13 +3,9 @@
package x.y.z;
-import java.lang.invoke.CallSite;
-import java.lang.invoke.MethodHandle;
-
import org.apache.uima.cas.impl.CASImpl;
import org.apache.uima.cas.impl.TypeImpl;
-import org.apache.uima.cas.impl.TypeSystemImpl;
-import org.apache.uima.jcas.JCas;
+import org.apache.uima.jcas.JCas;
import org.apache.uima.jcas.JCasRegistry;