chore: import ordering, final parameters, dependency analysis, and update deps

.mvn/wrapper/maven-wrapper.properties

@@ -1,19 +1,3 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-wrapperVersion=3.3.2
+wrapperVersion=3.3.4
 distributionType=only-script
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.14/apache-maven-3.9.14-bin.zip

codemodel-foundation/pom.xml

@@ -52,6 +52,13 @@
             <version>${base.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-core</artifactId>
+            <version>${jackson.version}</version>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>jakarta.inject</groupId>
             <artifactId>jakarta.inject-api</artifactId>
@@ -61,7 +68,7 @@
         <!-- Test Dependencies -->
         <dependency>
             <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-engine</artifactId>
+            <artifactId>junit-jupiter-api</artifactId>
             <version>${junit.version}</version>
             <scope>test</scope>
         </dependency>
@@ -73,18 +80,27 @@
             <scope>test</scope>
         </dependency>
 
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
-            <version>${mockito.version}</version>
-            <scope>test</scope>
-        </dependency>
-
         <dependency>
             <groupId>build.base</groupId>
             <artifactId>base-transport-json</artifactId>
             <version>${base.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <configuration>
+                    <ignoredNonTestScopedDependencies>
+                        <!-- requires build.base.telemetry in module-info.java for test visibility;
+                             no separate test module-info is feasible with Maven's single-module constraint -->
+                        <ignoredNonTestScopedDependency>build.base:base-telemetry</ignoredNonTestScopedDependency>
+                    </ignoredNonTestScopedDependencies>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>

codemodel-foundation/src/main/java/build/codemodel/foundation/AbstractCodeModel.java

@@ -39,7 +39,6 @@
 import build.codemodel.foundation.naming.NameProvider;
 import build.codemodel.foundation.naming.Namespace;
 import build.codemodel.foundation.naming.TypeName;
-import static build.base.foundation.iterator.Iterators.concat;
 
 import java.util.Iterator;
 import java.util.Objects;
@@ -49,6 +48,8 @@
 import java.util.function.Function;
 import java.util.stream.Stream;
 
+import static build.base.foundation.iterator.Iterators.concat;
+
 /**
  * An abstract {@link CodeModel} implementation.
  *

codemodel-foundation/src/main/java/build/codemodel/foundation/descriptor/CallableDescriptor.java

@@ -21,8 +21,8 @@
  */
 
 import build.base.foundation.stream.Streams;
-import build.codemodel.foundation.Dependent;
 import build.codemodel.foundation.CodeModel;
+import build.codemodel.foundation.Dependent;
 import build.codemodel.foundation.naming.CallableName;
 import build.codemodel.foundation.usage.TypeUsage;
 

codemodel-foundation/src/main/java/build/codemodel/foundation/descriptor/ThrowableDescriptor.java

@@ -27,8 +27,8 @@
 import build.base.marshalling.Marshalling;
 import build.base.marshalling.Out;
 import build.base.marshalling.Unmarshal;
-import build.codemodel.foundation.Dependent;
 import build.codemodel.foundation.CodeModel;
+import build.codemodel.foundation.Dependent;
 import build.codemodel.foundation.usage.TypeUsage;
 
 import java.lang.invoke.MethodHandles;

codemodel-foundation/src/main/java/build/codemodel/foundation/descriptor/TypeDescriptor.java

@@ -20,12 +20,12 @@
  * #L%
  */
 
-import java.util.stream.Stream;
-
 import build.codemodel.foundation.Dependent;
 import build.codemodel.foundation.naming.TypeName;
 import build.codemodel.foundation.usage.TypeUsage;
 
+import java.util.stream.Stream;
+
 /**
  * Provides type information concerning the <i>definition</i> of a type.
  *

codemodel-foundation/src/main/java/build/codemodel/foundation/usage/AnnotationTypeUsage.java

@@ -29,8 +29,8 @@
 import build.base.marshalling.Marshalling;
 import build.base.marshalling.Out;
 import build.base.marshalling.Unmarshal;
-import build.codemodel.foundation.Dependent;
 import build.codemodel.foundation.CodeModel;
+import build.codemodel.foundation.Dependent;
 import build.codemodel.foundation.descriptor.Trait;
 import build.codemodel.foundation.descriptor.Traitable;
 import build.codemodel.foundation.naming.TypeName;

codemodel-foundation/src/main/java/build/codemodel/foundation/usage/ArrayTypeUsage.java

@@ -29,8 +29,8 @@
 import build.base.marshalling.Marshalling;
 import build.base.marshalling.Out;
 import build.base.marshalling.Unmarshal;
-import build.codemodel.foundation.Dependent;
 import build.codemodel.foundation.CodeModel;
+import build.codemodel.foundation.Dependent;
 import build.codemodel.foundation.descriptor.Trait;
 import build.codemodel.foundation.descriptor.Traitable;
 

codemodel-foundation/src/main/java/build/codemodel/foundation/usage/GenericTypeUsage.java

@@ -29,8 +29,8 @@
 import build.base.marshalling.Marshalling;
 import build.base.marshalling.Out;
 import build.base.marshalling.Unmarshal;
-import build.codemodel.foundation.Dependent;
 import build.codemodel.foundation.CodeModel;
+import build.codemodel.foundation.Dependent;
 import build.codemodel.foundation.descriptor.Trait;
 import build.codemodel.foundation.descriptor.Traitable;
 import build.codemodel.foundation.naming.TypeName;

codemodel-foundation/src/main/java/build/codemodel/foundation/usage/IntersectionTypeUsage.java

@@ -29,8 +29,8 @@
 import build.base.marshalling.Marshalling;
 import build.base.marshalling.Out;
 import build.base.marshalling.Unmarshal;
-import build.codemodel.foundation.Dependent;
 import build.codemodel.foundation.CodeModel;
+import build.codemodel.foundation.Dependent;
 import build.codemodel.foundation.descriptor.Trait;
 import build.codemodel.foundation.descriptor.Traitable;
 import build.codemodel.foundation.descriptor.TypeDescriptor;

codemodel-foundation/src/main/java/build/codemodel/foundation/usage/SpecificTypeUsage.java

@@ -27,8 +27,8 @@
 import build.base.marshalling.Marshalling;
 import build.base.marshalling.Out;
 import build.base.marshalling.Unmarshal;
-import build.codemodel.foundation.Dependent;
 import build.codemodel.foundation.CodeModel;
+import build.codemodel.foundation.Dependent;
 import build.codemodel.foundation.descriptor.Trait;
 import build.codemodel.foundation.naming.TypeName;
 

codemodel-foundation/src/main/java/build/codemodel/foundation/usage/TypeUsage.java

@@ -20,8 +20,8 @@
  * #L%
  */
 
-import build.codemodel.foundation.Dependent;
 import build.codemodel.foundation.CodeModel;
+import build.codemodel.foundation.Dependent;
 import build.codemodel.foundation.descriptor.Traitable;
 import build.codemodel.foundation.descriptor.TypeDescriptor;
 

codemodel-foundation/src/main/java/build/codemodel/foundation/usage/TypeVariableUsage.java

@@ -29,8 +29,8 @@
 import build.base.marshalling.Marshalling;
 import build.base.marshalling.Out;
 import build.base.marshalling.Unmarshal;
-import build.codemodel.foundation.Dependent;
 import build.codemodel.foundation.CodeModel;
+import build.codemodel.foundation.Dependent;
 import build.codemodel.foundation.descriptor.Trait;
 import build.codemodel.foundation.descriptor.Traitable;
 import build.codemodel.foundation.descriptor.TypeDescriptor;

codemodel-foundation/src/main/java/build/codemodel/foundation/usage/UnionTypeUsage.java

@@ -29,8 +29,8 @@
 import build.base.marshalling.Marshalling;
 import build.base.marshalling.Out;
 import build.base.marshalling.Unmarshal;
-import build.codemodel.foundation.Dependent;
 import build.codemodel.foundation.CodeModel;
+import build.codemodel.foundation.Dependent;
 import build.codemodel.foundation.descriptor.Trait;
 import build.codemodel.foundation.descriptor.Traitable;
 import build.codemodel.foundation.descriptor.TypeDescriptor;

codemodel-foundation/src/main/java/build/codemodel/foundation/usage/UnknownTypeUsage.java

@@ -27,8 +27,8 @@
 import build.base.marshalling.Marshalling;
 import build.base.marshalling.Out;
 import build.base.marshalling.Unmarshal;
-import build.codemodel.foundation.Dependent;
 import build.codemodel.foundation.CodeModel;
+import build.codemodel.foundation.Dependent;
 import build.codemodel.foundation.descriptor.Trait;
 import build.codemodel.foundation.naming.TypeName;
 

codemodel-foundation/src/main/java/build/codemodel/foundation/usage/VoidTypeUsage.java

@@ -27,8 +27,8 @@
 import build.base.marshalling.Marshalling;
 import build.base.marshalling.Out;
 import build.base.marshalling.Unmarshal;
-import build.codemodel.foundation.Dependent;
 import build.codemodel.foundation.CodeModel;
+import build.codemodel.foundation.Dependent;
 import build.codemodel.foundation.descriptor.Trait;
 import build.codemodel.foundation.descriptor.TypeDescriptor;
 import build.codemodel.foundation.naming.TypeName;

codemodel-foundation/src/test/java/build/codemodel/foundation/CodeModelCompatibilityTests.java

@@ -12,13 +12,13 @@
 import build.codemodel.foundation.naming.ModuleName;
 import build.codemodel.foundation.naming.Namespace;
 import build.codemodel.foundation.naming.TypeName;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import org.junit.jupiter.api.Test;
 
 import java.util.Objects;
 import java.util.function.Function;
 
-import org.junit.jupiter.api.Test;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 /**
  * {@link CodeModel} compatibility tests.

codemodel-foundation/src/test/java/build/codemodel/foundation/ConceptualCodeModelTests.java

@@ -11,12 +11,12 @@
 import build.codemodel.foundation.descriptor.Trait;
 import build.codemodel.foundation.descriptor.TypeDescriptor;
 import build.codemodel.foundation.naming.NonCachingNameProvider;
-import static org.assertj.core.api.Assertions.assertThat;
+import org.junit.jupiter.api.Test;
 
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Function;
 
-import org.junit.jupiter.api.Test;
+import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * {@link CodeModelCompatibilityTests} for {@link ConceptualCodeModel}s.

codemodel-foundation/src/test/java/build/codemodel/foundation/TraitableCompatibilityTests.java

@@ -5,11 +5,11 @@
 import build.codemodel.foundation.descriptor.Singular;
 import build.codemodel.foundation.descriptor.Trait;
 import build.codemodel.foundation.descriptor.Traitable;
+import org.junit.jupiter.api.Test;
+
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
-import org.junit.jupiter.api.Test;
-
 /**
  * Compatibility tests of {@link Traitable}s.
  *

codemodel-foundation/src/test/java/build/codemodel/foundation/TypeDescriptorCompatibilityTests.java

@@ -6,11 +6,11 @@
 import build.codemodel.foundation.descriptor.Trait;
 import build.codemodel.foundation.descriptor.Traitable;
 import build.codemodel.foundation.descriptor.TypeDescriptor;
-import static org.assertj.core.api.Assertions.assertThat;
+import org.junit.jupiter.api.Test;
 
 import java.util.function.Function;
 
-import org.junit.jupiter.api.Test;
+import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * {@link TypeDescriptor} compatibility tests.

codemodel-foundation/src/test/java/build/codemodel/foundation/descriptor/MarshallingTests.java

@@ -4,8 +4,8 @@
 import build.base.marshalling.Marshalled;
 import build.base.marshalling.Marshalling;
 import build.base.transport.json.JsonTransport;
-import build.codemodel.foundation.ConceptualCodeModel;
 import build.codemodel.foundation.CodeModel;
+import build.codemodel.foundation.ConceptualCodeModel;
 import build.codemodel.foundation.naming.IrreducibleName;
 import build.codemodel.foundation.naming.ModuleName;
 import build.codemodel.foundation.naming.NameProvider;
@@ -16,18 +16,17 @@
 import build.codemodel.foundation.transport.NamespaceTransformer;
 import build.codemodel.foundation.transport.TypeNameTransformer;
 import build.codemodel.foundation.usage.VoidTypeUsage;
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import com.fasterxml.jackson.core.JsonFactory;
+import com.fasterxml.jackson.core.StreamReadFeature;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 import java.io.StringReader;
 import java.io.StringWriter;
 import java.util.Optional;
 
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-import com.fasterxml.jackson.core.JsonFactory;
-import com.fasterxml.jackson.core.StreamReadFeature;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * Marshalling tests for various {@link Marshal}able classes.

codemodel-foundation/src/test/java/build/codemodel/foundation/naming/IrreducibleNameTests.java

@@ -1,10 +1,9 @@
 package build.codemodel.foundation.naming;
 
-import build.codemodel.foundation.naming.IrreducibleName;
-import static org.assertj.core.api.Assertions.assertThat;
-
 import org.junit.jupiter.api.Test;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 /**
  * Unit tests for {@link IrreducibleName}s.
  *

codemodel-foundation/src/test/java/build/codemodel/foundation/naming/ModuleNameTests.java

@@ -1,10 +1,10 @@
 package build.codemodel.foundation.naming;
 
-import static org.assertj.core.api.Assertions.assertThat;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 /**
  * Unit tests for {@link ModuleName}s.
  *

codemodel-foundation/src/test/java/build/codemodel/foundation/naming/NameProviderTests.java

@@ -1,10 +1,10 @@
 package build.codemodel.foundation.naming;
 
-import static org.assertj.core.api.Assertions.assertThat;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 
-import org.junit.jupiter.api.Test;
+import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * Unit tests for {@link NameProvider}s.

codemodel-foundation/src/test/java/build/codemodel/foundation/naming/NamespaceTests.java

@@ -1,9 +1,9 @@
 package build.codemodel.foundation.naming;
 
-import static org.assertj.core.api.Assertions.assertThat;
-
 import org.junit.jupiter.api.Test;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 /**
  * Unit tests for {@link Namespace}s.
  *

codemodel-foundation/src/test/java/build/codemodel/foundation/transport/ModuleNameTransformerTests.java

@@ -2,10 +2,10 @@
 
 import build.codemodel.foundation.naming.ModuleName;
 import build.codemodel.foundation.naming.NonCachingNameProvider;
-import static org.assertj.core.api.Assertions.assertThat;
-
 import org.junit.jupiter.api.Test;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 /**
  * Tests for {@link ModuleNameTransformer}s.
  *