From aee6c90f46839092b1e4ae1d2cdc2ae4e0eae187 Mon Sep 17 00:00:00 2001 From: Reed von Redwitz Date: Thu, 2 Apr 2026 09:37:13 +0200 Subject: [PATCH] chore: import ordering, final parameters, dependency analysis, and update deps --- .mvn/wrapper/maven-wrapper.properties | 20 +---- codemodel-foundation/pom.xml | 32 +++++-- .../foundation/AbstractCodeModel.java | 3 +- .../descriptor/CallableDescriptor.java | 2 +- .../descriptor/ThrowableDescriptor.java | 2 +- .../foundation/descriptor/TypeDescriptor.java | 4 +- .../foundation/usage/AnnotationTypeUsage.java | 2 +- .../foundation/usage/ArrayTypeUsage.java | 2 +- .../foundation/usage/GenericTypeUsage.java | 2 +- .../usage/IntersectionTypeUsage.java | 2 +- .../foundation/usage/SpecificTypeUsage.java | 2 +- .../codemodel/foundation/usage/TypeUsage.java | 2 +- .../foundation/usage/TypeVariableUsage.java | 2 +- .../foundation/usage/UnionTypeUsage.java | 2 +- .../foundation/usage/UnknownTypeUsage.java | 2 +- .../foundation/usage/VoidTypeUsage.java | 2 +- .../CodeModelCompatibilityTests.java | 6 +- .../foundation/ConceptualCodeModelTests.java | 4 +- .../TraitableCompatibilityTests.java | 4 +- .../TypeDescriptorCompatibilityTests.java | 4 +- .../descriptor/MarshallingTests.java | 13 ++- .../naming/IrreducibleNameTests.java | 5 +- .../foundation/naming/ModuleNameTests.java | 4 +- .../foundation/naming/NameProviderTests.java | 4 +- .../foundation/naming/NamespaceTests.java | 4 +- .../transport/ModuleNameTransformerTests.java | 4 +- .../transport/NamespaceTransformerTests.java | 4 +- .../transport/TypeNameTransformerTests.java | 4 +- .../usage/GenericTypeUsageTests.java | 6 +- .../foundation/usage/MarshallingTests.java | 15 ++-- .../usage/OptionalTypeUsageTests.java | 6 +- codemodel-framework-builder/pom.xml | 32 ++++++- .../framework/builder/InternalFramework.java | 2 +- .../compliance/FrameworkBuilderTests.java | 4 +- codemodel-framework/pom.xml | 2 +- .../framework/compiler/Compilation.java | 2 +- .../framework/compiler/Compiler.java | 6 +- .../framework/compiler/TypeChecker.java | 6 +- .../framework/completer/Completer.java | 2 +- .../framework/completer/Completion.java | 2 +- .../framework/initialization/Enricher.java | 4 +- .../framework/initialization/Initializer.java | 2 +- .../framework/builder/EnricherTests.java | 8 +- config/checkstyle/checkstyle.xml | 30 ++----- config/intellij/CodeStyle.xml | 84 +++++++++++++++++++ dependency-injection/pom.xml | 18 ++-- .../injection/ConstructorInjectionPoint.java | 2 +- .../injection/FieldInjectionPoint.java | 2 +- .../injection/InjectableDescriptor.java | 2 +- .../injection/InjectionFramework.java | 4 +- .../codemodel/injection/InjectionPoint.java | 2 +- .../injection/MethodInjectionPoint.java | 2 +- .../injection/ConfigurationResolverTests.java | 4 +- .../injection/CyclicDependencyTests.java | 4 +- .../injection/DefaultOptionResolverTests.java | 4 +- .../injection/InjectionContextTests.java | 6 +- .../InjectionPointDiscoveryTests.java | 8 +- .../injection/OptionalResolverTests.java | 6 +- .../injection/ProvidesResolverTests.java | 5 +- .../injection/QualifiedResolverTests.java | 16 ++-- .../SystemPropertyInjectionTests.java | 4 +- .../compatibility/CompatibilityTests.java | 6 +- expression-codemodel/pom.xml | 23 ++++- .../expression/AbstractExpression.java | 1 - .../build/codemodel/expression/Addition.java | 8 +- .../codemodel/expression/AnyInCommon.java | 8 +- .../codemodel/expression/BooleanLiteral.java | 9 +- .../codemodel/expression/Conjunction.java | 8 +- .../build/codemodel/expression/EqualTo.java | 8 +- .../expression/ExclusiveDisjunction.java | 8 +- .../build/codemodel/expression/Exponent.java | 8 +- .../codemodel/expression/Expressions.java | 2 +- .../codemodel/expression/FunctionUsage.java | 6 +- .../codemodel/expression/GreaterThan.java | 8 +- .../build/codemodel/expression/LessThan.java | 8 +- .../build/codemodel/expression/Modulo.java | 8 +- .../codemodel/expression/Multiplication.java | 8 +- .../build/codemodel/expression/Negative.java | 8 +- .../codemodel/expression/NoneInCommon.java | 8 +- .../codemodel/expression/NotEqualTo.java | 8 +- .../codemodel/expression/Subtraction.java | 8 +- .../java/build/codemodel/expression/Then.java | 8 +- .../naming/AbstractCallableName.java | 1 - .../expression/naming/VariableName.java | 1 - .../expression/MarshallingTests.java | 13 ++- .../expression/naming/MarshallingTests.java | 13 ++- .../parsing/ExpressionParserTests.java | 33 +++++++- .../parsing/TemplateParserTests.java | 9 +- hierarchical-codemodel/pom.xml | 17 +++- .../descriptor/ParentTypeDescriptor.java | 2 +- .../HierarchicalCodeModelTests.java | 4 +- imperative-codemodel/pom.xml | 16 +++- .../imperative/MarshallingTests.java | 15 ++-- .../DiscoverableAnnotationDiscovery.java | 4 +- jdk-annotation-processor/pom.xml | 51 ++++++++--- .../processing/AnnotationMirrorLocation.java | 1 - .../processing/AnnotationProcessor.java | 4 +- .../processing/AnnotationValueLocation.java | 1 - .../processing/ElementLocation.java | 1 - .../src/main/java/module-info.java | 3 +- .../annotation/processing/DiscoveryTests.java | 13 ++- .../processing/FieldDiscoveryTests.java | 11 ++- .../processing/MethodDiscoveryTests.java | 13 ++- .../RecursivelyDefinedTypeDiscoveryTests.java | 11 ++- jdk-codemodel/pom.xml | 61 ++++++++++++-- .../codemodel/jdk/JdkExpressionConverter.java | 5 +- .../build/codemodel/jdk/JdkInitializer.java | 26 +++--- .../codemodel/jdk/JdkStatementConverter.java | 12 ++- .../java/build/codemodel/jdk/TypeUsages.java | 1 - .../codemodel/jdk/descriptor/JDKType.java | 6 +- .../jdk/ArrayAccessArrayTypeTests.java | 4 - .../build/codemodel/jdk/BodyCaptureTests.java | 2 - .../jdk/CodeModelTransportTests.java | 9 +- .../jdk/DirectoryDiscoveryTests.java | 4 +- .../build/codemodel/jdk/DiscoveryTests.java | 7 +- .../jdk/ExpressionTypeResolutionTests.java | 2 - .../jdk/FieldAccessReceiverTypeTests.java | 2 - .../codemodel/jdk/FieldDiscoveryTests.java | 7 +- .../codemodel/jdk/GenericsDiscoveryTests.java | 7 +- .../codemodel/jdk/JDKCodeModelTests.java | 14 ++-- .../codemodel/jdk/JdkInitializerTests.java | 6 +- .../codemodel/jdk/MethodDiscoveryTests.java | 7 +- .../MethodInvocationReceiverTypeTests.java | 2 - .../MethodReferenceQualifierTypeTests.java | 3 - .../RecursivelyDefinedTypeDiscoveryTests.java | 7 +- .../build/codemodel/jdk/TypeUsagesTests.java | 4 +- .../jdk/descriptor/MarshallingTests.java | 13 ++- mvnw | 50 +++++++++-- mvnw.cmd | 56 +++++++++++-- objectoriented-codemodel/pom.xml | 37 +++++++- .../descriptor/ExtendsTypeDescriptor.java | 6 +- .../descriptor/FieldDescriptor.java | 2 +- .../ParameterizedTypeDescriptor.java | 2 +- .../objectoriented/descriptor/ThisUsage.java | 2 +- .../objectoriented/naming/MethodName.java | 2 +- .../descriptor/MarshallingTests.java | 13 ++- .../naming/MarshallingTests.java | 13 ++- pom.xml | 55 ++++++++++-- 138 files changed, 823 insertions(+), 475 deletions(-) create mode 100644 config/intellij/CodeStyle.xml diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties index d58dfb7..c595b00 100644 --- a/.mvn/wrapper/maven-wrapper.properties +++ b/.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 diff --git a/codemodel-foundation/pom.xml b/codemodel-foundation/pom.xml index bb8b1c4..fc6fa1a 100644 --- a/codemodel-foundation/pom.xml +++ b/codemodel-foundation/pom.xml @@ -52,6 +52,13 @@ ${base.version} + + com.fasterxml.jackson.core + jackson-core + ${jackson.version} + test + + jakarta.inject jakarta.inject-api @@ -61,7 +68,7 @@ org.junit.jupiter - junit-jupiter-engine + junit-jupiter-api ${junit.version} test @@ -73,13 +80,6 @@ test - - org.mockito - mockito-core - ${mockito.version} - test - - build.base base-transport-json @@ -87,4 +87,20 @@ test + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + + build.base:base-telemetry + + + + + diff --git a/codemodel-foundation/src/main/java/build/codemodel/foundation/AbstractCodeModel.java b/codemodel-foundation/src/main/java/build/codemodel/foundation/AbstractCodeModel.java index 78d5a1d..b6b45ca 100644 --- a/codemodel-foundation/src/main/java/build/codemodel/foundation/AbstractCodeModel.java +++ b/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. * diff --git a/codemodel-foundation/src/main/java/build/codemodel/foundation/descriptor/CallableDescriptor.java b/codemodel-foundation/src/main/java/build/codemodel/foundation/descriptor/CallableDescriptor.java index eba8299..2b4b58f 100644 --- a/codemodel-foundation/src/main/java/build/codemodel/foundation/descriptor/CallableDescriptor.java +++ b/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; diff --git a/codemodel-foundation/src/main/java/build/codemodel/foundation/descriptor/ThrowableDescriptor.java b/codemodel-foundation/src/main/java/build/codemodel/foundation/descriptor/ThrowableDescriptor.java index b3a3917..559cd13 100644 --- a/codemodel-foundation/src/main/java/build/codemodel/foundation/descriptor/ThrowableDescriptor.java +++ b/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; diff --git a/codemodel-foundation/src/main/java/build/codemodel/foundation/descriptor/TypeDescriptor.java b/codemodel-foundation/src/main/java/build/codemodel/foundation/descriptor/TypeDescriptor.java index b213c8f..dc8b0cc 100644 --- a/codemodel-foundation/src/main/java/build/codemodel/foundation/descriptor/TypeDescriptor.java +++ b/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 definition of a type. * diff --git a/codemodel-foundation/src/main/java/build/codemodel/foundation/usage/AnnotationTypeUsage.java b/codemodel-foundation/src/main/java/build/codemodel/foundation/usage/AnnotationTypeUsage.java index 04d349b..52e265d 100644 --- a/codemodel-foundation/src/main/java/build/codemodel/foundation/usage/AnnotationTypeUsage.java +++ b/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; diff --git a/codemodel-foundation/src/main/java/build/codemodel/foundation/usage/ArrayTypeUsage.java b/codemodel-foundation/src/main/java/build/codemodel/foundation/usage/ArrayTypeUsage.java index af031d3..0f99dcb 100644 --- a/codemodel-foundation/src/main/java/build/codemodel/foundation/usage/ArrayTypeUsage.java +++ b/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; diff --git a/codemodel-foundation/src/main/java/build/codemodel/foundation/usage/GenericTypeUsage.java b/codemodel-foundation/src/main/java/build/codemodel/foundation/usage/GenericTypeUsage.java index d02cdb0..96f7b36 100644 --- a/codemodel-foundation/src/main/java/build/codemodel/foundation/usage/GenericTypeUsage.java +++ b/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; diff --git a/codemodel-foundation/src/main/java/build/codemodel/foundation/usage/IntersectionTypeUsage.java b/codemodel-foundation/src/main/java/build/codemodel/foundation/usage/IntersectionTypeUsage.java index 7510bc0..2e626eb 100644 --- a/codemodel-foundation/src/main/java/build/codemodel/foundation/usage/IntersectionTypeUsage.java +++ b/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; diff --git a/codemodel-foundation/src/main/java/build/codemodel/foundation/usage/SpecificTypeUsage.java b/codemodel-foundation/src/main/java/build/codemodel/foundation/usage/SpecificTypeUsage.java index e28bc0c..2702627 100644 --- a/codemodel-foundation/src/main/java/build/codemodel/foundation/usage/SpecificTypeUsage.java +++ b/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; diff --git a/codemodel-foundation/src/main/java/build/codemodel/foundation/usage/TypeUsage.java b/codemodel-foundation/src/main/java/build/codemodel/foundation/usage/TypeUsage.java index 5d3f237..af923ee 100644 --- a/codemodel-foundation/src/main/java/build/codemodel/foundation/usage/TypeUsage.java +++ b/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; diff --git a/codemodel-foundation/src/main/java/build/codemodel/foundation/usage/TypeVariableUsage.java b/codemodel-foundation/src/main/java/build/codemodel/foundation/usage/TypeVariableUsage.java index c5174ad..2b82cc7 100644 --- a/codemodel-foundation/src/main/java/build/codemodel/foundation/usage/TypeVariableUsage.java +++ b/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; diff --git a/codemodel-foundation/src/main/java/build/codemodel/foundation/usage/UnionTypeUsage.java b/codemodel-foundation/src/main/java/build/codemodel/foundation/usage/UnionTypeUsage.java index 0fa4ac7..7576b07 100644 --- a/codemodel-foundation/src/main/java/build/codemodel/foundation/usage/UnionTypeUsage.java +++ b/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; diff --git a/codemodel-foundation/src/main/java/build/codemodel/foundation/usage/UnknownTypeUsage.java b/codemodel-foundation/src/main/java/build/codemodel/foundation/usage/UnknownTypeUsage.java index 1e6b194..0707cc9 100644 --- a/codemodel-foundation/src/main/java/build/codemodel/foundation/usage/UnknownTypeUsage.java +++ b/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; diff --git a/codemodel-foundation/src/main/java/build/codemodel/foundation/usage/VoidTypeUsage.java b/codemodel-foundation/src/main/java/build/codemodel/foundation/usage/VoidTypeUsage.java index 0961b93..dcb3d49 100644 --- a/codemodel-foundation/src/main/java/build/codemodel/foundation/usage/VoidTypeUsage.java +++ b/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; diff --git a/codemodel-foundation/src/test/java/build/codemodel/foundation/CodeModelCompatibilityTests.java b/codemodel-foundation/src/test/java/build/codemodel/foundation/CodeModelCompatibilityTests.java index efc6880..cf9b5cf 100644 --- a/codemodel-foundation/src/test/java/build/codemodel/foundation/CodeModelCompatibilityTests.java +++ b/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. diff --git a/codemodel-foundation/src/test/java/build/codemodel/foundation/ConceptualCodeModelTests.java b/codemodel-foundation/src/test/java/build/codemodel/foundation/ConceptualCodeModelTests.java index 8cc88eb..8451dfe 100644 --- a/codemodel-foundation/src/test/java/build/codemodel/foundation/ConceptualCodeModelTests.java +++ b/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. diff --git a/codemodel-foundation/src/test/java/build/codemodel/foundation/TraitableCompatibilityTests.java b/codemodel-foundation/src/test/java/build/codemodel/foundation/TraitableCompatibilityTests.java index 848c1b2..6b166d2 100644 --- a/codemodel-foundation/src/test/java/build/codemodel/foundation/TraitableCompatibilityTests.java +++ b/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. * diff --git a/codemodel-foundation/src/test/java/build/codemodel/foundation/TypeDescriptorCompatibilityTests.java b/codemodel-foundation/src/test/java/build/codemodel/foundation/TypeDescriptorCompatibilityTests.java index 29eeb1d..af45830 100644 --- a/codemodel-foundation/src/test/java/build/codemodel/foundation/TypeDescriptorCompatibilityTests.java +++ b/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. diff --git a/codemodel-foundation/src/test/java/build/codemodel/foundation/descriptor/MarshallingTests.java b/codemodel-foundation/src/test/java/build/codemodel/foundation/descriptor/MarshallingTests.java index 6a60f88..7ad7f84 100644 --- a/codemodel-foundation/src/test/java/build/codemodel/foundation/descriptor/MarshallingTests.java +++ b/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. diff --git a/codemodel-foundation/src/test/java/build/codemodel/foundation/naming/IrreducibleNameTests.java b/codemodel-foundation/src/test/java/build/codemodel/foundation/naming/IrreducibleNameTests.java index 138fdd8..659f289 100644 --- a/codemodel-foundation/src/test/java/build/codemodel/foundation/naming/IrreducibleNameTests.java +++ b/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. * diff --git a/codemodel-foundation/src/test/java/build/codemodel/foundation/naming/ModuleNameTests.java b/codemodel-foundation/src/test/java/build/codemodel/foundation/naming/ModuleNameTests.java index 35a62fa..f8a46c6 100644 --- a/codemodel-foundation/src/test/java/build/codemodel/foundation/naming/ModuleNameTests.java +++ b/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. * diff --git a/codemodel-foundation/src/test/java/build/codemodel/foundation/naming/NameProviderTests.java b/codemodel-foundation/src/test/java/build/codemodel/foundation/naming/NameProviderTests.java index 2d96bcc..bed5240 100644 --- a/codemodel-foundation/src/test/java/build/codemodel/foundation/naming/NameProviderTests.java +++ b/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. diff --git a/codemodel-foundation/src/test/java/build/codemodel/foundation/naming/NamespaceTests.java b/codemodel-foundation/src/test/java/build/codemodel/foundation/naming/NamespaceTests.java index 98f2cd4..5c4d3fa 100644 --- a/codemodel-foundation/src/test/java/build/codemodel/foundation/naming/NamespaceTests.java +++ b/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. * diff --git a/codemodel-foundation/src/test/java/build/codemodel/foundation/transport/ModuleNameTransformerTests.java b/codemodel-foundation/src/test/java/build/codemodel/foundation/transport/ModuleNameTransformerTests.java index 2d95162..7191dfa 100644 --- a/codemodel-foundation/src/test/java/build/codemodel/foundation/transport/ModuleNameTransformerTests.java +++ b/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. * diff --git a/codemodel-foundation/src/test/java/build/codemodel/foundation/transport/NamespaceTransformerTests.java b/codemodel-foundation/src/test/java/build/codemodel/foundation/transport/NamespaceTransformerTests.java index 6ad528e..004bcd2 100644 --- a/codemodel-foundation/src/test/java/build/codemodel/foundation/transport/NamespaceTransformerTests.java +++ b/codemodel-foundation/src/test/java/build/codemodel/foundation/transport/NamespaceTransformerTests.java @@ -2,10 +2,10 @@ import build.codemodel.foundation.naming.Namespace; 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. * diff --git a/codemodel-foundation/src/test/java/build/codemodel/foundation/transport/TypeNameTransformerTests.java b/codemodel-foundation/src/test/java/build/codemodel/foundation/transport/TypeNameTransformerTests.java index 67a1008..55a9490 100644 --- a/codemodel-foundation/src/test/java/build/codemodel/foundation/transport/TypeNameTransformerTests.java +++ b/codemodel-foundation/src/test/java/build/codemodel/foundation/transport/TypeNameTransformerTests.java @@ -4,10 +4,10 @@ import build.codemodel.foundation.naming.Namespace; import build.codemodel.foundation.naming.NonCachingNameProvider; import build.codemodel.foundation.naming.TypeName; -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 TypeNameTransformer}s. * diff --git a/codemodel-foundation/src/test/java/build/codemodel/foundation/usage/GenericTypeUsageTests.java b/codemodel-foundation/src/test/java/build/codemodel/foundation/usage/GenericTypeUsageTests.java index 1750fbe..d54b8d9 100644 --- a/codemodel-foundation/src/test/java/build/codemodel/foundation/usage/GenericTypeUsageTests.java +++ b/codemodel-foundation/src/test/java/build/codemodel/foundation/usage/GenericTypeUsageTests.java @@ -7,13 +7,13 @@ import build.codemodel.foundation.usage.pattern.GenericTypeUsagePattern; import build.codemodel.foundation.usage.pattern.NamedTypeUsagePattern; import build.codemodel.foundation.usage.pattern.TypeUsagePattern; -import static org.assertj.core.api.Assertions.assertThat; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.util.Optional; import java.util.Spliterator; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; +import static org.assertj.core.api.Assertions.assertThat; /** * Unit tests for {@link GenericTypeUsage}s. diff --git a/codemodel-foundation/src/test/java/build/codemodel/foundation/usage/MarshallingTests.java b/codemodel-foundation/src/test/java/build/codemodel/foundation/usage/MarshallingTests.java index f202be1..27e1713 100644 --- a/codemodel-foundation/src/test/java/build/codemodel/foundation/usage/MarshallingTests.java +++ b/codemodel-foundation/src/test/java/build/codemodel/foundation/usage/MarshallingTests.java @@ -5,8 +5,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,19 +16,18 @@ import build.codemodel.foundation.transport.ModuleNameTransformer; import build.codemodel.foundation.transport.NamespaceTransformer; import build.codemodel.foundation.transport.TypeNameTransformer; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; +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; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Marshalling tests for various {@link Marshal}able classes. diff --git a/codemodel-foundation/src/test/java/build/codemodel/foundation/usage/OptionalTypeUsageTests.java b/codemodel-foundation/src/test/java/build/codemodel/foundation/usage/OptionalTypeUsageTests.java index efd4ab7..2bfce22 100644 --- a/codemodel-foundation/src/test/java/build/codemodel/foundation/usage/OptionalTypeUsageTests.java +++ b/codemodel-foundation/src/test/java/build/codemodel/foundation/usage/OptionalTypeUsageTests.java @@ -5,12 +5,12 @@ import build.codemodel.foundation.naming.NonCachingNameProvider; import build.codemodel.foundation.usage.pattern.NamedTypeUsagePattern; import build.codemodel.foundation.usage.pattern.OptionalTypeUsagePattern; -import static org.assertj.core.api.Assertions.assertThat; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.util.Optional; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; +import static org.assertj.core.api.Assertions.assertThat; /** * Unit tests for {@link GenericTypeUsage}s with {@link Optional} types. diff --git a/codemodel-framework-builder/pom.xml b/codemodel-framework-builder/pom.xml index 8ba4334..917023c 100644 --- a/codemodel-framework-builder/pom.xml +++ b/codemodel-framework-builder/pom.xml @@ -34,6 +34,18 @@ ${base.version} + + build.base + base-mereology + ${base.version} + + + + build.base + base-telemetry + ${base.version} + + build.base base-telemetry-foundation @@ -46,6 +58,12 @@ ${revision} + + build.codemodel + jdk-codemodel + ${revision} + + build.codemodel codemodel-framework @@ -61,7 +79,7 @@ org.junit.jupiter - junit-jupiter-engine + junit-jupiter-api ${junit.version} test @@ -76,6 +94,18 @@ + + org.apache.maven.plugins + maven-dependency-plugin + + + + jakarta.inject:jakarta.inject-api + com.google.auto.service:auto-service-annotations + + + + maven-compiler-plugin diff --git a/codemodel-framework-builder/src/main/java/build/codemodel/framework/builder/InternalFramework.java b/codemodel-framework-builder/src/main/java/build/codemodel/framework/builder/InternalFramework.java index 0dd1860..a0f5159 100644 --- a/codemodel-framework-builder/src/main/java/build/codemodel/framework/builder/InternalFramework.java +++ b/codemodel-framework-builder/src/main/java/build/codemodel/framework/builder/InternalFramework.java @@ -28,8 +28,8 @@ import build.base.telemetry.Error; import build.base.telemetry.TelemetryRecorder; import build.base.telemetry.foundation.ObservableTelemetryRecorder; -import build.codemodel.foundation.ConceptualCodeModel; import build.codemodel.foundation.CodeModel; +import build.codemodel.foundation.ConceptualCodeModel; import build.codemodel.foundation.descriptor.Trait; import build.codemodel.foundation.descriptor.Traitable; import build.codemodel.foundation.descriptor.TypeDescriptor; diff --git a/codemodel-framework-builder/src/test/java/build/framework/implementation/compliance/FrameworkBuilderTests.java b/codemodel-framework-builder/src/test/java/build/framework/implementation/compliance/FrameworkBuilderTests.java index cf6717d..da0308a 100644 --- a/codemodel-framework-builder/src/test/java/build/framework/implementation/compliance/FrameworkBuilderTests.java +++ b/codemodel-framework-builder/src/test/java/build/framework/implementation/compliance/FrameworkBuilderTests.java @@ -4,11 +4,11 @@ import build.codemodel.foundation.naming.NonCachingNameProvider; import build.codemodel.framework.Framework; import build.codemodel.framework.builder.FrameworkBuilder; -import static org.assertj.core.api.Assertions.assertThat; +import org.junit.jupiter.api.Test; import java.nio.file.FileSystems; -import org.junit.jupiter.api.Test; +import static org.assertj.core.api.Assertions.assertThat; /** * {@link FrameworkBuilder} compliance tests. diff --git a/codemodel-framework/pom.xml b/codemodel-framework/pom.xml index 6590dcb..1332029 100644 --- a/codemodel-framework/pom.xml +++ b/codemodel-framework/pom.xml @@ -36,7 +36,7 @@ org.junit.jupiter - junit-jupiter-engine + junit-jupiter-api ${junit.version} test diff --git a/codemodel-framework/src/main/java/build/codemodel/framework/compiler/Compilation.java b/codemodel-framework/src/main/java/build/codemodel/framework/compiler/Compilation.java index a6edcdf..4106ec4 100644 --- a/codemodel-framework/src/main/java/build/codemodel/framework/compiler/Compilation.java +++ b/codemodel-framework/src/main/java/build/codemodel/framework/compiler/Compilation.java @@ -20,8 +20,8 @@ * #L% */ -import build.codemodel.framework.completer.Completer; import build.codemodel.foundation.CodeModel; +import build.codemodel.framework.completer.Completer; /** * Provides access to the successfully compiled {@link CodeModel}, including the ability to complete it with diff --git a/codemodel-framework/src/main/java/build/codemodel/framework/compiler/Compiler.java b/codemodel-framework/src/main/java/build/codemodel/framework/compiler/Compiler.java index 10a8fbe..57ee7ba 100644 --- a/codemodel-framework/src/main/java/build/codemodel/framework/compiler/Compiler.java +++ b/codemodel-framework/src/main/java/build/codemodel/framework/compiler/Compiler.java @@ -20,13 +20,13 @@ * #L% */ -import build.codemodel.framework.Framework; -import build.codemodel.framework.Plugin; -import build.codemodel.framework.Targetable; import build.base.telemetry.TelemetryRecorder; import build.codemodel.foundation.CodeModel; import build.codemodel.foundation.descriptor.Trait; import build.codemodel.foundation.descriptor.Traitable; +import build.codemodel.framework.Framework; +import build.codemodel.framework.Plugin; +import build.codemodel.framework.Targetable; import java.util.Optional; diff --git a/codemodel-framework/src/main/java/build/codemodel/framework/compiler/TypeChecker.java b/codemodel-framework/src/main/java/build/codemodel/framework/compiler/TypeChecker.java index 678700f..22f2ece 100644 --- a/codemodel-framework/src/main/java/build/codemodel/framework/compiler/TypeChecker.java +++ b/codemodel-framework/src/main/java/build/codemodel/framework/compiler/TypeChecker.java @@ -20,13 +20,13 @@ * #L% */ -import build.codemodel.framework.Framework; -import build.codemodel.framework.Plugin; -import build.codemodel.framework.Targetable; import build.base.telemetry.TelemetryRecorder; import build.codemodel.foundation.CodeModel; import build.codemodel.foundation.descriptor.Trait; import build.codemodel.foundation.descriptor.Traitable; +import build.codemodel.framework.Framework; +import build.codemodel.framework.Plugin; +import build.codemodel.framework.Targetable; import java.util.Optional; diff --git a/codemodel-framework/src/main/java/build/codemodel/framework/completer/Completer.java b/codemodel-framework/src/main/java/build/codemodel/framework/completer/Completer.java index a0aeddf..21a9d03 100644 --- a/codemodel-framework/src/main/java/build/codemodel/framework/completer/Completer.java +++ b/codemodel-framework/src/main/java/build/codemodel/framework/completer/Completer.java @@ -21,11 +21,11 @@ */ import build.base.telemetry.TelemetryRecorder; +import build.codemodel.foundation.CodeModel; import build.codemodel.framework.Plugin; import build.codemodel.framework.Targetable; import build.codemodel.framework.compiler.Compilation; import build.codemodel.framework.compiler.Compiler; -import build.codemodel.foundation.CodeModel; import java.util.Optional; diff --git a/codemodel-framework/src/main/java/build/codemodel/framework/completer/Completion.java b/codemodel-framework/src/main/java/build/codemodel/framework/completer/Completion.java index 122b26d..be73650 100644 --- a/codemodel-framework/src/main/java/build/codemodel/framework/completer/Completion.java +++ b/codemodel-framework/src/main/java/build/codemodel/framework/completer/Completion.java @@ -20,8 +20,8 @@ * #L% */ -import build.codemodel.framework.compiler.Compilation; import build.codemodel.foundation.CodeModel; +import build.codemodel.framework.compiler.Compilation; /** * Represent a successfully completed {@link CodeModel} {@link Compilation}. diff --git a/codemodel-framework/src/main/java/build/codemodel/framework/initialization/Enricher.java b/codemodel-framework/src/main/java/build/codemodel/framework/initialization/Enricher.java index 71b18d6..82751e0 100644 --- a/codemodel-framework/src/main/java/build/codemodel/framework/initialization/Enricher.java +++ b/codemodel-framework/src/main/java/build/codemodel/framework/initialization/Enricher.java @@ -20,10 +20,10 @@ * #L% */ -import build.codemodel.framework.Plugin; -import build.codemodel.framework.Targetable; import build.codemodel.foundation.descriptor.Trait; import build.codemodel.foundation.descriptor.Traitable; +import build.codemodel.framework.Plugin; +import build.codemodel.framework.Targetable; import java.lang.reflect.ParameterizedType; import java.util.Arrays; diff --git a/codemodel-framework/src/main/java/build/codemodel/framework/initialization/Initializer.java b/codemodel-framework/src/main/java/build/codemodel/framework/initialization/Initializer.java index 7f144d8..d6601ac 100644 --- a/codemodel-framework/src/main/java/build/codemodel/framework/initialization/Initializer.java +++ b/codemodel-framework/src/main/java/build/codemodel/framework/initialization/Initializer.java @@ -20,8 +20,8 @@ * #L% */ -import build.codemodel.framework.Plugin; import build.codemodel.foundation.CodeModel; +import build.codemodel.framework.Plugin; /** * A {@link Plugin} to initialize {@link CodeModel}s. diff --git a/codemodel-framework/src/test/java/build/framework/builder/EnricherTests.java b/codemodel-framework/src/test/java/build/framework/builder/EnricherTests.java index 61404f3..079e784 100644 --- a/codemodel-framework/src/test/java/build/framework/builder/EnricherTests.java +++ b/codemodel-framework/src/test/java/build/framework/builder/EnricherTests.java @@ -1,14 +1,14 @@ package build.framework.builder; -import build.codemodel.framework.initialization.Enricher; import build.codemodel.foundation.descriptor.Trait; import build.codemodel.foundation.descriptor.Traitable; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; +import build.codemodel.framework.initialization.Enricher; +import org.junit.jupiter.api.Test; import java.util.stream.Stream; -import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Unit tests for {@link Enricher}s. diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml index a23ecf9..f1f5907 100644 --- a/config/checkstyle/checkstyle.xml +++ b/config/checkstyle/checkstyle.xml @@ -10,6 +10,11 @@ + + + + + @@ -17,6 +22,7 @@ + @@ -45,28 +51,6 @@ - + diff --git a/config/intellij/CodeStyle.xml b/config/intellij/CodeStyle.xml new file mode 100644 index 0000000..eed5d50 --- /dev/null +++ b/config/intellij/CodeStyle.xml @@ -0,0 +1,84 @@ + + diff --git a/dependency-injection/pom.xml b/dependency-injection/pom.xml index e273b05..e327298 100644 --- a/dependency-injection/pom.xml +++ b/dependency-injection/pom.xml @@ -36,20 +36,26 @@ build.codemodel - jdk-codemodel + codemodel-foundation ${revision} - - org.junit.jupiter - junit-jupiter-api - ${junit.version} + build.codemodel + objectoriented-codemodel + ${revision} + + build.codemodel + jdk-codemodel + ${revision} + + + org.junit.jupiter - junit-jupiter-engine + junit-jupiter-api ${junit.version} test diff --git a/dependency-injection/src/main/java/build/codemodel/injection/ConstructorInjectionPoint.java b/dependency-injection/src/main/java/build/codemodel/injection/ConstructorInjectionPoint.java index 1d5e269..7d4c830 100644 --- a/dependency-injection/src/main/java/build/codemodel/injection/ConstructorInjectionPoint.java +++ b/dependency-injection/src/main/java/build/codemodel/injection/ConstructorInjectionPoint.java @@ -23,9 +23,9 @@ import build.codemodel.foundation.descriptor.FormalParameterDescriptor; import build.codemodel.foundation.descriptor.Traitable; import build.codemodel.foundation.usage.AnnotationTypeUsage; -import build.codemodel.objectoriented.descriptor.ConstructorDescriptor; import build.codemodel.jdk.descriptor.ConstructorType; import build.codemodel.jdk.descriptor.JDKTypeDescriptor; +import build.codemodel.objectoriented.descriptor.ConstructorDescriptor; import jakarta.inject.Qualifier; import java.lang.reflect.InvocationTargetException; diff --git a/dependency-injection/src/main/java/build/codemodel/injection/FieldInjectionPoint.java b/dependency-injection/src/main/java/build/codemodel/injection/FieldInjectionPoint.java index 6f08a0f..9a86c7d 100644 --- a/dependency-injection/src/main/java/build/codemodel/injection/FieldInjectionPoint.java +++ b/dependency-injection/src/main/java/build/codemodel/injection/FieldInjectionPoint.java @@ -22,9 +22,9 @@ import build.codemodel.foundation.descriptor.Traitable; import build.codemodel.foundation.usage.AnnotationTypeUsage; -import build.codemodel.objectoriented.descriptor.FieldDescriptor; import build.codemodel.jdk.descriptor.FieldType; import build.codemodel.jdk.descriptor.JDKTypeDescriptor; +import build.codemodel.objectoriented.descriptor.FieldDescriptor; import jakarta.inject.Qualifier; import java.util.Arrays; diff --git a/dependency-injection/src/main/java/build/codemodel/injection/InjectableDescriptor.java b/dependency-injection/src/main/java/build/codemodel/injection/InjectableDescriptor.java index 8f90d32..e78163a 100644 --- a/dependency-injection/src/main/java/build/codemodel/injection/InjectableDescriptor.java +++ b/dependency-injection/src/main/java/build/codemodel/injection/InjectableDescriptor.java @@ -21,8 +21,8 @@ */ import build.codemodel.foundation.descriptor.Trait; -import build.codemodel.objectoriented.descriptor.MethodDescriptor; import build.codemodel.jdk.descriptor.JDKTypeDescriptor; +import build.codemodel.objectoriented.descriptor.MethodDescriptor; import java.util.ArrayList; import java.util.Objects; diff --git a/dependency-injection/src/main/java/build/codemodel/injection/InjectionFramework.java b/dependency-injection/src/main/java/build/codemodel/injection/InjectionFramework.java index a8bb85c..cb44126 100644 --- a/dependency-injection/src/main/java/build/codemodel/injection/InjectionFramework.java +++ b/dependency-injection/src/main/java/build/codemodel/injection/InjectionFramework.java @@ -24,13 +24,13 @@ import build.codemodel.foundation.descriptor.Traitable; import build.codemodel.foundation.naming.NonCachingNameProvider; import build.codemodel.foundation.usage.AnnotationTypeUsage; -import build.codemodel.objectoriented.descriptor.Classification; -import build.codemodel.objectoriented.descriptor.MethodDescriptor; import build.codemodel.jdk.JDKCodeModel; import build.codemodel.jdk.descriptor.FieldType; import build.codemodel.jdk.descriptor.JDKType; import build.codemodel.jdk.descriptor.JDKTypeDescriptor; import build.codemodel.jdk.descriptor.Static; +import build.codemodel.objectoriented.descriptor.Classification; +import build.codemodel.objectoriented.descriptor.MethodDescriptor; import jakarta.inject.Inject; import jakarta.inject.Qualifier; import jakarta.inject.Singleton; diff --git a/dependency-injection/src/main/java/build/codemodel/injection/InjectionPoint.java b/dependency-injection/src/main/java/build/codemodel/injection/InjectionPoint.java index d5a91fb..57d7244 100644 --- a/dependency-injection/src/main/java/build/codemodel/injection/InjectionPoint.java +++ b/dependency-injection/src/main/java/build/codemodel/injection/InjectionPoint.java @@ -20,8 +20,8 @@ * #L% */ -import build.codemodel.jdk.descriptor.JDKTypeDescriptor; import build.codemodel.foundation.usage.TypeUsage; +import build.codemodel.jdk.descriptor.JDKTypeDescriptor; import java.util.stream.Stream; diff --git a/dependency-injection/src/main/java/build/codemodel/injection/MethodInjectionPoint.java b/dependency-injection/src/main/java/build/codemodel/injection/MethodInjectionPoint.java index ce19eec..07a4d3e 100644 --- a/dependency-injection/src/main/java/build/codemodel/injection/MethodInjectionPoint.java +++ b/dependency-injection/src/main/java/build/codemodel/injection/MethodInjectionPoint.java @@ -23,9 +23,9 @@ import build.codemodel.foundation.descriptor.FormalParameterDescriptor; import build.codemodel.foundation.descriptor.Traitable; import build.codemodel.foundation.usage.AnnotationTypeUsage; -import build.codemodel.objectoriented.descriptor.MethodDescriptor; import build.codemodel.jdk.descriptor.JDKTypeDescriptor; import build.codemodel.jdk.descriptor.MethodType; +import build.codemodel.objectoriented.descriptor.MethodDescriptor; import jakarta.inject.Qualifier; import java.lang.reflect.InvocationTargetException; diff --git a/dependency-injection/src/test/java/build/codemodel/injection/ConfigurationResolverTests.java b/dependency-injection/src/test/java/build/codemodel/injection/ConfigurationResolverTests.java index 6fc2b35..f49235b 100644 --- a/dependency-injection/src/test/java/build/codemodel/injection/ConfigurationResolverTests.java +++ b/dependency-injection/src/test/java/build/codemodel/injection/ConfigurationResolverTests.java @@ -4,10 +4,10 @@ import build.base.configuration.Configuration; import build.base.configuration.Default; import jakarta.inject.Inject; -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 ConfigurationResolver}. * diff --git a/dependency-injection/src/test/java/build/codemodel/injection/CyclicDependencyTests.java b/dependency-injection/src/test/java/build/codemodel/injection/CyclicDependencyTests.java index 3f56fa2..8b92c72 100644 --- a/dependency-injection/src/test/java/build/codemodel/injection/CyclicDependencyTests.java +++ b/dependency-injection/src/test/java/build/codemodel/injection/CyclicDependencyTests.java @@ -1,11 +1,11 @@ package build.codemodel.injection; import jakarta.inject.Inject; +import org.junit.jupiter.api.Test; + import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertThrows; -import org.junit.jupiter.api.Test; - /** * Tests for Injection Cyclic Dependencies. * diff --git a/dependency-injection/src/test/java/build/codemodel/injection/DefaultOptionResolverTests.java b/dependency-injection/src/test/java/build/codemodel/injection/DefaultOptionResolverTests.java index f7b606a..3ab533c 100644 --- a/dependency-injection/src/test/java/build/codemodel/injection/DefaultOptionResolverTests.java +++ b/dependency-injection/src/test/java/build/codemodel/injection/DefaultOptionResolverTests.java @@ -4,10 +4,10 @@ import build.base.configuration.Default; import build.base.configuration.Option; import jakarta.inject.Inject; -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 DefaultOptionResolver}. * diff --git a/dependency-injection/src/test/java/build/codemodel/injection/InjectionContextTests.java b/dependency-injection/src/test/java/build/codemodel/injection/InjectionContextTests.java index d2f7051..c6fec1c 100644 --- a/dependency-injection/src/test/java/build/codemodel/injection/InjectionContextTests.java +++ b/dependency-injection/src/test/java/build/codemodel/injection/InjectionContextTests.java @@ -11,15 +11,15 @@ import jakarta.inject.Inject; import jakarta.inject.Named; import jakarta.inject.Singleton; -import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.jupiter.api.Assertions.assertThrows; +import org.junit.jupiter.api.Test; import java.util.Optional; import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Supplier; import java.util.stream.Stream; -import org.junit.jupiter.api.Test; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertThrows; /** * Tests for {@link InjectionContext}s. diff --git a/dependency-injection/src/test/java/build/codemodel/injection/InjectionPointDiscoveryTests.java b/dependency-injection/src/test/java/build/codemodel/injection/InjectionPointDiscoveryTests.java index 9221f31..c623855 100644 --- a/dependency-injection/src/test/java/build/codemodel/injection/InjectionPointDiscoveryTests.java +++ b/dependency-injection/src/test/java/build/codemodel/injection/InjectionPointDiscoveryTests.java @@ -1,5 +1,7 @@ package build.codemodel.injection; +import build.codemodel.foundation.usage.AnnotationTypeUsage; +import build.codemodel.foundation.usage.AnnotationValue; import build.codemodel.injection.example.AbstractPerson; import build.codemodel.injection.example.ConstructorInjectablePerson; import build.codemodel.injection.example.FieldInjectablePerson; @@ -8,15 +10,13 @@ import build.codemodel.injection.example.MultipleConstructorPerson; import build.codemodel.injection.example.NonAbstractPerson; import build.codemodel.injection.example.SetterInjectablePerson; -import build.codemodel.foundation.usage.AnnotationTypeUsage; -import build.codemodel.foundation.usage.AnnotationValue; import jakarta.inject.Named; import jakarta.inject.Qualifier; -import static org.assertj.core.api.Assertions.assertThat; +import org.junit.jupiter.api.Test; import java.util.Objects; -import org.junit.jupiter.api.Test; +import static org.assertj.core.api.Assertions.assertThat; /** * Tests for discovering {@link InjectionPoint}s using the {@link InjectionFramework}. diff --git a/dependency-injection/src/test/java/build/codemodel/injection/OptionalResolverTests.java b/dependency-injection/src/test/java/build/codemodel/injection/OptionalResolverTests.java index 1fb489e..200b0e2 100644 --- a/dependency-injection/src/test/java/build/codemodel/injection/OptionalResolverTests.java +++ b/dependency-injection/src/test/java/build/codemodel/injection/OptionalResolverTests.java @@ -1,11 +1,11 @@ package build.codemodel.injection; import jakarta.inject.Inject; -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; /** * Tests for {@link OptionalResolver}. @@ -57,4 +57,4 @@ static class Injectable { @Inject public Optional optionalEmpty; } -} \ No newline at end of file +} diff --git a/dependency-injection/src/test/java/build/codemodel/injection/ProvidesResolverTests.java b/dependency-injection/src/test/java/build/codemodel/injection/ProvidesResolverTests.java index b527e73..4715096 100644 --- a/dependency-injection/src/test/java/build/codemodel/injection/ProvidesResolverTests.java +++ b/dependency-injection/src/test/java/build/codemodel/injection/ProvidesResolverTests.java @@ -1,10 +1,11 @@ package build.codemodel.injection; import jakarta.inject.Inject; -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; /** * Tests for {@link ProvidesResolver}. diff --git a/dependency-injection/src/test/java/build/codemodel/injection/QualifiedResolverTests.java b/dependency-injection/src/test/java/build/codemodel/injection/QualifiedResolverTests.java index dc7dab5..7f3ba23 100644 --- a/dependency-injection/src/test/java/build/codemodel/injection/QualifiedResolverTests.java +++ b/dependency-injection/src/test/java/build/codemodel/injection/QualifiedResolverTests.java @@ -2,11 +2,8 @@ import jakarta.inject.Inject; import jakarta.inject.Qualifier; -import static java.lang.annotation.ElementType.CONSTRUCTOR; -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.jupiter.api.Assertions.assertThrows; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.lang.annotation.Documented; import java.lang.annotation.Inherited; @@ -14,8 +11,11 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; +import static java.lang.annotation.ElementType.CONSTRUCTOR; +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertThrows; /** * Tests for {@link QualifiedResolver}. @@ -214,4 +214,4 @@ public String getValue() { } } } -} \ No newline at end of file +} diff --git a/dependency-injection/src/test/java/build/codemodel/injection/SystemPropertyInjectionTests.java b/dependency-injection/src/test/java/build/codemodel/injection/SystemPropertyInjectionTests.java index 3b2fe0a..88736c5 100644 --- a/dependency-injection/src/test/java/build/codemodel/injection/SystemPropertyInjectionTests.java +++ b/dependency-injection/src/test/java/build/codemodel/injection/SystemPropertyInjectionTests.java @@ -2,12 +2,12 @@ import build.codemodel.injection.example.SystemPropertyInjectablePerson; import jakarta.inject.Inject; +import org.junit.jupiter.api.Test; + import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Fail.fail; import static org.junit.jupiter.api.Assertions.assertThrows; -import org.junit.jupiter.api.Test; - /** * Tests for {@link SystemProperty} injection. * diff --git a/dependency-injection/src/test/java/build/codemodel/injection/compatibility/CompatibilityTests.java b/dependency-injection/src/test/java/build/codemodel/injection/compatibility/CompatibilityTests.java index 40bb73d..bdc88e9 100644 --- a/dependency-injection/src/test/java/build/codemodel/injection/compatibility/CompatibilityTests.java +++ b/dependency-injection/src/test/java/build/codemodel/injection/compatibility/CompatibilityTests.java @@ -6,15 +6,15 @@ import build.codemodel.injection.compatibility.accessories.Cupholder; import build.codemodel.injection.compatibility.accessories.RoundThing; import build.codemodel.injection.compatibility.accessories.SpareTire; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNotSame; import static org.junit.jupiter.api.Assertions.assertSame; import static org.junit.jupiter.api.Assertions.assertTrue; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; - /** * Quark Injection Jakarta Dependency Injection Compatibility Tests. *

diff --git a/expression-codemodel/pom.xml b/expression-codemodel/pom.xml index 7b7309b..e2c8218 100644 --- a/expression-codemodel/pom.xml +++ b/expression-codemodel/pom.xml @@ -22,6 +22,18 @@ ${revision} + + build.base + base-foundation + ${base.version} + + + + build.base + base-io + ${base.version} + + build.base base-marshalling @@ -37,7 +49,7 @@ org.junit.jupiter - junit-jupiter-engine + junit-jupiter-api ${junit.version} test @@ -45,7 +57,14 @@ org.junit.jupiter junit-jupiter-params - 5.11.1 + ${junit.version} + test + + + + com.fasterxml.jackson.core + jackson-core + ${jackson.version} test diff --git a/expression-codemodel/src/main/java/build/codemodel/expression/AbstractExpression.java b/expression-codemodel/src/main/java/build/codemodel/expression/AbstractExpression.java index f7a9b87..bd1c86a 100644 --- a/expression-codemodel/src/main/java/build/codemodel/expression/AbstractExpression.java +++ b/expression-codemodel/src/main/java/build/codemodel/expression/AbstractExpression.java @@ -28,7 +28,6 @@ import build.codemodel.foundation.descriptor.Trait; import build.codemodel.foundation.usage.TypeUsage; -import java.util.Objects; import java.util.Optional; import java.util.stream.Stream; diff --git a/expression-codemodel/src/main/java/build/codemodel/expression/Addition.java b/expression-codemodel/src/main/java/build/codemodel/expression/Addition.java index ab2443a..0745a40 100644 --- a/expression-codemodel/src/main/java/build/codemodel/expression/Addition.java +++ b/expression-codemodel/src/main/java/build/codemodel/expression/Addition.java @@ -20,10 +20,6 @@ * #L% */ -import java.lang.invoke.MethodHandles; -import java.util.Optional; -import java.util.stream.Stream; - import build.base.marshalling.Bound; import build.base.marshalling.Marshal; import build.base.marshalling.Marshalled; @@ -35,6 +31,10 @@ import build.codemodel.foundation.descriptor.Trait; import build.codemodel.foundation.usage.TypeUsage; +import java.lang.invoke.MethodHandles; +import java.util.Optional; +import java.util.stream.Stream; + /** * Defines an Addition between two {@link Expression}s. * diff --git a/expression-codemodel/src/main/java/build/codemodel/expression/AnyInCommon.java b/expression-codemodel/src/main/java/build/codemodel/expression/AnyInCommon.java index 8818c2e..69ed914 100644 --- a/expression-codemodel/src/main/java/build/codemodel/expression/AnyInCommon.java +++ b/expression-codemodel/src/main/java/build/codemodel/expression/AnyInCommon.java @@ -20,10 +20,6 @@ * #L% */ -import java.lang.invoke.MethodHandles; -import java.util.Optional; -import java.util.stream.Stream; - import build.base.marshalling.Bound; import build.base.marshalling.Marshal; import build.base.marshalling.Marshalled; @@ -35,6 +31,10 @@ import build.codemodel.foundation.descriptor.Trait; import build.codemodel.foundation.usage.TypeUsage; +import java.lang.invoke.MethodHandles; +import java.util.Optional; +import java.util.stream.Stream; + /** * Defines an Any In Common {@link ComparisonExpression} between two {@link Expression}s. * diff --git a/expression-codemodel/src/main/java/build/codemodel/expression/BooleanLiteral.java b/expression-codemodel/src/main/java/build/codemodel/expression/BooleanLiteral.java index 77501a4..020041e 100644 --- a/expression-codemodel/src/main/java/build/codemodel/expression/BooleanLiteral.java +++ b/expression-codemodel/src/main/java/build/codemodel/expression/BooleanLiteral.java @@ -20,10 +20,6 @@ * #L% */ -import java.lang.invoke.MethodHandles; -import java.util.Optional; -import java.util.stream.Stream; - import build.base.marshalling.Bound; import build.base.marshalling.Marshal; import build.base.marshalling.Marshalled; @@ -32,11 +28,14 @@ import build.base.marshalling.Out; import build.base.marshalling.Unmarshal; import build.codemodel.foundation.CodeModel; -import build.codemodel.foundation.descriptor.AbstractTraitable; import build.codemodel.foundation.descriptor.Trait; import build.codemodel.foundation.usage.SpecificTypeUsage; import build.codemodel.foundation.usage.TypeUsage; +import java.lang.invoke.MethodHandles; +import java.util.Optional; +import java.util.stream.Stream; + /** * Describes {@link Boolean}-based {@link Literal}. * diff --git a/expression-codemodel/src/main/java/build/codemodel/expression/Conjunction.java b/expression-codemodel/src/main/java/build/codemodel/expression/Conjunction.java index baf0c79..1644369 100644 --- a/expression-codemodel/src/main/java/build/codemodel/expression/Conjunction.java +++ b/expression-codemodel/src/main/java/build/codemodel/expression/Conjunction.java @@ -20,10 +20,6 @@ * #L% */ -import java.lang.invoke.MethodHandles; -import java.util.Optional; -import java.util.stream.Stream; - import build.base.marshalling.Bound; import build.base.marshalling.Marshal; import build.base.marshalling.Marshalled; @@ -35,6 +31,10 @@ import build.codemodel.foundation.descriptor.Trait; import build.codemodel.foundation.usage.TypeUsage; +import java.lang.invoke.MethodHandles; +import java.util.Optional; +import java.util.stream.Stream; + /** * Defines a Conjunction (and) of two * {@link LogicalExpression}s. diff --git a/expression-codemodel/src/main/java/build/codemodel/expression/EqualTo.java b/expression-codemodel/src/main/java/build/codemodel/expression/EqualTo.java index b755a43..c3de653 100644 --- a/expression-codemodel/src/main/java/build/codemodel/expression/EqualTo.java +++ b/expression-codemodel/src/main/java/build/codemodel/expression/EqualTo.java @@ -20,10 +20,6 @@ * #L% */ -import java.lang.invoke.MethodHandles; -import java.util.Optional; -import java.util.stream.Stream; - import build.base.marshalling.Bound; import build.base.marshalling.Marshal; import build.base.marshalling.Marshalled; @@ -35,6 +31,10 @@ import build.codemodel.foundation.descriptor.Trait; import build.codemodel.foundation.usage.TypeUsage; +import java.lang.invoke.MethodHandles; +import java.util.Optional; +import java.util.stream.Stream; + /** * Defines an equality {@link LogicalExpression} between two {@link Expression}s. * diff --git a/expression-codemodel/src/main/java/build/codemodel/expression/ExclusiveDisjunction.java b/expression-codemodel/src/main/java/build/codemodel/expression/ExclusiveDisjunction.java index 15f5b13..e4ea6fc 100644 --- a/expression-codemodel/src/main/java/build/codemodel/expression/ExclusiveDisjunction.java +++ b/expression-codemodel/src/main/java/build/codemodel/expression/ExclusiveDisjunction.java @@ -20,10 +20,6 @@ * #L% */ -import java.lang.invoke.MethodHandles; -import java.util.Optional; -import java.util.stream.Stream; - import build.base.marshalling.Bound; import build.base.marshalling.Marshal; import build.base.marshalling.Marshalled; @@ -35,6 +31,10 @@ import build.codemodel.foundation.descriptor.Trait; import build.codemodel.foundation.usage.TypeUsage; +import java.lang.invoke.MethodHandles; +import java.util.Optional; +import java.util.stream.Stream; + /** * Defines an exclusive Disjunction (xor) of two * {@link LogicalExpression}s. diff --git a/expression-codemodel/src/main/java/build/codemodel/expression/Exponent.java b/expression-codemodel/src/main/java/build/codemodel/expression/Exponent.java index 32f83fe..61716da 100644 --- a/expression-codemodel/src/main/java/build/codemodel/expression/Exponent.java +++ b/expression-codemodel/src/main/java/build/codemodel/expression/Exponent.java @@ -20,10 +20,6 @@ * #L% */ -import java.lang.invoke.MethodHandles; -import java.util.Optional; -import java.util.stream.Stream; - import build.base.marshalling.Bound; import build.base.marshalling.Marshal; import build.base.marshalling.Marshalled; @@ -35,6 +31,10 @@ import build.codemodel.foundation.descriptor.Trait; import build.codemodel.foundation.usage.TypeUsage; +import java.lang.invoke.MethodHandles; +import java.util.Optional; +import java.util.stream.Stream; + /** * Defines a Exponent between two {@link Expression}s. * diff --git a/expression-codemodel/src/main/java/build/codemodel/expression/Expressions.java b/expression-codemodel/src/main/java/build/codemodel/expression/Expressions.java index 3093cb3..0a8b0d5 100644 --- a/expression-codemodel/src/main/java/build/codemodel/expression/Expressions.java +++ b/expression-codemodel/src/main/java/build/codemodel/expression/Expressions.java @@ -20,9 +20,9 @@ * #L% */ -import build.codemodel.foundation.CodeModel; import build.codemodel.expression.naming.FunctionName; import build.codemodel.expression.naming.VariableName; +import build.codemodel.foundation.CodeModel; import build.codemodel.foundation.usage.TypeUsage; import java.util.Objects; diff --git a/expression-codemodel/src/main/java/build/codemodel/expression/FunctionUsage.java b/expression-codemodel/src/main/java/build/codemodel/expression/FunctionUsage.java index 5a47c82..3d0237f 100644 --- a/expression-codemodel/src/main/java/build/codemodel/expression/FunctionUsage.java +++ b/expression-codemodel/src/main/java/build/codemodel/expression/FunctionUsage.java @@ -20,9 +20,6 @@ * #L% */ -import build.codemodel.foundation.CodeModel; -import build.codemodel.foundation.descriptor.AbstractTraitable; -import build.codemodel.foundation.descriptor.Trait; import build.base.marshalling.Bound; import build.base.marshalling.Marshal; import build.base.marshalling.Marshalled; @@ -31,7 +28,8 @@ import build.base.marshalling.Out; import build.base.marshalling.Unmarshal; import build.codemodel.expression.naming.FunctionName; -import build.codemodel.expression.naming.VariableName; +import build.codemodel.foundation.CodeModel; +import build.codemodel.foundation.descriptor.Trait; import build.codemodel.foundation.usage.TypeUsage; import java.lang.invoke.MethodHandles; diff --git a/expression-codemodel/src/main/java/build/codemodel/expression/GreaterThan.java b/expression-codemodel/src/main/java/build/codemodel/expression/GreaterThan.java index af3b4b7..c615ec3 100644 --- a/expression-codemodel/src/main/java/build/codemodel/expression/GreaterThan.java +++ b/expression-codemodel/src/main/java/build/codemodel/expression/GreaterThan.java @@ -20,10 +20,6 @@ * #L% */ -import java.lang.invoke.MethodHandles; -import java.util.Optional; -import java.util.stream.Stream; - import build.base.marshalling.Bound; import build.base.marshalling.Marshal; import build.base.marshalling.Marshalled; @@ -35,6 +31,10 @@ import build.codemodel.foundation.descriptor.Trait; import build.codemodel.foundation.usage.TypeUsage; +import java.lang.invoke.MethodHandles; +import java.util.Optional; +import java.util.stream.Stream; + /** * Defines a Greater Than {@link LogicalExpression} between two {@link Expression}s. * diff --git a/expression-codemodel/src/main/java/build/codemodel/expression/LessThan.java b/expression-codemodel/src/main/java/build/codemodel/expression/LessThan.java index d6d04e7..fa11681 100644 --- a/expression-codemodel/src/main/java/build/codemodel/expression/LessThan.java +++ b/expression-codemodel/src/main/java/build/codemodel/expression/LessThan.java @@ -20,10 +20,6 @@ * #L% */ -import java.lang.invoke.MethodHandles; -import java.util.Optional; -import java.util.stream.Stream; - import build.base.marshalling.Bound; import build.base.marshalling.Marshal; import build.base.marshalling.Marshalled; @@ -35,6 +31,10 @@ import build.codemodel.foundation.descriptor.Trait; import build.codemodel.foundation.usage.TypeUsage; +import java.lang.invoke.MethodHandles; +import java.util.Optional; +import java.util.stream.Stream; + /** * Defines a Less Than {@link LogicalExpression} between two {@link Expression}s. * diff --git a/expression-codemodel/src/main/java/build/codemodel/expression/Modulo.java b/expression-codemodel/src/main/java/build/codemodel/expression/Modulo.java index 828fc66..6147858 100644 --- a/expression-codemodel/src/main/java/build/codemodel/expression/Modulo.java +++ b/expression-codemodel/src/main/java/build/codemodel/expression/Modulo.java @@ -20,10 +20,6 @@ * #L% */ -import java.lang.invoke.MethodHandles; -import java.util.Optional; -import java.util.stream.Stream; - import build.base.marshalling.Bound; import build.base.marshalling.Marshal; import build.base.marshalling.Marshalled; @@ -35,6 +31,10 @@ import build.codemodel.foundation.descriptor.Trait; import build.codemodel.foundation.usage.TypeUsage; +import java.lang.invoke.MethodHandles; +import java.util.Optional; +import java.util.stream.Stream; + /** * Defines a Modulo between two {@link Expression}s. * diff --git a/expression-codemodel/src/main/java/build/codemodel/expression/Multiplication.java b/expression-codemodel/src/main/java/build/codemodel/expression/Multiplication.java index 435318e..d0d41d8 100644 --- a/expression-codemodel/src/main/java/build/codemodel/expression/Multiplication.java +++ b/expression-codemodel/src/main/java/build/codemodel/expression/Multiplication.java @@ -20,10 +20,6 @@ * #L% */ -import java.lang.invoke.MethodHandles; -import java.util.Optional; -import java.util.stream.Stream; - import build.base.marshalling.Bound; import build.base.marshalling.Marshal; import build.base.marshalling.Marshalled; @@ -35,6 +31,10 @@ import build.codemodel.foundation.descriptor.Trait; import build.codemodel.foundation.usage.TypeUsage; +import java.lang.invoke.MethodHandles; +import java.util.Optional; +import java.util.stream.Stream; + /** * Defines a Multiplication between two {@link Expression}s. * diff --git a/expression-codemodel/src/main/java/build/codemodel/expression/Negative.java b/expression-codemodel/src/main/java/build/codemodel/expression/Negative.java index d8eb399..09a3561 100644 --- a/expression-codemodel/src/main/java/build/codemodel/expression/Negative.java +++ b/expression-codemodel/src/main/java/build/codemodel/expression/Negative.java @@ -20,10 +20,6 @@ * #L% */ -import java.lang.invoke.MethodHandles; -import java.util.Optional; -import java.util.stream.Stream; - import build.base.marshalling.Bound; import build.base.marshalling.Marshal; import build.base.marshalling.Marshalled; @@ -35,6 +31,10 @@ import build.codemodel.foundation.descriptor.Trait; import build.codemodel.foundation.usage.TypeUsage; +import java.lang.invoke.MethodHandles; +import java.util.Optional; +import java.util.stream.Stream; + /** * Defines a Negative {@link Expression}. * diff --git a/expression-codemodel/src/main/java/build/codemodel/expression/NoneInCommon.java b/expression-codemodel/src/main/java/build/codemodel/expression/NoneInCommon.java index fa27274..8e2a1b6 100644 --- a/expression-codemodel/src/main/java/build/codemodel/expression/NoneInCommon.java +++ b/expression-codemodel/src/main/java/build/codemodel/expression/NoneInCommon.java @@ -20,10 +20,6 @@ * #L% */ -import java.lang.invoke.MethodHandles; -import java.util.Optional; -import java.util.stream.Stream; - import build.base.marshalling.Bound; import build.base.marshalling.Marshal; import build.base.marshalling.Marshalled; @@ -35,6 +31,10 @@ import build.codemodel.foundation.descriptor.Trait; import build.codemodel.foundation.usage.TypeUsage; +import java.lang.invoke.MethodHandles; +import java.util.Optional; +import java.util.stream.Stream; + /** * Defines a None In Common {@link ComparisonExpression} between two {@link Expression}s. * diff --git a/expression-codemodel/src/main/java/build/codemodel/expression/NotEqualTo.java b/expression-codemodel/src/main/java/build/codemodel/expression/NotEqualTo.java index d620fed..e24078a 100644 --- a/expression-codemodel/src/main/java/build/codemodel/expression/NotEqualTo.java +++ b/expression-codemodel/src/main/java/build/codemodel/expression/NotEqualTo.java @@ -20,10 +20,6 @@ * #L% */ -import java.lang.invoke.MethodHandles; -import java.util.Optional; -import java.util.stream.Stream; - import build.base.marshalling.Bound; import build.base.marshalling.Marshal; import build.base.marshalling.Marshalled; @@ -35,6 +31,10 @@ import build.codemodel.foundation.descriptor.Trait; import build.codemodel.foundation.usage.TypeUsage; +import java.lang.invoke.MethodHandles; +import java.util.Optional; +import java.util.stream.Stream; + /** * Defines the negated equality {@link LogicalExpression} between two {@link Expression}s. * diff --git a/expression-codemodel/src/main/java/build/codemodel/expression/Subtraction.java b/expression-codemodel/src/main/java/build/codemodel/expression/Subtraction.java index aa0462f..5662057 100644 --- a/expression-codemodel/src/main/java/build/codemodel/expression/Subtraction.java +++ b/expression-codemodel/src/main/java/build/codemodel/expression/Subtraction.java @@ -20,10 +20,6 @@ * #L% */ -import java.lang.invoke.MethodHandles; -import java.util.Optional; -import java.util.stream.Stream; - import build.base.marshalling.Bound; import build.base.marshalling.Marshal; import build.base.marshalling.Marshalled; @@ -35,6 +31,10 @@ import build.codemodel.foundation.descriptor.Trait; import build.codemodel.foundation.usage.TypeUsage; +import java.lang.invoke.MethodHandles; +import java.util.Optional; +import java.util.stream.Stream; + /** * Defines a Subtraction between two {@link Expression}s. * diff --git a/expression-codemodel/src/main/java/build/codemodel/expression/Then.java b/expression-codemodel/src/main/java/build/codemodel/expression/Then.java index f695653..828bcb5 100644 --- a/expression-codemodel/src/main/java/build/codemodel/expression/Then.java +++ b/expression-codemodel/src/main/java/build/codemodel/expression/Then.java @@ -20,10 +20,6 @@ * #L% */ -import java.lang.invoke.MethodHandles; -import java.util.Optional; -import java.util.stream.Stream; - import build.base.marshalling.Bound; import build.base.marshalling.Marshal; import build.base.marshalling.Marshalled; @@ -35,6 +31,10 @@ import build.codemodel.foundation.descriptor.Trait; import build.codemodel.foundation.usage.TypeUsage; +import java.lang.invoke.MethodHandles; +import java.util.Optional; +import java.util.stream.Stream; + /** * Defines a Then {@link LogicalExpression} between two {@link Expression}s. * diff --git a/expression-codemodel/src/main/java/build/codemodel/expression/naming/AbstractCallableName.java b/expression-codemodel/src/main/java/build/codemodel/expression/naming/AbstractCallableName.java index 0edf5d5..ac4a09d 100644 --- a/expression-codemodel/src/main/java/build/codemodel/expression/naming/AbstractCallableName.java +++ b/expression-codemodel/src/main/java/build/codemodel/expression/naming/AbstractCallableName.java @@ -24,7 +24,6 @@ import build.base.marshalling.Marshal; import build.base.marshalling.Marshaller; import build.base.marshalling.Out; -import build.base.marshalling.Unmarshal; import build.codemodel.foundation.CodeModel; import build.codemodel.foundation.naming.CallableName; import build.codemodel.foundation.naming.IrreducibleName; diff --git a/expression-codemodel/src/main/java/build/codemodel/expression/naming/VariableName.java b/expression-codemodel/src/main/java/build/codemodel/expression/naming/VariableName.java index 9b2fc59..e61c244 100644 --- a/expression-codemodel/src/main/java/build/codemodel/expression/naming/VariableName.java +++ b/expression-codemodel/src/main/java/build/codemodel/expression/naming/VariableName.java @@ -26,7 +26,6 @@ import build.base.marshalling.Marshalling; import build.base.marshalling.Out; import build.base.marshalling.Unmarshal; -import build.codemodel.expression.BooleanLiteral; import build.codemodel.foundation.CodeModel; import build.codemodel.foundation.naming.IrreducibleName; import build.codemodel.foundation.naming.ModuleName; diff --git a/expression-codemodel/src/test/java/build/codemodel/expression/MarshallingTests.java b/expression-codemodel/src/test/java/build/codemodel/expression/MarshallingTests.java index a2835c1..fb25b33 100644 --- a/expression-codemodel/src/test/java/build/codemodel/expression/MarshallingTests.java +++ b/expression-codemodel/src/test/java/build/codemodel/expression/MarshallingTests.java @@ -7,8 +7,8 @@ import build.codemodel.expression.naming.FunctionName; import build.codemodel.expression.naming.VariableName; import build.codemodel.expression.parsing.EmptyExpression; -import build.codemodel.foundation.ConceptualCodeModel; import build.codemodel.foundation.CodeModel; +import build.codemodel.foundation.ConceptualCodeModel; import build.codemodel.foundation.descriptor.FormalParameterDescriptor; import build.codemodel.foundation.descriptor.PolymorphicTypeDescriptor; import build.codemodel.foundation.descriptor.TypeDescriptor; @@ -23,7 +23,10 @@ import build.codemodel.foundation.transport.TypeNameTransformer; import build.codemodel.foundation.usage.UnknownTypeUsage; 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 static org.junit.jupiter.api.Assertions.assertTrue; import java.io.IOException; @@ -33,11 +36,7 @@ import java.util.Optional; import java.util.stream.Stream; -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. diff --git a/expression-codemodel/src/test/java/build/codemodel/expression/naming/MarshallingTests.java b/expression-codemodel/src/test/java/build/codemodel/expression/naming/MarshallingTests.java index d1a7998..713b7a6 100644 --- a/expression-codemodel/src/test/java/build/codemodel/expression/naming/MarshallingTests.java +++ b/expression-codemodel/src/test/java/build/codemodel/expression/naming/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; @@ -15,18 +15,17 @@ import build.codemodel.foundation.transport.ModuleNameTransformer; import build.codemodel.foundation.transport.NamespaceTransformer; import build.codemodel.foundation.transport.TypeNameTransformer; -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. diff --git a/expression-codemodel/src/test/java/build/codemodel/expression/parsing/ExpressionParserTests.java b/expression-codemodel/src/test/java/build/codemodel/expression/parsing/ExpressionParserTests.java index d603f57..ee3d4a0 100644 --- a/expression-codemodel/src/test/java/build/codemodel/expression/parsing/ExpressionParserTests.java +++ b/expression-codemodel/src/test/java/build/codemodel/expression/parsing/ExpressionParserTests.java @@ -1,10 +1,34 @@ package build.codemodel.expression.parsing; -import build.codemodel.expression.*; +import build.codemodel.expression.Addition; +import build.codemodel.expression.AnyInCommon; +import build.codemodel.expression.Conjunction; +import build.codemodel.expression.Disjunction; +import build.codemodel.expression.Division; +import build.codemodel.expression.EqualTo; +import build.codemodel.expression.ExclusiveDisjunction; +import build.codemodel.expression.Exponent; +import build.codemodel.expression.Expression; +import build.codemodel.expression.FunctionUsage; +import build.codemodel.expression.GreaterThan; +import build.codemodel.expression.GreaterThanOrEqualTo; +import build.codemodel.expression.LessThan; +import build.codemodel.expression.LessThanOrEqualTo; +import build.codemodel.expression.Literal; +import build.codemodel.expression.Modulo; +import build.codemodel.expression.Multiplication; +import build.codemodel.expression.Negation; +import build.codemodel.expression.Negative; +import build.codemodel.expression.NoneInCommon; +import build.codemodel.expression.NotEqualTo; +import build.codemodel.expression.NumericLiteral; +import build.codemodel.expression.Subtraction; +import build.codemodel.expression.Then; +import build.codemodel.expression.VariableUsage; import build.codemodel.expression.naming.FunctionName; import build.codemodel.expression.naming.VariableName; -import build.codemodel.foundation.ConceptualCodeModel; import build.codemodel.foundation.CodeModel; +import build.codemodel.foundation.ConceptualCodeModel; import build.codemodel.foundation.naming.CachingNameProvider; import build.codemodel.foundation.naming.IrreducibleName; import build.codemodel.foundation.naming.NonCachingNameProvider; @@ -20,7 +44,10 @@ import java.math.BigDecimal; import java.util.stream.Stream; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertInstanceOf; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertThrows; /** * Tests for {@link ExpressionParser}. diff --git a/expression-codemodel/src/test/java/build/codemodel/expression/parsing/TemplateParserTests.java b/expression-codemodel/src/test/java/build/codemodel/expression/parsing/TemplateParserTests.java index 9239265..f3fbdaa 100644 --- a/expression-codemodel/src/test/java/build/codemodel/expression/parsing/TemplateParserTests.java +++ b/expression-codemodel/src/test/java/build/codemodel/expression/parsing/TemplateParserTests.java @@ -1,9 +1,11 @@ package build.codemodel.expression.parsing; -import build.codemodel.expression.*; +import build.codemodel.expression.Expression; +import build.codemodel.expression.StringLiteral; +import build.codemodel.expression.VariableUsage; import build.codemodel.expression.naming.VariableName; -import build.codemodel.foundation.ConceptualCodeModel; import build.codemodel.foundation.CodeModel; +import build.codemodel.foundation.ConceptualCodeModel; import build.codemodel.foundation.naming.CachingNameProvider; import build.codemodel.foundation.naming.IrreducibleName; import build.codemodel.foundation.naming.NonCachingNameProvider; @@ -15,7 +17,8 @@ import java.util.List; import java.util.stream.Stream; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; public class TemplateParserTests { diff --git a/hierarchical-codemodel/pom.xml b/hierarchical-codemodel/pom.xml index b6026b8..c98e993 100644 --- a/hierarchical-codemodel/pom.xml +++ b/hierarchical-codemodel/pom.xml @@ -37,7 +37,7 @@ org.junit.jupiter - junit-jupiter-engine + junit-jupiter-api ${junit.version} test @@ -49,4 +49,19 @@ test + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + + build.base:base-foundation + + + + + diff --git a/hierarchical-codemodel/src/main/java/build/codemodel/hierarchical/descriptor/ParentTypeDescriptor.java b/hierarchical-codemodel/src/main/java/build/codemodel/hierarchical/descriptor/ParentTypeDescriptor.java index 08117d6..e872226 100644 --- a/hierarchical-codemodel/src/main/java/build/codemodel/hierarchical/descriptor/ParentTypeDescriptor.java +++ b/hierarchical-codemodel/src/main/java/build/codemodel/hierarchical/descriptor/ParentTypeDescriptor.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.Trait; import build.codemodel.foundation.descriptor.Traitable; import build.codemodel.foundation.descriptor.TypeDescriptor; diff --git a/hierarchical-codemodel/src/test/java/build/codemodel/hierarchical/HierarchicalCodeModelTests.java b/hierarchical-codemodel/src/test/java/build/codemodel/hierarchical/HierarchicalCodeModelTests.java index 6c2b910..7ea9d04 100644 --- a/hierarchical-codemodel/src/test/java/build/codemodel/hierarchical/HierarchicalCodeModelTests.java +++ b/hierarchical-codemodel/src/test/java/build/codemodel/hierarchical/HierarchicalCodeModelTests.java @@ -9,14 +9,14 @@ import build.codemodel.foundation.usage.NamedTypeUsage; import build.codemodel.foundation.usage.SpecificTypeUsage; import build.codemodel.hierarchical.descriptor.HierarchicalTypeDescriptor; -import static org.assertj.core.api.Assertions.assertThat; +import org.junit.jupiter.api.Test; import java.util.LinkedHashMap; import java.util.LinkedHashSet; import java.util.stream.Collectors; import java.util.stream.Stream; -import org.junit.jupiter.api.Test; +import static org.assertj.core.api.Assertions.assertThat; /** * Tests for {@link HierarchicalCodeModel}s. diff --git a/imperative-codemodel/pom.xml b/imperative-codemodel/pom.xml index 3036603..9752cef 100644 --- a/imperative-codemodel/pom.xml +++ b/imperative-codemodel/pom.xml @@ -37,11 +37,25 @@ org.junit.jupiter - junit-jupiter-engine + junit-jupiter-api ${junit.version} test + + com.fasterxml.jackson.core + jackson-core + ${jackson.version} + test + + + + build.base + base-transport + ${base.version} + test + + build.base base-transport-json diff --git a/imperative-codemodel/src/test/java/build/codemodel/imperative/MarshallingTests.java b/imperative-codemodel/src/test/java/build/codemodel/imperative/MarshallingTests.java index 731770c..7a781af 100644 --- a/imperative-codemodel/src/test/java/build/codemodel/imperative/MarshallingTests.java +++ b/imperative-codemodel/src/test/java/build/codemodel/imperative/MarshallingTests.java @@ -8,8 +8,8 @@ import build.codemodel.expression.NumericLiteral; import build.codemodel.expression.VariableUsage; import build.codemodel.expression.naming.VariableName; -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; @@ -18,18 +18,17 @@ import build.codemodel.foundation.transport.ModuleNameTransformer; import build.codemodel.foundation.transport.NamespaceTransformer; import build.codemodel.foundation.transport.TypeNameTransformer; -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 in the objectoriented-codemodel naming package. @@ -234,4 +233,4 @@ private void marshallAndTransportAndUnMarshalAndAssert(T original) assertEquals(original, unmarshalled); } -} \ No newline at end of file +} diff --git a/jdk-annotation-discovery/src/main/java/build/codemodel/annotation/discovery/DiscoverableAnnotationDiscovery.java b/jdk-annotation-discovery/src/main/java/build/codemodel/annotation/discovery/DiscoverableAnnotationDiscovery.java index 4fe7ff5..cbb09a5 100644 --- a/jdk-annotation-discovery/src/main/java/build/codemodel/annotation/discovery/DiscoverableAnnotationDiscovery.java +++ b/jdk-annotation-discovery/src/main/java/build/codemodel/annotation/discovery/DiscoverableAnnotationDiscovery.java @@ -20,11 +20,11 @@ * #L% */ +import com.google.auto.service.AutoService; + import java.lang.annotation.Annotation; import java.util.stream.Stream; -import com.google.auto.service.AutoService; - /** * An {@link AnnotationDiscovery} for the {@link Discoverable}. * diff --git a/jdk-annotation-processor/pom.xml b/jdk-annotation-processor/pom.xml index 8104ed4..ed1d284 100644 --- a/jdk-annotation-processor/pom.xml +++ b/jdk-annotation-processor/pom.xml @@ -70,6 +70,18 @@ ${revision} + + build.codemodel + hierarchical-codemodel + ${revision} + + + + build.codemodel + objectoriented-codemodel + ${revision} + + build.codemodel jdk-codemodel @@ -102,22 +114,15 @@ - org.junit.jupiter - junit-jupiter-api - ${junit.version} + com.google.guava + guava + ${guava.version} test org.junit.jupiter - junit-jupiter-params - ${junit.version} - test - - - - org.junit.jupiter - junit-jupiter-engine + junit-jupiter-api ${junit.version} test @@ -139,6 +144,30 @@ + + org.apache.maven.plugins + maven-dependency-plugin + + + + jakarta.inject:jakarta.inject-api + com.google.auto.service:auto-service-annotations + build.base:base-marshalling + build.base:base-query + + + + build.codemodel:expression-codemodel + + + + build.base:base-mereology + + build.codemodel:expression-codemodel + + + + maven-compiler-plugin diff --git a/jdk-annotation-processor/src/main/java/build/codemodel/annotation/processing/AnnotationMirrorLocation.java b/jdk-annotation-processor/src/main/java/build/codemodel/annotation/processing/AnnotationMirrorLocation.java index 3b49784..7cf69e0 100644 --- a/jdk-annotation-processor/src/main/java/build/codemodel/annotation/processing/AnnotationMirrorLocation.java +++ b/jdk-annotation-processor/src/main/java/build/codemodel/annotation/processing/AnnotationMirrorLocation.java @@ -24,7 +24,6 @@ import java.util.Objects; import java.util.Optional; - import javax.lang.model.element.AnnotationMirror; import javax.lang.model.element.AnnotationValue; import javax.lang.model.element.Element; diff --git a/jdk-annotation-processor/src/main/java/build/codemodel/annotation/processing/AnnotationProcessor.java b/jdk-annotation-processor/src/main/java/build/codemodel/annotation/processing/AnnotationProcessor.java index 9861c91..3ec0007 100644 --- a/jdk-annotation-processor/src/main/java/build/codemodel/annotation/processing/AnnotationProcessor.java +++ b/jdk-annotation-processor/src/main/java/build/codemodel/annotation/processing/AnnotationProcessor.java @@ -74,6 +74,7 @@ import build.codemodel.objectoriented.descriptor.MethodDescriptor; import build.codemodel.objectoriented.descriptor.ParameterizedTypeDescriptor; import build.codemodel.objectoriented.naming.MethodName; +import com.google.auto.service.AutoService; import java.nio.file.FileSystem; import java.nio.file.FileSystems; @@ -90,7 +91,6 @@ import java.util.regex.PatternSyntaxException; import java.util.stream.Collectors; import java.util.stream.Stream; - import javax.annotation.processing.AbstractProcessor; import javax.annotation.processing.Filer; import javax.annotation.processing.Messager; @@ -121,8 +121,6 @@ import javax.lang.model.type.UnionType; import javax.lang.model.type.WildcardType; -import com.google.auto.service.AutoService; - /** * A {@link Processor} to discover, reverse-engineer and process discoverable annotations from source and byte code. * diff --git a/jdk-annotation-processor/src/main/java/build/codemodel/annotation/processing/AnnotationValueLocation.java b/jdk-annotation-processor/src/main/java/build/codemodel/annotation/processing/AnnotationValueLocation.java index f078da3..95876fe 100644 --- a/jdk-annotation-processor/src/main/java/build/codemodel/annotation/processing/AnnotationValueLocation.java +++ b/jdk-annotation-processor/src/main/java/build/codemodel/annotation/processing/AnnotationValueLocation.java @@ -24,7 +24,6 @@ import java.util.Objects; import java.util.Optional; - import javax.lang.model.element.AnnotationMirror; import javax.lang.model.element.AnnotationValue; import javax.lang.model.element.Element; diff --git a/jdk-annotation-processor/src/main/java/build/codemodel/annotation/processing/ElementLocation.java b/jdk-annotation-processor/src/main/java/build/codemodel/annotation/processing/ElementLocation.java index a0ce396..76f4bba 100644 --- a/jdk-annotation-processor/src/main/java/build/codemodel/annotation/processing/ElementLocation.java +++ b/jdk-annotation-processor/src/main/java/build/codemodel/annotation/processing/ElementLocation.java @@ -27,7 +27,6 @@ import java.net.URI; import java.util.Objects; import java.util.Optional; - import javax.lang.model.element.AnnotationMirror; import javax.lang.model.element.Element; diff --git a/jdk-annotation-processor/src/main/java/module-info.java b/jdk-annotation-processor/src/main/java/module-info.java index f09ebc6..f525f92 100644 --- a/jdk-annotation-processor/src/main/java/module-info.java +++ b/jdk-annotation-processor/src/main/java/module-info.java @@ -17,6 +17,7 @@ * limitations under the License. * #L% */ + import build.codemodel.annotation.discovery.AnnotationDiscovery; import build.codemodel.framework.Plugin; import build.codemodel.framework.compiler.Compiler; @@ -25,7 +26,6 @@ import build.codemodel.framework.initialization.Enricher; import java.lang.reflect.Type; - import javax.annotation.processing.Processor; /** @@ -52,7 +52,6 @@ requires build.base.telemetry.foundation; requires build.codemodel.foundation; - requires build.codemodel.expression; requires build.codemodel.imperative; requires build.codemodel.objectoriented; requires build.codemodel.jdk; diff --git a/jdk-annotation-processor/src/test/java/build/codemodel/annotation/processing/DiscoveryTests.java b/jdk-annotation-processor/src/test/java/build/codemodel/annotation/processing/DiscoveryTests.java index aa55deb..9cade57 100644 --- a/jdk-annotation-processor/src/test/java/build/codemodel/annotation/processing/DiscoveryTests.java +++ b/jdk-annotation-processor/src/test/java/build/codemodel/annotation/processing/DiscoveryTests.java @@ -1,21 +1,20 @@ package build.codemodel.annotation.processing; +import build.codemodel.jdk.descriptor.JDKTypeDescriptor; import build.codemodel.objectoriented.descriptor.Classification; import build.codemodel.objectoriented.descriptor.ExtendsTypeDescriptor; import build.codemodel.objectoriented.descriptor.FieldDescriptor; import build.codemodel.objectoriented.descriptor.MethodDescriptor; -import build.codemodel.jdk.descriptor.JDKTypeDescriptor; -import static org.assertj.core.api.Assertions.assertThat; +import com.google.testing.compile.Compilation; +import com.google.testing.compile.Compiler; +import com.google.testing.compile.JavaFileObjects; +import org.junit.jupiter.api.Test; import java.nio.file.FileSystems; import java.util.Arrays; import java.util.Optional; -import org.junit.jupiter.api.Test; - -import com.google.testing.compile.Compilation; -import com.google.testing.compile.Compiler; -import com.google.testing.compile.JavaFileObjects; +import static org.assertj.core.api.Assertions.assertThat; /** * Unit tests to ensure discovery of types using the {@link AnnotationProcessor}. diff --git a/jdk-annotation-processor/src/test/java/build/codemodel/annotation/processing/FieldDiscoveryTests.java b/jdk-annotation-processor/src/test/java/build/codemodel/annotation/processing/FieldDiscoveryTests.java index 8ad9717..da0da77 100644 --- a/jdk-annotation-processor/src/test/java/build/codemodel/annotation/processing/FieldDiscoveryTests.java +++ b/jdk-annotation-processor/src/test/java/build/codemodel/annotation/processing/FieldDiscoveryTests.java @@ -6,17 +6,16 @@ import build.codemodel.objectoriented.descriptor.AccessModifier; import build.codemodel.objectoriented.descriptor.FieldDescriptor; import build.codemodel.objectoriented.descriptor.MethodDescriptor; -import static org.assertj.core.api.Assertions.assertThat; +import com.google.testing.compile.Compilation; +import com.google.testing.compile.Compiler; +import com.google.testing.compile.JavaFileObjects; +import org.junit.jupiter.api.Test; import java.nio.file.FileSystems; import java.util.Arrays; import java.util.Optional; -import org.junit.jupiter.api.Test; - -import com.google.testing.compile.Compilation; -import com.google.testing.compile.Compiler; -import com.google.testing.compile.JavaFileObjects; +import static org.assertj.core.api.Assertions.assertThat; /** * Unit tests to ensure discovery of field types using the {@link AnnotationProcessor}. diff --git a/jdk-annotation-processor/src/test/java/build/codemodel/annotation/processing/MethodDiscoveryTests.java b/jdk-annotation-processor/src/test/java/build/codemodel/annotation/processing/MethodDiscoveryTests.java index c53352e..8018431 100644 --- a/jdk-annotation-processor/src/test/java/build/codemodel/annotation/processing/MethodDiscoveryTests.java +++ b/jdk-annotation-processor/src/test/java/build/codemodel/annotation/processing/MethodDiscoveryTests.java @@ -2,22 +2,21 @@ import build.codemodel.foundation.naming.IrreducibleName; import build.codemodel.foundation.usage.NamedTypeUsage; +import build.codemodel.jdk.descriptor.MethodImplementationDescriptor; import build.codemodel.objectoriented.descriptor.Classification; import build.codemodel.objectoriented.descriptor.FieldDescriptor; import build.codemodel.objectoriented.descriptor.MethodDescriptor; import build.codemodel.objectoriented.naming.MethodName; -import build.codemodel.jdk.descriptor.MethodImplementationDescriptor; -import static org.assertj.core.api.Assertions.assertThat; +import com.google.testing.compile.Compilation; +import com.google.testing.compile.Compiler; +import com.google.testing.compile.JavaFileObjects; +import org.junit.jupiter.api.Test; import java.nio.file.FileSystems; import java.util.Arrays; import java.util.Optional; -import org.junit.jupiter.api.Test; - -import com.google.testing.compile.Compilation; -import com.google.testing.compile.Compiler; -import com.google.testing.compile.JavaFileObjects; +import static org.assertj.core.api.Assertions.assertThat; /** * Unit tests to ensure discovery of constructor types using the {@link AnnotationProcessor}. diff --git a/jdk-annotation-processor/src/test/java/build/codemodel/annotation/processing/RecursivelyDefinedTypeDiscoveryTests.java b/jdk-annotation-processor/src/test/java/build/codemodel/annotation/processing/RecursivelyDefinedTypeDiscoveryTests.java index 85cc831..9195488 100644 --- a/jdk-annotation-processor/src/test/java/build/codemodel/annotation/processing/RecursivelyDefinedTypeDiscoveryTests.java +++ b/jdk-annotation-processor/src/test/java/build/codemodel/annotation/processing/RecursivelyDefinedTypeDiscoveryTests.java @@ -2,17 +2,16 @@ import build.codemodel.objectoriented.descriptor.FieldDescriptor; import build.codemodel.objectoriented.descriptor.MethodDescriptor; -import static org.assertj.core.api.Assertions.assertThat; +import com.google.testing.compile.Compilation; +import com.google.testing.compile.Compiler; +import com.google.testing.compile.JavaFileObjects; +import org.junit.jupiter.api.Test; import java.nio.file.FileSystems; import java.util.Arrays; import java.util.Optional; -import org.junit.jupiter.api.Test; - -import com.google.testing.compile.Compilation; -import com.google.testing.compile.Compiler; -import com.google.testing.compile.JavaFileObjects; +import static org.assertj.core.api.Assertions.assertThat; /** * Unit tests to ensure discovery of recursively defined types using the {@link AnnotationProcessor}. diff --git a/jdk-codemodel/pom.xml b/jdk-codemodel/pom.xml index 931de54..0346736 100644 --- a/jdk-codemodel/pom.xml +++ b/jdk-codemodel/pom.xml @@ -28,12 +28,36 @@ ${base.version} + + build.base + base-marshalling + ${base.version} + + build.codemodel codemodel-foundation ${revision} + + build.codemodel + expression-codemodel + ${revision} + + + + build.codemodel + hierarchical-codemodel + ${revision} + + + + build.codemodel + imperative-codemodel + ${revision} + + build.codemodel objectoriented-codemodel @@ -51,12 +75,6 @@ org.junit.jupiter junit-jupiter-api ${junit.version} - - - - org.junit.jupiter - junit-jupiter-engine - ${junit.version} test @@ -67,9 +85,16 @@ test + + com.fasterxml.jackson.core + jackson-core + ${jackson.version} + test + + build.base - base-transport-json + base-transport ${base.version} test @@ -80,6 +105,13 @@ ${base.version} + + build.base + base-transport-json + ${base.version} + test + + com.google.testing.compile compile-testing @@ -87,4 +119,19 @@ test + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + + build.base:base-telemetry-foundation + + + + + diff --git a/jdk-codemodel/src/main/java/build/codemodel/jdk/JdkExpressionConverter.java b/jdk-codemodel/src/main/java/build/codemodel/jdk/JdkExpressionConverter.java index 1d2cbf8..241599b 100644 --- a/jdk-codemodel/src/main/java/build/codemodel/jdk/JdkExpressionConverter.java +++ b/jdk-codemodel/src/main/java/build/codemodel/jdk/JdkExpressionConverter.java @@ -22,13 +22,13 @@ import build.codemodel.expression.Addition; import build.codemodel.expression.BooleanLiteral; -import build.codemodel.expression.ExpressionType; import build.codemodel.expression.Cast; import build.codemodel.expression.Conjunction; import build.codemodel.expression.Disjunction; import build.codemodel.expression.Division; import build.codemodel.expression.EqualTo; import build.codemodel.expression.Expression; +import build.codemodel.expression.ExpressionType; import build.codemodel.expression.GreaterThan; import build.codemodel.expression.GreaterThanOrEqualTo; import build.codemodel.expression.LessThan; @@ -66,11 +66,9 @@ import build.codemodel.jdk.expression.Ternary; import build.codemodel.jdk.expression.UnknownExpression; import build.codemodel.jdk.statement.ExpressionStatement; - import com.sun.source.tree.ArrayAccessTree; import com.sun.source.tree.AssignmentTree; import com.sun.source.tree.BinaryTree; -import com.sun.source.tree.CaseTree; import com.sun.source.tree.CompilationUnitTree; import com.sun.source.tree.CompoundAssignmentTree; import com.sun.source.tree.ConditionalExpressionTree; @@ -97,7 +95,6 @@ import java.util.List; import java.util.Optional; import java.util.function.Function; - import javax.lang.model.type.TypeKind; import javax.lang.model.type.TypeMirror; diff --git a/jdk-codemodel/src/main/java/build/codemodel/jdk/JdkInitializer.java b/jdk-codemodel/src/main/java/build/codemodel/jdk/JdkInitializer.java index 5300360..3d5a618 100644 --- a/jdk-codemodel/src/main/java/build/codemodel/jdk/JdkInitializer.java +++ b/jdk-codemodel/src/main/java/build/codemodel/jdk/JdkInitializer.java @@ -22,6 +22,8 @@ import build.base.foundation.Lazy; import build.codemodel.foundation.CodeModel; +import build.codemodel.foundation.descriptor.FormalParameterDescriptor; +import build.codemodel.foundation.descriptor.ThrowableDescriptor; import build.codemodel.foundation.naming.NameProvider; import build.codemodel.foundation.usage.AnnotationTypeUsage; import build.codemodel.foundation.usage.AnnotationValue; @@ -43,12 +45,12 @@ import build.codemodel.jdk.descriptor.EnumConstantDescriptor; import build.codemodel.jdk.descriptor.EnumType; import build.codemodel.jdk.descriptor.FieldInitializerDescriptor; +import build.codemodel.jdk.descriptor.Final; import build.codemodel.jdk.descriptor.JDKClassTypeDescriptor; import build.codemodel.jdk.descriptor.JDKInterfaceTypeDescriptor; import build.codemodel.jdk.descriptor.JDKTypeDescriptor; import build.codemodel.jdk.descriptor.MethodBodyDescriptor; import build.codemodel.jdk.descriptor.MethodImplementationDescriptor; -import build.codemodel.jdk.descriptor.Final; import build.codemodel.jdk.descriptor.RecordComponentDescriptor; import build.codemodel.jdk.descriptor.RecordType; import build.codemodel.jdk.descriptor.Static; @@ -60,9 +62,15 @@ import build.codemodel.objectoriented.descriptor.ImplementsTypeDescriptor; import build.codemodel.objectoriented.descriptor.MethodDescriptor; import build.codemodel.objectoriented.descriptor.ParameterizedTypeDescriptor; -import build.codemodel.foundation.descriptor.FormalParameterDescriptor; -import build.codemodel.foundation.descriptor.ThrowableDescriptor; import build.codemodel.objectoriented.naming.MethodName; +import com.sun.source.tree.ClassTree; +import com.sun.source.tree.CompilationUnitTree; +import com.sun.source.tree.MethodTree; +import com.sun.source.tree.VariableTree; +import com.sun.source.util.JavacTask; +import com.sun.source.util.TreePath; +import com.sun.source.util.TreeScanner; +import com.sun.source.util.Trees; import java.io.File; import java.io.IOException; @@ -75,15 +83,14 @@ import java.util.List; import java.util.Optional; import java.util.stream.Collectors; - import javax.lang.model.element.AnnotationMirror; import javax.lang.model.element.Element; import javax.lang.model.element.ElementKind; import javax.lang.model.element.ExecutableElement; import javax.lang.model.element.Modifier; +import javax.lang.model.element.RecordComponentElement; import javax.lang.model.element.TypeElement; import javax.lang.model.element.TypeParameterElement; -import javax.lang.model.element.RecordComponentElement; import javax.lang.model.element.VariableElement; import javax.lang.model.type.ArrayType; import javax.lang.model.type.DeclaredType; @@ -104,15 +111,6 @@ import javax.tools.StandardJavaFileManager; import javax.tools.ToolProvider; -import com.sun.source.tree.ClassTree; -import com.sun.source.tree.CompilationUnitTree; -import com.sun.source.tree.MethodTree; -import com.sun.source.tree.VariableTree; -import com.sun.source.util.JavacTask; -import com.sun.source.util.TreePath; -import com.sun.source.util.TreeScanner; -import com.sun.source.util.Trees; - /** * Initializes a {@link build.codemodel.foundation.CodeModel} by parsing Java source files using * {@code javac} and building {@link build.codemodel.jdk.descriptor.JDKTypeDescriptor}s. diff --git a/jdk-codemodel/src/main/java/build/codemodel/jdk/JdkStatementConverter.java b/jdk-codemodel/src/main/java/build/codemodel/jdk/JdkStatementConverter.java index bef498f..a07b554 100644 --- a/jdk-codemodel/src/main/java/build/codemodel/jdk/JdkStatementConverter.java +++ b/jdk-codemodel/src/main/java/build/codemodel/jdk/JdkStatementConverter.java @@ -38,17 +38,11 @@ import build.codemodel.jdk.statement.For; import build.codemodel.jdk.statement.Labeled; import build.codemodel.jdk.statement.LocalVariableDeclaration; -import build.codemodel.jdk.statement.Synchronized; import build.codemodel.jdk.statement.SwitchCase; import build.codemodel.jdk.statement.SwitchStatement; +import build.codemodel.jdk.statement.Synchronized; import build.codemodel.jdk.statement.Throw; import build.codemodel.jdk.statement.Try; - -import java.util.List; -import java.util.Optional; - -import javax.lang.model.element.Modifier; - import com.sun.source.tree.AssertTree; import com.sun.source.tree.BlockTree; import com.sun.source.tree.BreakTree; @@ -74,6 +68,10 @@ import com.sun.source.tree.WhileLoopTree; import com.sun.source.util.SimpleTreeVisitor; +import java.util.List; +import java.util.Optional; +import javax.lang.model.element.Modifier; + /** * Converts {@link StatementTree} nodes from the javac tree API to model {@link Statement} nodes. * diff --git a/jdk-codemodel/src/main/java/build/codemodel/jdk/TypeUsages.java b/jdk-codemodel/src/main/java/build/codemodel/jdk/TypeUsages.java index 39d3cd6..ce97018 100644 --- a/jdk-codemodel/src/main/java/build/codemodel/jdk/TypeUsages.java +++ b/jdk-codemodel/src/main/java/build/codemodel/jdk/TypeUsages.java @@ -34,7 +34,6 @@ import java.util.Objects; import java.util.Optional; import java.util.stream.Collectors; - import javax.annotation.processing.Generated; /** diff --git a/jdk-codemodel/src/main/java/build/codemodel/jdk/descriptor/JDKType.java b/jdk-codemodel/src/main/java/build/codemodel/jdk/descriptor/JDKType.java index 326d0b3..d9e8c26 100644 --- a/jdk-codemodel/src/main/java/build/codemodel/jdk/descriptor/JDKType.java +++ b/jdk-codemodel/src/main/java/build/codemodel/jdk/descriptor/JDKType.java @@ -20,13 +20,13 @@ * #L% */ +import build.codemodel.foundation.descriptor.Singular; +import build.codemodel.foundation.descriptor.Trait; + import java.lang.reflect.Field; import java.lang.reflect.Type; import java.util.Objects; -import build.codemodel.foundation.descriptor.Singular; -import build.codemodel.foundation.descriptor.Trait; - /** * A {@link Singular} {@link Trait} that captures a JDK {@link Type}. * diff --git a/jdk-codemodel/src/test/java/build/codemodel/jdk/ArrayAccessArrayTypeTests.java b/jdk-codemodel/src/test/java/build/codemodel/jdk/ArrayAccessArrayTypeTests.java index 069e596..37f5a37 100644 --- a/jdk-codemodel/src/test/java/build/codemodel/jdk/ArrayAccessArrayTypeTests.java +++ b/jdk-codemodel/src/test/java/build/codemodel/jdk/ArrayAccessArrayTypeTests.java @@ -1,14 +1,10 @@ package build.codemodel.jdk; -import build.codemodel.foundation.usage.NamedTypeUsage; -import build.codemodel.foundation.usage.TypeUsage; import build.codemodel.jdk.descriptor.MethodBodyDescriptor; import build.codemodel.jdk.expression.ArrayAccess; import build.codemodel.jdk.statement.LocalVariableDeclaration; import build.codemodel.objectoriented.descriptor.MethodDescriptor; - import com.google.testing.compile.JavaFileObjects; - import org.junit.jupiter.api.Test; import java.util.List; diff --git a/jdk-codemodel/src/test/java/build/codemodel/jdk/BodyCaptureTests.java b/jdk-codemodel/src/test/java/build/codemodel/jdk/BodyCaptureTests.java index ce04ad3..3eac350 100644 --- a/jdk-codemodel/src/test/java/build/codemodel/jdk/BodyCaptureTests.java +++ b/jdk-codemodel/src/test/java/build/codemodel/jdk/BodyCaptureTests.java @@ -7,9 +7,7 @@ import build.codemodel.objectoriented.descriptor.ConstructorDescriptor; import build.codemodel.objectoriented.descriptor.FieldDescriptor; import build.codemodel.objectoriented.descriptor.MethodDescriptor; - import com.google.testing.compile.JavaFileObjects; - import org.junit.jupiter.api.Test; import java.util.List; diff --git a/jdk-codemodel/src/test/java/build/codemodel/jdk/CodeModelTransportTests.java b/jdk-codemodel/src/test/java/build/codemodel/jdk/CodeModelTransportTests.java index 475fbb7..691b04c 100644 --- a/jdk-codemodel/src/test/java/build/codemodel/jdk/CodeModelTransportTests.java +++ b/jdk-codemodel/src/test/java/build/codemodel/jdk/CodeModelTransportTests.java @@ -11,16 +11,15 @@ import build.codemodel.foundation.transport.ModuleNameTransformer; import build.codemodel.foundation.transport.NamespaceTransformer; import build.codemodel.foundation.transport.TypeNameTransformer; -import static org.assertj.core.api.Assertions.assertThat; +import com.fasterxml.jackson.core.JsonFactory; +import com.fasterxml.jackson.core.StreamReadFeature; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.io.StringReader; import java.io.StringWriter; -import org.junit.jupiter.api.Test; - -import com.fasterxml.jackson.core.JsonFactory; -import com.fasterxml.jackson.core.StreamReadFeature; +import static org.assertj.core.api.Assertions.assertThat; /** * Tests to transport {@link CodeModel}s. diff --git a/jdk-codemodel/src/test/java/build/codemodel/jdk/DirectoryDiscoveryTests.java b/jdk-codemodel/src/test/java/build/codemodel/jdk/DirectoryDiscoveryTests.java index 40fb7d6..87cd27a 100644 --- a/jdk-codemodel/src/test/java/build/codemodel/jdk/DirectoryDiscoveryTests.java +++ b/jdk-codemodel/src/test/java/build/codemodel/jdk/DirectoryDiscoveryTests.java @@ -2,11 +2,11 @@ import build.codemodel.objectoriented.descriptor.FieldDescriptor; import build.codemodel.objectoriented.descriptor.MethodDescriptor; -import static org.assertj.core.api.Assertions.assertThat; +import org.junit.jupiter.api.Test; import java.nio.file.Path; -import org.junit.jupiter.api.Test; +import static org.assertj.core.api.Assertions.assertThat; /** * Tests for {@link JdkInitializer#ofDirectory(Path)}. diff --git a/jdk-codemodel/src/test/java/build/codemodel/jdk/DiscoveryTests.java b/jdk-codemodel/src/test/java/build/codemodel/jdk/DiscoveryTests.java index fb411a8..2a68153 100644 --- a/jdk-codemodel/src/test/java/build/codemodel/jdk/DiscoveryTests.java +++ b/jdk-codemodel/src/test/java/build/codemodel/jdk/DiscoveryTests.java @@ -5,14 +5,13 @@ import build.codemodel.objectoriented.descriptor.ExtendsTypeDescriptor; import build.codemodel.objectoriented.descriptor.FieldDescriptor; import build.codemodel.objectoriented.descriptor.MethodDescriptor; -import static org.assertj.core.api.Assertions.assertThat; +import com.google.testing.compile.JavaFileObjects; +import org.junit.jupiter.api.Test; import java.util.List; import java.util.Optional; -import org.junit.jupiter.api.Test; - -import com.google.testing.compile.JavaFileObjects; +import static org.assertj.core.api.Assertions.assertThat; /** * Tests for discovering types via {@link JdkInitializer}. diff --git a/jdk-codemodel/src/test/java/build/codemodel/jdk/ExpressionTypeResolutionTests.java b/jdk-codemodel/src/test/java/build/codemodel/jdk/ExpressionTypeResolutionTests.java index 8df52ea..2b0d4b1 100644 --- a/jdk-codemodel/src/test/java/build/codemodel/jdk/ExpressionTypeResolutionTests.java +++ b/jdk-codemodel/src/test/java/build/codemodel/jdk/ExpressionTypeResolutionTests.java @@ -9,9 +9,7 @@ import build.codemodel.jdk.statement.ExpressionStatement; import build.codemodel.jdk.statement.LocalVariableDeclaration; import build.codemodel.objectoriented.descriptor.MethodDescriptor; - import com.google.testing.compile.JavaFileObjects; - import org.junit.jupiter.api.Test; import java.util.List; diff --git a/jdk-codemodel/src/test/java/build/codemodel/jdk/FieldAccessReceiverTypeTests.java b/jdk-codemodel/src/test/java/build/codemodel/jdk/FieldAccessReceiverTypeTests.java index 50cb606..5dc3327 100644 --- a/jdk-codemodel/src/test/java/build/codemodel/jdk/FieldAccessReceiverTypeTests.java +++ b/jdk-codemodel/src/test/java/build/codemodel/jdk/FieldAccessReceiverTypeTests.java @@ -5,9 +5,7 @@ import build.codemodel.jdk.expression.FieldAccess; import build.codemodel.jdk.statement.LocalVariableDeclaration; import build.codemodel.objectoriented.descriptor.MethodDescriptor; - import com.google.testing.compile.JavaFileObjects; - import org.junit.jupiter.api.Test; import java.util.List; diff --git a/jdk-codemodel/src/test/java/build/codemodel/jdk/FieldDiscoveryTests.java b/jdk-codemodel/src/test/java/build/codemodel/jdk/FieldDiscoveryTests.java index a612d13..6b56bd7 100644 --- a/jdk-codemodel/src/test/java/build/codemodel/jdk/FieldDiscoveryTests.java +++ b/jdk-codemodel/src/test/java/build/codemodel/jdk/FieldDiscoveryTests.java @@ -4,14 +4,13 @@ import build.codemodel.objectoriented.descriptor.AccessModifier; import build.codemodel.objectoriented.descriptor.FieldDescriptor; import build.codemodel.objectoriented.descriptor.MethodDescriptor; -import static org.assertj.core.api.Assertions.assertThat; +import com.google.testing.compile.JavaFileObjects; +import org.junit.jupiter.api.Test; import java.util.List; import java.util.Optional; -import org.junit.jupiter.api.Test; - -import com.google.testing.compile.JavaFileObjects; +import static org.assertj.core.api.Assertions.assertThat; /** * Tests for discovering fields via {@link JdkInitializer}. diff --git a/jdk-codemodel/src/test/java/build/codemodel/jdk/GenericsDiscoveryTests.java b/jdk-codemodel/src/test/java/build/codemodel/jdk/GenericsDiscoveryTests.java index dc68b98..757fcc8 100644 --- a/jdk-codemodel/src/test/java/build/codemodel/jdk/GenericsDiscoveryTests.java +++ b/jdk-codemodel/src/test/java/build/codemodel/jdk/GenericsDiscoveryTests.java @@ -8,14 +8,13 @@ import build.codemodel.objectoriented.descriptor.FieldDescriptor; import build.codemodel.objectoriented.descriptor.MethodDescriptor; import build.codemodel.objectoriented.descriptor.ParameterizedTypeDescriptor; -import static org.assertj.core.api.Assertions.assertThat; +import com.google.testing.compile.JavaFileObjects; +import org.junit.jupiter.api.Test; import java.util.List; import java.util.Optional; -import org.junit.jupiter.api.Test; - -import com.google.testing.compile.JavaFileObjects; +import static org.assertj.core.api.Assertions.assertThat; /** * Tests for generic type discovery via {@link JdkInitializer}. diff --git a/jdk-codemodel/src/test/java/build/codemodel/jdk/JDKCodeModelTests.java b/jdk-codemodel/src/test/java/build/codemodel/jdk/JDKCodeModelTests.java index 1f32eec..cd89bfc 100644 --- a/jdk-codemodel/src/test/java/build/codemodel/jdk/JDKCodeModelTests.java +++ b/jdk-codemodel/src/test/java/build/codemodel/jdk/JDKCodeModelTests.java @@ -5,6 +5,11 @@ import build.codemodel.foundation.usage.AnnotationTypeUsage; import build.codemodel.foundation.usage.GenericTypeUsage; import build.codemodel.hierarchical.descriptor.HierarchicalTypeDescriptor; +import build.codemodel.jdk.descriptor.JDKTypeDescriptor; +import build.codemodel.jdk.example.AbstractPerson; +import build.codemodel.jdk.example.Container; +import build.codemodel.jdk.example.Description; +import build.codemodel.jdk.example.NonAbstractPerson; import build.codemodel.objectoriented.descriptor.AccessModifier; import build.codemodel.objectoriented.descriptor.Classification; import build.codemodel.objectoriented.descriptor.ConstructorDescriptor; @@ -12,15 +17,10 @@ import build.codemodel.objectoriented.descriptor.FieldDescriptor; import build.codemodel.objectoriented.descriptor.ImplementsTypeDescriptor; import build.codemodel.objectoriented.descriptor.MethodDescriptor; -import build.codemodel.jdk.descriptor.JDKTypeDescriptor; -import build.codemodel.jdk.example.AbstractPerson; -import build.codemodel.jdk.example.Container; -import build.codemodel.jdk.example.Description; -import build.codemodel.jdk.example.NonAbstractPerson; -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 JDKCodeModel}. * diff --git a/jdk-codemodel/src/test/java/build/codemodel/jdk/JdkInitializerTests.java b/jdk-codemodel/src/test/java/build/codemodel/jdk/JdkInitializerTests.java index 508a5f4..fed43b5 100644 --- a/jdk-codemodel/src/test/java/build/codemodel/jdk/JdkInitializerTests.java +++ b/jdk-codemodel/src/test/java/build/codemodel/jdk/JdkInitializerTests.java @@ -8,13 +8,13 @@ import build.codemodel.objectoriented.descriptor.FieldDescriptor; import build.codemodel.objectoriented.descriptor.MethodDescriptor; import com.google.testing.compile.JavaFileObjects; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatThrownBy; +import org.junit.jupiter.api.Test; import java.io.File; import java.util.List; -import org.junit.jupiter.api.Test; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; /** * Tests for {@link JdkInitializer}. diff --git a/jdk-codemodel/src/test/java/build/codemodel/jdk/MethodDiscoveryTests.java b/jdk-codemodel/src/test/java/build/codemodel/jdk/MethodDiscoveryTests.java index 5c69d00..ad362f0 100644 --- a/jdk-codemodel/src/test/java/build/codemodel/jdk/MethodDiscoveryTests.java +++ b/jdk-codemodel/src/test/java/build/codemodel/jdk/MethodDiscoveryTests.java @@ -5,14 +5,13 @@ import build.codemodel.objectoriented.descriptor.Classification; import build.codemodel.objectoriented.descriptor.FieldDescriptor; import build.codemodel.objectoriented.descriptor.MethodDescriptor; -import static org.assertj.core.api.Assertions.assertThat; +import com.google.testing.compile.JavaFileObjects; +import org.junit.jupiter.api.Test; import java.util.List; import java.util.Optional; -import org.junit.jupiter.api.Test; - -import com.google.testing.compile.JavaFileObjects; +import static org.assertj.core.api.Assertions.assertThat; /** * Tests for discovering methods via {@link JdkInitializer}. diff --git a/jdk-codemodel/src/test/java/build/codemodel/jdk/MethodInvocationReceiverTypeTests.java b/jdk-codemodel/src/test/java/build/codemodel/jdk/MethodInvocationReceiverTypeTests.java index 1c0e5c3..ec3d1f2 100644 --- a/jdk-codemodel/src/test/java/build/codemodel/jdk/MethodInvocationReceiverTypeTests.java +++ b/jdk-codemodel/src/test/java/build/codemodel/jdk/MethodInvocationReceiverTypeTests.java @@ -5,9 +5,7 @@ import build.codemodel.jdk.expression.MethodInvocation; import build.codemodel.jdk.statement.ExpressionStatement; import build.codemodel.objectoriented.descriptor.MethodDescriptor; - import com.google.testing.compile.JavaFileObjects; - import org.junit.jupiter.api.Test; import java.util.List; diff --git a/jdk-codemodel/src/test/java/build/codemodel/jdk/MethodReferenceQualifierTypeTests.java b/jdk-codemodel/src/test/java/build/codemodel/jdk/MethodReferenceQualifierTypeTests.java index 2ac6538..d33f17e 100644 --- a/jdk-codemodel/src/test/java/build/codemodel/jdk/MethodReferenceQualifierTypeTests.java +++ b/jdk-codemodel/src/test/java/build/codemodel/jdk/MethodReferenceQualifierTypeTests.java @@ -3,11 +3,8 @@ import build.codemodel.foundation.usage.NamedTypeUsage; import build.codemodel.jdk.descriptor.MethodBodyDescriptor; import build.codemodel.jdk.expression.MethodReference; -import build.codemodel.jdk.statement.ExpressionStatement; import build.codemodel.objectoriented.descriptor.MethodDescriptor; - import com.google.testing.compile.JavaFileObjects; - import org.junit.jupiter.api.Test; import java.util.List; diff --git a/jdk-codemodel/src/test/java/build/codemodel/jdk/RecursivelyDefinedTypeDiscoveryTests.java b/jdk-codemodel/src/test/java/build/codemodel/jdk/RecursivelyDefinedTypeDiscoveryTests.java index 725fc92..ec4ef19 100644 --- a/jdk-codemodel/src/test/java/build/codemodel/jdk/RecursivelyDefinedTypeDiscoveryTests.java +++ b/jdk-codemodel/src/test/java/build/codemodel/jdk/RecursivelyDefinedTypeDiscoveryTests.java @@ -2,14 +2,13 @@ import build.codemodel.objectoriented.descriptor.FieldDescriptor; import build.codemodel.objectoriented.descriptor.MethodDescriptor; -import static org.assertj.core.api.Assertions.assertThat; +import com.google.testing.compile.JavaFileObjects; +import org.junit.jupiter.api.Test; import java.util.List; import java.util.Optional; -import org.junit.jupiter.api.Test; - -import com.google.testing.compile.JavaFileObjects; +import static org.assertj.core.api.Assertions.assertThat; /** * Tests for handling recursively defined types via {@link JdkInitializer}. diff --git a/jdk-codemodel/src/test/java/build/codemodel/jdk/TypeUsagesTests.java b/jdk-codemodel/src/test/java/build/codemodel/jdk/TypeUsagesTests.java index 9af58db..807c874 100644 --- a/jdk-codemodel/src/test/java/build/codemodel/jdk/TypeUsagesTests.java +++ b/jdk-codemodel/src/test/java/build/codemodel/jdk/TypeUsagesTests.java @@ -5,11 +5,11 @@ import build.codemodel.foundation.usage.ArrayTypeUsage; import build.codemodel.foundation.usage.GenericTypeUsage; import build.codemodel.foundation.usage.TypeUsage; -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; /** * Tests for {@link TypeUsages}. diff --git a/jdk-codemodel/src/test/java/build/codemodel/jdk/descriptor/MarshallingTests.java b/jdk-codemodel/src/test/java/build/codemodel/jdk/descriptor/MarshallingTests.java index 79083af..e32fb7a 100644 --- a/jdk-codemodel/src/test/java/build/codemodel/jdk/descriptor/MarshallingTests.java +++ b/jdk-codemodel/src/test/java/build/codemodel/jdk/descriptor/MarshallingTests.java @@ -15,18 +15,17 @@ import build.codemodel.foundation.transport.NamespaceTransformer; import build.codemodel.foundation.transport.TypeNameTransformer; import build.codemodel.objectoriented.ObjectOrientedCodeModel; -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 in the objectoriented-codemodel naming package. @@ -124,4 +123,4 @@ private void marshallAndTransportAndUnMarshalAndAssert(T original) assertEquals(original, unmarshalled); } -} \ No newline at end of file +} diff --git a/mvnw b/mvnw index 19529dd..bd8896b 100755 --- a/mvnw +++ b/mvnw @@ -19,7 +19,7 @@ # ---------------------------------------------------------------------------- # ---------------------------------------------------------------------------- -# Apache Maven Wrapper startup batch script, version 3.3.2 +# Apache Maven Wrapper startup batch script, version 3.3.4 # # Optional ENV vars # ----------------- @@ -105,14 +105,17 @@ trim() { printf "%s" "${1}" | tr -d '[:space:]' } +scriptDir="$(dirname "$0")" +scriptName="$(basename "$0")" + # parse distributionUrl and optional distributionSha256Sum, requires .mvn/wrapper/maven-wrapper.properties while IFS="=" read -r key value; do case "${key-}" in distributionUrl) distributionUrl=$(trim "${value-}") ;; distributionSha256Sum) distributionSha256Sum=$(trim "${value-}") ;; esac -done <"${0%/*}/.mvn/wrapper/maven-wrapper.properties" -[ -n "${distributionUrl-}" ] || die "cannot read distributionUrl property in ${0%/*}/.mvn/wrapper/maven-wrapper.properties" +done <"$scriptDir/.mvn/wrapper/maven-wrapper.properties" +[ -n "${distributionUrl-}" ] || die "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties" case "${distributionUrl##*/}" in maven-mvnd-*bin.*) @@ -130,7 +133,7 @@ maven-mvnd-*bin.*) distributionUrl="${distributionUrl%-bin.*}-$distributionPlatform.zip" ;; maven-mvnd-*) MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ ;; -*) MVN_CMD="mvn${0##*/mvnw}" _MVNW_REPO_PATTERN=/org/apache/maven/ ;; +*) MVN_CMD="mvn${scriptName#mvnw}" _MVNW_REPO_PATTERN=/org/apache/maven/ ;; esac # apply MVNW_REPOURL and calculate MAVEN_HOME @@ -227,7 +230,7 @@ if [ -n "${distributionSha256Sum-}" ]; then echo "Please disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2 exit 1 elif command -v sha256sum >/dev/null; then - if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | sha256sum -c >/dev/null 2>&1; then + if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | sha256sum -c - >/dev/null 2>&1; then distributionSha256Result=true fi elif command -v shasum >/dev/null; then @@ -252,8 +255,41 @@ if command -v unzip >/dev/null; then else tar xzf${__MVNW_QUIET_TAR:+"$__MVNW_QUIET_TAR"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -C "$TMP_DOWNLOAD_DIR" || die "failed to untar" fi -printf %s\\n "$distributionUrl" >"$TMP_DOWNLOAD_DIR/$distributionUrlNameMain/mvnw.url" -mv -- "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" "$MAVEN_HOME" || [ -d "$MAVEN_HOME" ] || die "fail to move MAVEN_HOME" + +# Find the actual extracted directory name (handles snapshots where filename != directory name) +actualDistributionDir="" + +# First try the expected directory name (for regular distributions) +if [ -d "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" ]; then + if [ -f "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain/bin/$MVN_CMD" ]; then + actualDistributionDir="$distributionUrlNameMain" + fi +fi + +# If not found, search for any directory with the Maven executable (for snapshots) +if [ -z "$actualDistributionDir" ]; then + # enable globbing to iterate over items + set +f + for dir in "$TMP_DOWNLOAD_DIR"/*; do + if [ -d "$dir" ]; then + if [ -f "$dir/bin/$MVN_CMD" ]; then + actualDistributionDir="$(basename "$dir")" + break + fi + fi + done + set -f +fi + +if [ -z "$actualDistributionDir" ]; then + verbose "Contents of $TMP_DOWNLOAD_DIR:" + verbose "$(ls -la "$TMP_DOWNLOAD_DIR")" + die "Could not find Maven distribution directory in extracted archive" +fi + +verbose "Found extracted Maven distribution directory: $actualDistributionDir" +printf %s\\n "$distributionUrl" >"$TMP_DOWNLOAD_DIR/$actualDistributionDir/mvnw.url" +mv -- "$TMP_DOWNLOAD_DIR/$actualDistributionDir" "$MAVEN_HOME" || [ -d "$MAVEN_HOME" ] || die "fail to move MAVEN_HOME" clean || : exec_maven "$@" diff --git a/mvnw.cmd b/mvnw.cmd index b150b91..5761d94 100644 --- a/mvnw.cmd +++ b/mvnw.cmd @@ -19,7 +19,7 @@ @REM ---------------------------------------------------------------------------- @REM ---------------------------------------------------------------------------- -@REM Apache Maven Wrapper startup batch script, version 3.3.2 +@REM Apache Maven Wrapper startup batch script, version 3.3.4 @REM @REM Optional ENV vars @REM MVNW_REPOURL - repo url base for downloading maven distribution @@ -40,7 +40,7 @@ @SET __MVNW_ARG0_NAME__= @SET MVNW_USERNAME= @SET MVNW_PASSWORD= -@IF NOT "%__MVNW_CMD__%"=="" (%__MVNW_CMD__% %*) +@IF NOT "%__MVNW_CMD__%"=="" ("%__MVNW_CMD__%" %*) @echo Cannot start maven from wrapper >&2 && exit /b 1 @GOTO :EOF : end batch / begin powershell #> @@ -73,16 +73,30 @@ switch -wildcard -casesensitive ( $($distributionUrl -replace '^.*/','') ) { # apply MVNW_REPOURL and calculate MAVEN_HOME # maven home pattern: ~/.m2/wrapper/dists/{apache-maven-,maven-mvnd--}/ if ($env:MVNW_REPOURL) { - $MVNW_REPO_PATTERN = if ($USE_MVND) { "/org/apache/maven/" } else { "/maven/mvnd/" } - $distributionUrl = "$env:MVNW_REPOURL$MVNW_REPO_PATTERN$($distributionUrl -replace '^.*'+$MVNW_REPO_PATTERN,'')" + $MVNW_REPO_PATTERN = if ($USE_MVND -eq $False) { "/org/apache/maven/" } else { "/maven/mvnd/" } + $distributionUrl = "$env:MVNW_REPOURL$MVNW_REPO_PATTERN$($distributionUrl -replace "^.*$MVNW_REPO_PATTERN",'')" } $distributionUrlName = $distributionUrl -replace '^.*/','' $distributionUrlNameMain = $distributionUrlName -replace '\.[^.]*$','' -replace '-bin$','' -$MAVEN_HOME_PARENT = "$HOME/.m2/wrapper/dists/$distributionUrlNameMain" + +$MAVEN_M2_PATH = "$HOME/.m2" if ($env:MAVEN_USER_HOME) { - $MAVEN_HOME_PARENT = "$env:MAVEN_USER_HOME/wrapper/dists/$distributionUrlNameMain" + $MAVEN_M2_PATH = "$env:MAVEN_USER_HOME" +} + +if (-not (Test-Path -Path $MAVEN_M2_PATH)) { + New-Item -Path $MAVEN_M2_PATH -ItemType Directory | Out-Null +} + +$MAVEN_WRAPPER_DISTS = $null +if ((Get-Item $MAVEN_M2_PATH).Target[0] -eq $null) { + $MAVEN_WRAPPER_DISTS = "$MAVEN_M2_PATH/wrapper/dists" +} else { + $MAVEN_WRAPPER_DISTS = (Get-Item $MAVEN_M2_PATH).Target[0] + "/wrapper/dists" } -$MAVEN_HOME_NAME = ([System.Security.Cryptography.MD5]::Create().ComputeHash([byte[]][char[]]$distributionUrl) | ForEach-Object {$_.ToString("x2")}) -join '' + +$MAVEN_HOME_PARENT = "$MAVEN_WRAPPER_DISTS/$distributionUrlNameMain" +$MAVEN_HOME_NAME = ([System.Security.Cryptography.SHA256]::Create().ComputeHash([byte[]][char[]]$distributionUrl) | ForEach-Object {$_.ToString("x2")}) -join '' $MAVEN_HOME = "$MAVEN_HOME_PARENT/$MAVEN_HOME_NAME" if (Test-Path -Path "$MAVEN_HOME" -PathType Container) { @@ -134,7 +148,33 @@ if ($distributionSha256Sum) { # unzip and move Expand-Archive "$TMP_DOWNLOAD_DIR/$distributionUrlName" -DestinationPath "$TMP_DOWNLOAD_DIR" | Out-Null -Rename-Item -Path "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" -NewName $MAVEN_HOME_NAME | Out-Null + +# Find the actual extracted directory name (handles snapshots where filename != directory name) +$actualDistributionDir = "" + +# First try the expected directory name (for regular distributions) +$expectedPath = Join-Path "$TMP_DOWNLOAD_DIR" "$distributionUrlNameMain" +$expectedMvnPath = Join-Path "$expectedPath" "bin/$MVN_CMD" +if ((Test-Path -Path $expectedPath -PathType Container) -and (Test-Path -Path $expectedMvnPath -PathType Leaf)) { + $actualDistributionDir = $distributionUrlNameMain +} + +# If not found, search for any directory with the Maven executable (for snapshots) +if (!$actualDistributionDir) { + Get-ChildItem -Path "$TMP_DOWNLOAD_DIR" -Directory | ForEach-Object { + $testPath = Join-Path $_.FullName "bin/$MVN_CMD" + if (Test-Path -Path $testPath -PathType Leaf) { + $actualDistributionDir = $_.Name + } + } +} + +if (!$actualDistributionDir) { + Write-Error "Could not find Maven distribution directory in extracted archive" +} + +Write-Verbose "Found extracted Maven distribution directory: $actualDistributionDir" +Rename-Item -Path "$TMP_DOWNLOAD_DIR/$actualDistributionDir" -NewName $MAVEN_HOME_NAME | Out-Null try { Move-Item -Path "$TMP_DOWNLOAD_DIR/$MAVEN_HOME_NAME" -Destination $MAVEN_HOME_PARENT | Out-Null } catch { diff --git a/objectoriented-codemodel/pom.xml b/objectoriented-codemodel/pom.xml index bf5309d..6aa9809 100644 --- a/objectoriented-codemodel/pom.xml +++ b/objectoriented-codemodel/pom.xml @@ -29,9 +29,9 @@ - build.base - base-transport - ${base.version} + jakarta.inject + jakarta.inject-api + ${jakarta-inject.version} @@ -61,7 +61,7 @@ org.junit.jupiter - junit-jupiter-engine + junit-jupiter-api ${junit.version} test @@ -73,6 +73,20 @@ test + + com.fasterxml.jackson.core + jackson-core + ${jackson.version} + test + + + + build.base + base-transport + ${base.version} + test + + build.base base-transport-json @@ -80,4 +94,19 @@ test + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + + build.codemodel:imperative-codemodel + + + + + diff --git a/objectoriented-codemodel/src/main/java/build/codemodel/objectoriented/descriptor/ExtendsTypeDescriptor.java b/objectoriented-codemodel/src/main/java/build/codemodel/objectoriented/descriptor/ExtendsTypeDescriptor.java index 4fbd556..6b2d624 100644 --- a/objectoriented-codemodel/src/main/java/build/codemodel/objectoriented/descriptor/ExtendsTypeDescriptor.java +++ b/objectoriented-codemodel/src/main/java/build/codemodel/objectoriented/descriptor/ExtendsTypeDescriptor.java @@ -20,9 +20,6 @@ * #L% */ -import java.lang.invoke.MethodHandles; -import java.util.stream.Stream; - import build.base.marshalling.Bound; import build.base.marshalling.Marshal; import build.base.marshalling.Marshalled; @@ -36,6 +33,9 @@ import build.codemodel.foundation.usage.NamedTypeUsage; import build.codemodel.hierarchical.descriptor.AbstractParentTypeDescriptor; +import java.lang.invoke.MethodHandles; +import java.util.stream.Stream; + /** * A {@link Trait} representing that a {@link TypeDescriptor} {@code extends} or {@code inherits} from another * {@link TypeDescriptor}. diff --git a/objectoriented-codemodel/src/main/java/build/codemodel/objectoriented/descriptor/FieldDescriptor.java b/objectoriented-codemodel/src/main/java/build/codemodel/objectoriented/descriptor/FieldDescriptor.java index f5a45ab..f24484d 100644 --- a/objectoriented-codemodel/src/main/java/build/codemodel/objectoriented/descriptor/FieldDescriptor.java +++ b/objectoriented-codemodel/src/main/java/build/codemodel/objectoriented/descriptor/FieldDescriptor.java @@ -28,8 +28,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.AbstractTraitable; import build.codemodel.foundation.descriptor.Trait; import build.codemodel.foundation.descriptor.Traitable; diff --git a/objectoriented-codemodel/src/main/java/build/codemodel/objectoriented/descriptor/ParameterizedTypeDescriptor.java b/objectoriented-codemodel/src/main/java/build/codemodel/objectoriented/descriptor/ParameterizedTypeDescriptor.java index 7b46fd4..812d378 100644 --- a/objectoriented-codemodel/src/main/java/build/codemodel/objectoriented/descriptor/ParameterizedTypeDescriptor.java +++ b/objectoriented-codemodel/src/main/java/build/codemodel/objectoriented/descriptor/ParameterizedTypeDescriptor.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.AbstractTraitable; import build.codemodel.foundation.descriptor.Trait; import build.codemodel.foundation.descriptor.Traitable; diff --git a/objectoriented-codemodel/src/main/java/build/codemodel/objectoriented/descriptor/ThisUsage.java b/objectoriented-codemodel/src/main/java/build/codemodel/objectoriented/descriptor/ThisUsage.java index dd8eab3..dd4d5b2 100644 --- a/objectoriented-codemodel/src/main/java/build/codemodel/objectoriented/descriptor/ThisUsage.java +++ b/objectoriented-codemodel/src/main/java/build/codemodel/objectoriented/descriptor/ThisUsage.java @@ -27,9 +27,9 @@ import build.base.marshalling.Marshalling; import build.base.marshalling.Out; import build.base.marshalling.Unmarshal; -import build.codemodel.foundation.CodeModel; import build.codemodel.expression.AbstractExpression; import build.codemodel.expression.Expression; +import build.codemodel.foundation.CodeModel; import build.codemodel.foundation.descriptor.Trait; import build.codemodel.foundation.usage.TypeUsage; diff --git a/objectoriented-codemodel/src/main/java/build/codemodel/objectoriented/naming/MethodName.java b/objectoriented-codemodel/src/main/java/build/codemodel/objectoriented/naming/MethodName.java index 877f9e0..391ceef 100644 --- a/objectoriented-codemodel/src/main/java/build/codemodel/objectoriented/naming/MethodName.java +++ b/objectoriented-codemodel/src/main/java/build/codemodel/objectoriented/naming/MethodName.java @@ -28,12 +28,12 @@ import build.base.marshalling.Unmarshal; import build.codemodel.expression.naming.AbstractCallableName; import build.codemodel.expression.naming.FunctionName; +import build.codemodel.foundation.CodeModel; import build.codemodel.foundation.naming.CallableName; import build.codemodel.foundation.naming.IrreducibleName; import build.codemodel.foundation.naming.ModuleName; import build.codemodel.foundation.naming.Namespace; import build.codemodel.foundation.naming.TypeName; -import build.codemodel.foundation.CodeModel; import java.lang.invoke.MethodHandles; import java.util.Optional; diff --git a/objectoriented-codemodel/src/test/java/build/codemodel/objectoriented/descriptor/MarshallingTests.java b/objectoriented-codemodel/src/test/java/build/codemodel/objectoriented/descriptor/MarshallingTests.java index a39a968..4f7045e 100644 --- a/objectoriented-codemodel/src/test/java/build/codemodel/objectoriented/descriptor/MarshallingTests.java +++ b/objectoriented-codemodel/src/test/java/build/codemodel/objectoriented/descriptor/MarshallingTests.java @@ -25,7 +25,10 @@ import build.codemodel.foundation.usage.VoidTypeUsage; import build.codemodel.objectoriented.ObjectOrientedCodeModel; import build.codemodel.objectoriented.naming.MethodName; -import static org.assertj.core.api.Assertions.assertThat; +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; @@ -33,11 +36,7 @@ import java.util.Optional; import java.util.stream.Stream; -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.assertj.core.api.Assertions.assertThat; /** * Marshalling tests for various {@link Marshal}able classes in the objectoriented-codemodel descriptor package. @@ -346,4 +345,4 @@ private void marshallAndTransportAndUnMarshalAndAssert(T original) .isEqualTo(unmarshalled); } } -} \ No newline at end of file +} diff --git a/objectoriented-codemodel/src/test/java/build/codemodel/objectoriented/naming/MarshallingTests.java b/objectoriented-codemodel/src/test/java/build/codemodel/objectoriented/naming/MarshallingTests.java index 4a679c5..6f9f2a5 100644 --- a/objectoriented-codemodel/src/test/java/build/codemodel/objectoriented/naming/MarshallingTests.java +++ b/objectoriented-codemodel/src/test/java/build/codemodel/objectoriented/naming/MarshallingTests.java @@ -16,18 +16,17 @@ import build.codemodel.foundation.transport.NamespaceTransformer; import build.codemodel.foundation.transport.TypeNameTransformer; import build.codemodel.objectoriented.ObjectOrientedCodeModel; -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 in the objectoriented-codemodel naming package. @@ -139,4 +138,4 @@ private void marshallAndTransportAndUnMarshalAndAssert(T original) assertEquals(original, unmarshalled); } -} \ No newline at end of file +} diff --git a/pom.xml b/pom.xml index 500e7f4..a468b06 100644 --- a/pom.xml +++ b/pom.xml @@ -60,14 +60,19 @@ 0.21.5 1.18.4 0.23.0 - 6.0.1 + 33.4.8-jre + 2.21.2 + 6.0.3 2.0.1 - 5.18.0 + 5.23.0 - 3.14.1 + 3.15.0 0.10.0 3.6.0 + 13.3.0 + 3.9.14 + 3.10.0 3.6.2 1.7.3 3.2.8 @@ -119,8 +124,6 @@ ${java.version} ${java.version} ${java.version} - true - true true -parameters @@ -130,9 +133,6 @@ org.apache.maven.plugins maven-surefire-plugin ${maven-surefire-plugin.version} - - --enable-preview - @@ -205,6 +205,13 @@ org.apache.maven.plugins maven-checkstyle-plugin ${maven-checkstyle-plugin.version} + + + com.puppycrawl.tools + checkstyle + ${checkstyle.version} + + ${maven.multiModuleProjectDirectory}/config/checkstyle/checkstyle.xml @@ -232,7 +239,6 @@ module-info.java true ${java.version} - --enable-preview @@ -250,6 +256,19 @@ maven-enforcer-plugin ${maven-enforcer-plugin.version} + + enforce-maven-version + + enforce + + + + + ${maven.version} + + + + enforce-no-snapshots @@ -269,6 +288,24 @@ + + org.apache.maven.plugins + maven-dependency-plugin + ${maven-dependency-plugin.version} + + + analyze-dependencies + verify + + analyze-only + + + true + + + + + org.codehaus.mojo license-maven-plugin