diff --git a/uimafit-core/src/main/java/org/apache/uima/fit/component/CasAnnotator_ImplBase.java b/uimafit-core/src/main/java/org/apache/uima/fit/component/CasAnnotator_ImplBase.java
index 587c5ef1e..719535379 100644
--- a/uimafit-core/src/main/java/org/apache/uima/fit/component/CasAnnotator_ImplBase.java
+++ b/uimafit-core/src/main/java/org/apache/uima/fit/component/CasAnnotator_ImplBase.java
@@ -26,7 +26,6 @@
 
 /**
  * Base class for CAS annotators which initializes itself based on annotations.
- * 
  */
 public abstract class CasAnnotator_ImplBase
         extends org.apache.uima.analysis_component.CasAnnotator_ImplBase {
diff --git a/uimafit-core/src/main/java/org/apache/uima/fit/component/CasCollectionReader_ImplBase.java b/uimafit-core/src/main/java/org/apache/uima/fit/component/CasCollectionReader_ImplBase.java
index eca9ef25c..a17e4dca3 100644
--- a/uimafit-core/src/main/java/org/apache/uima/fit/component/CasCollectionReader_ImplBase.java
+++ b/uimafit-core/src/main/java/org/apache/uima/fit/component/CasCollectionReader_ImplBase.java
@@ -29,7 +29,6 @@
 
 /**
  * Base class for CAS collection readers which initializes itself based on annotations.
- * 
  */
 @OperationalProperties(outputsNewCases = true)
 public abstract class CasCollectionReader_ImplBase extends CollectionReader_ImplBase {
diff --git a/uimafit-core/src/main/java/org/apache/uima/fit/component/CasConsumer_ImplBase.java b/uimafit-core/src/main/java/org/apache/uima/fit/component/CasConsumer_ImplBase.java
index 2ae04f2c0..4160fc448 100644
--- a/uimafit-core/src/main/java/org/apache/uima/fit/component/CasConsumer_ImplBase.java
+++ b/uimafit-core/src/main/java/org/apache/uima/fit/component/CasConsumer_ImplBase.java
@@ -28,7 +28,6 @@
  * Base class for CAS consumers (actually a
  * {@link org.apache.uima.analysis_component.CasAnnotator_ImplBase}) which initializes itself based
  * on annotations.
- * 
  */
 @OperationalProperties(multipleDeploymentAllowed = false)
 public abstract class CasConsumer_ImplBase
diff --git a/uimafit-core/src/main/java/org/apache/uima/fit/component/CasDumpWriter.java b/uimafit-core/src/main/java/org/apache/uima/fit/component/CasDumpWriter.java
index 3c5feb9d3..7bbfaddf1 100644
--- a/uimafit-core/src/main/java/org/apache/uima/fit/component/CasDumpWriter.java
+++ b/uimafit-core/src/main/java/org/apache/uima/fit/component/CasDumpWriter.java
@@ -51,7 +51,6 @@
  * Dumps CAS content to a text file. This is useful when setting up test cases which contain a
  * reference output to which an actually produced CAS is compared. The format produced by this
  * component is more easily comparable than a XCAS or XMI format.
- * 
  */
 public class CasDumpWriter extends CasConsumer_ImplBase {
   /**
diff --git a/uimafit-core/src/main/java/org/apache/uima/fit/component/CasFlowController_ImplBase.java b/uimafit-core/src/main/java/org/apache/uima/fit/component/CasFlowController_ImplBase.java
index 5cb9921ab..50ce44d18 100644
--- a/uimafit-core/src/main/java/org/apache/uima/fit/component/CasFlowController_ImplBase.java
+++ b/uimafit-core/src/main/java/org/apache/uima/fit/component/CasFlowController_ImplBase.java
@@ -23,9 +23,6 @@
 import org.apache.uima.flow.FlowControllerContext;
 import org.apache.uima.resource.ResourceInitializationException;
 
-/**
- */
-
 public abstract class CasFlowController_ImplBase
         extends org.apache.uima.flow.CasFlowController_ImplBase {
   @Override
diff --git a/uimafit-core/src/main/java/org/apache/uima/fit/component/CasMultiplier_ImplBase.java b/uimafit-core/src/main/java/org/apache/uima/fit/component/CasMultiplier_ImplBase.java
index 53a38cbef..4798c6b50 100644
--- a/uimafit-core/src/main/java/org/apache/uima/fit/component/CasMultiplier_ImplBase.java
+++ b/uimafit-core/src/main/java/org/apache/uima/fit/component/CasMultiplier_ImplBase.java
@@ -26,7 +26,6 @@
 
 /**
  * Base class for a CAS multiplier which initializes itself based on annotations.
- * 
  */
 @OperationalProperties(outputsNewCases = true)
 public abstract class CasMultiplier_ImplBase
diff --git a/uimafit-core/src/main/java/org/apache/uima/fit/component/JCasAnnotator_ImplBase.java b/uimafit-core/src/main/java/org/apache/uima/fit/component/JCasAnnotator_ImplBase.java
index f47911e3c..04933fd59 100644
--- a/uimafit-core/src/main/java/org/apache/uima/fit/component/JCasAnnotator_ImplBase.java
+++ b/uimafit-core/src/main/java/org/apache/uima/fit/component/JCasAnnotator_ImplBase.java
@@ -25,7 +25,6 @@
 
 /**
  * Base class for JCas annotators which initializes itself based on annotations.
- * 
  */
 public abstract class JCasAnnotator_ImplBase
         extends org.apache.uima.analysis_component.JCasAnnotator_ImplBase {
diff --git a/uimafit-core/src/main/java/org/apache/uima/fit/component/JCasCollectionReader_ImplBase.java b/uimafit-core/src/main/java/org/apache/uima/fit/component/JCasCollectionReader_ImplBase.java
index 0a7f0f42a..8a2f7ca0c 100644
--- a/uimafit-core/src/main/java/org/apache/uima/fit/component/JCasCollectionReader_ImplBase.java
+++ b/uimafit-core/src/main/java/org/apache/uima/fit/component/JCasCollectionReader_ImplBase.java
@@ -33,7 +33,6 @@
 
 /**
  * Base class for JCas collection readers which initializes itself based on annotations.
- * 
  */
 @OperationalProperties(outputsNewCases = true)
 public abstract class JCasCollectionReader_ImplBase extends CollectionReader_ImplBase {
diff --git a/uimafit-core/src/main/java/org/apache/uima/fit/component/JCasConsumer_ImplBase.java b/uimafit-core/src/main/java/org/apache/uima/fit/component/JCasConsumer_ImplBase.java
index 9bd52cb71..4c0befa51 100644
--- a/uimafit-core/src/main/java/org/apache/uima/fit/component/JCasConsumer_ImplBase.java
+++ b/uimafit-core/src/main/java/org/apache/uima/fit/component/JCasConsumer_ImplBase.java
@@ -28,7 +28,6 @@
  * Base class for JCas consumers (actually a
  * {@link org.apache.uima.analysis_component.JCasAnnotator_ImplBase}) which initializes itself based
  * on annotations.
- * 
  */
 @OperationalProperties(multipleDeploymentAllowed = false)
 public abstract class JCasConsumer_ImplBase
diff --git a/uimafit-core/src/main/java/org/apache/uima/fit/component/JCasFlowController_ImplBase.java b/uimafit-core/src/main/java/org/apache/uima/fit/component/JCasFlowController_ImplBase.java
index 5b8b32da5..db86a9dc6 100644
--- a/uimafit-core/src/main/java/org/apache/uima/fit/component/JCasFlowController_ImplBase.java
+++ b/uimafit-core/src/main/java/org/apache/uima/fit/component/JCasFlowController_ImplBase.java
@@ -23,9 +23,6 @@
 import org.apache.uima.flow.FlowControllerContext;
 import org.apache.uima.resource.ResourceInitializationException;
 
-/**
- */
-
 public abstract class JCasFlowController_ImplBase
         extends org.apache.uima.flow.JCasFlowController_ImplBase {
   @Override
diff --git a/uimafit-core/src/main/java/org/apache/uima/fit/component/JCasMultiplier_ImplBase.java b/uimafit-core/src/main/java/org/apache/uima/fit/component/JCasMultiplier_ImplBase.java
index 207266134..4b233e92d 100644
--- a/uimafit-core/src/main/java/org/apache/uima/fit/component/JCasMultiplier_ImplBase.java
+++ b/uimafit-core/src/main/java/org/apache/uima/fit/component/JCasMultiplier_ImplBase.java
@@ -26,7 +26,6 @@
 
 /**
  * Base class for a JCas multiplier which initializes itself based on annotations.
- * 
  */
 @OperationalProperties(outputsNewCases = true)
 public abstract class JCasMultiplier_ImplBase
diff --git a/uimafit-core/src/main/java/org/apache/uima/fit/component/NoOpAnnotator.java b/uimafit-core/src/main/java/org/apache/uima/fit/component/NoOpAnnotator.java
index f2e3af1d3..47461ab3b 100644
--- a/uimafit-core/src/main/java/org/apache/uima/fit/component/NoOpAnnotator.java
+++ b/uimafit-core/src/main/java/org/apache/uima/fit/component/NoOpAnnotator.java
@@ -23,7 +23,6 @@
 
 /**
  * No-operation annotator. This annotator performs no operation whatsoever.
- * 
  */
 public class NoOpAnnotator extends CasAnnotator_ImplBase {
   @Override
diff --git a/uimafit-core/src/main/java/org/apache/uima/fit/component/Resource_ImplBase.java b/uimafit-core/src/main/java/org/apache/uima/fit/component/Resource_ImplBase.java
index 208806907..b18e16e7c 100644
--- a/uimafit-core/src/main/java/org/apache/uima/fit/component/Resource_ImplBase.java
+++ b/uimafit-core/src/main/java/org/apache/uima/fit/component/Resource_ImplBase.java
@@ -28,7 +28,6 @@
 
 /**
  * Base class for external resources which initializes itself based on annotations.
- * 
  */
 public abstract class Resource_ImplBase extends org.apache.uima.resource.Resource_ImplBase
         implements ExternalResourceAware {
diff --git a/uimafit-core/src/main/java/org/apache/uima/fit/component/ViewCreatorAnnotator.java b/uimafit-core/src/main/java/org/apache/uima/fit/component/ViewCreatorAnnotator.java
index 9d6bc4989..7dba70d1b 100644
--- a/uimafit-core/src/main/java/org/apache/uima/fit/component/ViewCreatorAnnotator.java
+++ b/uimafit-core/src/main/java/org/apache/uima/fit/component/ViewCreatorAnnotator.java
@@ -33,8 +33,6 @@
  * - but if you have mapped the default view to some other view, then the view provided to your
  * annotator (when it asks for the default view) will not be created unless you have explicitly
  * created it.
- * 
- * 
  */
 public class ViewCreatorAnnotator extends JCasAnnotator_ImplBase {
 
diff --git a/uimafit-core/src/main/java/org/apache/uima/fit/component/ViewTextCopierAnnotator.java b/uimafit-core/src/main/java/org/apache/uima/fit/component/ViewTextCopierAnnotator.java
index 105785895..beddd917c 100644
--- a/uimafit-core/src/main/java/org/apache/uima/fit/component/ViewTextCopierAnnotator.java
+++ b/uimafit-core/src/main/java/org/apache/uima/fit/component/ViewTextCopierAnnotator.java
@@ -32,10 +32,7 @@
  * the end you can compare the annotations in the system view with those in the gold view. It is
  * convenient to have an annotator that simply copies the text from the gold view to the system view
  * before running a pipeline on the system view.
- * 
- * 
  */
-
 public class ViewTextCopierAnnotator extends JCasAnnotator_ImplBase {
 
   /**
@@ -67,5 +64,4 @@ public void process(final JCas jCas) throws AnalysisEngineProcessException {
       throw new AnalysisEngineProcessException(e);
     }
   }
-
 }
diff --git a/uimafit-core/src/main/java/org/apache/uima/fit/component/package-info.java b/uimafit-core/src/main/java/org/apache/uima/fit/component/package-info.java
index 0faa29f04..565c379e7 100644
--- a/uimafit-core/src/main/java/org/apache/uima/fit/component/package-info.java
+++ b/uimafit-core/src/main/java/org/apache/uima/fit/component/package-info.java
@@ -16,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+
 /**
  * uimaFIT-enhanced base classes for UIMA components and some simple components.
  */
diff --git a/uimafit-core/src/test/java/org/apache/uima/fit/factory/spi/TypeSystemDescriptionProviderForTesting.java b/uimafit-core/src/test/java/org/apache/uima/fit/factory/spi/TypeSystemDescriptionProviderForTesting.java
index f4196c02f..b94e2060a 100644
--- a/uimafit-core/src/test/java/org/apache/uima/fit/factory/spi/TypeSystemDescriptionProviderForTesting.java
+++ b/uimafit-core/src/test/java/org/apache/uima/fit/factory/spi/TypeSystemDescriptionProviderForTesting.java
@@ -33,8 +33,7 @@ public class TypeSystemDescriptionProviderForTesting implements TypeSystemDescri
 
   @Override
   public List<TypeSystemDescription> listTypeSystemDescriptions() {
-    TypeSystemDescription tsd = UIMAFramework.getResourceSpecifierFactory()
-            .createTypeSystemDescription();
+    var tsd = UIMAFramework.getResourceSpecifierFactory().createTypeSystemDescription();
     tsd.addType(TEST_TYPE_A, "", CAS.TYPE_NAME_ANNOTATION);
     return asList(tsd);
   }
diff --git a/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/TypeSystemDescription_impl.java b/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/TypeSystemDescription_impl.java
index ef11aefda..4359371ff 100644
--- a/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/TypeSystemDescription_impl.java
+++ b/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/TypeSystemDescription_impl.java
@@ -169,8 +169,7 @@ public synchronized void resolveImports(ResourceManager aResourceManager)
   @Override
   public synchronized void resolveImports(Collection<String> aAlreadyImportedTypeSystemURLs,
           ResourceManager aResourceManager) throws InvalidXMLException {
-    ImportResolver<TypeSystemDescription, TypeDescription> resolver = new ImportResolver<>(
-            TypeSystemDescriptionImportResolverAdapter::new);
+    var resolver = new ImportResolver<>(TypeSystemDescriptionImportResolverAdapter::new);
     resolver.resolveImports(this, aAlreadyImportedTypeSystemURLs, aResourceManager);
   }