From f56a8f3d771a64febd7586b7f1c7fa93cd1d1961 Mon Sep 17 00:00:00 2001 From: Tom Tourwe Date: Wed, 4 Nov 2026 16:55:00 +0100 Subject: [PATCH 1/2] run A: structure.optimizeImports(["**"], shortenQualifiedNames=False) --- .../maddi/aapi/archive/jdk/JavaAwt.java | 6 +- .../maddi/aapi/archive/jdk/JavaIo.java | 4 +- .../maddi/aapi/archive/jdk/JavaLang.java | 3 +- .../aapi/archive/jdk/JavaLangAnnotation.java | 8 +- .../aapi/archive/jdk/JavaLangConstant.java | 10 +- .../maddi/aapi/archive/jdk/JavaLangRef.java | 4 +- .../aapi/archive/jdk/JavaLangReflect.java | 7 +- .../maddi/aapi/archive/jdk/JavaNet.java | 6 +- .../maddi/aapi/archive/jdk/JavaNetHttp.java | 6 +- .../aapi/archive/jdk/JavaNioCharset.java | 2 +- .../maddi/aapi/archive/jdk/JavaNioFile.java | 15 +- .../maddi/aapi/archive/jdk/JavaSecurity.java | 14 +- .../maddi/aapi/archive/jdk/JavaTime.java | 10 +- .../aapi/archive/jdk/JavaTimeChrono.java | 4 +- .../aapi/archive/jdk/JavaTimeFormat.java | 2 +- .../aapi/archive/jdk/JavaTimeTemporal.java | 4 +- .../aapi/archive/jdk/JavaUtilConcurrent.java | 4 +- .../archive/jdk/JavaUtilConcurrentAtomic.java | 3 +- .../maddi/aapi/archive/jdk/JavaUtilJar.java | 8 +- .../aapi/archive/jdk/JavaUtilLogging.java | 2 +- .../aapi/archive/jdk/JavaUtilRandom.java | 3 +- .../maddi/aapi/archive/jdk/JavaUtilRegex.java | 4 +- .../aapi/archive/jdk/JavaUtilStream.java | 8 +- .../maddi/aapi/archive/jdk/JavaUtilZip.java | 7 +- .../maddi/aapi/archive/jdk/JavaxSwing.java | 9 +- .../aapi/archive/jdk/JavaxSwingTable.java | 9 +- .../aapi/archive/jdk/JavaxSwingText.java | 2 + .../OrgEclipseCollectionsApi.java | 3 +- .../OrgEclipseCollectionsApiAnnotation.java | 8 - .../OrgEclipseCollectionsApiBag.java | 5 +- .../OrgEclipseCollectionsApiBagSorted.java | 5 +- .../OrgEclipseCollectionsApiBimap.java | 6 +- .../OrgEclipseCollectionsApiCollection.java | 6 +- .../OrgEclipseCollectionsApiFactory.java | 5 +- .../OrgEclipseCollectionsApiFactoryBag.java | 8 +- ...EclipseCollectionsApiFactoryBagSorted.java | 7 +- ...lipseCollectionsApiFactoryBagStrategy.java | 6 +- .../OrgEclipseCollectionsApiFactoryBimap.java | 2 + .../OrgEclipseCollectionsApiFactoryList.java | 7 +- .../OrgEclipseCollectionsApiFactoryMap.java | 7 +- ...EclipseCollectionsApiFactoryMapSorted.java | 8 +- ...lipseCollectionsApiFactoryMapStrategy.java | 7 +- .../OrgEclipseCollectionsApiFactorySet.java | 7 +- ...EclipseCollectionsApiFactorySetSorted.java | 7 +- ...lipseCollectionsApiFactorySetStrategy.java | 7 +- .../OrgEclipseCollectionsApiFactoryStack.java | 8 +- .../OrgEclipseCollectionsApiIterator.java | 6 - .../OrgEclipseCollectionsApiList.java | 4 +- .../OrgEclipseCollectionsApiMap.java | 4 +- .../OrgEclipseCollectionsApiMapSorted.java | 5 +- .../OrgEclipseCollectionsApiMultimap.java | 4 +- .../OrgEclipseCollectionsApiMultimapBag.java | 3 +- .../OrgEclipseCollectionsApiMultimapList.java | 4 +- ...gEclipseCollectionsApiMultimapOrdered.java | 7 +- .../OrgEclipseCollectionsApiMultimapSet.java | 3 +- ...clipseCollectionsApiMultimapSortedbag.java | 3 +- ...clipseCollectionsApiMultimapSortedset.java | 4 +- .../OrgEclipseCollectionsApiOrdered.java | 8 +- .../OrgEclipseCollectionsApiPartition.java | 4 +- .../OrgEclipseCollectionsApiPartitionBag.java | 4 +- ...lipseCollectionsApiPartitionBagSorted.java | 4 +- ...OrgEclipseCollectionsApiPartitionList.java | 5 +- ...EclipseCollectionsApiPartitionOrdered.java | 6 +- .../OrgEclipseCollectionsApiPartitionSet.java | 5 +- ...lipseCollectionsApiPartitionSetSorted.java | 5 +- ...rgEclipseCollectionsApiPartitionStack.java | 5 +- .../OrgEclipseCollectionsApiSet.java | 4 +- .../OrgEclipseCollectionsApiSetSorted.java | 5 +- .../OrgEclipseCollectionsApiStack.java | 5 +- .../OrgEclipseCollectionsApiTuple.java | 7 +- .../libs/guava/ComGoogleCommonCollect.java | 16 +- .../libs/kotlin/KotlinCollections.java | 16 +- .../aapi/archive/libs/kotlin/KotlinIo.java | 6 +- .../archive/libs/kotlin/KotlinIoPath.java | 6 +- .../archive/libs/kotlin/KotlinReflect.java | 4 +- .../archive/libs/kotlin/KotlinSequences.java | 10 +- .../aapi/archive/libs/kotlin/KotlinText.java | 6 +- .../archive/libs/test/OrgJunitJupiterApi.java | 3 +- .../maddi/aapi/archive/libs/vavr/IoVavr.java | 31 +-- .../archive/libs/vavr/IoVavrCollection.java | 51 ++-- .../archive/libs/vavr/IoVavrConcurrent.java | 18 +- .../aapi/archive/libs/vavr/IoVavrControl.java | 10 +- .../maddi/analysis/api/AnalysisEngine.java | 18 +- .../maddi/analysis/api/AnalysisValueFeed.java | 4 +- .../analysis/api/ModificationOutcome.java | 6 +- .../analysis/api/ModificationRequest.java | 8 +- .../maddi/analysis/api/PrepOutcome.java | 4 +- .../maddi/analysis/api/PrepRequest.java | 8 +- .../callgraph/CallGraphContributions.java | 18 +- .../maddi/callgraph/ComputeAnalysisOrder.java | 17 +- .../maddi/callgraph/ComputeCallGraph.java | 30 +-- .../maddi/callgraph/PrimaryTypeUseGraph.java | 8 +- .../codelaser/maddi/callgraph/CommonTest.java | 32 +-- .../maddi/callgraph/TestAnalysisOrder.java | 15 +- .../maddi/callgraph/TestByNameReferences.java | 38 +-- .../maddi/callgraph/TestCallGraph.java | 17 +- .../callgraph/TestCallGraphArrayCreation.java | 17 +- .../callgraph/TestCallGraphContributions.java | 29 +- ...allGraphExplicitConstructorInvocation.java | 15 +- .../TestCallGraphSealedAnonEnum.java | 9 +- .../callgraph/TestCallGraphSwitchPattern.java | 9 +- .../maddi/callgraph/TestComputeCallGraph.java | 4 +- .../impl/analysis/AnalysisAccessRecorder.java | 6 +- .../analysis/ConsumptionEdgeRecorder.java | 10 +- .../analysis/ForwardingNullabilityFacts.java | 4 +- .../maddi/cst/impl/analysis/LinkFacts.java | 4 +- .../maddi/cst/impl/analysis/MessageImpl.java | 4 +- .../cst/impl/analysis/ModificationFacts.java | 2 +- .../cst/impl/analysis/NullAnnotations.java | 8 +- .../impl/analysis/PropertyProviderImpl.java | 4 +- .../impl/analysis/PropertyValueMapImpl.java | 11 +- .../maddi/cst/impl/analysis/ValueImpl.java | 8 +- .../TestEveryWritablePropertyDecodes.java | 10 +- .../impl/analysis/TestNullabilityValue.java | 7 +- .../maddi/cst/api/analysis/Codec.java | 14 +- .../maddi/cst/api/analysis/Message.java | 4 +- .../cst/api/analysis/PropertyValueMap.java | 7 +- .../maddi/cst/api/analysis/Value.java | 8 +- .../maddi/cst/api/element/Comment.java | 1 - .../cst/api/element/CompilationUnit.java | 6 +- .../cst/api/element/DetailedSources.java | 8 +- .../maddi/cst/api/element/Element.java | 9 +- .../maddi/cst/api/element/JavaDoc.java | 6 +- .../maddi/cst/api/element/ModuleInfo.java | 6 +- .../maddi/cst/api/element/RecordPattern.java | 4 +- .../maddi/cst/api/expression/And.java | 4 +- .../api/expression/AnnotationExpression.java | 7 +- .../cst/api/expression/ArrayInitializer.java | 4 +- .../cst/api/expression/CommaExpression.java | 4 +- .../api/expression/ConstantExpression.java | 1 - .../cst/api/expression/ConstructorCall.java | 4 +- .../maddi/cst/api/expression/Expression.java | 1 - .../maddi/cst/api/expression/InstanceOf.java | 1 - .../maddi/cst/api/expression/Lambda.java | 4 +- .../maddi/cst/api/expression/MethodCall.java | 4 +- .../cst/api/expression/MethodReference.java | 4 +- .../maddi/cst/api/expression/Or.java | 5 +- .../cst/api/expression/SwitchExpression.java | 6 +- .../cst/api/info/ComputeMethodOverrides.java | 6 +- .../maddi/cst/api/info/FieldInfo.java | 6 +- .../maddi/cst/api/info/ImportComputer.java | 7 +- .../io/codelaser/maddi/cst/api/info/Info.java | 6 +- .../maddi/cst/api/info/MethodInfo.java | 5 +- .../maddi/cst/api/info/MethodModifier.java | 3 - .../maddi/cst/api/info/ParameterInfo.java | 6 +- .../maddi/cst/api/info/TypeInfo.java | 12 +- .../maddi/cst/api/info/TypeParameter.java | 14 +- .../maddi/cst/api/info/TypePrinter.java | 4 +- .../maddi/cst/api/output/OutputBuilder.java | 2 - .../maddi/cst/api/output/Qualification.java | 4 +- .../codelaser/maddi/cst/api/runtime/Eval.java | 6 +- .../maddi/cst/api/runtime/Factory.java | 15 +- .../maddi/cst/api/runtime/Predefined.java | 6 +- .../maddi/cst/api/runtime/Types.java | 4 +- .../maddi/cst/api/statement/Block.java | 6 +- .../ExplicitConstructorInvocation.java | 4 +- .../maddi/cst/api/statement/ForStatement.java | 4 +- .../api/statement/LocalVariableCreation.java | 8 +- .../maddi/cst/api/statement/Statement.java | 8 +- .../maddi/cst/api/statement/SwitchEntry.java | 6 +- .../statement/SwitchStatementNewStyle.java | 6 +- .../statement/SwitchStatementOldStyle.java | 17 +- .../maddi/cst/api/statement/TryStatement.java | 6 +- .../cst/api/translate/TranslationMap.java | 14 +- .../maddi/cst/api/type/ParameterizedType.java | 16 +- .../codelaser/maddi/cst/api/util/ParSeq.java | 2 - .../maddi/cst/api/variable/Variable.java | 8 +- .../cst/impl/element/CompilationUnitImpl.java | 19 +- .../cst/impl/element/CompilationUnitStub.java | 11 +- .../cst/impl/element/DetailedSourcesImpl.java | 16 +- .../maddi/cst/impl/element/ElementImpl.java | 11 +- .../maddi/cst/impl/element/JavaDocImpl.java | 21 +- .../impl/element/MaddiAnnotationsImpl.java | 12 +- .../cst/impl/element/ModuleInfoImpl.java | 13 +- .../impl/element/MultiLineCommentImpl.java | 12 +- .../cst/impl/element/RecordPatternImpl.java | 9 +- .../impl/element/SingleLineCommentImpl.java | 11 +- .../maddi/cst/impl/element/SourceImpl.java | 4 +- .../maddi/cst/impl/expression/AndImpl.java | 13 +- .../expression/AnnotationExpressionImpl.java | 17 +- .../impl/expression/ArrayInitializerImpl.java | 11 +- .../cst/impl/expression/ArrayLengthImpl.java | 9 +- .../cst/impl/expression/AssignmentImpl.java | 11 +- .../impl/expression/BinaryOperatorImpl.java | 17 +- .../impl/expression/BitwiseNegationImpl.java | 5 +- .../impl/expression/BooleanConstantImpl.java | 4 +- .../cst/impl/expression/ByteConstantImpl.java | 5 +- .../maddi/cst/impl/expression/CastImpl.java | 11 +- .../cst/impl/expression/CharConstantImpl.java | 4 +- .../impl/expression/ClassExpressionImpl.java | 10 +- .../impl/expression/CommaExpressionImpl.java | 11 +- .../expression/ConstantExpressionImpl.java | 8 +- .../impl/expression/ConstructorCallImpl.java | 13 +- .../maddi/cst/impl/expression/DivideImpl.java | 5 +- .../impl/expression/DoubleConstantImpl.java | 4 +- .../impl/expression/EmptyExpressionImpl.java | 9 +- .../expression/EnclosedExpressionImpl.java | 11 +- .../maddi/cst/impl/expression/EqualsImpl.java | 5 +- .../cst/impl/expression/ExpressionImpl.java | 4 +- .../impl/expression/FloatConstantImpl.java | 5 +- .../impl/expression/GreaterThanZeroImpl.java | 11 +- .../expression/InlineConditionalImpl.java | 11 +- .../cst/impl/expression/InstanceOfImpl.java | 11 +- .../cst/impl/expression/IntConstantImpl.java | 4 +- .../maddi/cst/impl/expression/LambdaImpl.java | 11 +- .../cst/impl/expression/LongConstantImpl.java | 4 +- .../cst/impl/expression/MethodCallImpl.java | 11 +- .../impl/expression/MethodReferenceImpl.java | 17 +- .../cst/impl/expression/NegationImpl.java | 5 +- .../cst/impl/expression/NullConstantImpl.java | 4 +- .../maddi/cst/impl/expression/OrImpl.java | 13 +- .../cst/impl/expression/ProductImpl.java | 5 +- .../cst/impl/expression/RemainderImpl.java | 6 +- .../impl/expression/ShortConstantImpl.java | 4 +- .../cst/impl/expression/StringConcatImpl.java | 7 +- .../impl/expression/StringConstantImpl.java | 6 +- .../maddi/cst/impl/expression/SumImpl.java | 5 +- .../impl/expression/SwitchExpressionImpl.java | 13 +- .../cst/impl/expression/TextBlockImpl.java | 4 +- .../impl/expression/TypeExpressionImpl.java | 15 +- .../impl/expression/UnaryOperatorImpl.java | 11 +- .../expression/VariableExpressionImpl.java | 11 +- .../cst/impl/expression/eval/EvalAnd.java | 13 +- .../cst/impl/expression/eval/EvalBoolean.java | 12 +- .../impl/expression/eval/EvalConstant.java | 4 +- .../cst/impl/expression/eval/EvalDivide.java | 1 - .../cst/impl/expression/eval/EvalEquals.java | 9 +- .../impl/expression/eval/EvalInequality.java | 4 +- .../eval/EvalInlineConditional.java | 4 +- .../impl/expression/eval/EvalNegation.java | 8 +- .../cst/impl/expression/eval/EvalOr.java | 13 +- .../cst/impl/expression/eval/EvalProduct.java | 4 +- .../impl/expression/eval/EvalRemainder.java | 1 - .../cst/impl/expression/eval/EvalSum.java | 8 +- .../cst/impl/expression/util/AndOrSorter.java | 6 +- .../expression/util/ExpressionComparator.java | 11 +- .../util/ExtractComponentsOfTooComplex.java | 8 +- .../expression/util/InequalityHelper.java | 6 +- .../expression/util/InequalitySolver.java | 6 +- .../cst/impl/expression/util/Interval.java | 4 +- .../cst/impl/expression/util/LhsRhs.java | 4 +- .../util/LinearInequalityInOneVariable.java | 4 +- .../util/LinearInequalityInTwoVariables.java | 4 +- .../impl/info/CompilationUnitPrinterImpl.java | 6 +- .../impl/info/ComputeMethodOverridesImpl.java | 15 +- .../maddi/cst/impl/info/FieldInfoImpl.java | 13 +- .../maddi/cst/impl/info/FieldInspection.java | 4 +- .../cst/impl/info/FieldInspectionImpl.java | 6 +- .../maddi/cst/impl/info/FieldPrinterImpl.java | 10 +- .../cst/impl/info/ImportComputerImpl.java | 15 +- .../maddi/cst/impl/info/InfoImpl.java | 6 +- .../maddi/cst/impl/info/InfoMapImpl.java | 12 +- .../maddi/cst/impl/info/Inspection.java | 4 +- .../maddi/cst/impl/info/InspectionImpl.java | 9 +- .../maddi/cst/impl/info/MethodInfoImpl.java | 16 +- .../maddi/cst/impl/info/MethodInspection.java | 8 +- .../cst/impl/info/MethodInspectionImpl.java | 11 +- .../cst/impl/info/MethodPrinterImpl.java | 12 +- .../cst/impl/info/ParameterInfoImpl.java | 12 +- .../impl/info/ParameterInspectionImpl.java | 1 - .../maddi/cst/impl/info/TypeInfoImpl.java | 20 +- .../maddi/cst/impl/info/TypeInspection.java | 10 +- .../cst/impl/info/TypeInspectionImpl.java | 6 +- .../impl/info/TypeParameterInspection.java | 4 +- .../info/TypeParameterInspectionImpl.java | 6 +- .../maddi/cst/impl/info/TypePrinterImpl.java | 14 +- .../cst/impl/info/util/MethodMapImpl.java | 9 +- .../maddi/cst/impl/output/BlankLineImpl.java | 4 +- .../cst/impl/output/ElementarySpaceEnum.java | 4 +- .../maddi/cst/impl/output/GuideImpl.java | 4 +- .../cst/impl/output/OutputBuilderImpl.java | 6 +- .../cst/impl/output/QualificationImpl.java | 10 +- .../maddi/cst/impl/output/SpaceEnum.java | 4 +- .../maddi/cst/impl/output/SymbolEnum.java | 5 +- .../impl/output/TextBlockFormattingImpl.java | 4 +- .../maddi/cst/impl/runtime/EvalImpl.java | 10 +- .../maddi/cst/impl/runtime/FactoryImpl.java | 15 +- .../cst/impl/runtime/PredefinedImpl.java | 6 +- .../maddi/cst/impl/runtime/RuntimeImpl.java | 12 +- .../impl/statement/AssertStatementImpl.java | 11 +- .../maddi/cst/impl/statement/BlockImpl.java | 15 +- .../BreakOrContinueStatementImpl.java | 10 +- .../impl/statement/BreakStatementImpl.java | 7 +- .../impl/statement/ContinueStatementImpl.java | 7 +- .../cst/impl/statement/DoStatementImpl.java | 11 +- .../impl/statement/EmptyStatementImpl.java | 11 +- .../ExplicitConstructorInvocationImpl.java | 11 +- .../statement/ExpressionAsStatementImpl.java | 11 +- .../impl/statement/ForEachStatementImpl.java | 11 +- .../cst/impl/statement/ForStatementImpl.java | 15 +- .../impl/statement/IfElseStatementImpl.java | 11 +- .../impl/statement/ImportStatementImpl.java | 11 +- .../statement/LocalTypeDeclarationImpl.java | 9 +- .../statement/LocalVariableCreationImpl.java | 9 +- .../impl/statement/ReturnStatementImpl.java | 11 +- .../cst/impl/statement/StatementImpl.java | 6 +- .../cst/impl/statement/SwitchEntryImpl.java | 13 +- .../SwitchStatementNewStyleImpl.java | 15 +- .../SwitchStatementOldStyleImpl.java | 9 +- .../statement/SynchronizedStatementImpl.java | 11 +- .../impl/statement/ThrowStatementImpl.java | 11 +- .../cst/impl/statement/TryStatementImpl.java | 13 +- .../impl/statement/WhileStatementImpl.java | 11 +- .../impl/statement/YieldStatementImpl.java | 11 +- .../impl/translate/TranslationMapImpl.java | 12 +- .../maddi/cst/impl/type/CommonType.java | 4 +- .../cst/impl/type/DeclaredNullability.java | 8 +- .../maddi/cst/impl/type/IsAssignableFrom.java | 12 +- .../cst/impl/type/IsAssignableFrom2.java | 6 +- .../cst/impl/type/ParameterizedTypeImpl.java | 9 +- .../impl/type/ParameterizedTypePrinter.java | 10 +- .../cst/impl/type/TypeParameterImpl.java | 10 +- .../impl/variable/DependentVariableImpl.java | 7 +- .../cst/impl/variable/FieldReferenceImpl.java | 15 +- .../cst/impl/variable/LocalVariableImpl.java | 9 +- .../maddi/cst/impl/variable/ThisImpl.java | 13 +- .../maddi/cst/impl/variable/VariableImpl.java | 8 +- .../TestDetailedSourcesOwnsItsState.java | 13 +- .../cst/impl/element/TestModuleInfoPrint.java | 16 +- .../element/TestMultiLineCommentPrint.java | 9 +- .../impl/expression/TestAbstractValue.java | 5 +- .../impl/expression/TestAndComparison.java | 5 +- .../maddi/cst/impl/expression/TestAndOr.java | 9 +- .../cst/impl/expression/TestAndSorting.java | 7 +- .../expression/TestBooleanAndComparison.java | 7 +- .../expression/TestBooleanExpressions.java | 5 +- .../expression/TestCastAndArrayAccess.java | 7 +- .../cst/impl/expression/TestCharLiteral.java | 6 +- .../cst/impl/expression/TestComplexity.java | 7 +- .../cst/impl/expression/TestEvalBudget.java | 13 +- .../TestExpressionComparatorConcurrent.java | 13 +- .../impl/expression/TestGreaterThanAndOr.java | 7 +- .../cst/impl/expression/TestInequality.java | 11 +- .../cst/impl/expression/TestInstanceOf.java | 5 +- .../maddi/cst/impl/expression/TestMethod.java | 15 +- .../expression/TestNegationStructure.java | 25 +- .../impl/expression/TestParameterOrder.java | 17 +- .../cst/impl/expression/TestProduct.java | 6 +- .../cst/impl/expression/TestStringConcat.java | 9 +- .../maddi/cst/impl/expression/TestSum.java | 5 +- .../cst/impl/info/TestOverridesOrder.java | 17 +- .../info/TestParameterFullyQualifiedName.java | 11 +- .../output/TestTextBlockFormattingImpl.java | 4 +- .../runtime/TestPredefinedSourceSetName.java | 7 +- .../TestTranslateDependentVariable.java | 9 +- .../maddi/cst/impl/type/TestCachedHashes.java | 19 +- .../io/codelaser/maddi/cst/io/CodecImpl.java | 31 +-- .../maddi/cst/io/ExpressionCodec.java | 10 +- .../main/java/org/parsers/json/JSONLexer.java | 4 +- .../java/org/parsers/json/JSONParser.java | 6 +- .../src/main/java/org/parsers/json/Token.java | 4 +- .../java/org/parsers/json/TokenSource.java | 4 +- .../java/org/parsers/json/ast/BaseNode.java | 4 +- .../io/codelaser/maddi/cst/io/CommonTest.java | 1 - .../io/codelaser/maddi/cst/io/TestCodec.java | 29 +- .../maddi/cst/io/TestCodecCollections.java | 11 +- .../maddi/cst/io/TestCodecExpression.java | 9 +- .../maddi/cst/io/TestCodecFieldByName.java | 11 +- .../codelaser/maddi/cst/io/TestCodecInfo.java | 4 +- .../maddi/cst/io/TestCodecInfoInContext.java | 11 +- .../maddi/cst/io/TestCodecMemberDataOnly.java | 21 +- .../cst/io/TestCodecMethodByDescriptor.java | 17 +- .../maddi/cst/io/TestCodecMethodByName.java | 11 +- .../maddi/cst/io/TestCodecPrimitives.java | 5 +- .../cst/io/TestCodecSetOfMethodInfo.java | 17 +- .../codelaser/maddi/cst/io/TestCodecType.java | 9 +- .../cst/io/TestCodecVariableRoundTrip.java | 9 +- .../codelaser/maddi/cst/io/TestValueImpl.java | 21 +- .../maddi/cst/print/csharp/CSharpAccess.java | 10 +- .../cst/print/csharp/CSharpAnonymous.java | 18 +- .../cst/print/csharp/CSharpAttributes.java | 14 +- .../maddi/cst/print/csharp/CSharpBcl.java | 16 +- .../csharp/CSharpCompilationUnitPrinter.java | 14 +- .../maddi/cst/print/csharp/CSharpContext.java | 22 +- .../cst/print/csharp/CSharpErasures.java | 12 +- .../print/csharp/CSharpExpressionPrinter.java | 28 +- .../maddi/cst/print/csharp/CSharpFacts.java | 4 +- .../cst/print/csharp/CSharpFieldPrinter.java | 4 +- .../cst/print/csharp/CSharpHierarchy.java | 14 +- .../maddi/cst/print/csharp/CSharpInner.java | 10 +- .../cst/print/csharp/CSharpLibraries.java | 18 +- .../cst/print/csharp/CSharpLocalTypes.java | 15 +- .../maddi/cst/print/csharp/CSharpLocals.java | 8 +- .../cst/print/csharp/CSharpMappingFile.java | 20 +- .../cst/print/csharp/CSharpMethodPrinter.java | 14 +- .../maddi/cst/print/csharp/CSharpNames.java | 20 +- .../cst/print/csharp/CSharpNotNullKeys.java | 18 +- .../cst/print/csharp/CSharpNullability.java | 2 - .../maddi/cst/print/csharp/CSharpProgram.java | 26 +- .../cst/print/csharp/CSharpProgramIndex.java | 14 +- .../cst/print/csharp/CSharpProperties.java | 14 +- .../cst/print/csharp/CSharpReadOnly.java | 18 +- .../print/csharp/CSharpStatementPrinter.java | 14 +- .../cst/print/csharp/CSharpTemplate.java | 12 +- .../cst/print/csharp/CSharpTranslator.java | 14 +- .../cst/print/csharp/CSharpTypeName.java | 16 +- .../cst/print/csharp/CSharpTypePrinter.java | 18 +- .../csharp/CSharpWildcardInterfaces.java | 24 +- .../cst/print/csharp/CSharpWildcards.java | 14 +- .../maddi/cst/print/csharp/ComposedFacts.java | 6 +- .../maddi/cst/print/csharp/FamilyFacts.java | 8 +- .../cst/print/csharp/JacksonAttributes.java | 8 +- .../print/csharp/JaxbXmlSerialization.java | 18 +- .../cst/print/csharp/LibraryMapping.java | 14 +- .../cst/print/csharp/CommonJavaToCSharp.java | 31 +-- .../print/csharp/TestCSharpMappingFile.java | 11 +- .../cst/print/csharp/TestCstSupertypes.java | 13 +- .../cst/print/csharp/TestJavaToCSharpBcl.java | 5 +- .../print/csharp/TestJavaToCSharpFacts.java | 19 +- .../csharp/TestJavaToCSharpLibraries.java | 21 +- .../csharp/TestJavaToCSharpMessages.java | 9 +- .../csharp/TestJavaToCSharpPolicies.java | 7 +- .../csharp/TestJavaToCSharpStructure.java | 6 +- .../cst/print/kotlin/KotlinAnnotations.java | 6 +- .../maddi/cst/print/kotlin/KotlinApply.java | 6 +- .../cst/print/kotlin/KotlinAssignments.java | 14 +- .../kotlin/KotlinCollectionFactories.java | 8 +- .../cst/print/kotlin/KotlinComments.java | 12 +- .../kotlin/KotlinCompilationUnitPrinter.java | 12 +- .../maddi/cst/print/kotlin/KotlinContext.java | 12 +- .../print/kotlin/KotlinExpressionPrinter.java | 14 +- .../cst/print/kotlin/KotlinFieldPrinter.java | 6 +- .../kotlin/KotlinHeaderQualification.java | 2 +- .../print/kotlin/KotlinInheritedDefaults.java | 12 +- .../cst/print/kotlin/KotlinMappedMembers.java | 10 +- .../cst/print/kotlin/KotlinMethodPrinter.java | 6 +- .../cst/print/kotlin/KotlinModifiers.java | 4 +- .../cst/print/kotlin/KotlinNullability.java | 10 +- .../cst/print/kotlin/KotlinPrintOptions.java | 4 +- .../cst/print/kotlin/KotlinReadOnly.java | 14 +- .../cst/print/kotlin/KotlinSmartCasts.java | 33 ++- .../print/kotlin/KotlinStatementPrinter.java | 8 +- .../cst/print/kotlin/KotlinTranslator.java | 14 +- .../cst/print/kotlin/KotlinTypeName.java | 9 +- .../cst/print/kotlin/KotlinTypePrinter.java | 22 +- .../cst/print/kotlin/KotlinValCopies.java | 14 +- .../maddi/cst/print/kotlin/KotlinWorld.java | 14 +- .../cst/print/kotlin/CommonJavaToKotlin.java | 17 +- .../kotlin/KotlinReadOnlyTestAccess.java | 4 +- .../print/kotlin/TestJavaToKotlinCalls.java | 8 +- .../kotlin/TestJavaToKotlinComments.java | 6 +- .../kotlin/TestJavaToKotlinMessages.java | 9 +- .../kotlin/TestJavaToKotlinNullability.java | 21 +- .../kotlin/TestJavaToKotlinStructure.java | 13 +- .../kotlin/TestJavaToKotlinTranslation.java | 8 +- .../print/kotlin/TestStatementSeparation.java | 4 +- .../maddi/cst/print/rust/RustBodyPrinter.java | 20 +- .../maddi/cst/print/rust/RustBorrows.java | 10 +- .../maddi/cst/print/rust/RustBounds.java | 14 +- .../maddi/cst/print/rust/RustBoxes.java | 6 +- .../maddi/cst/print/rust/RustCells.java | 10 +- .../maddi/cst/print/rust/RustClosures.java | 8 +- .../maddi/cst/print/rust/RustContext.java | 14 +- .../maddi/cst/print/rust/RustFacts.java | 7 +- .../maddi/cst/print/rust/RustGetters.java | 8 +- .../maddi/cst/print/rust/RustJdk.java | 6 +- .../maddi/cst/print/rust/RustNames.java | 6 +- .../maddi/cst/print/rust/RustTranslator.java | 10 +- .../maddi/cst/print/rust/RustTypePrinter.java | 14 +- .../maddi/cst/print/rust/RustTypes.java | 8 +- .../maddi/cst/print/rust/RustTypestate.java | 6 +- .../maddi/cst/print/rust/RustUnsafety.java | 10 +- .../cst/print/rust/CommonJavaToRust.java | 33 +-- .../cst/print/rust/TestJavaToRustJdk.java | 17 +- .../cst/print/rust/TestJavaToRustMapping.java | 19 +- .../print/rust/TestJavaToRustOwnership.java | 15 +- .../print/rust/TestJavaToRustStatements.java | 13 +- .../print/rust/TestJavaToRustStructure.java | 17 +- .../maddi/cst/print/translate/CstQueries.java | 10 +- .../cst/print/translate/CstSupertypes.java | 12 +- .../cst/print/translate/TranslationState.java | 14 +- .../cst/print/translate/TestLiterals.java | 4 +- .../print/translate/TestTranslationState.java | 4 +- .../maddi/cst/print/OutputContextImpl.java | 1 - .../cst/print/formatter2/BlockPrinter.java | 13 +- .../cst/print/formatter2/ElementPrinter.java | 13 +- .../cst/print/formatter2/Formatter2Impl.java | 4 +- .../maddi/cst/print/formatter2/Util.java | 4 +- .../print/TestFormattingOptionsBuilder.java | 5 +- .../maddi/cst/print/TestOutputBuilder.java | 14 +- .../maddi/cst/print/TestTypeName.java | 7 +- .../maddi/cst/print/formatter2/Test3.java | 9 +- .../maddi/cst/print/formatter2/Test4.java | 7 +- .../maddi/cst/print/formatter2/Test5.java | 9 +- .../maddi/cst/print/formatter2/Test6.java | 11 +- .../maddi/cst/print/formatter2/Test7.java | 7 +- .../print/formatter2/TestBlockPrinter1.java | 9 +- .../print/formatter2/TestBlockPrinter2.java | 9 +- .../formatter2/TestBreakPriorityBlocks.java | 9 +- .../print/formatter2/TestCollectElements.java | 7 +- .../formatter2/TestFormatterModuleInfo.java | 13 +- .../cst/print/formatter2/TestGreedyFill.java | 7 +- .../print/formatter2/TestGreedySpacing.java | 9 +- .../formatter2/TestTextBlockFormatter.java | 10 +- .../codelaser/maddi/graph/analyser/Main.java | 23 +- .../maddi/graph/analyser/TypeGraphIO.java | 21 +- .../codelaser/maddi/graph/op/BreakCycles.java | 11 +- .../io/codelaser/maddi/graph/op/Common.java | 4 +- .../io/codelaser/maddi/graph/op/Cycle.java | 4 +- .../io/codelaser/maddi/graph/op/Cycles.java | 4 +- .../maddi/graph/op/DijkstraShortestPath.java | 6 +- .../maddi/graph/op/GreedyEdgeRemoval.java | 11 +- .../codelaser/maddi/graph/op/Hierarchy.java | 4 +- .../codelaser/maddi/graph/op/Linearize.java | 8 +- .../graph/op/ParallelGreedyEdgeRemoval.java | 17 +- .../graph/op/RemoveEdgesByVertexWeight.java | 11 +- .../maddi/graph/op/ShortestCycleDijkstra.java | 6 +- .../op/ShortestCycleDijkstraWeights.java | 6 +- .../graph/op/SimpleDijkstraShortestPath.java | 4 +- .../maddi/graph/util/TimedLogger.java | 4 +- .../codelaser/maddi/graph/TestLinearize.java | 13 +- .../graph/analyser/TestTypeDependencies.java | 9 +- .../graph/op/TestDijkstraShortestPath.java | 4 +- .../graph/op/TestShortestCycleDijkstra.java | 18 +- .../op/TestShortestCycleDijkstraWeights.java | 13 +- .../api/integration/JavaInspector.java | 18 +- .../api/integration/JavaInspectorFactory.java | 4 +- .../maddi/inspection/api/parser/Context.java | 4 +- .../api/parser/ErasedExpression.java | 4 +- .../inspection/api/parser/GenericsHelper.java | 4 +- .../api/parser/HierarchyHelper.java | 1 - .../api/parser/MethodResolution.java | 7 +- .../api/parser/MethodTypeParameterMap.java | 6 +- .../inspection/api/parser/ParseHelper.java | 6 +- .../inspection/api/parser/ParseResult.java | 8 +- .../maddi/inspection/api/parser/Resolver.java | 4 +- .../maddi/inspection/api/parser/Summary.java | 14 +- .../inspection/api/parser/TypeContext.java | 4 +- .../api/parser/TypeParameterMap.java | 6 +- .../api/resource/CompiledTypesManager.java | 4 +- .../api/resource/InputConfiguration.java | 6 +- .../api/resource/MD5FingerPrint.java | 4 +- .../api/resource/ParameterNameIndex.java | 8 +- .../inspection/api/resource/Resources.java | 7 +- .../inspection/api/resource/SourceFile.java | 6 +- .../inspection/api/util/RecordSynthetics.java | 4 +- .../integration/CompiledTypesManagerImpl.java | 13 +- .../integration/JavaInspectorImpl.java | 65 ++--- .../inspection/integration/ResourcesImpl.java | 19 +- .../RuntimeWithCompiledTypesManager.java | 10 +- .../inspection/integration/ToolChain.java | 4 +- .../integration/TestPreloadJavaBase.java | 19 +- .../integration/TestRuntimeImageFallback.java | 17 +- .../integration/java/CommonTest.java | 15 +- .../integration/java/CommonTest2.java | 21 +- .../java/constructor/TestAnonymousType.java | 11 +- .../java/constructor/TestConstructor.java | 11 +- .../java/constructor/TestConstructor2.java | 9 +- .../TestExplicitConstructorInvocation.java | 15 +- .../constructor/TestExtendedConstructor.java | 9 +- .../java/constructor/TestInitializers.java | 9 +- .../constructor/TestRecordConstructor.java | 13 +- .../java/example/Annotations_2.java | 4 +- .../genericshelper/TestGenericsHelper.java | 17 +- ...estTypeParameterBoundIsATypeParameter.java | 17 +- .../java/invalidate/TestInvalidate.java | 17 +- .../integration/java/lombok/TestBuilder.java | 11 +- .../java/lombok/TestConstructor.java | 13 +- .../integration/java/lombok/TestData.java | 15 +- .../integration/java/lombok/TestGetter.java | 13 +- .../integration/java/lombok/TestLogger.java | 9 +- .../integration/java/lombok/TestSetter.java | 13 +- .../java/method/TestMethodCall0.java | 13 +- .../java/method/TestMethodCall1.java | 9 +- .../java/method/TestMethodCall10.java | 7 +- .../java/method/TestMethodCall11.java | 11 +- .../java/method/TestMethodCall12.java | 17 +- .../java/method/TestMethodCall13.java | 13 +- .../java/method/TestMethodCall3.java | 11 +- .../java/method/TestMethodCall6.java | 9 +- .../java/method/TestMethodCall7.java | 15 +- .../java/method/TestMethodCall8.java | 11 +- .../java/method/TestMethodCall9.java | 13 +- .../java/method/TestOverload0.java | 11 +- .../java/method/TestOverload1.java | 11 +- .../java/method/TestOverride2.java | 15 +- .../java/method/TestOverride3.java | 13 +- .../java/method/TestOverride4.java | 15 +- .../TestOverridesOfRecordAccessors.java | 15 +- .../java/other/TestAnnotations.java | 9 +- .../java/other/TestArrayInitializer.java | 15 +- .../integration/java/other/TestComments.java | 17 +- .../java/other/TestCompilationProblem.java | 17 +- .../java/other/TestCompiledTypesManager.java | 9 +- .../integration/java/other/TestEnum.java | 11 +- .../java/other/TestExceptionTypes.java | 9 +- .../integration/java/other/TestField.java | 9 +- .../integration/java/other/TestField2.java | 15 +- .../java/other/TestFieldAccess.java | 13 +- .../integration/java/other/TestImport.java | 17 +- .../integration/java/other/TestImport2.java | 13 +- .../integration/java/other/TestImport3.java | 15 +- .../integration/java/other/TestImport4.java | 17 +- .../java/other/TestInstanceOf.java | 11 +- .../integration/java/other/TestJavaDoc.java | 13 +- .../integration/java/other/TestJavaDoc2.java | 15 +- .../integration/java/other/TestJavaDoc3.java | 17 +- .../integration/java/other/TestLambda.java | 11 +- .../java/other/TestMethodReference.java | 13 +- .../java/other/TestModuleInfo.java | 21 +- .../integration/java/other/TestNative.java | 9 +- .../integration/java/other/TestOperators.java | 9 +- .../java/other/TestPackageInfo.java | 13 +- .../java/other/TestParseResult.java | 21 +- .../integration/java/other/TestRecord.java | 17 +- .../java/other/TestRecordPattern.java | 13 +- .../java/other/TestStaticInitializer.java | 15 +- .../integration/java/other/TestSwitch.java | 17 +- .../integration/java/other/TestTryCatch.java | 11 +- .../java/other/TestTryResource.java | 9 +- .../java/other/TestTypeNatureKeyword.java | 11 +- .../java/other/TestTypeParameter.java | 21 +- .../java/other/TestTypeParameter2.java | 9 +- .../java/other/TestTypesReferenced.java | 7 +- .../java/other/TestUnnamedVariable.java | 11 +- .../java/other/TestUnresolvedTypeWarning.java | 17 +- .../integration/java/other/TestVar.java | 9 +- .../java/print/TestCastAndMemberAccess.java | 9 +- .../java/print/TestDetailedSources.java | 13 +- .../TestImportAnnotationClassLiteral.java | 21 +- .../TestImportConstructorTypeArgument.java | 15 +- .../print/TestImportInheritedNestedType.java | 21 +- .../print/TestImportSamePackageShadow.java | 17 +- .../TestStaticInterfaceMethodQualifier.java | 15 +- .../java/print/TestTextBlockFormatting.java | 11 +- .../java/print/TestTypeQualification.java | 11 +- .../java/print/TestVariousPrint2Issues.java | 13 +- .../integration/java/stub/TestStub1.java | 9 +- .../integration/java/stub/TestStub2.java | 11 +- .../java/translate/TestTranslate.java | 11 +- .../translate/TestTranslateAnonymousType.java | 13 +- .../integration/java/type/TestAnnotation.java | 9 +- .../java/type/TestApplyTranslation.java | 19 +- .../integration/java/type/TestByteCode.java | 23 +- .../java/type/TestFullyQualified.java | 13 +- .../integration/java/type/TestHierarchy.java | 7 +- .../integration/java/type/TestInner2.java | 17 +- .../integration/java/type/TestInnerClass.java | 9 +- .../java/type/TestIsAssignableFrom.java | 17 +- .../java/type/TestIsAssignableFrom2.java | 15 +- .../integration/java/type/TestLocalType.java | 11 +- .../integration/java/type/TestSealed.java | 9 +- .../java/type/TestSelfReferentialBound.java | 13 +- .../java/type/TestTypeParameter.java | 17 +- .../openjdk/CompiledTypesManagerImpl.java | 13 +- .../inspection/openjdk/JavaInspectorImpl.java | 79 +++--- .../RuntimeWithCompiledTypesManager.java | 10 +- .../maddi/inspection/openjdk/LombokJar.java | 6 +- .../openjdk/TestAlternativeJRE.java | 27 +- .../TestAnonymousForwardReference.java | 23 +- .../openjdk/TestCompilationUnitIdentity.java | 25 +- .../openjdk/TestConcurrentClassFileLoad.java | 38 +-- .../TestDeepExpressionOnSmallStack.java | 19 +- .../openjdk/TestDescribeParseProblem.java | 11 +- .../openjdk/TestDropAstFailLoud.java | 13 +- .../openjdk/TestEventualConformance.java | 39 +-- .../inspection/openjdk/TestFingerPrint.java | 21 +- .../TestGap12ClasspathGapReproduction.java | 30 ++- .../TestGap12StaleJarReproduction.java | 28 +- .../openjdk/TestGap150NestedAccessOrder.java | 25 +- .../openjdk/TestGeneratedClassOutput.java | 35 +-- .../openjdk/TestInfoByFqnAllTypes.java | 13 +- .../inspection/openjdk/TestInvalidate.java | 40 +-- .../openjdk/TestJavaInspector1OnlyJmod.java | 23 +- .../TestJavaInspector2JarOnClasspath.java | 31 +-- .../TestJavaInspector3RealClasspath.java | 33 +-- .../TestJavaInspector4RealClasspath.java | 29 +- ...TestJavaInspector5RealClasspathModule.java | 35 +-- .../TestJavaInspector6MultiProject.java | 33 +-- .../TestJavaInspector7MulltiTypeClass.java | 29 +- .../TestJavaInspector7MulltiTypeSource.java | 29 +- ...estJdkInternalsWithoutJdkDependencies.java | 21 +- .../openjdk/TestLazyLoaderSourceSet.java | 17 +- .../maddi/inspection/openjdk/TestLombok.java | 27 +- .../openjdk/TestLombokFallback.java | 30 ++- .../TestModuleDirectiveResolution.java | 31 +-- .../openjdk/TestMultiReleaseJarOverwrite.java | 38 +-- .../openjdk/TestNarOnClassPath.java | 34 +-- .../openjdk/TestNestedTypeLoad.java | 13 +- .../openjdk/TestPartialReparse.java | 38 +-- .../openjdk/TestPerSourceSetAddExports.java | 23 +- .../openjdk/TestPerSourceSetRelease.java | 23 +- .../maddi/inspection/openjdk/TestPreload.java | 15 +- .../TestPreloadBeforeSourceSymbols.java | 34 +-- ...estPreloadLeavesScannedTypesInspected.java | 17 +- .../openjdk/TestPreloadOffClasspath.java | 17 +- .../openjdk/TestPrivateConstructor.java | 15 +- .../inspection/openjdk/TestPrivateField.java | 17 +- .../TestPrivateNestedTypeInClassFile.java | 34 +-- .../openjdk/TestReloadAddedRemoved.java | 42 +-- .../openjdk/TestReloadPrerequisites.java | 25 +- .../inspection/openjdk/TestReloadSources.java | 27 +- .../openjdk/TestReloadSourcesFromDisk.java | 28 +- .../openjdk/TestRescanAfterDroppedUnit.java | 21 +- ...rictToPackagesRelativeSourceDirectory.java | 21 +- .../inspection/openjdk/TestScanOrder.java | 9 +- ...TestSelfReferentialClassTypeParameter.java | 32 +-- .../openjdk/TestSharedJdkRelease.java | 25 +- .../TestSharedSourceFileInTwoSourceSets.java | 29 +- .../TestSingleAbstractMethodDiagnostic.java | 16 +- .../inspection/openjdk/TestStopPolicy.java | 23 +- .../openjdk/TestStubMeetsItsOwnSource.java | 30 ++- .../openjdk/TestStubTypeRegistration.java | 15 +- .../openjdk/TestTypeByBinaryName.java | 25 +- .../openjdk/TestUnaccountedUnits.java | 25 +- ...tUnqualifiedCallOnUnresolvedSupertype.java | 23 +- .../openjdk/TestWithSupportFromClasspath.java | 26 +- .../inspection/impl/parser/ContextImpl.java | 13 +- .../impl/parser/GenericsHelperImpl.java | 11 +- .../ListMethodAndConstructorCandidates.java | 6 +- .../inspection/impl/parser/LombokImpl.java | 15 +- .../impl/parser/MethodResolutionImpl.java | 21 +- .../parser/MethodTypeParameterMapImpl.java | 14 +- .../parser/ReevaluateErasedExpressions.java | 11 +- .../inspection/impl/parser/ResolverImpl.java | 23 +- .../impl/parser/StaticImportMapImpl.java | 4 +- .../impl/parser/TypeContextImpl.java | 11 +- .../impl/parser/VariableContextImpl.java | 8 +- .../resource/BuildFilesCapture.java | 8 +- .../resource/DetectKotlinSources.java | 12 +- .../maddi/inspection/resource/InfoByFqn.java | 13 +- .../resource/InputConfigurationImpl.java | 13 +- .../inspection/resource/ParseResultImpl.java | 10 +- .../resource/ResolveModuleDirectives.java | 13 +- .../inspection/resource/SourceSetImpl.java | 8 +- .../inspection/resource/SummaryImpl.java | 4 +- .../bytecode/java/ExpressionFactory.java | 11 +- .../java/asm/BuildParameterNameIndex.java | 13 +- .../java/asm/ByteCodeInspectorImpl.java | 23 +- .../java/asm/MyAnnotationVisitor.java | 15 +- .../bytecode/java/asm/MyClassVisitor.java | 15 +- .../bytecode/java/asm/MyFieldVisitor.java | 11 +- .../bytecode/java/asm/MyMethodVisitor.java | 29 +- .../java/asm/ParameterNameFactory.java | 4 +- .../java/asm/ParameterizedTypeFactory.java | 11 +- .../bytecode/java/asm/ParseGenerics.java | 8 +- .../java/asm/ParseParameterTypes.java | 6 +- .../java/asm/CommonJmodBaseTests.java | 15 +- .../java/asm/GenerateParameterNameIndex.java | 33 +-- .../maddi/bytecode/java/asm/TestGrpcStub.java | 24 +- .../java/asm/TestParameterNameIndex.java | 15 +- .../asm/TestParameterizedTypeFactory.java | 9 +- .../bytecode/java/asm/TestParseGenerics.java | 19 +- .../bytecode/java/asm/TestPredefined.java | 7 +- .../java/openjdk/ClassSymbolScanner.java | 55 ++-- .../java/openjdk/ComputeMethodOverrides.java | 9 +- .../maddi/java/openjdk/ConvertType.java | 8 +- .../maddi/java/openjdk/ElementStack.java | 4 +- .../java/openjdk/InMemoryJavaFileObject.java | 3 +- .../openjdk/MaddiDiagnosticCollector.java | 10 +- .../maddi/java/openjdk/ResolveJavaDoc.java | 8 +- .../java/openjdk/ScanCompilationUnit.java | 35 +-- .../java/openjdk/ScanCompilationUnits.java | 43 +-- .../maddi/java/openjdk/ScanJavaDoc.java | 17 +- .../maddi/java/openjdk/SourceCodeScan.java | 15 +- .../maddi/java/openjdk/SourceProvider.java | 5 +- .../java/openjdk/SourceSetInterleave.java | 4 +- .../maddi/java/openjdk/TypeData.java | 2 - .../maddi/java/openjdk/CommonTest.java | 42 +-- .../java/openjdk/TestChainNoBlankLine.java | 1 - .../TestDeclarationAnnotationsBaseline.java | 15 +- .../java/openjdk/TestDeclaredNullability.java | 17 +- .../java/openjdk/TestDeepNestingPrint.java | 9 +- .../openjdk/TestFormatterRoundTripStable.java | 1 - .../java/openjdk/TestFormatterStress.java | 5 +- .../TestGap12StaleArtifactDiagnosis.java | 6 +- .../openjdk/TestLineCommentNotInlined.java | 9 +- .../openjdk/TestPrinterRoundTripIssues.java | 11 +- .../openjdk/TestSpaceBeforeParenOperand.java | 9 +- ...estTypeUseAnnotationDistinguishesUses.java | 15 +- .../TestTypeUseAnnotationOnACalledMethod.java | 15 +- ...stTypeUseAnnotationOnAReferencedField.java | 13 +- ...TypeUseAnnotationOnAnonymousSupertype.java | 13 +- .../TestTypeUseAnnotationQualifiedName.java | 17 +- .../TestTypeUseAnnotationRoundTrip.java | 23 +- .../TestTypeUseAnnotationTargetRouting.java | 15 +- .../constructor/TestAnonymousType.java | 11 +- .../TestCompactConstructorProbe.java | 13 +- .../openjdk/constructor/TestConstructor.java | 17 +- .../openjdk/constructor/TestConstructor2.java | 15 +- .../TestExplicitConstructorInvocation.java | 9 +- .../constructor/TestExtendedConstructor.java | 9 +- .../openjdk/constructor/TestInitializers.java | 13 +- .../constructor/TestRecordConstructor.java | 15 +- .../TestAnonymousInTypeArgument.java | 9 +- .../java/openjdk/expression/TestArray.java | 7 +- .../expression/TestArrayInitializer.java | 16 +- .../expression/TestArrayMethodReference.java | 9 +- .../openjdk/expression/TestAssignment.java | 9 +- .../expression/TestBinaryOperator.java | 9 +- .../java/openjdk/expression/TestCast.java | 9 +- .../expression/TestCompoundAssignment.java | 9 +- .../openjdk/expression/TestInstanceOf.java | 9 +- .../java/openjdk/expression/TestLambda.java | 11 +- .../TestLambdaCapturedWildcard.java | 17 +- .../expression/TestLiteralSpelling.java | 19 +- .../expression/TestMethodReference.java | 11 +- .../expression/TestStringConstant.java | 19 +- .../expression/TestSwitchExpression.java | 27 +- .../openjdk/expression/TestThisSuper.java | 9 +- .../expression/TestUnnamedVariable.java | 11 +- .../java/openjdk/initial/TestClass1.java | 13 +- .../java/openjdk/initial/TestInMemoryUri.java | 7 +- .../java/openjdk/lombok/TestBuilder.java | 11 +- .../java/openjdk/lombok/TestConstructor.java | 13 +- .../maddi/java/openjdk/lombok/TestData.java | 15 +- .../maddi/java/openjdk/lombok/TestGetter.java | 13 +- .../maddi/java/openjdk/lombok/TestLogger.java | 10 +- .../maddi/java/openjdk/lombok/TestSetter.java | 13 +- .../java/openjdk/lombok/TestSuperBuilder.java | 15 +- .../method/TestImplicitThisEnclosing.java | 13 +- .../java/openjdk/method/TestMethodCall0.java | 9 +- .../java/openjdk/method/TestMethodCall1.java | 9 +- .../java/openjdk/method/TestMethodCall11.java | 16 +- .../java/openjdk/method/TestMethodCall12.java | 13 +- .../java/openjdk/method/TestMethodCall13.java | 13 +- .../java/openjdk/method/TestMethodCall2.java | 11 +- .../java/openjdk/method/TestMethodCall3.java | 9 +- .../java/openjdk/method/TestMethodCall6.java | 9 +- .../java/openjdk/method/TestMethodCall7.java | 11 +- .../java/openjdk/method/TestMethodCall8.java | 11 +- .../java/openjdk/method/TestMethodCall9.java | 14 +- .../method/TestMethodTypeParameterSource.java | 19 +- .../method/TestNestedTypeArgumentSource.java | 13 +- .../java/openjdk/method/TestOverload0.java | 9 +- .../java/openjdk/method/TestOverload1.java | 11 +- .../java/openjdk/method/TestOverride2.java | 13 +- .../java/openjdk/method/TestOverride3.java | 7 +- .../java/openjdk/method/TestOverride4.java | 13 +- .../java/openjdk/method/TestOverrides.java | 21 +- .../TestOverridesOfRecordAccessors.java | 11 +- .../method/TestOverridesTwoInterfaces.java | 16 +- .../method/TestOverridesUnitOrder.java | 15 +- .../method/TestParameterInfoSource.java | 13 +- .../method/TestParameterNameSource.java | 13 +- .../openjdk/method/TestReturnTypeSource.java | 9 +- .../method/TestTrailingStatementComment.java | 7 +- .../other/TestAnnotatedArrayReturnType.java | 17 +- .../java/openjdk/other/TestAnnotations.java | 13 +- ...nonymousClassSupertypeDetailedSources.java | 15 +- .../TestClassLiteralOnUnresolvedType.java | 13 +- .../openjdk/other/TestClassSymbolScanner.java | 9 +- .../java/openjdk/other/TestComments.java | 17 +- .../other/TestCompiledTypesManager.java | 3 - .../TestCrossScannerDuplicateInterfaces.java | 15 +- ...stDescriptorWithoutTypeUseAnnotations.java | 15 +- ...tDetailedSourcePreScanFailureDegrades.java | 11 +- .../other/TestDroppedUnitMethodAccess.java | 22 +- .../other/TestElasticsearchShapes.java | 7 +- .../maddi/java/openjdk/other/TestEnum.java | 9 +- .../other/TestEnumConstantComments.java | 15 +- .../openjdk/other/TestExceptionTypes.java | 9 +- .../maddi/java/openjdk/other/TestField.java | 13 +- .../java/openjdk/other/TestFieldAccess.java | 13 +- .../other/TestFieldTypeDetailUnitOrder.java | 19 +- .../maddi/java/openjdk/other/TestForLoop.java | 11 +- .../maddi/java/openjdk/other/TestImport.java | 18 +- .../maddi/java/openjdk/other/TestImport2.java | 11 +- .../maddi/java/openjdk/other/TestImport3.java | 13 +- .../maddi/java/openjdk/other/TestImport4.java | 14 +- .../other/TestIntersectionBoundPrinting.java | 17 +- .../maddi/java/openjdk/other/TestJavaDoc.java | 9 +- .../java/openjdk/other/TestJavaDoc2.java | 13 +- .../java/openjdk/other/TestJavaDoc3.java | 19 +- .../other/TestJavaDocEmptyHasASource.java | 9 +- .../openjdk/other/TestJavaDocEmptyTag.java | 9 +- .../java/openjdk/other/TestJavaDocField.java | 15 +- .../other/TestJavaDocKeepsItsLines.java | 13 +- .../other/TestJavaDocLiteralBraces.java | 11 +- .../other/TestJavaDocMemberRefNotUnique.java | 17 +- .../other/TestJavaDocNestedTypeReference.java | 15 +- .../other/TestLambdaWithoutTargetType.java | 13 +- .../openjdk/other/TestLocalTypeStream.java | 11 +- .../other/TestLocalVariableDeclarationId.java | 17 +- .../other/TestMethodCallDetailedSources.java | 13 +- .../other/TestModifierDetailedSources.java | 21 +- .../java/openjdk/other/TestModuleInfo.java | 11 +- .../maddi/java/openjdk/other/TestNative.java | 9 +- .../java/openjdk/other/TestOperators.java | 9 +- .../TestPackageAnnotationNamesItsOwnType.java | 16 +- .../java/openjdk/other/TestPackageInfo.java | 7 +- .../other/TestParameterNamesFromIndex.java | 13 +- .../java/openjdk/other/TestParseResult.java | 19 +- .../TestPlatformModuleOutsideJavaSe.java | 9 +- .../maddi/java/openjdk/other/TestPreload.java | 7 +- .../other/TestPreloadDuplicateInterfaces.java | 13 +- .../TestReceiverParameterDetailedSources.java | 11 +- .../maddi/java/openjdk/other/TestRecord.java | 11 +- ...tRecordAccessorCalledIsStillSynthetic.java | 9 +- .../TestRecordCompactConstructorAccess.java | 15 +- .../TestRecordComponentParameterSource.java | 13 +- .../java/openjdk/other/TestRecordPattern.java | 11 +- .../TestRecordWritesOutOneOfItsAccessors.java | 11 +- .../other/TestReleaseEightPlatformTypes.java | 7 +- .../maddi/java/openjdk/other/TestSealed.java | 11 +- .../other/TestSelfAnnotatedPackage.java | 16 +- .../maddi/java/openjdk/other/TestSwitch.java | 17 +- .../TestSwitchArrowCaseLocalOnStack.java | 7 +- .../TestTypeAndPackageDetailedSources.java | 11 +- .../java/openjdk/other/TestTypeParameter.java | 17 +- .../openjdk/other/TestTypeParameter2.java | 9 +- .../openjdk/other/TestTypesReferenced.java | 7 +- ...estUnresolvedEnumConstantInAnnotation.java | 18 +- .../maddi/java/openjdk/other/TestVar.java | 10 +- .../print/TestBlankLinesFromSource.java | 11 +- .../openjdk/print/TestBracePlacement.java | 11 +- .../openjdk/print/TestBracelessBodies.java | 11 +- .../print/TestCastAndMemberAccess.java | 10 +- .../openjdk/print/TestCommentBeforeBrace.java | 11 +- .../openjdk/print/TestDetailedSources.java | 15 +- .../openjdk/print/TestLambdaBlockBody.java | 11 +- .../java/openjdk/print/TestMemberOrder.java | 11 +- .../TestMethodReferenceTypeArguments.java | 11 +- .../java/openjdk/print/TestPrintSpacing.java | 17 +- .../TestQualifiedNestedTypeTakenName.java | 11 +- .../openjdk/print/TestReparsedPrintBugs.java | 17 +- .../openjdk/print/TestSameLineComments.java | 11 +- .../java/openjdk/print/TestSealedPrint.java | 7 +- .../java/openjdk/print/TestStaticImports.java | 13 +- .../print/TestTextBlockFormatting.java | 11 +- .../openjdk/print/TestTypeQualification.java | 11 +- .../print/TestUnnamedPatternVariable.java | 7 +- .../print/TestVariousPrint2Issues.java | 13 +- .../sourcecode/TestSourceCodeScan.java | 17 +- .../java/openjdk/statement/TestAssert.java | 9 +- .../java/openjdk/statement/TestBlock.java | 15 +- .../TestCommentBeforeEveryStatementKind.java | 19 +- .../statement/TestCommentBeforeSwitch.java | 19 +- .../TestCommentInEmptyConstructor.java | 9 +- .../maddi/java/openjdk/statement/TestFor.java | 9 +- .../java/openjdk/statement/TestForEach.java | 9 +- .../statement/TestForLoopLvcSource.java | 13 +- .../java/openjdk/statement/TestIfElse.java | 9 +- .../java/openjdk/statement/TestLocalType.java | 11 +- .../openjdk/statement/TestLocalVariable.java | 9 +- .../TestSwitchGuardPatternVariable.java | 9 +- .../statement/TestSwitchLabelVariables.java | 15 +- .../openjdk/statement/TestSwitchNewStyle.java | 19 +- .../openjdk/statement/TestSwitchOldStyle.java | 23 +- .../openjdk/statement/TestSynchronized.java | 9 +- .../TestTrailingStatementComments.java | 21 +- .../java/openjdk/statement/TestTryCatch.java | 9 +- .../openjdk/statement/TestTryResource.java | 9 +- .../java/openjdk/statement/TestWhile.java | 9 +- .../maddi/java/openjdk/stub/TestStub1.java | 7 +- .../maddi/java/openjdk/stub/TestStub2.java | 11 +- .../java/openjdk/translate/TestTranslate.java | 7 +- .../translate/TestTranslateAnonymousType.java | 13 +- .../TestTranslateLocalHoldingLambda.java | 11 +- .../TestTranslateMethodReference.java | 17 +- .../TestTranslateUnchangedSubType.java | 9 +- .../openjdk/type/TestApplyTranslation.java | 9 - ...estArrayLengthOnInheritedTypeVariable.java | 9 +- .../type/TestClassTypeParameterIdentity.java | 23 +- .../type/TestClassTypeParameterSource.java | 11 +- .../type/TestCommonTypeRawArgument.java | 9 +- ...TestConcreteSuperTypeWildcardArgument.java | 9 +- .../java/openjdk/type/TestFullyQualified.java | 13 +- .../java/openjdk/type/TestHierarchy.java | 9 +- .../maddi/java/openjdk/type/TestInner2.java | 15 +- .../java/openjdk/type/TestInnerClass.java | 9 +- .../openjdk/type/TestIsAssignableFrom.java | 9 +- .../openjdk/type/TestListSyntheticGetSet.java | 13 +- ...LocalClassForwardReferenceInAnonymous.java | 7 +- .../type/TestLocalClassTypeParameter.java | 7 +- .../type/TestMemberClassOfLocalClass.java | 7 +- .../openjdk/type/TestNestedTypeAccess.java | 9 +- .../type/TestSelfReferentialBound.java | 13 +- .../java/openjdk/type/TestTypeParameter.java | 17 +- .../type/TestWildcardBoundIsNotFlattened.java | 17 +- .../maddi/parser/java/CommonParse.java | 27 +- .../java/ParseAnnotationExpression.java | 11 +- .../ParseAnnotationMethodDeclaration.java | 11 +- .../maddi/parser/java/ParseBlock.java | 9 +- .../parser/java/ParseCompilationUnit.java | 15 +- .../parser/java/ParseConstructorCall.java | 19 +- .../maddi/parser/java/ParseExpression.java | 31 +-- .../parser/java/ParseFieldDeclaration.java | 11 +- .../maddi/parser/java/ParseHelperImpl.java | 21 +- .../parser/java/ParseLambdaExpression.java | 17 +- .../maddi/parser/java/ParseMethodCall.java | 19 +- .../parser/java/ParseMethodDeclaration.java | 17 +- .../parser/java/ParseMethodReference.java | 17 +- .../maddi/parser/java/ParseModuleInfo.java | 13 +- .../maddi/parser/java/ParseRecordPattern.java | 20 +- .../maddi/parser/java/ParseStatement.java | 41 +-- .../maddi/parser/java/ParseType.java | 15 +- .../parser/java/ParseTypeDeclaration.java | 27 +- .../parser/java/ScanCompilationUnit.java | 22 +- .../java/erasure/ConstructorCallErasure.java | 7 +- .../java/erasure/ErasureExpressionImpl.java | 8 +- .../parser/java/erasure/LambdaErasure.java | 9 +- .../java/erasure/MethodCallErasure.java | 7 +- .../maddi/parser/java/util/JavaDocParser.java | 13 +- .../parser/java/util/TextBlockParser.java | 9 +- .../main/java/org/parsers/java/JavaLexer.java | 4 +- .../java/org/parsers/java/JavaParser.java | 250 +++++++++--------- .../src/main/java/org/parsers/java/Node.java | 4 +- .../src/main/java/org/parsers/java/Token.java | 3 +- .../java/org/parsers/java/TokenSource.java | 7 +- .../parsers/java/ast/AdditiveExpression.java | 2 - .../java/ast/AllocationExpression.java | 2 - .../org/parsers/java/ast/AndExpression.java | 2 - .../java/org/parsers/java/ast/Annotation.java | 1 - .../java/ast/AnnotationMethodDeclaration.java | 2 - .../parsers/java/ast/AnnotationTypeBody.java | 2 - .../java/ast/AnnotationTypeDeclaration.java | 2 - .../ast/AnnotationTypeMemberDeclaration.java | 2 - .../org/parsers/java/ast/ArrayAccess.java | 2 - .../parsers/java/ast/ArrayDimsAndInits.java | 2 - .../parsers/java/ast/ArrayInitializer.java | 2 - .../org/parsers/java/ast/AssertStatement.java | 2 - .../java/ast/AssignmentExpression.java | 2 - .../java/org/parsers/java/ast/BaseNode.java | 10 +- .../parsers/java/ast/BasicForStatement.java | 2 - .../org/parsers/java/ast/BooleanLiteral.java | 3 +- .../org/parsers/java/ast/BreakStatement.java | 2 - .../java/org/parsers/java/ast/CTRL_Z.java | 3 +- .../org/parsers/java/ast/CasePattern.java | 2 - .../org/parsers/java/ast/CastExpression.java | 2 - .../java/org/parsers/java/ast/CatchBlock.java | 2 - .../parsers/java/ast/CharacterLiteral.java | 3 +- .../parsers/java/ast/ClassDeclaration.java | 2 - .../org/parsers/java/ast/ClassLiteral.java | 2 - .../java/ast/ClassOrInterfaceBody.java | 2 - .../ast/ClassOrInterfaceBodyDeclaration.java | 1 - .../java/ast/ClassicCaseStatement.java | 2 - .../parsers/java/ast/ClassicSwitchLabel.java | 2 - .../java/org/parsers/java/ast/CodeBlock.java | 2 - .../java/org/parsers/java/ast/Comment.java | 3 +- .../ast/CompactConstructorDeclaration.java | 2 - .../org/parsers/java/ast/CompilationUnit.java | 2 - .../java/ast/ConditionalAndExpression.java | 2 - .../java/ast/ConditionalOrExpression.java | 2 - .../java/ast/ConstructorDeclaration.java | 2 - .../parsers/java/ast/ContinueStatement.java | 2 - .../org/parsers/java/ast/DefaultValue.java | 2 - .../java/org/parsers/java/ast/Delimiter.java | 3 +- .../org/parsers/java/ast/DiamondOperator.java | 2 - .../org/parsers/java/ast/DoStatement.java | 2 - .../java/org/parsers/java/ast/DotName.java | 2 - .../java/org/parsers/java/ast/DotNew.java | 2 - .../java/org/parsers/java/ast/DotSuper.java | 2 - .../java/org/parsers/java/ast/DotThis.java | 2 - .../parsers/java/ast/EmptyDeclaration.java | 2 - .../org/parsers/java/ast/EmptyStatement.java | 2 - .../java/ast/EnhancedForStatement.java | 2 - .../java/org/parsers/java/ast/EnumBody.java | 2 - .../org/parsers/java/ast/EnumConstant.java | 2 - .../org/parsers/java/ast/EnumDeclaration.java | 2 - .../parsers/java/ast/EqualityExpression.java | 2 - .../java/ast/ExclusiveOrExpression.java | 2 - .../ast/ExplicitConstructorInvocation.java | 2 - .../parsers/java/ast/ExportsDirective.java | 2 - .../java/org/parsers/java/ast/Expression.java | 1 - .../parsers/java/ast/ExpressionStatement.java | 2 - .../org/parsers/java/ast/ExtendsList.java | 6 +- .../parsers/java/ast/FieldDeclaration.java | 2 - .../org/parsers/java/ast/FinallyBlock.java | 2 - .../java/ast/FloatingPointLiteral.java | 3 +- .../org/parsers/java/ast/ForStatement.java | 2 - .../org/parsers/java/ast/FormalParameter.java | 2 - .../parsers/java/ast/FormalParameters.java | 2 - .../java/org/parsers/java/ast/Identifier.java | 3 +- .../org/parsers/java/ast/IfStatement.java | 4 +- .../org/parsers/java/ast/ImplementsList.java | 2 - .../parsers/java/ast/ImportDeclaration.java | 2 - .../java/ast/InclusiveOrExpression.java | 2 - .../org/parsers/java/ast/Initializer.java | 2 - .../java/ast/InstanceOfExpression.java | 2 - .../org/parsers/java/ast/IntegerLiteral.java | 3 +- .../java/ast/InterfaceDeclaration.java | 2 - .../parsers/java/ast/InvocationArguments.java | 2 - .../java/org/parsers/java/ast/KeyWord.java | 3 +- .../main/java/org/parsers/java/ast/Label.java | 2 - .../parsers/java/ast/LabeledStatement.java | 2 - .../parsers/java/ast/LambdaExpression.java | 2 - .../java/org/parsers/java/ast/LambdaLHS.java | 2 - .../org/parsers/java/ast/LambdaParameter.java | 2 - .../parsers/java/ast/LambdaParameters.java | 2 - .../java/org/parsers/java/ast/Literal.java | 3 +- .../parsers/java/ast/LiteralExpression.java | 2 - .../java/ast/LocalVariableDeclaration.java | 2 - .../org/parsers/java/ast/LongLiteral.java | 3 +- .../parsers/java/ast/MarkerAnnotation.java | 2 - .../org/parsers/java/ast/MemberValue.java | 2 - .../java/ast/MemberValueArrayInitializer.java | 2 - .../org/parsers/java/ast/MemberValuePair.java | 2 - .../parsers/java/ast/MemberValuePairs.java | 2 - .../java/org/parsers/java/ast/MethodCall.java | 2 - .../parsers/java/ast/MethodDeclaration.java | 2 - .../org/parsers/java/ast/MethodReference.java | 2 - .../java/org/parsers/java/ast/Modifiers.java | 2 - .../java/ast/ModularCompilationUnit.java | 2 - .../org/parsers/java/ast/ModuleDirective.java | 2 - .../parsers/java/ast/MultiLineComment.java | 3 +- .../java/ast/MultiplicativeExpression.java | 2 - .../main/java/org/parsers/java/ast/Name.java | 2 - .../parsers/java/ast/NewCaseStatement.java | 2 - .../org/parsers/java/ast/NewSwitchLabel.java | 2 - .../parsers/java/ast/NormalAnnotation.java | 2 - .../org/parsers/java/ast/NullLiteral.java | 3 +- .../parsers/java/ast/NumericalLiteral.java | 3 +- .../java/ast/ObjectArrayInitialization.java | 2 - .../java/ast/ObjectCastExpression.java | 2 - .../parsers/java/ast/ObjectInstantiation.java | 2 - .../java/org/parsers/java/ast/ObjectType.java | 2 - .../org/parsers/java/ast/OpensDirective.java | 2 - .../java/org/parsers/java/ast/Operator.java | 3 +- .../parsers/java/ast/PackageDeclaration.java | 2 - .../org/parsers/java/ast/Parentheses.java | 2 - .../org/parsers/java/ast/PermitsList.java | 2 - .../parsers/java/ast/PostfixExpression.java | 2 - .../java/ast/PreDecrementExpression.java | 2 - .../java/ast/PreIncrementExpression.java | 2 - .../parsers/java/ast/PrimaryExpression.java | 1 - .../java/org/parsers/java/ast/Primitive.java | 3 +- .../ast/PrimitiveArrayInitialization.java | 2 - .../parsers/java/ast/PrimitiveArrayType.java | 2 - .../java/ast/PrimitiveCastExpression.java | 2 - .../org/parsers/java/ast/PrimitiveType.java | 2 - .../parsers/java/ast/ProvidesDirective.java | 2 - .../parsers/java/ast/ReceiverParameter.java | 2 - .../java/org/parsers/java/ast/RecordBody.java | 2 - .../org/parsers/java/ast/RecordComponent.java | 2 - .../parsers/java/ast/RecordDeclaration.java | 2 - .../org/parsers/java/ast/RecordHeader.java | 2 - .../org/parsers/java/ast/RecordPattern.java | 2 - .../org/parsers/java/ast/ReferenceType.java | 2 - .../java/ast/RelationalExpression.java | 2 - .../parsers/java/ast/RequiresDirective.java | 2 - .../parsers/java/ast/ResourcesInTryBlock.java | 2 - .../org/parsers/java/ast/ReturnStatement.java | 2 - .../java/org/parsers/java/ast/ReturnType.java | 2 - .../org/parsers/java/ast/ShiftExpression.java | 2 - .../parsers/java/ast/SingleLineComment.java | 3 +- .../java/ast/SingleMemberAnnotation.java | 2 - .../java/org/parsers/java/ast/Statement.java | 1 - .../parsers/java/ast/StatementExpression.java | 2 - .../org/parsers/java/ast/StringLiteral.java | 3 +- .../org/parsers/java/ast/SuperDotName.java | 2 - .../parsers/java/ast/SwitchExpression.java | 2 - .../org/parsers/java/ast/SwitchStatement.java | 2 - .../java/ast/SynchronizedStatement.java | 2 - .../parsers/java/ast/TernaryExpression.java | 2 - .../org/parsers/java/ast/ThisLiteral.java | 3 +- .../org/parsers/java/ast/ThrowStatement.java | 2 - .../java/org/parsers/java/ast/ThrowsList.java | 2 - .../org/parsers/java/ast/TryStatement.java | 2 - .../main/java/org/parsers/java/ast/Type.java | 1 - .../org/parsers/java/ast/TypeArgument.java | 2 - .../org/parsers/java/ast/TypeArguments.java | 2 - .../java/org/parsers/java/ast/TypeBound.java | 2 - .../org/parsers/java/ast/TypeDeclaration.java | 1 - .../org/parsers/java/ast/TypeParameter.java | 2 - .../org/parsers/java/ast/TypeParameters.java | 6 +- .../org/parsers/java/ast/TypePattern.java | 2 - .../org/parsers/java/ast/UnaryExpression.java | 2 - .../java/ast/UnaryExpressionNotPlusMinus.java | 2 - .../org/parsers/java/ast/UsesDirective.java | 2 - .../parsers/java/ast/VariableDeclarator.java | 2 - .../java/ast/VariableDeclaratorId.java | 2 - .../java/org/parsers/java/ast/WhenClause.java | 2 - .../org/parsers/java/ast/WhileStatement.java | 2 - .../java/org/parsers/java/ast/Whitespace.java | 3 +- .../org/parsers/java/ast/WildcardBounds.java | 2 - .../org/parsers/java/ast/YieldStatement.java | 2 - .../maddi/parser/java/CommonTestParse.java | 19 +- .../maddi/parser/java/TestAssignment.java | 10 +- .../TestExplicitConstructorInvocation.java | 9 +- .../java/TestInlineConditionalOperator.java | 9 +- .../parser/java/TestParameterAnnotations.java | 1 - .../maddi/parser/java/TestParse101.java | 9 +- .../java/TestParseAnnotationDeclaration.java | 9 +- .../java/TestParseAnnotationExpression.java | 13 +- .../parser/java/TestParseAnonymousType.java | 11 +- .../maddi/parser/java/TestParseArray.java | 5 +- .../java/TestParseArrayInitializer.java | 12 +- .../java/TestParseArrayMethodReference.java | 5 +- .../maddi/parser/java/TestParseAssert.java | 14 +- .../parser/java/TestParseBinaryOperator.java | 9 +- .../maddi/parser/java/TestParseBlock.java | 13 +- .../parser/java/TestParseConstructorCall.java | 10 +- .../parser/java/TestParseDetailedSources.java | 19 +- .../maddi/parser/java/TestParseEnum.java | 9 +- .../maddi/parser/java/TestParseFields.java | 9 +- .../maddi/parser/java/TestParseFor.java | 9 +- .../maddi/parser/java/TestParseForEach.java | 9 +- .../maddi/parser/java/TestParseHierarchy.java | 5 +- .../maddi/parser/java/TestParseIfElse.java | 9 +- .../java/TestParseInstanceOfPattern.java | 11 +- .../maddi/parser/java/TestParseJavaDoc.java | 9 +- .../java/TestParseLambdaExpression.java | 9 +- .../parser/java/TestParseLambdaWithBlock.java | 9 +- .../maddi/parser/java/TestParseLiteral.java | 15 +- .../parser/java/TestParseLocalVariable.java | 9 +- .../parser/java/TestParseMethodReference.java | 10 +- .../java/TestParseMethodTypeParameter.java | 9 +- .../maddi/parser/java/TestParseMethods.java | 9 +- .../maddi/parser/java/TestParseRecord.java | 9 +- ...stParseRecordCompactConstructorAccess.java | 9 +- .../maddi/parser/java/TestParseSealed.java | 7 +- .../java/TestParseSplitExpression0.java | 9 +- .../maddi/parser/java/TestParseSubType.java | 13 +- .../java/TestParseSwitchExpression.java | 19 +- .../parser/java/TestParseSwitchNewStyle.java | 13 +- .../parser/java/TestParseSwitchOldStyle.java | 11 +- .../parser/java/TestParseSynchronized.java | 9 +- .../maddi/parser/java/TestParseTryCatch.java | 9 +- .../parser/java/TestParseTryResource.java | 11 +- .../maddi/parser/java/TestParseType.java | 13 +- .../parser/java/TestParseTypeParameter.java | 11 +- .../parser/java/TestParseUnaryOperator.java | 10 +- .../maddi/parser/java/TestParseVarargs.java | 12 +- .../maddi/parser/java/TestParseWhile.java | 9 +- .../maddi/parser/java/TestParserError.java | 7 +- .../parser/java/TestReceiverParameter.java | 11 +- .../java/TestRecordAccessorIsSynthetic.java | 9 +- .../TestRecordWritesOutOneOfItsAccessors.java | 9 +- .../maddi/parser/java/TestStringConstant.java | 19 +- .../parser/java/TestSwitchIsVisited.java | 9 +- .../maddi/parser/java/TestTranslate.java | 9 +- .../parser/java/util/TestEscapeSequence.java | 4 +- .../codelaser/maddi/kotlin/realm/K2Realm.java | 11 +- .../maddi/project/config/BuildFileCheck.java | 11 +- .../maddi/project/config/CaptureResult.java | 4 +- .../maddi/project/config/CaptureSpec.java | 6 +- .../project/config/CompileLogCapture.java | 14 +- .../maddi/project/config/Directories.java | 2 +- .../config/DirectoriesConfiguration.java | 8 +- .../maddi/project/config/Regenerate.java | 4 +- .../project/config/CompileLogCaptureTest.java | 6 +- .../project/config/MavenCaptureTest.java | 10 +- .../config/ProjectConfiguratorTest.java | 6 +- .../run/config/ShippedAnalysisResults.java | 6 +- .../compile/AnnotationProcessorOutput.java | 20 +- .../CompileListToInputConfiguration.java | 14 +- .../compile/CompileListToSourceSets.java | 11 +- .../run/config/compile/JarContentOwner.java | 6 +- .../compile/TypeUseAnnotationClosure.java | 11 +- .../maddi/run/config/javac/Javac.java | 11 +- .../maddi/run/config/javac/MakeJavacList.java | 6 +- .../run/config/javac/ParseJavacList.java | 11 +- .../maddi/run/config/report/ErrorReport.java | 9 +- .../run/config/util/ComputeDependencies.java | 6 +- .../run/config/util/ConfigurationChecks.java | 9 +- .../maddi/run/config/util/JavaModules.java | 6 +- .../maddi/run/config/util/JsonStreaming.java | 30 ++- .../config/util/PluginInputConfiguration.java | 12 +- .../run/config/util/PluginSourceSets.java | 12 +- .../TestAbsorbedSourceSetStaysReadable.java | 13 +- .../TestAnnotationProcessorOutput.java | 18 +- .../run/config/compile/TestAntLayout.java | 11 +- .../compile/TestEncapsulatedImports.java | 15 +- .../config/compile/TestExcludeSourceSets.java | 13 +- .../TestExternalJarNamedLikeAModule.java | 9 +- .../TestGradleSiblingJarOnClasspath.java | 9 +- .../compile/TestNamesAreIdentities.java | 13 +- .../TestPartialReleaseIsNotGlobal.java | 11 +- .../compile/TestReactorJarOnClasspath.java | 11 +- .../run/config/compile/TestShadedJar.java | 11 +- .../run/config/compile/TestSourceSetKind.java | 9 +- .../TestStatedSourceOlderThanRunningJdk.java | 10 +- .../compile/TestTestJarOnClasspath.java | 11 +- .../compile/TestTypeUseAnnotationClosure.java | 20 +- .../TestWorkingDirectoryIsTheBuildRoot.java | 9 +- .../run/config/javac/TestAntJavacBlock.java | 6 +- .../javac/TestExtractBuildProjectNames.java | 6 +- .../maddi/run/config/javac/TestJavac.java | 6 +- .../run/config/javac/TestJavacGradleLine.java | 6 +- .../javac/TestJavacTimefoldSolverCore.java | 14 +- .../maddi/run/config/util/TestBuildFiles.java | 18 +- .../run/config/util/TestJavaModules.java | 7 +- .../util/TestPluginInputConfiguration.java | 17 +- .../run/config/util/TestPluginSourceSets.java | 9 +- .../maddi/run/config/util/TestStreaming.java | 26 +- .../codelaser/maddi/run/kotlinmain/Main.java | 31 +-- .../run/kotlinmain/RunMixedPrepAnalyzer.java | 45 ++-- .../maddi/run/kotlinmain/kotlinc/Kotlinc.java | 9 +- .../kotlinmain/kotlinc/ParseKotlincList.java | 15 +- .../kotlinmain/kotlinc/ParseMixedList.java | 15 +- .../kotlinmain/kotlinc/SharedDestination.java | 4 +- .../run/kotlinmain/K2RealmTestBootstrap.java | 5 +- .../run/kotlinmain/TestCensusRatchet.java | 6 +- .../TestCompilerIsNotOnTheClasspath.java | 11 +- .../run/kotlinmain/TestCorpusRequirement.java | 15 +- .../run/kotlinmain/TestDestructuring.java | 19 +- .../kotlinmain/TestDetektReferenceRecall.java | 23 +- .../kotlinmain/TestInlineOnlyLowering.java | 19 +- .../kotlinmain/TestJavaSetterOverloads.java | 19 +- .../run/kotlinmain/TestLibraryCompanions.java | 19 +- .../kotlinmain/TestLibraryShellMembers.java | 21 +- .../kotlinmain/TestLibraryVarargCalls.java | 19 +- .../run/kotlinmain/TestOneEntryPoint.java | 31 +-- .../run/kotlinmain/TestPrimitiveMembers.java | 19 +- .../run/kotlinmain/TestSuperCallTargets.java | 23 +- .../kotlinmain/TestTopLevelPropertyReads.java | 19 +- .../run/kotlinmain/kotlinc/TestKotlinc.java | 11 +- .../run/kotlinmain/kotlinc/TestMixedList.java | 13 +- .../io/codelaser/maddi/run/main/Main.java | 32 +-- .../codelaser/maddi/run/main/RunAnalyzer.java | 37 ++- .../maddi/run/main/TestPluginPreload.java | 7 +- .../run/main/TestRefuseKotlinSources.java | 23 +- .../codelaser/maddi/run/openjdkmain/Main.java | 40 +-- .../maddi/run/openjdkmain/RunAnalyzer.java | 43 ++- .../run/openjdkmain/TestCompileLogCli.java | 18 +- .../run/openjdkmain/TestErrorReporting.java | 8 +- .../TestJavaToCSharpFernflower.java | 11 +- .../TestJavaToCSharpLangchain4j.java | 13 +- .../openjdkmain/TestJavaToCSharpTimefold.java | 11 +- .../openjdkmain/TestJavaToKotlinExternal.java | 11 +- .../TestJavaToKotlinFernflower.java | 11 +- .../openjdkmain/TestJavaToKotlinGuava.java | 11 +- .../TestJavaToKotlinLangchain4j.java | 11 +- .../openjdkmain/TestKotlinSourcesRefusal.java | 13 +- .../TestRewireFBoundedTypeParameters.java | 35 +-- .../openjdkmain/TestRewireIntrinsicCarry.java | 29 +- .../run/openjdkmain/TestRewireLocalClass.java | 29 +- .../TestShippedAnalysisResults.java | 10 +- .../openjdkmain/TestShortOptionBindings.java | 12 +- .../run/openjdkmain/TestTranslateOption.java | 6 +- .../TestTypeParameterIdentityCorpus.java | 21 +- .../maddi/run/j2cs/JavaToCSharpRatchet.java | 27 +- .../maddi/run/j2k/JavaToKotlinRatchet.java | 35 +-- .../maddi/run/rewire/ReparseOracle.java | 18 +- .../maddi/run/rewire/RunRewireTests.java | 23 +- .../codelaser/maddi/support/AddOnceSet.java | 6 +- .../io/codelaser/maddi/support/Either.java | 4 +- .../io/codelaser/maddi/support/FirstThen.java | 4 +- .../io/codelaser/maddi/support/IntMemo.java | 4 +- .../java/io/codelaser/maddi/support/Lazy.java | 6 +- .../java/io/codelaser/maddi/support/Memo.java | 4 +- .../io/codelaser/maddi/support/SetOnce.java | 4 +- .../codelaser/maddi/support/SetOnceMap.java | 6 +- .../maddi/support/VariableFirstThen.java | 4 +- .../codelaser/maddi/support/TestEither.java | 4 +- .../maddi/support/TestEventuallyFinal.java | 4 +- .../maddi/support/TestFirstThen.java | 4 +- .../io/codelaser/maddi/support/TestLazy.java | 4 +- .../io/codelaser/maddi/util/ListUtil.java | 8 +- .../java/io/codelaser/maddi/util/MapUtil.java | 4 +- .../java/io/codelaser/maddi/util/Trie.java | 8 +- .../io/codelaser/maddi/util/ZipLists.java | 6 +- .../codelaser/maddi/util/TestStringUtil.java | 4 +- .../codelaser/maddi/util/corpus/Corpora.java | 4 +- 1345 files changed, 7401 insertions(+), 7258 deletions(-) diff --git a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/jdk/JavaAwt.java b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/jdk/JavaAwt.java index e31dcf4a9d..e9c232f11b 100644 --- a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/jdk/JavaAwt.java +++ b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/jdk/JavaAwt.java @@ -32,12 +32,14 @@ import java.util.EventListener; import java.util.Locale; import java.util.Set; + import javax.accessibility.AccessibleContext; -import io.codelaser.maddi.annotation.Modified; -import io.codelaser.maddi.annotation.NotModified; + import io.codelaser.maddi.annotation.Commutable; import io.codelaser.maddi.annotation.Immutable; import io.codelaser.maddi.annotation.Independent; +import io.codelaser.maddi.annotation.Modified; +import io.codelaser.maddi.annotation.NotModified; import io.codelaser.maddi.annotation.method.GetSet; public class JavaAwt { diff --git a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/jdk/JavaIo.java b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/jdk/JavaIo.java index faca767e21..93abe66f4a 100644 --- a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/jdk/JavaIo.java +++ b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/jdk/JavaIo.java @@ -27,13 +27,13 @@ import java.util.Locale; import java.util.stream.Stream; -import io.codelaser.maddi.annotation.Modified; -import io.codelaser.maddi.annotation.Nullable; import io.codelaser.maddi.annotation.Immutable; import io.codelaser.maddi.annotation.ImmutableContainer; import io.codelaser.maddi.annotation.Independent; +import io.codelaser.maddi.annotation.Modified; import io.codelaser.maddi.annotation.NotModified; import io.codelaser.maddi.annotation.NotNull; +import io.codelaser.maddi.annotation.Nullable; import io.codelaser.maddi.annotation.rare.AllowsInterrupt; public class JavaIo { public static final String PACKAGE_NAME = "java.io"; diff --git a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/jdk/JavaLang.java b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/jdk/JavaLang.java index c68062b7d1..235c949a78 100644 --- a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/jdk/JavaLang.java +++ b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/jdk/JavaLang.java @@ -37,7 +37,7 @@ import java.util.function.Supplier; import java.util.stream.IntStream; import java.util.stream.Stream; -import io.codelaser.maddi.annotation.Nullable; + import io.codelaser.maddi.annotation.Container; import io.codelaser.maddi.annotation.Fluent; import io.codelaser.maddi.annotation.Immutable; @@ -46,6 +46,7 @@ import io.codelaser.maddi.annotation.Modified; import io.codelaser.maddi.annotation.NotModified; import io.codelaser.maddi.annotation.NotNull; +import io.codelaser.maddi.annotation.Nullable; import io.codelaser.maddi.annotation.rare.IgnoreModifications; import io.codelaser.maddi.annotation.rare.StaticSideEffects; import io.codelaser.maddi.annotation.type.UtilityClass; diff --git a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/jdk/JavaLangAnnotation.java b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/jdk/JavaLangAnnotation.java index c8436c6fa1..c2ff9611f3 100644 --- a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/jdk/JavaLangAnnotation.java +++ b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/jdk/JavaLangAnnotation.java @@ -16,15 +16,15 @@ */ package io.codelaser.maddi.aapi.archive.jdk; -import io.codelaser.maddi.annotation.ImmutableContainer; -import io.codelaser.maddi.annotation.NotModified; - import java.lang.annotation.Annotation; import java.lang.annotation.ElementType; import java.lang.annotation.RetentionPolicy; import java.lang.reflect.Method; -import io.codelaser.maddi.annotation.Nullable; + +import io.codelaser.maddi.annotation.ImmutableContainer; +import io.codelaser.maddi.annotation.NotModified; import io.codelaser.maddi.annotation.NotNull; +import io.codelaser.maddi.annotation.Nullable; public class JavaLangAnnotation { public static final String PACKAGE_NAME = "java.lang.annotation"; diff --git a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/jdk/JavaLangConstant.java b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/jdk/JavaLangConstant.java index b51d2762c7..42047ce81f 100644 --- a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/jdk/JavaLangConstant.java +++ b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/jdk/JavaLangConstant.java @@ -16,14 +16,14 @@ */ package io.codelaser.maddi.aapi.archive.jdk; -import io.codelaser.maddi.annotation.NotModified; -import io.codelaser.maddi.annotation.ImmutableContainer; -import io.codelaser.maddi.annotation.Independent; -import io.codelaser.maddi.annotation.NotNull; - import java.lang.constant.ConstantDesc; import java.lang.invoke.MethodHandles; import java.util.Optional; + +import io.codelaser.maddi.annotation.ImmutableContainer; +import io.codelaser.maddi.annotation.Independent; +import io.codelaser.maddi.annotation.NotModified; +import io.codelaser.maddi.annotation.NotNull; import io.codelaser.maddi.annotation.Nullable; public class JavaLangConstant { diff --git a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/jdk/JavaLangRef.java b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/jdk/JavaLangRef.java index 628a5f3548..9734ebfdcc 100644 --- a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/jdk/JavaLangRef.java +++ b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/jdk/JavaLangRef.java @@ -18,10 +18,10 @@ package io.codelaser.maddi.aapi.archive.jdk; -import io.codelaser.maddi.annotation.NotModified; import io.codelaser.maddi.annotation.Modified; -import io.codelaser.maddi.annotation.Nullable; +import io.codelaser.maddi.annotation.NotModified; import io.codelaser.maddi.annotation.NotNull; +import io.codelaser.maddi.annotation.Nullable; public class JavaLangRef { public static final String PACKAGE_NAME = "java.lang.ref"; diff --git a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/jdk/JavaLangReflect.java b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/jdk/JavaLangReflect.java index 8f4d654a75..987b80d393 100644 --- a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/jdk/JavaLangReflect.java +++ b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/jdk/JavaLangReflect.java @@ -17,14 +17,15 @@ package io.codelaser.maddi.aapi.archive.jdk; -import io.codelaser.maddi.annotation.NotModified; -import io.codelaser.maddi.annotation.Nullable; import java.lang.reflect.Method; + import io.codelaser.maddi.annotation.ImmutableContainer; import io.codelaser.maddi.annotation.Independent; import io.codelaser.maddi.annotation.Modified; -import io.codelaser.maddi.annotation.type.UtilityClass; +import io.codelaser.maddi.annotation.NotModified; import io.codelaser.maddi.annotation.NotNull; +import io.codelaser.maddi.annotation.Nullable; +import io.codelaser.maddi.annotation.type.UtilityClass; public class JavaLangReflect { public static final String PACKAGE_NAME = "java.lang.reflect"; diff --git a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/jdk/JavaNet.java b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/jdk/JavaNet.java index 48915bfc20..2d33f66614 100644 --- a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/jdk/JavaNet.java +++ b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/jdk/JavaNet.java @@ -20,11 +20,11 @@ import java.net.*; import java.nio.charset.Charset; -import io.codelaser.maddi.annotation.NotModified; -import io.codelaser.maddi.annotation.Modified; import io.codelaser.maddi.annotation.ImmutableContainer; -import io.codelaser.maddi.annotation.Nullable; +import io.codelaser.maddi.annotation.Modified; +import io.codelaser.maddi.annotation.NotModified; import io.codelaser.maddi.annotation.NotNull; +import io.codelaser.maddi.annotation.Nullable; public class JavaNet { public static final String PACKAGE_NAME = "java.net"; diff --git a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/jdk/JavaNetHttp.java b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/jdk/JavaNetHttp.java index 54a13bdac6..bba70c7eac 100644 --- a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/jdk/JavaNetHttp.java +++ b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/jdk/JavaNetHttp.java @@ -16,9 +16,6 @@ */ package io.codelaser.maddi.aapi.archive.jdk; -import io.codelaser.maddi.annotation.*; -import io.codelaser.maddi.annotation.method.GetSet; - import java.io.InputStream; import java.net.URI; import java.net.http.HttpClient; @@ -36,6 +33,9 @@ import java.util.function.BiPredicate; import java.util.function.Supplier; +import io.codelaser.maddi.annotation.*; +import io.codelaser.maddi.annotation.method.GetSet; + public class JavaNetHttp { public static final String PACKAGE_NAME = "java.net.http"; //public abstract class HttpRequest diff --git a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/jdk/JavaNioCharset.java b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/jdk/JavaNioCharset.java index c09b351299..7f951cf2ed 100644 --- a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/jdk/JavaNioCharset.java +++ b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/jdk/JavaNioCharset.java @@ -26,8 +26,8 @@ import java.util.SortedMap; import io.codelaser.maddi.annotation.Immutable; -import io.codelaser.maddi.annotation.Nullable; import io.codelaser.maddi.annotation.NotNull; +import io.codelaser.maddi.annotation.Nullable; public class JavaNioCharset { public static final String PACKAGE_NAME = "java.nio.charset"; diff --git a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/jdk/JavaNioFile.java b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/jdk/JavaNioFile.java index 081966daf2..9203ec72fe 100644 --- a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/jdk/JavaNioFile.java +++ b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/jdk/JavaNioFile.java @@ -16,14 +16,6 @@ */ package io.codelaser.maddi.aapi.archive.jdk; -import io.codelaser.maddi.annotation.Modified; -import io.codelaser.maddi.annotation.Immutable; -import io.codelaser.maddi.annotation.NotModified; -import io.codelaser.maddi.annotation.NotNull; -import io.codelaser.maddi.annotation.Nullable; -import io.codelaser.maddi.annotation.rare.AllowsInterrupt; -import io.codelaser.maddi.annotation.rare.IgnoreModifications; - import java.io.*; import java.net.URI; import java.nio.channels.SeekableByteChannel; @@ -34,6 +26,13 @@ import java.util.function.BiPredicate; import java.util.stream.Stream; +import io.codelaser.maddi.annotation.Immutable; +import io.codelaser.maddi.annotation.Modified; +import io.codelaser.maddi.annotation.NotModified; +import io.codelaser.maddi.annotation.NotNull; +import io.codelaser.maddi.annotation.Nullable; +import io.codelaser.maddi.annotation.rare.AllowsInterrupt; + public class JavaNioFile { public static final String PACKAGE_NAME = "java.nio.file"; //public final class Files diff --git a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/jdk/JavaSecurity.java b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/jdk/JavaSecurity.java index 65ea56c188..279d9cfb97 100644 --- a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/jdk/JavaSecurity.java +++ b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/jdk/JavaSecurity.java @@ -16,17 +16,17 @@ */ package io.codelaser.maddi.aapi.archive.jdk; -import io.codelaser.maddi.annotation.Modified; -import io.codelaser.maddi.annotation.Container; -import io.codelaser.maddi.annotation.ImmutableContainer; -import io.codelaser.maddi.annotation.Independent; -import io.codelaser.maddi.annotation.NotModified; - import java.nio.ByteBuffer; import java.security.*; + import javax.security.auth.Subject; -import io.codelaser.maddi.annotation.Nullable; + +import io.codelaser.maddi.annotation.Container; +import io.codelaser.maddi.annotation.Independent; +import io.codelaser.maddi.annotation.Modified; +import io.codelaser.maddi.annotation.NotModified; import io.codelaser.maddi.annotation.NotNull; +import io.codelaser.maddi.annotation.Nullable; public class JavaSecurity { public static final String PACKAGE_NAME = "java.security"; diff --git a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/jdk/JavaTime.java b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/jdk/JavaTime.java index 7f9dd462f8..7b93dc63f9 100644 --- a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/jdk/JavaTime.java +++ b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/jdk/JavaTime.java @@ -16,10 +16,6 @@ */ package io.codelaser.maddi.aapi.archive.jdk; -import io.codelaser.maddi.annotation.NotModified; -import io.codelaser.maddi.annotation.ImmutableContainer; -import io.codelaser.maddi.annotation.Independent; - import java.time.*; import java.time.chrono.*; import java.time.format.DateTimeFormatter; @@ -28,8 +24,12 @@ import java.time.zone.ZoneRules; import java.util.*; import java.util.stream.Stream; -import io.codelaser.maddi.annotation.Nullable; + +import io.codelaser.maddi.annotation.ImmutableContainer; +import io.codelaser.maddi.annotation.Independent; +import io.codelaser.maddi.annotation.NotModified; import io.codelaser.maddi.annotation.NotNull; +import io.codelaser.maddi.annotation.Nullable; public class JavaTime { public static final String PACKAGE_NAME = "java.time"; diff --git a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/jdk/JavaTimeChrono.java b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/jdk/JavaTimeChrono.java index e44316e911..811f754cf3 100644 --- a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/jdk/JavaTimeChrono.java +++ b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/jdk/JavaTimeChrono.java @@ -22,10 +22,10 @@ import java.time.temporal.*; import java.util.Comparator; -import io.codelaser.maddi.annotation.NotModified; import io.codelaser.maddi.annotation.ImmutableContainer; -import io.codelaser.maddi.annotation.Nullable; +import io.codelaser.maddi.annotation.NotModified; import io.codelaser.maddi.annotation.NotNull; +import io.codelaser.maddi.annotation.Nullable; public class JavaTimeChrono { public static final String PACKAGE_NAME = "java.time.chrono"; diff --git a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/jdk/JavaTimeFormat.java b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/jdk/JavaTimeFormat.java index dc5c77cb56..f8042d5219 100644 --- a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/jdk/JavaTimeFormat.java +++ b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/jdk/JavaTimeFormat.java @@ -30,10 +30,10 @@ import java.util.Map; import java.util.Set; -import io.codelaser.maddi.annotation.Modified; import io.codelaser.maddi.annotation.Container; import io.codelaser.maddi.annotation.Immutable; import io.codelaser.maddi.annotation.ImmutableContainer; +import io.codelaser.maddi.annotation.Modified; import io.codelaser.maddi.annotation.NotModified; import io.codelaser.maddi.annotation.Nullable; public class JavaTimeFormat { diff --git a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/jdk/JavaTimeTemporal.java b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/jdk/JavaTimeTemporal.java index 6a6f299784..e9112eb6ad 100644 --- a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/jdk/JavaTimeTemporal.java +++ b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/jdk/JavaTimeTemporal.java @@ -20,10 +20,10 @@ import java.time.temporal.*; import java.util.List; -import io.codelaser.maddi.annotation.NotModified; import io.codelaser.maddi.annotation.ImmutableContainer; -import io.codelaser.maddi.annotation.Nullable; +import io.codelaser.maddi.annotation.NotModified; import io.codelaser.maddi.annotation.NotNull; +import io.codelaser.maddi.annotation.Nullable; public class JavaTimeTemporal { public static final String PACKAGE_NAME = "java.time.temporal"; diff --git a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/jdk/JavaUtilConcurrent.java b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/jdk/JavaUtilConcurrent.java index b8914de5e4..ec1a361b00 100644 --- a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/jdk/JavaUtilConcurrent.java +++ b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/jdk/JavaUtilConcurrent.java @@ -23,13 +23,13 @@ import java.util.stream.IntStream; import java.util.stream.LongStream; -import io.codelaser.maddi.annotation.Modified; -import io.codelaser.maddi.annotation.Nullable; import io.codelaser.maddi.annotation.Container; import io.codelaser.maddi.annotation.ImmutableContainer; import io.codelaser.maddi.annotation.Independent; +import io.codelaser.maddi.annotation.Modified; import io.codelaser.maddi.annotation.NotModified; import io.codelaser.maddi.annotation.NotNull; +import io.codelaser.maddi.annotation.Nullable; public class JavaUtilConcurrent { public static final String PACKAGE_NAME = "java.util.concurrent"; diff --git a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/jdk/JavaUtilConcurrentAtomic.java b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/jdk/JavaUtilConcurrentAtomic.java index ebded7b5cb..3d4dd08b71 100644 --- a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/jdk/JavaUtilConcurrentAtomic.java +++ b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/jdk/JavaUtilConcurrentAtomic.java @@ -17,9 +17,10 @@ package io.codelaser.maddi.aapi.archive.jdk; import java.util.function.*; -import io.codelaser.maddi.annotation.Modified; + import io.codelaser.maddi.annotation.Container; import io.codelaser.maddi.annotation.Independent; +import io.codelaser.maddi.annotation.Modified; import io.codelaser.maddi.annotation.NotModified; import io.codelaser.maddi.annotation.NotNull; diff --git a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/jdk/JavaUtilJar.java b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/jdk/JavaUtilJar.java index afdcd36d1e..baf6980b80 100644 --- a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/jdk/JavaUtilJar.java +++ b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/jdk/JavaUtilJar.java @@ -17,13 +17,13 @@ package io.codelaser.maddi.aapi.archive.jdk; -import io.codelaser.maddi.annotation.NotModified; -import io.codelaser.maddi.annotation.Modified; -import io.codelaser.maddi.annotation.Nullable; - import java.util.jar.JarEntry; import java.util.jar.Manifest; + +import io.codelaser.maddi.annotation.Modified; +import io.codelaser.maddi.annotation.NotModified; import io.codelaser.maddi.annotation.NotNull; +import io.codelaser.maddi.annotation.Nullable; public class JavaUtilJar { public static final String PACKAGE_NAME = "java.util.jar"; diff --git a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/jdk/JavaUtilLogging.java b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/jdk/JavaUtilLogging.java index cad420302e..50486268b0 100644 --- a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/jdk/JavaUtilLogging.java +++ b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/jdk/JavaUtilLogging.java @@ -22,8 +22,8 @@ import io.codelaser.maddi.annotation.Independent; import io.codelaser.maddi.annotation.Modified; import io.codelaser.maddi.annotation.NotModified; -import io.codelaser.maddi.annotation.Nullable; import io.codelaser.maddi.annotation.NotNull; +import io.codelaser.maddi.annotation.Nullable; import io.codelaser.maddi.annotation.rare.IgnoreModifications; /** diff --git a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/jdk/JavaUtilRandom.java b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/jdk/JavaUtilRandom.java index cbfbeec1a6..f36dd6de70 100644 --- a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/jdk/JavaUtilRandom.java +++ b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/jdk/JavaUtilRandom.java @@ -18,8 +18,9 @@ package io.codelaser.maddi.aapi.archive.jdk; import java.util.random.RandomGenerator; import java.util.stream.*; -import io.codelaser.maddi.annotation.NotModified; + import io.codelaser.maddi.annotation.Modified; +import io.codelaser.maddi.annotation.NotModified; import io.codelaser.maddi.annotation.NotNull; public class JavaUtilRandom { public static final String PACKAGE_NAME = "java.util.random"; diff --git a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/jdk/JavaUtilRegex.java b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/jdk/JavaUtilRegex.java index 2f59cb9f59..1dff803216 100644 --- a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/jdk/JavaUtilRegex.java +++ b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/jdk/JavaUtilRegex.java @@ -24,12 +24,12 @@ import java.util.regex.Pattern; import java.util.stream.Stream; -import io.codelaser.maddi.annotation.Modified; import io.codelaser.maddi.annotation.Container; import io.codelaser.maddi.annotation.ImmutableContainer; +import io.codelaser.maddi.annotation.Modified; import io.codelaser.maddi.annotation.NotModified; -import io.codelaser.maddi.annotation.Nullable; import io.codelaser.maddi.annotation.NotNull; +import io.codelaser.maddi.annotation.Nullable; public class JavaUtilRegex { public static final String PACKAGE_NAME = "java.util.regex"; diff --git a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/jdk/JavaUtilStream.java b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/jdk/JavaUtilStream.java index 6d8ed20b68..fea5b35cb9 100644 --- a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/jdk/JavaUtilStream.java +++ b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/jdk/JavaUtilStream.java @@ -16,15 +16,15 @@ */ package io.codelaser.maddi.aapi.archive.jdk; -import io.codelaser.maddi.annotation.*; -import io.codelaser.maddi.annotation.rare.Finalizer; -import io.codelaser.maddi.annotation.type.UtilityClass; - import java.util.*; import java.util.concurrent.ConcurrentMap; import java.util.function.*; import java.util.stream.*; +import io.codelaser.maddi.annotation.*; +import io.codelaser.maddi.annotation.rare.Finalizer; +import io.codelaser.maddi.annotation.type.UtilityClass; + public class JavaUtilStream { public static final String PACKAGE_NAME = "java.util.stream"; //public interface BaseStream implements AutoCloseable diff --git a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/jdk/JavaUtilZip.java b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/jdk/JavaUtilZip.java index f90f1ef1fa..25282b6616 100644 --- a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/jdk/JavaUtilZip.java +++ b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/jdk/JavaUtilZip.java @@ -16,13 +16,14 @@ */ package io.codelaser.maddi.aapi.archive.jdk; -import io.codelaser.maddi.annotation.Modified; -import io.codelaser.maddi.annotation.NotModified; import java.io.OutputStream; import java.nio.charset.Charset; import java.util.zip.ZipEntry; -import io.codelaser.maddi.annotation.Nullable; + +import io.codelaser.maddi.annotation.Modified; +import io.codelaser.maddi.annotation.NotModified; import io.codelaser.maddi.annotation.NotNull; +import io.codelaser.maddi.annotation.Nullable; public class JavaUtilZip { public static final String PACKAGE_NAME = "java.util.zip"; diff --git a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/jdk/JavaxSwing.java b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/jdk/JavaxSwing.java index 45e873d08a..3e9b5bb510 100644 --- a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/jdk/JavaxSwing.java +++ b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/jdk/JavaxSwing.java @@ -16,10 +16,6 @@ */ package io.codelaser.maddi.aapi.archive.jdk; -import io.codelaser.maddi.annotation.Modified; -import io.codelaser.maddi.annotation.NotModified; -import io.codelaser.maddi.annotation.Commutable; - import java.awt.*; import java.awt.event.*; import java.awt.print.Printable; @@ -27,6 +23,7 @@ import java.util.Collection; import java.util.EventObject; import java.util.Vector; + import javax.accessibility.AccessibleContext; import javax.print.PrintService; import javax.print.attribute.PrintRequestAttributeSet; @@ -35,6 +32,10 @@ import javax.swing.plaf.*; import javax.swing.table.*; +import io.codelaser.maddi.annotation.Commutable; +import io.codelaser.maddi.annotation.Modified; +import io.codelaser.maddi.annotation.NotModified; + public class JavaxSwing { public static final String PACKAGE_NAME = "javax.swing"; //public abstract class AbstractButton extends JComponent implements ItemSelectable, SwingConstants diff --git a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/jdk/JavaxSwingTable.java b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/jdk/JavaxSwingTable.java index aeac909a93..faa03dd8e3 100644 --- a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/jdk/JavaxSwingTable.java +++ b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/jdk/JavaxSwingTable.java @@ -16,14 +16,15 @@ */ package io.codelaser.maddi.aapi.archive.jdk; -import io.codelaser.maddi.annotation.Modified; -import io.codelaser.maddi.annotation.NotModified; -import io.codelaser.maddi.annotation.Commutable; - import java.beans.PropertyChangeListener; + import javax.swing.table.TableCellEditor; import javax.swing.table.TableCellRenderer; +import io.codelaser.maddi.annotation.Commutable; +import io.codelaser.maddi.annotation.Modified; +import io.codelaser.maddi.annotation.NotModified; + public class JavaxSwingTable { public static final String PACKAGE_NAME = "javax.swing.table"; //public class TableColumn implements Serializable diff --git a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/jdk/JavaxSwingText.java b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/jdk/JavaxSwingText.java index 4bbe1544a9..2af133676a 100644 --- a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/jdk/JavaxSwingText.java +++ b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/jdk/JavaxSwingText.java @@ -26,6 +26,7 @@ import java.io.Reader; import java.io.Writer; import java.text.MessageFormat; + import javax.accessibility.*; import javax.print.PrintService; import javax.print.attribute.PrintRequestAttributeSet; @@ -37,6 +38,7 @@ import javax.swing.event.DocumentEvent; import javax.swing.plaf.TextUI; import javax.swing.text.*; + import io.codelaser.maddi.annotation.Modified; import io.codelaser.maddi.annotation.NotModified; diff --git a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApi.java b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApi.java index 1528a90a80..34ce86145b 100644 --- a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApi.java +++ b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApi.java @@ -5,6 +5,7 @@ import java.util.function.Consumer; import java.util.function.Supplier; import java.util.stream.Collector; + import org.eclipse.collections.api.*; import org.eclipse.collections.api.bag.*; import org.eclipse.collections.api.bag.primitive.*; @@ -41,9 +42,9 @@ import org.eclipse.collections.api.set.sorted.ImmutableSortedSet; import org.eclipse.collections.api.set.sorted.MutableSortedSet; import org.eclipse.collections.api.tuple.Pair; + import io.codelaser.maddi.annotation.FinalFields; import io.codelaser.maddi.annotation.Fluent; -import io.codelaser.maddi.annotation.Immutable; import io.codelaser.maddi.annotation.Independent; import io.codelaser.maddi.annotation.Modified; import io.codelaser.maddi.annotation.NotModified; diff --git a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiAnnotation.java b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiAnnotation.java index 4a0e12d889..6403d780f0 100644 --- a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiAnnotation.java +++ b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiAnnotation.java @@ -1,14 +1,6 @@ package io.codelaser.maddi.aapi.archive.libs.eclipsecollections; -import io.codelaser.maddi.annotation.Container; -import io.codelaser.maddi.annotation.FinalFields; -import io.codelaser.maddi.annotation.Fluent; -import io.codelaser.maddi.annotation.Immutable; import io.codelaser.maddi.annotation.ImmutableContainer; import io.codelaser.maddi.annotation.Independent; -import io.codelaser.maddi.annotation.Modified; -import io.codelaser.maddi.annotation.NotModified; -import io.codelaser.maddi.annotation.NotNull; -import io.codelaser.maddi.annotation.rare.IgnoreModifications; @Independent(absent = true) public class OrgEclipseCollectionsApiAnnotation { public static final String PACKAGE_NAME = "org.eclipse.collections.api.annotation"; diff --git a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiBag.java b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiBag.java index a42219a615..38d92fe7c4 100644 --- a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiBag.java +++ b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiBag.java @@ -3,6 +3,7 @@ import java.util.function.BiConsumer; import java.util.function.Supplier; import java.util.stream.Collector; + import org.eclipse.collections.api.RichIterable; import org.eclipse.collections.api.bag.*; import org.eclipse.collections.api.bag.primitive.*; @@ -28,16 +29,14 @@ import org.eclipse.collections.api.set.*; import org.eclipse.collections.api.tuple.Pair; import org.eclipse.collections.api.tuple.primitive.ObjectIntPair; + import io.codelaser.maddi.annotation.Container; import io.codelaser.maddi.annotation.FinalFields; import io.codelaser.maddi.annotation.Fluent; -import io.codelaser.maddi.annotation.Immutable; import io.codelaser.maddi.annotation.ImmutableContainer; import io.codelaser.maddi.annotation.Independent; import io.codelaser.maddi.annotation.Modified; import io.codelaser.maddi.annotation.NotModified; -import io.codelaser.maddi.annotation.NotNull; -import io.codelaser.maddi.annotation.rare.IgnoreModifications; @Independent(absent = true) public class OrgEclipseCollectionsApiBag { public static final String PACKAGE_NAME = "org.eclipse.collections.api.bag"; diff --git a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiBagSorted.java b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiBagSorted.java index a6b8d17cc2..8aed7cdff3 100644 --- a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiBagSorted.java +++ b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiBagSorted.java @@ -1,5 +1,6 @@ package io.codelaser.maddi.aapi.archive.libs.eclipsecollections; import java.util.Comparator; + import org.eclipse.collections.api.bag.ImmutableBag; import org.eclipse.collections.api.bag.MutableBag; import org.eclipse.collections.api.bag.sorted.*; @@ -24,16 +25,14 @@ import org.eclipse.collections.api.set.sorted.MutableSortedSet; import org.eclipse.collections.api.set.sorted.SortedSetIterable; import org.eclipse.collections.api.tuple.Pair; + import io.codelaser.maddi.annotation.Container; import io.codelaser.maddi.annotation.FinalFields; import io.codelaser.maddi.annotation.Fluent; -import io.codelaser.maddi.annotation.Immutable; import io.codelaser.maddi.annotation.ImmutableContainer; import io.codelaser.maddi.annotation.Independent; import io.codelaser.maddi.annotation.Modified; import io.codelaser.maddi.annotation.NotModified; -import io.codelaser.maddi.annotation.NotNull; -import io.codelaser.maddi.annotation.rare.IgnoreModifications; @Independent(absent = true) public class OrgEclipseCollectionsApiBagSorted { public static final String PACKAGE_NAME = "org.eclipse.collections.api.bag.sorted"; diff --git a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiBimap.java b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiBimap.java index 0ce77223a0..7ad5ef40db 100644 --- a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiBimap.java +++ b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiBimap.java @@ -1,5 +1,6 @@ package io.codelaser.maddi.aapi.archive.libs.eclipsecollections; import java.util.Map; + import org.eclipse.collections.api.bag.ImmutableBagIterable; import org.eclipse.collections.api.bimap.BiMap; import org.eclipse.collections.api.bimap.ImmutableBiMap; @@ -22,16 +23,13 @@ import org.eclipse.collections.api.set.MutableSet; import org.eclipse.collections.api.set.SetIterable; import org.eclipse.collections.api.tuple.Pair; + import io.codelaser.maddi.annotation.Container; -import io.codelaser.maddi.annotation.FinalFields; import io.codelaser.maddi.annotation.Fluent; -import io.codelaser.maddi.annotation.Immutable; import io.codelaser.maddi.annotation.ImmutableContainer; import io.codelaser.maddi.annotation.Independent; import io.codelaser.maddi.annotation.Modified; import io.codelaser.maddi.annotation.NotModified; -import io.codelaser.maddi.annotation.NotNull; -import io.codelaser.maddi.annotation.rare.IgnoreModifications; @Independent(absent = true) public class OrgEclipseCollectionsApiBimap { public static final String PACKAGE_NAME = "org.eclipse.collections.api.bimap"; diff --git a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiCollection.java b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiCollection.java index 1f3285c66d..8538e04986 100644 --- a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiCollection.java +++ b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiCollection.java @@ -2,6 +2,7 @@ import java.util.Collection; import java.util.Spliterator; import java.util.stream.Stream; + import org.eclipse.collections.api.bag.ImmutableBag; import org.eclipse.collections.api.bag.MutableBag; import org.eclipse.collections.api.block.function.*; @@ -25,15 +26,12 @@ import org.eclipse.collections.api.partition.PartitionMutableCollection; import org.eclipse.collections.api.tuple.Pair; import org.eclipse.collections.api.tuple.Twin; + import io.codelaser.maddi.annotation.Container; -import io.codelaser.maddi.annotation.FinalFields; -import io.codelaser.maddi.annotation.Fluent; -import io.codelaser.maddi.annotation.Immutable; import io.codelaser.maddi.annotation.ImmutableContainer; import io.codelaser.maddi.annotation.Independent; import io.codelaser.maddi.annotation.Modified; import io.codelaser.maddi.annotation.NotModified; -import io.codelaser.maddi.annotation.NotNull; @Independent(absent = true) public class OrgEclipseCollectionsApiCollection { public static final String PACKAGE_NAME = "org.eclipse.collections.api.collection"; diff --git a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiFactory.java b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiFactory.java index ff073c793d..56f5bf3b9d 100644 --- a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiFactory.java +++ b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiFactory.java @@ -1,5 +1,6 @@ package io.codelaser.maddi.aapi.archive.libs.eclipsecollections; import java.lang.reflect.Method; + import org.eclipse.collections.api.factory.bag.ImmutableBagFactory; import org.eclipse.collections.api.factory.bag.MultiReaderBagFactory; import org.eclipse.collections.api.factory.bag.MutableBagFactory; @@ -18,14 +19,12 @@ import org.eclipse.collections.api.factory.set.sorted.MutableSortedSetFactory; import org.eclipse.collections.api.factory.stack.ImmutableStackFactory; import org.eclipse.collections.api.factory.stack.MutableStackFactory; + import io.codelaser.maddi.annotation.Container; import io.codelaser.maddi.annotation.FinalFields; -import io.codelaser.maddi.annotation.Fluent; import io.codelaser.maddi.annotation.Immutable; import io.codelaser.maddi.annotation.Independent; -import io.codelaser.maddi.annotation.Modified; import io.codelaser.maddi.annotation.NotModified; -import io.codelaser.maddi.annotation.NotNull; @Independent(absent = true) public class OrgEclipseCollectionsApiFactory { public static final String PACKAGE_NAME = "org.eclipse.collections.api.factory"; diff --git a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiFactoryBag.java b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiFactoryBag.java index d7057e5f6c..1120eb1162 100644 --- a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiFactoryBag.java +++ b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiFactoryBag.java @@ -1,19 +1,15 @@ package io.codelaser.maddi.aapi.archive.libs.eclipsecollections; import java.util.stream.Stream; + import org.eclipse.collections.api.bag.ImmutableBag; import org.eclipse.collections.api.bag.MultiReaderBag; import org.eclipse.collections.api.bag.MutableBag; import org.eclipse.collections.api.tuple.primitive.ObjectIntPair; -import io.codelaser.maddi.annotation.Container; -import io.codelaser.maddi.annotation.FinalFields; -import io.codelaser.maddi.annotation.Fluent; + import io.codelaser.maddi.annotation.Immutable; -import io.codelaser.maddi.annotation.ImmutableContainer; import io.codelaser.maddi.annotation.Independent; import io.codelaser.maddi.annotation.Modified; import io.codelaser.maddi.annotation.NotModified; -import io.codelaser.maddi.annotation.NotNull; -import io.codelaser.maddi.annotation.rare.IgnoreModifications; @Independent(absent = true) public class OrgEclipseCollectionsApiFactoryBag { public static final String PACKAGE_NAME = "org.eclipse.collections.api.factory.bag"; diff --git a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiFactoryBagSorted.java b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiFactoryBagSorted.java index 122733cc93..ecb02544fe 100644 --- a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiFactoryBagSorted.java +++ b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiFactoryBagSorted.java @@ -1,17 +1,14 @@ package io.codelaser.maddi.aapi.archive.libs.eclipsecollections; import java.util.Comparator; + import org.eclipse.collections.api.bag.sorted.ImmutableSortedBag; import org.eclipse.collections.api.bag.sorted.MutableSortedBag; import org.eclipse.collections.api.bag.sorted.SortedBag; -import io.codelaser.maddi.annotation.Container; -import io.codelaser.maddi.annotation.FinalFields; -import io.codelaser.maddi.annotation.Fluent; + import io.codelaser.maddi.annotation.Immutable; -import io.codelaser.maddi.annotation.ImmutableContainer; import io.codelaser.maddi.annotation.Independent; import io.codelaser.maddi.annotation.Modified; import io.codelaser.maddi.annotation.NotModified; -import io.codelaser.maddi.annotation.NotNull; @Independent(absent = true) public class OrgEclipseCollectionsApiFactoryBagSorted { public static final String PACKAGE_NAME = "org.eclipse.collections.api.factory.bag.sorted"; diff --git a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiFactoryBagStrategy.java b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiFactoryBagStrategy.java index f744a20f89..c6006d0445 100644 --- a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiFactoryBagStrategy.java +++ b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiFactoryBagStrategy.java @@ -2,15 +2,11 @@ import org.eclipse.collections.api.bag.MutableBag; import org.eclipse.collections.api.block.HashingStrategy; import org.eclipse.collections.api.block.function.Function; -import io.codelaser.maddi.annotation.Container; -import io.codelaser.maddi.annotation.FinalFields; -import io.codelaser.maddi.annotation.Fluent; + import io.codelaser.maddi.annotation.Immutable; -import io.codelaser.maddi.annotation.ImmutableContainer; import io.codelaser.maddi.annotation.Independent; import io.codelaser.maddi.annotation.Modified; import io.codelaser.maddi.annotation.NotModified; -import io.codelaser.maddi.annotation.NotNull; @Independent(absent = true) public class OrgEclipseCollectionsApiFactoryBagStrategy { public static final String PACKAGE_NAME = "org.eclipse.collections.api.factory.bag.strategy"; diff --git a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiFactoryBimap.java b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiFactoryBimap.java index ff08c7acd5..6de291687d 100644 --- a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiFactoryBimap.java +++ b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiFactoryBimap.java @@ -1,8 +1,10 @@ package io.codelaser.maddi.aapi.archive.libs.eclipsecollections; import java.util.Map; + import org.eclipse.collections.api.bimap.ImmutableBiMap; import org.eclipse.collections.api.bimap.MutableBiMap; import org.eclipse.collections.api.map.ImmutableMap; + import io.codelaser.maddi.annotation.Immutable; import io.codelaser.maddi.annotation.Independent; import io.codelaser.maddi.annotation.Modified; diff --git a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiFactoryList.java b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiFactoryList.java index 6124430846..bbd18ccd28 100644 --- a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiFactoryList.java +++ b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiFactoryList.java @@ -1,18 +1,15 @@ package io.codelaser.maddi.aapi.archive.libs.eclipsecollections; import java.util.Comparator; import java.util.stream.Stream; + import org.eclipse.collections.api.RichIterable; import org.eclipse.collections.api.block.function.Function0; import org.eclipse.collections.api.list.*; -import io.codelaser.maddi.annotation.Container; -import io.codelaser.maddi.annotation.FinalFields; -import io.codelaser.maddi.annotation.Fluent; + import io.codelaser.maddi.annotation.Immutable; -import io.codelaser.maddi.annotation.ImmutableContainer; import io.codelaser.maddi.annotation.Independent; import io.codelaser.maddi.annotation.Modified; import io.codelaser.maddi.annotation.NotModified; -import io.codelaser.maddi.annotation.NotNull; @Independent(absent = true) public class OrgEclipseCollectionsApiFactoryList { public static final String PACKAGE_NAME = "org.eclipse.collections.api.factory.list"; diff --git a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiFactoryMap.java b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiFactoryMap.java index b2c8045507..60986b0a88 100644 --- a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiFactoryMap.java +++ b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiFactoryMap.java @@ -1,15 +1,12 @@ package io.codelaser.maddi.aapi.archive.libs.eclipsecollections; import java.util.Map; + import org.eclipse.collections.api.map.*; -import io.codelaser.maddi.annotation.Container; -import io.codelaser.maddi.annotation.FinalFields; -import io.codelaser.maddi.annotation.Fluent; + import io.codelaser.maddi.annotation.Immutable; -import io.codelaser.maddi.annotation.ImmutableContainer; import io.codelaser.maddi.annotation.Independent; import io.codelaser.maddi.annotation.Modified; import io.codelaser.maddi.annotation.NotModified; -import io.codelaser.maddi.annotation.NotNull; @Independent(absent = true) public class OrgEclipseCollectionsApiFactoryMap { public static final String PACKAGE_NAME = "org.eclipse.collections.api.factory.map"; diff --git a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiFactoryMapSorted.java b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiFactoryMapSorted.java index d4e1d0fd33..c496b874dd 100644 --- a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiFactoryMapSorted.java +++ b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiFactoryMapSorted.java @@ -2,17 +2,13 @@ import java.util.Comparator; import java.util.Map; import java.util.SortedMap; + import org.eclipse.collections.api.map.sorted.ImmutableSortedMap; import org.eclipse.collections.api.map.sorted.MutableSortedMap; -import io.codelaser.maddi.annotation.Container; -import io.codelaser.maddi.annotation.FinalFields; -import io.codelaser.maddi.annotation.Fluent; + import io.codelaser.maddi.annotation.Immutable; -import io.codelaser.maddi.annotation.ImmutableContainer; import io.codelaser.maddi.annotation.Independent; -import io.codelaser.maddi.annotation.Modified; import io.codelaser.maddi.annotation.NotModified; -import io.codelaser.maddi.annotation.NotNull; @Independent(absent = true) public class OrgEclipseCollectionsApiFactoryMapSorted { public static final String PACKAGE_NAME = "org.eclipse.collections.api.factory.map.sorted"; diff --git a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiFactoryMapStrategy.java b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiFactoryMapStrategy.java index 999246a140..043b65f58d 100644 --- a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiFactoryMapStrategy.java +++ b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiFactoryMapStrategy.java @@ -1,18 +1,15 @@ package io.codelaser.maddi.aapi.archive.libs.eclipsecollections; import java.util.Map; + import org.eclipse.collections.api.block.HashingStrategy; import org.eclipse.collections.api.block.function.Function; import org.eclipse.collections.api.map.ImmutableMap; import org.eclipse.collections.api.map.MutableMap; -import io.codelaser.maddi.annotation.Container; -import io.codelaser.maddi.annotation.FinalFields; -import io.codelaser.maddi.annotation.Fluent; + import io.codelaser.maddi.annotation.Immutable; -import io.codelaser.maddi.annotation.ImmutableContainer; import io.codelaser.maddi.annotation.Independent; import io.codelaser.maddi.annotation.Modified; import io.codelaser.maddi.annotation.NotModified; -import io.codelaser.maddi.annotation.NotNull; @Independent(absent = true) public class OrgEclipseCollectionsApiFactoryMapStrategy { public static final String PACKAGE_NAME = "org.eclipse.collections.api.factory.map.strategy"; diff --git a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiFactorySet.java b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiFactorySet.java index 5b9206787f..3cab259ce4 100644 --- a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiFactorySet.java +++ b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiFactorySet.java @@ -1,15 +1,12 @@ package io.codelaser.maddi.aapi.archive.libs.eclipsecollections; import java.util.stream.Stream; + import org.eclipse.collections.api.set.*; -import io.codelaser.maddi.annotation.Container; -import io.codelaser.maddi.annotation.FinalFields; -import io.codelaser.maddi.annotation.Fluent; + import io.codelaser.maddi.annotation.Immutable; -import io.codelaser.maddi.annotation.ImmutableContainer; import io.codelaser.maddi.annotation.Independent; import io.codelaser.maddi.annotation.Modified; import io.codelaser.maddi.annotation.NotModified; -import io.codelaser.maddi.annotation.NotNull; @Independent(absent = true) public class OrgEclipseCollectionsApiFactorySet { public static final String PACKAGE_NAME = "org.eclipse.collections.api.factory.set"; diff --git a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiFactorySetSorted.java b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiFactorySetSorted.java index 52e78f4649..b53ddaddc3 100644 --- a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiFactorySetSorted.java +++ b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiFactorySetSorted.java @@ -1,17 +1,14 @@ package io.codelaser.maddi.aapi.archive.libs.eclipsecollections; import java.util.Comparator; import java.util.SortedSet; + import org.eclipse.collections.api.set.sorted.ImmutableSortedSet; import org.eclipse.collections.api.set.sorted.MutableSortedSet; -import io.codelaser.maddi.annotation.Container; -import io.codelaser.maddi.annotation.FinalFields; -import io.codelaser.maddi.annotation.Fluent; + import io.codelaser.maddi.annotation.Immutable; -import io.codelaser.maddi.annotation.ImmutableContainer; import io.codelaser.maddi.annotation.Independent; import io.codelaser.maddi.annotation.Modified; import io.codelaser.maddi.annotation.NotModified; -import io.codelaser.maddi.annotation.NotNull; @Independent(absent = true) public class OrgEclipseCollectionsApiFactorySetSorted { public static final String PACKAGE_NAME = "org.eclipse.collections.api.factory.set.sorted"; diff --git a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiFactorySetStrategy.java b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiFactorySetStrategy.java index b1a8ade7b9..9bc623f56b 100644 --- a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiFactorySetStrategy.java +++ b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiFactorySetStrategy.java @@ -3,16 +3,11 @@ import org.eclipse.collections.api.block.function.Function; import org.eclipse.collections.api.set.ImmutableSet; import org.eclipse.collections.api.set.MutableSet; -import io.codelaser.maddi.annotation.Container; -import io.codelaser.maddi.annotation.FinalFields; -import io.codelaser.maddi.annotation.Fluent; + import io.codelaser.maddi.annotation.Immutable; -import io.codelaser.maddi.annotation.ImmutableContainer; import io.codelaser.maddi.annotation.Independent; import io.codelaser.maddi.annotation.Modified; import io.codelaser.maddi.annotation.NotModified; -import io.codelaser.maddi.annotation.NotNull; -import io.codelaser.maddi.annotation.rare.IgnoreModifications; @Independent(absent = true) public class OrgEclipseCollectionsApiFactorySetStrategy { public static final String PACKAGE_NAME = "org.eclipse.collections.api.factory.set.strategy"; diff --git a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiFactoryStack.java b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiFactoryStack.java index d05f7fb79b..b15df2fda5 100644 --- a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiFactoryStack.java +++ b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiFactoryStack.java @@ -1,16 +1,12 @@ package io.codelaser.maddi.aapi.archive.libs.eclipsecollections; import java.util.stream.Stream; + import org.eclipse.collections.api.stack.ImmutableStack; import org.eclipse.collections.api.stack.MutableStack; -import io.codelaser.maddi.annotation.Container; -import io.codelaser.maddi.annotation.FinalFields; -import io.codelaser.maddi.annotation.Fluent; + import io.codelaser.maddi.annotation.Immutable; -import io.codelaser.maddi.annotation.ImmutableContainer; import io.codelaser.maddi.annotation.Independent; -import io.codelaser.maddi.annotation.Modified; import io.codelaser.maddi.annotation.NotModified; -import io.codelaser.maddi.annotation.NotNull; @Independent(absent = true) public class OrgEclipseCollectionsApiFactoryStack { public static final String PACKAGE_NAME = "org.eclipse.collections.api.factory.stack"; diff --git a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiIterator.java b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiIterator.java index f79661cf96..fb27854ced 100644 --- a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiIterator.java +++ b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiIterator.java @@ -1,14 +1,8 @@ package io.codelaser.maddi.aapi.archive.libs.eclipsecollections; import io.codelaser.maddi.annotation.Container; import io.codelaser.maddi.annotation.FinalFields; -import io.codelaser.maddi.annotation.Fluent; -import io.codelaser.maddi.annotation.Immutable; -import io.codelaser.maddi.annotation.ImmutableContainer; import io.codelaser.maddi.annotation.Independent; import io.codelaser.maddi.annotation.Modified; -import io.codelaser.maddi.annotation.NotModified; -import io.codelaser.maddi.annotation.NotNull; -import io.codelaser.maddi.annotation.rare.IgnoreModifications; @Independent(absent = true) public class OrgEclipseCollectionsApiIterator { public static final String PACKAGE_NAME = "org.eclipse.collections.api.iterator"; diff --git a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiList.java b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiList.java index ee11f0b4bd..7cc1a66b9c 100644 --- a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiList.java +++ b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiList.java @@ -1,6 +1,7 @@ package io.codelaser.maddi.aapi.archive.libs.eclipsecollections; import java.util.*; import java.util.concurrent.ExecutorService; + import org.eclipse.collections.api.block.HashingStrategy; import org.eclipse.collections.api.block.function.Function; import org.eclipse.collections.api.block.function.Function2; @@ -20,16 +21,15 @@ import org.eclipse.collections.api.partition.list.PartitionMutableList; import org.eclipse.collections.api.set.ParallelUnsortedSetIterable; import org.eclipse.collections.api.tuple.Pair; + import io.codelaser.maddi.annotation.Container; import io.codelaser.maddi.annotation.FinalFields; import io.codelaser.maddi.annotation.Fluent; -import io.codelaser.maddi.annotation.Immutable; import io.codelaser.maddi.annotation.ImmutableContainer; import io.codelaser.maddi.annotation.Independent; import io.codelaser.maddi.annotation.Modified; import io.codelaser.maddi.annotation.NotModified; import io.codelaser.maddi.annotation.NotNull; -import io.codelaser.maddi.annotation.rare.IgnoreModifications; @Independent(absent = true) public class OrgEclipseCollectionsApiList { public static final String PACKAGE_NAME = "org.eclipse.collections.api.list"; diff --git a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiMap.java b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiMap.java index 72288cdaaf..464af503ef 100644 --- a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiMap.java +++ b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiMap.java @@ -3,6 +3,7 @@ import java.util.function.BiConsumer; import java.util.function.BiFunction; import java.util.stream.Stream; + import org.eclipse.collections.api.RichIterable; import org.eclipse.collections.api.bag.Bag; import org.eclipse.collections.api.bag.ImmutableBag; @@ -46,10 +47,9 @@ import org.eclipse.collections.api.set.MutableSet; import org.eclipse.collections.api.set.UnsortedSetIterable; import org.eclipse.collections.api.tuple.Pair; + import io.codelaser.maddi.annotation.Container; -import io.codelaser.maddi.annotation.FinalFields; import io.codelaser.maddi.annotation.Fluent; -import io.codelaser.maddi.annotation.Immutable; import io.codelaser.maddi.annotation.ImmutableContainer; import io.codelaser.maddi.annotation.Independent; import io.codelaser.maddi.annotation.Modified; diff --git a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiMapSorted.java b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiMapSorted.java index 5d047b8a6c..67b998df9f 100644 --- a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiMapSorted.java +++ b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiMapSorted.java @@ -2,6 +2,7 @@ import java.util.Comparator; import java.util.Map; import java.util.SortedMap; + import org.eclipse.collections.api.block.function.Function; import org.eclipse.collections.api.block.function.Function0; import org.eclipse.collections.api.block.function.Function2; @@ -30,15 +31,13 @@ import org.eclipse.collections.api.partition.list.PartitionMutableList; import org.eclipse.collections.api.set.MutableSet; import org.eclipse.collections.api.tuple.Pair; + import io.codelaser.maddi.annotation.Container; -import io.codelaser.maddi.annotation.FinalFields; import io.codelaser.maddi.annotation.Fluent; -import io.codelaser.maddi.annotation.Immutable; import io.codelaser.maddi.annotation.ImmutableContainer; import io.codelaser.maddi.annotation.Independent; import io.codelaser.maddi.annotation.Modified; import io.codelaser.maddi.annotation.NotModified; -import io.codelaser.maddi.annotation.NotNull; @Independent(absent = true) public class OrgEclipseCollectionsApiMapSorted { public static final String PACKAGE_NAME = "org.eclipse.collections.api.map.sorted"; diff --git a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiMultimap.java b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiMultimap.java index e5273162c6..5e1014edcd 100644 --- a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiMultimap.java +++ b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiMultimap.java @@ -1,5 +1,6 @@ package io.codelaser.maddi.aapi.archive.libs.eclipsecollections; import java.util.Collection; + import org.eclipse.collections.api.RichIterable; import org.eclipse.collections.api.bag.Bag; import org.eclipse.collections.api.block.function.Function; @@ -16,15 +17,14 @@ import org.eclipse.collections.api.multimap.MutableMultimap; import org.eclipse.collections.api.set.SetIterable; import org.eclipse.collections.api.tuple.Pair; + import io.codelaser.maddi.annotation.Container; import io.codelaser.maddi.annotation.FinalFields; import io.codelaser.maddi.annotation.Fluent; -import io.codelaser.maddi.annotation.Immutable; import io.codelaser.maddi.annotation.ImmutableContainer; import io.codelaser.maddi.annotation.Independent; import io.codelaser.maddi.annotation.Modified; import io.codelaser.maddi.annotation.NotModified; -import io.codelaser.maddi.annotation.NotNull; @Independent(absent = true) public class OrgEclipseCollectionsApiMultimap { public static final String PACKAGE_NAME = "org.eclipse.collections.api.multimap"; diff --git a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiMultimapBag.java b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiMultimapBag.java index 2f80c5bcdf..6b5180e370 100644 --- a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiMultimapBag.java +++ b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiMultimapBag.java @@ -9,15 +9,14 @@ import org.eclipse.collections.api.multimap.MutableMultimap; import org.eclipse.collections.api.multimap.bag.*; import org.eclipse.collections.api.tuple.Pair; + import io.codelaser.maddi.annotation.Container; import io.codelaser.maddi.annotation.FinalFields; import io.codelaser.maddi.annotation.Fluent; -import io.codelaser.maddi.annotation.Immutable; import io.codelaser.maddi.annotation.ImmutableContainer; import io.codelaser.maddi.annotation.Independent; import io.codelaser.maddi.annotation.Modified; import io.codelaser.maddi.annotation.NotModified; -import io.codelaser.maddi.annotation.NotNull; @Independent(absent = true) public class OrgEclipseCollectionsApiMultimapBag { public static final String PACKAGE_NAME = "org.eclipse.collections.api.multimap.bag"; diff --git a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiMultimapList.java b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiMultimapList.java index f4dc9db2bb..0b55cee955 100644 --- a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiMultimapList.java +++ b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiMultimapList.java @@ -12,16 +12,14 @@ import org.eclipse.collections.api.multimap.list.ListMultimap; import org.eclipse.collections.api.multimap.list.MutableListMultimap; import org.eclipse.collections.api.tuple.Pair; + import io.codelaser.maddi.annotation.Container; import io.codelaser.maddi.annotation.FinalFields; import io.codelaser.maddi.annotation.Fluent; -import io.codelaser.maddi.annotation.Immutable; import io.codelaser.maddi.annotation.ImmutableContainer; import io.codelaser.maddi.annotation.Independent; import io.codelaser.maddi.annotation.Modified; import io.codelaser.maddi.annotation.NotModified; -import io.codelaser.maddi.annotation.NotNull; -import io.codelaser.maddi.annotation.rare.IgnoreModifications; @Independent(absent = true) public class OrgEclipseCollectionsApiMultimapList { public static final String PACKAGE_NAME = "org.eclipse.collections.api.multimap.list"; diff --git a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiMultimapOrdered.java b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiMultimapOrdered.java index c2029c29e2..25d0129f3d 100644 --- a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiMultimapOrdered.java +++ b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiMultimapOrdered.java @@ -1,5 +1,6 @@ package io.codelaser.maddi.aapi.archive.libs.eclipsecollections; import java.util.Comparator; + import org.eclipse.collections.api.RichIterable; import org.eclipse.collections.api.block.function.Function; import org.eclipse.collections.api.block.function.Function2; @@ -13,15 +14,11 @@ import org.eclipse.collections.api.ordered.ReversibleIterable; import org.eclipse.collections.api.ordered.SortedIterable; import org.eclipse.collections.api.tuple.Pair; -import io.codelaser.maddi.annotation.Container; + import io.codelaser.maddi.annotation.FinalFields; -import io.codelaser.maddi.annotation.Fluent; -import io.codelaser.maddi.annotation.Immutable; -import io.codelaser.maddi.annotation.ImmutableContainer; import io.codelaser.maddi.annotation.Independent; import io.codelaser.maddi.annotation.Modified; import io.codelaser.maddi.annotation.NotModified; -import io.codelaser.maddi.annotation.NotNull; @Independent(absent = true) public class OrgEclipseCollectionsApiMultimapOrdered { public static final String PACKAGE_NAME = "org.eclipse.collections.api.multimap.ordered"; diff --git a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiMultimapSet.java b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiMultimapSet.java index 803d0f845e..0bc29c32b2 100644 --- a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiMultimapSet.java +++ b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiMultimapSet.java @@ -10,15 +10,14 @@ import org.eclipse.collections.api.multimap.set.*; import org.eclipse.collections.api.set.*; import org.eclipse.collections.api.tuple.Pair; + import io.codelaser.maddi.annotation.Container; import io.codelaser.maddi.annotation.FinalFields; import io.codelaser.maddi.annotation.Fluent; -import io.codelaser.maddi.annotation.Immutable; import io.codelaser.maddi.annotation.ImmutableContainer; import io.codelaser.maddi.annotation.Independent; import io.codelaser.maddi.annotation.Modified; import io.codelaser.maddi.annotation.NotModified; -import io.codelaser.maddi.annotation.NotNull; @Independent(absent = true) public class OrgEclipseCollectionsApiMultimapSet { public static final String PACKAGE_NAME = "org.eclipse.collections.api.multimap.set"; diff --git a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiMultimapSortedbag.java b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiMultimapSortedbag.java index 71a8fc41c6..7621bb2be1 100644 --- a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiMultimapSortedbag.java +++ b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiMultimapSortedbag.java @@ -16,15 +16,14 @@ import org.eclipse.collections.api.multimap.sortedbag.MutableSortedBagMultimap; import org.eclipse.collections.api.multimap.sortedbag.SortedBagMultimap; import org.eclipse.collections.api.tuple.Pair; + import io.codelaser.maddi.annotation.Container; import io.codelaser.maddi.annotation.FinalFields; import io.codelaser.maddi.annotation.Fluent; -import io.codelaser.maddi.annotation.Immutable; import io.codelaser.maddi.annotation.ImmutableContainer; import io.codelaser.maddi.annotation.Independent; import io.codelaser.maddi.annotation.Modified; import io.codelaser.maddi.annotation.NotModified; -import io.codelaser.maddi.annotation.NotNull; @Independent(absent = true) public class OrgEclipseCollectionsApiMultimapSortedbag { public static final String PACKAGE_NAME = "org.eclipse.collections.api.multimap.sortedbag"; diff --git a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiMultimapSortedset.java b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiMultimapSortedset.java index bb26527adc..3f0b129e46 100644 --- a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiMultimapSortedset.java +++ b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiMultimapSortedset.java @@ -18,16 +18,14 @@ import org.eclipse.collections.api.set.sorted.MutableSortedSet; import org.eclipse.collections.api.set.sorted.SortedSetIterable; import org.eclipse.collections.api.tuple.Pair; + import io.codelaser.maddi.annotation.Container; import io.codelaser.maddi.annotation.FinalFields; import io.codelaser.maddi.annotation.Fluent; -import io.codelaser.maddi.annotation.Immutable; import io.codelaser.maddi.annotation.ImmutableContainer; import io.codelaser.maddi.annotation.Independent; import io.codelaser.maddi.annotation.Modified; import io.codelaser.maddi.annotation.NotModified; -import io.codelaser.maddi.annotation.NotNull; -import io.codelaser.maddi.annotation.rare.IgnoreModifications; @Independent(absent = true) public class OrgEclipseCollectionsApiMultimapSortedset { public static final String PACKAGE_NAME = "org.eclipse.collections.api.multimap.sortedset"; diff --git a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiOrdered.java b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiOrdered.java index 1af18a0dc1..57f51c40ea 100644 --- a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiOrdered.java +++ b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiOrdered.java @@ -2,6 +2,7 @@ import java.util.Collection; import java.util.Comparator; import java.util.Optional; + import org.eclipse.collections.api.LazyIterable; import org.eclipse.collections.api.block.function.Function; import org.eclipse.collections.api.block.function.Function2; @@ -24,15 +25,10 @@ import org.eclipse.collections.api.partition.ordered.PartitionSortedIterable; import org.eclipse.collections.api.stack.MutableStack; import org.eclipse.collections.api.tuple.Pair; -import io.codelaser.maddi.annotation.Container; -import io.codelaser.maddi.annotation.FinalFields; -import io.codelaser.maddi.annotation.Fluent; -import io.codelaser.maddi.annotation.Immutable; -import io.codelaser.maddi.annotation.ImmutableContainer; + import io.codelaser.maddi.annotation.Independent; import io.codelaser.maddi.annotation.Modified; import io.codelaser.maddi.annotation.NotModified; -import io.codelaser.maddi.annotation.NotNull; @Independent(absent = true) public class OrgEclipseCollectionsApiOrdered { public static final String PACKAGE_NAME = "org.eclipse.collections.api.ordered"; diff --git a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiPartition.java b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiPartition.java index 6b34479141..667d924766 100644 --- a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiPartition.java +++ b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiPartition.java @@ -3,15 +3,13 @@ import org.eclipse.collections.api.collection.ImmutableCollection; import org.eclipse.collections.api.collection.MutableCollection; import org.eclipse.collections.api.partition.PartitionImmutableCollection; + import io.codelaser.maddi.annotation.Container; import io.codelaser.maddi.annotation.FinalFields; -import io.codelaser.maddi.annotation.Fluent; -import io.codelaser.maddi.annotation.Immutable; import io.codelaser.maddi.annotation.ImmutableContainer; import io.codelaser.maddi.annotation.Independent; import io.codelaser.maddi.annotation.Modified; import io.codelaser.maddi.annotation.NotModified; -import io.codelaser.maddi.annotation.NotNull; @Independent(absent = true) public class OrgEclipseCollectionsApiPartition { public static final String PACKAGE_NAME = "org.eclipse.collections.api.partition"; diff --git a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiPartitionBag.java b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiPartitionBag.java index d785ee4e29..4565e6d263 100644 --- a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiPartitionBag.java +++ b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiPartitionBag.java @@ -2,15 +2,13 @@ import org.eclipse.collections.api.bag.*; import org.eclipse.collections.api.partition.bag.PartitionImmutableBag; import org.eclipse.collections.api.partition.bag.PartitionImmutableBagIterable; + import io.codelaser.maddi.annotation.Container; import io.codelaser.maddi.annotation.FinalFields; -import io.codelaser.maddi.annotation.Fluent; -import io.codelaser.maddi.annotation.Immutable; import io.codelaser.maddi.annotation.ImmutableContainer; import io.codelaser.maddi.annotation.Independent; import io.codelaser.maddi.annotation.Modified; import io.codelaser.maddi.annotation.NotModified; -import io.codelaser.maddi.annotation.NotNull; @Independent(absent = true) public class OrgEclipseCollectionsApiPartitionBag { public static final String PACKAGE_NAME = "org.eclipse.collections.api.partition.bag"; diff --git a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiPartitionBagSorted.java b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiPartitionBagSorted.java index 578c159c52..27163692ec 100644 --- a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiPartitionBagSorted.java +++ b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiPartitionBagSorted.java @@ -3,15 +3,13 @@ import org.eclipse.collections.api.bag.sorted.MutableSortedBag; import org.eclipse.collections.api.bag.sorted.SortedBag; import org.eclipse.collections.api.partition.bag.sorted.PartitionImmutableSortedBag; + import io.codelaser.maddi.annotation.Container; import io.codelaser.maddi.annotation.FinalFields; -import io.codelaser.maddi.annotation.Fluent; -import io.codelaser.maddi.annotation.Immutable; import io.codelaser.maddi.annotation.ImmutableContainer; import io.codelaser.maddi.annotation.Independent; import io.codelaser.maddi.annotation.Modified; import io.codelaser.maddi.annotation.NotModified; -import io.codelaser.maddi.annotation.NotNull; @Independent(absent = true) public class OrgEclipseCollectionsApiPartitionBagSorted { public static final String PACKAGE_NAME = "org.eclipse.collections.api.partition.bag.sorted"; diff --git a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiPartitionList.java b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiPartitionList.java index 9eafe01733..0b1201faf6 100644 --- a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiPartitionList.java +++ b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiPartitionList.java @@ -3,16 +3,13 @@ import org.eclipse.collections.api.list.ListIterable; import org.eclipse.collections.api.list.MutableList; import org.eclipse.collections.api.partition.list.PartitionImmutableList; + import io.codelaser.maddi.annotation.Container; import io.codelaser.maddi.annotation.FinalFields; -import io.codelaser.maddi.annotation.Fluent; -import io.codelaser.maddi.annotation.Immutable; import io.codelaser.maddi.annotation.ImmutableContainer; import io.codelaser.maddi.annotation.Independent; import io.codelaser.maddi.annotation.Modified; import io.codelaser.maddi.annotation.NotModified; -import io.codelaser.maddi.annotation.NotNull; -import io.codelaser.maddi.annotation.rare.IgnoreModifications; @Independent(absent = true) public class OrgEclipseCollectionsApiPartitionList { public static final String PACKAGE_NAME = "org.eclipse.collections.api.partition.list"; diff --git a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiPartitionOrdered.java b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiPartitionOrdered.java index 554ea3cd80..0b469daa9c 100644 --- a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiPartitionOrdered.java +++ b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiPartitionOrdered.java @@ -2,15 +2,11 @@ import org.eclipse.collections.api.ordered.OrderedIterable; import org.eclipse.collections.api.ordered.ReversibleIterable; import org.eclipse.collections.api.ordered.SortedIterable; + import io.codelaser.maddi.annotation.Container; import io.codelaser.maddi.annotation.FinalFields; -import io.codelaser.maddi.annotation.Fluent; -import io.codelaser.maddi.annotation.Immutable; -import io.codelaser.maddi.annotation.ImmutableContainer; import io.codelaser.maddi.annotation.Independent; -import io.codelaser.maddi.annotation.Modified; import io.codelaser.maddi.annotation.NotModified; -import io.codelaser.maddi.annotation.NotNull; @Independent(absent = true) public class OrgEclipseCollectionsApiPartitionOrdered { public static final String PACKAGE_NAME = "org.eclipse.collections.api.partition.ordered"; diff --git a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiPartitionSet.java b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiPartitionSet.java index 3e8f25dfde..6c1fb4c0c5 100644 --- a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiPartitionSet.java +++ b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiPartitionSet.java @@ -1,16 +1,13 @@ package io.codelaser.maddi.aapi.archive.libs.eclipsecollections; import org.eclipse.collections.api.partition.set.PartitionImmutableSet; import org.eclipse.collections.api.set.*; + import io.codelaser.maddi.annotation.Container; import io.codelaser.maddi.annotation.FinalFields; -import io.codelaser.maddi.annotation.Fluent; -import io.codelaser.maddi.annotation.Immutable; import io.codelaser.maddi.annotation.ImmutableContainer; import io.codelaser.maddi.annotation.Independent; import io.codelaser.maddi.annotation.Modified; import io.codelaser.maddi.annotation.NotModified; -import io.codelaser.maddi.annotation.NotNull; -import io.codelaser.maddi.annotation.rare.IgnoreModifications; @Independent(absent = true) public class OrgEclipseCollectionsApiPartitionSet { public static final String PACKAGE_NAME = "org.eclipse.collections.api.partition.set"; diff --git a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiPartitionSetSorted.java b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiPartitionSetSorted.java index 5486fc6c0f..4018690be9 100644 --- a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiPartitionSetSorted.java +++ b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiPartitionSetSorted.java @@ -3,15 +3,12 @@ import org.eclipse.collections.api.set.sorted.ImmutableSortedSet; import org.eclipse.collections.api.set.sorted.MutableSortedSet; import org.eclipse.collections.api.set.sorted.SortedSetIterable; + import io.codelaser.maddi.annotation.Container; import io.codelaser.maddi.annotation.FinalFields; -import io.codelaser.maddi.annotation.Fluent; -import io.codelaser.maddi.annotation.Immutable; import io.codelaser.maddi.annotation.ImmutableContainer; import io.codelaser.maddi.annotation.Independent; -import io.codelaser.maddi.annotation.Modified; import io.codelaser.maddi.annotation.NotModified; -import io.codelaser.maddi.annotation.NotNull; @Independent(absent = true) public class OrgEclipseCollectionsApiPartitionSetSorted { public static final String PACKAGE_NAME = "org.eclipse.collections.api.partition.set.sorted"; diff --git a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiPartitionStack.java b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiPartitionStack.java index cab933d9f1..82ebaabe2f 100644 --- a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiPartitionStack.java +++ b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiPartitionStack.java @@ -3,15 +3,12 @@ import org.eclipse.collections.api.stack.ImmutableStack; import org.eclipse.collections.api.stack.MutableStack; import org.eclipse.collections.api.stack.StackIterable; + import io.codelaser.maddi.annotation.Container; import io.codelaser.maddi.annotation.FinalFields; -import io.codelaser.maddi.annotation.Fluent; -import io.codelaser.maddi.annotation.Immutable; import io.codelaser.maddi.annotation.ImmutableContainer; import io.codelaser.maddi.annotation.Independent; -import io.codelaser.maddi.annotation.Modified; import io.codelaser.maddi.annotation.NotModified; -import io.codelaser.maddi.annotation.NotNull; @Independent(absent = true) public class OrgEclipseCollectionsApiPartitionStack { public static final String PACKAGE_NAME = "org.eclipse.collections.api.partition.stack"; diff --git a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiSet.java b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiSet.java index 884b1d7978..a45f895239 100644 --- a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiSet.java +++ b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiSet.java @@ -1,6 +1,7 @@ package io.codelaser.maddi.aapi.archive.libs.eclipsecollections; import java.util.Set; import java.util.concurrent.ExecutorService; + import org.eclipse.collections.api.LazyIterable; import org.eclipse.collections.api.block.function.Function; import org.eclipse.collections.api.block.function.Function2; @@ -14,15 +15,14 @@ import org.eclipse.collections.api.set.*; import org.eclipse.collections.api.set.primitive.*; import org.eclipse.collections.api.tuple.Pair; + import io.codelaser.maddi.annotation.Container; import io.codelaser.maddi.annotation.FinalFields; import io.codelaser.maddi.annotation.Fluent; -import io.codelaser.maddi.annotation.Immutable; import io.codelaser.maddi.annotation.ImmutableContainer; import io.codelaser.maddi.annotation.Independent; import io.codelaser.maddi.annotation.Modified; import io.codelaser.maddi.annotation.NotModified; -import io.codelaser.maddi.annotation.NotNull; @Independent(absent = true) public class OrgEclipseCollectionsApiSet { public static final String PACKAGE_NAME = "org.eclipse.collections.api.set"; diff --git a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiSetSorted.java b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiSetSorted.java index 70cec029cf..dbf2109a8b 100644 --- a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiSetSorted.java +++ b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiSetSorted.java @@ -2,6 +2,7 @@ import java.util.Comparator; import java.util.SortedSet; import java.util.concurrent.ExecutorService; + import org.eclipse.collections.api.block.function.Function; import org.eclipse.collections.api.block.function.Function2; import org.eclipse.collections.api.block.function.primitive.*; @@ -19,16 +20,14 @@ import org.eclipse.collections.api.set.SetIterable; import org.eclipse.collections.api.set.sorted.*; import org.eclipse.collections.api.tuple.Pair; + import io.codelaser.maddi.annotation.Container; import io.codelaser.maddi.annotation.FinalFields; import io.codelaser.maddi.annotation.Fluent; -import io.codelaser.maddi.annotation.Immutable; import io.codelaser.maddi.annotation.ImmutableContainer; import io.codelaser.maddi.annotation.Independent; import io.codelaser.maddi.annotation.Modified; import io.codelaser.maddi.annotation.NotModified; -import io.codelaser.maddi.annotation.NotNull; -import io.codelaser.maddi.annotation.rare.IgnoreModifications; @Independent(absent = true) public class OrgEclipseCollectionsApiSetSorted { public static final String PACKAGE_NAME = "org.eclipse.collections.api.set.sorted"; diff --git a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiStack.java b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiStack.java index 4746084aa7..fcca1269c2 100644 --- a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiStack.java +++ b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiStack.java @@ -1,5 +1,6 @@ package io.codelaser.maddi.aapi.archive.libs.eclipsecollections; import java.util.Collection; + import org.eclipse.collections.api.bag.ImmutableBag; import org.eclipse.collections.api.bag.MutableBag; import org.eclipse.collections.api.block.function.Function; @@ -25,10 +26,8 @@ import org.eclipse.collections.api.stack.StackIterable; import org.eclipse.collections.api.stack.primitive.*; import org.eclipse.collections.api.tuple.Pair; + import io.codelaser.maddi.annotation.Container; -import io.codelaser.maddi.annotation.FinalFields; -import io.codelaser.maddi.annotation.Fluent; -import io.codelaser.maddi.annotation.Immutable; import io.codelaser.maddi.annotation.ImmutableContainer; import io.codelaser.maddi.annotation.Independent; import io.codelaser.maddi.annotation.Modified; diff --git a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiTuple.java b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiTuple.java index 8ee9dabf0e..69952dd6cc 100644 --- a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiTuple.java +++ b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/eclipsecollections/OrgEclipseCollectionsApiTuple.java @@ -1,15 +1,12 @@ package io.codelaser.maddi.aapi.archive.libs.eclipsecollections; import java.util.Map; + import org.eclipse.collections.api.tuple.*; -import io.codelaser.maddi.annotation.Container; -import io.codelaser.maddi.annotation.FinalFields; -import io.codelaser.maddi.annotation.Fluent; + import io.codelaser.maddi.annotation.Immutable; -import io.codelaser.maddi.annotation.ImmutableContainer; import io.codelaser.maddi.annotation.Independent; import io.codelaser.maddi.annotation.Modified; import io.codelaser.maddi.annotation.NotModified; -import io.codelaser.maddi.annotation.NotNull; @Independent(absent = true) public class OrgEclipseCollectionsApiTuple { public static final String PACKAGE_NAME = "org.eclipse.collections.api.tuple"; diff --git a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/guava/ComGoogleCommonCollect.java b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/guava/ComGoogleCommonCollect.java index 4c9dedacf0..fa7794c769 100644 --- a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/guava/ComGoogleCommonCollect.java +++ b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/guava/ComGoogleCommonCollect.java @@ -1,11 +1,4 @@ package io.codelaser.maddi.aapi.archive.libs.guava; -import com.google.common.base.Converter; -import com.google.common.base.Equivalence; -import com.google.common.base.Function; -import com.google.common.base.Joiner; -import com.google.common.base.Optional; -import com.google.common.base.Predicate; -import com.google.common.collect.*; import java.math.BigInteger; import java.time.Duration; import java.util.ArrayDeque; @@ -51,6 +44,15 @@ import java.util.function.ToIntFunction; import java.util.function.UnaryOperator; import java.util.stream.*; + +import com.google.common.base.Converter; +import com.google.common.base.Equivalence; +import com.google.common.base.Function; +import com.google.common.base.Joiner; +import com.google.common.base.Optional; +import com.google.common.base.Predicate; +import com.google.common.collect.*; + import io.codelaser.maddi.annotation.Container; import io.codelaser.maddi.annotation.FinalFields; import io.codelaser.maddi.annotation.Fluent; diff --git a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/kotlin/KotlinCollections.java b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/kotlin/KotlinCollections.java index c29d2c53c9..e1d37adddb 100644 --- a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/kotlin/KotlinCollections.java +++ b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/kotlin/KotlinCollections.java @@ -17,6 +17,14 @@ package io.codelaser.maddi.aapi.archive.libs.kotlin; +import java.util.Collection; +import java.util.Comparator; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.SortedSet; + import io.codelaser.maddi.annotation.Identity; import io.codelaser.maddi.annotation.Independent; import io.codelaser.maddi.annotation.Modified; @@ -29,14 +37,6 @@ import kotlin.ranges.IntRange; import kotlin.sequences.Sequence; -import java.util.Collection; -import java.util.Comparator; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.SortedSet; - /** * The annotated API for {@code kotlin.collections}: the extension functions every Kotlin codebase calls on a * collection. Each is a static whose first parameter is the receiver — what kotlinc emits, and what maddi diff --git a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/kotlin/KotlinIo.java b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/kotlin/KotlinIo.java index eb0287d696..cd7d7c78f9 100644 --- a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/kotlin/KotlinIo.java +++ b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/kotlin/KotlinIo.java @@ -17,13 +17,13 @@ package io.codelaser.maddi.aapi.archive.libs.kotlin; -import io.codelaser.maddi.annotation.NotModified; -import io.codelaser.maddi.annotation.NotNull; - import java.io.File; import java.nio.charset.Charset; import java.util.List; +import io.codelaser.maddi.annotation.NotModified; +import io.codelaser.maddi.annotation.NotNull; + /** * The annotated API for {@code kotlin.io}: reading a file through a {@link File} leaves the File object as it * was. The stream extensions (readBytes, copyTo, reader) DO consume their stream and stay uncontracted. diff --git a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/kotlin/KotlinIoPath.java b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/kotlin/KotlinIoPath.java index c63bf9d52f..8e6c4759bb 100644 --- a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/kotlin/KotlinIoPath.java +++ b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/kotlin/KotlinIoPath.java @@ -16,14 +16,14 @@ */ package io.codelaser.maddi.aapi.archive.libs.kotlin; -import io.codelaser.maddi.annotation.NotModified; -import io.codelaser.maddi.annotation.NotNull; - import java.nio.charset.Charset; import java.nio.file.OpenOption; import java.nio.file.Path; import java.nio.file.attribute.FileAttribute; +import io.codelaser.maddi.annotation.NotModified; +import io.codelaser.maddi.annotation.NotNull; + /** * The annotated API for {@code kotlin.io.path}: like {@link KotlinIo}, a Path only names a file, and writing or * walking the file leaves the Path as it was. Each vararg array of options is read, never written. diff --git a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/kotlin/KotlinReflect.java b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/kotlin/KotlinReflect.java index b2953558f3..4f9868dfac 100644 --- a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/kotlin/KotlinReflect.java +++ b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/kotlin/KotlinReflect.java @@ -17,10 +17,10 @@ package io.codelaser.maddi.aapi.archive.libs.kotlin; -import io.codelaser.maddi.annotation.NotModified; - import java.lang.reflect.Type; +import io.codelaser.maddi.annotation.NotModified; + /** * The annotated API for {@code kotlin.reflect}: the read-only accessors the library-call census found read as * modifying. A KClass, KCallable or KType is a description of code, and asking it a question changes nothing. diff --git a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/kotlin/KotlinSequences.java b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/kotlin/KotlinSequences.java index 6c974ca417..c10af256b7 100644 --- a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/kotlin/KotlinSequences.java +++ b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/kotlin/KotlinSequences.java @@ -17,6 +17,11 @@ package io.codelaser.maddi.aapi.archive.libs.kotlin; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Set; + import io.codelaser.maddi.annotation.Independent; import io.codelaser.maddi.annotation.NotModified; import io.codelaser.maddi.annotation.NotNull; @@ -29,11 +34,6 @@ import kotlin.sequences.Sequence; import kotlin.sequences.SequenceScope; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Set; - /** * The annotated API for {@code kotlin.sequences}: the extensions on {@link Sequence}, the census's largest * uncontracted part class after the scope functions. A Sequence is an interface the defaults treat as mutable, so diff --git a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/kotlin/KotlinText.java b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/kotlin/KotlinText.java index b34e92ec7b..111778e817 100644 --- a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/kotlin/KotlinText.java +++ b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/kotlin/KotlinText.java @@ -17,19 +17,19 @@ package io.codelaser.maddi.aapi.archive.libs.kotlin; +import java.util.List; + import io.codelaser.maddi.annotation.ImmutableContainer; import io.codelaser.maddi.annotation.Independent; import io.codelaser.maddi.annotation.NotModified; import io.codelaser.maddi.annotation.NotNull; -import kotlin.sequences.Sequence; import kotlin.ranges.IntRange; +import kotlin.sequences.Sequence; import kotlin.text.MatchGroup; import kotlin.text.MatchGroupCollection; import kotlin.text.MatchResult; import kotlin.text.RegexOption; -import java.util.List; - /** * The annotated API for {@code kotlin.text}. The type that matters here is {@link kotlin.text.Regex}, the exact * analogue of {@code java.util.regex.Pattern} in {@code jdk/JavaUtilRegex}: it wraps a compiled {@code Pattern} diff --git a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/test/OrgJunitJupiterApi.java b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/test/OrgJunitJupiterApi.java index e411fe3b5a..829fc1ddae 100644 --- a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/test/OrgJunitJupiterApi.java +++ b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/test/OrgJunitJupiterApi.java @@ -23,11 +23,12 @@ import java.util.function.Supplier; import java.util.stream.Stream; -import io.codelaser.maddi.annotation.Immutable; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.function.Executable; import org.junit.jupiter.api.function.ThrowingSupplier; +import io.codelaser.maddi.annotation.Immutable; + public class OrgJunitJupiterApi { public static final String PACKAGE_NAME = "org.junit.jupiter.api"; //public class Assertions diff --git a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/vavr/IoVavr.java b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/vavr/IoVavr.java index 354e9d517c..dcc1360021 100644 --- a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/vavr/IoVavr.java +++ b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/vavr/IoVavr.java @@ -1,19 +1,4 @@ package io.codelaser.maddi.aapi.archive.libs.vavr; -import io.vavr.*; -import io.vavr.collection.Array; -import io.vavr.collection.CharSeq; -import io.vavr.collection.IndexedSeq; -import io.vavr.collection.Iterator; -import io.vavr.collection.List; -import io.vavr.collection.PriorityQueue; -import io.vavr.collection.Queue; -import io.vavr.collection.Seq; -import io.vavr.collection.SortedMap; -import io.vavr.collection.SortedSet; -import io.vavr.collection.Tree; -import io.vavr.collection.Vector; -import io.vavr.concurrent.Future; -import io.vavr.control.*; import java.io.PrintStream; import java.io.PrintWriter; import java.util.Collection; @@ -27,6 +12,7 @@ import java.util.function.*; import java.util.stream.Collector; import java.util.stream.Stream; + import io.codelaser.maddi.annotation.Container; import io.codelaser.maddi.annotation.FinalFields; import io.codelaser.maddi.annotation.Fluent; @@ -40,6 +26,21 @@ import io.codelaser.maddi.annotation.method.GetSet; import io.codelaser.maddi.annotation.rare.IgnoreModifications; import io.codelaser.maddi.annotation.type.UtilityClass; +import io.vavr.*; +import io.vavr.collection.Array; +import io.vavr.collection.CharSeq; +import io.vavr.collection.IndexedSeq; +import io.vavr.collection.Iterator; +import io.vavr.collection.List; +import io.vavr.collection.PriorityQueue; +import io.vavr.collection.Queue; +import io.vavr.collection.Seq; +import io.vavr.collection.SortedMap; +import io.vavr.collection.SortedSet; +import io.vavr.collection.Tree; +import io.vavr.collection.Vector; +import io.vavr.concurrent.Future; +import io.vavr.control.*; @Independent(absent = true) public class IoVavr { public static final String PACKAGE_NAME = "io.vavr"; diff --git a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/vavr/IoVavrCollection.java b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/vavr/IoVavrCollection.java index ee61afc9e7..04e3fb1da1 100644 --- a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/vavr/IoVavrCollection.java +++ b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/vavr/IoVavrCollection.java @@ -1,29 +1,4 @@ package io.codelaser.maddi.aapi.archive.libs.vavr; -import io.vavr.*; -import io.vavr.collection.Array; -import io.vavr.collection.BitSet; -import io.vavr.collection.CharSeq; -import io.vavr.collection.HashMultimap; -import io.vavr.collection.IndexedSeq; -import io.vavr.collection.Iterator; -import io.vavr.collection.LinearSeq; -import io.vavr.collection.LinkedHashMap; -import io.vavr.collection.LinkedHashMultimap; -import io.vavr.collection.LinkedHashSet; -import io.vavr.collection.List; -import io.vavr.collection.Multimap; -import io.vavr.collection.PriorityQueue; -import io.vavr.collection.Queue; -import io.vavr.collection.Seq; -import io.vavr.collection.SortedMap; -import io.vavr.collection.SortedMultimap; -import io.vavr.collection.Traversable; -import io.vavr.collection.Tree; -import io.vavr.collection.TreeMap; -import io.vavr.collection.TreeMultimap; -import io.vavr.collection.TreeSet; -import io.vavr.collection.Vector; -import io.vavr.control.Option; import java.math.BigDecimal; import java.nio.charset.Charset; import java.util.ArrayList; @@ -39,6 +14,7 @@ import java.util.function.*; import java.util.stream.Collector; import java.util.stream.Stream; + import io.codelaser.maddi.annotation.Container; import io.codelaser.maddi.annotation.FinalFields; import io.codelaser.maddi.annotation.Fluent; @@ -51,6 +27,31 @@ import io.codelaser.maddi.annotation.NotNull; import io.codelaser.maddi.annotation.method.GetSet; import io.codelaser.maddi.annotation.rare.IgnoreModifications; +import io.vavr.*; +import io.vavr.collection.Array; +import io.vavr.collection.BitSet; +import io.vavr.collection.CharSeq; +import io.vavr.collection.HashMultimap; +import io.vavr.collection.IndexedSeq; +import io.vavr.collection.Iterator; +import io.vavr.collection.LinearSeq; +import io.vavr.collection.LinkedHashMap; +import io.vavr.collection.LinkedHashMultimap; +import io.vavr.collection.LinkedHashSet; +import io.vavr.collection.List; +import io.vavr.collection.Multimap; +import io.vavr.collection.PriorityQueue; +import io.vavr.collection.Queue; +import io.vavr.collection.Seq; +import io.vavr.collection.SortedMap; +import io.vavr.collection.SortedMultimap; +import io.vavr.collection.Traversable; +import io.vavr.collection.Tree; +import io.vavr.collection.TreeMap; +import io.vavr.collection.TreeMultimap; +import io.vavr.collection.TreeSet; +import io.vavr.collection.Vector; +import io.vavr.control.Option; @Independent(absent = true) public class IoVavrCollection { public static final String PACKAGE_NAME = "io.vavr.collection"; diff --git a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/vavr/IoVavrConcurrent.java b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/vavr/IoVavrConcurrent.java index aac0bb21b6..4c7a760862 100644 --- a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/vavr/IoVavrConcurrent.java +++ b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/vavr/IoVavrConcurrent.java @@ -1,28 +1,24 @@ package io.codelaser.maddi.aapi.archive.libs.vavr; -import io.vavr.*; -import io.vavr.collection.Iterator; -import io.vavr.collection.Seq; -import io.vavr.concurrent.Promise; -import io.vavr.control.Option; -import io.vavr.control.Try; import java.util.concurrent.CompletableFuture; import java.util.concurrent.Executor; import java.util.concurrent.ExecutorService; import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; import java.util.function.*; -import io.codelaser.maddi.annotation.Container; + import io.codelaser.maddi.annotation.FinalFields; import io.codelaser.maddi.annotation.Fluent; import io.codelaser.maddi.annotation.Identity; -import io.codelaser.maddi.annotation.Immutable; -import io.codelaser.maddi.annotation.ImmutableContainer; import io.codelaser.maddi.annotation.Independent; import io.codelaser.maddi.annotation.Modified; import io.codelaser.maddi.annotation.NotModified; -import io.codelaser.maddi.annotation.NotNull; -import io.codelaser.maddi.annotation.method.GetSet; import io.codelaser.maddi.annotation.rare.IgnoreModifications; +import io.vavr.*; +import io.vavr.collection.Iterator; +import io.vavr.collection.Seq; +import io.vavr.concurrent.Promise; +import io.vavr.control.Option; +import io.vavr.control.Try; @Independent(absent = true) public class IoVavrConcurrent { public static final String PACKAGE_NAME = "io.vavr.concurrent"; diff --git a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/vavr/IoVavrControl.java b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/vavr/IoVavrControl.java index 7198b67e39..7e13741cc7 100644 --- a/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/vavr/IoVavrControl.java +++ b/maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/libs/vavr/IoVavrControl.java @@ -1,11 +1,8 @@ package io.codelaser.maddi.aapi.archive.libs.vavr; -import io.vavr.*; -import io.vavr.collection.Iterator; -import io.vavr.collection.Seq; -import io.vavr.control.*; import java.util.Optional; import java.util.concurrent.Callable; import java.util.function.*; + import io.codelaser.maddi.annotation.Container; import io.codelaser.maddi.annotation.FinalFields; import io.codelaser.maddi.annotation.Fluent; @@ -17,7 +14,10 @@ import io.codelaser.maddi.annotation.NotModified; import io.codelaser.maddi.annotation.NotNull; import io.codelaser.maddi.annotation.method.GetSet; -import io.codelaser.maddi.annotation.rare.IgnoreModifications; +import io.vavr.*; +import io.vavr.collection.Iterator; +import io.vavr.collection.Seq; +import io.vavr.control.*; @Independent(absent = true) public class IoVavrControl { public static final String PACKAGE_NAME = "io.vavr.control"; diff --git a/maddi-analysis-api/src/main/java/io/codelaser/maddi/analysis/api/AnalysisEngine.java b/maddi-analysis-api/src/main/java/io/codelaser/maddi/analysis/api/AnalysisEngine.java index dddbbb4b17..d849984ced 100644 --- a/maddi-analysis-api/src/main/java/io/codelaser/maddi/analysis/api/AnalysisEngine.java +++ b/maddi-analysis-api/src/main/java/io/codelaser/maddi/analysis/api/AnalysisEngine.java @@ -17,6 +17,15 @@ package io.codelaser.maddi.analysis.api; +import java.io.File; +import java.io.IOException; +import java.util.Collection; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.function.Function; +import java.util.function.Predicate; + import io.codelaser.maddi.cst.api.analysis.Message; import io.codelaser.maddi.cst.api.analysis.Property; import io.codelaser.maddi.cst.api.element.Element; @@ -32,15 +41,6 @@ import io.codelaser.maddi.inspection.api.integration.JavaInspectorFactory; import io.codelaser.maddi.util.Trie; -import java.io.File; -import java.io.IOException; -import java.util.Collection; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.function.Function; -import java.util.function.Predicate; - /** * ⭐ The only way into the modification analysis from outside maddi-mod. The base tier (the run drivers, * the refactor engine) and the ext tier (the IDE daemon, the build plugins) compile against this interface; the diff --git a/maddi-analysis-api/src/main/java/io/codelaser/maddi/analysis/api/AnalysisValueFeed.java b/maddi-analysis-api/src/main/java/io/codelaser/maddi/analysis/api/AnalysisValueFeed.java index c7560b95ca..1a692d377c 100644 --- a/maddi-analysis-api/src/main/java/io/codelaser/maddi/analysis/api/AnalysisValueFeed.java +++ b/maddi-analysis-api/src/main/java/io/codelaser/maddi/analysis/api/AnalysisValueFeed.java @@ -17,10 +17,10 @@ package io.codelaser.maddi.analysis.api; -import io.codelaser.maddi.cst.api.info.Info; - import java.util.Collection; +import io.codelaser.maddi.cst.api.info.Info; + /** * Streaming view of analysis values as the fixpoint iteration progresses, for consumers (the IDE daemon) * that want to display established values before certification. The design rests on the property diff --git a/maddi-analysis-api/src/main/java/io/codelaser/maddi/analysis/api/ModificationOutcome.java b/maddi-analysis-api/src/main/java/io/codelaser/maddi/analysis/api/ModificationOutcome.java index 8ff743f053..882419538a 100644 --- a/maddi-analysis-api/src/main/java/io/codelaser/maddi/analysis/api/ModificationOutcome.java +++ b/maddi-analysis-api/src/main/java/io/codelaser/maddi/analysis/api/ModificationOutcome.java @@ -17,12 +17,12 @@ package io.codelaser.maddi.analysis.api; -import io.codelaser.maddi.cst.api.analysis.Message; -import io.codelaser.maddi.cst.api.info.Info; - import java.util.List; import java.util.Set; +import io.codelaser.maddi.cst.api.analysis.Message; +import io.codelaser.maddi.cst.api.info.Info; + /** * @param fingerprintedSourceSets the number of source sets whose fingerprint was stored; 0 unless asked for * @param scope null after a cold analysis. After a seeded one ({@link ModificationRequest#seed()}), diff --git a/maddi-analysis-api/src/main/java/io/codelaser/maddi/analysis/api/ModificationRequest.java b/maddi-analysis-api/src/main/java/io/codelaser/maddi/analysis/api/ModificationRequest.java index df06ab2fd9..7ffd257095 100644 --- a/maddi-analysis-api/src/main/java/io/codelaser/maddi/analysis/api/ModificationRequest.java +++ b/maddi-analysis-api/src/main/java/io/codelaser/maddi/analysis/api/ModificationRequest.java @@ -17,15 +17,15 @@ package io.codelaser.maddi.analysis.api; +import java.util.Collection; +import java.util.List; +import java.util.Set; + import io.codelaser.maddi.cst.api.info.Info; import io.codelaser.maddi.cst.api.info.TypeInfo; import io.codelaser.maddi.graph.G; import io.codelaser.maddi.inspection.api.integration.JavaInspector; -import java.util.Collection; -import java.util.List; -import java.util.Set; - /** * @param callGraph null: analyze the order without the graph (no worklist narrowing) * @param primaryTypes what the environment gates' incremental state is computed over; may be empty otherwise diff --git a/maddi-analysis-api/src/main/java/io/codelaser/maddi/analysis/api/PrepOutcome.java b/maddi-analysis-api/src/main/java/io/codelaser/maddi/analysis/api/PrepOutcome.java index dec24ed558..436a4bd1ef 100644 --- a/maddi-analysis-api/src/main/java/io/codelaser/maddi/analysis/api/PrepOutcome.java +++ b/maddi-analysis-api/src/main/java/io/codelaser/maddi/analysis/api/PrepOutcome.java @@ -17,9 +17,9 @@ package io.codelaser.maddi.analysis.api; -import io.codelaser.maddi.callgraph.ComputeCallGraph; - import java.util.List; +import io.codelaser.maddi.callgraph.ComputeCallGraph; + public record PrepOutcome(ComputeCallGraph callGraph, List problems) { } diff --git a/maddi-analysis-api/src/main/java/io/codelaser/maddi/analysis/api/PrepRequest.java b/maddi-analysis-api/src/main/java/io/codelaser/maddi/analysis/api/PrepRequest.java index c7522976fd..a69335821b 100644 --- a/maddi-analysis-api/src/main/java/io/codelaser/maddi/analysis/api/PrepRequest.java +++ b/maddi-analysis-api/src/main/java/io/codelaser/maddi/analysis/api/PrepRequest.java @@ -17,15 +17,15 @@ package io.codelaser.maddi.analysis.api; +import java.util.Collection; +import java.util.Set; +import java.util.function.Predicate; + import io.codelaser.maddi.callgraph.CallGraphContributions; import io.codelaser.maddi.cst.api.element.ModuleInfo; import io.codelaser.maddi.cst.api.info.TypeInfo; import io.codelaser.maddi.cst.api.runtime.Runtime; -import java.util.Collection; -import java.util.Set; -import java.util.function.Predicate; - /** * @param faultTolerant null: the prep analyzer's own default options; otherwise its fault-tolerance switch. * @param callGraphContributions null: the call graph is walked in full. Otherwise the per-type call graph of an diff --git a/maddi-callgraph/src/main/java/io/codelaser/maddi/callgraph/CallGraphContributions.java b/maddi-callgraph/src/main/java/io/codelaser/maddi/callgraph/CallGraphContributions.java index bd2b09dac1..afa4777a4f 100644 --- a/maddi-callgraph/src/main/java/io/codelaser/maddi/callgraph/CallGraphContributions.java +++ b/maddi-callgraph/src/main/java/io/codelaser/maddi/callgraph/CallGraphContributions.java @@ -17,15 +17,6 @@ package io.codelaser.maddi.callgraph; -import io.codelaser.maddi.cst.api.info.Info; -import io.codelaser.maddi.cst.api.info.MethodInfo; -import io.codelaser.maddi.cst.api.info.TypeInfo; -import io.codelaser.maddi.graph.G; -import io.codelaser.maddi.inspection.api.byname.ByNameDangling; -import io.codelaser.maddi.inspection.api.byname.ByNameReference; -import io.codelaser.maddi.inspection.api.byname.ByNameSink; -import io.codelaser.maddi.inspection.api.parser.ParseResult; - import java.util.Collections; import java.util.HashMap; import java.util.HashSet; @@ -36,6 +27,15 @@ import java.util.Set; import java.util.function.Predicate; +import io.codelaser.maddi.cst.api.info.Info; +import io.codelaser.maddi.cst.api.info.MethodInfo; +import io.codelaser.maddi.cst.api.info.TypeInfo; +import io.codelaser.maddi.graph.G; +import io.codelaser.maddi.inspection.api.byname.ByNameDangling; +import io.codelaser.maddi.inspection.api.byname.ByNameReference; +import io.codelaser.maddi.inspection.api.byname.ByNameSink; +import io.codelaser.maddi.inspection.api.parser.ParseResult; + /** * The call graph kept per primary type, across runs: each primary type's vertices, edges and recursive methods are * its own contribution, and {@link ComputeCallGraph#go(CallGraphContributions)} unions them. After a partial re-parse diff --git a/maddi-callgraph/src/main/java/io/codelaser/maddi/callgraph/ComputeAnalysisOrder.java b/maddi-callgraph/src/main/java/io/codelaser/maddi/callgraph/ComputeAnalysisOrder.java index e50ecae98f..301e5ec39f 100644 --- a/maddi-callgraph/src/main/java/io/codelaser/maddi/callgraph/ComputeAnalysisOrder.java +++ b/maddi-callgraph/src/main/java/io/codelaser/maddi/callgraph/ComputeAnalysisOrder.java @@ -17,20 +17,21 @@ package io.codelaser.maddi.callgraph; -import io.codelaser.maddi.cst.api.element.ModuleInfo; -import io.codelaser.maddi.cst.api.info.Info; -import io.codelaser.maddi.graph.G; -import io.codelaser.maddi.graph.V; -import io.codelaser.maddi.graph.op.Linearize; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import java.util.Comparator; import java.util.List; import java.util.Set; import java.util.stream.Collectors; import java.util.stream.Stream; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import io.codelaser.maddi.cst.api.element.ModuleInfo; +import io.codelaser.maddi.cst.api.info.Info; +import io.codelaser.maddi.graph.G; +import io.codelaser.maddi.graph.V; +import io.codelaser.maddi.graph.op.Linearize; + /* given the call graph, compute the linearization, and all supporting information to deal with cycles. diff --git a/maddi-callgraph/src/main/java/io/codelaser/maddi/callgraph/ComputeCallGraph.java b/maddi-callgraph/src/main/java/io/codelaser/maddi/callgraph/ComputeCallGraph.java index 081b382419..f99d491928 100644 --- a/maddi-callgraph/src/main/java/io/codelaser/maddi/callgraph/ComputeCallGraph.java +++ b/maddi-callgraph/src/main/java/io/codelaser/maddi/callgraph/ComputeCallGraph.java @@ -18,6 +18,19 @@ package io.codelaser.maddi.callgraph; +import static io.codelaser.maddi.cst.impl.analysis.PropertyImpl.RECURSIVE_METHOD; +import static io.codelaser.maddi.cst.impl.analysis.ValueImpl.BoolImpl.TRUE; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.HashSet; +import java.util.IdentityHashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.function.Predicate; + import io.codelaser.maddi.cst.api.element.Element; import io.codelaser.maddi.cst.api.element.JavaDoc; import io.codelaser.maddi.cst.api.element.ModuleInfo; @@ -35,25 +48,12 @@ import io.codelaser.maddi.cst.api.statement.TryStatement; import io.codelaser.maddi.cst.api.type.ParameterizedType; import io.codelaser.maddi.cst.api.variable.FieldReference; +import io.codelaser.maddi.graph.G; +import io.codelaser.maddi.graph.ImmutableGraph; import io.codelaser.maddi.inspection.api.byname.ByNameDangling; import io.codelaser.maddi.inspection.api.byname.ByNameReference; import io.codelaser.maddi.inspection.api.byname.ByNameSink; import io.codelaser.maddi.inspection.api.parser.ParseResult; -import io.codelaser.maddi.graph.G; -import io.codelaser.maddi.graph.ImmutableGraph; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.HashSet; -import java.util.IdentityHashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.function.Predicate; - -import static io.codelaser.maddi.cst.impl.analysis.PropertyImpl.RECURSIVE_METHOD; -import static io.codelaser.maddi.cst.impl.analysis.ValueImpl.BoolImpl.TRUE; /* call & reference graphs. diff --git a/maddi-callgraph/src/main/java/io/codelaser/maddi/callgraph/PrimaryTypeUseGraph.java b/maddi-callgraph/src/main/java/io/codelaser/maddi/callgraph/PrimaryTypeUseGraph.java index 792c79803e..3d7fc0e774 100644 --- a/maddi-callgraph/src/main/java/io/codelaser/maddi/callgraph/PrimaryTypeUseGraph.java +++ b/maddi-callgraph/src/main/java/io/codelaser/maddi/callgraph/PrimaryTypeUseGraph.java @@ -17,6 +17,10 @@ package io.codelaser.maddi.callgraph; +import java.util.List; +import java.util.Set; +import java.util.stream.Collectors; + import io.codelaser.maddi.cst.api.element.ModuleInfo; import io.codelaser.maddi.cst.api.info.Info; import io.codelaser.maddi.cst.api.info.TypeInfo; @@ -25,10 +29,6 @@ import io.codelaser.maddi.graph.V; import io.codelaser.maddi.graph.op.Common; -import java.util.List; -import java.util.Set; -import java.util.stream.Collectors; - /** * The {@link ComputeCallGraph} projected down to primary types, and transposed: the answer to "who depends on * this type?". diff --git a/maddi-callgraph/src/test/java/io/codelaser/maddi/callgraph/CommonTest.java b/maddi-callgraph/src/test/java/io/codelaser/maddi/callgraph/CommonTest.java index ff6f5f8bea..30db31529c 100644 --- a/maddi-callgraph/src/test/java/io/codelaser/maddi/callgraph/CommonTest.java +++ b/maddi-callgraph/src/test/java/io/codelaser/maddi/callgraph/CommonTest.java @@ -17,6 +17,22 @@ package io.codelaser.maddi.callgraph; +import static io.codelaser.maddi.inspection.api.integration.JavaInspector.TEST_PROTOCOL; +import static io.codelaser.maddi.inspection.integration.JavaInspectorImpl.JAR_WITH_PATH_PREFIX; +import static io.codelaser.maddi.inspection.resource.SourceSetImpl.sourceSetOf; + +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.URI; +import java.net.URISyntaxException; +import java.util.List; + +import org.jetbrains.annotations.NotNull; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.BeforeEach; +import org.slf4j.LoggerFactory; + import ch.qos.logback.classic.Level; import ch.qos.logback.classic.Logger; import io.codelaser.maddi.cst.api.element.SourceSet; @@ -27,24 +43,8 @@ import io.codelaser.maddi.inspection.resource.InputConfigurationImpl; import io.codelaser.maddi.inspection.resource.SourceSetImpl; import io.codelaser.maddi.support.SetOnce; -import org.jetbrains.annotations.NotNull; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.BeforeAll; -import org.junit.jupiter.api.BeforeEach; -import org.slf4j.LoggerFactory; - import io.codelaser.maddi.support.SetOnceMap; -import java.io.IOException; -import java.io.UnsupportedEncodingException; -import java.net.URI; -import java.net.URISyntaxException; -import java.util.List; - -import static io.codelaser.maddi.inspection.api.integration.JavaInspector.TEST_PROTOCOL; -import static io.codelaser.maddi.inspection.integration.JavaInspectorImpl.JAR_WITH_PATH_PREFIX; -import static io.codelaser.maddi.inspection.resource.SourceSetImpl.sourceSetOf; - public class CommonTest { private static final org.slf4j.Logger LOGGER = LoggerFactory.getLogger(CommonTest.class); protected static final String ABX = "a.b.X"; diff --git a/maddi-callgraph/src/test/java/io/codelaser/maddi/callgraph/TestAnalysisOrder.java b/maddi-callgraph/src/test/java/io/codelaser/maddi/callgraph/TestAnalysisOrder.java index 9414f21e78..b647b6be37 100644 --- a/maddi-callgraph/src/test/java/io/codelaser/maddi/callgraph/TestAnalysisOrder.java +++ b/maddi-callgraph/src/test/java/io/codelaser/maddi/callgraph/TestAnalysisOrder.java @@ -17,17 +17,18 @@ package io.codelaser.maddi.callgraph; -import io.codelaser.maddi.cst.api.info.Info; -import io.codelaser.maddi.cst.api.info.TypeInfo; -import io.codelaser.maddi.graph.G; -import org.intellij.lang.annotations.Language; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.List; import java.util.stream.Collectors; -import static org.junit.jupiter.api.Assertions.assertEquals; +import org.intellij.lang.annotations.Language; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; + +import io.codelaser.maddi.cst.api.info.Info; +import io.codelaser.maddi.cst.api.info.TypeInfo; +import io.codelaser.maddi.graph.G; public class TestAnalysisOrder extends CommonTest { diff --git a/maddi-callgraph/src/test/java/io/codelaser/maddi/callgraph/TestByNameReferences.java b/maddi-callgraph/src/test/java/io/codelaser/maddi/callgraph/TestByNameReferences.java index 75f12ca77e..c8f19decd4 100644 --- a/maddi-callgraph/src/test/java/io/codelaser/maddi/callgraph/TestByNameReferences.java +++ b/maddi-callgraph/src/test/java/io/codelaser/maddi/callgraph/TestByNameReferences.java @@ -17,39 +17,39 @@ package io.codelaser.maddi.callgraph; +import static io.codelaser.maddi.inspection.integration.JavaInspectorImpl.JAR_WITH_PATH_PREFIX; +import static io.codelaser.maddi.inspection.integration.JavaInspectorImpl.TEST_PROTOCOL_PREFIX; +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.assertNull; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.io.IOException; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +import org.intellij.lang.annotations.Language; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; + import io.codelaser.maddi.cst.api.info.FieldInfo; import io.codelaser.maddi.cst.api.info.Info; import io.codelaser.maddi.cst.api.info.MethodInfo; import io.codelaser.maddi.cst.api.info.TypeInfo; import io.codelaser.maddi.graph.G; import io.codelaser.maddi.graph.V; -import io.codelaser.maddi.inspection.api.integration.JavaInspector; import io.codelaser.maddi.inspection.api.byname.ByNameDangling; import io.codelaser.maddi.inspection.api.byname.ByNameReference; import io.codelaser.maddi.inspection.api.byname.ByNameSink; +import io.codelaser.maddi.inspection.api.integration.JavaInspector; import io.codelaser.maddi.inspection.api.parser.ParseResult; import io.codelaser.maddi.inspection.api.parser.Summary; import io.codelaser.maddi.inspection.api.resource.InputConfiguration; import io.codelaser.maddi.inspection.integration.JavaInspectorImpl; import io.codelaser.maddi.inspection.resource.InputConfigurationImpl; -import org.intellij.lang.annotations.Language; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; - -import java.io.IOException; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; - -import static io.codelaser.maddi.inspection.integration.JavaInspectorImpl.JAR_WITH_PATH_PREFIX; -import static io.codelaser.maddi.inspection.integration.JavaInspectorImpl.TEST_PROTOCOL_PREFIX; - -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.assertNull; -import static org.junit.jupiter.api.Assertions.assertSame; -import static org.junit.jupiter.api.Assertions.assertTrue; /** * A string literal that a declared {@link ByNameSink} turns into a type: the reference the compiler never sees and diff --git a/maddi-callgraph/src/test/java/io/codelaser/maddi/callgraph/TestCallGraph.java b/maddi-callgraph/src/test/java/io/codelaser/maddi/callgraph/TestCallGraph.java index 08f07f2e93..2456bc376c 100644 --- a/maddi-callgraph/src/test/java/io/codelaser/maddi/callgraph/TestCallGraph.java +++ b/maddi-callgraph/src/test/java/io/codelaser/maddi/callgraph/TestCallGraph.java @@ -17,20 +17,21 @@ package io.codelaser.maddi.callgraph; +import static org.junit.jupiter.api.Assertions.*; + +import java.util.List; +import java.util.Set; + +import org.intellij.lang.annotations.Language; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; + import io.codelaser.maddi.cst.api.element.ModuleInfo; import io.codelaser.maddi.cst.api.info.FieldInfo; import io.codelaser.maddi.cst.api.info.Info; import io.codelaser.maddi.cst.api.info.MethodInfo; import io.codelaser.maddi.cst.api.info.TypeInfo; import io.codelaser.maddi.graph.G; -import org.intellij.lang.annotations.Language; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; - -import java.util.List; -import java.util.Set; - -import static org.junit.jupiter.api.Assertions.*; public class TestCallGraph extends CommonTest { diff --git a/maddi-callgraph/src/test/java/io/codelaser/maddi/callgraph/TestCallGraphArrayCreation.java b/maddi-callgraph/src/test/java/io/codelaser/maddi/callgraph/TestCallGraphArrayCreation.java index 1c80d9893f..cd9a1fd11d 100644 --- a/maddi-callgraph/src/test/java/io/codelaser/maddi/callgraph/TestCallGraphArrayCreation.java +++ b/maddi-callgraph/src/test/java/io/codelaser/maddi/callgraph/TestCallGraphArrayCreation.java @@ -17,19 +17,20 @@ package io.codelaser.maddi.callgraph; +import static org.junit.jupiter.api.Assertions.*; + +import java.util.List; +import java.util.Map; + +import org.intellij.lang.annotations.Language; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; + import io.codelaser.maddi.cst.api.info.Info; import io.codelaser.maddi.cst.api.info.MethodInfo; import io.codelaser.maddi.cst.api.info.TypeInfo; import io.codelaser.maddi.graph.G; import io.codelaser.maddi.graph.V; -import org.intellij.lang.annotations.Language; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; - -import java.util.List; -import java.util.Map; - -import static org.junit.jupiter.api.Assertions.*; /** * {@code new X[n]} is an array creation, not a call to a constructor of {@code X}. diff --git a/maddi-callgraph/src/test/java/io/codelaser/maddi/callgraph/TestCallGraphContributions.java b/maddi-callgraph/src/test/java/io/codelaser/maddi/callgraph/TestCallGraphContributions.java index 40bb479ce4..1732f5b009 100644 --- a/maddi-callgraph/src/test/java/io/codelaser/maddi/callgraph/TestCallGraphContributions.java +++ b/maddi-callgraph/src/test/java/io/codelaser/maddi/callgraph/TestCallGraphContributions.java @@ -17,18 +17,8 @@ package io.codelaser.maddi.callgraph; -import io.codelaser.maddi.cst.api.element.SourceSet; -import io.codelaser.maddi.cst.api.info.TypeInfo; -import io.codelaser.maddi.inspection.api.integration.JavaInspector; -import io.codelaser.maddi.inspection.api.parser.ParseResult; -import io.codelaser.maddi.inspection.api.resource.InputConfiguration; -import io.codelaser.maddi.inspection.openjdk.JavaInspectorImpl; -import io.codelaser.maddi.inspection.resource.InputConfigurationImpl; -import io.codelaser.maddi.inspection.resource.SourceSetImpl; -import org.intellij.lang.annotations.Language; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.io.TempDir; +import static io.codelaser.maddi.inspection.api.integration.JavaInspector.InvalidationState.*; +import static org.junit.jupiter.api.Assertions.*; import java.io.IOException; import java.nio.file.Files; @@ -38,8 +28,19 @@ import java.util.Set; import java.util.stream.Collectors; -import static io.codelaser.maddi.inspection.api.integration.JavaInspector.InvalidationState.*; -import static org.junit.jupiter.api.Assertions.*; +import org.intellij.lang.annotations.Language; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.io.TempDir; + +import io.codelaser.maddi.cst.api.element.SourceSet; +import io.codelaser.maddi.cst.api.info.TypeInfo; +import io.codelaser.maddi.inspection.api.integration.JavaInspector; +import io.codelaser.maddi.inspection.api.parser.ParseResult; +import io.codelaser.maddi.inspection.api.resource.InputConfiguration; +import io.codelaser.maddi.inspection.openjdk.JavaInspectorImpl; +import io.codelaser.maddi.inspection.resource.InputConfigurationImpl; +import io.codelaser.maddi.inspection.resource.SourceSetImpl; /** * The call graph per primary type (docs/design/incremental-and-overlay.md §7 item 5): after a partial re-parse only diff --git a/maddi-callgraph/src/test/java/io/codelaser/maddi/callgraph/TestCallGraphExplicitConstructorInvocation.java b/maddi-callgraph/src/test/java/io/codelaser/maddi/callgraph/TestCallGraphExplicitConstructorInvocation.java index 97ec218d29..bc7f092a02 100644 --- a/maddi-callgraph/src/test/java/io/codelaser/maddi/callgraph/TestCallGraphExplicitConstructorInvocation.java +++ b/maddi-callgraph/src/test/java/io/codelaser/maddi/callgraph/TestCallGraphExplicitConstructorInvocation.java @@ -17,18 +17,19 @@ package io.codelaser.maddi.callgraph; +import static org.junit.jupiter.api.Assertions.*; + +import java.util.Map; + +import org.intellij.lang.annotations.Language; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; + import io.codelaser.maddi.cst.api.info.Info; import io.codelaser.maddi.cst.api.info.MethodInfo; import io.codelaser.maddi.cst.api.info.TypeInfo; import io.codelaser.maddi.graph.G; import io.codelaser.maddi.graph.V; -import org.intellij.lang.annotations.Language; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; - -import java.util.Map; - -import static org.junit.jupiter.api.Assertions.*; /** * {@code this(..)} and {@code super(..)} are calls, and the graph says so with the R bit as well as the S one. diff --git a/maddi-callgraph/src/test/java/io/codelaser/maddi/callgraph/TestCallGraphSealedAnonEnum.java b/maddi-callgraph/src/test/java/io/codelaser/maddi/callgraph/TestCallGraphSealedAnonEnum.java index 0b8df88565..ccb6ab6536 100644 --- a/maddi-callgraph/src/test/java/io/codelaser/maddi/callgraph/TestCallGraphSealedAnonEnum.java +++ b/maddi-callgraph/src/test/java/io/codelaser/maddi/callgraph/TestCallGraphSealedAnonEnum.java @@ -17,14 +17,15 @@ package io.codelaser.maddi.callgraph; -import io.codelaser.maddi.cst.api.info.Info; -import io.codelaser.maddi.cst.api.info.TypeInfo; -import io.codelaser.maddi.graph.G; +import static org.junit.jupiter.api.Assertions.*; + import org.intellij.lang.annotations.Language; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.*; +import io.codelaser.maddi.cst.api.info.Info; +import io.codelaser.maddi.cst.api.info.TypeInfo; +import io.codelaser.maddi.graph.G; /** * The call graph must record three forward type references it used to drop, each of which made periphery diff --git a/maddi-callgraph/src/test/java/io/codelaser/maddi/callgraph/TestCallGraphSwitchPattern.java b/maddi-callgraph/src/test/java/io/codelaser/maddi/callgraph/TestCallGraphSwitchPattern.java index 7f9bf36af6..2faaee88f9 100644 --- a/maddi-callgraph/src/test/java/io/codelaser/maddi/callgraph/TestCallGraphSwitchPattern.java +++ b/maddi-callgraph/src/test/java/io/codelaser/maddi/callgraph/TestCallGraphSwitchPattern.java @@ -17,14 +17,15 @@ package io.codelaser.maddi.callgraph; -import io.codelaser.maddi.cst.api.info.Info; -import io.codelaser.maddi.cst.api.info.TypeInfo; -import io.codelaser.maddi.graph.G; +import static org.junit.jupiter.api.Assertions.assertTrue; + import org.intellij.lang.annotations.Language; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertTrue; +import io.codelaser.maddi.cst.api.info.Info; +import io.codelaser.maddi.cst.api.info.TypeInfo; +import io.codelaser.maddi.graph.G; /** * A type named ONLY by a switch type pattern is a compile dependency like any other, in both switch forms. diff --git a/maddi-callgraph/src/test/java/io/codelaser/maddi/callgraph/TestComputeCallGraph.java b/maddi-callgraph/src/test/java/io/codelaser/maddi/callgraph/TestComputeCallGraph.java index 45ed3bac33..776fff5c5a 100644 --- a/maddi-callgraph/src/test/java/io/codelaser/maddi/callgraph/TestComputeCallGraph.java +++ b/maddi-callgraph/src/test/java/io/codelaser/maddi/callgraph/TestComputeCallGraph.java @@ -17,11 +17,11 @@ package io.codelaser.maddi.callgraph; -import org.junit.jupiter.api.Test; - import static io.codelaser.maddi.callgraph.ComputeCallGraph.*; import static org.junit.jupiter.api.Assertions.*; +import org.junit.jupiter.api.Test; + public class TestComputeCallGraph { // every count odd and every weight distinct, so no field can be read from its neighbour's bits unnoticed; the // test below uses even counts only, and passed while the doc count was read from the reference count's low bit diff --git a/maddi-cst-analysis/src/main/java/io/codelaser/maddi/cst/impl/analysis/AnalysisAccessRecorder.java b/maddi-cst-analysis/src/main/java/io/codelaser/maddi/cst/impl/analysis/AnalysisAccessRecorder.java index b77bcdaba1..4e6c2eabf5 100644 --- a/maddi-cst-analysis/src/main/java/io/codelaser/maddi/cst/impl/analysis/AnalysisAccessRecorder.java +++ b/maddi-cst-analysis/src/main/java/io/codelaser/maddi/cst/impl/analysis/AnalysisAccessRecorder.java @@ -17,9 +17,6 @@ package io.codelaser.maddi.cst.impl.analysis; -import io.codelaser.maddi.cst.api.analysis.Property; -import io.codelaser.maddi.cst.api.analysis.Value; - import java.util.ArrayList; import java.util.HashMap; import java.util.LinkedHashMap; @@ -28,6 +25,9 @@ import java.util.Objects; import java.util.Set; +import io.codelaser.maddi.cst.api.analysis.Property; +import io.codelaser.maddi.cst.api.analysis.Value; + /** * CodeLaser/maddi-mod#76: records, for one computation on one thread, every analysis value it read and every * value it left behind, so that a later run of the same computation can be skipped when nothing it read has diff --git a/maddi-cst-analysis/src/main/java/io/codelaser/maddi/cst/impl/analysis/ConsumptionEdgeRecorder.java b/maddi-cst-analysis/src/main/java/io/codelaser/maddi/cst/impl/analysis/ConsumptionEdgeRecorder.java index 1ec683b94c..1444339e28 100644 --- a/maddi-cst-analysis/src/main/java/io/codelaser/maddi/cst/impl/analysis/ConsumptionEdgeRecorder.java +++ b/maddi-cst-analysis/src/main/java/io/codelaser/maddi/cst/impl/analysis/ConsumptionEdgeRecorder.java @@ -17,20 +17,20 @@ package io.codelaser.maddi.cst.impl.analysis; -import io.codelaser.maddi.cst.api.info.Info; -import io.codelaser.maddi.cst.api.info.ParameterInfo; - -import java.util.ArrayList; import java.util.ArrayDeque; -import java.util.HashMap; +import java.util.ArrayList; import java.util.Comparator; import java.util.Deque; +import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; +import io.codelaser.maddi.cst.api.info.Info; +import io.codelaser.maddi.cst.api.info.ParameterInfo; + /** * Task #35 Phase A (measure, GO/NO-GO): records, per analyzed element, which OTHER elements' * analysis maps were touched during its analysis — an UPPER BOUND on true summary consumption diff --git a/maddi-cst-analysis/src/main/java/io/codelaser/maddi/cst/impl/analysis/ForwardingNullabilityFacts.java b/maddi-cst-analysis/src/main/java/io/codelaser/maddi/cst/impl/analysis/ForwardingNullabilityFacts.java index 128dbbd255..7e4143c888 100644 --- a/maddi-cst-analysis/src/main/java/io/codelaser/maddi/cst/impl/analysis/ForwardingNullabilityFacts.java +++ b/maddi-cst-analysis/src/main/java/io/codelaser/maddi/cst/impl/analysis/ForwardingNullabilityFacts.java @@ -16,6 +16,8 @@ */ package io.codelaser.maddi.cst.impl.analysis; +import java.util.Objects; + import io.codelaser.maddi.cst.api.element.Element; import io.codelaser.maddi.cst.api.expression.Expression; import io.codelaser.maddi.cst.api.info.FieldInfo; @@ -26,8 +28,6 @@ import io.codelaser.maddi.cst.api.variable.LocalVariable; import io.codelaser.maddi.cst.api.variable.Variable; -import java.util.Objects; - /** * {@link NullabilityFacts} that answer as {@code delegate} does: a base for facts that change one answer or add a * concern of their own (a printer's, beside nullability). diff --git a/maddi-cst-analysis/src/main/java/io/codelaser/maddi/cst/impl/analysis/LinkFacts.java b/maddi-cst-analysis/src/main/java/io/codelaser/maddi/cst/impl/analysis/LinkFacts.java index dbdd6e2177..6ba954f2bf 100644 --- a/maddi-cst-analysis/src/main/java/io/codelaser/maddi/cst/impl/analysis/LinkFacts.java +++ b/maddi-cst-analysis/src/main/java/io/codelaser/maddi/cst/impl/analysis/LinkFacts.java @@ -17,11 +17,11 @@ package io.codelaser.maddi.cst.impl.analysis; +import java.util.Set; + import io.codelaser.maddi.cst.api.info.MethodInfo; import io.codelaser.maddi.cst.api.info.ParameterInfo; -import java.util.Set; - /** * What the modification analysis's links say about a method's result, for a printer whose types state ownership * (Rust): a new object or one that existed before the call, and what of the receiver and the parameters it is or diff --git a/maddi-cst-analysis/src/main/java/io/codelaser/maddi/cst/impl/analysis/MessageImpl.java b/maddi-cst-analysis/src/main/java/io/codelaser/maddi/cst/impl/analysis/MessageImpl.java index 76fe9efa0f..87dee5fda7 100644 --- a/maddi-cst-analysis/src/main/java/io/codelaser/maddi/cst/impl/analysis/MessageImpl.java +++ b/maddi-cst-analysis/src/main/java/io/codelaser/maddi/cst/impl/analysis/MessageImpl.java @@ -17,12 +17,12 @@ package io.codelaser.maddi.cst.impl.analysis; +import java.util.List; + import io.codelaser.maddi.cst.api.analysis.Message; import io.codelaser.maddi.cst.api.element.Source; import io.codelaser.maddi.cst.api.info.Info; -import java.util.List; - public record MessageImpl(Source source, Info info, Level level, String message, String category, List causes) implements Message { public static final String GENERAL = "general"; diff --git a/maddi-cst-analysis/src/main/java/io/codelaser/maddi/cst/impl/analysis/ModificationFacts.java b/maddi-cst-analysis/src/main/java/io/codelaser/maddi/cst/impl/analysis/ModificationFacts.java index 5d3a4f2bf6..346f363c9e 100644 --- a/maddi-cst-analysis/src/main/java/io/codelaser/maddi/cst/impl/analysis/ModificationFacts.java +++ b/maddi-cst-analysis/src/main/java/io/codelaser/maddi/cst/impl/analysis/ModificationFacts.java @@ -16,9 +16,9 @@ */ package io.codelaser.maddi.cst.impl.analysis; +import io.codelaser.maddi.cst.api.analysis.Value; import io.codelaser.maddi.cst.api.info.FieldInfo; import io.codelaser.maddi.cst.api.info.MethodInfo; -import io.codelaser.maddi.cst.api.analysis.Value; import io.codelaser.maddi.cst.api.info.ParameterInfo; import io.codelaser.maddi.cst.api.type.ParameterizedType; diff --git a/maddi-cst-analysis/src/main/java/io/codelaser/maddi/cst/impl/analysis/NullAnnotations.java b/maddi-cst-analysis/src/main/java/io/codelaser/maddi/cst/impl/analysis/NullAnnotations.java index 0f2f0de9f0..1053ed4ecf 100644 --- a/maddi-cst-analysis/src/main/java/io/codelaser/maddi/cst/impl/analysis/NullAnnotations.java +++ b/maddi-cst-analysis/src/main/java/io/codelaser/maddi/cst/impl/analysis/NullAnnotations.java @@ -18,6 +18,10 @@ package io.codelaser.maddi.cst.impl.analysis; +import java.util.List; +import java.util.Set; +import java.util.stream.Stream; + import io.codelaser.maddi.cst.api.element.CompilationUnit; import io.codelaser.maddi.cst.api.expression.AnnotationExpression; import io.codelaser.maddi.cst.api.info.FieldInfo; @@ -28,10 +32,6 @@ import io.codelaser.maddi.cst.api.type.NullableState; import io.codelaser.maddi.cst.api.type.ParameterizedType; -import java.util.List; -import java.util.Set; -import java.util.stream.Stream; - /** * The null annotations, recognised by SIMPLE NAME, the way the families are actually used: JSpecify, JetBrains, * JSR-305, Jakarta, Checker Framework, FindBugs/SpotBugs, Android, Lombok, Eclipse JDT, maddi's own, and a project's diff --git a/maddi-cst-analysis/src/main/java/io/codelaser/maddi/cst/impl/analysis/PropertyProviderImpl.java b/maddi-cst-analysis/src/main/java/io/codelaser/maddi/cst/impl/analysis/PropertyProviderImpl.java index e8161f18c0..a7f27a9108 100644 --- a/maddi-cst-analysis/src/main/java/io/codelaser/maddi/cst/impl/analysis/PropertyProviderImpl.java +++ b/maddi-cst-analysis/src/main/java/io/codelaser/maddi/cst/impl/analysis/PropertyProviderImpl.java @@ -17,11 +17,11 @@ package io.codelaser.maddi.cst.impl.analysis; -import io.codelaser.maddi.cst.api.analysis.Property; +import static io.codelaser.maddi.cst.impl.analysis.PropertyImpl.*; import java.util.*; -import static io.codelaser.maddi.cst.impl.analysis.PropertyImpl.*; +import io.codelaser.maddi.cst.api.analysis.Property; public class PropertyProviderImpl { diff --git a/maddi-cst-analysis/src/main/java/io/codelaser/maddi/cst/impl/analysis/PropertyValueMapImpl.java b/maddi-cst-analysis/src/main/java/io/codelaser/maddi/cst/impl/analysis/PropertyValueMapImpl.java index 81dc8e1b3b..185dc5b2b8 100644 --- a/maddi-cst-analysis/src/main/java/io/codelaser/maddi/cst/impl/analysis/PropertyValueMapImpl.java +++ b/maddi-cst-analysis/src/main/java/io/codelaser/maddi/cst/impl/analysis/PropertyValueMapImpl.java @@ -17,17 +17,16 @@ package io.codelaser.maddi.cst.impl.analysis; -import io.codelaser.maddi.cst.api.analysis.Property; -import io.codelaser.maddi.cst.api.analysis.PropertyValueMap; -import io.codelaser.maddi.cst.api.analysis.Value; -import io.codelaser.maddi.cst.api.info.InfoMap; -import io.codelaser.maddi.cst.api.info.InfoMapView; - import java.util.HashMap; import java.util.Map; import java.util.function.Supplier; import java.util.stream.Stream; +import io.codelaser.maddi.cst.api.analysis.Property; +import io.codelaser.maddi.cst.api.analysis.PropertyValueMap; +import io.codelaser.maddi.cst.api.analysis.Value; +import io.codelaser.maddi.cst.api.info.InfoMapView; + /* Does not use SetOnceMap<> because of controlled overwrites. diff --git a/maddi-cst-analysis/src/main/java/io/codelaser/maddi/cst/impl/analysis/ValueImpl.java b/maddi-cst-analysis/src/main/java/io/codelaser/maddi/cst/impl/analysis/ValueImpl.java index e370696952..c9f7dcfffe 100644 --- a/maddi-cst-analysis/src/main/java/io/codelaser/maddi/cst/impl/analysis/ValueImpl.java +++ b/maddi-cst-analysis/src/main/java/io/codelaser/maddi/cst/impl/analysis/ValueImpl.java @@ -17,6 +17,10 @@ package io.codelaser.maddi.cst.impl.analysis; +import java.util.*; +import java.util.function.BiFunction; +import java.util.stream.Collectors; + import io.codelaser.maddi.cst.api.analysis.Codec; import io.codelaser.maddi.cst.api.analysis.Value; import io.codelaser.maddi.cst.api.expression.Expression; @@ -29,10 +33,6 @@ import io.codelaser.maddi.cst.api.variable.FieldReference; import io.codelaser.maddi.cst.api.variable.Variable; -import java.util.*; -import java.util.function.BiFunction; -import java.util.stream.Collectors; - public abstract class ValueImpl implements Value { private static final Map, BiFunction> decoderMap = new HashMap<>(); diff --git a/maddi-cst-analysis/src/test/java/io/codelaser/maddi/cst/impl/analysis/TestEveryWritablePropertyDecodes.java b/maddi-cst-analysis/src/test/java/io/codelaser/maddi/cst/impl/analysis/TestEveryWritablePropertyDecodes.java index 673d99b7f6..857f0cffed 100644 --- a/maddi-cst-analysis/src/test/java/io/codelaser/maddi/cst/impl/analysis/TestEveryWritablePropertyDecodes.java +++ b/maddi-cst-analysis/src/test/java/io/codelaser/maddi/cst/impl/analysis/TestEveryWritablePropertyDecodes.java @@ -16,17 +16,17 @@ */ package io.codelaser.maddi.cst.impl.analysis; -import io.codelaser.maddi.cst.api.analysis.Property; -import io.codelaser.maddi.cst.api.analysis.Property.AnalysisTier; -import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.lang.reflect.Field; import java.lang.reflect.Modifier; import java.util.ArrayList; import java.util.List; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; +import org.junit.jupiter.api.Test; + +import io.codelaser.maddi.cst.api.analysis.Property; /** * ⛔ Everything the encoder can write, the decoder must be able to read. A {@link Property} declared diff --git a/maddi-cst-analysis/src/test/java/io/codelaser/maddi/cst/impl/analysis/TestNullabilityValue.java b/maddi-cst-analysis/src/test/java/io/codelaser/maddi/cst/impl/analysis/TestNullabilityValue.java index 6a92e5f61e..e06912c544 100644 --- a/maddi-cst-analysis/src/test/java/io/codelaser/maddi/cst/impl/analysis/TestNullabilityValue.java +++ b/maddi-cst-analysis/src/test/java/io/codelaser/maddi/cst/impl/analysis/TestNullabilityValue.java @@ -1,11 +1,12 @@ package io.codelaser.maddi.cst.impl.analysis; -import io.codelaser.maddi.cst.api.type.NullableState; -import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.*; import java.util.List; -import static org.junit.jupiter.api.Assertions.*; +import org.junit.jupiter.api.Test; + +import io.codelaser.maddi.cst.api.type.NullableState; /** The encoded shape of {@link ValueImpl.NullabilityImpl}: what a results file holds. */ public class TestNullabilityValue { diff --git a/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/analysis/Codec.java b/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/analysis/Codec.java index 86d17a4966..b33ce2c508 100644 --- a/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/analysis/Codec.java +++ b/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/analysis/Codec.java @@ -17,6 +17,13 @@ package io.codelaser.maddi.cst.api.analysis; +import java.util.Comparator; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.function.BiFunction; +import java.util.stream.Stream; + import io.codelaser.maddi.annotation.Modified; import io.codelaser.maddi.cst.api.expression.Expression; import io.codelaser.maddi.cst.api.info.FieldInfo; @@ -26,13 +33,6 @@ import io.codelaser.maddi.cst.api.type.ParameterizedType; import io.codelaser.maddi.cst.api.variable.Variable; -import java.util.Comparator; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.function.BiFunction; -import java.util.stream.Stream; - /* support for reading and writing the property-value pairs in many elements. */ diff --git a/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/analysis/Message.java b/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/analysis/Message.java index aeabf7f25c..e696e3195b 100644 --- a/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/analysis/Message.java +++ b/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/analysis/Message.java @@ -17,11 +17,11 @@ package io.codelaser.maddi.cst.api.analysis; +import java.util.List; + import io.codelaser.maddi.cst.api.element.Source; import io.codelaser.maddi.cst.api.info.Info; -import java.util.List; - public interface Message { interface Level { diff --git a/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/analysis/PropertyValueMap.java b/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/analysis/PropertyValueMap.java index 843f96b9c2..ed62e98072 100644 --- a/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/analysis/PropertyValueMap.java +++ b/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/analysis/PropertyValueMap.java @@ -17,14 +17,13 @@ package io.codelaser.maddi.cst.api.analysis; -import io.codelaser.maddi.annotation.Independent; +import java.util.function.Supplier; +import java.util.stream.Stream; +import io.codelaser.maddi.annotation.Independent; import io.codelaser.maddi.cst.api.info.InfoMap; import io.codelaser.maddi.cst.api.info.InfoMapView; -import java.util.function.Supplier; -import java.util.stream.Stream; - public interface PropertyValueMap { boolean isEmpty(); diff --git a/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/analysis/Value.java b/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/analysis/Value.java index ea16870012..511295c433 100644 --- a/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/analysis/Value.java +++ b/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/analysis/Value.java @@ -17,6 +17,10 @@ package io.codelaser.maddi.cst.api.analysis; +import java.util.List; +import java.util.Map; +import java.util.Set; + import io.codelaser.maddi.cst.api.expression.Expression; import io.codelaser.maddi.cst.api.info.*; import io.codelaser.maddi.cst.api.runtime.Runtime; @@ -25,10 +29,6 @@ import io.codelaser.maddi.cst.api.util.ParSeq; import io.codelaser.maddi.cst.api.variable.Variable; -import java.util.List; -import java.util.Map; -import java.util.Set; - public interface Value extends Comparable { Codec.EncodedValue encode(Codec codec, Codec.Context context); diff --git a/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/element/Comment.java b/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/element/Comment.java index 267d326d9a..af1d8b8b3b 100644 --- a/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/element/Comment.java +++ b/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/element/Comment.java @@ -17,7 +17,6 @@ package io.codelaser.maddi.cst.api.element; -import io.codelaser.maddi.cst.api.info.InfoMap; import io.codelaser.maddi.cst.api.info.InfoMapView; import io.codelaser.maddi.cst.api.translate.TranslationMap; diff --git a/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/element/CompilationUnit.java b/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/element/CompilationUnit.java index 3e5effe8e6..15becbdcde 100644 --- a/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/element/CompilationUnit.java +++ b/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/element/CompilationUnit.java @@ -17,13 +17,13 @@ package io.codelaser.maddi.cst.api.element; +import java.net.URI; +import java.util.List; + import io.codelaser.maddi.annotation.Fluent; import io.codelaser.maddi.cst.api.expression.AnnotationExpression; import io.codelaser.maddi.cst.api.info.TypeInfo; -import java.net.URI; -import java.util.List; - /** * Represents a single Java source file — the top-level unit of compilation in the CST. *

diff --git a/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/element/DetailedSources.java b/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/element/DetailedSources.java index e6eed9342f..bf696edc07 100644 --- a/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/element/DetailedSources.java +++ b/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/element/DetailedSources.java @@ -17,14 +17,14 @@ package io.codelaser.maddi.cst.api.element; -import io.codelaser.maddi.cst.api.variable.LocalVariable; +import java.util.List; +import java.util.function.BiConsumer; + import io.codelaser.maddi.annotation.NotNull; import io.codelaser.maddi.cst.api.info.Info; import io.codelaser.maddi.cst.api.info.TypeInfo; import io.codelaser.maddi.cst.api.type.ParameterizedType; - -import java.util.List; -import java.util.function.BiConsumer; +import io.codelaser.maddi.cst.api.variable.LocalVariable; /** * A fine-grained map from well-known syntactic positions (keywords, punctuation, comma separators) diff --git a/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/element/Element.java b/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/element/Element.java index 205fcf628b..9d8db74248 100644 --- a/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/element/Element.java +++ b/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/element/Element.java @@ -17,6 +17,10 @@ package io.codelaser.maddi.cst.api.element; +import java.util.List; +import java.util.function.Predicate; +import java.util.stream.Stream; + import io.codelaser.maddi.annotation.Fluent; import io.codelaser.maddi.annotation.ImmutableContainer; import io.codelaser.maddi.annotation.Independent; @@ -25,7 +29,6 @@ import io.codelaser.maddi.annotation.rare.IgnoreModifications; import io.codelaser.maddi.cst.api.analysis.PropertyValueMap; import io.codelaser.maddi.cst.api.expression.AnnotationExpression; -import io.codelaser.maddi.cst.api.info.InfoMap; import io.codelaser.maddi.cst.api.info.InfoMapView; import io.codelaser.maddi.cst.api.info.TypeInfo; import io.codelaser.maddi.cst.api.output.OutputBuilder; @@ -34,10 +37,6 @@ import io.codelaser.maddi.cst.api.variable.DescendMode; import io.codelaser.maddi.cst.api.variable.Variable; -import java.util.List; -import java.util.function.Predicate; -import java.util.stream.Stream; - /** * Represents an element in the Common Syntax Tree. * Each element has a diff --git a/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/element/JavaDoc.java b/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/element/JavaDoc.java index e65a75e257..5fb32b6bb7 100644 --- a/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/element/JavaDoc.java +++ b/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/element/JavaDoc.java @@ -17,15 +17,13 @@ package io.codelaser.maddi.cst.api.element; -import io.codelaser.maddi.annotation.Independent; +import java.util.List; -import io.codelaser.maddi.cst.api.info.InfoMap; +import io.codelaser.maddi.annotation.Independent; import io.codelaser.maddi.cst.api.info.InfoMapView; import io.codelaser.maddi.cst.api.info.TypeInfo; import io.codelaser.maddi.cst.api.translate.TranslationMap; -import java.util.List; - /** * A structured {@code /** … *}{@code /} Javadoc comment, parsed into a list of {@link Tag} entries. *

diff --git a/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/element/ModuleInfo.java b/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/element/ModuleInfo.java index dcb4b255d6..d1cb0ad52a 100644 --- a/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/element/ModuleInfo.java +++ b/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/element/ModuleInfo.java @@ -17,13 +17,13 @@ package io.codelaser.maddi.cst.api.element; -import io.codelaser.maddi.cst.api.info.Info; -import io.codelaser.maddi.cst.api.info.TypeInfo; - import java.util.HashMap; import java.util.List; import java.util.Map; +import io.codelaser.maddi.cst.api.info.Info; +import io.codelaser.maddi.cst.api.info.TypeInfo; + /** * Represents the contents of a Java 9+ {@code module-info.java} file. *

diff --git a/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/element/RecordPattern.java b/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/element/RecordPattern.java index ba499cafa1..5903b12aaa 100644 --- a/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/element/RecordPattern.java +++ b/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/element/RecordPattern.java @@ -17,12 +17,12 @@ package io.codelaser.maddi.cst.api.element; +import java.util.List; + import io.codelaser.maddi.cst.api.translate.TranslationMap; import io.codelaser.maddi.cst.api.type.ParameterizedType; import io.codelaser.maddi.cst.api.variable.LocalVariable; -import java.util.List; - /** * Represents a pattern used in an {@code instanceof} type test or a {@code switch} entry. *

diff --git a/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/expression/And.java b/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/expression/And.java index e525684587..4fda7d10cd 100644 --- a/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/expression/And.java +++ b/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/expression/And.java @@ -17,11 +17,11 @@ package io.codelaser.maddi.cst.api.expression; +import java.util.List; + import io.codelaser.maddi.annotation.Fluent; import io.codelaser.maddi.cst.api.element.Element; -import java.util.List; - /** * Boolean conjunction of two or more operands ({@code a && b && ...}). Modelled as a flat list rather * than a nested {@link BinaryOperator} so the analyzer can normalise and simplify boolean formulae. diff --git a/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/expression/AnnotationExpression.java b/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/expression/AnnotationExpression.java index 88ceb7cae8..30a604524b 100644 --- a/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/expression/AnnotationExpression.java +++ b/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/expression/AnnotationExpression.java @@ -17,18 +17,15 @@ package io.codelaser.maddi.cst.api.expression; -import io.codelaser.maddi.annotation.Independent; +import java.util.List; import io.codelaser.maddi.annotation.Fluent; +import io.codelaser.maddi.annotation.Independent; import io.codelaser.maddi.cst.api.element.Element; -import io.codelaser.maddi.cst.api.element.Source; -import io.codelaser.maddi.cst.api.info.InfoMap; import io.codelaser.maddi.cst.api.info.InfoMapView; import io.codelaser.maddi.cst.api.info.TypeInfo; import io.codelaser.maddi.cst.api.translate.TranslationMap; -import java.util.List; - /** * An annotation use, {@code @SomeAnnotation(key = value, ...)}. Modelled as an expression so it can be * attached to any {@link Element}. The annotation type is {@link #typeInfo()} and its arguments are the diff --git a/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/expression/ArrayInitializer.java b/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/expression/ArrayInitializer.java index c7eb9d0d48..89020273ec 100644 --- a/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/expression/ArrayInitializer.java +++ b/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/expression/ArrayInitializer.java @@ -17,12 +17,12 @@ package io.codelaser.maddi.cst.api.expression; +import java.util.List; + import io.codelaser.maddi.annotation.Fluent; import io.codelaser.maddi.cst.api.element.Element; import io.codelaser.maddi.cst.api.type.ParameterizedType; -import java.util.List; - /** * An array initialiser, the brace-enclosed element list {@code { e0, e1, ... }} (as in * {@code new int[]{1, 2, 3}} or a field initialiser). The builder also records the common element type. diff --git a/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/expression/CommaExpression.java b/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/expression/CommaExpression.java index b6d88b6ff0..6412f700c3 100644 --- a/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/expression/CommaExpression.java +++ b/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/expression/CommaExpression.java @@ -18,10 +18,10 @@ package io.codelaser.maddi.cst.api.expression; -import io.codelaser.maddi.annotation.Fluent; - import java.util.List; +import io.codelaser.maddi.annotation.Fluent; + /** * A sequence of expressions evaluated in order, the value being that of the last. Java has no comma * operator in general expression position (only in {@code for} clauses); this node is used by the diff --git a/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/expression/ConstantExpression.java b/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/expression/ConstantExpression.java index cdd107d114..728e4cab3d 100644 --- a/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/expression/ConstantExpression.java +++ b/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/expression/ConstantExpression.java @@ -17,7 +17,6 @@ package io.codelaser.maddi.cst.api.expression; -import io.codelaser.maddi.cst.api.info.InfoMap; import io.codelaser.maddi.cst.api.info.InfoMapView; /** diff --git a/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/expression/ConstructorCall.java b/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/expression/ConstructorCall.java index 2fc0068895..7d7ace6eaf 100644 --- a/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/expression/ConstructorCall.java +++ b/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/expression/ConstructorCall.java @@ -17,14 +17,14 @@ package io.codelaser.maddi.cst.api.expression; +import java.util.List; + import io.codelaser.maddi.annotation.Fluent; import io.codelaser.maddi.cst.api.info.MethodInfo; import io.codelaser.maddi.cst.api.info.TypeInfo; import io.codelaser.maddi.cst.api.type.Diamond; import io.codelaser.maddi.cst.api.type.ParameterizedType; -import java.util.List; - /** * An object or array creation: {@code new Type(args)}, {@code new Type[n]}/{@code new Type[]{...}}, an * anonymous class instantiation {@code new Type(){ ... }}, or a qualified {@code outer.new Inner(...)}. diff --git a/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/expression/Expression.java b/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/expression/Expression.java index fd8eeaec87..14b6bd0d71 100644 --- a/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/expression/Expression.java +++ b/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/expression/Expression.java @@ -20,7 +20,6 @@ import io.codelaser.maddi.annotation.Independent; import io.codelaser.maddi.cst.api.element.Element; import io.codelaser.maddi.cst.api.element.Source; -import io.codelaser.maddi.cst.api.info.InfoMap; import io.codelaser.maddi.cst.api.info.InfoMapView; import io.codelaser.maddi.cst.api.translate.TranslationMap; import io.codelaser.maddi.cst.api.type.ParameterizedType; diff --git a/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/expression/InstanceOf.java b/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/expression/InstanceOf.java index 41f0b3e1ec..3d9a773c67 100644 --- a/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/expression/InstanceOf.java +++ b/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/expression/InstanceOf.java @@ -21,7 +21,6 @@ import io.codelaser.maddi.cst.api.element.Element; import io.codelaser.maddi.cst.api.element.RecordPattern; import io.codelaser.maddi.cst.api.type.ParameterizedType; -import io.codelaser.maddi.cst.api.variable.LocalVariable; /** * An {@code expression instanceof TestType} test, including pattern-matching forms diff --git a/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/expression/Lambda.java b/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/expression/Lambda.java index 92ec0796ef..6001487d14 100644 --- a/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/expression/Lambda.java +++ b/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/expression/Lambda.java @@ -17,6 +17,8 @@ package io.codelaser.maddi.cst.api.expression; +import java.util.List; + import io.codelaser.maddi.annotation.Fluent; import io.codelaser.maddi.cst.api.element.Element; import io.codelaser.maddi.cst.api.info.MethodInfo; @@ -28,8 +30,6 @@ import io.codelaser.maddi.cst.api.statement.ReturnStatement; import io.codelaser.maddi.cst.api.type.ParameterizedType; -import java.util.List; - /** * A lambda expression, {@code (params) -> body}. It is represented through a synthetic * {@link MethodInfo}: the lambda's parameters and body are that method's parameters and body, and the diff --git a/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/expression/MethodCall.java b/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/expression/MethodCall.java index 8cb784a1ed..6b88aa3009 100644 --- a/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/expression/MethodCall.java +++ b/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/expression/MethodCall.java @@ -17,14 +17,14 @@ package io.codelaser.maddi.cst.api.expression; +import java.util.List; + import io.codelaser.maddi.annotation.Fluent; import io.codelaser.maddi.cst.api.element.Element; import io.codelaser.maddi.cst.api.expression.util.OneVariable; import io.codelaser.maddi.cst.api.info.MethodInfo; import io.codelaser.maddi.cst.api.type.ParameterizedType; -import java.util.List; - /** * A method invocation, {@code object.method(args)}. Operators are also modelled as method calls (see * {@link BinaryOperator}). It is a {@link io.codelaser.maddi.cst.api.expression.util.OneVariable} because diff --git a/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/expression/MethodReference.java b/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/expression/MethodReference.java index aaaf50c84c..7a17f75db8 100644 --- a/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/expression/MethodReference.java +++ b/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/expression/MethodReference.java @@ -17,12 +17,12 @@ package io.codelaser.maddi.cst.api.expression; +import java.util.List; + import io.codelaser.maddi.annotation.Fluent; import io.codelaser.maddi.cst.api.info.MethodInfo; import io.codelaser.maddi.cst.api.type.ParameterizedType; -import java.util.List; - /** * A method reference, {@code scope::method} (including constructor references {@code Type::new}). Its * type is the functional interface it targets; the concrete parameter/return types record how that diff --git a/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/expression/Or.java b/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/expression/Or.java index 155d044770..7e62a027d0 100644 --- a/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/expression/Or.java +++ b/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/expression/Or.java @@ -17,11 +17,10 @@ package io.codelaser.maddi.cst.api.expression; +import java.util.List; + import io.codelaser.maddi.annotation.Fluent; import io.codelaser.maddi.cst.api.element.Element; -import io.codelaser.maddi.cst.api.type.ParameterizedType; - -import java.util.List; /** * Boolean disjunction of two or more operands ({@code a || b || ...}). Like {@link And}, a flat list so diff --git a/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/expression/SwitchExpression.java b/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/expression/SwitchExpression.java index 689f9491b8..ccd98d57d7 100644 --- a/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/expression/SwitchExpression.java +++ b/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/expression/SwitchExpression.java @@ -17,14 +17,14 @@ package io.codelaser.maddi.cst.api.expression; +import java.util.Collection; +import java.util.List; + import io.codelaser.maddi.annotation.Fluent; import io.codelaser.maddi.cst.api.element.Element; import io.codelaser.maddi.cst.api.statement.SwitchEntry; import io.codelaser.maddi.cst.api.type.ParameterizedType; -import java.util.Collection; -import java.util.List; - /** * A switch expression, {@code switch (selector) { case ... -> value; ... }}, which yields a value. Like * the arrow-form switch statement it is modelled as a list of diff --git a/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/info/ComputeMethodOverrides.java b/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/info/ComputeMethodOverrides.java index d5d889a906..c19978b7b7 100644 --- a/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/info/ComputeMethodOverrides.java +++ b/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/info/ComputeMethodOverrides.java @@ -17,13 +17,13 @@ package io.codelaser.maddi.cst.api.info; -import io.codelaser.maddi.cst.api.type.NamedType; -import io.codelaser.maddi.cst.api.type.ParameterizedType; - import java.util.List; import java.util.Map; import java.util.Set; +import io.codelaser.maddi.cst.api.type.NamedType; +import io.codelaser.maddi.cst.api.type.ParameterizedType; + public interface ComputeMethodOverrides { /* uses the same machinery as 'overrides', but is executed at a different stage. diff --git a/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/info/FieldInfo.java b/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/info/FieldInfo.java index 0a2aaf1d02..22c2ea131a 100644 --- a/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/info/FieldInfo.java +++ b/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/info/FieldInfo.java @@ -17,6 +17,9 @@ package io.codelaser.maddi.cst.api.info; +import java.util.List; +import java.util.Set; + import io.codelaser.maddi.annotation.Fluent; import io.codelaser.maddi.cst.api.analysis.PropertyValueMap; import io.codelaser.maddi.cst.api.element.CompilationUnit; @@ -26,9 +29,6 @@ import io.codelaser.maddi.cst.api.translate.TranslationMap; import io.codelaser.maddi.cst.api.type.ParameterizedType; -import java.util.List; -import java.util.Set; - /** * Represents a field declaration in the CST. *

diff --git a/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/info/ImportComputer.java b/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/info/ImportComputer.java index 1d9c1aa6cc..e81fb85aa9 100644 --- a/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/info/ImportComputer.java +++ b/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/info/ImportComputer.java @@ -17,14 +17,13 @@ package io.codelaser.maddi.cst.api.info; +import java.util.List; +import java.util.Objects; + import io.codelaser.maddi.cst.api.element.Comment; import io.codelaser.maddi.cst.api.element.CompilationUnit; import io.codelaser.maddi.cst.api.output.Qualification; -import java.util.List; -import java.util.Objects; -import java.util.Set; - public interface ImportComputer { record ImportDetails(String importString, List comments) { @Override diff --git a/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/info/Info.java b/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/info/Info.java index 7082597e78..d1ff968a9c 100644 --- a/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/info/Info.java +++ b/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/info/Info.java @@ -17,6 +17,9 @@ package io.codelaser.maddi.cst.api.info; +import java.util.List; +import java.util.stream.Stream; + import io.codelaser.maddi.annotation.Fluent; import io.codelaser.maddi.cst.api.element.Comment; import io.codelaser.maddi.cst.api.element.CompilationUnit; @@ -25,9 +28,6 @@ import io.codelaser.maddi.cst.api.expression.AnnotationExpression; import io.codelaser.maddi.cst.api.translate.TranslationMap; -import java.util.List; -import java.util.stream.Stream; - /** * Base interface for all named, inspectable program elements: types, methods, fields, and parameters. *

diff --git a/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/info/MethodInfo.java b/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/info/MethodInfo.java index 79e9567d90..7be6540190 100644 --- a/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/info/MethodInfo.java +++ b/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/info/MethodInfo.java @@ -17,6 +17,8 @@ package io.codelaser.maddi.cst.api.info; +import java.util.*; + import io.codelaser.maddi.annotation.Fluent; import io.codelaser.maddi.cst.api.analysis.Value; import io.codelaser.maddi.cst.api.element.CompilationUnit; @@ -26,9 +28,6 @@ import io.codelaser.maddi.cst.api.type.ParameterizedType; import io.codelaser.maddi.cst.api.util.ParSeq; -import java.util.*; -import java.util.stream.Stream; - /** * Represents a method or constructor declaration in the CST. *

diff --git a/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/info/MethodModifier.java b/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/info/MethodModifier.java index 4694c12fa0..cda38cf424 100644 --- a/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/info/MethodModifier.java +++ b/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/info/MethodModifier.java @@ -17,9 +17,6 @@ package io.codelaser.maddi.cst.api.info; -import io.codelaser.maddi.cst.api.output.OutputBuilder; -import io.codelaser.maddi.cst.api.output.element.Keyword; - /** * A modifier that can appear on a method or constructor declaration: * {@code public}, {@code private}, {@code protected}, {@code abstract}, diff --git a/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/info/ParameterInfo.java b/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/info/ParameterInfo.java index 63204f18d5..edc220d320 100644 --- a/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/info/ParameterInfo.java +++ b/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/info/ParameterInfo.java @@ -17,15 +17,15 @@ package io.codelaser.maddi.cst.api.info; +import java.util.List; +import java.util.stream.Stream; + import io.codelaser.maddi.annotation.Fluent; import io.codelaser.maddi.cst.api.analysis.Value; import io.codelaser.maddi.cst.api.translate.TranslationMap; import io.codelaser.maddi.cst.api.type.ParameterizedType; import io.codelaser.maddi.cst.api.variable.Variable; -import java.util.List; -import java.util.stream.Stream; - /** * Represents a single parameter in a method or constructor declaration. *

diff --git a/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/info/TypeInfo.java b/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/info/TypeInfo.java index 7b86892da2..477a693060 100644 --- a/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/info/TypeInfo.java +++ b/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/info/TypeInfo.java @@ -18,6 +18,12 @@ package io.codelaser.maddi.cst.api.info; +import java.util.*; +import java.util.function.Consumer; +import java.util.function.Predicate; +import java.util.function.Supplier; +import java.util.stream.Stream; + import io.codelaser.maddi.annotation.Fluent; import io.codelaser.maddi.cst.api.element.Comment; import io.codelaser.maddi.cst.api.element.CompilationUnit; @@ -33,12 +39,6 @@ import io.codelaser.maddi.cst.api.type.TypeNature; import io.codelaser.maddi.support.Either; -import java.util.*; -import java.util.function.Consumer; -import java.util.function.Predicate; -import java.util.function.Supplier; -import java.util.stream.Stream; - /** * Represents a type declaration in the CST: a class, interface, enum, record, or annotation type. *

diff --git a/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/info/TypeParameter.java b/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/info/TypeParameter.java index 21cf425336..e68bd7d161 100644 --- a/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/info/TypeParameter.java +++ b/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/info/TypeParameter.java @@ -17,25 +17,23 @@ package io.codelaser.maddi.cst.api.info; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.stream.Stream; + import io.codelaser.maddi.annotation.Fluent; import io.codelaser.maddi.annotation.Independent; import io.codelaser.maddi.annotation.NotNull; import io.codelaser.maddi.cst.api.element.DetailedSources; import io.codelaser.maddi.cst.api.element.Element; -import io.codelaser.maddi.cst.api.info.InfoMapView; import io.codelaser.maddi.cst.api.output.OutputBuilder; import io.codelaser.maddi.cst.api.output.Qualification; import io.codelaser.maddi.cst.api.type.NamedType; import io.codelaser.maddi.cst.api.type.ParameterizedType; import io.codelaser.maddi.support.Either; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.function.Predicate; -import java.util.stream.Stream; - /** * Represents a type parameter declaration, such as {@code T} in {@code class Box} * or {@code E extends Comparable} in a method signature. diff --git a/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/info/TypePrinter.java b/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/info/TypePrinter.java index bb7d4c62a0..80c77dd245 100644 --- a/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/info/TypePrinter.java +++ b/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/info/TypePrinter.java @@ -17,11 +17,11 @@ package io.codelaser.maddi.cst.api.info; +import java.util.List; + import io.codelaser.maddi.cst.api.output.OutputBuilder; import io.codelaser.maddi.cst.api.output.Qualification; -import java.util.List; - public interface TypePrinter { List minimalModifiers(TypeInfo typeInfo); diff --git a/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/output/OutputBuilder.java b/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/output/OutputBuilder.java index 3f90f64e53..e82768bd1b 100644 --- a/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/output/OutputBuilder.java +++ b/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/output/OutputBuilder.java @@ -17,8 +17,6 @@ package io.codelaser.maddi.cst.api.output; -import io.codelaser.maddi.cst.api.output.element.Symbol; - import java.util.List; import java.util.stream.Collectors; import java.util.stream.Stream; diff --git a/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/output/Qualification.java b/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/output/Qualification.java index 27812484fa..aa03ece065 100644 --- a/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/output/Qualification.java +++ b/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/output/Qualification.java @@ -17,6 +17,8 @@ package io.codelaser.maddi.cst.api.output; +import java.util.List; + import io.codelaser.maddi.cst.api.element.Comment; import io.codelaser.maddi.cst.api.element.Element; import io.codelaser.maddi.cst.api.element.ImportStatement; @@ -27,8 +29,6 @@ import io.codelaser.maddi.cst.api.variable.This; import io.codelaser.maddi.cst.api.variable.Variable; -import java.util.List; - /** * This type helps determine how variables and types are qualified. * Its implementations are mutable. diff --git a/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/runtime/Eval.java b/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/runtime/Eval.java index 45568088af..8487be102f 100644 --- a/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/runtime/Eval.java +++ b/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/runtime/Eval.java @@ -17,13 +17,13 @@ package io.codelaser.maddi.cst.api.runtime; -import io.codelaser.maddi.cst.api.expression.*; -import io.codelaser.maddi.cst.api.variable.Variable; - import java.util.Collection; import java.util.List; import java.util.stream.Stream; +import io.codelaser.maddi.cst.api.expression.*; +import io.codelaser.maddi.cst.api.variable.Variable; + /* All recursion takes place in sortAndSimplify, when required. None of the abstract methods should call sortAndSimplify again. diff --git a/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/runtime/Factory.java b/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/runtime/Factory.java index 2db3a8d9d8..d2057229a1 100644 --- a/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/runtime/Factory.java +++ b/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/runtime/Factory.java @@ -17,6 +17,14 @@ package io.codelaser.maddi.cst.api.runtime; +import java.util.Collection; +import java.util.List; +import java.util.Set; +import java.util.function.Function; +import java.util.stream.Collector; + +import org.jetbrains.annotations.Nullable; + import io.codelaser.maddi.cst.api.element.*; import io.codelaser.maddi.cst.api.expression.*; import io.codelaser.maddi.cst.api.info.*; @@ -33,13 +41,6 @@ import io.codelaser.maddi.cst.api.type.TypeNature; import io.codelaser.maddi.cst.api.type.Wildcard; import io.codelaser.maddi.cst.api.variable.*; -import org.jetbrains.annotations.Nullable; - -import java.util.Collection; -import java.util.List; -import java.util.Set; -import java.util.function.Function; -import java.util.stream.Collector; public interface Factory { diff --git a/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/runtime/Predefined.java b/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/runtime/Predefined.java index 1dc6b70873..7a6832c714 100644 --- a/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/runtime/Predefined.java +++ b/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/runtime/Predefined.java @@ -17,15 +17,15 @@ package io.codelaser.maddi.cst.api.runtime; +import java.util.Collection; +import java.util.List; + import io.codelaser.maddi.annotation.Independent; import io.codelaser.maddi.cst.api.expression.AnnotationExpression; import io.codelaser.maddi.cst.api.info.MethodInfo; import io.codelaser.maddi.cst.api.info.TypeInfo; import io.codelaser.maddi.cst.api.type.ParameterizedType; -import java.util.Collection; -import java.util.List; - public interface Predefined extends PredefinedWithoutParameterizedType { MethodInfo assignOperator(ParameterizedType parameterizedType); diff --git a/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/runtime/Types.java b/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/runtime/Types.java index a1b9a8ea17..6b2751240b 100644 --- a/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/runtime/Types.java +++ b/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/runtime/Types.java @@ -17,12 +17,12 @@ package io.codelaser.maddi.cst.api.runtime; +import java.util.stream.Stream; + import io.codelaser.maddi.cst.api.element.SourceSet; import io.codelaser.maddi.cst.api.expression.AnnotationExpression; import io.codelaser.maddi.cst.api.info.TypeInfo; -import java.util.stream.Stream; - public interface Types { TypeInfo getFullyQualified(String name, boolean complain); diff --git a/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/statement/Block.java b/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/statement/Block.java index e473bb8417..5fd42d7971 100644 --- a/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/statement/Block.java +++ b/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/statement/Block.java @@ -17,15 +17,13 @@ package io.codelaser.maddi.cst.api.statement; -import io.codelaser.maddi.annotation.Independent; +import java.util.List; import io.codelaser.maddi.annotation.Fluent; +import io.codelaser.maddi.annotation.Independent; import io.codelaser.maddi.cst.api.element.Comment; -import io.codelaser.maddi.cst.api.info.InfoMap; import io.codelaser.maddi.cst.api.info.InfoMapView; -import java.util.List; - /** * A brace-delimited sequence of statements, {@code { ... }}. * diff --git a/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/statement/ExplicitConstructorInvocation.java b/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/statement/ExplicitConstructorInvocation.java index 5f22407290..96226b24e0 100644 --- a/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/statement/ExplicitConstructorInvocation.java +++ b/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/statement/ExplicitConstructorInvocation.java @@ -17,13 +17,13 @@ package io.codelaser.maddi.cst.api.statement; +import java.util.List; + import io.codelaser.maddi.annotation.Fluent; import io.codelaser.maddi.cst.api.element.Source; import io.codelaser.maddi.cst.api.expression.Expression; import io.codelaser.maddi.cst.api.info.MethodInfo; -import java.util.List; - /** * An explicit constructor invocation as the first statement of a constructor body: {@code this(...)} or * {@code super(...)}. {@link #isSuper()} distinguishes the two, {@link #methodInfo()} is the invoked diff --git a/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/statement/ForStatement.java b/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/statement/ForStatement.java index 060d0e1157..1cc181fe6b 100644 --- a/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/statement/ForStatement.java +++ b/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/statement/ForStatement.java @@ -17,12 +17,12 @@ package io.codelaser.maddi.cst.api.statement; +import java.util.List; + import io.codelaser.maddi.annotation.Fluent; import io.codelaser.maddi.cst.api.element.Element; import io.codelaser.maddi.cst.api.expression.Expression; -import java.util.List; - /** * The classic {@code for (init; condition; update) body} loop. The condition is * {@link Statement#expression()} and the body is the primary {@link Statement#block()}; the init and diff --git a/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/statement/LocalVariableCreation.java b/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/statement/LocalVariableCreation.java index 93fadddb2a..2b8b0fe7c6 100644 --- a/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/statement/LocalVariableCreation.java +++ b/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/statement/LocalVariableCreation.java @@ -17,15 +17,15 @@ package io.codelaser.maddi.cst.api.statement; -import io.codelaser.maddi.annotation.Fluent; -import io.codelaser.maddi.cst.api.element.Source; -import io.codelaser.maddi.cst.api.variable.LocalVariable; - import java.util.List; import java.util.Set; import java.util.stream.Collectors; import java.util.stream.Stream; +import io.codelaser.maddi.annotation.Fluent; +import io.codelaser.maddi.cst.api.element.Source; +import io.codelaser.maddi.cst.api.variable.LocalVariable; + /** * A local variable declaration statement, for example {@code int i = 0;} or {@code final var a = b, c = d;}. * diff --git a/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/statement/Statement.java b/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/statement/Statement.java index f74abba112..77fe5f21b8 100644 --- a/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/statement/Statement.java +++ b/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/statement/Statement.java @@ -17,21 +17,19 @@ package io.codelaser.maddi.cst.api.statement; -import io.codelaser.maddi.annotation.Independent; +import java.util.List; +import java.util.stream.Stream; import io.codelaser.maddi.annotation.Fluent; +import io.codelaser.maddi.annotation.Independent; import io.codelaser.maddi.annotation.NotNull; import io.codelaser.maddi.cst.api.element.Element; import io.codelaser.maddi.cst.api.element.Source; import io.codelaser.maddi.cst.api.expression.AnnotationExpression; import io.codelaser.maddi.cst.api.expression.Expression; -import io.codelaser.maddi.cst.api.info.InfoMap; import io.codelaser.maddi.cst.api.info.InfoMapView; import io.codelaser.maddi.cst.api.translate.TranslationMap; -import java.util.List; -import java.util.stream.Stream; - /** * A statement in the common syntax tree (CST). * diff --git a/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/statement/SwitchEntry.java b/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/statement/SwitchEntry.java index 4dc89bfd42..d1f17f7c0e 100644 --- a/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/statement/SwitchEntry.java +++ b/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/statement/SwitchEntry.java @@ -17,15 +17,15 @@ package io.codelaser.maddi.cst.api.statement; +import java.util.Collection; +import java.util.List; + import io.codelaser.maddi.annotation.Fluent; import io.codelaser.maddi.cst.api.element.Element; import io.codelaser.maddi.cst.api.element.RecordPattern; import io.codelaser.maddi.cst.api.expression.Expression; import io.codelaser.maddi.cst.api.translate.TranslationMap; -import java.util.Collection; -import java.util.List; - /** * One arm of an arrow-form switch ({@link SwitchStatementNewStyle}): the labels on the left of the * {@code ->} together with the code on its right. A {@code SwitchEntry} is an {@link Element}, not a diff --git a/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/statement/SwitchStatementNewStyle.java b/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/statement/SwitchStatementNewStyle.java index 8bbb36acf5..1260996ead 100644 --- a/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/statement/SwitchStatementNewStyle.java +++ b/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/statement/SwitchStatementNewStyle.java @@ -17,12 +17,12 @@ package io.codelaser.maddi.cst.api.statement; -import io.codelaser.maddi.annotation.Fluent; -import io.codelaser.maddi.cst.api.expression.Expression; - import java.util.Collection; import java.util.List; +import io.codelaser.maddi.annotation.Fluent; +import io.codelaser.maddi.cst.api.expression.Expression; + /** * The arrow-form {@code switch (selector) { case ... -> ...; }} statement (Java 14+), modelled as a list * of {@link SwitchEntry entries}. The selector is {@link Statement#expression()}; this statement has no diff --git a/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/statement/SwitchStatementOldStyle.java b/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/statement/SwitchStatementOldStyle.java index 8e2f1f5562..d581832ce8 100644 --- a/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/statement/SwitchStatementOldStyle.java +++ b/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/statement/SwitchStatementOldStyle.java @@ -17,29 +17,24 @@ package io.codelaser.maddi.cst.api.statement; -import io.codelaser.maddi.annotation.Independent; +import java.util.Collection; +import java.util.List; +import java.util.Map; +import java.util.function.Predicate; +import java.util.stream.Stream; import io.codelaser.maddi.annotation.Fluent; +import io.codelaser.maddi.annotation.Independent; import io.codelaser.maddi.cst.api.element.Element; import io.codelaser.maddi.cst.api.element.RecordPattern; -import io.codelaser.maddi.cst.api.element.Visitor; import io.codelaser.maddi.cst.api.expression.Expression; -import io.codelaser.maddi.cst.api.info.InfoMap; import io.codelaser.maddi.cst.api.info.InfoMapView; import io.codelaser.maddi.cst.api.output.OutputBuilder; import io.codelaser.maddi.cst.api.output.Qualification; import io.codelaser.maddi.cst.api.translate.TranslationMap; -import io.codelaser.maddi.cst.api.type.ParameterizedType; import io.codelaser.maddi.cst.api.variable.DescendMode; -import io.codelaser.maddi.cst.api.variable.LocalVariable; import io.codelaser.maddi.cst.api.variable.Variable; -import java.util.Collection; -import java.util.List; -import java.util.Map; -import java.util.function.Predicate; -import java.util.stream.Stream; - /** * The colon-form {@code switch (selector) { case X: ...; default: ...; }} statement with fall-through. * The selector is {@link Statement#expression()} and the whole body is a single primary diff --git a/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/statement/TryStatement.java b/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/statement/TryStatement.java index 53c2e09bd4..58b21ca06d 100644 --- a/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/statement/TryStatement.java +++ b/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/statement/TryStatement.java @@ -17,18 +17,16 @@ package io.codelaser.maddi.cst.api.statement; -import io.codelaser.maddi.annotation.Independent; +import java.util.List; import io.codelaser.maddi.annotation.Fluent; +import io.codelaser.maddi.annotation.Independent; import io.codelaser.maddi.cst.api.element.Element; -import io.codelaser.maddi.cst.api.info.InfoMap; import io.codelaser.maddi.cst.api.info.InfoMapView; import io.codelaser.maddi.cst.api.translate.TranslationMap; import io.codelaser.maddi.cst.api.type.ParameterizedType; import io.codelaser.maddi.cst.api.variable.LocalVariable; -import java.util.List; - /** * The {@code try ... catch ... finally} statement, including try-with-resources. The {@code try} body is * the primary {@link Statement#block()}; the {@code catch} clauses are {@link #catchClauses()}, the diff --git a/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/translate/TranslationMap.java b/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/translate/TranslationMap.java index b1dffbbd17..97e974ede0 100644 --- a/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/translate/TranslationMap.java +++ b/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/translate/TranslationMap.java @@ -17,6 +17,13 @@ package io.codelaser.maddi.cst.api.translate; +import java.util.*; +import java.util.function.BiConsumer; +import java.util.function.BinaryOperator; +import java.util.function.Function; +import java.util.function.Supplier; +import java.util.stream.Collector; + import io.codelaser.maddi.annotation.Fluent; import io.codelaser.maddi.annotation.NotNull; import io.codelaser.maddi.cst.api.element.Element; @@ -31,13 +38,6 @@ import io.codelaser.maddi.cst.api.variable.LocalVariable; import io.codelaser.maddi.cst.api.variable.Variable; -import java.util.*; -import java.util.function.BiConsumer; -import java.util.function.BinaryOperator; -import java.util.function.Function; -import java.util.function.Supplier; -import java.util.stream.Collector; - public interface TranslationMap { // only called upon change diff --git a/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/type/ParameterizedType.java b/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/type/ParameterizedType.java index 4df3235903..5048c3ee40 100644 --- a/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/type/ParameterizedType.java +++ b/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/type/ParameterizedType.java @@ -17,12 +17,17 @@ package io.codelaser.maddi.cst.api.type; -import io.codelaser.maddi.cst.api.expression.AnnotationExpression; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.stream.Stream; import io.codelaser.maddi.annotation.Independent; import io.codelaser.maddi.cst.api.element.DetailedSources; import io.codelaser.maddi.cst.api.element.Element; -import io.codelaser.maddi.cst.api.info.InfoMap; +import io.codelaser.maddi.cst.api.expression.AnnotationExpression; import io.codelaser.maddi.cst.api.info.InfoMapView; import io.codelaser.maddi.cst.api.info.TypeInfo; import io.codelaser.maddi.cst.api.info.TypeParameter; @@ -31,13 +36,6 @@ import io.codelaser.maddi.cst.api.runtime.Predefined; import io.codelaser.maddi.cst.api.runtime.PredefinedWithoutParameterizedType; -import java.util.HashSet; -import java.util.List; -import java.util.HashMap; -import java.util.Map; -import java.util.Set; -import java.util.stream.Stream; - public interface ParameterizedType { // Nullability as a first-class dimension of the type (Kotlin String?). Languages that do not track diff --git a/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/util/ParSeq.java b/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/util/ParSeq.java index 3ef4cfaabe..30b1453b97 100644 --- a/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/util/ParSeq.java +++ b/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/util/ParSeq.java @@ -17,8 +17,6 @@ package io.codelaser.maddi.cst.api.util; -import io.codelaser.maddi.cst.api.info.InfoMap; - import java.util.Comparator; import java.util.List; diff --git a/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/variable/Variable.java b/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/variable/Variable.java index d90ba09bc3..1cfe993eab 100644 --- a/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/variable/Variable.java +++ b/maddi-cst-api/src/main/java/io/codelaser/maddi/cst/api/variable/Variable.java @@ -17,19 +17,17 @@ package io.codelaser.maddi.cst.api.variable; -import io.codelaser.maddi.annotation.Independent; +import java.util.function.Predicate; +import java.util.stream.Stream; +import io.codelaser.maddi.annotation.Independent; import io.codelaser.maddi.annotation.NotNull; import io.codelaser.maddi.cst.api.element.DetailedSources; import io.codelaser.maddi.cst.api.element.Element; import io.codelaser.maddi.cst.api.expression.util.OneVariable; -import io.codelaser.maddi.cst.api.info.InfoMap; import io.codelaser.maddi.cst.api.info.InfoMapView; import io.codelaser.maddi.cst.api.type.ParameterizedType; -import java.util.function.Predicate; -import java.util.stream.Stream; - /** * Base interface for all variable kinds in the CST. *

diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/element/CompilationUnitImpl.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/element/CompilationUnitImpl.java index 54ef4ee987..0c871b77f3 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/element/CompilationUnitImpl.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/element/CompilationUnitImpl.java @@ -17,9 +17,17 @@ package io.codelaser.maddi.cst.impl.element; +import java.net.URI; +import java.net.URISyntaxException; +import java.util.ArrayList; +import java.util.LinkedList; +import java.util.List; +import java.util.Objects; +import java.util.function.Predicate; +import java.util.stream.Stream; + import io.codelaser.maddi.cst.api.element.*; import io.codelaser.maddi.cst.api.expression.AnnotationExpression; -import io.codelaser.maddi.cst.api.info.InfoMap; import io.codelaser.maddi.cst.api.info.InfoMapView; import io.codelaser.maddi.cst.api.info.TypeInfo; import io.codelaser.maddi.cst.api.output.OutputBuilder; @@ -30,15 +38,6 @@ import io.codelaser.maddi.cst.impl.output.TextImpl; import io.codelaser.maddi.support.SetOnce; -import java.net.URI; -import java.net.URISyntaxException; -import java.util.ArrayList; -import java.util.LinkedList; -import java.util.List; -import java.util.Objects; -import java.util.function.Predicate; -import java.util.stream.Stream; - public class CompilationUnitImpl extends ElementImpl implements CompilationUnit { private final URI uri; private final String packageName; diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/element/CompilationUnitStub.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/element/CompilationUnitStub.java index fd969f01b8..378a079371 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/element/CompilationUnitStub.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/element/CompilationUnitStub.java @@ -17,8 +17,12 @@ package io.codelaser.maddi.cst.impl.element; +import java.net.URI; +import java.util.List; +import java.util.function.Predicate; +import java.util.stream.Stream; + import io.codelaser.maddi.cst.api.element.*; -import io.codelaser.maddi.cst.api.info.InfoMap; import io.codelaser.maddi.cst.api.info.InfoMapView; import io.codelaser.maddi.cst.api.info.TypeInfo; import io.codelaser.maddi.cst.api.output.OutputBuilder; @@ -27,11 +31,6 @@ import io.codelaser.maddi.cst.api.variable.Variable; import io.codelaser.maddi.support.SetOnce; -import java.net.URI; -import java.util.List; -import java.util.function.Predicate; -import java.util.stream.Stream; - public class CompilationUnitStub implements CompilationUnit { private final String packageName; private final SetOnce> types = new SetOnce<>(); diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/element/DetailedSourcesImpl.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/element/DetailedSourcesImpl.java index 2f1aa8079c..7fc32d7391 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/element/DetailedSourcesImpl.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/element/DetailedSourcesImpl.java @@ -17,6 +17,14 @@ package io.codelaser.maddi.cst.impl.element; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.IdentityHashMap; +import java.util.List; +import java.util.Map; +import java.util.function.BiConsumer; +import java.util.stream.Stream; + import io.codelaser.maddi.cst.api.element.DetailedSources; import io.codelaser.maddi.cst.api.element.Element; import io.codelaser.maddi.cst.api.element.Source; @@ -31,14 +39,6 @@ import io.codelaser.maddi.cst.api.variable.LocalVariable; import io.codelaser.maddi.cst.api.variable.Variable; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.IdentityHashMap; -import java.util.List; -import java.util.Map; -import java.util.function.BiConsumer; -import java.util.stream.Stream; - public class DetailedSourcesImpl implements DetailedSources { private final IdentityHashMap identityHashMap; private final IdentityHashMap association; diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/element/ElementImpl.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/element/ElementImpl.java index 81e5e71b96..b8a1d6995e 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/element/ElementImpl.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/element/ElementImpl.java @@ -17,6 +17,12 @@ package io.codelaser.maddi.cst.impl.element; +import java.util.ArrayList; +import java.util.List; +import java.util.stream.Stream; + +import org.jetbrains.annotations.NotNull; + import io.codelaser.maddi.cst.api.element.Comment; import io.codelaser.maddi.cst.api.element.Element; import io.codelaser.maddi.cst.api.element.SingleLineComment; @@ -27,11 +33,6 @@ import io.codelaser.maddi.cst.api.variable.Variable; import io.codelaser.maddi.cst.impl.output.QualificationImpl; import io.codelaser.maddi.cst.impl.variable.DescendModeEnum; -import org.jetbrains.annotations.NotNull; - -import java.util.ArrayList; -import java.util.List; -import java.util.stream.Stream; public abstract class ElementImpl implements Element { diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/element/JavaDocImpl.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/element/JavaDocImpl.java index f7e3c5b118..bf102f79a5 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/element/JavaDocImpl.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/element/JavaDocImpl.java @@ -17,13 +17,20 @@ package io.codelaser.maddi.cst.impl.element; +import java.util.Arrays; +import java.util.List; +import java.util.Objects; +import java.util.function.Predicate; +import java.util.regex.Matcher; +import java.util.regex.Pattern; +import java.util.stream.Stream; + import io.codelaser.maddi.cst.api.element.*; +import io.codelaser.maddi.cst.api.info.FieldInfo; import io.codelaser.maddi.cst.api.info.Info; -import io.codelaser.maddi.cst.api.info.InfoMap; import io.codelaser.maddi.cst.api.info.InfoMapView; -import io.codelaser.maddi.cst.api.info.TypeInfo; -import io.codelaser.maddi.cst.api.info.FieldInfo; import io.codelaser.maddi.cst.api.info.MethodInfo; +import io.codelaser.maddi.cst.api.info.TypeInfo; import io.codelaser.maddi.cst.api.output.Formatter; import io.codelaser.maddi.cst.api.output.OutputBuilder; import io.codelaser.maddi.cst.api.output.Qualification; @@ -35,14 +42,6 @@ import io.codelaser.maddi.cst.impl.output.SpaceEnum; import io.codelaser.maddi.cst.impl.output.TextImpl; -import java.util.Arrays; -import java.util.List; -import java.util.Objects; -import java.util.function.Predicate; -import java.util.regex.Matcher; -import java.util.regex.Pattern; -import java.util.stream.Stream; - /** * Convention: the "comment" string in {@link MultiLineCommentImpl} may hold a {@link JavaDoc#placeholder} for each tag * in this object, which {@link #comment()} replaces by the tag as written. The maddi parser writes them; the openjdk diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/element/MaddiAnnotationsImpl.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/element/MaddiAnnotationsImpl.java index e0ea88ccdb..a2a24e85d0 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/element/MaddiAnnotationsImpl.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/element/MaddiAnnotationsImpl.java @@ -17,6 +17,12 @@ package io.codelaser.maddi.cst.impl.element; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.stream.Stream; + import io.codelaser.maddi.annotation.*; import io.codelaser.maddi.annotation.eventual.BeforeMark; import io.codelaser.maddi.annotation.eventual.Mark; @@ -34,12 +40,6 @@ import io.codelaser.maddi.cst.impl.expression.AnnotationExpressionImpl; import io.codelaser.maddi.cst.impl.info.TypeInfoImpl; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.stream.Stream; - public class MaddiAnnotationsImpl { public final static String IMPLIED = "implied"; public final static String ABSENT = "absent"; diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/element/ModuleInfoImpl.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/element/ModuleInfoImpl.java index bb41fb3841..fd0809b625 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/element/ModuleInfoImpl.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/element/ModuleInfoImpl.java @@ -17,10 +17,15 @@ package io.codelaser.maddi.cst.impl.element; +import java.util.ArrayList; +import java.util.List; +import java.util.Objects; +import java.util.function.Predicate; +import java.util.stream.Stream; + import io.codelaser.maddi.cst.api.element.*; import io.codelaser.maddi.cst.api.info.Access; import io.codelaser.maddi.cst.api.info.Info; -import io.codelaser.maddi.cst.api.info.InfoMap; import io.codelaser.maddi.cst.api.info.InfoMapView; import io.codelaser.maddi.cst.api.info.TypeInfo; import io.codelaser.maddi.cst.api.output.OutputBuilder; @@ -35,12 +40,6 @@ import io.codelaser.maddi.cst.impl.output.TextImpl; import io.codelaser.maddi.support.SetOnce; -import java.util.ArrayList; -import java.util.List; -import java.util.Objects; -import java.util.function.Predicate; -import java.util.stream.Stream; - public class ModuleInfoImpl extends ElementImpl implements ModuleInfo { private final CompilationUnit compilationUnit; private final String name; diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/element/MultiLineCommentImpl.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/element/MultiLineCommentImpl.java index 28e48449a7..eb0609f41a 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/element/MultiLineCommentImpl.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/element/MultiLineCommentImpl.java @@ -17,6 +17,12 @@ package io.codelaser.maddi.cst.impl.element; +import java.util.Arrays; +import java.util.List; +import java.util.Objects; +import java.util.function.Predicate; +import java.util.stream.Stream; + import io.codelaser.maddi.cst.api.element.*; import io.codelaser.maddi.cst.api.output.Formatter; import io.codelaser.maddi.cst.api.output.OutputBuilder; @@ -25,12 +31,6 @@ import io.codelaser.maddi.cst.api.variable.Variable; import io.codelaser.maddi.cst.impl.output.*; -import java.util.Arrays; -import java.util.List; -import java.util.Objects; -import java.util.function.Predicate; -import java.util.stream.Stream; - public class MultiLineCommentImpl implements MultiLineComment { private final String comment; private final Source source; diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/element/RecordPatternImpl.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/element/RecordPatternImpl.java index 3d4b238776..53bf488f06 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/element/RecordPatternImpl.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/element/RecordPatternImpl.java @@ -17,8 +17,11 @@ package io.codelaser.maddi.cst.impl.element; +import java.util.List; +import java.util.function.Predicate; +import java.util.stream.Stream; + import io.codelaser.maddi.cst.api.element.*; -import io.codelaser.maddi.cst.api.info.InfoMap; import io.codelaser.maddi.cst.api.info.InfoMapView; import io.codelaser.maddi.cst.api.output.OutputBuilder; import io.codelaser.maddi.cst.api.output.Qualification; @@ -30,10 +33,6 @@ import io.codelaser.maddi.cst.impl.output.*; import io.codelaser.maddi.cst.impl.type.DiamondEnum; -import java.util.List; -import java.util.function.Predicate; -import java.util.stream.Stream; - public class RecordPatternImpl extends ElementImpl implements RecordPattern { private final List comments; private final Source source; diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/element/SingleLineCommentImpl.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/element/SingleLineCommentImpl.java index 86bec1df63..5cc0f45dc5 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/element/SingleLineCommentImpl.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/element/SingleLineCommentImpl.java @@ -17,8 +17,12 @@ package io.codelaser.maddi.cst.impl.element; +import java.util.List; +import java.util.Objects; +import java.util.function.Predicate; +import java.util.stream.Stream; + import io.codelaser.maddi.cst.api.element.*; -import io.codelaser.maddi.cst.api.info.InfoMap; import io.codelaser.maddi.cst.api.output.OutputBuilder; import io.codelaser.maddi.cst.api.output.Qualification; import io.codelaser.maddi.cst.api.variable.DescendMode; @@ -28,11 +32,6 @@ import io.codelaser.maddi.cst.impl.output.SymbolEnum; import io.codelaser.maddi.cst.impl.output.TextImpl; -import java.util.List; -import java.util.Objects; -import java.util.function.Predicate; -import java.util.stream.Stream; - public class SingleLineCommentImpl implements SingleLineComment { private final String comment; private final Source source; diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/element/SourceImpl.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/element/SourceImpl.java index 1d167e4706..2336448374 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/element/SourceImpl.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/element/SourceImpl.java @@ -17,12 +17,12 @@ package io.codelaser.maddi.cst.impl.element; +import java.util.Objects; + import io.codelaser.maddi.cst.api.element.CompilationUnit; import io.codelaser.maddi.cst.api.element.DetailedSources; import io.codelaser.maddi.cst.api.element.Source; -import java.util.Objects; - /* we must be a bit memory-conscious: no unnecessary fields because there may be millions of elements */ diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/AndImpl.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/AndImpl.java index aa34427c75..eef943728c 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/AndImpl.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/AndImpl.java @@ -17,6 +17,12 @@ package io.codelaser.maddi.cst.impl.expression; +import java.util.ArrayList; +import java.util.List; +import java.util.Objects; +import java.util.function.Predicate; +import java.util.stream.Stream; + import io.codelaser.maddi.annotation.rare.IgnoreModifications; import io.codelaser.maddi.cst.api.element.Comment; import io.codelaser.maddi.cst.api.element.Element; @@ -25,7 +31,6 @@ import io.codelaser.maddi.cst.api.expression.And; import io.codelaser.maddi.cst.api.expression.Expression; import io.codelaser.maddi.cst.api.expression.Precedence; -import io.codelaser.maddi.cst.api.info.InfoMap; import io.codelaser.maddi.cst.api.info.InfoMapView; import io.codelaser.maddi.cst.api.output.OutputBuilder; import io.codelaser.maddi.cst.api.output.Qualification; @@ -41,12 +46,6 @@ import io.codelaser.maddi.cst.impl.output.SymbolEnum; import io.codelaser.maddi.util.ListUtil; -import java.util.ArrayList; -import java.util.List; -import java.util.Objects; -import java.util.function.Predicate; -import java.util.stream.Stream; - public class AndImpl extends ExpressionImpl implements And { diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/AnnotationExpressionImpl.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/AnnotationExpressionImpl.java index 943bfdaa04..23df6059ef 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/AnnotationExpressionImpl.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/AnnotationExpressionImpl.java @@ -17,9 +17,16 @@ package io.codelaser.maddi.cst.impl.expression; +import static io.codelaser.maddi.cst.api.element.Element.TypeReferenceNature.EXPLICIT; + +import java.util.ArrayList; +import java.util.List; +import java.util.Objects; +import java.util.function.Predicate; +import java.util.stream.Stream; + import io.codelaser.maddi.cst.api.element.*; import io.codelaser.maddi.cst.api.expression.*; -import io.codelaser.maddi.cst.api.info.InfoMap; import io.codelaser.maddi.cst.api.info.InfoMapView; import io.codelaser.maddi.cst.api.info.TypeInfo; import io.codelaser.maddi.cst.api.output.OutputBuilder; @@ -35,14 +42,6 @@ import io.codelaser.maddi.cst.impl.output.*; import io.codelaser.maddi.cst.impl.type.ParameterizedTypeImpl; -import java.util.ArrayList; -import java.util.List; -import java.util.Objects; -import java.util.function.Predicate; -import java.util.stream.Stream; - -import static io.codelaser.maddi.cst.api.element.Element.TypeReferenceNature.EXPLICIT; - public class AnnotationExpressionImpl extends ExpressionImpl implements AnnotationExpression { private final TypeInfo typeInfo; private final List keyValuePairs; diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/ArrayInitializerImpl.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/ArrayInitializerImpl.java index 3bc92559d9..e901b2438d 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/ArrayInitializerImpl.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/ArrayInitializerImpl.java @@ -17,6 +17,11 @@ package io.codelaser.maddi.cst.impl.expression; +import java.util.List; +import java.util.Objects; +import java.util.function.Predicate; +import java.util.stream.Stream; + import io.codelaser.maddi.cst.api.element.Comment; import io.codelaser.maddi.cst.api.element.Element; import io.codelaser.maddi.cst.api.element.Source; @@ -24,7 +29,6 @@ import io.codelaser.maddi.cst.api.expression.ArrayInitializer; import io.codelaser.maddi.cst.api.expression.Expression; import io.codelaser.maddi.cst.api.expression.Precedence; -import io.codelaser.maddi.cst.api.info.InfoMap; import io.codelaser.maddi.cst.api.info.InfoMapView; import io.codelaser.maddi.cst.api.output.OutputBuilder; import io.codelaser.maddi.cst.api.output.Qualification; @@ -40,11 +44,6 @@ import io.codelaser.maddi.cst.impl.output.SymbolEnum; import io.codelaser.maddi.util.ListUtil; -import java.util.List; -import java.util.Objects; -import java.util.function.Predicate; -import java.util.stream.Stream; - public class ArrayInitializerImpl extends ExpressionImpl implements ArrayInitializer { private final ParameterizedType commonType; diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/ArrayLengthImpl.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/ArrayLengthImpl.java index 13e8b5c4f4..55e300bb3a 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/ArrayLengthImpl.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/ArrayLengthImpl.java @@ -17,6 +17,10 @@ package io.codelaser.maddi.cst.impl.expression; +import java.util.List; +import java.util.function.Predicate; +import java.util.stream.Stream; + import io.codelaser.maddi.cst.api.element.Comment; import io.codelaser.maddi.cst.api.element.Element; import io.codelaser.maddi.cst.api.element.Source; @@ -24,7 +28,6 @@ import io.codelaser.maddi.cst.api.expression.ArrayLength; import io.codelaser.maddi.cst.api.expression.Expression; import io.codelaser.maddi.cst.api.expression.Precedence; -import io.codelaser.maddi.cst.api.info.InfoMap; import io.codelaser.maddi.cst.api.info.InfoMapView; import io.codelaser.maddi.cst.api.output.OutputBuilder; import io.codelaser.maddi.cst.api.output.Qualification; @@ -40,10 +43,6 @@ import io.codelaser.maddi.cst.impl.output.OutputBuilderImpl; import io.codelaser.maddi.cst.impl.output.SymbolEnum; -import java.util.List; -import java.util.function.Predicate; -import java.util.stream.Stream; - public class ArrayLengthImpl extends ExpressionImpl implements ArrayLength { private final Expression scope; private final ParameterizedType intPt; diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/AssignmentImpl.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/AssignmentImpl.java index d9c93a3257..87c35cc6a7 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/AssignmentImpl.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/AssignmentImpl.java @@ -17,6 +17,11 @@ package io.codelaser.maddi.cst.impl.expression; +import java.util.List; +import java.util.Objects; +import java.util.function.Predicate; +import java.util.stream.Stream; + import io.codelaser.maddi.cst.api.element.Comment; import io.codelaser.maddi.cst.api.element.Element; import io.codelaser.maddi.cst.api.element.Source; @@ -25,7 +30,6 @@ import io.codelaser.maddi.cst.api.expression.Expression; import io.codelaser.maddi.cst.api.expression.Precedence; import io.codelaser.maddi.cst.api.expression.VariableExpression; -import io.codelaser.maddi.cst.api.info.InfoMap; import io.codelaser.maddi.cst.api.info.InfoMapView; import io.codelaser.maddi.cst.api.info.MethodInfo; import io.codelaser.maddi.cst.api.output.OutputBuilder; @@ -40,11 +44,6 @@ import io.codelaser.maddi.cst.impl.output.OutputBuilderImpl; import io.codelaser.maddi.cst.impl.output.SymbolEnum; -import java.util.List; -import java.util.Objects; -import java.util.function.Predicate; -import java.util.stream.Stream; - public class AssignmentImpl extends ExpressionImpl implements Assignment { private final VariableExpression target; private final Expression value; diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/BinaryOperatorImpl.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/BinaryOperatorImpl.java index e5272f5513..d6b09fe3cf 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/BinaryOperatorImpl.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/BinaryOperatorImpl.java @@ -17,6 +17,14 @@ package io.codelaser.maddi.cst.impl.expression; +import java.util.HashSet; +import java.util.List; +import java.util.Objects; +import java.util.Set; +import java.util.function.Predicate; +import java.util.stream.Collectors; +import java.util.stream.Stream; + import io.codelaser.maddi.cst.api.element.Comment; import io.codelaser.maddi.cst.api.element.Element; import io.codelaser.maddi.cst.api.element.Source; @@ -25,7 +33,6 @@ import io.codelaser.maddi.cst.api.expression.Expression; import io.codelaser.maddi.cst.api.expression.GreaterThanZero; import io.codelaser.maddi.cst.api.expression.Precedence; -import io.codelaser.maddi.cst.api.info.InfoMap; import io.codelaser.maddi.cst.api.info.InfoMapView; import io.codelaser.maddi.cst.api.info.MethodInfo; import io.codelaser.maddi.cst.api.output.OutputBuilder; @@ -39,14 +46,6 @@ import io.codelaser.maddi.cst.impl.output.OutputBuilderImpl; import io.codelaser.maddi.cst.impl.output.SymbolEnum; -import java.util.HashSet; -import java.util.List; -import java.util.Objects; -import java.util.Set; -import java.util.function.Predicate; -import java.util.stream.Collectors; -import java.util.stream.Stream; - public class BinaryOperatorImpl extends ExpressionImpl implements BinaryOperator { protected final MethodInfo operator; diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/BitwiseNegationImpl.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/BitwiseNegationImpl.java index 1d5e554dec..3fb4c8ac1d 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/BitwiseNegationImpl.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/BitwiseNegationImpl.java @@ -17,18 +17,17 @@ package io.codelaser.maddi.cst.impl.expression; +import java.util.List; + import io.codelaser.maddi.cst.api.element.Comment; import io.codelaser.maddi.cst.api.element.Source; import io.codelaser.maddi.cst.api.expression.BitwiseNegation; import io.codelaser.maddi.cst.api.expression.Expression; import io.codelaser.maddi.cst.api.expression.Precedence; -import io.codelaser.maddi.cst.api.info.InfoMap; import io.codelaser.maddi.cst.api.info.InfoMapView; import io.codelaser.maddi.cst.api.info.MethodInfo; import io.codelaser.maddi.util.IntUtil; -import java.util.List; - public class BitwiseNegationImpl extends UnaryOperatorImpl implements BitwiseNegation { public BitwiseNegationImpl(List comments, Source source, MethodInfo operator, Precedence precedence, Expression expression) { diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/BooleanConstantImpl.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/BooleanConstantImpl.java index 86840394a9..79f7a86855 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/BooleanConstantImpl.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/BooleanConstantImpl.java @@ -17,6 +17,8 @@ package io.codelaser.maddi.cst.impl.expression; +import java.util.List; + import io.codelaser.maddi.cst.api.element.Comment; import io.codelaser.maddi.cst.api.element.Source; import io.codelaser.maddi.cst.api.expression.BooleanConstant; @@ -29,8 +31,6 @@ import io.codelaser.maddi.cst.impl.output.OutputBuilderImpl; import io.codelaser.maddi.cst.impl.output.TextImpl; -import java.util.List; - public class BooleanConstantImpl extends ConstantExpressionImpl implements BooleanConstant { private final ParameterizedType booleanPt; private final boolean constant; diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/ByteConstantImpl.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/ByteConstantImpl.java index f4a99df402..be5c30a06a 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/ByteConstantImpl.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/ByteConstantImpl.java @@ -17,11 +17,12 @@ package io.codelaser.maddi.cst.impl.expression; +import java.util.List; + import io.codelaser.maddi.cst.api.element.Comment; import io.codelaser.maddi.cst.api.element.Source; import io.codelaser.maddi.cst.api.expression.ByteConstant; import io.codelaser.maddi.cst.api.expression.Expression; -import io.codelaser.maddi.cst.api.expression.IntConstant; import io.codelaser.maddi.cst.api.expression.Numeric; import io.codelaser.maddi.cst.api.output.OutputBuilder; import io.codelaser.maddi.cst.api.output.Qualification; @@ -31,8 +32,6 @@ import io.codelaser.maddi.cst.impl.output.OutputBuilderImpl; import io.codelaser.maddi.cst.impl.output.TextImpl; -import java.util.List; - public class ByteConstantImpl extends ConstantExpressionImpl implements Numeric, ByteConstant { private final byte value; diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/CastImpl.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/CastImpl.java index 8c446dbc90..e74332b7fc 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/CastImpl.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/CastImpl.java @@ -17,6 +17,11 @@ package io.codelaser.maddi.cst.impl.expression; +import java.util.List; +import java.util.Objects; +import java.util.function.Predicate; +import java.util.stream.Stream; + import io.codelaser.maddi.cst.api.element.Comment; import io.codelaser.maddi.cst.api.element.Element; import io.codelaser.maddi.cst.api.element.Source; @@ -24,7 +29,6 @@ import io.codelaser.maddi.cst.api.expression.Cast; import io.codelaser.maddi.cst.api.expression.Expression; import io.codelaser.maddi.cst.api.expression.Precedence; -import io.codelaser.maddi.cst.api.info.InfoMap; import io.codelaser.maddi.cst.api.info.InfoMapView; import io.codelaser.maddi.cst.api.output.OutputBuilder; import io.codelaser.maddi.cst.api.output.Qualification; @@ -39,11 +43,6 @@ import io.codelaser.maddi.cst.impl.output.SymbolEnum; import io.codelaser.maddi.cst.impl.type.DiamondEnum; -import java.util.List; -import java.util.Objects; -import java.util.function.Predicate; -import java.util.stream.Stream; - public class CastImpl extends ExpressionImpl implements Cast { private final Expression expression; private final ParameterizedType parameterizedType; diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/CharConstantImpl.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/CharConstantImpl.java index 3eab24501f..83b45ad3ef 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/CharConstantImpl.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/CharConstantImpl.java @@ -17,6 +17,8 @@ package io.codelaser.maddi.cst.impl.expression; +import java.util.List; + import io.codelaser.maddi.cst.api.element.Comment; import io.codelaser.maddi.cst.api.element.Source; import io.codelaser.maddi.cst.api.expression.CharConstant; @@ -29,8 +31,6 @@ import io.codelaser.maddi.cst.impl.output.OutputBuilderImpl; import io.codelaser.maddi.cst.impl.output.TextImpl; -import java.util.List; - public class CharConstantImpl extends ConstantExpressionImpl implements CharConstant { private final char constant; diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/ClassExpressionImpl.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/ClassExpressionImpl.java index 2c0c9cb08b..4ea4945534 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/ClassExpressionImpl.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/ClassExpressionImpl.java @@ -17,6 +17,11 @@ package io.codelaser.maddi.cst.impl.expression; +import java.util.List; +import java.util.Objects; +import java.util.function.Predicate; +import java.util.stream.Stream; + import io.codelaser.maddi.cst.api.element.Comment; import io.codelaser.maddi.cst.api.element.Element; import io.codelaser.maddi.cst.api.element.Source; @@ -35,11 +40,6 @@ import io.codelaser.maddi.cst.impl.output.SymbolEnum; import io.codelaser.maddi.cst.impl.type.DiamondEnum; -import java.util.List; -import java.util.Objects; -import java.util.function.Predicate; -import java.util.stream.Stream; - public class ClassExpressionImpl extends ConstantExpressionImpl implements ClassExpression { public final ParameterizedType parameterizedType; // String.class -> String public final ParameterizedType classType; // String.class -> Class diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/CommaExpressionImpl.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/CommaExpressionImpl.java index c9ae1fb80a..dcf6ac1ffb 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/CommaExpressionImpl.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/CommaExpressionImpl.java @@ -17,6 +17,11 @@ package io.codelaser.maddi.cst.impl.expression; +import java.util.ArrayList; +import java.util.List; +import java.util.function.Predicate; +import java.util.stream.Stream; + import io.codelaser.maddi.cst.api.element.Comment; import io.codelaser.maddi.cst.api.element.Element; import io.codelaser.maddi.cst.api.element.Source; @@ -24,7 +29,6 @@ import io.codelaser.maddi.cst.api.expression.CommaExpression; import io.codelaser.maddi.cst.api.expression.Expression; import io.codelaser.maddi.cst.api.expression.Precedence; -import io.codelaser.maddi.cst.api.info.InfoMap; import io.codelaser.maddi.cst.api.info.InfoMapView; import io.codelaser.maddi.cst.api.output.OutputBuilder; import io.codelaser.maddi.cst.api.output.Qualification; @@ -40,11 +44,6 @@ import io.codelaser.maddi.cst.impl.output.SymbolEnum; import io.codelaser.maddi.util.ListUtil; -import java.util.ArrayList; -import java.util.List; -import java.util.function.Predicate; -import java.util.stream.Stream; - public class CommaExpressionImpl extends ExpressionImpl implements CommaExpression { private final List expressions; diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/ConstantExpressionImpl.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/ConstantExpressionImpl.java index d1f8685e12..cc69990c36 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/ConstantExpressionImpl.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/ConstantExpressionImpl.java @@ -17,6 +17,10 @@ package io.codelaser.maddi.cst.impl.expression; +import java.util.List; +import java.util.function.Predicate; +import java.util.stream.Stream; + import io.codelaser.maddi.cst.api.element.Comment; import io.codelaser.maddi.cst.api.element.Element; import io.codelaser.maddi.cst.api.element.Source; @@ -29,10 +33,6 @@ import io.codelaser.maddi.cst.api.variable.Variable; import io.codelaser.maddi.cst.impl.expression.util.PrecedenceEnum; -import java.util.List; -import java.util.function.Predicate; -import java.util.stream.Stream; - public abstract class ConstantExpressionImpl extends ExpressionImpl implements ConstantExpression { protected ConstantExpressionImpl(List comments, Source source, int complexity) { diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/ConstructorCallImpl.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/ConstructorCallImpl.java index 4c980eeb8c..be7a08b590 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/ConstructorCallImpl.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/ConstructorCallImpl.java @@ -17,7 +17,11 @@ package io.codelaser.maddi.cst.impl.expression; -import io.codelaser.maddi.cst.impl.type.ParameterizedTypePrinter; +import java.util.List; +import java.util.Objects; +import java.util.function.Predicate; +import java.util.stream.Stream; + import io.codelaser.maddi.annotation.rare.IgnoreModifications; import io.codelaser.maddi.cst.api.analysis.PropertyValueMap; import io.codelaser.maddi.cst.api.element.*; @@ -25,7 +29,6 @@ import io.codelaser.maddi.cst.api.expression.ConstructorCall; import io.codelaser.maddi.cst.api.expression.Expression; import io.codelaser.maddi.cst.api.expression.Precedence; -import io.codelaser.maddi.cst.api.info.InfoMap; import io.codelaser.maddi.cst.api.info.InfoMapView; import io.codelaser.maddi.cst.api.info.MethodInfo; import io.codelaser.maddi.cst.api.info.TypeInfo; @@ -44,13 +47,9 @@ import io.codelaser.maddi.cst.impl.expression.util.PrecedenceEnum; import io.codelaser.maddi.cst.impl.output.*; import io.codelaser.maddi.cst.impl.type.DiamondEnum; +import io.codelaser.maddi.cst.impl.type.ParameterizedTypePrinter; import io.codelaser.maddi.util.ListUtil; -import java.util.List; -import java.util.Objects; -import java.util.function.Predicate; -import java.util.stream.Stream; - public class ConstructorCallImpl extends ExpressionImpl implements ConstructorCall { private final MethodInfo constructor; private final Diamond diamond; diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/DivideImpl.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/DivideImpl.java index c63bb32a41..ddd4963d4e 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/DivideImpl.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/DivideImpl.java @@ -17,19 +17,18 @@ package io.codelaser.maddi.cst.impl.expression; +import java.util.List; + import io.codelaser.maddi.cst.api.element.Comment; import io.codelaser.maddi.cst.api.element.Source; import io.codelaser.maddi.cst.api.expression.Divide; import io.codelaser.maddi.cst.api.expression.Expression; import io.codelaser.maddi.cst.api.expression.Precedence; -import io.codelaser.maddi.cst.api.info.InfoMap; import io.codelaser.maddi.cst.api.info.InfoMapView; import io.codelaser.maddi.cst.api.info.MethodInfo; import io.codelaser.maddi.cst.api.runtime.Runtime; import io.codelaser.maddi.cst.api.type.ParameterizedType; -import java.util.List; - public class DivideImpl extends BinaryOperatorImpl implements Divide { public DivideImpl(List comments, Source source, MethodInfo operator, Precedence precedence, diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/DoubleConstantImpl.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/DoubleConstantImpl.java index ad14a79230..fad6e1d3d9 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/DoubleConstantImpl.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/DoubleConstantImpl.java @@ -17,6 +17,8 @@ package io.codelaser.maddi.cst.impl.expression; +import java.util.List; + import io.codelaser.maddi.cst.api.element.Comment; import io.codelaser.maddi.cst.api.element.Source; import io.codelaser.maddi.cst.api.expression.DoubleConstant; @@ -32,8 +34,6 @@ import io.codelaser.maddi.cst.impl.output.TextImpl; import io.codelaser.maddi.util.IntUtil; -import java.util.List; - public class DoubleConstantImpl extends ConstantExpressionImpl implements Numeric, DoubleConstant { private final double value; diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/EmptyExpressionImpl.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/EmptyExpressionImpl.java index e5150e42fe..8d5f82c457 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/EmptyExpressionImpl.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/EmptyExpressionImpl.java @@ -17,13 +17,16 @@ package io.codelaser.maddi.cst.impl.expression; +import java.util.Objects; +import java.util.function.Predicate; +import java.util.stream.Stream; + import io.codelaser.maddi.cst.api.element.Element; import io.codelaser.maddi.cst.api.element.Source; import io.codelaser.maddi.cst.api.element.Visitor; import io.codelaser.maddi.cst.api.expression.EmptyExpression; import io.codelaser.maddi.cst.api.expression.Expression; import io.codelaser.maddi.cst.api.expression.Precedence; -import io.codelaser.maddi.cst.api.info.InfoMap; import io.codelaser.maddi.cst.api.info.InfoMapView; import io.codelaser.maddi.cst.api.output.OutputBuilder; import io.codelaser.maddi.cst.api.output.Qualification; @@ -38,10 +41,6 @@ import io.codelaser.maddi.cst.impl.output.OutputBuilderImpl; import io.codelaser.maddi.cst.impl.output.TextImpl; -import java.util.Objects; -import java.util.function.Predicate; -import java.util.stream.Stream; - public class EmptyExpressionImpl extends ExpressionImpl implements EmptyExpression { public static final String EMPTY_EXPRESSION = ""; public static final String DEFAULT_EXPRESSION = ""; // negation of the disjunction of all earlier conditions diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/EnclosedExpressionImpl.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/EnclosedExpressionImpl.java index 2f5de965d0..4fd9e1eaad 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/EnclosedExpressionImpl.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/EnclosedExpressionImpl.java @@ -17,6 +17,11 @@ package io.codelaser.maddi.cst.impl.expression; +import java.util.List; +import java.util.Objects; +import java.util.function.Predicate; +import java.util.stream.Stream; + import io.codelaser.maddi.cst.api.element.Comment; import io.codelaser.maddi.cst.api.element.Element; import io.codelaser.maddi.cst.api.element.Source; @@ -24,7 +29,6 @@ import io.codelaser.maddi.cst.api.expression.EnclosedExpression; import io.codelaser.maddi.cst.api.expression.Expression; import io.codelaser.maddi.cst.api.expression.Precedence; -import io.codelaser.maddi.cst.api.info.InfoMap; import io.codelaser.maddi.cst.api.info.InfoMapView; import io.codelaser.maddi.cst.api.output.OutputBuilder; import io.codelaser.maddi.cst.api.output.Qualification; @@ -37,11 +41,6 @@ import io.codelaser.maddi.cst.impl.output.OutputBuilderImpl; import io.codelaser.maddi.cst.impl.output.SymbolEnum; -import java.util.List; -import java.util.Objects; -import java.util.function.Predicate; -import java.util.stream.Stream; - public class EnclosedExpressionImpl extends ExpressionImpl implements EnclosedExpression { private final Expression inner; diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/EqualsImpl.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/EqualsImpl.java index 57eebcd625..30310efac4 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/EqualsImpl.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/EqualsImpl.java @@ -17,20 +17,19 @@ package io.codelaser.maddi.cst.impl.expression; +import java.util.List; + import io.codelaser.maddi.cst.api.element.Comment; import io.codelaser.maddi.cst.api.element.Source; import io.codelaser.maddi.cst.api.expression.Equals; import io.codelaser.maddi.cst.api.expression.Expression; import io.codelaser.maddi.cst.api.expression.Precedence; -import io.codelaser.maddi.cst.api.info.InfoMap; import io.codelaser.maddi.cst.api.info.InfoMapView; import io.codelaser.maddi.cst.api.info.MethodInfo; import io.codelaser.maddi.cst.api.runtime.Runtime; import io.codelaser.maddi.cst.api.translate.TranslationMap; import io.codelaser.maddi.cst.api.type.ParameterizedType; -import java.util.List; - public class EqualsImpl extends BinaryOperatorImpl implements Equals { public EqualsImpl(List comments, Source source, MethodInfo operator, Precedence precedence, diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/ExpressionImpl.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/ExpressionImpl.java index 3f4d1a3117..fe4601f9be 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/ExpressionImpl.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/ExpressionImpl.java @@ -17,6 +17,8 @@ package io.codelaser.maddi.cst.impl.expression; +import java.util.List; + import io.codelaser.maddi.annotation.NotNull; import io.codelaser.maddi.cst.api.element.Comment; import io.codelaser.maddi.cst.api.element.Source; @@ -29,8 +31,6 @@ import io.codelaser.maddi.cst.impl.output.OutputBuilderImpl; import io.codelaser.maddi.cst.impl.output.SymbolEnum; -import java.util.List; - public abstract class ExpressionImpl extends ElementImpl implements Expression { private final int complexity; private final Source source; diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/FloatConstantImpl.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/FloatConstantImpl.java index 2d1e094ec5..62477d0b27 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/FloatConstantImpl.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/FloatConstantImpl.java @@ -17,11 +17,12 @@ package io.codelaser.maddi.cst.impl.expression; +import java.util.List; + import io.codelaser.maddi.cst.api.element.Comment; import io.codelaser.maddi.cst.api.element.Source; import io.codelaser.maddi.cst.api.expression.Expression; import io.codelaser.maddi.cst.api.expression.FloatConstant; -import io.codelaser.maddi.cst.api.expression.IntConstant; import io.codelaser.maddi.cst.api.expression.Numeric; import io.codelaser.maddi.cst.api.output.OutputBuilder; import io.codelaser.maddi.cst.api.output.Qualification; @@ -31,8 +32,6 @@ import io.codelaser.maddi.cst.impl.output.OutputBuilderImpl; import io.codelaser.maddi.cst.impl.output.TextImpl; -import java.util.List; - public class FloatConstantImpl extends ConstantExpressionImpl implements Numeric, FloatConstant { private final float value; diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/GreaterThanZeroImpl.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/GreaterThanZeroImpl.java index b07d8e1eb8..0699fed868 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/GreaterThanZeroImpl.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/GreaterThanZeroImpl.java @@ -17,12 +17,16 @@ package io.codelaser.maddi.cst.impl.expression; +import java.util.List; +import java.util.Objects; +import java.util.function.Predicate; +import java.util.stream.Stream; + import io.codelaser.maddi.cst.api.element.Comment; import io.codelaser.maddi.cst.api.element.Element; import io.codelaser.maddi.cst.api.element.Source; import io.codelaser.maddi.cst.api.element.Visitor; import io.codelaser.maddi.cst.api.expression.*; -import io.codelaser.maddi.cst.api.info.InfoMap; import io.codelaser.maddi.cst.api.info.InfoMapView; import io.codelaser.maddi.cst.api.output.OutputBuilder; import io.codelaser.maddi.cst.api.output.Qualification; @@ -41,11 +45,6 @@ import io.codelaser.maddi.cst.impl.output.TextImpl; import io.codelaser.maddi.util.IntUtil; -import java.util.List; -import java.util.Objects; -import java.util.function.Predicate; -import java.util.stream.Stream; - public class GreaterThanZeroImpl extends ExpressionImpl implements GreaterThanZero { private final Expression expression; private final boolean allowEquals; diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/InlineConditionalImpl.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/InlineConditionalImpl.java index 8effbbcb7d..5bb5d81119 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/InlineConditionalImpl.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/InlineConditionalImpl.java @@ -17,6 +17,11 @@ package io.codelaser.maddi.cst.impl.expression; +import java.util.List; +import java.util.Objects; +import java.util.function.Predicate; +import java.util.stream.Stream; + import io.codelaser.maddi.cst.api.element.Comment; import io.codelaser.maddi.cst.api.element.Element; import io.codelaser.maddi.cst.api.element.Source; @@ -25,7 +30,6 @@ import io.codelaser.maddi.cst.api.expression.InlineConditional; import io.codelaser.maddi.cst.api.expression.Negation; import io.codelaser.maddi.cst.api.expression.Precedence; -import io.codelaser.maddi.cst.api.info.InfoMap; import io.codelaser.maddi.cst.api.info.InfoMapView; import io.codelaser.maddi.cst.api.output.OutputBuilder; import io.codelaser.maddi.cst.api.output.Qualification; @@ -40,11 +44,6 @@ import io.codelaser.maddi.cst.impl.output.OutputBuilderImpl; import io.codelaser.maddi.cst.impl.output.SymbolEnum; -import java.util.List; -import java.util.Objects; -import java.util.function.Predicate; -import java.util.stream.Stream; - public class InlineConditionalImpl extends ExpressionImpl implements InlineConditional { private final Expression condition; diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/InstanceOfImpl.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/InstanceOfImpl.java index 9115b10d4b..fd2cb46c47 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/InstanceOfImpl.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/InstanceOfImpl.java @@ -17,6 +17,11 @@ package io.codelaser.maddi.cst.impl.expression; +import java.util.List; +import java.util.Objects; +import java.util.function.Predicate; +import java.util.stream.Stream; + import io.codelaser.maddi.annotation.rare.IgnoreModifications; import io.codelaser.maddi.cst.api.analysis.PropertyValueMap; import io.codelaser.maddi.cst.api.element.*; @@ -24,7 +29,6 @@ import io.codelaser.maddi.cst.api.expression.InstanceOf; import io.codelaser.maddi.cst.api.expression.Precedence; import io.codelaser.maddi.cst.api.expression.VariableExpression; -import io.codelaser.maddi.cst.api.info.InfoMap; import io.codelaser.maddi.cst.api.info.InfoMapView; import io.codelaser.maddi.cst.api.output.OutputBuilder; import io.codelaser.maddi.cst.api.output.Qualification; @@ -41,11 +45,6 @@ import io.codelaser.maddi.cst.impl.output.SymbolEnum; import io.codelaser.maddi.cst.impl.type.DiamondEnum; -import java.util.List; -import java.util.Objects; -import java.util.function.Predicate; -import java.util.stream.Stream; - public class InstanceOfImpl extends ExpressionImpl implements InstanceOf { private final Expression expression; private final ParameterizedType testType; diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/IntConstantImpl.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/IntConstantImpl.java index 7cad4f0b40..8426a2b2ee 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/IntConstantImpl.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/IntConstantImpl.java @@ -17,6 +17,8 @@ package io.codelaser.maddi.cst.impl.expression; +import java.util.List; + import io.codelaser.maddi.cst.api.element.Comment; import io.codelaser.maddi.cst.api.element.Source; import io.codelaser.maddi.cst.api.expression.Expression; @@ -30,8 +32,6 @@ import io.codelaser.maddi.cst.impl.output.OutputBuilderImpl; import io.codelaser.maddi.cst.impl.output.TextImpl; -import java.util.List; - public class IntConstantImpl extends ConstantExpressionImpl implements Numeric, IntConstant { private final int value; diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/LambdaImpl.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/LambdaImpl.java index 4b84f51a1a..993a037846 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/LambdaImpl.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/LambdaImpl.java @@ -17,15 +17,18 @@ package io.codelaser.maddi.cst.impl.expression; +import java.util.List; +import java.util.function.Predicate; +import java.util.stream.Stream; + import io.codelaser.maddi.cst.api.element.Comment; -import io.codelaser.maddi.cst.api.element.Element; import io.codelaser.maddi.cst.api.element.DetailedSources; +import io.codelaser.maddi.cst.api.element.Element; import io.codelaser.maddi.cst.api.element.Source; import io.codelaser.maddi.cst.api.element.Visitor; import io.codelaser.maddi.cst.api.expression.Expression; import io.codelaser.maddi.cst.api.expression.Lambda; import io.codelaser.maddi.cst.api.expression.Precedence; -import io.codelaser.maddi.cst.api.info.InfoMap; import io.codelaser.maddi.cst.api.info.InfoMapView; import io.codelaser.maddi.cst.api.info.MethodInfo; import io.codelaser.maddi.cst.api.info.ParameterInfo; @@ -48,10 +51,6 @@ import io.codelaser.maddi.cst.impl.output.SymbolEnum; import io.codelaser.maddi.cst.impl.type.DiamondEnum; -import java.util.List; -import java.util.function.Predicate; -import java.util.stream.Stream; - public class LambdaImpl extends ExpressionImpl implements Lambda { private final MethodInfo methodInfo; private final List outputVariants; diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/LongConstantImpl.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/LongConstantImpl.java index 8fb52d905f..1118dfa634 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/LongConstantImpl.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/LongConstantImpl.java @@ -17,6 +17,8 @@ package io.codelaser.maddi.cst.impl.expression; +import java.util.List; + import io.codelaser.maddi.cst.api.element.Comment; import io.codelaser.maddi.cst.api.element.Source; import io.codelaser.maddi.cst.api.expression.Expression; @@ -31,8 +33,6 @@ import io.codelaser.maddi.cst.impl.output.OutputBuilderImpl; import io.codelaser.maddi.cst.impl.output.TextImpl; -import java.util.List; - public class LongConstantImpl extends ConstantExpressionImpl implements Numeric, LongConstant { private final long value; diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/MethodCallImpl.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/MethodCallImpl.java index abe3c29cc6..7d95c3eccc 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/MethodCallImpl.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/MethodCallImpl.java @@ -17,6 +17,11 @@ package io.codelaser.maddi.cst.impl.expression; +import java.util.List; +import java.util.Objects; +import java.util.function.Predicate; +import java.util.stream.Stream; + import io.codelaser.maddi.annotation.rare.IgnoreModifications; import io.codelaser.maddi.cst.api.analysis.PropertyValueMap; import io.codelaser.maddi.cst.api.element.Comment; @@ -24,7 +29,6 @@ import io.codelaser.maddi.cst.api.element.Source; import io.codelaser.maddi.cst.api.element.Visitor; import io.codelaser.maddi.cst.api.expression.*; -import io.codelaser.maddi.cst.api.info.InfoMap; import io.codelaser.maddi.cst.api.info.InfoMapView; import io.codelaser.maddi.cst.api.info.MethodInfo; import io.codelaser.maddi.cst.api.info.TypeInfo; @@ -44,11 +48,6 @@ import io.codelaser.maddi.cst.impl.output.*; import io.codelaser.maddi.cst.impl.type.DiamondEnum; -import java.util.List; -import java.util.Objects; -import java.util.function.Predicate; -import java.util.stream.Stream; - public class MethodCallImpl extends ExpressionImpl implements MethodCall { private final Expression object; private final boolean objectIsImplicit; diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/MethodReferenceImpl.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/MethodReferenceImpl.java index 661aebe34b..124cc16e35 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/MethodReferenceImpl.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/MethodReferenceImpl.java @@ -17,6 +17,12 @@ package io.codelaser.maddi.cst.impl.expression; +import java.util.ArrayList; +import java.util.List; +import java.util.Objects; +import java.util.function.Predicate; +import java.util.stream.Stream; + import io.codelaser.maddi.cst.api.element.Comment; import io.codelaser.maddi.cst.api.element.Element; import io.codelaser.maddi.cst.api.element.Source; @@ -24,14 +30,12 @@ import io.codelaser.maddi.cst.api.expression.Expression; import io.codelaser.maddi.cst.api.expression.MethodReference; import io.codelaser.maddi.cst.api.expression.Precedence; -import io.codelaser.maddi.cst.api.info.InfoMap; +import io.codelaser.maddi.cst.api.expression.TypeExpression; import io.codelaser.maddi.cst.api.info.InfoMapView; import io.codelaser.maddi.cst.api.info.MethodInfo; import io.codelaser.maddi.cst.api.output.OutputBuilder; import io.codelaser.maddi.cst.api.output.Qualification; import io.codelaser.maddi.cst.api.translate.TranslationMap; -import io.codelaser.maddi.cst.api.expression.TypeExpression; -import io.codelaser.maddi.cst.impl.type.DiamondEnum; import io.codelaser.maddi.cst.api.type.ParameterizedType; import io.codelaser.maddi.cst.api.variable.DescendMode; import io.codelaser.maddi.cst.api.variable.Variable; @@ -42,12 +46,7 @@ import io.codelaser.maddi.cst.impl.output.OutputBuilderImpl; import io.codelaser.maddi.cst.impl.output.SymbolEnum; import io.codelaser.maddi.cst.impl.output.TextImpl; - -import java.util.ArrayList; -import java.util.List; -import java.util.Objects; -import java.util.function.Predicate; -import java.util.stream.Stream; +import io.codelaser.maddi.cst.impl.type.DiamondEnum; public class MethodReferenceImpl extends ExpressionImpl implements MethodReference { private final ParameterizedType parameterizedType; diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/NegationImpl.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/NegationImpl.java index 98720481c1..d1bbca3ec5 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/NegationImpl.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/NegationImpl.java @@ -17,13 +17,14 @@ package io.codelaser.maddi.cst.impl.expression; +import java.util.List; + import io.codelaser.maddi.cst.api.element.Comment; import io.codelaser.maddi.cst.api.element.Source; import io.codelaser.maddi.cst.api.expression.Equals; import io.codelaser.maddi.cst.api.expression.Expression; import io.codelaser.maddi.cst.api.expression.Negation; import io.codelaser.maddi.cst.api.expression.Precedence; -import io.codelaser.maddi.cst.api.info.InfoMap; import io.codelaser.maddi.cst.api.info.InfoMapView; import io.codelaser.maddi.cst.api.info.MethodInfo; import io.codelaser.maddi.cst.api.output.OutputBuilder; @@ -32,8 +33,6 @@ import io.codelaser.maddi.cst.impl.output.OutputBuilderImpl; import io.codelaser.maddi.cst.impl.output.SymbolEnum; -import java.util.List; - public class NegationImpl extends UnaryOperatorImpl implements Negation { public NegationImpl(MethodInfo operator, Precedence precedence, Expression expression) { diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/NullConstantImpl.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/NullConstantImpl.java index d791ecb9e1..f802f98e6e 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/NullConstantImpl.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/NullConstantImpl.java @@ -17,6 +17,8 @@ package io.codelaser.maddi.cst.impl.expression; +import java.util.List; + import io.codelaser.maddi.cst.api.element.Comment; import io.codelaser.maddi.cst.api.element.Source; import io.codelaser.maddi.cst.api.expression.Expression; @@ -28,8 +30,6 @@ import io.codelaser.maddi.cst.impl.output.KeywordImpl; import io.codelaser.maddi.cst.impl.output.OutputBuilderImpl; -import java.util.List; - public class NullConstantImpl extends ConstantExpressionImpl implements NullConstant { private final ParameterizedType parameterizedType; diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/OrImpl.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/OrImpl.java index a0f0685dba..a47f0faa1a 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/OrImpl.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/OrImpl.java @@ -17,6 +17,12 @@ package io.codelaser.maddi.cst.impl.expression; +import java.util.ArrayList; +import java.util.List; +import java.util.Objects; +import java.util.function.Predicate; +import java.util.stream.Stream; + import io.codelaser.maddi.annotation.rare.IgnoreModifications; import io.codelaser.maddi.cst.api.element.Comment; import io.codelaser.maddi.cst.api.element.Element; @@ -25,7 +31,6 @@ import io.codelaser.maddi.cst.api.expression.Expression; import io.codelaser.maddi.cst.api.expression.Or; import io.codelaser.maddi.cst.api.expression.Precedence; -import io.codelaser.maddi.cst.api.info.InfoMap; import io.codelaser.maddi.cst.api.info.InfoMapView; import io.codelaser.maddi.cst.api.output.OutputBuilder; import io.codelaser.maddi.cst.api.output.Qualification; @@ -41,12 +46,6 @@ import io.codelaser.maddi.cst.impl.output.SymbolEnum; import io.codelaser.maddi.util.ListUtil; -import java.util.ArrayList; -import java.util.List; -import java.util.Objects; -import java.util.function.Predicate; -import java.util.stream.Stream; - public class OrImpl extends ExpressionImpl implements Or { diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/ProductImpl.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/ProductImpl.java index 9aad2503bf..8d36349e09 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/ProductImpl.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/ProductImpl.java @@ -17,20 +17,19 @@ package io.codelaser.maddi.cst.impl.expression; +import java.util.List; + import io.codelaser.maddi.cst.api.element.Comment; import io.codelaser.maddi.cst.api.element.Source; import io.codelaser.maddi.cst.api.expression.Expression; import io.codelaser.maddi.cst.api.expression.Precedence; import io.codelaser.maddi.cst.api.expression.Product; -import io.codelaser.maddi.cst.api.info.InfoMap; import io.codelaser.maddi.cst.api.info.InfoMapView; import io.codelaser.maddi.cst.api.info.MethodInfo; import io.codelaser.maddi.cst.api.runtime.Runtime; import io.codelaser.maddi.cst.api.translate.TranslationMap; import io.codelaser.maddi.cst.api.type.ParameterizedType; -import java.util.List; - public class ProductImpl extends BinaryOperatorImpl implements Product { public ProductImpl(Runtime runtime, Expression lhs, Expression rhs) { diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/RemainderImpl.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/RemainderImpl.java index 238616e6e2..3f08f5a328 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/RemainderImpl.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/RemainderImpl.java @@ -17,20 +17,18 @@ package io.codelaser.maddi.cst.impl.expression; +import java.util.List; + import io.codelaser.maddi.cst.api.element.Comment; import io.codelaser.maddi.cst.api.element.Source; -import io.codelaser.maddi.cst.api.expression.Divide; import io.codelaser.maddi.cst.api.expression.Expression; import io.codelaser.maddi.cst.api.expression.Precedence; import io.codelaser.maddi.cst.api.expression.Remainder; -import io.codelaser.maddi.cst.api.info.InfoMap; import io.codelaser.maddi.cst.api.info.InfoMapView; import io.codelaser.maddi.cst.api.info.MethodInfo; import io.codelaser.maddi.cst.api.runtime.Runtime; import io.codelaser.maddi.cst.api.type.ParameterizedType; -import java.util.List; - public class RemainderImpl extends BinaryOperatorImpl implements Remainder { public RemainderImpl(List comments, Source source, MethodInfo operator, Precedence precedence, diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/ShortConstantImpl.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/ShortConstantImpl.java index 83e52a5f6b..cd2780cb0b 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/ShortConstantImpl.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/ShortConstantImpl.java @@ -17,6 +17,8 @@ package io.codelaser.maddi.cst.impl.expression; +import java.util.List; + import io.codelaser.maddi.cst.api.element.Comment; import io.codelaser.maddi.cst.api.element.Source; import io.codelaser.maddi.cst.api.expression.Expression; @@ -30,8 +32,6 @@ import io.codelaser.maddi.cst.impl.output.OutputBuilderImpl; import io.codelaser.maddi.cst.impl.output.TextImpl; -import java.util.List; - public class ShortConstantImpl extends ConstantExpressionImpl implements Numeric, ShortConstant { private final short value; diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/StringConcatImpl.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/StringConcatImpl.java index a61850ad2c..09e5ea407e 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/StringConcatImpl.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/StringConcatImpl.java @@ -17,22 +17,19 @@ package io.codelaser.maddi.cst.impl.expression; +import java.util.List; + import io.codelaser.maddi.cst.api.element.Comment; import io.codelaser.maddi.cst.api.element.Source; import io.codelaser.maddi.cst.api.expression.Expression; import io.codelaser.maddi.cst.api.expression.Precedence; import io.codelaser.maddi.cst.api.expression.StringConcat; -import io.codelaser.maddi.cst.api.info.InfoMap; import io.codelaser.maddi.cst.api.info.InfoMapView; import io.codelaser.maddi.cst.api.info.MethodInfo; -import io.codelaser.maddi.cst.api.runtime.Factory; import io.codelaser.maddi.cst.api.runtime.Predefined; -import io.codelaser.maddi.cst.api.runtime.Runtime; import io.codelaser.maddi.cst.api.type.ParameterizedType; import io.codelaser.maddi.cst.impl.expression.util.PrecedenceEnum; -import java.util.List; - public class StringConcatImpl extends BinaryOperatorImpl implements StringConcat { public StringConcatImpl(List comments, Source source, MethodInfo operator, Precedence precedence, Expression lhs, Expression rhs, ParameterizedType parameterizedType) { diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/StringConstantImpl.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/StringConstantImpl.java index 679d0718c3..965b3d2cd8 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/StringConstantImpl.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/StringConstantImpl.java @@ -17,6 +17,9 @@ package io.codelaser.maddi.cst.impl.expression; +import java.util.List; +import java.util.Objects; + import io.codelaser.maddi.cst.api.element.Comment; import io.codelaser.maddi.cst.api.element.Source; import io.codelaser.maddi.cst.api.expression.Expression; @@ -30,9 +33,6 @@ import io.codelaser.maddi.cst.impl.output.TextImpl; import io.codelaser.maddi.util.StringUtil; -import java.util.List; -import java.util.Objects; - public class StringConstantImpl extends ConstantExpressionImpl implements StringConstant { private final ParameterizedType stringPt; private final String constant; diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/SumImpl.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/SumImpl.java index 3eb6672c43..93dca990ec 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/SumImpl.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/SumImpl.java @@ -17,10 +17,11 @@ package io.codelaser.maddi.cst.impl.expression; +import java.util.List; + import io.codelaser.maddi.cst.api.element.Comment; import io.codelaser.maddi.cst.api.element.Source; import io.codelaser.maddi.cst.api.expression.*; -import io.codelaser.maddi.cst.api.info.InfoMap; import io.codelaser.maddi.cst.api.info.InfoMapView; import io.codelaser.maddi.cst.api.info.MethodInfo; import io.codelaser.maddi.cst.api.output.OutputBuilder; @@ -32,8 +33,6 @@ import io.codelaser.maddi.cst.impl.output.OutputBuilderImpl; import io.codelaser.maddi.cst.impl.output.SymbolEnum; -import java.util.List; - public class SumImpl extends BinaryOperatorImpl implements Sum { diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/SwitchExpressionImpl.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/SwitchExpressionImpl.java index 26f7f8bdbf..0dd27e80f8 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/SwitchExpressionImpl.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/SwitchExpressionImpl.java @@ -17,6 +17,12 @@ package io.codelaser.maddi.cst.impl.expression; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import java.util.function.Predicate; +import java.util.stream.Stream; + import io.codelaser.maddi.cst.api.element.Comment; import io.codelaser.maddi.cst.api.element.Element; import io.codelaser.maddi.cst.api.element.Source; @@ -24,7 +30,6 @@ import io.codelaser.maddi.cst.api.expression.Expression; import io.codelaser.maddi.cst.api.expression.Precedence; import io.codelaser.maddi.cst.api.expression.SwitchExpression; -import io.codelaser.maddi.cst.api.info.InfoMap; import io.codelaser.maddi.cst.api.info.InfoMapView; import io.codelaser.maddi.cst.api.output.OutputBuilder; import io.codelaser.maddi.cst.api.output.Qualification; @@ -42,12 +47,6 @@ import io.codelaser.maddi.cst.impl.output.OutputBuilderImpl; import io.codelaser.maddi.cst.impl.output.SymbolEnum; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; -import java.util.function.Predicate; -import java.util.stream.Stream; - public class SwitchExpressionImpl extends ExpressionImpl implements SwitchExpression { private final Expression selector; private final List entries; diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/TextBlockImpl.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/TextBlockImpl.java index 0f6b798ef3..3b0c1e079b 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/TextBlockImpl.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/TextBlockImpl.java @@ -17,6 +17,8 @@ package io.codelaser.maddi.cst.impl.expression; +import java.util.List; + import io.codelaser.maddi.cst.api.element.Comment; import io.codelaser.maddi.cst.api.element.Source; import io.codelaser.maddi.cst.api.expression.Expression; @@ -28,8 +30,6 @@ import io.codelaser.maddi.cst.impl.output.OutputBuilderImpl; import io.codelaser.maddi.cst.impl.output.TextImpl; -import java.util.List; - public class TextBlockImpl extends StringConstantImpl implements TextBlock { private final TextBlockFormatting textBlockFormatting; diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/TypeExpressionImpl.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/TypeExpressionImpl.java index f952cbccff..438ecccf9d 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/TypeExpressionImpl.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/TypeExpressionImpl.java @@ -17,11 +17,17 @@ package io.codelaser.maddi.cst.impl.expression; +import static io.codelaser.maddi.cst.api.element.Element.TypeReferenceNature.EXPLICIT; + +import java.util.List; +import java.util.Objects; +import java.util.function.Predicate; +import java.util.stream.Stream; + import io.codelaser.maddi.cst.api.element.*; import io.codelaser.maddi.cst.api.expression.Expression; import io.codelaser.maddi.cst.api.expression.Precedence; import io.codelaser.maddi.cst.api.expression.TypeExpression; -import io.codelaser.maddi.cst.api.info.InfoMap; import io.codelaser.maddi.cst.api.info.InfoMapView; import io.codelaser.maddi.cst.api.info.TypeInfo; import io.codelaser.maddi.cst.api.output.OutputBuilder; @@ -37,13 +43,6 @@ import io.codelaser.maddi.cst.impl.expression.util.PrecedenceEnum; import io.codelaser.maddi.cst.impl.output.OutputBuilderImpl; -import java.util.List; -import java.util.Objects; -import java.util.function.Predicate; -import java.util.stream.Stream; - -import static io.codelaser.maddi.cst.api.element.Element.TypeReferenceNature.EXPLICIT; - public class TypeExpressionImpl extends ExpressionImpl implements TypeExpression { public final ParameterizedType parameterizedType; public final Diamond diamond; diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/UnaryOperatorImpl.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/UnaryOperatorImpl.java index f97811785d..d27130bc44 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/UnaryOperatorImpl.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/UnaryOperatorImpl.java @@ -17,6 +17,11 @@ package io.codelaser.maddi.cst.impl.expression; +import java.util.List; +import java.util.Objects; +import java.util.function.Predicate; +import java.util.stream.Stream; + import io.codelaser.maddi.annotation.NotNull; import io.codelaser.maddi.annotation.rare.IgnoreModifications; import io.codelaser.maddi.cst.api.element.Comment; @@ -26,7 +31,6 @@ import io.codelaser.maddi.cst.api.expression.Expression; import io.codelaser.maddi.cst.api.expression.Precedence; import io.codelaser.maddi.cst.api.expression.UnaryOperator; -import io.codelaser.maddi.cst.api.info.InfoMap; import io.codelaser.maddi.cst.api.info.InfoMapView; import io.codelaser.maddi.cst.api.info.MethodInfo; import io.codelaser.maddi.cst.api.output.OutputBuilder; @@ -39,11 +43,6 @@ import io.codelaser.maddi.cst.impl.output.OutputBuilderImpl; import io.codelaser.maddi.cst.impl.output.SymbolEnum; -import java.util.List; -import java.util.Objects; -import java.util.function.Predicate; -import java.util.stream.Stream; - public class UnaryOperatorImpl extends ExpressionImpl implements UnaryOperator { public final Expression expression; public final Precedence precedence; diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/VariableExpressionImpl.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/VariableExpressionImpl.java index ae87b271c1..413b062344 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/VariableExpressionImpl.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/VariableExpressionImpl.java @@ -17,6 +17,11 @@ package io.codelaser.maddi.cst.impl.expression; +import java.util.List; +import java.util.Objects; +import java.util.function.Predicate; +import java.util.stream.Stream; + import io.codelaser.maddi.cst.api.element.Comment; import io.codelaser.maddi.cst.api.element.Element; import io.codelaser.maddi.cst.api.element.Source; @@ -24,7 +29,6 @@ import io.codelaser.maddi.cst.api.expression.Expression; import io.codelaser.maddi.cst.api.expression.Precedence; import io.codelaser.maddi.cst.api.expression.VariableExpression; -import io.codelaser.maddi.cst.api.info.InfoMap; import io.codelaser.maddi.cst.api.info.InfoMapView; import io.codelaser.maddi.cst.api.output.OutputBuilder; import io.codelaser.maddi.cst.api.output.Qualification; @@ -39,11 +43,6 @@ import io.codelaser.maddi.cst.impl.output.OutputBuilderImpl; import io.codelaser.maddi.cst.impl.output.TextImpl; -import java.util.List; -import java.util.Objects; -import java.util.function.Predicate; -import java.util.stream.Stream; - public class VariableExpressionImpl extends ExpressionImpl implements VariableExpression { private final Variable variable; diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/eval/EvalAnd.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/eval/EvalAnd.java index 465ea3298d..8623f3b40e 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/eval/EvalAnd.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/eval/EvalAnd.java @@ -17,6 +17,13 @@ package io.codelaser.maddi.cst.impl.expression.eval; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import io.codelaser.maddi.cst.api.expression.*; import io.codelaser.maddi.cst.api.runtime.Runtime; import io.codelaser.maddi.cst.api.variable.Variable; @@ -26,12 +33,6 @@ import io.codelaser.maddi.cst.impl.expression.util.InequalitySolver; import io.codelaser.maddi.cst.impl.expression.util.LhsRhs; import io.codelaser.maddi.util.IntUtil; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; public class EvalAnd { private static final Logger LOGGER = LoggerFactory.getLogger(EvalAnd.class); diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/eval/EvalBoolean.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/eval/EvalBoolean.java index 629880191d..81e698772b 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/eval/EvalBoolean.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/eval/EvalBoolean.java @@ -17,12 +17,6 @@ package io.codelaser.maddi.cst.impl.expression.eval; -import io.codelaser.maddi.cst.api.expression.And; -import io.codelaser.maddi.cst.api.expression.Expression; -import io.codelaser.maddi.cst.api.expression.Negation; -import io.codelaser.maddi.cst.api.expression.Or; -import io.codelaser.maddi.cst.api.runtime.Runtime; - import java.util.Collection; import java.util.HashMap; import java.util.List; @@ -30,6 +24,12 @@ import java.util.Set; import java.util.stream.Collectors; +import io.codelaser.maddi.cst.api.expression.And; +import io.codelaser.maddi.cst.api.expression.Expression; +import io.codelaser.maddi.cst.api.expression.Negation; +import io.codelaser.maddi.cst.api.expression.Or; +import io.codelaser.maddi.cst.api.runtime.Runtime; + public class EvalBoolean { private final Runtime runtime; private final EvalNegation evalNegation; diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/eval/EvalConstant.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/eval/EvalConstant.java index 1f3185becb..d4d8324e42 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/eval/EvalConstant.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/eval/EvalConstant.java @@ -17,12 +17,12 @@ package io.codelaser.maddi.cst.impl.expression.eval; +import java.util.Objects; + import io.codelaser.maddi.cst.api.expression.*; import io.codelaser.maddi.cst.api.runtime.Runtime; import io.codelaser.maddi.util.IntUtil; -import java.util.Objects; - public class EvalConstant { private final Runtime runtime; diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/eval/EvalDivide.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/eval/EvalDivide.java index fc5ff97e5a..7cfbcfb0f6 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/eval/EvalDivide.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/eval/EvalDivide.java @@ -23,7 +23,6 @@ import io.codelaser.maddi.cst.api.expression.Numeric; import io.codelaser.maddi.cst.api.runtime.Runtime; import io.codelaser.maddi.cst.impl.expression.DivideImpl; -import io.codelaser.maddi.cst.impl.expression.IntConstantImpl; public class EvalDivide { private final Runtime runtime; diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/eval/EvalEquals.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/eval/EvalEquals.java index adc5062274..8b0dc717a5 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/eval/EvalEquals.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/eval/EvalEquals.java @@ -17,15 +17,14 @@ package io.codelaser.maddi.cst.impl.expression.eval; -import io.codelaser.maddi.cst.api.expression.*; -import io.codelaser.maddi.cst.api.info.MethodInfo; -import io.codelaser.maddi.cst.api.runtime.Runtime; -import io.codelaser.maddi.cst.impl.expression.EqualsImpl; - import java.util.Arrays; import java.util.List; import java.util.stream.Stream; +import io.codelaser.maddi.cst.api.expression.*; +import io.codelaser.maddi.cst.api.runtime.Runtime; +import io.codelaser.maddi.cst.impl.expression.EqualsImpl; + public class EvalEquals { private final Runtime runtime; diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/eval/EvalInequality.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/eval/EvalInequality.java index e91ba40ae9..817be88d53 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/eval/EvalInequality.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/eval/EvalInequality.java @@ -17,12 +17,12 @@ package io.codelaser.maddi.cst.impl.expression.eval; +import java.util.Arrays; + import io.codelaser.maddi.cst.api.expression.*; import io.codelaser.maddi.cst.api.runtime.Runtime; import io.codelaser.maddi.util.IntUtil; -import java.util.Arrays; - public class EvalInequality { private final Runtime runtime; diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/eval/EvalInlineConditional.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/eval/EvalInlineConditional.java index 2f49141f60..b5cba64fee 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/eval/EvalInlineConditional.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/eval/EvalInlineConditional.java @@ -17,13 +17,13 @@ package io.codelaser.maddi.cst.impl.expression.eval; +import java.util.concurrent.atomic.AtomicBoolean; + import io.codelaser.maddi.cst.api.expression.*; import io.codelaser.maddi.cst.api.runtime.Runtime; import io.codelaser.maddi.cst.api.variable.Variable; import io.codelaser.maddi.cst.impl.expression.util.LhsRhs; -import java.util.concurrent.atomic.AtomicBoolean; - public class EvalInlineConditional { private final Runtime runtime; diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/eval/EvalNegation.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/eval/EvalNegation.java index ab030e93c6..d5ad1bf583 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/eval/EvalNegation.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/eval/EvalNegation.java @@ -17,6 +17,10 @@ package io.codelaser.maddi.cst.impl.expression.eval; +import java.util.HashMap; +import java.util.List; +import java.util.Objects; + import io.codelaser.maddi.annotation.NotNull; import io.codelaser.maddi.annotation.rare.IgnoreModifications; import io.codelaser.maddi.cst.api.expression.*; @@ -25,10 +29,6 @@ import io.codelaser.maddi.cst.api.variable.LocalVariable; import io.codelaser.maddi.cst.impl.expression.NegationImpl; -import java.util.HashMap; -import java.util.List; -import java.util.Objects; - public class EvalNegation { private final Runtime runtime; private final EvalOptions evalOptions; diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/eval/EvalOr.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/eval/EvalOr.java index 22f3a360cd..0d2e58f26e 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/eval/EvalOr.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/eval/EvalOr.java @@ -17,17 +17,18 @@ package io.codelaser.maddi.cst.impl.expression.eval; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import io.codelaser.maddi.cst.api.expression.*; import io.codelaser.maddi.cst.api.runtime.Runtime; import io.codelaser.maddi.cst.impl.expression.OrImpl; import io.codelaser.maddi.cst.impl.expression.util.AndOrSorter; import io.codelaser.maddi.util.IntUtil; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; public class EvalOr { private static final Logger LOGGER = LoggerFactory.getLogger(EvalOr.class); diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/eval/EvalProduct.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/eval/EvalProduct.java index 7122c88de4..8042a22546 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/eval/EvalProduct.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/eval/EvalProduct.java @@ -17,14 +17,14 @@ package io.codelaser.maddi.cst.impl.expression.eval; +import java.util.stream.Stream; + import io.codelaser.maddi.cst.api.expression.Expression; import io.codelaser.maddi.cst.api.expression.Product; import io.codelaser.maddi.cst.api.expression.Sum; import io.codelaser.maddi.cst.api.runtime.Runtime; import io.codelaser.maddi.cst.impl.expression.ProductImpl; -import java.util.stream.Stream; - public class EvalProduct { private final Runtime runtime; diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/eval/EvalRemainder.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/eval/EvalRemainder.java index 9b53a2f4b2..0ab6a5880b 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/eval/EvalRemainder.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/eval/EvalRemainder.java @@ -21,7 +21,6 @@ import io.codelaser.maddi.cst.api.expression.IntConstant; import io.codelaser.maddi.cst.api.expression.Numeric; import io.codelaser.maddi.cst.api.runtime.Runtime; -import io.codelaser.maddi.cst.impl.expression.DivideImpl; import io.codelaser.maddi.cst.impl.expression.RemainderImpl; public class EvalRemainder { diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/eval/EvalSum.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/eval/EvalSum.java index 8d039b4d6b..76d783c576 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/eval/EvalSum.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/eval/EvalSum.java @@ -17,16 +17,16 @@ package io.codelaser.maddi.cst.impl.expression.eval; -import io.codelaser.maddi.cst.api.expression.*; -import io.codelaser.maddi.cst.api.runtime.Runtime; -import io.codelaser.maddi.cst.impl.expression.SumImpl; - import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.List; import java.util.stream.Stream; +import io.codelaser.maddi.cst.api.expression.*; +import io.codelaser.maddi.cst.api.runtime.Runtime; +import io.codelaser.maddi.cst.impl.expression.SumImpl; + public class EvalSum { private final Runtime runtime; diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/util/AndOrSorter.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/util/AndOrSorter.java index a1f96ce33b..6642044405 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/util/AndOrSorter.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/util/AndOrSorter.java @@ -18,15 +18,15 @@ package io.codelaser.maddi.cst.impl.expression.util; +import java.util.*; +import java.util.stream.Collectors; + import io.codelaser.maddi.cst.api.expression.*; import io.codelaser.maddi.cst.api.variable.Variable; import io.codelaser.maddi.cst.impl.expression.VariableExpressionImpl; import io.codelaser.maddi.cst.impl.expression.eval.EvalSwitches; import io.codelaser.maddi.cst.impl.variable.DescendModeEnum; -import java.util.*; -import java.util.stream.Collectors; - /* Full sorting of clauses in an "And" or "Or" is not allowed; we want, e.g., in != null before in.isEmpty() diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/util/ExpressionComparator.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/util/ExpressionComparator.java index e9304811dc..32d57272a1 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/util/ExpressionComparator.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/util/ExpressionComparator.java @@ -17,14 +17,15 @@ package io.codelaser.maddi.cst.impl.expression.util; -import io.codelaser.maddi.annotation.rare.IgnoreModifications; -import io.codelaser.maddi.cst.api.expression.Expression; -import io.codelaser.maddi.cst.api.expression.ExpressionWrapper; +import java.util.Comparator; +import java.util.IdentityHashMap; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.Comparator; -import java.util.IdentityHashMap; +import io.codelaser.maddi.annotation.rare.IgnoreModifications; +import io.codelaser.maddi.cst.api.expression.Expression; +import io.codelaser.maddi.cst.api.expression.ExpressionWrapper; public class ExpressionComparator implements Comparator { private static final Logger LOGGER = LoggerFactory.getLogger(ExpressionComparator.class); diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/util/ExtractComponentsOfTooComplex.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/util/ExtractComponentsOfTooComplex.java index 06846088df..15bb9b710f 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/util/ExtractComponentsOfTooComplex.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/util/ExtractComponentsOfTooComplex.java @@ -18,15 +18,15 @@ package io.codelaser.maddi.cst.impl.expression.util; +import java.util.HashSet; +import java.util.Set; +import java.util.function.Predicate; + import io.codelaser.maddi.cst.api.element.Element; import io.codelaser.maddi.cst.api.expression.*; import io.codelaser.maddi.cst.api.runtime.Runtime; import io.codelaser.maddi.cst.api.variable.Variable; -import java.util.HashSet; -import java.util.Set; -import java.util.function.Predicate; - public class ExtractComponentsOfTooComplex implements Predicate { final Set expressions = new HashSet<>(); final Set variablesToIgnore = new HashSet<>(); diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/util/InequalityHelper.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/util/InequalityHelper.java index 4cf84cfe15..847b571667 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/util/InequalityHelper.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/util/InequalityHelper.java @@ -18,12 +18,12 @@ package io.codelaser.maddi.cst.impl.expression.util; -import io.codelaser.maddi.cst.api.expression.*; -import io.codelaser.maddi.cst.api.expression.util.OneVariable; - import java.util.ArrayList; import java.util.List; +import io.codelaser.maddi.cst.api.expression.*; +import io.codelaser.maddi.cst.api.expression.util.OneVariable; + public class InequalityHelper { private record Term(double a, OneVariable v) { diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/util/InequalitySolver.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/util/InequalitySolver.java index 08820c0807..80c49870bd 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/util/InequalitySolver.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/util/InequalitySolver.java @@ -17,13 +17,13 @@ package io.codelaser.maddi.cst.impl.expression.util; +import java.util.*; +import java.util.concurrent.atomic.AtomicBoolean; + import io.codelaser.maddi.cst.api.expression.*; import io.codelaser.maddi.cst.api.expression.util.OneVariable; import io.codelaser.maddi.cst.api.runtime.Runtime; -import java.util.*; -import java.util.concurrent.atomic.AtomicBoolean; - /* very simple inequality solver diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/util/Interval.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/util/Interval.java index 436e940fe2..0e258c039b 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/util/Interval.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/util/Interval.java @@ -18,11 +18,11 @@ package io.codelaser.maddi.cst.impl.expression.util; +import java.util.List; + import io.codelaser.maddi.cst.api.expression.Expression; import io.codelaser.maddi.cst.api.expression.GreaterThanZero; -import java.util.List; - public record Interval(double left, boolean leftIncluded, double right, boolean rightIncluded) { public Interval { diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/util/LhsRhs.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/util/LhsRhs.java index 6d1d7ad88d..53521988c8 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/util/LhsRhs.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/util/LhsRhs.java @@ -18,13 +18,13 @@ package io.codelaser.maddi.cst.impl.expression.util; +import java.util.List; + import io.codelaser.maddi.cst.api.expression.And; import io.codelaser.maddi.cst.api.expression.Equals; import io.codelaser.maddi.cst.api.expression.Expression; import io.codelaser.maddi.cst.api.expression.MethodCall; -import java.util.List; - public record LhsRhs(Expression lhs, Expression rhs) { public static List extractEqualities(Expression e) { diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/util/LinearInequalityInOneVariable.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/util/LinearInequalityInOneVariable.java index 46f43add2a..5475ce2046 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/util/LinearInequalityInOneVariable.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/util/LinearInequalityInOneVariable.java @@ -17,11 +17,11 @@ package io.codelaser.maddi.cst.impl.expression.util; +import java.util.List; + import io.codelaser.maddi.cst.api.expression.Expression; import io.codelaser.maddi.cst.api.expression.util.OneVariable; -import java.util.List; - /* av + b >= 0 or av + b > 0 (we're not using x because IntelliJ complains passing y onto x) diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/util/LinearInequalityInTwoVariables.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/util/LinearInequalityInTwoVariables.java index 6cce63db29..b5f67d3e51 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/util/LinearInequalityInTwoVariables.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/expression/util/LinearInequalityInTwoVariables.java @@ -17,11 +17,11 @@ package io.codelaser.maddi.cst.impl.expression.util; +import java.util.List; + import io.codelaser.maddi.cst.api.expression.Expression; import io.codelaser.maddi.cst.api.expression.util.OneVariable; -import java.util.List; - public record LinearInequalityInTwoVariables(double a, OneVariable x, double b, diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/info/CompilationUnitPrinterImpl.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/info/CompilationUnitPrinterImpl.java index 899e08e319..d8bfa03e9b 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/info/CompilationUnitPrinterImpl.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/info/CompilationUnitPrinterImpl.java @@ -17,9 +17,11 @@ package io.codelaser.maddi.cst.impl.info; -import io.codelaser.maddi.cst.api.element.ModuleInfo; +import java.util.List; + import io.codelaser.maddi.cst.api.element.CompilationUnit; import io.codelaser.maddi.cst.api.element.ImportStatement; +import io.codelaser.maddi.cst.api.element.ModuleInfo; import io.codelaser.maddi.cst.api.element.Source; import io.codelaser.maddi.cst.api.info.CompilationUnitPrinter; import io.codelaser.maddi.cst.api.info.ImportComputer; @@ -29,8 +31,6 @@ import io.codelaser.maddi.cst.api.output.Qualification; import io.codelaser.maddi.cst.impl.output.*; -import java.util.List; - public record CompilationUnitPrinterImpl(CompilationUnit compilationUnit, boolean formatter2) implements CompilationUnitPrinter { diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/info/ComputeMethodOverridesImpl.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/info/ComputeMethodOverridesImpl.java index a63ad29117..c21ecd1f51 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/info/ComputeMethodOverridesImpl.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/info/ComputeMethodOverridesImpl.java @@ -17,17 +17,18 @@ package io.codelaser.maddi.cst.impl.info; -import io.codelaser.maddi.cst.api.info.*; -import io.codelaser.maddi.cst.api.runtime.Runtime; -import io.codelaser.maddi.cst.api.type.NamedType; -import io.codelaser.maddi.cst.api.type.ParameterizedType; +import java.util.*; +import java.util.concurrent.ConcurrentHashMap; +import java.util.stream.Stream; + import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.*; -import java.util.concurrent.ConcurrentHashMap; -import java.util.stream.Stream; +import io.codelaser.maddi.cst.api.info.*; +import io.codelaser.maddi.cst.api.runtime.Runtime; +import io.codelaser.maddi.cst.api.type.NamedType; +import io.codelaser.maddi.cst.api.type.ParameterizedType; public class ComputeMethodOverridesImpl implements ComputeMethodOverrides { private static final Logger LOGGER = LoggerFactory.getLogger(ComputeMethodOverridesImpl.class); diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/info/FieldInfoImpl.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/info/FieldInfoImpl.java index 60bbeac279..c608bd0d3c 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/info/FieldInfoImpl.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/info/FieldInfoImpl.java @@ -17,6 +17,12 @@ package io.codelaser.maddi.cst.impl.info; +import java.util.List; +import java.util.Objects; +import java.util.Set; +import java.util.function.Predicate; +import java.util.stream.Stream; + import io.codelaser.maddi.annotation.NotModified; import io.codelaser.maddi.cst.api.analysis.PropertyValueMap; import io.codelaser.maddi.cst.api.analysis.Value; @@ -24,7 +30,6 @@ import io.codelaser.maddi.cst.api.expression.AnnotationExpression; import io.codelaser.maddi.cst.api.expression.Expression; import io.codelaser.maddi.cst.api.info.*; - import io.codelaser.maddi.cst.api.output.OutputBuilder; import io.codelaser.maddi.cst.api.output.Qualification; import io.codelaser.maddi.cst.api.translate.TranslationMap; @@ -36,12 +41,6 @@ import io.codelaser.maddi.cst.impl.analysis.ValueImpl; import io.codelaser.maddi.support.EventuallyFinal; -import java.util.List; -import java.util.Objects; -import java.util.Set; -import java.util.function.Predicate; -import java.util.stream.Stream; - public class FieldInfoImpl extends InfoImpl implements FieldInfo { private final String name; diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/info/FieldInspection.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/info/FieldInspection.java index 1434933c46..0e4dfb5bd0 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/info/FieldInspection.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/info/FieldInspection.java @@ -17,13 +17,13 @@ package io.codelaser.maddi.cst.impl.info; +import java.util.Set; + import io.codelaser.maddi.annotation.Independent; import io.codelaser.maddi.cst.api.analysis.PropertyValueMap; import io.codelaser.maddi.cst.api.expression.Expression; import io.codelaser.maddi.cst.api.info.FieldModifier; -import java.util.Set; - public interface FieldInspection extends Inspection { /* diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/info/FieldInspectionImpl.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/info/FieldInspectionImpl.java index c98570bef2..c226f53a17 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/info/FieldInspectionImpl.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/info/FieldInspectionImpl.java @@ -18,6 +18,9 @@ package io.codelaser.maddi.cst.impl.info; +import java.util.HashSet; +import java.util.Set; + import io.codelaser.maddi.annotation.rare.IgnoreModifications; import io.codelaser.maddi.cst.api.analysis.PropertyValueMap; import io.codelaser.maddi.cst.api.expression.Expression; @@ -27,9 +30,6 @@ import io.codelaser.maddi.cst.api.type.ParameterizedType; import io.codelaser.maddi.cst.impl.analysis.PropertyValueMapImpl; -import java.util.HashSet; -import java.util.Set; - public class FieldInspectionImpl extends InspectionImpl implements FieldInspection { private final Set fieldModifiers; diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/info/FieldPrinterImpl.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/info/FieldPrinterImpl.java index 6bc85caf70..ce0eb7b868 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/info/FieldPrinterImpl.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/info/FieldPrinterImpl.java @@ -17,6 +17,11 @@ package io.codelaser.maddi.cst.impl.info; +import java.util.ArrayList; +import java.util.List; +import java.util.Set; +import java.util.stream.Stream; + import io.codelaser.maddi.cst.api.element.Comment; import io.codelaser.maddi.cst.api.element.DetailedSources; import io.codelaser.maddi.cst.api.element.Source; @@ -30,11 +35,6 @@ import io.codelaser.maddi.cst.impl.output.*; import io.codelaser.maddi.cst.impl.type.DiamondEnum; -import java.util.ArrayList; -import java.util.List; -import java.util.Set; -import java.util.stream.Stream; - public class FieldPrinterImpl implements FieldPrinter { private final boolean formatter2; private final FieldInfo fieldInfo; diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/info/ImportComputerImpl.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/info/ImportComputerImpl.java index a1edd67580..e5bb4d9bdb 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/info/ImportComputerImpl.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/info/ImportComputerImpl.java @@ -17,22 +17,23 @@ package io.codelaser.maddi.cst.impl.info; +import java.util.*; +import java.util.function.Function; +import java.util.stream.Collectors; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import io.codelaser.maddi.cst.api.element.Comment; import io.codelaser.maddi.cst.api.element.CompilationUnit; import io.codelaser.maddi.cst.api.element.Element; import io.codelaser.maddi.cst.api.element.ImportStatement; import io.codelaser.maddi.cst.api.info.ImportComputer; import io.codelaser.maddi.cst.api.info.TypeInfo; -import io.codelaser.maddi.cst.api.type.ParameterizedType; import io.codelaser.maddi.cst.api.output.Qualification; +import io.codelaser.maddi.cst.api.type.ParameterizedType; import io.codelaser.maddi.cst.impl.output.QualificationImpl; import io.codelaser.maddi.cst.impl.output.TypeNameImpl; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.util.*; -import java.util.function.Function; -import java.util.stream.Collectors; public class ImportComputerImpl implements ImportComputer { private static final Logger LOGGER = LoggerFactory.getLogger(ImportComputerImpl.class); diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/info/InfoImpl.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/info/InfoImpl.java index ded1514bec..3dcf1a6483 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/info/InfoImpl.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/info/InfoImpl.java @@ -17,6 +17,9 @@ package io.codelaser.maddi.cst.impl.info; +import java.util.stream.Stream; + +import io.codelaser.maddi.annotation.rare.IgnoreModifications; import io.codelaser.maddi.cst.api.analysis.PropertyValueMap; import io.codelaser.maddi.cst.api.info.Info; import io.codelaser.maddi.cst.api.variable.Variable; @@ -24,9 +27,6 @@ import io.codelaser.maddi.cst.impl.analysis.PropertyValueMapImpl; import io.codelaser.maddi.cst.impl.analysis.ValueImpl; import io.codelaser.maddi.cst.impl.variable.DescendModeEnum; -import io.codelaser.maddi.annotation.rare.IgnoreModifications; - -import java.util.stream.Stream; public abstract class InfoImpl implements Info { diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/info/InfoMapImpl.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/info/InfoMapImpl.java index c9bf9ff83a..230a847486 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/info/InfoMapImpl.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/info/InfoMapImpl.java @@ -17,18 +17,18 @@ package io.codelaser.maddi.cst.impl.info; -import io.codelaser.maddi.cst.impl.element.CompilationUnitImpl; -import io.codelaser.maddi.cst.api.expression.AnnotationExpression; -import io.codelaser.maddi.cst.api.info.*; -import io.codelaser.maddi.cst.api.type.ParameterizedType; -import io.codelaser.maddi.cst.impl.statement.BlockImpl; - import java.util.HashMap; import java.util.Map; import java.util.Objects; import java.util.Set; import java.util.stream.Collectors; +import io.codelaser.maddi.cst.api.expression.AnnotationExpression; +import io.codelaser.maddi.cst.api.info.*; +import io.codelaser.maddi.cst.api.type.ParameterizedType; +import io.codelaser.maddi.cst.impl.element.CompilationUnitImpl; +import io.codelaser.maddi.cst.impl.statement.BlockImpl; + /* BASIC RULE OF REWIRING: the fqn stays the same, as does the (name of the) source set. Conceptually the object stays the same. diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/info/Inspection.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/info/Inspection.java index 74c354a32c..5f6d714bf7 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/info/Inspection.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/info/Inspection.java @@ -17,6 +17,8 @@ package io.codelaser.maddi.cst.impl.info; +import java.util.List; + import io.codelaser.maddi.annotation.NotNull; import io.codelaser.maddi.cst.api.element.Comment; import io.codelaser.maddi.cst.api.element.JavaDoc; @@ -24,8 +26,6 @@ import io.codelaser.maddi.cst.api.expression.AnnotationExpression; import io.codelaser.maddi.cst.api.info.Access; -import java.util.List; - public interface Inspection { Access access(); diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/info/InspectionImpl.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/info/InspectionImpl.java index 904dc6b94e..179d083eda 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/info/InspectionImpl.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/info/InspectionImpl.java @@ -17,6 +17,10 @@ package io.codelaser.maddi.cst.impl.info; +import java.util.ArrayList; +import java.util.List; +import java.util.stream.Stream; + import io.codelaser.maddi.annotation.Fluent; import io.codelaser.maddi.cst.api.element.Comment; import io.codelaser.maddi.cst.api.element.JavaDoc; @@ -25,11 +29,6 @@ import io.codelaser.maddi.cst.api.info.Access; import io.codelaser.maddi.cst.api.info.Info; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.stream.Stream; - public abstract class InspectionImpl implements Inspection { private final Access access; private final List comments; diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/info/MethodInfoImpl.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/info/MethodInfoImpl.java index 4f953caa95..83c69f34f1 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/info/MethodInfoImpl.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/info/MethodInfoImpl.java @@ -17,6 +17,14 @@ package io.codelaser.maddi.cst.impl.info; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Set; +import java.util.function.Predicate; +import java.util.stream.Collectors; +import java.util.stream.Stream; + import io.codelaser.maddi.annotation.NotModified; import io.codelaser.maddi.cst.api.analysis.Value; import io.codelaser.maddi.cst.api.element.*; @@ -36,14 +44,6 @@ import io.codelaser.maddi.cst.impl.translate.TranslationMapImpl; import io.codelaser.maddi.support.EventuallyFinal; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.Set; -import java.util.function.Predicate; -import java.util.stream.Collectors; -import java.util.stream.Stream; - public class MethodInfoImpl extends InfoImpl implements MethodInfo { public enum MethodTypeEnum implements MethodType { diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/info/MethodInspection.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/info/MethodInspection.java index 69841e809d..2a570ef321 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/info/MethodInspection.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/info/MethodInspection.java @@ -17,15 +17,15 @@ package io.codelaser.maddi.cst.impl.info; +import java.util.List; +import java.util.Set; + import io.codelaser.maddi.cst.api.info.MethodInfo; import io.codelaser.maddi.cst.api.info.MethodModifier; import io.codelaser.maddi.cst.api.info.ParameterInfo; +import io.codelaser.maddi.cst.api.info.TypeParameter; import io.codelaser.maddi.cst.api.statement.Block; import io.codelaser.maddi.cst.api.type.ParameterizedType; -import io.codelaser.maddi.cst.api.info.TypeParameter; - -import java.util.List; -import java.util.Set; public interface MethodInspection extends Inspection { List exceptionTypes(); diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/info/MethodInspectionImpl.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/info/MethodInspectionImpl.java index dc26989cf3..01812a2e1a 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/info/MethodInspectionImpl.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/info/MethodInspectionImpl.java @@ -17,17 +17,18 @@ package io.codelaser.maddi.cst.impl.info; +import java.util.*; +import java.util.stream.Collectors; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import io.codelaser.maddi.annotation.Fluent; import io.codelaser.maddi.cst.api.info.*; import io.codelaser.maddi.cst.api.statement.Block; import io.codelaser.maddi.cst.api.type.ParameterizedType; import io.codelaser.maddi.cst.impl.variable.LocalVariableImpl; import io.codelaser.maddi.support.SetOnce; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.util.*; -import java.util.stream.Collectors; public class MethodInspectionImpl extends InspectionImpl implements MethodInspection { private static final Logger LOGGER = LoggerFactory.getLogger(MethodInspectionImpl.class); diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/info/MethodPrinterImpl.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/info/MethodPrinterImpl.java index cfea4513e3..35fcde6e1e 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/info/MethodPrinterImpl.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/info/MethodPrinterImpl.java @@ -17,6 +17,12 @@ package io.codelaser.maddi.cst.impl.info; +import java.util.ArrayList; +import java.util.List; +import java.util.Set; +import java.util.stream.Collectors; +import java.util.stream.Stream; + import io.codelaser.maddi.cst.api.element.Comment; import io.codelaser.maddi.cst.api.expression.AnnotationExpression; import io.codelaser.maddi.cst.api.expression.Expression; @@ -30,12 +36,6 @@ import io.codelaser.maddi.cst.impl.output.*; import io.codelaser.maddi.cst.impl.type.DiamondEnum; -import java.util.ArrayList; -import java.util.List; -import java.util.Set; -import java.util.stream.Collectors; -import java.util.stream.Stream; - /* we allow for a different type when translating types, see TypePrinter, TypeInfoImpl.translate()... where method ownership is not changed correctly. diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/info/ParameterInfoImpl.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/info/ParameterInfoImpl.java index c01bc9668e..cb2a54a4b4 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/info/ParameterInfoImpl.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/info/ParameterInfoImpl.java @@ -17,7 +17,13 @@ package io.codelaser.maddi.cst.impl.info; +import java.util.List; +import java.util.Objects; +import java.util.function.Predicate; +import java.util.stream.Stream; + import io.codelaser.maddi.annotation.NotModified; +import io.codelaser.maddi.annotation.rare.IgnoreModifications; import io.codelaser.maddi.cst.api.analysis.PropertyValueMap; import io.codelaser.maddi.cst.api.analysis.Value; import io.codelaser.maddi.cst.api.element.*; @@ -37,12 +43,6 @@ import io.codelaser.maddi.cst.impl.variable.DescendModeEnum; import io.codelaser.maddi.cst.impl.variable.LocalVariableImpl; import io.codelaser.maddi.support.EventuallyFinal; -import io.codelaser.maddi.annotation.rare.IgnoreModifications; - -import java.util.List; -import java.util.Objects; -import java.util.function.Predicate; -import java.util.stream.Stream; public class ParameterInfoImpl implements ParameterInfo { private final int index; diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/info/ParameterInspectionImpl.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/info/ParameterInspectionImpl.java index 0d81c7580b..89bf854408 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/info/ParameterInspectionImpl.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/info/ParameterInspectionImpl.java @@ -19,7 +19,6 @@ import io.codelaser.maddi.annotation.Fluent; -import io.codelaser.maddi.cst.api.element.JavaDoc; import io.codelaser.maddi.cst.api.info.ParameterInfo; public class ParameterInspectionImpl extends InspectionImpl implements ParameterInspection { diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/info/TypeInfoImpl.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/info/TypeInfoImpl.java index 303b5549d1..1fef696e32 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/info/TypeInfoImpl.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/info/TypeInfoImpl.java @@ -17,7 +17,15 @@ package io.codelaser.maddi.cst.impl.info; -import io.codelaser.maddi.cst.impl.element.CompilationUnitImpl; +import static io.codelaser.maddi.cst.api.element.Element.TypeReferenceNature.EXPLICIT; + +import java.util.*; +import java.util.function.Consumer; +import java.util.function.Predicate; +import java.util.function.Supplier; +import java.util.stream.Collectors; +import java.util.stream.Stream; + import io.codelaser.maddi.annotation.NotModified; import io.codelaser.maddi.cst.api.element.*; import io.codelaser.maddi.cst.api.expression.AnnotationExpression; @@ -33,6 +41,7 @@ import io.codelaser.maddi.cst.api.variable.Variable; import io.codelaser.maddi.cst.impl.analysis.PropertyImpl; import io.codelaser.maddi.cst.impl.analysis.ValueImpl; +import io.codelaser.maddi.cst.impl.element.CompilationUnitImpl; import io.codelaser.maddi.cst.impl.element.ElementImpl; import io.codelaser.maddi.cst.impl.translate.TranslationMapImpl; import io.codelaser.maddi.cst.impl.type.ParameterizedTypeImpl; @@ -40,15 +49,6 @@ import io.codelaser.maddi.support.Either; import io.codelaser.maddi.support.EventuallyFinalOnDemand; -import java.util.*; -import java.util.function.Consumer; -import java.util.function.Predicate; -import java.util.function.Supplier; -import java.util.stream.Collectors; -import java.util.stream.Stream; - -import static io.codelaser.maddi.cst.api.element.Element.TypeReferenceNature.EXPLICIT; - public class TypeInfoImpl extends InfoImpl implements TypeInfo { public static final String JAVA_LANG_OBJECT = "java.lang.Object"; diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/info/TypeInspection.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/info/TypeInspection.java index a73de6478b..91a52943f0 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/info/TypeInspection.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/info/TypeInspection.java @@ -17,16 +17,16 @@ package io.codelaser.maddi.cst.impl.info; -import io.codelaser.maddi.cst.api.element.Comment; -import io.codelaser.maddi.cst.api.info.*; -import io.codelaser.maddi.cst.api.type.ParameterizedType; -import io.codelaser.maddi.cst.api.type.TypeNature; - import java.util.List; import java.util.Set; import java.util.function.Supplier; import java.util.stream.Stream; +import io.codelaser.maddi.cst.api.element.Comment; +import io.codelaser.maddi.cst.api.info.*; +import io.codelaser.maddi.cst.api.type.ParameterizedType; +import io.codelaser.maddi.cst.api.type.TypeNature; + public interface TypeInspection extends Inspection { interface MethodMap { diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/info/TypeInspectionImpl.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/info/TypeInspectionImpl.java index 0a8075b298..d421ea93cb 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/info/TypeInspectionImpl.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/info/TypeInspectionImpl.java @@ -17,15 +17,15 @@ package io.codelaser.maddi.cst.impl.info; +import java.util.*; +import java.util.stream.Stream; + import io.codelaser.maddi.cst.api.element.Comment; import io.codelaser.maddi.cst.api.info.*; import io.codelaser.maddi.cst.api.type.ParameterizedType; import io.codelaser.maddi.cst.api.type.TypeNature; import io.codelaser.maddi.cst.impl.info.util.MethodMapImpl; -import java.util.*; -import java.util.stream.Stream; - public class TypeInspectionImpl extends InspectionImpl implements TypeInspection { private final Set typeModifiers; private final List methods; diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/info/TypeParameterInspection.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/info/TypeParameterInspection.java index d5ee8d2f25..8e9a2c42cf 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/info/TypeParameterInspection.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/info/TypeParameterInspection.java @@ -17,13 +17,13 @@ package io.codelaser.maddi.cst.impl.info; +import java.util.List; + import io.codelaser.maddi.cst.api.element.JavaDoc; import io.codelaser.maddi.cst.api.info.Access; import io.codelaser.maddi.cst.api.info.Variance; import io.codelaser.maddi.cst.api.type.ParameterizedType; -import java.util.List; - public interface TypeParameterInspection extends Inspection { List typeBounds(); diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/info/TypeParameterInspectionImpl.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/info/TypeParameterInspectionImpl.java index cfbfe5f47d..d92c6a67ec 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/info/TypeParameterInspectionImpl.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/info/TypeParameterInspectionImpl.java @@ -17,14 +17,14 @@ package io.codelaser.maddi.cst.impl.info; +import java.util.ArrayList; +import java.util.List; + import io.codelaser.maddi.cst.api.info.TypeParameter; import io.codelaser.maddi.cst.api.info.Variance; import io.codelaser.maddi.cst.api.type.ParameterizedType; import io.codelaser.maddi.cst.impl.type.TypeParameterImpl; -import java.util.ArrayList; -import java.util.List; - // Note: we store the bounds as separate types, rather than as an intersection type public class TypeParameterInspectionImpl extends InspectionImpl implements TypeParameterInspection { diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/info/TypePrinterImpl.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/info/TypePrinterImpl.java index 7a3bc2931b..f0d11ade4c 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/info/TypePrinterImpl.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/info/TypePrinterImpl.java @@ -17,6 +17,13 @@ package io.codelaser.maddi.cst.impl.info; +import java.util.ArrayList; +import java.util.Comparator; +import java.util.List; +import java.util.Set; +import java.util.stream.IntStream; +import java.util.stream.Stream; + import io.codelaser.maddi.cst.api.element.Element; import io.codelaser.maddi.cst.api.element.Source; import io.codelaser.maddi.cst.api.expression.AnnotationExpression; @@ -30,13 +37,6 @@ import io.codelaser.maddi.cst.impl.type.DiamondEnum; import io.codelaser.maddi.cst.impl.variable.ThisImpl; -import java.util.ArrayList; -import java.util.Comparator; -import java.util.List; -import java.util.Set; -import java.util.stream.IntStream; -import java.util.stream.Stream; - public record TypePrinterImpl(TypeInfo typeInfo, boolean formatter2) implements TypePrinter { @Override diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/info/util/MethodMapImpl.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/info/util/MethodMapImpl.java index 03c136b7c7..0573ab7baf 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/info/util/MethodMapImpl.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/info/util/MethodMapImpl.java @@ -1,9 +1,5 @@ package io.codelaser.maddi.cst.impl.info.util; -import io.codelaser.maddi.cst.api.info.MethodInfo; -import io.codelaser.maddi.cst.impl.info.TypeInspection; -import org.jetbrains.annotations.NotNull; - import java.util.HashMap; import java.util.List; import java.util.Map; @@ -11,6 +7,11 @@ import java.util.function.Supplier; import java.util.stream.Collectors; +import org.jetbrains.annotations.NotNull; + +import io.codelaser.maddi.cst.api.info.MethodInfo; +import io.codelaser.maddi.cst.impl.info.TypeInspection; + /** * Index of a type's methods by name → parameter count → erased-parameter FQNs → method. A fourth level, * keyed by the erased return type, is inserted only when two methods share the same erased parameters diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/output/BlankLineImpl.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/output/BlankLineImpl.java index 8c6b20a8ab..23ca0c6caa 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/output/BlankLineImpl.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/output/BlankLineImpl.java @@ -18,6 +18,8 @@ package io.codelaser.maddi.cst.impl.output; +import java.util.List; + import io.codelaser.maddi.cst.api.element.Comment; import io.codelaser.maddi.cst.api.element.Element; import io.codelaser.maddi.cst.api.element.Source; @@ -27,8 +29,6 @@ import io.codelaser.maddi.cst.api.output.element.ElementarySpace; import io.codelaser.maddi.cst.api.output.element.Split; -import java.util.List; - /** * The one {@link BlankLine}, and when to add it: when the source has a blank line between two neighbours. */ diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/output/ElementarySpaceEnum.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/output/ElementarySpaceEnum.java index 3ad25f6e50..4b19c8660f 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/output/ElementarySpaceEnum.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/output/ElementarySpaceEnum.java @@ -17,10 +17,10 @@ package io.codelaser.maddi.cst.impl.output; -import io.codelaser.maddi.cst.api.output.element.ElementarySpace; - import java.util.Objects; +import io.codelaser.maddi.cst.api.output.element.ElementarySpace; + public enum ElementarySpaceEnum implements ElementarySpace { ONE(" "), NICE(" "), NONE(""), RELAXED_NONE(""), NEWLINE("\n"), ; diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/output/GuideImpl.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/output/GuideImpl.java index da727e09ab..b7cff61ee7 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/output/GuideImpl.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/output/GuideImpl.java @@ -18,13 +18,13 @@ package io.codelaser.maddi.cst.impl.output; +import java.util.concurrent.atomic.AtomicInteger; + import io.codelaser.maddi.annotation.ImmutableContainer; import io.codelaser.maddi.annotation.rare.IgnoreModifications; import io.codelaser.maddi.cst.api.output.FormattingOptions; import io.codelaser.maddi.cst.api.output.element.Guide; -import java.util.concurrent.atomic.AtomicInteger; - @ImmutableContainer public record GuideImpl(String name, int index, diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/output/OutputBuilderImpl.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/output/OutputBuilderImpl.java index 7b69265370..ce3a0b47df 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/output/OutputBuilderImpl.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/output/OutputBuilderImpl.java @@ -18,9 +18,6 @@ package io.codelaser.maddi.cst.impl.output; -import io.codelaser.maddi.cst.api.output.OutputBuilder; -import io.codelaser.maddi.cst.api.output.OutputElement; - import java.util.*; import java.util.concurrent.atomic.AtomicInteger; import java.util.function.BiConsumer; @@ -31,6 +28,9 @@ import java.util.stream.Collectors; import java.util.stream.Stream; +import io.codelaser.maddi.cst.api.output.OutputBuilder; +import io.codelaser.maddi.cst.api.output.OutputElement; + public class OutputBuilderImpl implements OutputBuilder { private final List list = new LinkedList<>(); diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/output/QualificationImpl.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/output/QualificationImpl.java index efbab45357..f2b263d713 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/output/QualificationImpl.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/output/QualificationImpl.java @@ -17,6 +17,11 @@ package io.codelaser.maddi.cst.impl.output; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; + import io.codelaser.maddi.cst.api.info.FieldInfo; import io.codelaser.maddi.cst.api.info.MethodInfo; import io.codelaser.maddi.cst.api.info.TypeInfo; @@ -26,11 +31,6 @@ import io.codelaser.maddi.cst.api.variable.This; import io.codelaser.maddi.cst.api.variable.Variable; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; - public class QualificationImpl implements Qualification { public static final Qualification FULLY_QUALIFIED_NAMES = new QualificationImpl(false, TypeNameImpl.Required.FQN, null); public static final Qualification DESCRIPTORS = new QualificationImpl(false, TypeNameImpl.Required.DESCRIPTOR, null); diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/output/SpaceEnum.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/output/SpaceEnum.java index f7bf4f256e..cae59babc6 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/output/SpaceEnum.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/output/SpaceEnum.java @@ -17,13 +17,13 @@ package io.codelaser.maddi.cst.impl.output; +import java.util.Objects; + import io.codelaser.maddi.cst.api.output.FormattingOptions; import io.codelaser.maddi.cst.api.output.element.ElementarySpace; import io.codelaser.maddi.cst.api.output.element.Space; import io.codelaser.maddi.cst.api.output.element.Split; -import java.util.Objects; - public enum SpaceEnum implements Space { // no space, do not split diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/output/SymbolEnum.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/output/SymbolEnum.java index c7321faa8c..4f9d049db8 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/output/SymbolEnum.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/output/SymbolEnum.java @@ -17,14 +17,13 @@ package io.codelaser.maddi.cst.impl.output; +import static io.codelaser.maddi.cst.impl.output.SpaceEnum.*; + import io.codelaser.maddi.cst.api.output.FormattingOptions; -import io.codelaser.maddi.cst.api.output.OutputBuilder; import io.codelaser.maddi.cst.api.output.element.Space; import io.codelaser.maddi.cst.api.output.element.Symbol; import io.codelaser.maddi.util.StringUtil; -import static io.codelaser.maddi.cst.impl.output.SpaceEnum.*; - public record SymbolEnum(String symbol, Space left, Space right, String constant) implements Symbol { diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/output/TextBlockFormattingImpl.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/output/TextBlockFormattingImpl.java index d8935e7d5b..1eb28cf5de 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/output/TextBlockFormattingImpl.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/output/TextBlockFormattingImpl.java @@ -17,11 +17,11 @@ package io.codelaser.maddi.cst.impl.output; -import io.codelaser.maddi.cst.api.output.element.TextBlockFormatting; - import java.util.HashSet; import java.util.Set; +import io.codelaser.maddi.cst.api.output.element.TextBlockFormatting; + public record TextBlockFormattingImpl(Set lineBreaks, boolean optOutWhiteSpaceStripping, boolean trailingClosingQuotes) implements TextBlockFormatting { diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/runtime/EvalImpl.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/runtime/EvalImpl.java index 68cae364c4..ecf5770c31 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/runtime/EvalImpl.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/runtime/EvalImpl.java @@ -17,17 +17,17 @@ package io.codelaser.maddi.cst.impl.runtime; +import java.util.Arrays; +import java.util.Collection; +import java.util.List; +import java.util.stream.Stream; + import io.codelaser.maddi.cst.api.expression.*; import io.codelaser.maddi.cst.api.runtime.Eval; import io.codelaser.maddi.cst.api.runtime.Runtime; import io.codelaser.maddi.cst.api.variable.Variable; import io.codelaser.maddi.cst.impl.expression.eval.*; -import java.util.Arrays; -import java.util.Collection; -import java.util.List; -import java.util.stream.Stream; - public class EvalImpl implements Eval { private final EvalProduct evalProduct; private final EvalSum evalSum; diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/runtime/FactoryImpl.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/runtime/FactoryImpl.java index 590b6b28d2..ff3231e241 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/runtime/FactoryImpl.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/runtime/FactoryImpl.java @@ -17,6 +17,14 @@ package io.codelaser.maddi.cst.impl.runtime; +import java.util.*; +import java.util.function.Function; +import java.util.regex.Matcher; +import java.util.regex.Pattern; +import java.util.stream.Collector; + +import org.jetbrains.annotations.Nullable; + import io.codelaser.maddi.cst.api.element.*; import io.codelaser.maddi.cst.api.expression.*; import io.codelaser.maddi.cst.api.info.*; @@ -47,13 +55,6 @@ import io.codelaser.maddi.cst.impl.variable.*; import io.codelaser.maddi.support.Either; import io.codelaser.maddi.util.IntUtil; -import org.jetbrains.annotations.Nullable; - -import java.util.*; -import java.util.function.Function; -import java.util.regex.Matcher; -import java.util.regex.Pattern; -import java.util.stream.Collector; public class FactoryImpl extends PredefinedImpl implements Factory { diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/runtime/PredefinedImpl.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/runtime/PredefinedImpl.java index 26b21d99d4..b29a43e90a 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/runtime/PredefinedImpl.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/runtime/PredefinedImpl.java @@ -17,6 +17,9 @@ package io.codelaser.maddi.cst.impl.runtime; +import java.net.URI; +import java.util.*; + import io.codelaser.maddi.cst.api.element.CompilationUnit; import io.codelaser.maddi.cst.api.element.SourceSet; import io.codelaser.maddi.cst.api.expression.AnnotationExpression; @@ -35,9 +38,6 @@ import io.codelaser.maddi.cst.impl.type.IsAssignableFrom2; import io.codelaser.maddi.cst.impl.type.ParameterizedTypeImpl; -import java.net.URI; -import java.util.*; - public class PredefinedImpl implements Predefined { /** * The synthetic source set the primitives and the {@code java.lang} types belong to. diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/runtime/RuntimeImpl.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/runtime/RuntimeImpl.java index 4722215957..db4698ac3c 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/runtime/RuntimeImpl.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/runtime/RuntimeImpl.java @@ -17,6 +17,12 @@ package io.codelaser.maddi.cst.impl.runtime; +import java.util.Collection; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.stream.Stream; + import io.codelaser.maddi.cst.api.analysis.Value; import io.codelaser.maddi.cst.api.expression.*; import io.codelaser.maddi.cst.api.info.ComputeMethodOverrides; @@ -34,12 +40,6 @@ import io.codelaser.maddi.cst.impl.expression.eval.EvalOptions; import io.codelaser.maddi.cst.impl.info.ComputeMethodOverridesImpl; -import java.util.Collection; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.stream.Stream; - public class RuntimeImpl extends FactoryImpl implements Runtime { private final Eval eval; private final MaddiAnnotationsImpl maddiAnnotations = new MaddiAnnotationsImpl(); diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/statement/AssertStatementImpl.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/statement/AssertStatementImpl.java index bf2e0aef67..fd76545457 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/statement/AssertStatementImpl.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/statement/AssertStatementImpl.java @@ -17,13 +17,17 @@ package io.codelaser.maddi.cst.impl.statement; +import java.util.List; +import java.util.Objects; +import java.util.function.Predicate; +import java.util.stream.Stream; + import io.codelaser.maddi.cst.api.element.Comment; import io.codelaser.maddi.cst.api.element.Element; import io.codelaser.maddi.cst.api.element.Source; import io.codelaser.maddi.cst.api.element.Visitor; import io.codelaser.maddi.cst.api.expression.AnnotationExpression; import io.codelaser.maddi.cst.api.expression.Expression; -import io.codelaser.maddi.cst.api.info.InfoMap; import io.codelaser.maddi.cst.api.info.InfoMapView; import io.codelaser.maddi.cst.api.output.OutputBuilder; import io.codelaser.maddi.cst.api.output.Qualification; @@ -38,11 +42,6 @@ import io.codelaser.maddi.cst.impl.output.SpaceEnum; import io.codelaser.maddi.cst.impl.output.SymbolEnum; -import java.util.List; -import java.util.Objects; -import java.util.function.Predicate; -import java.util.stream.Stream; - public class AssertStatementImpl extends StatementImpl implements AssertStatement { private final Expression message; private final Expression expression; diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/statement/BlockImpl.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/statement/BlockImpl.java index 8103512aa0..3824a8cd7a 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/statement/BlockImpl.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/statement/BlockImpl.java @@ -17,6 +17,13 @@ package io.codelaser.maddi.cst.impl.statement; +import java.util.ArrayList; +import java.util.List; +import java.util.Objects; +import java.util.function.Predicate; +import java.util.stream.IntStream; +import java.util.stream.Stream; + import io.codelaser.maddi.annotation.Fluent; import io.codelaser.maddi.cst.api.element.Comment; import io.codelaser.maddi.cst.api.element.DetailedSources; @@ -25,7 +32,6 @@ import io.codelaser.maddi.cst.api.element.Source; import io.codelaser.maddi.cst.api.element.Visitor; import io.codelaser.maddi.cst.api.expression.AnnotationExpression; -import io.codelaser.maddi.cst.api.info.InfoMap; import io.codelaser.maddi.cst.api.info.InfoMapView; import io.codelaser.maddi.cst.api.output.OutputBuilder; import io.codelaser.maddi.cst.api.output.Qualification; @@ -40,13 +46,6 @@ import io.codelaser.maddi.cst.impl.output.SpaceEnum; import io.codelaser.maddi.cst.impl.output.SymbolEnum; -import java.util.ArrayList; -import java.util.List; -import java.util.Objects; -import java.util.function.Predicate; -import java.util.stream.IntStream; -import java.util.stream.Stream; - public class BlockImpl extends StatementImpl implements Block { private final List statements; private final List trailingComments; diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/statement/BreakOrContinueStatementImpl.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/statement/BreakOrContinueStatementImpl.java index 8204b7cc8b..347ae01aba 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/statement/BreakOrContinueStatementImpl.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/statement/BreakOrContinueStatementImpl.java @@ -17,6 +17,11 @@ package io.codelaser.maddi.cst.impl.statement; +import java.util.List; +import java.util.Objects; +import java.util.function.Predicate; +import java.util.stream.Stream; + import io.codelaser.maddi.cst.api.element.Comment; import io.codelaser.maddi.cst.api.element.Element; import io.codelaser.maddi.cst.api.element.Source; @@ -28,11 +33,6 @@ import io.codelaser.maddi.cst.api.variable.DescendMode; import io.codelaser.maddi.cst.api.variable.Variable; -import java.util.List; -import java.util.Objects; -import java.util.function.Predicate; -import java.util.stream.Stream; - public abstract class BreakOrContinueStatementImpl extends StatementImpl implements BreakOrContinueStatement { private final String goToLabel; diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/statement/BreakStatementImpl.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/statement/BreakStatementImpl.java index 5196bc8fe1..15e6495441 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/statement/BreakStatementImpl.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/statement/BreakStatementImpl.java @@ -17,10 +17,12 @@ package io.codelaser.maddi.cst.impl.statement; +import java.util.List; +import java.util.Objects; + import io.codelaser.maddi.cst.api.element.Comment; import io.codelaser.maddi.cst.api.element.Source; import io.codelaser.maddi.cst.api.expression.AnnotationExpression; -import io.codelaser.maddi.cst.api.info.InfoMap; import io.codelaser.maddi.cst.api.info.InfoMapView; import io.codelaser.maddi.cst.api.output.OutputBuilder; import io.codelaser.maddi.cst.api.output.Qualification; @@ -32,9 +34,6 @@ import io.codelaser.maddi.cst.impl.output.SymbolEnum; import io.codelaser.maddi.cst.impl.output.TextImpl; -import java.util.List; -import java.util.Objects; - public class BreakStatementImpl extends BreakOrContinueStatementImpl implements BreakStatement { public BreakStatementImpl(List comments, Source source, List annotationExpressions, String label, String goToLabel) { diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/statement/ContinueStatementImpl.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/statement/ContinueStatementImpl.java index 97125357c1..5bc8394693 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/statement/ContinueStatementImpl.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/statement/ContinueStatementImpl.java @@ -17,10 +17,12 @@ package io.codelaser.maddi.cst.impl.statement; +import java.util.List; +import java.util.Objects; + import io.codelaser.maddi.cst.api.element.Comment; import io.codelaser.maddi.cst.api.element.Source; import io.codelaser.maddi.cst.api.expression.AnnotationExpression; -import io.codelaser.maddi.cst.api.info.InfoMap; import io.codelaser.maddi.cst.api.info.InfoMapView; import io.codelaser.maddi.cst.api.output.OutputBuilder; import io.codelaser.maddi.cst.api.output.Qualification; @@ -32,9 +34,6 @@ import io.codelaser.maddi.cst.impl.output.SymbolEnum; import io.codelaser.maddi.cst.impl.output.TextImpl; -import java.util.List; -import java.util.Objects; - public class ContinueStatementImpl extends BreakOrContinueStatementImpl implements ContinueStatement { public ContinueStatementImpl(List comments, Source source, List annotationExpressions, String label, String goToLabel) { diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/statement/DoStatementImpl.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/statement/DoStatementImpl.java index 61b8918b6c..2bfcef7c39 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/statement/DoStatementImpl.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/statement/DoStatementImpl.java @@ -17,13 +17,17 @@ package io.codelaser.maddi.cst.impl.statement; +import java.util.List; +import java.util.Objects; +import java.util.function.Predicate; +import java.util.stream.Stream; + import io.codelaser.maddi.cst.api.element.Comment; import io.codelaser.maddi.cst.api.element.Element; import io.codelaser.maddi.cst.api.element.Source; import io.codelaser.maddi.cst.api.element.Visitor; import io.codelaser.maddi.cst.api.expression.AnnotationExpression; import io.codelaser.maddi.cst.api.expression.Expression; -import io.codelaser.maddi.cst.api.info.InfoMap; import io.codelaser.maddi.cst.api.info.InfoMapView; import io.codelaser.maddi.cst.api.output.OutputBuilder; import io.codelaser.maddi.cst.api.output.Qualification; @@ -36,11 +40,6 @@ import io.codelaser.maddi.cst.impl.output.KeywordImpl; import io.codelaser.maddi.cst.impl.output.SymbolEnum; -import java.util.List; -import java.util.Objects; -import java.util.function.Predicate; -import java.util.stream.Stream; - public class DoStatementImpl extends StatementImpl implements DoStatement { private final Expression expression; private final Block block; diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/statement/EmptyStatementImpl.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/statement/EmptyStatementImpl.java index a35e193ada..a461ce6b38 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/statement/EmptyStatementImpl.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/statement/EmptyStatementImpl.java @@ -17,13 +17,17 @@ package io.codelaser.maddi.cst.impl.statement; +import java.util.List; +import java.util.Objects; +import java.util.function.Predicate; +import java.util.stream.Stream; + import io.codelaser.maddi.cst.api.element.Comment; import io.codelaser.maddi.cst.api.element.Element; import io.codelaser.maddi.cst.api.element.Source; import io.codelaser.maddi.cst.api.element.Visitor; import io.codelaser.maddi.cst.api.expression.AnnotationExpression; import io.codelaser.maddi.cst.api.expression.Expression; -import io.codelaser.maddi.cst.api.info.InfoMap; import io.codelaser.maddi.cst.api.info.InfoMapView; import io.codelaser.maddi.cst.api.output.OutputBuilder; import io.codelaser.maddi.cst.api.output.Qualification; @@ -35,11 +39,6 @@ import io.codelaser.maddi.cst.api.variable.Variable; import io.codelaser.maddi.cst.impl.output.SymbolEnum; -import java.util.List; -import java.util.Objects; -import java.util.function.Predicate; -import java.util.stream.Stream; - public class EmptyStatementImpl extends StatementImpl implements EmptyStatement { public EmptyStatementImpl(List comments, Source source, List annotations, String label) { diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/statement/ExplicitConstructorInvocationImpl.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/statement/ExplicitConstructorInvocationImpl.java index 731c48df6c..9a57f58f26 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/statement/ExplicitConstructorInvocationImpl.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/statement/ExplicitConstructorInvocationImpl.java @@ -17,13 +17,17 @@ package io.codelaser.maddi.cst.impl.statement; +import java.util.List; +import java.util.Objects; +import java.util.function.Predicate; +import java.util.stream.Stream; + import io.codelaser.maddi.cst.api.element.Comment; import io.codelaser.maddi.cst.api.element.Element; import io.codelaser.maddi.cst.api.element.Source; import io.codelaser.maddi.cst.api.element.Visitor; import io.codelaser.maddi.cst.api.expression.AnnotationExpression; import io.codelaser.maddi.cst.api.expression.Expression; -import io.codelaser.maddi.cst.api.info.InfoMap; import io.codelaser.maddi.cst.api.info.InfoMapView; import io.codelaser.maddi.cst.api.info.MethodInfo; import io.codelaser.maddi.cst.api.output.OutputBuilder; @@ -38,11 +42,6 @@ import io.codelaser.maddi.cst.impl.output.SymbolEnum; import io.codelaser.maddi.cst.impl.output.TextImpl; -import java.util.List; -import java.util.Objects; -import java.util.function.Predicate; -import java.util.stream.Stream; - public class ExplicitConstructorInvocationImpl extends StatementImpl implements ExplicitConstructorInvocation { private final boolean isSuper; private final MethodInfo methodInfo; diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/statement/ExpressionAsStatementImpl.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/statement/ExpressionAsStatementImpl.java index fa04604077..a108c7ad04 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/statement/ExpressionAsStatementImpl.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/statement/ExpressionAsStatementImpl.java @@ -17,13 +17,17 @@ package io.codelaser.maddi.cst.impl.statement; +import java.util.List; +import java.util.Objects; +import java.util.function.Predicate; +import java.util.stream.Stream; + import io.codelaser.maddi.cst.api.element.Comment; import io.codelaser.maddi.cst.api.element.Element; import io.codelaser.maddi.cst.api.element.Source; import io.codelaser.maddi.cst.api.element.Visitor; import io.codelaser.maddi.cst.api.expression.AnnotationExpression; import io.codelaser.maddi.cst.api.expression.Expression; -import io.codelaser.maddi.cst.api.info.InfoMap; import io.codelaser.maddi.cst.api.info.InfoMapView; import io.codelaser.maddi.cst.api.output.OutputBuilder; import io.codelaser.maddi.cst.api.output.Qualification; @@ -35,11 +39,6 @@ import io.codelaser.maddi.cst.api.variable.Variable; import io.codelaser.maddi.cst.impl.output.SymbolEnum; -import java.util.List; -import java.util.Objects; -import java.util.function.Predicate; -import java.util.stream.Stream; - public class ExpressionAsStatementImpl extends StatementImpl implements ExpressionAsStatement { private final Expression expression; diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/statement/ForEachStatementImpl.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/statement/ForEachStatementImpl.java index 7af6014eb9..cdd18109ad 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/statement/ForEachStatementImpl.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/statement/ForEachStatementImpl.java @@ -17,13 +17,17 @@ package io.codelaser.maddi.cst.impl.statement; +import java.util.List; +import java.util.Objects; +import java.util.function.Predicate; +import java.util.stream.Stream; + import io.codelaser.maddi.cst.api.element.Comment; import io.codelaser.maddi.cst.api.element.Element; import io.codelaser.maddi.cst.api.element.Source; import io.codelaser.maddi.cst.api.element.Visitor; import io.codelaser.maddi.cst.api.expression.AnnotationExpression; import io.codelaser.maddi.cst.api.expression.Expression; -import io.codelaser.maddi.cst.api.info.InfoMap; import io.codelaser.maddi.cst.api.info.InfoMapView; import io.codelaser.maddi.cst.api.output.OutputBuilder; import io.codelaser.maddi.cst.api.output.Qualification; @@ -38,11 +42,6 @@ import io.codelaser.maddi.cst.impl.output.*; import io.codelaser.maddi.cst.impl.type.DiamondEnum; -import java.util.List; -import java.util.Objects; -import java.util.function.Predicate; -import java.util.stream.Stream; - public class ForEachStatementImpl extends StatementImpl implements ForEachStatement { private final LocalVariableCreation initializer; private final Expression expression; diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/statement/ForStatementImpl.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/statement/ForStatementImpl.java index 8b3d2d1388..086a41f1dd 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/statement/ForStatementImpl.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/statement/ForStatementImpl.java @@ -17,13 +17,19 @@ package io.codelaser.maddi.cst.impl.statement; +import java.util.ArrayList; +import java.util.List; +import java.util.Objects; +import java.util.function.Predicate; +import java.util.stream.Collectors; +import java.util.stream.Stream; + import io.codelaser.maddi.cst.api.element.Comment; import io.codelaser.maddi.cst.api.element.Element; import io.codelaser.maddi.cst.api.element.Source; import io.codelaser.maddi.cst.api.element.Visitor; import io.codelaser.maddi.cst.api.expression.AnnotationExpression; import io.codelaser.maddi.cst.api.expression.Expression; -import io.codelaser.maddi.cst.api.info.InfoMap; import io.codelaser.maddi.cst.api.info.InfoMapView; import io.codelaser.maddi.cst.api.output.OutputBuilder; import io.codelaser.maddi.cst.api.output.Qualification; @@ -38,13 +44,6 @@ import io.codelaser.maddi.cst.impl.output.OutputBuilderImpl; import io.codelaser.maddi.cst.impl.output.SymbolEnum; -import java.util.ArrayList; -import java.util.List; -import java.util.Objects; -import java.util.function.Predicate; -import java.util.stream.Collectors; -import java.util.stream.Stream; - public class ForStatementImpl extends StatementImpl implements ForStatement { private final List initializers; private final List updaters; diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/statement/IfElseStatementImpl.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/statement/IfElseStatementImpl.java index d093a0e76e..95f592aa13 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/statement/IfElseStatementImpl.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/statement/IfElseStatementImpl.java @@ -17,13 +17,17 @@ package io.codelaser.maddi.cst.impl.statement; +import java.util.List; +import java.util.Objects; +import java.util.function.Predicate; +import java.util.stream.Stream; + import io.codelaser.maddi.cst.api.element.Comment; import io.codelaser.maddi.cst.api.element.Element; import io.codelaser.maddi.cst.api.element.Source; import io.codelaser.maddi.cst.api.element.Visitor; import io.codelaser.maddi.cst.api.expression.AnnotationExpression; import io.codelaser.maddi.cst.api.expression.Expression; -import io.codelaser.maddi.cst.api.info.InfoMap; import io.codelaser.maddi.cst.api.info.InfoMapView; import io.codelaser.maddi.cst.api.output.OutputBuilder; import io.codelaser.maddi.cst.api.output.Qualification; @@ -37,11 +41,6 @@ import io.codelaser.maddi.cst.impl.output.KeywordImpl; import io.codelaser.maddi.cst.impl.output.SymbolEnum; -import java.util.List; -import java.util.Objects; -import java.util.function.Predicate; -import java.util.stream.Stream; - public class IfElseStatementImpl extends StatementImpl implements IfElseStatement { private final Expression expression; private final Block block; diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/statement/ImportStatementImpl.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/statement/ImportStatementImpl.java index 1fdaaa6fd9..93b420f808 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/statement/ImportStatementImpl.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/statement/ImportStatementImpl.java @@ -17,8 +17,12 @@ package io.codelaser.maddi.cst.impl.statement; +import java.util.List; +import java.util.Objects; +import java.util.function.Predicate; +import java.util.stream.Stream; + import io.codelaser.maddi.cst.api.element.*; -import io.codelaser.maddi.cst.api.info.InfoMap; import io.codelaser.maddi.cst.api.info.InfoMapView; import io.codelaser.maddi.cst.api.output.OutputBuilder; import io.codelaser.maddi.cst.api.output.Qualification; @@ -32,11 +36,6 @@ import io.codelaser.maddi.cst.impl.output.SymbolEnum; import io.codelaser.maddi.cst.impl.output.TextImpl; -import java.util.List; -import java.util.Objects; -import java.util.function.Predicate; -import java.util.stream.Stream; - public class ImportStatementImpl extends StatementImpl implements ImportStatement { private final String importString; private final boolean isStatic; diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/statement/LocalTypeDeclarationImpl.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/statement/LocalTypeDeclarationImpl.java index 8740da0464..e34cb9b93f 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/statement/LocalTypeDeclarationImpl.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/statement/LocalTypeDeclarationImpl.java @@ -17,12 +17,15 @@ package io.codelaser.maddi.cst.impl.statement; +import java.util.List; +import java.util.function.Predicate; +import java.util.stream.Stream; + import io.codelaser.maddi.cst.api.element.Comment; import io.codelaser.maddi.cst.api.element.Element; import io.codelaser.maddi.cst.api.element.Source; import io.codelaser.maddi.cst.api.element.Visitor; import io.codelaser.maddi.cst.api.expression.AnnotationExpression; -import io.codelaser.maddi.cst.api.info.InfoMap; import io.codelaser.maddi.cst.api.info.InfoMapView; import io.codelaser.maddi.cst.api.info.TypeInfo; import io.codelaser.maddi.cst.api.output.OutputBuilder; @@ -34,10 +37,6 @@ import io.codelaser.maddi.cst.api.variable.DescendMode; import io.codelaser.maddi.cst.api.variable.Variable; -import java.util.List; -import java.util.function.Predicate; -import java.util.stream.Stream; - public class LocalTypeDeclarationImpl extends StatementImpl implements LocalTypeDeclaration { private final TypeInfo typeInfo; diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/statement/LocalVariableCreationImpl.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/statement/LocalVariableCreationImpl.java index 0a6bf1bd74..2703626f23 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/statement/LocalVariableCreationImpl.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/statement/LocalVariableCreationImpl.java @@ -17,12 +17,15 @@ package io.codelaser.maddi.cst.impl.statement; +import java.util.*; +import java.util.function.Predicate; +import java.util.stream.Stream; + import io.codelaser.maddi.cst.api.element.Comment; import io.codelaser.maddi.cst.api.element.Element; import io.codelaser.maddi.cst.api.element.Source; import io.codelaser.maddi.cst.api.element.Visitor; import io.codelaser.maddi.cst.api.expression.AnnotationExpression; -import io.codelaser.maddi.cst.api.info.InfoMap; import io.codelaser.maddi.cst.api.info.InfoMapView; import io.codelaser.maddi.cst.api.output.OutputBuilder; import io.codelaser.maddi.cst.api.output.Qualification; @@ -37,10 +40,6 @@ import io.codelaser.maddi.cst.impl.output.*; import io.codelaser.maddi.cst.impl.type.DiamondEnum; -import java.util.*; -import java.util.function.Predicate; -import java.util.stream.Stream; - public class LocalVariableCreationImpl extends StatementImpl implements LocalVariableCreation { private final LocalVariable localVariable; diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/statement/ReturnStatementImpl.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/statement/ReturnStatementImpl.java index 2efcfdf2c5..e124f6819c 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/statement/ReturnStatementImpl.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/statement/ReturnStatementImpl.java @@ -17,13 +17,17 @@ package io.codelaser.maddi.cst.impl.statement; +import java.util.List; +import java.util.Objects; +import java.util.function.Predicate; +import java.util.stream.Stream; + import io.codelaser.maddi.cst.api.element.Comment; import io.codelaser.maddi.cst.api.element.Element; import io.codelaser.maddi.cst.api.element.Source; import io.codelaser.maddi.cst.api.element.Visitor; import io.codelaser.maddi.cst.api.expression.AnnotationExpression; import io.codelaser.maddi.cst.api.expression.Expression; -import io.codelaser.maddi.cst.api.info.InfoMap; import io.codelaser.maddi.cst.api.info.InfoMapView; import io.codelaser.maddi.cst.api.output.OutputBuilder; import io.codelaser.maddi.cst.api.output.Qualification; @@ -38,11 +42,6 @@ import io.codelaser.maddi.cst.impl.output.SymbolEnum; import io.codelaser.maddi.cst.impl.output.TextImpl; -import java.util.List; -import java.util.Objects; -import java.util.function.Predicate; -import java.util.stream.Stream; - public class ReturnStatementImpl extends StatementImpl implements ReturnStatement { private final Expression expression; diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/statement/StatementImpl.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/statement/StatementImpl.java index 00b0c92a41..fbe149e0c8 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/statement/StatementImpl.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/statement/StatementImpl.java @@ -17,13 +17,15 @@ package io.codelaser.maddi.cst.impl.statement; -import io.codelaser.maddi.cst.api.info.InfoMapView; +import java.util.List; + import io.codelaser.maddi.annotation.Fluent; import io.codelaser.maddi.annotation.rare.IgnoreModifications; import io.codelaser.maddi.cst.api.analysis.PropertyValueMap; import io.codelaser.maddi.cst.api.element.Comment; import io.codelaser.maddi.cst.api.element.Source; import io.codelaser.maddi.cst.api.expression.AnnotationExpression; +import io.codelaser.maddi.cst.api.info.InfoMapView; import io.codelaser.maddi.cst.api.output.OutputBuilder; import io.codelaser.maddi.cst.api.output.OutputElement; import io.codelaser.maddi.cst.api.output.Qualification; @@ -36,8 +38,6 @@ import io.codelaser.maddi.cst.impl.element.SourceImpl; import io.codelaser.maddi.cst.impl.output.*; -import java.util.List; - public abstract class StatementImpl extends ElementImpl implements Statement { private final List comments; diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/statement/SwitchEntryImpl.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/statement/SwitchEntryImpl.java index 83451991ec..883ecf6f0a 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/statement/SwitchEntryImpl.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/statement/SwitchEntryImpl.java @@ -17,10 +17,15 @@ package io.codelaser.maddi.cst.impl.statement; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import java.util.function.Predicate; +import java.util.stream.Stream; + import io.codelaser.maddi.cst.api.element.*; import io.codelaser.maddi.cst.api.expression.Expression; import io.codelaser.maddi.cst.api.expression.VariableExpression; -import io.codelaser.maddi.cst.api.info.InfoMap; import io.codelaser.maddi.cst.api.info.InfoMapView; import io.codelaser.maddi.cst.api.output.OutputBuilder; import io.codelaser.maddi.cst.api.output.Qualification; @@ -35,12 +40,6 @@ import io.codelaser.maddi.cst.impl.output.*; import io.codelaser.maddi.util.ListUtil; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; -import java.util.function.Predicate; -import java.util.stream.Stream; - public class SwitchEntryImpl implements SwitchEntry { private final List conditions; private final RecordPattern patternVariable; diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/statement/SwitchStatementNewStyleImpl.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/statement/SwitchStatementNewStyleImpl.java index 388adf03f5..b5b38e92ba 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/statement/SwitchStatementNewStyleImpl.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/statement/SwitchStatementNewStyleImpl.java @@ -17,13 +17,19 @@ package io.codelaser.maddi.cst.impl.statement; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import java.util.Objects; +import java.util.function.Predicate; +import java.util.stream.Stream; + import io.codelaser.maddi.cst.api.element.Comment; import io.codelaser.maddi.cst.api.element.Element; import io.codelaser.maddi.cst.api.element.Source; import io.codelaser.maddi.cst.api.element.Visitor; import io.codelaser.maddi.cst.api.expression.AnnotationExpression; import io.codelaser.maddi.cst.api.expression.Expression; -import io.codelaser.maddi.cst.api.info.InfoMap; import io.codelaser.maddi.cst.api.info.InfoMapView; import io.codelaser.maddi.cst.api.output.OutputBuilder; import io.codelaser.maddi.cst.api.output.Qualification; @@ -39,13 +45,6 @@ import io.codelaser.maddi.cst.impl.output.SymbolEnum; import io.codelaser.maddi.util.ZipLists; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; -import java.util.Objects; -import java.util.function.Predicate; -import java.util.stream.Stream; - public class SwitchStatementNewStyleImpl extends StatementImpl implements SwitchStatementNewStyle { private final Expression selector; private final List entries; diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/statement/SwitchStatementOldStyleImpl.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/statement/SwitchStatementOldStyleImpl.java index 681c739b82..48b4f682d9 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/statement/SwitchStatementOldStyleImpl.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/statement/SwitchStatementOldStyleImpl.java @@ -17,10 +17,13 @@ package io.codelaser.maddi.cst.impl.statement; +import java.util.*; +import java.util.function.Predicate; +import java.util.stream.Stream; + import io.codelaser.maddi.cst.api.element.*; import io.codelaser.maddi.cst.api.expression.AnnotationExpression; import io.codelaser.maddi.cst.api.expression.Expression; -import io.codelaser.maddi.cst.api.info.InfoMap; import io.codelaser.maddi.cst.api.info.InfoMapView; import io.codelaser.maddi.cst.api.output.OutputBuilder; import io.codelaser.maddi.cst.api.output.Qualification; @@ -32,10 +35,6 @@ import io.codelaser.maddi.cst.api.variable.Variable; import io.codelaser.maddi.cst.impl.output.*; -import java.util.*; -import java.util.function.Predicate; -import java.util.stream.Stream; - public class SwitchStatementOldStyleImpl extends StatementImpl implements SwitchStatementOldStyle { private final Expression selector; private final Block block; diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/statement/SynchronizedStatementImpl.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/statement/SynchronizedStatementImpl.java index b6c57327bf..c0874a8852 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/statement/SynchronizedStatementImpl.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/statement/SynchronizedStatementImpl.java @@ -17,13 +17,17 @@ package io.codelaser.maddi.cst.impl.statement; +import java.util.List; +import java.util.Objects; +import java.util.function.Predicate; +import java.util.stream.Stream; + import io.codelaser.maddi.cst.api.element.Comment; import io.codelaser.maddi.cst.api.element.Element; import io.codelaser.maddi.cst.api.element.Source; import io.codelaser.maddi.cst.api.element.Visitor; import io.codelaser.maddi.cst.api.expression.AnnotationExpression; import io.codelaser.maddi.cst.api.expression.Expression; -import io.codelaser.maddi.cst.api.info.InfoMap; import io.codelaser.maddi.cst.api.info.InfoMapView; import io.codelaser.maddi.cst.api.output.OutputBuilder; import io.codelaser.maddi.cst.api.output.Qualification; @@ -36,11 +40,6 @@ import io.codelaser.maddi.cst.impl.output.KeywordImpl; import io.codelaser.maddi.cst.impl.output.SymbolEnum; -import java.util.List; -import java.util.Objects; -import java.util.function.Predicate; -import java.util.stream.Stream; - public class SynchronizedStatementImpl extends StatementImpl implements SynchronizedStatement { private final Block block; private final Expression expression; diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/statement/ThrowStatementImpl.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/statement/ThrowStatementImpl.java index c18aac84d5..6180a6c19d 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/statement/ThrowStatementImpl.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/statement/ThrowStatementImpl.java @@ -17,13 +17,17 @@ package io.codelaser.maddi.cst.impl.statement; +import java.util.List; +import java.util.Objects; +import java.util.function.Predicate; +import java.util.stream.Stream; + import io.codelaser.maddi.cst.api.element.Comment; import io.codelaser.maddi.cst.api.element.Element; import io.codelaser.maddi.cst.api.element.Source; import io.codelaser.maddi.cst.api.element.Visitor; import io.codelaser.maddi.cst.api.expression.AnnotationExpression; import io.codelaser.maddi.cst.api.expression.Expression; -import io.codelaser.maddi.cst.api.info.InfoMap; import io.codelaser.maddi.cst.api.info.InfoMapView; import io.codelaser.maddi.cst.api.output.OutputBuilder; import io.codelaser.maddi.cst.api.output.Qualification; @@ -37,11 +41,6 @@ import io.codelaser.maddi.cst.impl.output.SpaceEnum; import io.codelaser.maddi.cst.impl.output.SymbolEnum; -import java.util.List; -import java.util.Objects; -import java.util.function.Predicate; -import java.util.stream.Stream; - public class ThrowStatementImpl extends StatementImpl implements ThrowStatement { private final Expression expression; diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/statement/TryStatementImpl.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/statement/TryStatementImpl.java index 3b9d4c6e1e..640c56e445 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/statement/TryStatementImpl.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/statement/TryStatementImpl.java @@ -17,6 +17,12 @@ package io.codelaser.maddi.cst.impl.statement; +import java.util.ArrayList; +import java.util.List; +import java.util.Objects; +import java.util.function.Predicate; +import java.util.stream.Stream; + import io.codelaser.maddi.annotation.rare.IgnoreModifications; import io.codelaser.maddi.cst.api.analysis.PropertyValueMap; import io.codelaser.maddi.cst.api.element.Comment; @@ -24,7 +30,6 @@ import io.codelaser.maddi.cst.api.element.Source; import io.codelaser.maddi.cst.api.element.Visitor; import io.codelaser.maddi.cst.api.expression.AnnotationExpression; -import io.codelaser.maddi.cst.api.info.InfoMap; import io.codelaser.maddi.cst.api.info.InfoMapView; import io.codelaser.maddi.cst.api.output.OutputBuilder; import io.codelaser.maddi.cst.api.output.Qualification; @@ -45,12 +50,6 @@ import io.codelaser.maddi.cst.impl.type.DiamondEnum; import io.codelaser.maddi.util.ZipLists; -import java.util.ArrayList; -import java.util.List; -import java.util.Objects; -import java.util.function.Predicate; -import java.util.stream.Stream; - public class TryStatementImpl extends StatementImpl implements TryStatement { private final Block block; private final Block finallyBlock; diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/statement/WhileStatementImpl.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/statement/WhileStatementImpl.java index e2a2930e0e..12fa78a6c1 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/statement/WhileStatementImpl.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/statement/WhileStatementImpl.java @@ -17,13 +17,17 @@ package io.codelaser.maddi.cst.impl.statement; +import java.util.List; +import java.util.Objects; +import java.util.function.Predicate; +import java.util.stream.Stream; + import io.codelaser.maddi.cst.api.element.Comment; import io.codelaser.maddi.cst.api.element.Element; import io.codelaser.maddi.cst.api.element.Source; import io.codelaser.maddi.cst.api.element.Visitor; import io.codelaser.maddi.cst.api.expression.AnnotationExpression; import io.codelaser.maddi.cst.api.expression.Expression; -import io.codelaser.maddi.cst.api.info.InfoMap; import io.codelaser.maddi.cst.api.info.InfoMapView; import io.codelaser.maddi.cst.api.output.OutputBuilder; import io.codelaser.maddi.cst.api.output.Qualification; @@ -36,11 +40,6 @@ import io.codelaser.maddi.cst.impl.output.KeywordImpl; import io.codelaser.maddi.cst.impl.output.SymbolEnum; -import java.util.List; -import java.util.Objects; -import java.util.function.Predicate; -import java.util.stream.Stream; - public class WhileStatementImpl extends StatementImpl implements WhileStatement { private final Expression expression; private final Block block; diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/statement/YieldStatementImpl.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/statement/YieldStatementImpl.java index 98565d4b1a..6dbcd4eaec 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/statement/YieldStatementImpl.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/statement/YieldStatementImpl.java @@ -17,13 +17,17 @@ package io.codelaser.maddi.cst.impl.statement; +import java.util.List; +import java.util.Objects; +import java.util.function.Predicate; +import java.util.stream.Stream; + import io.codelaser.maddi.cst.api.element.Comment; import io.codelaser.maddi.cst.api.element.Element; import io.codelaser.maddi.cst.api.element.Source; import io.codelaser.maddi.cst.api.element.Visitor; import io.codelaser.maddi.cst.api.expression.AnnotationExpression; import io.codelaser.maddi.cst.api.expression.Expression; -import io.codelaser.maddi.cst.api.info.InfoMap; import io.codelaser.maddi.cst.api.info.InfoMapView; import io.codelaser.maddi.cst.api.output.OutputBuilder; import io.codelaser.maddi.cst.api.output.Qualification; @@ -37,11 +41,6 @@ import io.codelaser.maddi.cst.impl.output.SpaceEnum; import io.codelaser.maddi.cst.impl.output.SymbolEnum; -import java.util.List; -import java.util.Objects; -import java.util.function.Predicate; -import java.util.stream.Stream; - public class YieldStatementImpl extends StatementImpl implements YieldStatement { private final Expression expression; diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/translate/TranslationMapImpl.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/translate/TranslationMapImpl.java index 9844df4d98..cd1c3d8c38 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/translate/TranslationMapImpl.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/translate/TranslationMapImpl.java @@ -17,6 +17,12 @@ package io.codelaser.maddi.cst.impl.translate; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.stream.Collectors; + import io.codelaser.maddi.cst.api.element.Element; import io.codelaser.maddi.cst.api.expression.Expression; import io.codelaser.maddi.cst.api.expression.MethodCall; @@ -34,12 +40,6 @@ import io.codelaser.maddi.cst.impl.variable.FieldReferenceImpl; import io.codelaser.maddi.cst.impl.variable.ThisImpl; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.stream.Collectors; - public class TranslationMapImpl implements TranslationMap { private final Map variables; diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/type/CommonType.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/type/CommonType.java index 6d41f0c45b..6c091f5b1d 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/type/CommonType.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/type/CommonType.java @@ -17,12 +17,12 @@ package io.codelaser.maddi.cst.impl.type; +import java.util.*; + import io.codelaser.maddi.cst.api.info.TypeInfo; import io.codelaser.maddi.cst.api.runtime.Predefined; import io.codelaser.maddi.cst.api.type.ParameterizedType; -import java.util.*; - public class CommonType { private final Predefined runtime; diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/type/DeclaredNullability.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/type/DeclaredNullability.java index 0dd01d71bd..c2a68023a7 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/type/DeclaredNullability.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/type/DeclaredNullability.java @@ -17,6 +17,10 @@ package io.codelaser.maddi.cst.impl.type; +import java.util.List; +import java.util.Set; +import java.util.function.Function; + import io.codelaser.maddi.cst.api.element.CompilationUnit; import io.codelaser.maddi.cst.api.element.Element; import io.codelaser.maddi.cst.api.expression.AnnotationExpression; @@ -28,10 +32,6 @@ import io.codelaser.maddi.cst.api.type.ParameterizedType; import io.codelaser.maddi.cst.impl.analysis.NullAnnotations; -import java.util.List; -import java.util.Set; -import java.util.function.Function; - /** * What the SOURCE says about nullability: the null annotations written on a declaration and on the type arguments * of its type, read against the {@code @NullMarked} scope the declaration sits in. The answer is the declared type diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/type/IsAssignableFrom.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/type/IsAssignableFrom.java index 663d05814d..aef1bf299e 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/type/IsAssignableFrom.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/type/IsAssignableFrom.java @@ -17,6 +17,12 @@ package io.codelaser.maddi.cst.impl.type; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.function.IntBinaryOperator; + import io.codelaser.maddi.cst.api.info.MethodInfo; import io.codelaser.maddi.cst.api.info.ParameterInfo; import io.codelaser.maddi.cst.api.info.TypeInfo; @@ -26,12 +32,6 @@ import io.codelaser.maddi.cst.api.type.Wildcard; import io.codelaser.maddi.util.ListUtil; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.function.IntBinaryOperator; - public class IsAssignableFrom { private final Predefined runtime; private final ParameterizedType target; diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/type/IsAssignableFrom2.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/type/IsAssignableFrom2.java index dfc7bfc9b7..fbefd52e1f 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/type/IsAssignableFrom2.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/type/IsAssignableFrom2.java @@ -17,13 +17,13 @@ package io.codelaser.maddi.cst.impl.type; +import java.util.HashSet; +import java.util.Set; + import io.codelaser.maddi.cst.api.info.TypeInfo; import io.codelaser.maddi.cst.api.runtime.Predefined; import io.codelaser.maddi.cst.api.type.ParameterizedType; -import java.util.HashSet; -import java.util.Set; - public record IsAssignableFrom2(Predefined runtime) { diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/type/ParameterizedTypeImpl.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/type/ParameterizedTypeImpl.java index 394820e17d..6390236812 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/type/ParameterizedTypeImpl.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/type/ParameterizedTypeImpl.java @@ -17,11 +17,14 @@ package io.codelaser.maddi.cst.impl.type; +import java.util.*; +import java.util.stream.Collectors; +import java.util.stream.Stream; + import io.codelaser.maddi.annotation.rare.IgnoreModifications; import io.codelaser.maddi.cst.api.element.DetailedSources; import io.codelaser.maddi.cst.api.element.Element; import io.codelaser.maddi.cst.api.expression.AnnotationExpression; -import io.codelaser.maddi.cst.api.info.InfoMap; import io.codelaser.maddi.cst.api.info.InfoMapView; import io.codelaser.maddi.cst.api.info.MethodInfo; import io.codelaser.maddi.cst.api.info.TypeInfo; @@ -39,10 +42,6 @@ import io.codelaser.maddi.cst.impl.element.ElementImpl; import io.codelaser.maddi.cst.impl.output.QualificationImpl; -import java.util.*; -import java.util.stream.Collectors; -import java.util.stream.Stream; - public class ParameterizedTypeImpl implements ParameterizedType { public static final ParameterizedType NULL_CONSTANT = new ParameterizedTypeImpl(); public static final ParameterizedType RETURN_TYPE_OF_CONSTRUCTOR = new ParameterizedTypeImpl() { diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/type/ParameterizedTypePrinter.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/type/ParameterizedTypePrinter.java index 709e09f038..ef1d9fb6d6 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/type/ParameterizedTypePrinter.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/type/ParameterizedTypePrinter.java @@ -18,10 +18,14 @@ package io.codelaser.maddi.cst.impl.type; +import java.util.ArrayList; +import java.util.LinkedList; +import java.util.List; + +import io.codelaser.maddi.cst.api.expression.AnnotationExpression; import io.codelaser.maddi.cst.api.info.TypeInfo; import io.codelaser.maddi.cst.api.info.TypeParameter; import io.codelaser.maddi.cst.api.output.OutputBuilder; -import io.codelaser.maddi.cst.api.expression.AnnotationExpression; import io.codelaser.maddi.cst.api.output.Qualification; import io.codelaser.maddi.cst.api.output.TypeNameRequired; import io.codelaser.maddi.cst.api.type.Diamond; @@ -29,10 +33,6 @@ import io.codelaser.maddi.cst.api.type.Wildcard; import io.codelaser.maddi.cst.impl.output.*; -import java.util.ArrayList; -import java.util.LinkedList; -import java.util.List; - public class ParameterizedTypePrinter { /** diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/type/TypeParameterImpl.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/type/TypeParameterImpl.java index 34535eaf3c..d9b311fe82 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/type/TypeParameterImpl.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/type/TypeParameterImpl.java @@ -17,7 +17,12 @@ package io.codelaser.maddi.cst.impl.type; +import java.util.*; +import java.util.function.Predicate; +import java.util.stream.Stream; + import io.codelaser.maddi.annotation.NotModified; +import io.codelaser.maddi.annotation.rare.IgnoreModifications; import io.codelaser.maddi.cst.api.analysis.PropertyValueMap; import io.codelaser.maddi.cst.api.element.*; import io.codelaser.maddi.cst.api.expression.AnnotationExpression; @@ -36,11 +41,6 @@ import io.codelaser.maddi.cst.impl.output.*; import io.codelaser.maddi.support.Either; import io.codelaser.maddi.support.EventuallyFinal; -import io.codelaser.maddi.annotation.rare.IgnoreModifications; - -import java.util.*; -import java.util.function.Predicate; -import java.util.stream.Stream; public class TypeParameterImpl extends InfoImpl implements TypeParameter { private final int index; diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/variable/DependentVariableImpl.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/variable/DependentVariableImpl.java index ce83318f85..e9fc0fc912 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/variable/DependentVariableImpl.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/variable/DependentVariableImpl.java @@ -17,6 +17,9 @@ package io.codelaser.maddi.cst.impl.variable; +import java.util.function.Predicate; +import java.util.stream.Stream; + import io.codelaser.maddi.annotation.NotNull; import io.codelaser.maddi.annotation.Nullable; import io.codelaser.maddi.cst.api.element.DetailedSources; @@ -24,7 +27,6 @@ import io.codelaser.maddi.cst.api.element.Source; import io.codelaser.maddi.cst.api.element.Visitor; import io.codelaser.maddi.cst.api.expression.*; -import io.codelaser.maddi.cst.api.info.InfoMap; import io.codelaser.maddi.cst.api.info.InfoMapView; import io.codelaser.maddi.cst.api.output.OutputBuilder; import io.codelaser.maddi.cst.api.output.Qualification; @@ -37,9 +39,6 @@ import io.codelaser.maddi.cst.impl.output.QualificationImpl; import io.codelaser.maddi.cst.impl.output.SymbolEnum; -import java.util.function.Predicate; -import java.util.stream.Stream; - public class DependentVariableImpl extends VariableImpl implements DependentVariable { @NotNull private final Expression indexExpression; diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/variable/FieldReferenceImpl.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/variable/FieldReferenceImpl.java index a3a2366b05..72ceb98272 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/variable/FieldReferenceImpl.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/variable/FieldReferenceImpl.java @@ -17,6 +17,13 @@ package io.codelaser.maddi.cst.impl.variable; +import static io.codelaser.maddi.cst.api.element.Element.TypeReferenceNature.IMPLICIT; + +import java.util.List; +import java.util.Objects; +import java.util.function.Predicate; +import java.util.stream.Stream; + import io.codelaser.maddi.annotation.NotNull; import io.codelaser.maddi.annotation.Nullable; import io.codelaser.maddi.cst.api.element.DetailedSources; @@ -26,7 +33,6 @@ import io.codelaser.maddi.cst.api.expression.TypeExpression; import io.codelaser.maddi.cst.api.expression.VariableExpression; import io.codelaser.maddi.cst.api.info.FieldInfo; -import io.codelaser.maddi.cst.api.info.InfoMap; import io.codelaser.maddi.cst.api.info.InfoMapView; import io.codelaser.maddi.cst.api.info.TypeInfo; import io.codelaser.maddi.cst.api.output.OutputBuilder; @@ -45,13 +51,6 @@ import io.codelaser.maddi.cst.impl.output.*; import io.codelaser.maddi.cst.impl.type.DiamondEnum; -import java.util.List; -import java.util.Objects; -import java.util.function.Predicate; -import java.util.stream.Stream; - -import static io.codelaser.maddi.cst.api.element.Element.TypeReferenceNature.IMPLICIT; - public class FieldReferenceImpl extends VariableImpl implements FieldReference { @NotNull private final FieldInfo fieldInfo; diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/variable/LocalVariableImpl.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/variable/LocalVariableImpl.java index b6da0ff274..7ba8c1fd19 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/variable/LocalVariableImpl.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/variable/LocalVariableImpl.java @@ -17,11 +17,14 @@ package io.codelaser.maddi.cst.impl.variable; +import java.util.Objects; +import java.util.function.Predicate; +import java.util.stream.Stream; + import io.codelaser.maddi.cst.api.element.DetailedSources; import io.codelaser.maddi.cst.api.element.Element; import io.codelaser.maddi.cst.api.element.Visitor; import io.codelaser.maddi.cst.api.expression.Expression; -import io.codelaser.maddi.cst.api.info.InfoMap; import io.codelaser.maddi.cst.api.info.InfoMapView; import io.codelaser.maddi.cst.api.output.OutputBuilder; import io.codelaser.maddi.cst.api.output.Qualification; @@ -33,10 +36,6 @@ import io.codelaser.maddi.cst.impl.output.OutputBuilderImpl; import io.codelaser.maddi.cst.impl.output.QualifiedNameImpl; -import java.util.Objects; -import java.util.function.Predicate; -import java.util.stream.Stream; - public class LocalVariableImpl extends VariableImpl implements LocalVariable { public static final String UNNAMED = ":"; diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/variable/ThisImpl.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/variable/ThisImpl.java index f1aaa44210..e8be32ae11 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/variable/ThisImpl.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/variable/ThisImpl.java @@ -17,10 +17,15 @@ package io.codelaser.maddi.cst.impl.variable; +import static io.codelaser.maddi.cst.api.element.Element.TypeReferenceNature.EXPLICIT; +import static io.codelaser.maddi.cst.api.element.Element.TypeReferenceNature.IMPLICIT; + +import java.util.function.Predicate; +import java.util.stream.Stream; + import io.codelaser.maddi.cst.api.element.DetailedSources; import io.codelaser.maddi.cst.api.element.Element; import io.codelaser.maddi.cst.api.element.Visitor; -import io.codelaser.maddi.cst.api.info.InfoMap; import io.codelaser.maddi.cst.api.info.InfoMapView; import io.codelaser.maddi.cst.api.info.TypeInfo; import io.codelaser.maddi.cst.api.output.OutputBuilder; @@ -37,12 +42,6 @@ import io.codelaser.maddi.cst.impl.output.TextImpl; import io.codelaser.maddi.cst.impl.output.TypeNameImpl; -import java.util.function.Predicate; -import java.util.stream.Stream; - -import static io.codelaser.maddi.cst.api.element.Element.TypeReferenceNature.EXPLICIT; -import static io.codelaser.maddi.cst.api.element.Element.TypeReferenceNature.IMPLICIT; - public class ThisImpl extends VariableImpl implements This { private final boolean writeSuper; diff --git a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/variable/VariableImpl.java b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/variable/VariableImpl.java index 8a650ef5bd..821ad6d267 100644 --- a/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/variable/VariableImpl.java +++ b/maddi-cst-impl/src/main/java/io/codelaser/maddi/cst/impl/variable/VariableImpl.java @@ -17,6 +17,10 @@ package io.codelaser.maddi.cst.impl.variable; +import java.util.List; +import java.util.Objects; +import java.util.stream.Stream; + import io.codelaser.maddi.annotation.rare.IgnoreModifications; import io.codelaser.maddi.cst.api.element.Comment; import io.codelaser.maddi.cst.api.element.Source; @@ -25,10 +29,6 @@ import io.codelaser.maddi.cst.impl.element.SourceImpl; import io.codelaser.maddi.cst.impl.output.QualificationImpl; -import java.util.List; -import java.util.Objects; -import java.util.stream.Stream; - public abstract class VariableImpl implements Variable { private final ParameterizedType parameterizedType; diff --git a/maddi-cst-impl/src/test/java/io/codelaser/maddi/cst/impl/element/TestDetailedSourcesOwnsItsState.java b/maddi-cst-impl/src/test/java/io/codelaser/maddi/cst/impl/element/TestDetailedSourcesOwnsItsState.java index 967d8ab232..9b12dde8fb 100644 --- a/maddi-cst-impl/src/test/java/io/codelaser/maddi/cst/impl/element/TestDetailedSourcesOwnsItsState.java +++ b/maddi-cst-impl/src/test/java/io/codelaser/maddi/cst/impl/element/TestDetailedSourcesOwnsItsState.java @@ -17,16 +17,17 @@ package io.codelaser.maddi.cst.impl.element; -import io.codelaser.maddi.cst.api.element.DetailedSources; -import io.codelaser.maddi.cst.api.element.Source; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; import java.util.ArrayList; import java.util.List; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertThrows; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; + +import io.codelaser.maddi.cst.api.element.DetailedSources; +import io.codelaser.maddi.cst.api.element.Source; /** * A built {@link DetailedSources} owns its state (#51): before, {@code build()} handed over the builder's maps and diff --git a/maddi-cst-impl/src/test/java/io/codelaser/maddi/cst/impl/element/TestModuleInfoPrint.java b/maddi-cst-impl/src/test/java/io/codelaser/maddi/cst/impl/element/TestModuleInfoPrint.java index b4723357b4..43f9c89cbd 100644 --- a/maddi-cst-impl/src/test/java/io/codelaser/maddi/cst/impl/element/TestModuleInfoPrint.java +++ b/maddi-cst-impl/src/test/java/io/codelaser/maddi/cst/impl/element/TestModuleInfoPrint.java @@ -17,17 +17,17 @@ package io.codelaser.maddi.cst.impl.element; -import io.codelaser.maddi.cst.api.element.ModuleInfo; -import io.codelaser.maddi.cst.api.output.Qualification; -import io.codelaser.maddi.cst.impl.output.QualificationImpl; -import io.codelaser.maddi.cst.api.runtime.Runtime; -import io.codelaser.maddi.cst.impl.runtime.RuntimeImpl; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.List; -import static org.junit.jupiter.api.Assertions.assertEquals; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; + +import io.codelaser.maddi.cst.api.element.ModuleInfo; +import io.codelaser.maddi.cst.api.runtime.Runtime; +import io.codelaser.maddi.cst.impl.output.QualificationImpl; +import io.codelaser.maddi.cst.impl.runtime.RuntimeImpl; /** * Every module directive used to answer {@code print(Qualification)} with {@code null}, so the only way to produce diff --git a/maddi-cst-impl/src/test/java/io/codelaser/maddi/cst/impl/element/TestMultiLineCommentPrint.java b/maddi-cst-impl/src/test/java/io/codelaser/maddi/cst/impl/element/TestMultiLineCommentPrint.java index 5ebe4a3f5b..2d1f972c67 100644 --- a/maddi-cst-impl/src/test/java/io/codelaser/maddi/cst/impl/element/TestMultiLineCommentPrint.java +++ b/maddi-cst-impl/src/test/java/io/codelaser/maddi/cst/impl/element/TestMultiLineCommentPrint.java @@ -17,13 +17,14 @@ package io.codelaser.maddi.cst.impl.element; -import io.codelaser.maddi.cst.api.output.OutputBuilder; -import io.codelaser.maddi.cst.impl.output.TextImpl; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertTrue; +import io.codelaser.maddi.cst.api.output.OutputBuilder; +import io.codelaser.maddi.cst.impl.output.TextImpl; /** * Real-world sources carry trailing whitespace before the newline inside block comments (closed-core, diff --git a/maddi-cst-impl/src/test/java/io/codelaser/maddi/cst/impl/expression/TestAbstractValue.java b/maddi-cst-impl/src/test/java/io/codelaser/maddi/cst/impl/expression/TestAbstractValue.java index 176de24316..484d52e72f 100644 --- a/maddi-cst-impl/src/test/java/io/codelaser/maddi/cst/impl/expression/TestAbstractValue.java +++ b/maddi-cst-impl/src/test/java/io/codelaser/maddi/cst/impl/expression/TestAbstractValue.java @@ -17,10 +17,11 @@ package io.codelaser.maddi.cst.impl.expression; -import io.codelaser.maddi.cst.api.expression.Expression; +import static org.junit.jupiter.api.Assertions.assertEquals; + import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; +import io.codelaser.maddi.cst.api.expression.Expression; public class TestAbstractValue extends CommonTest { diff --git a/maddi-cst-impl/src/test/java/io/codelaser/maddi/cst/impl/expression/TestAndComparison.java b/maddi-cst-impl/src/test/java/io/codelaser/maddi/cst/impl/expression/TestAndComparison.java index 7a6b8daf0b..118ffbceee 100644 --- a/maddi-cst-impl/src/test/java/io/codelaser/maddi/cst/impl/expression/TestAndComparison.java +++ b/maddi-cst-impl/src/test/java/io/codelaser/maddi/cst/impl/expression/TestAndComparison.java @@ -17,11 +17,12 @@ package io.codelaser.maddi.cst.impl.expression; -import io.codelaser.maddi.cst.api.expression.Expression; +import static org.junit.jupiter.api.Assertions.assertEquals; + import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; +import io.codelaser.maddi.cst.api.expression.Expression; public class TestAndComparison extends CommonTest { diff --git a/maddi-cst-impl/src/test/java/io/codelaser/maddi/cst/impl/expression/TestAndOr.java b/maddi-cst-impl/src/test/java/io/codelaser/maddi/cst/impl/expression/TestAndOr.java index 0bd04c73bd..66a0193e6d 100644 --- a/maddi-cst-impl/src/test/java/io/codelaser/maddi/cst/impl/expression/TestAndOr.java +++ b/maddi-cst-impl/src/test/java/io/codelaser/maddi/cst/impl/expression/TestAndOr.java @@ -17,13 +17,14 @@ package io.codelaser.maddi.cst.impl.expression; -import io.codelaser.maddi.cst.api.expression.Expression; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.List; -import static org.junit.jupiter.api.Assertions.assertEquals; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; + +import io.codelaser.maddi.cst.api.expression.Expression; public class TestAndOr extends CommonTest { diff --git a/maddi-cst-impl/src/test/java/io/codelaser/maddi/cst/impl/expression/TestAndSorting.java b/maddi-cst-impl/src/test/java/io/codelaser/maddi/cst/impl/expression/TestAndSorting.java index 2c9c58b5d9..1baef83e64 100644 --- a/maddi-cst-impl/src/test/java/io/codelaser/maddi/cst/impl/expression/TestAndSorting.java +++ b/maddi-cst-impl/src/test/java/io/codelaser/maddi/cst/impl/expression/TestAndSorting.java @@ -17,12 +17,13 @@ package io.codelaser.maddi.cst.impl.expression; -import io.codelaser.maddi.cst.api.expression.Expression; -import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.List; -import static org.junit.jupiter.api.Assertions.assertEquals; +import org.junit.jupiter.api.Test; + +import io.codelaser.maddi.cst.api.expression.Expression; public class TestAndSorting extends CommonTest { diff --git a/maddi-cst-impl/src/test/java/io/codelaser/maddi/cst/impl/expression/TestBooleanAndComparison.java b/maddi-cst-impl/src/test/java/io/codelaser/maddi/cst/impl/expression/TestBooleanAndComparison.java index 21470219aa..f125756daf 100644 --- a/maddi-cst-impl/src/test/java/io/codelaser/maddi/cst/impl/expression/TestBooleanAndComparison.java +++ b/maddi-cst-impl/src/test/java/io/codelaser/maddi/cst/impl/expression/TestBooleanAndComparison.java @@ -17,11 +17,12 @@ package io.codelaser.maddi.cst.impl.expression; -import io.codelaser.maddi.cst.api.expression.Expression; -import io.codelaser.maddi.cst.api.expression.GreaterThanZero; +import static org.junit.jupiter.api.Assertions.*; + import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.*; +import io.codelaser.maddi.cst.api.expression.Expression; +import io.codelaser.maddi.cst.api.expression.GreaterThanZero; public class TestBooleanAndComparison extends CommonTest { diff --git a/maddi-cst-impl/src/test/java/io/codelaser/maddi/cst/impl/expression/TestBooleanExpressions.java b/maddi-cst-impl/src/test/java/io/codelaser/maddi/cst/impl/expression/TestBooleanExpressions.java index be6a3bd74a..9471b34a01 100644 --- a/maddi-cst-impl/src/test/java/io/codelaser/maddi/cst/impl/expression/TestBooleanExpressions.java +++ b/maddi-cst-impl/src/test/java/io/codelaser/maddi/cst/impl/expression/TestBooleanExpressions.java @@ -18,10 +18,11 @@ package io.codelaser.maddi.cst.impl.expression; -import io.codelaser.maddi.cst.api.expression.Expression; +import static org.junit.jupiter.api.Assertions.assertEquals; + import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; +import io.codelaser.maddi.cst.api.expression.Expression; public class TestBooleanExpressions extends CommonTest { diff --git a/maddi-cst-impl/src/test/java/io/codelaser/maddi/cst/impl/expression/TestCastAndArrayAccess.java b/maddi-cst-impl/src/test/java/io/codelaser/maddi/cst/impl/expression/TestCastAndArrayAccess.java index 0df91596d8..79dba41dc9 100644 --- a/maddi-cst-impl/src/test/java/io/codelaser/maddi/cst/impl/expression/TestCastAndArrayAccess.java +++ b/maddi-cst-impl/src/test/java/io/codelaser/maddi/cst/impl/expression/TestCastAndArrayAccess.java @@ -17,15 +17,16 @@ package io.codelaser.maddi.cst.impl.expression; +import static org.junit.jupiter.api.Assertions.assertEquals; + +import org.junit.jupiter.api.Test; + import io.codelaser.maddi.cst.api.element.Source; import io.codelaser.maddi.cst.api.expression.Cast; import io.codelaser.maddi.cst.api.expression.VariableExpression; import io.codelaser.maddi.cst.api.type.ParameterizedType; import io.codelaser.maddi.cst.api.variable.DependentVariable; import io.codelaser.maddi.cst.api.variable.LocalVariable; -import org.junit.jupiter.api.Test; - -import static org.junit.jupiter.api.Assertions.assertEquals; public class TestCastAndArrayAccess extends CommonTest { diff --git a/maddi-cst-impl/src/test/java/io/codelaser/maddi/cst/impl/expression/TestCharLiteral.java b/maddi-cst-impl/src/test/java/io/codelaser/maddi/cst/impl/expression/TestCharLiteral.java index 1495443a68..cc2709503d 100644 --- a/maddi-cst-impl/src/test/java/io/codelaser/maddi/cst/impl/expression/TestCharLiteral.java +++ b/maddi-cst-impl/src/test/java/io/codelaser/maddi/cst/impl/expression/TestCharLiteral.java @@ -17,13 +17,11 @@ package io.codelaser.maddi.cst.impl.expression; -import io.codelaser.maddi.cst.api.runtime.Predefined; -import io.codelaser.maddi.cst.api.type.ParameterizedType; -import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.List; -import static org.junit.jupiter.api.Assertions.assertEquals; +import org.junit.jupiter.api.Test; public class TestCharLiteral { diff --git a/maddi-cst-impl/src/test/java/io/codelaser/maddi/cst/impl/expression/TestComplexity.java b/maddi-cst-impl/src/test/java/io/codelaser/maddi/cst/impl/expression/TestComplexity.java index 092965cfb6..252970f297 100644 --- a/maddi-cst-impl/src/test/java/io/codelaser/maddi/cst/impl/expression/TestComplexity.java +++ b/maddi-cst-impl/src/test/java/io/codelaser/maddi/cst/impl/expression/TestComplexity.java @@ -17,14 +17,15 @@ package io.codelaser.maddi.cst.impl.expression; +import static org.junit.jupiter.api.Assertions.assertEquals; + +import org.junit.jupiter.api.Test; + import io.codelaser.maddi.cst.api.expression.Expression; import io.codelaser.maddi.cst.api.expression.IntConstant; import io.codelaser.maddi.cst.api.expression.VariableExpression; import io.codelaser.maddi.cst.api.variable.DependentVariable; import io.codelaser.maddi.cst.api.variable.Variable; -import org.junit.jupiter.api.Test; - -import static org.junit.jupiter.api.Assertions.assertEquals; public class TestComplexity extends CommonTest { diff --git a/maddi-cst-impl/src/test/java/io/codelaser/maddi/cst/impl/expression/TestEvalBudget.java b/maddi-cst-impl/src/test/java/io/codelaser/maddi/cst/impl/expression/TestEvalBudget.java index 72674cc582..94b7f275ab 100644 --- a/maddi-cst-impl/src/test/java/io/codelaser/maddi/cst/impl/expression/TestEvalBudget.java +++ b/maddi-cst-impl/src/test/java/io/codelaser/maddi/cst/impl/expression/TestEvalBudget.java @@ -17,16 +17,17 @@ package io.codelaser.maddi.cst.impl.expression; -import io.codelaser.maddi.cst.api.expression.Expression; -import io.codelaser.maddi.cst.api.expression.Negation; -import io.codelaser.maddi.cst.impl.expression.eval.EvalBudget; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.*; import java.time.Duration; import java.util.concurrent.CancellationException; -import static org.junit.jupiter.api.Assertions.*; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; + +import io.codelaser.maddi.cst.api.expression.Expression; +import io.codelaser.maddi.cst.api.expression.Negation; +import io.codelaser.maddi.cst.impl.expression.eval.EvalBudget; /** * maddi-mod#20: the boolean evaluator must stop when its thread is interrupted, and negating an And/Or whose diff --git a/maddi-cst-impl/src/test/java/io/codelaser/maddi/cst/impl/expression/TestExpressionComparatorConcurrent.java b/maddi-cst-impl/src/test/java/io/codelaser/maddi/cst/impl/expression/TestExpressionComparatorConcurrent.java index 4f92d4d4de..4ca14c3b8f 100644 --- a/maddi-cst-impl/src/test/java/io/codelaser/maddi/cst/impl/expression/TestExpressionComparatorConcurrent.java +++ b/maddi-cst-impl/src/test/java/io/codelaser/maddi/cst/impl/expression/TestExpressionComparatorConcurrent.java @@ -17,10 +17,8 @@ package io.codelaser.maddi.cst.impl.expression; -import io.codelaser.maddi.cst.api.expression.Expression; -import io.codelaser.maddi.cst.impl.expression.util.ExpressionComparator; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTimeoutPreemptively; import java.time.Duration; import java.util.ArrayList; @@ -29,8 +27,11 @@ import java.util.concurrent.Executors; import java.util.concurrent.Future; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertTimeoutPreemptively; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; + +import io.codelaser.maddi.cst.api.expression.Expression; +import io.codelaser.maddi.cst.impl.expression.util.ExpressionComparator; /** * The comparator's SINGLETON is shared by every thread that sorts expressions; its memoization cache was one diff --git a/maddi-cst-impl/src/test/java/io/codelaser/maddi/cst/impl/expression/TestGreaterThanAndOr.java b/maddi-cst-impl/src/test/java/io/codelaser/maddi/cst/impl/expression/TestGreaterThanAndOr.java index 75a7c5e2ff..5062748237 100644 --- a/maddi-cst-impl/src/test/java/io/codelaser/maddi/cst/impl/expression/TestGreaterThanAndOr.java +++ b/maddi-cst-impl/src/test/java/io/codelaser/maddi/cst/impl/expression/TestGreaterThanAndOr.java @@ -17,12 +17,13 @@ package io.codelaser.maddi.cst.impl.expression; -import io.codelaser.maddi.cst.api.expression.Expression; -import org.junit.jupiter.api.Test; - import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotEquals; +import org.junit.jupiter.api.Test; + +import io.codelaser.maddi.cst.api.expression.Expression; + /* NOTE: there are some rules commented out in EvalOr */ diff --git a/maddi-cst-impl/src/test/java/io/codelaser/maddi/cst/impl/expression/TestInequality.java b/maddi-cst-impl/src/test/java/io/codelaser/maddi/cst/impl/expression/TestInequality.java index 21c3230d95..b804107fe3 100644 --- a/maddi-cst-impl/src/test/java/io/codelaser/maddi/cst/impl/expression/TestInequality.java +++ b/maddi-cst-impl/src/test/java/io/codelaser/maddi/cst/impl/expression/TestInequality.java @@ -17,16 +17,17 @@ package io.codelaser.maddi.cst.impl.expression; +import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; + +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; + import io.codelaser.maddi.cst.api.expression.DoubleConstant; import io.codelaser.maddi.cst.api.expression.Expression; import io.codelaser.maddi.cst.api.expression.GreaterThanZero; import io.codelaser.maddi.cst.api.expression.IntConstant; import io.codelaser.maddi.util.IntUtil; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; - -import static org.junit.jupiter.api.Assertions.*; -import static org.junit.jupiter.api.Assertions.assertEquals; public class TestInequality extends CommonTest { diff --git a/maddi-cst-impl/src/test/java/io/codelaser/maddi/cst/impl/expression/TestInstanceOf.java b/maddi-cst-impl/src/test/java/io/codelaser/maddi/cst/impl/expression/TestInstanceOf.java index 20b6ecef6c..fed2d6a130 100644 --- a/maddi-cst-impl/src/test/java/io/codelaser/maddi/cst/impl/expression/TestInstanceOf.java +++ b/maddi-cst-impl/src/test/java/io/codelaser/maddi/cst/impl/expression/TestInstanceOf.java @@ -17,10 +17,11 @@ package io.codelaser.maddi.cst.impl.expression; -import io.codelaser.maddi.cst.api.expression.Expression; +import static org.junit.jupiter.api.Assertions.*; + import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.*; +import io.codelaser.maddi.cst.api.expression.Expression; public class TestInstanceOf extends CommonTest { diff --git a/maddi-cst-impl/src/test/java/io/codelaser/maddi/cst/impl/expression/TestMethod.java b/maddi-cst-impl/src/test/java/io/codelaser/maddi/cst/impl/expression/TestMethod.java index 56f16bfde4..dc5912e1b3 100644 --- a/maddi-cst-impl/src/test/java/io/codelaser/maddi/cst/impl/expression/TestMethod.java +++ b/maddi-cst-impl/src/test/java/io/codelaser/maddi/cst/impl/expression/TestMethod.java @@ -17,6 +17,14 @@ package io.codelaser.maddi.cst.impl.expression; +import static org.junit.jupiter.api.Assertions.*; + +import java.util.List; +import java.util.NoSuchElementException; + +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; + import io.codelaser.maddi.cst.api.element.CompilationUnit; import io.codelaser.maddi.cst.api.info.MethodInfo; import io.codelaser.maddi.cst.api.info.TypeInfo; @@ -25,13 +33,6 @@ import io.codelaser.maddi.cst.impl.info.ImportComputerImpl; import io.codelaser.maddi.cst.impl.info.TypePrinterImpl; import io.codelaser.maddi.cst.impl.runtime.RuntimeImpl; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; - -import java.util.List; -import java.util.NoSuchElementException; - -import static org.junit.jupiter.api.Assertions.*; public class TestMethod { diff --git a/maddi-cst-impl/src/test/java/io/codelaser/maddi/cst/impl/expression/TestNegationStructure.java b/maddi-cst-impl/src/test/java/io/codelaser/maddi/cst/impl/expression/TestNegationStructure.java index 99e72f261a..a048b10e14 100644 --- a/maddi-cst-impl/src/test/java/io/codelaser/maddi/cst/impl/expression/TestNegationStructure.java +++ b/maddi-cst-impl/src/test/java/io/codelaser/maddi/cst/impl/expression/TestNegationStructure.java @@ -17,6 +17,19 @@ package io.codelaser.maddi.cst.impl.expression; +import static org.junit.jupiter.api.Assertions.*; + +import java.time.Duration; +import java.util.ArrayList; +import java.util.List; +import java.util.Random; +import java.util.Set; +import java.util.function.BooleanSupplier; + +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; + import io.codelaser.maddi.cst.api.expression.Expression; import io.codelaser.maddi.cst.api.expression.InstanceOf; import io.codelaser.maddi.cst.api.info.FieldInfo; @@ -26,18 +39,6 @@ import io.codelaser.maddi.cst.impl.expression.eval.EvalSwitches; import io.codelaser.maddi.cst.impl.expression.util.AndOrSorter; import io.codelaser.maddi.cst.impl.runtime.RuntimeImpl; -import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; - -import java.time.Duration; -import java.util.ArrayList; -import java.util.List; -import java.util.Random; -import java.util.Set; -import java.util.function.BooleanSupplier; - -import static org.junit.jupiter.api.Assertions.*; /** * The structural answer to isNegationOf for an And against an Or (gate NOSTRUCTNEG), the per-operation negation diff --git a/maddi-cst-impl/src/test/java/io/codelaser/maddi/cst/impl/expression/TestParameterOrder.java b/maddi-cst-impl/src/test/java/io/codelaser/maddi/cst/impl/expression/TestParameterOrder.java index f6c6428fa1..98c5c582c3 100644 --- a/maddi-cst-impl/src/test/java/io/codelaser/maddi/cst/impl/expression/TestParameterOrder.java +++ b/maddi-cst-impl/src/test/java/io/codelaser/maddi/cst/impl/expression/TestParameterOrder.java @@ -1,5 +1,14 @@ package io.codelaser.maddi.cst.impl.expression; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.util.ArrayList; +import java.util.List; + +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; + import io.codelaser.maddi.cst.api.element.CompilationUnit; import io.codelaser.maddi.cst.api.info.MethodInfo; import io.codelaser.maddi.cst.api.info.ParameterInfo; @@ -8,14 +17,6 @@ import io.codelaser.maddi.cst.api.variable.DependentVariable; import io.codelaser.maddi.cst.api.variable.Variable; import io.codelaser.maddi.cst.impl.runtime.RuntimeImpl; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; - -import java.util.ArrayList; -import java.util.List; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; /** * The order of variables is one order, by fully qualified name. Parameters of one method used to compare by index diff --git a/maddi-cst-impl/src/test/java/io/codelaser/maddi/cst/impl/expression/TestProduct.java b/maddi-cst-impl/src/test/java/io/codelaser/maddi/cst/impl/expression/TestProduct.java index 9ecee54a3c..2898dfcb87 100644 --- a/maddi-cst-impl/src/test/java/io/codelaser/maddi/cst/impl/expression/TestProduct.java +++ b/maddi-cst-impl/src/test/java/io/codelaser/maddi/cst/impl/expression/TestProduct.java @@ -17,11 +17,11 @@ package io.codelaser.maddi.cst.impl.expression; -import io.codelaser.maddi.cst.api.expression.Expression; -import io.codelaser.maddi.cst.api.expression.VariableExpression; +import static org.junit.jupiter.api.Assertions.assertEquals; + import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; +import io.codelaser.maddi.cst.api.expression.Expression; public class TestProduct extends CommonTest { diff --git a/maddi-cst-impl/src/test/java/io/codelaser/maddi/cst/impl/expression/TestStringConcat.java b/maddi-cst-impl/src/test/java/io/codelaser/maddi/cst/impl/expression/TestStringConcat.java index 9b3a5ca5e3..6ee8421dcf 100644 --- a/maddi-cst-impl/src/test/java/io/codelaser/maddi/cst/impl/expression/TestStringConcat.java +++ b/maddi-cst-impl/src/test/java/io/codelaser/maddi/cst/impl/expression/TestStringConcat.java @@ -17,13 +17,14 @@ package io.codelaser.maddi.cst.impl.expression; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertInstanceOf; + +import org.junit.jupiter.api.Test; + import io.codelaser.maddi.cst.api.expression.BinaryOperator; import io.codelaser.maddi.cst.api.expression.Expression; import io.codelaser.maddi.cst.api.expression.StringConcat; -import org.junit.jupiter.api.Test; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertInstanceOf; public class TestStringConcat extends CommonTest { @Test diff --git a/maddi-cst-impl/src/test/java/io/codelaser/maddi/cst/impl/expression/TestSum.java b/maddi-cst-impl/src/test/java/io/codelaser/maddi/cst/impl/expression/TestSum.java index 904238160b..3544136858 100644 --- a/maddi-cst-impl/src/test/java/io/codelaser/maddi/cst/impl/expression/TestSum.java +++ b/maddi-cst-impl/src/test/java/io/codelaser/maddi/cst/impl/expression/TestSum.java @@ -17,10 +17,11 @@ package io.codelaser.maddi.cst.impl.expression; -import io.codelaser.maddi.cst.api.expression.Expression; +import static org.junit.jupiter.api.Assertions.assertEquals; + import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; +import io.codelaser.maddi.cst.api.expression.Expression; public class TestSum extends CommonTest { diff --git a/maddi-cst-impl/src/test/java/io/codelaser/maddi/cst/impl/info/TestOverridesOrder.java b/maddi-cst-impl/src/test/java/io/codelaser/maddi/cst/impl/info/TestOverridesOrder.java index cd259793a6..ab127dbe9d 100644 --- a/maddi-cst-impl/src/test/java/io/codelaser/maddi/cst/impl/info/TestOverridesOrder.java +++ b/maddi-cst-impl/src/test/java/io/codelaser/maddi/cst/impl/info/TestOverridesOrder.java @@ -1,18 +1,19 @@ package io.codelaser.maddi.cst.impl.info; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; + +import java.util.ArrayList; +import java.util.List; + +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; + import io.codelaser.maddi.cst.api.element.CompilationUnit; import io.codelaser.maddi.cst.api.info.MethodInfo; import io.codelaser.maddi.cst.api.info.TypeInfo; import io.codelaser.maddi.cst.api.runtime.Runtime; import io.codelaser.maddi.cst.impl.runtime.RuntimeImpl; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; - -import java.util.ArrayList; -import java.util.List; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertThrows; /** * A method's overrides iterate in the order of their fully qualified names, whatever order they were added in. They diff --git a/maddi-cst-impl/src/test/java/io/codelaser/maddi/cst/impl/info/TestParameterFullyQualifiedName.java b/maddi-cst-impl/src/test/java/io/codelaser/maddi/cst/impl/info/TestParameterFullyQualifiedName.java index eaafb6db42..a72af2a09c 100644 --- a/maddi-cst-impl/src/test/java/io/codelaser/maddi/cst/impl/info/TestParameterFullyQualifiedName.java +++ b/maddi-cst-impl/src/test/java/io/codelaser/maddi/cst/impl/info/TestParameterFullyQualifiedName.java @@ -1,16 +1,17 @@ package io.codelaser.maddi.cst.impl.info; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertSame; + +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; + import io.codelaser.maddi.cst.api.element.CompilationUnit; import io.codelaser.maddi.cst.api.info.MethodInfo; import io.codelaser.maddi.cst.api.info.ParameterInfo; import io.codelaser.maddi.cst.api.info.TypeInfo; import io.codelaser.maddi.cst.api.runtime.Runtime; import io.codelaser.maddi.cst.impl.runtime.RuntimeImpl; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertSame; /** * A parameter's fully qualified name holds its method's full signature. The prepwork analysis keys every statement's diff --git a/maddi-cst-impl/src/test/java/io/codelaser/maddi/cst/impl/output/TestTextBlockFormattingImpl.java b/maddi-cst-impl/src/test/java/io/codelaser/maddi/cst/impl/output/TestTextBlockFormattingImpl.java index 7b5d3436df..a858261fbc 100644 --- a/maddi-cst-impl/src/test/java/io/codelaser/maddi/cst/impl/output/TestTextBlockFormattingImpl.java +++ b/maddi-cst-impl/src/test/java/io/codelaser/maddi/cst/impl/output/TestTextBlockFormattingImpl.java @@ -17,11 +17,11 @@ package io.codelaser.maddi.cst.impl.output; +import static org.junit.jupiter.api.Assertions.assertEquals; + import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; - public class TestTextBlockFormattingImpl { String s1 = """ diff --git a/maddi-cst-impl/src/test/java/io/codelaser/maddi/cst/impl/runtime/TestPredefinedSourceSetName.java b/maddi-cst-impl/src/test/java/io/codelaser/maddi/cst/impl/runtime/TestPredefinedSourceSetName.java index 67239e89bc..446226c121 100644 --- a/maddi-cst-impl/src/test/java/io/codelaser/maddi/cst/impl/runtime/TestPredefinedSourceSetName.java +++ b/maddi-cst-impl/src/test/java/io/codelaser/maddi/cst/impl/runtime/TestPredefinedSourceSetName.java @@ -1,11 +1,12 @@ package io.codelaser.maddi.cst.impl.runtime; -import io.codelaser.maddi.cst.api.element.SourceSet; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; +import io.codelaser.maddi.cst.api.element.SourceSet; /** * A source set that claims {@link SourceSet#partOfJdk()} is named after its JPMS module. That is the convention diff --git a/maddi-cst-impl/src/test/java/io/codelaser/maddi/cst/impl/translate/TestTranslateDependentVariable.java b/maddi-cst-impl/src/test/java/io/codelaser/maddi/cst/impl/translate/TestTranslateDependentVariable.java index 395745fd79..f14b4fe883 100644 --- a/maddi-cst-impl/src/test/java/io/codelaser/maddi/cst/impl/translate/TestTranslateDependentVariable.java +++ b/maddi-cst-impl/src/test/java/io/codelaser/maddi/cst/impl/translate/TestTranslateDependentVariable.java @@ -17,17 +17,16 @@ package io.codelaser.maddi.cst.impl.translate; -import io.codelaser.maddi.cst.api.expression.Expression; -import io.codelaser.maddi.cst.api.expression.VariableExpression; +import static org.junit.jupiter.api.Assertions.assertEquals; + +import org.junit.jupiter.api.Test; + import io.codelaser.maddi.cst.api.info.FieldInfo; import io.codelaser.maddi.cst.api.info.TypeInfo; import io.codelaser.maddi.cst.api.runtime.Runtime; import io.codelaser.maddi.cst.api.translate.TranslationMap; import io.codelaser.maddi.cst.api.variable.*; import io.codelaser.maddi.cst.impl.runtime.RuntimeImpl; -import org.junit.jupiter.api.Test; - -import static org.junit.jupiter.api.Assertions.assertEquals; public class TestTranslateDependentVariable { private final Runtime r = new RuntimeImpl(); diff --git a/maddi-cst-impl/src/test/java/io/codelaser/maddi/cst/impl/type/TestCachedHashes.java b/maddi-cst-impl/src/test/java/io/codelaser/maddi/cst/impl/type/TestCachedHashes.java index ff46bd36a0..681c03c3b3 100644 --- a/maddi-cst-impl/src/test/java/io/codelaser/maddi/cst/impl/type/TestCachedHashes.java +++ b/maddi-cst-impl/src/test/java/io/codelaser/maddi/cst/impl/type/TestCachedHashes.java @@ -1,5 +1,15 @@ package io.codelaser.maddi.cst.impl.type; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.util.List; +import java.util.Objects; + +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; + import io.codelaser.maddi.cst.api.element.CompilationUnit; import io.codelaser.maddi.cst.api.info.MethodInfo; import io.codelaser.maddi.cst.api.info.TypeInfo; @@ -7,15 +17,6 @@ import io.codelaser.maddi.cst.api.type.ParameterizedType; import io.codelaser.maddi.cst.impl.runtime.RuntimeImpl; import io.codelaser.maddi.support.Either; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; - -import java.util.List; -import java.util.Objects; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertTrue; /** * The cached hashes of ParameterizedTypeImpl and TypeParameterImpl (docs/status/performance-2026-10-22.md) keep the diff --git a/maddi-cst-io/src/main/java/io/codelaser/maddi/cst/io/CodecImpl.java b/maddi-cst-io/src/main/java/io/codelaser/maddi/cst/io/CodecImpl.java index f78b3bd62b..87504401c7 100644 --- a/maddi-cst-io/src/main/java/io/codelaser/maddi/cst/io/CodecImpl.java +++ b/maddi-cst-io/src/main/java/io/codelaser/maddi/cst/io/CodecImpl.java @@ -17,6 +17,22 @@ package io.codelaser.maddi.cst.io; +import java.io.IOException; +import java.io.StringWriter; +import java.io.Writer; +import java.util.*; +import java.util.function.BiFunction; +import java.util.function.Function; +import java.util.regex.Matcher; +import java.util.regex.Pattern; +import java.util.stream.Collectors; +import java.util.stream.Stream; + +import org.parsers.json.Node; +import org.parsers.json.ast.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import io.codelaser.maddi.cst.api.analysis.Codec; import io.codelaser.maddi.cst.api.analysis.Property; import io.codelaser.maddi.cst.api.analysis.PropertyValueMap; @@ -31,21 +47,6 @@ import io.codelaser.maddi.cst.api.type.Wildcard; import io.codelaser.maddi.cst.api.variable.*; import io.codelaser.maddi.cst.impl.analysis.PropertyImpl; -import org.parsers.json.Node; -import org.parsers.json.ast.*; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.io.IOException; -import java.io.StringWriter; -import java.io.Writer; -import java.util.*; -import java.util.function.BiFunction; -import java.util.function.Function; -import java.util.regex.Matcher; -import java.util.regex.Pattern; -import java.util.stream.Collectors; -import java.util.stream.Stream; public class CodecImpl implements Codec { private static final Logger LOGGER = LoggerFactory.getLogger(CodecImpl.class); diff --git a/maddi-cst-io/src/main/java/io/codelaser/maddi/cst/io/ExpressionCodec.java b/maddi-cst-io/src/main/java/io/codelaser/maddi/cst/io/ExpressionCodec.java index c90e12e680..e07afaa6e4 100644 --- a/maddi-cst-io/src/main/java/io/codelaser/maddi/cst/io/ExpressionCodec.java +++ b/maddi-cst-io/src/main/java/io/codelaser/maddi/cst/io/ExpressionCodec.java @@ -17,6 +17,11 @@ package io.codelaser.maddi.cst.io; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Stream; + import io.codelaser.maddi.cst.api.analysis.Codec; import io.codelaser.maddi.cst.api.element.Source; import io.codelaser.maddi.cst.api.expression.*; @@ -26,11 +31,6 @@ import io.codelaser.maddi.cst.api.type.ParameterizedType; import io.codelaser.maddi.cst.api.variable.Variable; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.stream.Stream; - public class ExpressionCodec { private final Codec codec; private final Codec.Context context; diff --git a/maddi-cst-io/src/main/java/org/parsers/json/JSONLexer.java b/maddi-cst-io/src/main/java/org/parsers/json/JSONLexer.java index 53c74cb545..2aef85f6f9 100644 --- a/maddi-cst-io/src/main/java/org/parsers/json/JSONLexer.java +++ b/maddi-cst-io/src/main/java/org/parsers/json/JSONLexer.java @@ -18,13 +18,13 @@ /* Generated by: CongoCC Parser Generator. JSONLexer.java */ package org.parsers.json; -import org.parsers.json.Token.TokenType; +import static org.parsers.json.Token.TokenType.*; import java.util.BitSet; import java.util.EnumSet; import java.util.Objects; -import static org.parsers.json.Token.TokenType.*; +import org.parsers.json.Token.TokenType; public class JSONLexer extends TokenSource { diff --git a/maddi-cst-io/src/main/java/org/parsers/json/JSONParser.java b/maddi-cst-io/src/main/java/org/parsers/json/JSONParser.java index c1183faf94..aef3dc32ae 100644 --- a/maddi-cst-io/src/main/java/org/parsers/json/JSONParser.java +++ b/maddi-cst-io/src/main/java/org/parsers/json/JSONParser.java @@ -18,8 +18,7 @@ /* Generated by: CongoCC Parser Generator. JSONParser.java */ package org.parsers.json; -import org.parsers.json.Token.TokenType; -import org.parsers.json.ast.*; +import static org.parsers.json.Token.TokenType.*; import java.io.IOException; import java.io.PrintStream; @@ -29,7 +28,8 @@ import java.util.*; import java.util.concurrent.CancellationException; -import static org.parsers.json.Token.TokenType.*; +import org.parsers.json.Token.TokenType; +import org.parsers.json.ast.*; public class JSONParser { diff --git a/maddi-cst-io/src/main/java/org/parsers/json/Token.java b/maddi-cst-io/src/main/java/org/parsers/json/Token.java index b893986bd6..12968727e3 100644 --- a/maddi-cst-io/src/main/java/org/parsers/json/Token.java +++ b/maddi-cst-io/src/main/java/org/parsers/json/Token.java @@ -20,13 +20,13 @@ */ package org.parsers.json; -import org.parsers.json.ast.*; - import java.util.ArrayList; import java.util.Collections; import java.util.Iterator; import java.util.List; +import org.parsers.json.ast.*; + public class Token implements CharSequence, Node.TerminalNode { diff --git a/maddi-cst-io/src/main/java/org/parsers/json/TokenSource.java b/maddi-cst-io/src/main/java/org/parsers/json/TokenSource.java index a8709fee21..5d2d6bb761 100644 --- a/maddi-cst-io/src/main/java/org/parsers/json/TokenSource.java +++ b/maddi-cst-io/src/main/java/org/parsers/json/TokenSource.java @@ -20,6 +20,8 @@ */ package org.parsers.json; +import static java.nio.charset.StandardCharsets.*; + import java.nio.ByteBuffer; import java.nio.CharBuffer; import java.nio.charset.CharacterCodingException; @@ -29,8 +31,6 @@ import java.util.Arrays; import java.util.BitSet; -import static java.nio.charset.StandardCharsets.*; - abstract public class TokenSource implements CharSequence { private int tabSize = 1; diff --git a/maddi-cst-io/src/main/java/org/parsers/json/ast/BaseNode.java b/maddi-cst-io/src/main/java/org/parsers/json/ast/BaseNode.java index 2580aec0a0..3d5d57bf1a 100644 --- a/maddi-cst-io/src/main/java/org/parsers/json/ast/BaseNode.java +++ b/maddi-cst-io/src/main/java/org/parsers/json/ast/BaseNode.java @@ -18,13 +18,13 @@ /* Generated by: CongoCC Parser Generator. Do not edit. BaseNode.java */ package org.parsers.json.ast; +import java.util.*; + import org.parsers.json.JSONLexer; import org.parsers.json.Node; import org.parsers.json.Token; import org.parsers.json.TokenSource; -import java.util.*; - /** * The base concrete class for non-terminal Nodes diff --git a/maddi-cst-io/src/test/java/io/codelaser/maddi/cst/io/CommonTest.java b/maddi-cst-io/src/test/java/io/codelaser/maddi/cst/io/CommonTest.java index 3afe50c4af..dc35531c55 100644 --- a/maddi-cst-io/src/test/java/io/codelaser/maddi/cst/io/CommonTest.java +++ b/maddi-cst-io/src/test/java/io/codelaser/maddi/cst/io/CommonTest.java @@ -19,7 +19,6 @@ import io.codelaser.maddi.cst.api.analysis.Codec; import io.codelaser.maddi.cst.api.element.CompilationUnit; -import io.codelaser.maddi.cst.api.element.SourceSet; import io.codelaser.maddi.cst.api.info.FieldInfo; import io.codelaser.maddi.cst.api.info.MethodInfo; import io.codelaser.maddi.cst.api.info.ParameterInfo; diff --git a/maddi-cst-io/src/test/java/io/codelaser/maddi/cst/io/TestCodec.java b/maddi-cst-io/src/test/java/io/codelaser/maddi/cst/io/TestCodec.java index 497ad8c484..e861f3c33f 100644 --- a/maddi-cst-io/src/test/java/io/codelaser/maddi/cst/io/TestCodec.java +++ b/maddi-cst-io/src/test/java/io/codelaser/maddi/cst/io/TestCodec.java @@ -17,15 +17,12 @@ package io.codelaser.maddi.cst.io; -import io.codelaser.maddi.cst.api.analysis.Codec; -import io.codelaser.maddi.cst.api.analysis.Property; -import io.codelaser.maddi.cst.api.element.CompilationUnit; -import io.codelaser.maddi.cst.api.info.TypeInfo; -import io.codelaser.maddi.cst.api.runtime.Runtime; -import io.codelaser.maddi.cst.impl.analysis.PropertyImpl; -import io.codelaser.maddi.cst.impl.analysis.PropertyProviderImpl; -import io.codelaser.maddi.cst.impl.analysis.ValueImpl; -import io.codelaser.maddi.cst.impl.runtime.RuntimeImpl; +import static org.junit.jupiter.api.Assertions.*; + +import java.util.ArrayList; +import java.util.List; +import java.util.stream.Stream; + import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.parsers.json.JSONParser; @@ -35,11 +32,15 @@ import org.parsers.json.ast.Root; import org.parsers.json.ast.StringLiteral; -import java.util.ArrayList; -import java.util.List; -import java.util.stream.Stream; - -import static org.junit.jupiter.api.Assertions.*; +import io.codelaser.maddi.cst.api.analysis.Codec; +import io.codelaser.maddi.cst.api.analysis.Property; +import io.codelaser.maddi.cst.api.element.CompilationUnit; +import io.codelaser.maddi.cst.api.info.TypeInfo; +import io.codelaser.maddi.cst.api.runtime.Runtime; +import io.codelaser.maddi.cst.impl.analysis.PropertyImpl; +import io.codelaser.maddi.cst.impl.analysis.PropertyProviderImpl; +import io.codelaser.maddi.cst.impl.analysis.ValueImpl; +import io.codelaser.maddi.cst.impl.runtime.RuntimeImpl; public class TestCodec { diff --git a/maddi-cst-io/src/test/java/io/codelaser/maddi/cst/io/TestCodecCollections.java b/maddi-cst-io/src/test/java/io/codelaser/maddi/cst/io/TestCodecCollections.java index 30421f0e87..ce360efddc 100644 --- a/maddi-cst-io/src/test/java/io/codelaser/maddi/cst/io/TestCodecCollections.java +++ b/maddi-cst-io/src/test/java/io/codelaser/maddi/cst/io/TestCodecCollections.java @@ -17,14 +17,15 @@ package io.codelaser.maddi.cst.io; -import io.codelaser.maddi.cst.api.analysis.Codec; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.*; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; + +import io.codelaser.maddi.cst.api.analysis.Codec; /** * Robustness tests for the structural layer of {@link CodecImpl}: list / set / map / mapAsList encoding and diff --git a/maddi-cst-io/src/test/java/io/codelaser/maddi/cst/io/TestCodecExpression.java b/maddi-cst-io/src/test/java/io/codelaser/maddi/cst/io/TestCodecExpression.java index f1481a63a3..f7cf2ec9ea 100644 --- a/maddi-cst-io/src/test/java/io/codelaser/maddi/cst/io/TestCodecExpression.java +++ b/maddi-cst-io/src/test/java/io/codelaser/maddi/cst/io/TestCodecExpression.java @@ -17,15 +17,16 @@ package io.codelaser.maddi.cst.io; +import static org.junit.jupiter.api.Assertions.assertEquals; + +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; + import io.codelaser.maddi.cst.api.analysis.Codec; import io.codelaser.maddi.cst.api.expression.EnclosedExpression; import io.codelaser.maddi.cst.api.expression.VariableExpression; import io.codelaser.maddi.cst.api.variable.FieldReference; import io.codelaser.maddi.cst.api.variable.LocalVariable; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; - -import static org.junit.jupiter.api.Assertions.assertEquals; public class TestCodecExpression extends CommonTest { diff --git a/maddi-cst-io/src/test/java/io/codelaser/maddi/cst/io/TestCodecFieldByName.java b/maddi-cst-io/src/test/java/io/codelaser/maddi/cst/io/TestCodecFieldByName.java index cbdb375152..a01e8b73b5 100644 --- a/maddi-cst-io/src/test/java/io/codelaser/maddi/cst/io/TestCodecFieldByName.java +++ b/maddi-cst-io/src/test/java/io/codelaser/maddi/cst/io/TestCodecFieldByName.java @@ -17,14 +17,15 @@ package io.codelaser.maddi.cst.io; -import io.codelaser.maddi.cst.api.analysis.Codec; -import io.codelaser.maddi.cst.api.info.FieldInfo; -import io.codelaser.maddi.cst.api.info.Info; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertThrows; + import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertSame; -import static org.junit.jupiter.api.Assertions.assertThrows; +import io.codelaser.maddi.cst.api.analysis.Codec; +import io.codelaser.maddi.cst.api.info.FieldInfo; +import io.codelaser.maddi.cst.api.info.Info; /** * A field reference decodes by its (unique) name; the encoded positional index is a fast-path hint only. This makes diff --git a/maddi-cst-io/src/test/java/io/codelaser/maddi/cst/io/TestCodecInfo.java b/maddi-cst-io/src/test/java/io/codelaser/maddi/cst/io/TestCodecInfo.java index 76970fb085..c3961edd63 100644 --- a/maddi-cst-io/src/test/java/io/codelaser/maddi/cst/io/TestCodecInfo.java +++ b/maddi-cst-io/src/test/java/io/codelaser/maddi/cst/io/TestCodecInfo.java @@ -17,11 +17,11 @@ package io.codelaser.maddi.cst.io; +import static org.junit.jupiter.api.Assertions.assertEquals; + import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; - public class TestCodecInfo extends CommonTest { diff --git a/maddi-cst-io/src/test/java/io/codelaser/maddi/cst/io/TestCodecInfoInContext.java b/maddi-cst-io/src/test/java/io/codelaser/maddi/cst/io/TestCodecInfoInContext.java index a635b3d433..b0579c7762 100644 --- a/maddi-cst-io/src/test/java/io/codelaser/maddi/cst/io/TestCodecInfoInContext.java +++ b/maddi-cst-io/src/test/java/io/codelaser/maddi/cst/io/TestCodecInfoInContext.java @@ -17,15 +17,16 @@ package io.codelaser.maddi.cst.io; -import io.codelaser.maddi.cst.api.analysis.Codec; -import io.codelaser.maddi.cst.api.info.MethodInfo; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; - import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertSame; import static org.junit.jupiter.api.Assertions.assertThrows; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; + +import io.codelaser.maddi.cst.api.analysis.Codec; +import io.codelaser.maddi.cst.api.info.MethodInfo; + /** * Round-trips for the in-context info encoding ({@link CodecImpl#encodeInfoInContext} / {@code decodeInfoInContext}): * a single short token (e.g. {@code "Ff(0)"}) resolved against the {@code Context} stack (current type / method). diff --git a/maddi-cst-io/src/test/java/io/codelaser/maddi/cst/io/TestCodecMemberDataOnly.java b/maddi-cst-io/src/test/java/io/codelaser/maddi/cst/io/TestCodecMemberDataOnly.java index 6196ce8df1..80695db8ac 100644 --- a/maddi-cst-io/src/test/java/io/codelaser/maddi/cst/io/TestCodecMemberDataOnly.java +++ b/maddi-cst-io/src/test/java/io/codelaser/maddi/cst/io/TestCodecMemberDataOnly.java @@ -17,15 +17,7 @@ package io.codelaser.maddi.cst.io; -import io.codelaser.maddi.cst.api.analysis.Codec; -import io.codelaser.maddi.cst.api.element.CompilationUnit; -import io.codelaser.maddi.cst.api.info.TypeInfo; -import io.codelaser.maddi.cst.api.runtime.Runtime; -import io.codelaser.maddi.cst.impl.analysis.PropertyProviderImpl; -import io.codelaser.maddi.cst.impl.analysis.ValueImpl; -import io.codelaser.maddi.cst.impl.runtime.RuntimeImpl; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.*; import java.io.IOException; import java.io.StringWriter; @@ -33,7 +25,16 @@ import java.util.List; import java.util.stream.Stream; -import static org.junit.jupiter.api.Assertions.*; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; + +import io.codelaser.maddi.cst.api.analysis.Codec; +import io.codelaser.maddi.cst.api.element.CompilationUnit; +import io.codelaser.maddi.cst.api.info.TypeInfo; +import io.codelaser.maddi.cst.api.runtime.Runtime; +import io.codelaser.maddi.cst.impl.analysis.PropertyProviderImpl; +import io.codelaser.maddi.cst.impl.analysis.ValueImpl; +import io.codelaser.maddi.cst.impl.runtime.RuntimeImpl; /** * An element with no data of its own but with members that carry some must be written. The codec dropped it: diff --git a/maddi-cst-io/src/test/java/io/codelaser/maddi/cst/io/TestCodecMethodByDescriptor.java b/maddi-cst-io/src/test/java/io/codelaser/maddi/cst/io/TestCodecMethodByDescriptor.java index d0ec8bc999..ec9c1b0e3a 100644 --- a/maddi-cst-io/src/test/java/io/codelaser/maddi/cst/io/TestCodecMethodByDescriptor.java +++ b/maddi-cst-io/src/test/java/io/codelaser/maddi/cst/io/TestCodecMethodByDescriptor.java @@ -17,18 +17,19 @@ package io.codelaser.maddi.cst.io; -import io.codelaser.maddi.cst.api.analysis.Codec; -import io.codelaser.maddi.cst.api.info.Info; -import io.codelaser.maddi.cst.api.info.MethodInfo; -import io.codelaser.maddi.cst.api.info.ParameterInfo; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertThrows; import java.util.Comparator; import java.util.List; -import static org.junit.jupiter.api.Assertions.assertSame; -import static org.junit.jupiter.api.Assertions.assertThrows; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; + +import io.codelaser.maddi.cst.api.analysis.Codec; +import io.codelaser.maddi.cst.api.info.Info; +import io.codelaser.maddi.cst.api.info.MethodInfo; +import io.codelaser.maddi.cst.api.info.ParameterInfo; /** * A method token carries the erased parameter types, {@code Mname(index,p1,p2)}, because for an OVERLOADED name a diff --git a/maddi-cst-io/src/test/java/io/codelaser/maddi/cst/io/TestCodecMethodByName.java b/maddi-cst-io/src/test/java/io/codelaser/maddi/cst/io/TestCodecMethodByName.java index b323a96040..6204531c5d 100644 --- a/maddi-cst-io/src/test/java/io/codelaser/maddi/cst/io/TestCodecMethodByName.java +++ b/maddi-cst-io/src/test/java/io/codelaser/maddi/cst/io/TestCodecMethodByName.java @@ -17,14 +17,15 @@ package io.codelaser.maddi.cst.io; -import io.codelaser.maddi.cst.api.analysis.Codec; -import io.codelaser.maddi.cst.api.info.Info; -import io.codelaser.maddi.cst.api.info.MethodInfo; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertThrows; + import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertSame; -import static org.junit.jupiter.api.Assertions.assertThrows; +import io.codelaser.maddi.cst.api.analysis.Codec; +import io.codelaser.maddi.cst.api.info.Info; +import io.codelaser.maddi.cst.api.info.MethodInfo; /** * A method reference with a unique (non-overloaded) name decodes by name; the encoded index is a fast-path hint. diff --git a/maddi-cst-io/src/test/java/io/codelaser/maddi/cst/io/TestCodecPrimitives.java b/maddi-cst-io/src/test/java/io/codelaser/maddi/cst/io/TestCodecPrimitives.java index e2176f2f37..e3d640e869 100644 --- a/maddi-cst-io/src/test/java/io/codelaser/maddi/cst/io/TestCodecPrimitives.java +++ b/maddi-cst-io/src/test/java/io/codelaser/maddi/cst/io/TestCodecPrimitives.java @@ -17,11 +17,12 @@ package io.codelaser.maddi.cst.io; -import io.codelaser.maddi.cst.api.analysis.Codec; +import static org.junit.jupiter.api.Assertions.*; + import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.*; +import io.codelaser.maddi.cst.api.analysis.Codec; /** * Robustness tests for the scalar layer of {@link CodecImpl}: the pure quote/unquote helpers and the diff --git a/maddi-cst-io/src/test/java/io/codelaser/maddi/cst/io/TestCodecSetOfMethodInfo.java b/maddi-cst-io/src/test/java/io/codelaser/maddi/cst/io/TestCodecSetOfMethodInfo.java index af49d0f5b5..69a9b2fa8d 100644 --- a/maddi-cst-io/src/test/java/io/codelaser/maddi/cst/io/TestCodecSetOfMethodInfo.java +++ b/maddi-cst-io/src/test/java/io/codelaser/maddi/cst/io/TestCodecSetOfMethodInfo.java @@ -17,18 +17,19 @@ package io.codelaser.maddi.cst.io; -import io.codelaser.maddi.cst.api.analysis.Codec; -import io.codelaser.maddi.cst.api.analysis.Value; -import io.codelaser.maddi.cst.api.info.MethodInfo; -import io.codelaser.maddi.cst.impl.analysis.ValueImpl; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.Set; import java.util.stream.StreamSupport; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; + +import io.codelaser.maddi.cst.api.analysis.Codec; +import io.codelaser.maddi.cst.api.analysis.Value; +import io.codelaser.maddi.cst.api.info.MethodInfo; +import io.codelaser.maddi.cst.impl.analysis.ValueImpl; /** * #30: a decoded {@code SetOfMethodInfo} is a registry like any other. Prep's addImplementation adds to it when a diff --git a/maddi-cst-io/src/test/java/io/codelaser/maddi/cst/io/TestCodecType.java b/maddi-cst-io/src/test/java/io/codelaser/maddi/cst/io/TestCodecType.java index d6a3907a5c..f207f7797e 100644 --- a/maddi-cst-io/src/test/java/io/codelaser/maddi/cst/io/TestCodecType.java +++ b/maddi-cst-io/src/test/java/io/codelaser/maddi/cst/io/TestCodecType.java @@ -17,13 +17,14 @@ package io.codelaser.maddi.cst.io; -import io.codelaser.maddi.cst.api.type.ParameterizedType; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.List; -import static org.junit.jupiter.api.Assertions.assertEquals; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; + +import io.codelaser.maddi.cst.api.type.ParameterizedType; public class TestCodecType extends CommonTest { diff --git a/maddi-cst-io/src/test/java/io/codelaser/maddi/cst/io/TestCodecVariableRoundTrip.java b/maddi-cst-io/src/test/java/io/codelaser/maddi/cst/io/TestCodecVariableRoundTrip.java index ea658c1462..f2c46a1e14 100644 --- a/maddi-cst-io/src/test/java/io/codelaser/maddi/cst/io/TestCodecVariableRoundTrip.java +++ b/maddi-cst-io/src/test/java/io/codelaser/maddi/cst/io/TestCodecVariableRoundTrip.java @@ -17,14 +17,15 @@ package io.codelaser.maddi.cst.io; +import static org.junit.jupiter.api.Assertions.assertEquals; + +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; + import io.codelaser.maddi.cst.api.variable.DependentVariable; import io.codelaser.maddi.cst.api.variable.FieldReference; import io.codelaser.maddi.cst.api.variable.LocalVariable; import io.codelaser.maddi.cst.api.variable.This; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; - -import static org.junit.jupiter.api.Assertions.assertEquals; /** * Round-trips for every variable kind handled by {@link CodecImpl#encodeVariable} / {@code decodeVariable}: diff --git a/maddi-cst-io/src/test/java/io/codelaser/maddi/cst/io/TestValueImpl.java b/maddi-cst-io/src/test/java/io/codelaser/maddi/cst/io/TestValueImpl.java index 925f28c4ca..be6991c0d3 100644 --- a/maddi-cst-io/src/test/java/io/codelaser/maddi/cst/io/TestValueImpl.java +++ b/maddi-cst-io/src/test/java/io/codelaser/maddi/cst/io/TestValueImpl.java @@ -17,12 +17,11 @@ package io.codelaser.maddi.cst.io; -import io.codelaser.maddi.cst.api.analysis.Codec; -import io.codelaser.maddi.cst.api.analysis.Value; -import io.codelaser.maddi.cst.api.runtime.Runtime; -import io.codelaser.maddi.cst.impl.analysis.PropertyProviderImpl; -import io.codelaser.maddi.cst.impl.analysis.ValueImpl; -import io.codelaser.maddi.cst.impl.runtime.RuntimeImpl; +import static org.junit.jupiter.api.Assertions.*; + +import java.util.List; +import java.util.Map; + import org.junit.jupiter.api.Test; import org.parsers.json.JSONParser; import org.parsers.json.Node; @@ -31,10 +30,12 @@ import org.parsers.json.ast.KeyValuePair; import org.parsers.json.ast.StringLiteral; -import java.util.List; -import java.util.Map; - -import static org.junit.jupiter.api.Assertions.*; +import io.codelaser.maddi.cst.api.analysis.Codec; +import io.codelaser.maddi.cst.api.analysis.Value; +import io.codelaser.maddi.cst.api.runtime.Runtime; +import io.codelaser.maddi.cst.impl.analysis.PropertyProviderImpl; +import io.codelaser.maddi.cst.impl.analysis.ValueImpl; +import io.codelaser.maddi.cst.impl.runtime.RuntimeImpl; public class TestValueImpl { Runtime runtime = new RuntimeImpl(); diff --git a/maddi-cst-print-csharp/src/main/java/io/codelaser/maddi/cst/print/csharp/CSharpAccess.java b/maddi-cst-print-csharp/src/main/java/io/codelaser/maddi/cst/print/csharp/CSharpAccess.java index 4074df913e..caa2877354 100644 --- a/maddi-cst-print-csharp/src/main/java/io/codelaser/maddi/cst/print/csharp/CSharpAccess.java +++ b/maddi-cst-print-csharp/src/main/java/io/codelaser/maddi/cst/print/csharp/CSharpAccess.java @@ -17,7 +17,10 @@ package io.codelaser.maddi.cst.print.csharp; -import io.codelaser.maddi.cst.print.translate.CstQueries; +import java.util.HashSet; +import java.util.Set; +import java.util.stream.Stream; + import io.codelaser.maddi.cst.api.element.CompilationUnit; import io.codelaser.maddi.cst.api.element.Element; import io.codelaser.maddi.cst.api.expression.ConstructorCall; @@ -31,10 +34,7 @@ import io.codelaser.maddi.cst.api.info.TypeModifier; import io.codelaser.maddi.cst.api.type.ParameterizedType; import io.codelaser.maddi.cst.api.variable.FieldReference; - -import java.util.HashSet; -import java.util.Set; -import java.util.stream.Stream; +import io.codelaser.maddi.cst.print.translate.CstQueries; /** * Java's {@code private} is private to the top-level type: a class reaches the private members of the classes nested diff --git a/maddi-cst-print-csharp/src/main/java/io/codelaser/maddi/cst/print/csharp/CSharpAnonymous.java b/maddi-cst-print-csharp/src/main/java/io/codelaser/maddi/cst/print/csharp/CSharpAnonymous.java index 9c90728f03..ec835a2e36 100644 --- a/maddi-cst-print-csharp/src/main/java/io/codelaser/maddi/cst/print/csharp/CSharpAnonymous.java +++ b/maddi-cst-print-csharp/src/main/java/io/codelaser/maddi/cst/print/csharp/CSharpAnonymous.java @@ -17,8 +17,13 @@ package io.codelaser.maddi.cst.print.csharp; -import io.codelaser.maddi.cst.print.translate.CstQueries; -import io.codelaser.maddi.cst.print.translate.CstSupertypes; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; + import io.codelaser.maddi.cst.api.element.Element; import io.codelaser.maddi.cst.api.element.RecordPattern; import io.codelaser.maddi.cst.api.expression.ConstructorCall; @@ -34,13 +39,8 @@ import io.codelaser.maddi.cst.api.variable.FieldReference; import io.codelaser.maddi.cst.api.variable.LocalVariable; import io.codelaser.maddi.cst.api.variable.This; - -import java.util.ArrayList; -import java.util.HashSet; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; +import io.codelaser.maddi.cst.print.translate.CstQueries; +import io.codelaser.maddi.cst.print.translate.CstSupertypes; /** * C# has no anonymous classes. One that does not become a lambda (see {@link CSharpProgram#lambdaLike}) is hoisted: diff --git a/maddi-cst-print-csharp/src/main/java/io/codelaser/maddi/cst/print/csharp/CSharpAttributes.java b/maddi-cst-print-csharp/src/main/java/io/codelaser/maddi/cst/print/csharp/CSharpAttributes.java index e13a58218e..2c4579dda4 100644 --- a/maddi-cst-print-csharp/src/main/java/io/codelaser/maddi/cst/print/csharp/CSharpAttributes.java +++ b/maddi-cst-print-csharp/src/main/java/io/codelaser/maddi/cst/print/csharp/CSharpAttributes.java @@ -17,6 +17,13 @@ package io.codelaser.maddi.cst.print.csharp; +import java.util.ArrayList; +import java.util.Comparator; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; + import io.codelaser.maddi.cst.api.expression.AnnotationExpression; import io.codelaser.maddi.cst.api.expression.ArrayInitializer; import io.codelaser.maddi.cst.api.expression.Expression; @@ -34,13 +41,6 @@ import io.codelaser.maddi.cst.impl.output.TextImpl; import io.codelaser.maddi.cst.print.translate.CstQueries; -import java.util.ArrayList; -import java.util.Comparator; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; - /** * Java's annotations as C#'s attributes. An annotation type of the program is a sealed attribute class, * {@code ToolAttribute}: its elements are properties with their defaults, a {@code value} element also the diff --git a/maddi-cst-print-csharp/src/main/java/io/codelaser/maddi/cst/print/csharp/CSharpBcl.java b/maddi-cst-print-csharp/src/main/java/io/codelaser/maddi/cst/print/csharp/CSharpBcl.java index 3bdcb7386d..a56d11b9ce 100644 --- a/maddi-cst-print-csharp/src/main/java/io/codelaser/maddi/cst/print/csharp/CSharpBcl.java +++ b/maddi-cst-print-csharp/src/main/java/io/codelaser/maddi/cst/print/csharp/CSharpBcl.java @@ -17,6 +17,14 @@ package io.codelaser.maddi.cst.print.csharp; +import java.util.Comparator; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.stream.Stream; + import io.codelaser.maddi.cst.api.expression.Expression; import io.codelaser.maddi.cst.api.expression.MethodCall; import io.codelaser.maddi.cst.api.expression.MethodReference; @@ -28,14 +36,6 @@ import io.codelaser.maddi.cst.api.type.ParameterizedType; import io.codelaser.maddi.cst.print.translate.CstQueries; -import java.util.Comparator; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.stream.Stream; - /** * The JDK → BCL mapping: what a JDK type, a call of a JDK method and a JDK field are in C#. Its rules are data, the * file {@code jdk-bcl.csmap} ({@link CSharpMappingFile}); the rules it chooses per call, by an argument's or the diff --git a/maddi-cst-print-csharp/src/main/java/io/codelaser/maddi/cst/print/csharp/CSharpCompilationUnitPrinter.java b/maddi-cst-print-csharp/src/main/java/io/codelaser/maddi/cst/print/csharp/CSharpCompilationUnitPrinter.java index 80772a4509..3c2af9268a 100644 --- a/maddi-cst-print-csharp/src/main/java/io/codelaser/maddi/cst/print/csharp/CSharpCompilationUnitPrinter.java +++ b/maddi-cst-print-csharp/src/main/java/io/codelaser/maddi/cst/print/csharp/CSharpCompilationUnitPrinter.java @@ -17,7 +17,12 @@ package io.codelaser.maddi.cst.print.csharp; -import io.codelaser.maddi.cst.print.translate.PrintMessage; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Set; +import java.util.TreeSet; + import io.codelaser.maddi.cst.api.element.CompilationUnit; import io.codelaser.maddi.cst.api.info.ImportComputer; import io.codelaser.maddi.cst.api.info.TypeInfo; @@ -25,12 +30,7 @@ import io.codelaser.maddi.cst.api.output.Qualification; import io.codelaser.maddi.cst.impl.info.CompilationUnitPrinterImpl; import io.codelaser.maddi.cst.impl.output.*; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Set; -import java.util.TreeSet; +import io.codelaser.maddi.cst.print.translate.PrintMessage; /** * Prints a {@link CompilationUnit} as a C# file: the {@code using} directives, a file-scoped {@code namespace}, and diff --git a/maddi-cst-print-csharp/src/main/java/io/codelaser/maddi/cst/print/csharp/CSharpContext.java b/maddi-cst-print-csharp/src/main/java/io/codelaser/maddi/cst/print/csharp/CSharpContext.java index ee045736cb..8632746d07 100644 --- a/maddi-cst-print-csharp/src/main/java/io/codelaser/maddi/cst/print/csharp/CSharpContext.java +++ b/maddi-cst-print-csharp/src/main/java/io/codelaser/maddi/cst/print/csharp/CSharpContext.java @@ -17,6 +17,17 @@ package io.codelaser.maddi.cst.print.csharp; +import java.util.ArrayDeque; +import java.util.ArrayList; +import java.util.Deque; +import java.util.HashMap; +import java.util.HashSet; +import java.util.IdentityHashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.TreeSet; + import io.codelaser.maddi.cst.api.element.Element; import io.codelaser.maddi.cst.api.expression.ConstructorCall; import io.codelaser.maddi.cst.api.expression.Expression; @@ -31,17 +42,6 @@ import io.codelaser.maddi.cst.print.translate.PrintMessage; import io.codelaser.maddi.cst.print.translate.TranslationState; -import java.util.ArrayDeque; -import java.util.ArrayList; -import java.util.Deque; -import java.util.HashMap; -import java.util.HashSet; -import java.util.IdentityHashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.TreeSet; - /** * The state of one file's printing, shared by the printers: they are created through the cst-api factories, whose * signatures carry no context. One per thread; {@link CSharpCompilationUnitPrinter} resets it per file. What every diff --git a/maddi-cst-print-csharp/src/main/java/io/codelaser/maddi/cst/print/csharp/CSharpErasures.java b/maddi-cst-print-csharp/src/main/java/io/codelaser/maddi/cst/print/csharp/CSharpErasures.java index 054c3f3223..9e8976f0b0 100644 --- a/maddi-cst-print-csharp/src/main/java/io/codelaser/maddi/cst/print/csharp/CSharpErasures.java +++ b/maddi-cst-print-csharp/src/main/java/io/codelaser/maddi/cst/print/csharp/CSharpErasures.java @@ -17,6 +17,12 @@ package io.codelaser.maddi.cst.print.csharp; +import java.util.ArrayList; +import java.util.List; +import java.util.Set; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + import io.codelaser.maddi.cst.api.expression.Expression; import io.codelaser.maddi.cst.api.info.MethodInfo; import io.codelaser.maddi.cst.api.info.ParameterInfo; @@ -32,12 +38,6 @@ import io.codelaser.maddi.cst.print.translate.CstQueries; import io.codelaser.maddi.cst.print.translate.CstSupertypes; -import java.util.ArrayList; -import java.util.List; -import java.util.Set; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - /** * Java's {@code UniConstraintCollector} of a program interface without a wildcard interface * ({@link CSharpWildcardInterfaces}: the code passes the wildcard where a generic method captures the type parameter) diff --git a/maddi-cst-print-csharp/src/main/java/io/codelaser/maddi/cst/print/csharp/CSharpExpressionPrinter.java b/maddi-cst-print-csharp/src/main/java/io/codelaser/maddi/cst/print/csharp/CSharpExpressionPrinter.java index 1d2a657ef0..603b2fe2c5 100644 --- a/maddi-cst-print-csharp/src/main/java/io/codelaser/maddi/cst/print/csharp/CSharpExpressionPrinter.java +++ b/maddi-cst-print-csharp/src/main/java/io/codelaser/maddi/cst/print/csharp/CSharpExpressionPrinter.java @@ -17,6 +17,20 @@ package io.codelaser.maddi.cst.print.csharp; +import java.util.ArrayDeque; +import java.util.ArrayList; +import java.util.Deque; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Set; +import java.util.function.Supplier; +import java.util.stream.Collectors; +import java.util.stream.IntStream; +import java.util.stream.Stream; + import io.codelaser.maddi.cst.api.element.RecordPattern; import io.codelaser.maddi.cst.api.expression.*; import io.codelaser.maddi.cst.api.info.FieldInfo; @@ -43,20 +57,6 @@ import io.codelaser.maddi.cst.print.translate.Emission; import io.codelaser.maddi.cst.print.translate.Literals; -import java.util.ArrayDeque; -import java.util.ArrayList; -import java.util.Deque; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.Set; -import java.util.function.Supplier; -import java.util.stream.Collectors; -import java.util.stream.IntStream; -import java.util.stream.Stream; - /** * Prints an {@link Expression} as C#. Every expression form is printed here, recursively, so that a Java-only form * nested anywhere is translated too; only a form this class does not know falls back to the Java diff --git a/maddi-cst-print-csharp/src/main/java/io/codelaser/maddi/cst/print/csharp/CSharpFacts.java b/maddi-cst-print-csharp/src/main/java/io/codelaser/maddi/cst/print/csharp/CSharpFacts.java index 11b5bac00e..c27e05a7e3 100644 --- a/maddi-cst-print-csharp/src/main/java/io/codelaser/maddi/cst/print/csharp/CSharpFacts.java +++ b/maddi-cst-print-csharp/src/main/java/io/codelaser/maddi/cst/print/csharp/CSharpFacts.java @@ -17,6 +17,8 @@ package io.codelaser.maddi.cst.print.csharp; +import java.util.function.Predicate; + import io.codelaser.maddi.cst.api.element.Element; import io.codelaser.maddi.cst.api.info.FieldInfo; import io.codelaser.maddi.cst.api.info.MethodInfo; @@ -26,8 +28,6 @@ import io.codelaser.maddi.cst.api.variable.LocalVariable; import io.codelaser.maddi.cst.impl.analysis.NullabilityFacts; -import java.util.function.Predicate; - /** * What the analysis knows about the program, for the C# the printer chooses: the modification analysis's verdicts * (an unmodified collection parameter is read-only in C#) and the nullability analysis's ({@code string?}), the diff --git a/maddi-cst-print-csharp/src/main/java/io/codelaser/maddi/cst/print/csharp/CSharpFieldPrinter.java b/maddi-cst-print-csharp/src/main/java/io/codelaser/maddi/cst/print/csharp/CSharpFieldPrinter.java index e78cc7e5f9..7eb0d7ace8 100644 --- a/maddi-cst-print-csharp/src/main/java/io/codelaser/maddi/cst/print/csharp/CSharpFieldPrinter.java +++ b/maddi-cst-print-csharp/src/main/java/io/codelaser/maddi/cst/print/csharp/CSharpFieldPrinter.java @@ -17,6 +17,8 @@ package io.codelaser.maddi.cst.print.csharp; +import java.util.List; + import io.codelaser.maddi.cst.api.expression.AnnotationExpression; import io.codelaser.maddi.cst.api.info.FieldInfo; import io.codelaser.maddi.cst.api.info.FieldPrinter; @@ -28,8 +30,6 @@ import io.codelaser.maddi.cst.impl.output.TextImpl; import io.codelaser.maddi.cst.print.translate.CstQueries; -import java.util.List; - /** * Prints a {@link FieldInfo} as a C# field: {@code [access] [static] [const|readonly] [volatile] Type name [= init];}. * A static final primitive or String with a constant initializer is a {@code const}; another final field is diff --git a/maddi-cst-print-csharp/src/main/java/io/codelaser/maddi/cst/print/csharp/CSharpHierarchy.java b/maddi-cst-print-csharp/src/main/java/io/codelaser/maddi/cst/print/csharp/CSharpHierarchy.java index e698dfe7bb..eee933778b 100644 --- a/maddi-cst-print-csharp/src/main/java/io/codelaser/maddi/cst/print/csharp/CSharpHierarchy.java +++ b/maddi-cst-print-csharp/src/main/java/io/codelaser/maddi/cst/print/csharp/CSharpHierarchy.java @@ -17,13 +17,6 @@ package io.codelaser.maddi.cst.print.csharp; -import io.codelaser.maddi.cst.api.info.MethodInfo; -import io.codelaser.maddi.cst.api.info.TypeInfo; -import io.codelaser.maddi.cst.api.info.TypeParameter; -import io.codelaser.maddi.cst.api.type.ParameterizedType; -import io.codelaser.maddi.cst.print.translate.CstQueries; -import io.codelaser.maddi.cst.print.translate.CstSupertypes; - import java.util.ArrayDeque; import java.util.ArrayList; import java.util.Deque; @@ -34,6 +27,13 @@ import java.util.Map; import java.util.Set; +import io.codelaser.maddi.cst.api.info.MethodInfo; +import io.codelaser.maddi.cst.api.info.TypeInfo; +import io.codelaser.maddi.cst.api.info.TypeParameter; +import io.codelaser.maddi.cst.api.type.ParameterizedType; +import io.codelaser.maddi.cst.print.translate.CstQueries; +import io.codelaser.maddi.cst.print.translate.CstSupertypes; + /** * The type hierarchy as C# needs it: a supertype as a type extends or implements it, in its own type parameters, and * what the type parameters of a generic supertype are in a subtype; the interface methods an abstract class leaves to diff --git a/maddi-cst-print-csharp/src/main/java/io/codelaser/maddi/cst/print/csharp/CSharpInner.java b/maddi-cst-print-csharp/src/main/java/io/codelaser/maddi/cst/print/csharp/CSharpInner.java index 15f2ee1ea8..c434c9764e 100644 --- a/maddi-cst-print-csharp/src/main/java/io/codelaser/maddi/cst/print/csharp/CSharpInner.java +++ b/maddi-cst-print-csharp/src/main/java/io/codelaser/maddi/cst/print/csharp/CSharpInner.java @@ -17,6 +17,11 @@ package io.codelaser.maddi.cst.print.csharp; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Set; + import io.codelaser.maddi.cst.api.element.Element; import io.codelaser.maddi.cst.api.expression.ConstructorCall; import io.codelaser.maddi.cst.api.expression.MethodCall; @@ -33,11 +38,6 @@ import io.codelaser.maddi.cst.impl.output.TextImpl; import io.codelaser.maddi.cst.print.translate.CstQueries; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Set; - /** * A Java inner class, a non-static member class, has an enclosing instance; a C# nested class has none. One that uses * its enclosing instance gets it as a field, {@code outer}, which every constructor takes first: diff --git a/maddi-cst-print-csharp/src/main/java/io/codelaser/maddi/cst/print/csharp/CSharpLibraries.java b/maddi-cst-print-csharp/src/main/java/io/codelaser/maddi/cst/print/csharp/CSharpLibraries.java index 921ef599ff..4bc673eb1a 100644 --- a/maddi-cst-print-csharp/src/main/java/io/codelaser/maddi/cst/print/csharp/CSharpLibraries.java +++ b/maddi-cst-print-csharp/src/main/java/io/codelaser/maddi/cst/print/csharp/CSharpLibraries.java @@ -17,15 +17,6 @@ package io.codelaser.maddi.cst.print.csharp; -import io.codelaser.maddi.cst.api.expression.AnnotationExpression; -import io.codelaser.maddi.cst.api.expression.Expression; -import io.codelaser.maddi.cst.api.expression.MethodCall; -import io.codelaser.maddi.cst.api.info.FieldInfo; -import io.codelaser.maddi.cst.api.info.MethodInfo; -import io.codelaser.maddi.cst.api.info.TypeInfo; -import io.codelaser.maddi.cst.api.output.Qualification; -import io.codelaser.maddi.cst.api.type.ParameterizedType; - import java.util.ArrayList; import java.util.Collections; import java.util.HashSet; @@ -39,6 +30,15 @@ import java.util.function.Supplier; import java.util.stream.Stream; +import io.codelaser.maddi.cst.api.expression.AnnotationExpression; +import io.codelaser.maddi.cst.api.expression.Expression; +import io.codelaser.maddi.cst.api.expression.MethodCall; +import io.codelaser.maddi.cst.api.info.FieldInfo; +import io.codelaser.maddi.cst.api.info.MethodInfo; +import io.codelaser.maddi.cst.api.info.TypeInfo; +import io.codelaser.maddi.cst.api.output.Qualification; +import io.codelaser.maddi.cst.api.type.ParameterizedType; + /** * The library mappings of a translation, in order: the first that answers wins. A client puts its own overrides in * front, and leaves out the mapping of a library it does not want translated; the JDK's is normally last. diff --git a/maddi-cst-print-csharp/src/main/java/io/codelaser/maddi/cst/print/csharp/CSharpLocalTypes.java b/maddi-cst-print-csharp/src/main/java/io/codelaser/maddi/cst/print/csharp/CSharpLocalTypes.java index 100820f2c8..3dc77e8474 100644 --- a/maddi-cst-print-csharp/src/main/java/io/codelaser/maddi/cst/print/csharp/CSharpLocalTypes.java +++ b/maddi-cst-print-csharp/src/main/java/io/codelaser/maddi/cst/print/csharp/CSharpLocalTypes.java @@ -17,7 +17,12 @@ package io.codelaser.maddi.cst.print.csharp; -import io.codelaser.maddi.cst.print.translate.CstQueries; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Set; +import java.util.stream.Stream; + import io.codelaser.maddi.cst.api.element.Element; import io.codelaser.maddi.cst.api.element.RecordPattern; import io.codelaser.maddi.cst.api.expression.MethodCall; @@ -29,13 +34,7 @@ import io.codelaser.maddi.cst.api.statement.LocalVariableCreation; import io.codelaser.maddi.cst.api.variable.FieldReference; import io.codelaser.maddi.cst.api.variable.LocalVariable; -import io.codelaser.maddi.cst.api.variable.This; - -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; -import java.util.Set; -import java.util.stream.Stream; +import io.codelaser.maddi.cst.print.translate.CstQueries; /** * C# has no local classes. A local class that captures nothing of its method (no local variable, no parameter, no diff --git a/maddi-cst-print-csharp/src/main/java/io/codelaser/maddi/cst/print/csharp/CSharpLocals.java b/maddi-cst-print-csharp/src/main/java/io/codelaser/maddi/cst/print/csharp/CSharpLocals.java index 59c3d28bae..df362b8659 100644 --- a/maddi-cst-print-csharp/src/main/java/io/codelaser/maddi/cst/print/csharp/CSharpLocals.java +++ b/maddi-cst-print-csharp/src/main/java/io/codelaser/maddi/cst/print/csharp/CSharpLocals.java @@ -17,6 +17,10 @@ package io.codelaser.maddi.cst.print.csharp; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + import io.codelaser.maddi.cst.api.element.Element; import io.codelaser.maddi.cst.api.element.RecordPattern; import io.codelaser.maddi.cst.api.expression.InstanceOf; @@ -26,10 +30,6 @@ import io.codelaser.maddi.cst.api.statement.Statement; import io.codelaser.maddi.cst.api.variable.LocalVariable; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - /** * The names a block declares at its own level, for {@link CSharpContext#enterScope}. C#'s scoping of locals is * stricter than Java's in two ways: diff --git a/maddi-cst-print-csharp/src/main/java/io/codelaser/maddi/cst/print/csharp/CSharpMappingFile.java b/maddi-cst-print-csharp/src/main/java/io/codelaser/maddi/cst/print/csharp/CSharpMappingFile.java index 44aa31bb20..548a96d281 100644 --- a/maddi-cst-print-csharp/src/main/java/io/codelaser/maddi/cst/print/csharp/CSharpMappingFile.java +++ b/maddi-cst-print-csharp/src/main/java/io/codelaser/maddi/cst/print/csharp/CSharpMappingFile.java @@ -17,16 +17,6 @@ package io.codelaser.maddi.cst.print.csharp; -import io.codelaser.maddi.cst.api.expression.AnnotationExpression; -import io.codelaser.maddi.cst.api.expression.Expression; -import io.codelaser.maddi.cst.api.expression.MethodCall; -import io.codelaser.maddi.cst.api.expression.StringConstant; -import io.codelaser.maddi.cst.api.expression.VariableExpression; -import io.codelaser.maddi.cst.api.info.FieldInfo; -import io.codelaser.maddi.cst.api.info.MethodInfo; -import io.codelaser.maddi.cst.api.info.TypeInfo; -import io.codelaser.maddi.cst.api.type.ParameterizedType; - import java.io.IOException; import java.io.InputStream; import java.io.UncheckedIOException; @@ -47,6 +37,16 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; +import io.codelaser.maddi.cst.api.expression.AnnotationExpression; +import io.codelaser.maddi.cst.api.expression.Expression; +import io.codelaser.maddi.cst.api.expression.MethodCall; +import io.codelaser.maddi.cst.api.expression.StringConstant; +import io.codelaser.maddi.cst.api.expression.VariableExpression; +import io.codelaser.maddi.cst.api.info.FieldInfo; +import io.codelaser.maddi.cst.api.info.MethodInfo; +import io.codelaser.maddi.cst.api.info.TypeInfo; +import io.codelaser.maddi.cst.api.type.ParameterizedType; + /** * A library mapping written as text, a {@code .csmap} file: what a client writes to override rules without Java, and * how the simpler library mappings are written. One directive per line, {@code #} starts a comment: diff --git a/maddi-cst-print-csharp/src/main/java/io/codelaser/maddi/cst/print/csharp/CSharpMethodPrinter.java b/maddi-cst-print-csharp/src/main/java/io/codelaser/maddi/cst/print/csharp/CSharpMethodPrinter.java index fb00fa7b66..dca0d76535 100644 --- a/maddi-cst-print-csharp/src/main/java/io/codelaser/maddi/cst/print/csharp/CSharpMethodPrinter.java +++ b/maddi-cst-print-csharp/src/main/java/io/codelaser/maddi/cst/print/csharp/CSharpMethodPrinter.java @@ -17,6 +17,13 @@ package io.codelaser.maddi.cst.print.csharp; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.function.Function; +import java.util.stream.Stream; + import io.codelaser.maddi.cst.api.expression.Expression; import io.codelaser.maddi.cst.api.info.MethodInfo; import io.codelaser.maddi.cst.api.info.MethodPrinter; @@ -34,13 +41,6 @@ import io.codelaser.maddi.cst.print.translate.CstQueries; import io.codelaser.maddi.cst.print.translate.CstSupertypes; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.function.Function; -import java.util.stream.Stream; - /** * Prints a {@link MethodInfo} as a C# method or constructor: * {@code [access] [static] [virtual|override|abstract] ReturnType Name(T p, params U[] us) where T : … body}. diff --git a/maddi-cst-print-csharp/src/main/java/io/codelaser/maddi/cst/print/csharp/CSharpNames.java b/maddi-cst-print-csharp/src/main/java/io/codelaser/maddi/cst/print/csharp/CSharpNames.java index 1e47c7f24d..f47153a5d5 100644 --- a/maddi-cst-print-csharp/src/main/java/io/codelaser/maddi/cst/print/csharp/CSharpNames.java +++ b/maddi-cst-print-csharp/src/main/java/io/codelaser/maddi/cst/print/csharp/CSharpNames.java @@ -17,16 +17,6 @@ package io.codelaser.maddi.cst.print.csharp; -import io.codelaser.maddi.cst.api.element.Element; -import io.codelaser.maddi.cst.api.expression.ConstructorCall; -import io.codelaser.maddi.cst.api.info.FieldInfo; -import io.codelaser.maddi.cst.api.info.MethodInfo; -import io.codelaser.maddi.cst.api.info.TypeInfo; -import io.codelaser.maddi.cst.api.info.TypeParameter; -import io.codelaser.maddi.cst.api.statement.LocalTypeDeclaration; -import io.codelaser.maddi.cst.print.translate.CstQueries; -import io.codelaser.maddi.cst.print.translate.CstSupertypes; - import java.util.ArrayDeque; import java.util.ArrayList; import java.util.Arrays; @@ -37,6 +27,16 @@ import java.util.Set; import java.util.stream.Collectors; +import io.codelaser.maddi.cst.api.element.Element; +import io.codelaser.maddi.cst.api.expression.ConstructorCall; +import io.codelaser.maddi.cst.api.info.FieldInfo; +import io.codelaser.maddi.cst.api.info.MethodInfo; +import io.codelaser.maddi.cst.api.info.TypeInfo; +import io.codelaser.maddi.cst.api.info.TypeParameter; +import io.codelaser.maddi.cst.api.statement.LocalTypeDeclaration; +import io.codelaser.maddi.cst.print.translate.CstQueries; +import io.codelaser.maddi.cst.print.translate.CstSupertypes; + /** * The naming policy: Java's names, written the way C# code names things. Every name is a function of the declaration * alone, so a declaration and all its uses agree without a renaming pass: diff --git a/maddi-cst-print-csharp/src/main/java/io/codelaser/maddi/cst/print/csharp/CSharpNotNullKeys.java b/maddi-cst-print-csharp/src/main/java/io/codelaser/maddi/cst/print/csharp/CSharpNotNullKeys.java index efb28012d6..70be8b371b 100644 --- a/maddi-cst-print-csharp/src/main/java/io/codelaser/maddi/cst/print/csharp/CSharpNotNullKeys.java +++ b/maddi-cst-print-csharp/src/main/java/io/codelaser/maddi/cst/print/csharp/CSharpNotNullKeys.java @@ -17,6 +17,15 @@ package io.codelaser.maddi.cst.print.csharp; +import java.util.ArrayDeque; +import java.util.Deque; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.stream.Stream; + import io.codelaser.maddi.cst.api.element.Element; import io.codelaser.maddi.cst.api.expression.ConstructorCall; import io.codelaser.maddi.cst.api.expression.Expression; @@ -29,15 +38,6 @@ import io.codelaser.maddi.cst.api.statement.LocalVariableCreation; import io.codelaser.maddi.cst.api.type.ParameterizedType; -import java.util.ArrayDeque; -import java.util.Deque; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.stream.Stream; - /** * The type parameters that are {@code where T : notnull} in a nullable context. C#'s Dictionary, SortedDictionary and * OrderedDictionary want a key type that is not null (CS8714); Java's HashMap, TreeMap and LinkedHashMap, which they diff --git a/maddi-cst-print-csharp/src/main/java/io/codelaser/maddi/cst/print/csharp/CSharpNullability.java b/maddi-cst-print-csharp/src/main/java/io/codelaser/maddi/cst/print/csharp/CSharpNullability.java index 647841dcd7..95a7e1c800 100644 --- a/maddi-cst-print-csharp/src/main/java/io/codelaser/maddi/cst/print/csharp/CSharpNullability.java +++ b/maddi-cst-print-csharp/src/main/java/io/codelaser/maddi/cst/print/csharp/CSharpNullability.java @@ -38,8 +38,6 @@ import io.codelaser.maddi.cst.impl.output.SpaceEnum; import io.codelaser.maddi.cst.impl.output.SymbolEnum; -import java.util.List; - /** * Where C#'s nullable reference types need a {@code !}: when the analysis's facts say the program's nullability is * known ({@link CSharpFacts#nullabilityAnalysed}), a dereference of a value that may be null is {@code x!.m()}. Java diff --git a/maddi-cst-print-csharp/src/main/java/io/codelaser/maddi/cst/print/csharp/CSharpProgram.java b/maddi-cst-print-csharp/src/main/java/io/codelaser/maddi/cst/print/csharp/CSharpProgram.java index 163ea880a5..0f979c4118 100644 --- a/maddi-cst-print-csharp/src/main/java/io/codelaser/maddi/cst/print/csharp/CSharpProgram.java +++ b/maddi-cst-print-csharp/src/main/java/io/codelaser/maddi/cst/print/csharp/CSharpProgram.java @@ -17,6 +17,19 @@ package io.codelaser.maddi.cst.print.csharp; +import java.util.ArrayDeque; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Deque; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Set; +import java.util.concurrent.ConcurrentHashMap; +import java.util.stream.Stream; + import io.codelaser.maddi.cst.api.element.Element; import io.codelaser.maddi.cst.api.expression.ConstructorCall; import io.codelaser.maddi.cst.api.expression.Expression; @@ -33,19 +46,6 @@ import io.codelaser.maddi.cst.print.translate.CstQueries; import io.codelaser.maddi.cst.print.translate.CstSupertypes; -import java.util.ArrayDeque; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Deque; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.Set; -import java.util.concurrent.ConcurrentHashMap; -import java.util.stream.Stream; - /** * What the printer knows of the whole translated program, beyond the file it prints: computed once, before the * files are printed, and handed to each {@link CSharpCompilationUnitPrinter}. Without it ({@link #NONE}), every diff --git a/maddi-cst-print-csharp/src/main/java/io/codelaser/maddi/cst/print/csharp/CSharpProgramIndex.java b/maddi-cst-print-csharp/src/main/java/io/codelaser/maddi/cst/print/csharp/CSharpProgramIndex.java index 8dfff477d2..ddf62ce591 100644 --- a/maddi-cst-print-csharp/src/main/java/io/codelaser/maddi/cst/print/csharp/CSharpProgramIndex.java +++ b/maddi-cst-print-csharp/src/main/java/io/codelaser/maddi/cst/print/csharp/CSharpProgramIndex.java @@ -17,6 +17,13 @@ package io.codelaser.maddi.cst.print.csharp; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; + import io.codelaser.maddi.cst.api.element.Element; import io.codelaser.maddi.cst.api.expression.ConstructorCall; import io.codelaser.maddi.cst.api.expression.Expression; @@ -27,13 +34,6 @@ import io.codelaser.maddi.cst.api.statement.ExplicitConstructorInvocation; import io.codelaser.maddi.cst.print.translate.CstQueries; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; - /** * What the whole-program analyses of {@link CSharpProgram} ask of the program, gathered in one pass over its types and * one walk of its code: the methods that override one another, the methods a method reference names, and the diff --git a/maddi-cst-print-csharp/src/main/java/io/codelaser/maddi/cst/print/csharp/CSharpProperties.java b/maddi-cst-print-csharp/src/main/java/io/codelaser/maddi/cst/print/csharp/CSharpProperties.java index 5d73cbe343..d3185c1d9b 100644 --- a/maddi-cst-print-csharp/src/main/java/io/codelaser/maddi/cst/print/csharp/CSharpProperties.java +++ b/maddi-cst-print-csharp/src/main/java/io/codelaser/maddi/cst/print/csharp/CSharpProperties.java @@ -17,6 +17,13 @@ package io.codelaser.maddi.cst.print.csharp; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; + import io.codelaser.maddi.cst.api.element.Element; import io.codelaser.maddi.cst.api.expression.Assignment; import io.codelaser.maddi.cst.api.expression.Expression; @@ -31,13 +38,6 @@ import io.codelaser.maddi.cst.api.variable.This; import io.codelaser.maddi.cst.print.translate.CstQueries; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; - /** * Java's getters and setters as C#'s properties, decided for the whole program. A class's getter whose body is * {@code return f;}, of a field of its own of the same type, is the property that takes the field's place: diff --git a/maddi-cst-print-csharp/src/main/java/io/codelaser/maddi/cst/print/csharp/CSharpReadOnly.java b/maddi-cst-print-csharp/src/main/java/io/codelaser/maddi/cst/print/csharp/CSharpReadOnly.java index 99c16d8184..5855697497 100644 --- a/maddi-cst-print-csharp/src/main/java/io/codelaser/maddi/cst/print/csharp/CSharpReadOnly.java +++ b/maddi-cst-print-csharp/src/main/java/io/codelaser/maddi/cst/print/csharp/CSharpReadOnly.java @@ -17,6 +17,15 @@ package io.codelaser.maddi.cst.print.csharp; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.IdentityHashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; + import io.codelaser.maddi.cst.api.element.Element; import io.codelaser.maddi.cst.api.expression.ConstructorCall; import io.codelaser.maddi.cst.api.expression.Expression; @@ -30,15 +39,6 @@ import io.codelaser.maddi.cst.api.type.ParameterizedType; import io.codelaser.maddi.cst.print.translate.CstSupertypes; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.IdentityHashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; - /** * The collection parameters that are read-only in C#: {@code IReadOnlyList}, {@code IReadOnlyCollection}, * {@code IReadOnlySet}, {@code IReadOnlyDictionary} for Java's {@code List}, {@code Collection}, {@code Set} diff --git a/maddi-cst-print-csharp/src/main/java/io/codelaser/maddi/cst/print/csharp/CSharpStatementPrinter.java b/maddi-cst-print-csharp/src/main/java/io/codelaser/maddi/cst/print/csharp/CSharpStatementPrinter.java index 15e0a553bf..b81a2671ec 100644 --- a/maddi-cst-print-csharp/src/main/java/io/codelaser/maddi/cst/print/csharp/CSharpStatementPrinter.java +++ b/maddi-cst-print-csharp/src/main/java/io/codelaser/maddi/cst/print/csharp/CSharpStatementPrinter.java @@ -17,6 +17,13 @@ package io.codelaser.maddi.cst.print.csharp; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Objects; +import java.util.Set; +import java.util.function.Supplier; + import io.codelaser.maddi.cst.api.element.Element; import io.codelaser.maddi.cst.api.element.RecordPattern; import io.codelaser.maddi.cst.api.expression.Assignment; @@ -44,13 +51,6 @@ import io.codelaser.maddi.cst.print.translate.CstQueries; import io.codelaser.maddi.cst.print.translate.CstSupertypes; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; -import java.util.Objects; -import java.util.Set; -import java.util.function.Supplier; - /** * Prints a {@link Statement} as C#. Most of Java's statements are C#'s; where they differ: *