From 736ffb679fbec81c7ea6555b595fa2dd95ad777a Mon Sep 17 00:00:00 2001 From: Manfred Hanke Date: Sun, 20 Nov 2022 16:21:23 +0100 Subject: [PATCH] remove unnecessary `final` on variables or parameters Signed-off-by: Manfred Hanke --- .../junit4/SlicesIsolationTest.java | 2 +- .../junit5/SlicesIsolationTest.java | 2 +- .../first/dao/domain/PersistentObject.java | 2 +- .../dao/domain/OtherPersistentObject.java | 2 +- .../exampletest/SlicesIsolationTest.java | 2 +- .../extension/NewConfigurationEvent.java | 2 +- .../archunit/ArchUnitArchitectureTest.java | 4 +- .../integration/ExamplesIntegrationTest.java | 4 +- .../integration/ExtensionIntegrationTest.java | 2 +- .../testutils/CyclicErrorMatcher.java | 2 +- .../archunit/testutils/HandlingAssertion.java | 12 +-- .../testutils/MessageAssertionChain.java | 14 ++-- .../internal/ArchUnitRunnerInternal.java | 2 +- .../ArchUnitRunnerRunsRuleSetsTest.java | 2 +- .../junit/engine_api/FieldSelector.java | 2 +- .../junit/engine_api/FieldSource.java | 2 +- .../archunit/junit/internal/ClassCache.java | 2 +- .../junit/internal/ReflectionUtils.java | 2 +- .../internal/ClassCacheConcurrencyTest.java | 2 +- .../junit/internal/ClassCacheTest.java | 2 +- .../junit/internal/ReflectionUtilsTest.java | 2 +- .../archunit/base/ChainableFunction.java | 4 +- .../archunit/base/DescribedIterable.java | 2 +- .../archunit/base/DescribedPredicate.java | 28 +++---- .../archunit/core/domain/AccessTarget.java | 10 +-- .../archunit/core/domain/AnnotationProxy.java | 2 +- .../archunit/core/domain/Dependency.java | 6 +- .../archunit/core/domain/JavaAccess.java | 4 +- .../archunit/core/domain/JavaCall.java | 2 +- .../archunit/core/domain/JavaClass.java | 44 +++++------ .../core/domain/JavaClassDependencies.java | 4 +- .../core/domain/JavaClassDescriptor.java | 2 +- .../core/domain/JavaClassMembers.java | 2 +- .../archunit/core/domain/JavaClasses.java | 2 +- .../core/domain/JavaCodeUnitAccess.java | 2 +- .../core/domain/JavaCodeUnitReference.java | 2 +- .../core/domain/JavaEnumConstant.java | 2 +- .../archunit/core/domain/JavaFieldAccess.java | 4 +- .../core/domain/ReverseDependencies.java | 6 +- .../tngtech/archunit/core/domain/Source.java | 4 +- .../core/domain/SourceCodeLocation.java | 2 +- .../archunit/core/domain/ThrowsClause.java | 2 +- .../core/domain/ThrowsDeclaration.java | 2 +- .../domain/properties/CanBeAnnotated.java | 14 ++-- .../core/domain/properties/HasModifiers.java | 2 +- .../core/domain/properties/HasName.java | 10 +-- .../core/domain/properties/HasOwner.java | 2 +- .../domain/properties/HasParameterTypes.java | 8 +- .../domain/properties/HasThrowsClause.java | 12 +-- .../archunit/core/importer/AccessRecord.java | 2 +- .../core/importer/ClassFileImporter.java | 2 +- .../core/importer/ClassFileSource.java | 8 +- .../core/importer/DomainBuilders.java | 34 ++++----- .../core/importer/JavaClassProcessor.java | 19 ++--- .../archunit/core/importer/Location.java | 6 +- .../core/importer/NormalizedResourceName.java | 2 +- .../archunit/core/importer/NormalizedUri.java | 2 +- .../core/importer/RawAccessRecord.java | 2 +- .../archunit/core/importer/UrlSource.java | 2 +- .../importer/resolvers/ClassResolver.java | 10 +-- .../lang/AbstractClassesTransformer.java | 2 +- .../com/tngtech/archunit/lang/ArchRule.java | 2 +- .../archunit/lang/EvaluationResult.java | 4 +- .../conditions/AllDependenciesCondition.java | 4 +- .../lang/conditions/AndCondition.java | 2 +- .../conditions/AnyDependencyCondition.java | 4 +- .../lang/conditions/ArchConditions.java | 74 +++++++++---------- .../JavaAccessPackagePredicate.java | 2 +- .../lang/conditions/JoinCondition.java | 2 +- .../archunit/lang/conditions/OrCondition.java | 2 +- .../lang/syntax/ArchRuleDefinition.java | 10 +-- .../lang/syntax/ClassesShouldInternal.java | 6 +- .../syntax/MembersDeclaredInClassesThat.java | 2 +- .../lang/syntax/ObjectsShouldInternal.java | 6 +- .../archunit/library/Architectures.java | 12 +-- .../archunit/library/DependencyRules.java | 2 +- .../tngtech/archunit/library/ProxyRules.java | 2 +- .../archunit/library/dependencies/Cycle.java | 2 +- .../archunit/library/dependencies/Edge.java | 2 +- .../archunit/library/dependencies/Path.java | 2 +- .../archunit/library/dependencies/Slice.java | 2 +- .../library/dependencies/SliceDependency.java | 4 +- .../library/dependencies/SliceIdentifier.java | 2 +- .../archunit/library/dependencies/Slices.java | 2 +- .../library/freeze/FreezingArchRule.java | 6 +- .../freeze/ViolationLineMatcherFactory.java | 2 +- .../library/plantuml/rules/Alias.java | 2 +- .../plantuml/rules/ComponentIdentifier.java | 2 +- .../library/plantuml/rules/ComponentName.java | 2 +- .../rules/JavaClassDiagramAssociation.java | 4 +- .../plantuml/rules/ParsedDependency.java | 2 +- .../plantuml/rules/PlantUmlArchCondition.java | 8 +- .../plantuml/rules/PlantUmlComponent.java | 2 +- .../rules/PlantUmlComponentDependency.java | 2 +- .../plantuml/rules/PlantUmlPatterns.java | 2 +- .../library/plantuml/rules/Stereotype.java | 2 +- .../archunit/base/ChainableFunctionTest.java | 4 +- .../archunit/base/DescribedPredicateTest.java | 2 +- .../core/domain/AnnotationProxyTest.java | 4 +- .../archunit/core/domain/JavaClassTest.java | 18 ++--- .../archunit/core/domain/JavaClassesTest.java | 2 +- .../core/domain/JavaCodeUnitTest.java | 6 +- .../archunit/core/domain/JavaPackageTest.java | 16 ++-- .../archunit/core/domain/TestUtils.java | 2 +- .../domain/properties/HasModifiersTest.java | 2 +- .../core/domain/properties/HasNameTest.java | 4 +- .../core/domain/properties/HasOwnerTest.java | 4 +- .../properties/HasParameterTypesTest.java | 2 +- .../domain/properties/HasReturnTypeTest.java | 4 +- .../properties/HasThrowsClauseTest.java | 2 +- .../core/domain/properties/HasTypeTest.java | 2 +- .../ClassFileImporterAccessesTest.java | 12 +-- .../core/importer/ClassFileImporterTest.java | 4 +- .../core/importer/ClassFileSourceTest.java | 6 +- .../DependencyResolutionProcessTestUtils.java | 8 +- .../core/importer/ImportTestUtils.java | 2 +- .../archunit/core/importer/LocationTest.java | 2 +- .../archunit/core/importer/UrlSourceTest.java | 4 +- .../ClassResolverFromClassPathTest.java | 6 +- ...electedClassResolverFromClasspathTest.java | 2 +- .../innerclassimport/ClassWithInnerClass.java | 4 +- .../archunit/lang/ArchConditionTest.java | 14 ++-- .../tngtech/archunit/lang/ArchRuleTest.java | 4 +- .../archunit/lang/CompositeArchRuleTest.java | 2 +- .../archunit/lang/EvaluationResultTest.java | 6 +- .../lang/FailureDisplayFormatFactoryTest.java | 2 +- .../lang/SimpleConditionEventTest.java | 2 +- .../ClassAccessesFieldConditionTest.java | 2 +- .../ArchUnitExtensionLoaderTest.java | 4 +- .../syntax/elements/ClassesShouldTest.java | 2 +- .../syntax/elements/CodeUnitsShouldTest.java | 2 +- .../syntax/elements/GivenClassesThatTest.java | 2 +- .../syntax/elements/GivenCodeUnitsTest.java | 2 +- .../syntax/elements/GivenMembersTest.java | 4 +- .../library/dependencies/GivenSlicesTest.java | 4 +- .../library/dependencies/SliceRuleTest.java | 8 +- .../dependencies/SlicesShouldTest.java | 2 +- .../library/dependencies/SlicesTest.java | 2 +- .../library/freeze/FreezingArchRuleTest.java | 6 +- .../ComponentDependencyMetricsTest.java | 2 +- .../library/metrics/LakosMetricsTest.java | 6 +- .../rules/PlantUmlArchConditionTest.java | 2 +- .../plantuml/rules/PlantUmlParserTest.java | 2 +- .../testutil/ArchConfigurationRule.java | 4 +- .../tngtech/archunit/testutil/Conditions.java | 4 +- .../archunit/testutil/JavaCallQuery.java | 8 +- .../archunit/testutil/TestLogRecorder.java | 4 +- .../assertion/AccessToFieldAssertion.java | 4 +- .../assertion/CodeUnitAccessAssertion.java | 10 +-- .../assertion/DependenciesAssertion.java | 6 +- .../assertion/ExpectedAccessCreation.java | 6 +- .../assertion/JavaAnnotationAssertion.java | 10 +-- .../testutil/syntax/MethodChoiceStrategy.java | 4 +- 153 files changed, 397 insertions(+), 402 deletions(-) diff --git a/archunit-example/example-junit4/src/test/java/com/tngtech/archunit/exampletest/junit4/SlicesIsolationTest.java b/archunit-example/example-junit4/src/test/java/com/tngtech/archunit/exampletest/junit4/SlicesIsolationTest.java index b072cb7837..3ac1d30fbc 100644 --- a/archunit-example/example-junit4/src/test/java/com/tngtech/archunit/exampletest/junit4/SlicesIsolationTest.java +++ b/archunit-example/example-junit4/src/test/java/com/tngtech/archunit/exampletest/junit4/SlicesIsolationTest.java @@ -38,7 +38,7 @@ public class SlicesIsolationTest { .ignoreDependency(UseCaseOneTwoController.class, UseCaseTwoController.class) .ignoreDependency(nameMatching(".*controller\\.three.*"), alwaysTrue()); - private static DescribedPredicate containDescription(final String descriptionPart) { + private static DescribedPredicate containDescription(String descriptionPart) { return new DescribedPredicate("contain description '%s'", descriptionPart) { @Override public boolean test(Slice input) { diff --git a/archunit-example/example-junit5/src/test/java/com/tngtech/archunit/exampletest/junit5/SlicesIsolationTest.java b/archunit-example/example-junit5/src/test/java/com/tngtech/archunit/exampletest/junit5/SlicesIsolationTest.java index ba454d0036..44a27035b0 100644 --- a/archunit-example/example-junit5/src/test/java/com/tngtech/archunit/exampletest/junit5/SlicesIsolationTest.java +++ b/archunit-example/example-junit5/src/test/java/com/tngtech/archunit/exampletest/junit5/SlicesIsolationTest.java @@ -35,7 +35,7 @@ public class SlicesIsolationTest { .ignoreDependency(UseCaseOneTwoController.class, UseCaseTwoController.class) .ignoreDependency(nameMatching(".*controller\\.three.*"), alwaysTrue()); - private static DescribedPredicate containDescription(final String descriptionPart) { + private static DescribedPredicate containDescription(String descriptionPart) { return new DescribedPredicate("contain description '%s'", descriptionPart) { @Override public boolean test(Slice input) { diff --git a/archunit-example/example-plain/src/main/java/com/tngtech/archunit/example/layers/persistence/first/dao/domain/PersistentObject.java b/archunit-example/example-plain/src/main/java/com/tngtech/archunit/example/layers/persistence/first/dao/domain/PersistentObject.java index 56dc774674..82d3500339 100644 --- a/archunit-example/example-plain/src/main/java/com/tngtech/archunit/example/layers/persistence/first/dao/domain/PersistentObject.java +++ b/archunit-example/example-plain/src/main/java/com/tngtech/archunit/example/layers/persistence/first/dao/domain/PersistentObject.java @@ -31,7 +31,7 @@ public boolean equals(Object obj) { if (obj == null || getClass() != obj.getClass()) { return false; } - final PersistentObject other = (PersistentObject) obj; + PersistentObject other = (PersistentObject) obj; return Objects.equals(this.id, other.id); } } diff --git a/archunit-example/example-plain/src/main/java/com/tngtech/archunit/example/layers/persistence/second/dao/domain/OtherPersistentObject.java b/archunit-example/example-plain/src/main/java/com/tngtech/archunit/example/layers/persistence/second/dao/domain/OtherPersistentObject.java index 6f989f1c00..b2680eb316 100644 --- a/archunit-example/example-plain/src/main/java/com/tngtech/archunit/example/layers/persistence/second/dao/domain/OtherPersistentObject.java +++ b/archunit-example/example-plain/src/main/java/com/tngtech/archunit/example/layers/persistence/second/dao/domain/OtherPersistentObject.java @@ -38,7 +38,7 @@ public boolean equals(Object obj) { if (obj == null || getClass() != obj.getClass()) { return false; } - final OtherPersistentObject other = (OtherPersistentObject) obj; + OtherPersistentObject other = (OtherPersistentObject) obj; return Objects.equals(this.id, other.id); } } diff --git a/archunit-example/example-plain/src/test/java/com/tngtech/archunit/exampletest/SlicesIsolationTest.java b/archunit-example/example-plain/src/test/java/com/tngtech/archunit/exampletest/SlicesIsolationTest.java index 8b10044ae5..e2873ee47d 100644 --- a/archunit-example/example-plain/src/test/java/com/tngtech/archunit/exampletest/SlicesIsolationTest.java +++ b/archunit-example/example-plain/src/test/java/com/tngtech/archunit/exampletest/SlicesIsolationTest.java @@ -43,7 +43,7 @@ public void controllers_should_only_use_their_own_slice_with_custom_ignore() { .check(classes); } - private static DescribedPredicate containDescription(final String descriptionPart) { + private static DescribedPredicate containDescription(String descriptionPart) { return new DescribedPredicate("contain description '%s'", descriptionPart) { @Override public boolean test(Slice input) { diff --git a/archunit-example/example-plain/src/test/java/com/tngtech/archunit/exampletest/extension/NewConfigurationEvent.java b/archunit-example/example-plain/src/test/java/com/tngtech/archunit/exampletest/extension/NewConfigurationEvent.java index 25dcbe4128..7b511e2c2c 100644 --- a/archunit-example/example-plain/src/test/java/com/tngtech/archunit/exampletest/extension/NewConfigurationEvent.java +++ b/archunit-example/example-plain/src/test/java/com/tngtech/archunit/exampletest/extension/NewConfigurationEvent.java @@ -35,7 +35,7 @@ public boolean equals(Object obj) { if (obj == null || getClass() != obj.getClass()) { return false; } - final NewConfigurationEvent other = (NewConfigurationEvent) obj; + NewConfigurationEvent other = (NewConfigurationEvent) obj; return Objects.equals(this.properties, other.properties); } diff --git a/archunit-integration-test/src/test/java/com/tngtech/archunit/ArchUnitArchitectureTest.java b/archunit-integration-test/src/test/java/com/tngtech/archunit/ArchUnitArchitectureTest.java index 4b1234795f..2c54f26f31 100644 --- a/archunit-integration-test/src/test/java/com/tngtech/archunit/ArchUnitArchitectureTest.java +++ b/archunit-integration-test/src/test/java/com/tngtech/archunit/ArchUnitArchitectureTest.java @@ -83,11 +83,11 @@ private static DescribedPredicate> typeIsIllegallyResolvedViaReflect return classIsResolvedViaReflection().and(not(explicitlyAllowedUsage)); } - private static DescribedPredicate> contextIsAnnotatedWith(final Class annotationType) { + private static DescribedPredicate> contextIsAnnotatedWith(Class annotationType) { return origin(With.owner(withAnnotation(annotationType))); } - private static DescribedPredicate withAnnotation(final Class annotationType) { + private static DescribedPredicate withAnnotation(Class annotationType) { return new DescribedPredicate("annotated with @" + annotationType.getName()) { @Override public boolean test(JavaClass input) { diff --git a/archunit-integration-test/src/test/java/com/tngtech/archunit/integration/ExamplesIntegrationTest.java b/archunit-integration-test/src/test/java/com/tngtech/archunit/integration/ExamplesIntegrationTest.java index b1364a1d85..69f5a3602a 100644 --- a/archunit-integration-test/src/test/java/com/tngtech/archunit/integration/ExamplesIntegrationTest.java +++ b/archunit-integration-test/src/test/java/com/tngtech/archunit/integration/ExamplesIntegrationTest.java @@ -1263,8 +1263,8 @@ Stream RestrictNumberOfClassesWithACertainPropertyTest() { } - private static MessageAssertionChain.Link classesContaining(final Class... classes) { - final String expectedLine = String.format("there is/are %d element(s) in %s", classes.length, formatNamesOf(classes)); + private static MessageAssertionChain.Link classesContaining(Class... classes) { + String expectedLine = String.format("there is/are %d element(s) in %s", classes.length, formatNamesOf(classes)); return new MessageAssertionChain.Link() { @Override public Result filterMatching(List lines) { diff --git a/archunit-integration-test/src/test/java/com/tngtech/archunit/integration/ExtensionIntegrationTest.java b/archunit-integration-test/src/test/java/com/tngtech/archunit/integration/ExtensionIntegrationTest.java index 7721526c02..61b63341d1 100644 --- a/archunit-integration-test/src/test/java/com/tngtech/archunit/integration/ExtensionIntegrationTest.java +++ b/archunit-integration-test/src/test/java/com/tngtech/archunit/integration/ExtensionIntegrationTest.java @@ -65,7 +65,7 @@ void evaluation_results_are_only_dispatched_to_enabled_extensions() { assertThat(ExampleExtension.getEvaluatedRuleEvents()).isEmpty(); } - private static Condition containingEntry(final String propKey, final String propValue) { + private static Condition containingEntry(String propKey, String propValue) { return new Condition(String.format("containing entry {%s=%s}", propKey, propValue)) { @Override public boolean matches(Object value) { diff --git a/archunit-integration-test/src/test/java/com/tngtech/archunit/testutils/CyclicErrorMatcher.java b/archunit-integration-test/src/test/java/com/tngtech/archunit/testutils/CyclicErrorMatcher.java index c34595b3f2..8816e00edc 100644 --- a/archunit-integration-test/src/test/java/com/tngtech/archunit/testutils/CyclicErrorMatcher.java +++ b/archunit-integration-test/src/test/java/com/tngtech/archunit/testutils/CyclicErrorMatcher.java @@ -58,7 +58,7 @@ public CyclicErrorMatcher by(ExpectedRelation dependency) { @Override public MessageAssertionChain.Link.Result filterMatching(List lines) { - final Result.Builder builder = new Result.Builder() + Result.Builder builder = new Result.Builder() .containsText(cycleText()); for (String sliceName : details.asMap().keySet()) { diff --git a/archunit-integration-test/src/test/java/com/tngtech/archunit/testutils/HandlingAssertion.java b/archunit-integration-test/src/test/java/com/tngtech/archunit/testutils/HandlingAssertion.java index 2341ce840b..dd7795c9c8 100644 --- a/archunit-integration-test/src/test/java/com/tngtech/archunit/testutils/HandlingAssertion.java +++ b/archunit-integration-test/src/test/java/com/tngtech/archunit/testutils/HandlingAssertion.java @@ -80,7 +80,7 @@ Result evaluate(EvaluationResult evaluationResult) { private Set evaluateFieldAccesses(EvaluationResult result) { Set errorMessages = new HashSet<>(); - final Set left = new HashSet<>(this.expectedFieldAccesses); + Set left = new HashSet<>(this.expectedFieldAccesses); result.handleViolations((Collection violatingObjects, String message) -> errorMessages.addAll(removeExpectedAccesses(violatingObjects, left))); return union(errorMessages, errorMessagesFrom(left)); @@ -88,7 +88,7 @@ private Set evaluateFieldAccesses(EvaluationResult result) { private Set evaluateMethodCalls(EvaluationResult result) { Set errorMessages = new HashSet<>(); - final Set left = new HashSet<>(expectedMethodCalls); + Set left = new HashSet<>(expectedMethodCalls); result.handleViolations((Collection violatingObjects, String message) -> errorMessages.addAll(removeExpectedAccesses(violatingObjects, left))); return union(errorMessages, errorMessagesFrom(left)); @@ -96,7 +96,7 @@ private Set evaluateMethodCalls(EvaluationResult result) { private Set evaluateConstructorCalls(EvaluationResult result) { Set errorMessages = new HashSet<>(); - final Set left = new HashSet<>(expectedConstructorCalls); + Set left = new HashSet<>(expectedConstructorCalls); result.handleViolations((Collection violatingObjects, String message) -> errorMessages.addAll(removeExpectedAccesses(violatingObjects, left))); return union(errorMessages, errorMessagesFrom(left)); @@ -104,7 +104,7 @@ private Set evaluateConstructorCalls(EvaluationResult result) { private Set evaluateCalls(EvaluationResult result) { Set errorMessages = new HashSet<>(); - final Set left = new HashSet<>(Sets.union(expectedConstructorCalls, expectedMethodCalls)); + Set left = new HashSet<>(Sets.union(expectedConstructorCalls, expectedMethodCalls)); result.handleViolations((Collection> violatingObjects, String message) -> errorMessages.addAll(removeExpectedAccesses(violatingObjects, left))); return union(errorMessages, errorMessagesFrom(left)); @@ -112,7 +112,7 @@ private Set evaluateCalls(EvaluationResult result) { private Set evaluateAccesses(EvaluationResult result) { Set errorMessages = new HashSet<>(); - final Set left = new HashSet() { + Set left = new HashSet() { { addAll(expectedConstructorCalls); addAll(expectedMethodCalls); @@ -126,7 +126,7 @@ private Set evaluateAccesses(EvaluationResult result) { private Set evaluateDependencies(EvaluationResult result) { Set errorMessages = new HashSet<>(); - final Set left = new HashSet<>(expectedDependencies); + Set left = new HashSet<>(expectedDependencies); result.handleViolations((Collection violatingObjects, String message) -> errorMessages.addAll(removeExpectedAccesses(violatingObjects, left))); return union(errorMessages, errorMessagesFrom(left)); diff --git a/archunit-integration-test/src/test/java/com/tngtech/archunit/testutils/MessageAssertionChain.java b/archunit-integration-test/src/test/java/com/tngtech/archunit/testutils/MessageAssertionChain.java index cdde0a4db2..cd470b14c6 100644 --- a/archunit-integration-test/src/test/java/com/tngtech/archunit/testutils/MessageAssertionChain.java +++ b/archunit-integration-test/src/test/java/com/tngtech/archunit/testutils/MessageAssertionChain.java @@ -38,8 +38,8 @@ public String toString() { return links.stream().map(Link::getDescription).collect(joining(lineSeparator())); } - static Link matchesLine(final String pattern) { - final Pattern p = Pattern.compile(pattern); + static Link matchesLine(String pattern) { + Pattern p = Pattern.compile(pattern); return new Link() { @Override public Result filterMatching(List lines) { @@ -61,7 +61,7 @@ public String getDescription() { } static Link containsLine(String text, Object... args) { - final String expectedLine = String.format(text, args); + String expectedLine = String.format(text, args); return new Link() { @Override public Result filterMatching(List lines) { @@ -79,7 +79,7 @@ public String getDescription() { static Link containsText(String text, Object... args) { String expectedText = String.format(text, args); - final List expectedLines = Splitter.on(lineSeparator()).splitToList(expectedText); + List expectedLines = Splitter.on(lineSeparator()).splitToList(expectedText); return new Link() { @Override public Result filterMatching(List lines) { @@ -115,10 +115,10 @@ private static String describeLines(List lines) { return "Lines were >>>>>>>>" + lineSeparator() + Joiner.on(lineSeparator()).join(lines) + lineSeparator() + "<<<<<<<<"; } - static Link containsConsecutiveLines(final List expectedLines) { + static Link containsConsecutiveLines(List expectedLines) { checkArgument(!expectedLines.isEmpty(), "Asserting zero consecutive lines makes no sense"); - final String linesDescription = Joiner.on(lineSeparator()).join(expectedLines); - final String description = "Message contains consecutive lines " + lineSeparator() + linesDescription; + String linesDescription = Joiner.on(lineSeparator()).join(expectedLines); + String description = "Message contains consecutive lines " + lineSeparator() + linesDescription; return new Link() { @Override diff --git a/archunit-junit/junit4/src/main/java/com/tngtech/archunit/junit/internal/ArchUnitRunnerInternal.java b/archunit-junit/junit4/src/main/java/com/tngtech/archunit/junit/internal/ArchUnitRunnerInternal.java index 42b44f17f8..00073a2b09 100644 --- a/archunit-junit/junit4/src/main/java/com/tngtech/archunit/junit/internal/ArchUnitRunnerInternal.java +++ b/archunit-junit/junit4/src/main/java/com/tngtech/archunit/junit/internal/ArchUnitRunnerInternal.java @@ -64,7 +64,7 @@ private static AnalyzeClasses checkAnnotation(Class testClass) { @Override public Statement classBlock(RunNotifier notifier) { - final Statement statement = super.classBlock(notifier); + Statement statement = super.classBlock(notifier); return new Statement() { @Override public void evaluate() throws Throwable { diff --git a/archunit-junit/junit4/src/test/java/com/tngtech/archunit/junit/internal/ArchUnitRunnerRunsRuleSetsTest.java b/archunit-junit/junit4/src/test/java/com/tngtech/archunit/junit/internal/ArchUnitRunnerRunsRuleSetsTest.java index 5f577bcadd..2c4f4a3466 100644 --- a/archunit-junit/junit4/src/test/java/com/tngtech/archunit/junit/internal/ArchUnitRunnerRunsRuleSetsTest.java +++ b/archunit-junit/junit4/src/test/java/com/tngtech/archunit/junit/internal/ArchUnitRunnerRunsRuleSetsTest.java @@ -201,7 +201,7 @@ private Runnable verifyTestRan() { } // extractingResultOf(..) only looks for public methods - private Extractor resultOf(final String methodName) { + private Extractor resultOf(String methodName) { return input -> { Collection candidates = getAllMethods(input.getClass(), method -> method.getName().equals(methodName)); checkState(!candidates.isEmpty(), diff --git a/archunit-junit/junit5/engine-api/src/main/java/com/tngtech/archunit/junit/engine_api/FieldSelector.java b/archunit-junit/junit5/engine-api/src/main/java/com/tngtech/archunit/junit/engine_api/FieldSelector.java index fcdc8e94f8..81481c2d5d 100644 --- a/archunit-junit/junit5/engine-api/src/main/java/com/tngtech/archunit/junit/engine_api/FieldSelector.java +++ b/archunit-junit/junit5/engine-api/src/main/java/com/tngtech/archunit/junit/engine_api/FieldSelector.java @@ -59,7 +59,7 @@ public boolean equals(Object obj) { if (obj == null || getClass() != obj.getClass()) { return false; } - final FieldSelector other = (FieldSelector) obj; + FieldSelector other = (FieldSelector) obj; return Objects.equals(this.clazz, other.clazz) && Objects.equals(this.field, other.field); } diff --git a/archunit-junit/junit5/engine-api/src/main/java/com/tngtech/archunit/junit/engine_api/FieldSource.java b/archunit-junit/junit5/engine-api/src/main/java/com/tngtech/archunit/junit/engine_api/FieldSource.java index 85abe8ee22..5f8aa4b6e7 100644 --- a/archunit-junit/junit5/engine-api/src/main/java/com/tngtech/archunit/junit/engine_api/FieldSource.java +++ b/archunit-junit/junit5/engine-api/src/main/java/com/tngtech/archunit/junit/engine_api/FieldSource.java @@ -62,7 +62,7 @@ public boolean equals(Object obj) { if (obj == null || getClass() != obj.getClass()) { return false; } - final FieldSource other = (FieldSource) obj; + FieldSource other = (FieldSource) obj; return Objects.equals(this.javaClass, other.javaClass) && Objects.equals(this.fieldName, other.fieldName); } diff --git a/archunit-junit/src/main/java/com/tngtech/archunit/junit/internal/ClassCache.java b/archunit-junit/src/main/java/com/tngtech/archunit/junit/internal/ClassCache.java index 6a72564f39..44e9535f83 100644 --- a/archunit-junit/src/main/java/com/tngtech/archunit/junit/internal/ClassCache.java +++ b/archunit-junit/src/main/java/com/tngtech/archunit/junit/internal/ClassCache.java @@ -149,7 +149,7 @@ public boolean equals(Object obj) { if (obj == null || getClass() != obj.getClass()) { return false; } - final LocationsKey other = (LocationsKey) obj; + LocationsKey other = (LocationsKey) obj; return Objects.equals(this.importOptionTypes, other.importOptionTypes) && Objects.equals(this.locations, other.locations); } diff --git a/archunit-junit/src/main/java/com/tngtech/archunit/junit/internal/ReflectionUtils.java b/archunit-junit/src/main/java/com/tngtech/archunit/junit/internal/ReflectionUtils.java index e05bf41dad..5810f575db 100644 --- a/archunit-junit/src/main/java/com/tngtech/archunit/junit/internal/ReflectionUtils.java +++ b/archunit-junit/src/main/java/com/tngtech/archunit/junit/internal/ReflectionUtils.java @@ -121,7 +121,7 @@ private static void rethrowUnchecked(Throwable throwable) throw (T) throwable; } - static Predicate withAnnotation(final Class annotationType) { + static Predicate withAnnotation(Class annotationType) { return input -> input.isAnnotationPresent(annotationType); } } diff --git a/archunit-junit/src/test/java/com/tngtech/archunit/junit/internal/ClassCacheConcurrencyTest.java b/archunit-junit/src/test/java/com/tngtech/archunit/junit/internal/ClassCacheConcurrencyTest.java index 1ffb9fc14d..0bb5b3bf51 100644 --- a/archunit-junit/src/test/java/com/tngtech/archunit/junit/internal/ClassCacheConcurrencyTest.java +++ b/archunit-junit/src/test/java/com/tngtech/archunit/junit/internal/ClassCacheConcurrencyTest.java @@ -67,7 +67,7 @@ public void concurrent_access() throws Exception { verifyNoMoreInteractions(classFileImporter); } - private Runnable repeatGetClassesToAnalyze(final int times) { + private Runnable repeatGetClassesToAnalyze(int times) { return () -> { for (int j = 0; j < times; j++) { cache.getClassesToAnalyzeFor(TEST_CLASSES.get(j % TEST_CLASSES.size()), diff --git a/archunit-junit/src/test/java/com/tngtech/archunit/junit/internal/ClassCacheTest.java b/archunit-junit/src/test/java/com/tngtech/archunit/junit/internal/ClassCacheTest.java index 270f9ec436..eb1cb5b6e5 100644 --- a/archunit-junit/src/test/java/com/tngtech/archunit/junit/internal/ClassCacheTest.java +++ b/archunit-junit/src/test/java/com/tngtech/archunit/junit/internal/ClassCacheTest.java @@ -246,7 +246,7 @@ private void verifyNumberOfImports(int number) { verifyNoMoreInteractions(cacheClassFileImporter); } - private static Condition> locationContaining(final String part) { + private static Condition> locationContaining(String part) { return new Condition>() { @Override public boolean matches(Iterable locations) { diff --git a/archunit-junit/src/test/java/com/tngtech/archunit/junit/internal/ReflectionUtilsTest.java b/archunit-junit/src/test/java/com/tngtech/archunit/junit/internal/ReflectionUtilsTest.java index f0c12325da..0f8796f611 100644 --- a/archunit-junit/src/test/java/com/tngtech/archunit/junit/internal/ReflectionUtilsTest.java +++ b/archunit-junit/src/test/java/com/tngtech/archunit/junit/internal/ReflectionUtilsTest.java @@ -62,7 +62,7 @@ public void getAllFields_of_interface() { field(OtherInterface.class, "OTHER_CONSTANT")); } - private Predicate named(final String name) { + private Predicate named(String name) { return input -> input.getName().equals(name); } diff --git a/archunit/src/main/java/com/tngtech/archunit/base/ChainableFunction.java b/archunit/src/main/java/com/tngtech/archunit/base/ChainableFunction.java index 702d169fd6..db89aa57c2 100644 --- a/archunit/src/main/java/com/tngtech/archunit/base/ChainableFunction.java +++ b/archunit/src/main/java/com/tngtech/archunit/base/ChainableFunction.java @@ -23,7 +23,7 @@ @PublicAPI(usage = INHERITANCE) public abstract class ChainableFunction implements Function { - public ChainableFunction after(final Function function) { + public ChainableFunction after(Function function) { return new ChainableFunction() { @Override public T apply(E input) { @@ -32,7 +32,7 @@ public T apply(E input) { }; } - public ChainableFunction then(final Function function) { + public ChainableFunction then(Function function) { return new ChainableFunction() { @Override public U apply(F input) { diff --git a/archunit/src/main/java/com/tngtech/archunit/base/DescribedIterable.java b/archunit/src/main/java/com/tngtech/archunit/base/DescribedIterable.java index f811474f11..688d5c9e45 100644 --- a/archunit/src/main/java/com/tngtech/archunit/base/DescribedIterable.java +++ b/archunit/src/main/java/com/tngtech/archunit/base/DescribedIterable.java @@ -30,7 +30,7 @@ private From() { } @PublicAPI(usage = ACCESS) - public static DescribedIterable iterable(final Iterable iterable, final String description) { + public static DescribedIterable iterable(Iterable iterable, String description) { return new DescribedIterable() { @Override public String getDescription() { diff --git a/archunit/src/main/java/com/tngtech/archunit/base/DescribedPredicate.java b/archunit/src/main/java/com/tngtech/archunit/base/DescribedPredicate.java index 2e56c7cea2..fd0e675599 100644 --- a/archunit/src/main/java/com/tngtech/archunit/base/DescribedPredicate.java +++ b/archunit/src/main/java/com/tngtech/archunit/base/DescribedPredicate.java @@ -68,15 +68,15 @@ public DescribedPredicate as(String description, Object... params) { return new AsPredicate<>(this, description, params); } - public DescribedPredicate and(final DescribedPredicate other) { + public DescribedPredicate and(DescribedPredicate other) { return new AndPredicate<>(this, other); } - public DescribedPredicate or(final DescribedPredicate other) { + public DescribedPredicate or(DescribedPredicate other) { return new OrPredicate<>(this, other); } - public DescribedPredicate onResultOf(final Function function) { + public DescribedPredicate onResultOf(Function function) { return new OnResultOfPredicate<>(this, function); } @@ -129,27 +129,27 @@ public boolean test(Object input) { }; @PublicAPI(usage = ACCESS) - public static DescribedPredicate equalTo(final T object) { + public static DescribedPredicate equalTo(T object) { return new EqualToPredicate<>(object); } @PublicAPI(usage = ACCESS) - public static > DescribedPredicate lessThan(final T value) { + public static > DescribedPredicate lessThan(T value) { return new LessThanPredicate<>(value); } @PublicAPI(usage = ACCESS) - public static > DescribedPredicate greaterThan(final T value) { + public static > DescribedPredicate greaterThan(T value) { return new GreaterThanPredicate<>(value); } @PublicAPI(usage = ACCESS) - public static > DescribedPredicate lessThanOrEqualTo(final T value) { + public static > DescribedPredicate lessThanOrEqualTo(T value) { return new LessThanOrEqualToPredicate<>(value); } @PublicAPI(usage = ACCESS) - public static > DescribedPredicate greaterThanOrEqualTo(final T value) { + public static > DescribedPredicate greaterThanOrEqualTo(T value) { return new GreaterThanOrEqualToPredicate<>(value); } @@ -162,7 +162,7 @@ public static DescribedPredicate describe(String description, Predicate DescribedPredicate doesNot(final DescribedPredicate predicate) { + public static DescribedPredicate doesNot(DescribedPredicate predicate) { return not(predicate).as("does not %s", predicate.getDescription()).forSubtype(); } @@ -170,7 +170,7 @@ public static DescribedPredicate doesNot(final DescribedPredicate DescribedPredicate doNot(final DescribedPredicate predicate) { + public static DescribedPredicate doNot(DescribedPredicate predicate) { return not(predicate).as("do not %s", predicate.getDescription()).forSubtype(); } @@ -180,7 +180,7 @@ public static DescribedPredicate doNot(final DescribedPredicate The type of object the {@link DescribedPredicate predicate} applies to */ @PublicAPI(usage = ACCESS) - public static DescribedPredicate not(final DescribedPredicate predicate) { + public static DescribedPredicate not(DescribedPredicate predicate) { return new NotPredicate<>(predicate); } @@ -253,7 +253,7 @@ public static DescribedPredicate> empty() { } @PublicAPI(usage = ACCESS) - public static DescribedPredicate> optionalContains(final DescribedPredicate predicate) { + public static DescribedPredicate> optionalContains(DescribedPredicate predicate) { return new OptionalContainsPredicate<>(predicate); } @@ -271,7 +271,7 @@ public static DescribedPredicate> optionalEmpty() { * @param The type of object the {@link DescribedPredicate predicate} applies to */ @PublicAPI(usage = ACCESS) - public static DescribedPredicate> anyElementThat(final DescribedPredicate predicate) { + public static DescribedPredicate> anyElementThat(DescribedPredicate predicate) { return new AnyElementPredicate<>(predicate); } @@ -282,7 +282,7 @@ public static DescribedPredicate> anyElementThat(final * @param The type of object the {@link DescribedPredicate predicate} applies to */ @PublicAPI(usage = ACCESS) - public static DescribedPredicate> allElements(final DescribedPredicate predicate) { + public static DescribedPredicate> allElements(DescribedPredicate predicate) { return new AllElementsPredicate<>(predicate); } diff --git a/archunit/src/main/java/com/tngtech/archunit/core/domain/AccessTarget.java b/archunit/src/main/java/com/tngtech/archunit/core/domain/AccessTarget.java index f8fb8fc1fe..db4564a67f 100644 --- a/archunit/src/main/java/com/tngtech/archunit/core/domain/AccessTarget.java +++ b/archunit/src/main/java/com/tngtech/archunit/core/domain/AccessTarget.java @@ -153,7 +153,7 @@ public boolean isAnnotatedWith(Class annotationType) { */ @Override @PublicAPI(usage = ACCESS) - public boolean isAnnotatedWith(final String annotationTypeName) { + public boolean isAnnotatedWith(String annotationTypeName) { return resolveMember().isPresent() && resolveMember().get().isAnnotatedWith(annotationTypeName); } @@ -166,7 +166,7 @@ public boolean isAnnotatedWith(final String annotationTypeName) { */ @Override @PublicAPI(usage = ACCESS) - public boolean isAnnotatedWith(final DescribedPredicate> predicate) { + public boolean isAnnotatedWith(DescribedPredicate> predicate) { return resolveMember().isPresent() && resolveMember().get().isAnnotatedWith(predicate); } @@ -188,7 +188,7 @@ public boolean isMetaAnnotatedWith(Class annotationType) { */ @Override @PublicAPI(usage = ACCESS) - public boolean isMetaAnnotatedWith(final String annotationTypeName) { + public boolean isMetaAnnotatedWith(String annotationTypeName) { return resolveMember().isPresent() && resolveMember().get().isMetaAnnotatedWith(annotationTypeName); } @@ -201,7 +201,7 @@ public boolean isMetaAnnotatedWith(final String annotationTypeName) { */ @Override @PublicAPI(usage = ACCESS) - public boolean isMetaAnnotatedWith(final DescribedPredicate> predicate) { + public boolean isMetaAnnotatedWith(DescribedPredicate> predicate) { return resolveMember().isPresent() && resolveMember().get().isMetaAnnotatedWith(predicate); } @@ -218,7 +218,7 @@ public boolean equals(Object obj) { if (obj == null || getClass() != obj.getClass()) { return false; } - final AccessTarget other = (AccessTarget) obj; + AccessTarget other = (AccessTarget) obj; return Objects.equals(this.fullName, other.fullName); } diff --git a/archunit/src/main/java/com/tngtech/archunit/core/domain/AnnotationProxy.java b/archunit/src/main/java/com/tngtech/archunit/core/domain/AnnotationProxy.java index db40c335b6..89b6a5b0b0 100644 --- a/archunit/src/main/java/com/tngtech/archunit/core/domain/AnnotationProxy.java +++ b/archunit/src/main/java/com/tngtech/archunit/core/domain/AnnotationProxy.java @@ -364,7 +364,7 @@ public boolean equals(Object obj) { if (obj == null || getClass() != obj.getClass()) { return false; } - final MethodKey other = (MethodKey) obj; + MethodKey other = (MethodKey) obj; return Objects.equals(this.name, other.name) && Objects.equals(this.paramTypeNames, other.paramTypeNames); } diff --git a/archunit/src/main/java/com/tngtech/archunit/core/domain/Dependency.java b/archunit/src/main/java/com/tngtech/archunit/core/domain/Dependency.java index 413430f1ad..121819c097 100644 --- a/archunit/src/main/java/com/tngtech/archunit/core/domain/Dependency.java +++ b/archunit/src/main/java/com/tngtech/archunit/core/domain/Dependency.java @@ -288,7 +288,7 @@ public boolean equals(Object obj) { if (obj == null || getClass() != obj.getClass()) { return false; } - final Dependency other = (Dependency) obj; + Dependency other = (Dependency) obj; return Objects.equals(this.originClass, other.originClass) && Objects.equals(this.targetClass, other.targetClass) && Objects.equals(this.lineNumber, other.lineNumber) @@ -372,7 +372,7 @@ public static DescribedPredicate dependencyOrigin(String className) } @PublicAPI(usage = ACCESS) - public static DescribedPredicate dependencyOrigin(final DescribedPredicate predicate) { + public static DescribedPredicate dependencyOrigin(DescribedPredicate predicate) { return Functions.GET_ORIGIN_CLASS.is(predicate).as("origin " + predicate.getDescription()); } @@ -387,7 +387,7 @@ public static DescribedPredicate dependencyTarget(String className) } @PublicAPI(usage = ACCESS) - public static DescribedPredicate dependencyTarget(final DescribedPredicate predicate) { + public static DescribedPredicate dependencyTarget(DescribedPredicate predicate) { return Functions.GET_TARGET_CLASS.is(predicate).as("target " + predicate.getDescription()); } } diff --git a/archunit/src/main/java/com/tngtech/archunit/core/domain/JavaAccess.java b/archunit/src/main/java/com/tngtech/archunit/core/domain/JavaAccess.java index b0c2b1b34b..549efc181f 100644 --- a/archunit/src/main/java/com/tngtech/archunit/core/domain/JavaAccess.java +++ b/archunit/src/main/java/com/tngtech/archunit/core/domain/JavaAccess.java @@ -155,12 +155,12 @@ public static DescribedPredicate> originOwnerEqualsTargetOwner() { } @PublicAPI(usage = ACCESS) - public static DescribedPredicate> targetOwner(final DescribedPredicate predicate) { + public static DescribedPredicate> targetOwner(DescribedPredicate predicate) { return target(Get.owner().is(predicate)); } @PublicAPI(usage = ACCESS) - public static DescribedPredicate> target(final DescribedPredicate predicate) { + public static DescribedPredicate> target(DescribedPredicate predicate) { return new TargetPredicate<>(predicate); } diff --git a/archunit/src/main/java/com/tngtech/archunit/core/domain/JavaCall.java b/archunit/src/main/java/com/tngtech/archunit/core/domain/JavaCall.java index 62dcbcddb1..0819a56f32 100644 --- a/archunit/src/main/java/com/tngtech/archunit/core/domain/JavaCall.java +++ b/archunit/src/main/java/com/tngtech/archunit/core/domain/JavaCall.java @@ -39,7 +39,7 @@ private Predicates() { } @PublicAPI(usage = ACCESS) - public static DescribedPredicate> target(final DescribedPredicate predicate) { + public static DescribedPredicate> target(DescribedPredicate predicate) { return new TargetPredicate<>(predicate); } } diff --git a/archunit/src/main/java/com/tngtech/archunit/core/domain/JavaClass.java b/archunit/src/main/java/com/tngtech/archunit/core/domain/JavaClass.java index 73cd8cefe5..504c057a06 100644 --- a/archunit/src/main/java/com/tngtech/archunit/core/domain/JavaClass.java +++ b/archunit/src/main/java/com/tngtech/archunit/core/domain/JavaClass.java @@ -1388,7 +1388,7 @@ public boolean isAssignableTo(Class type) { } @PublicAPI(usage = ACCESS) - public boolean isAssignableTo(final String typeName) { + public boolean isAssignableTo(String typeName) { return isAssignableTo(GET_NAME.is(equalTo(typeName))); } @@ -1467,12 +1467,12 @@ void completeGenericInterfacesFrom(ImportContext context) { completionProcess.markGenericInterfacesComplete(); } - void completeMembers(final ImportContext context) { + void completeMembers(ImportContext context) { members = JavaClassMembers.create(this, context); completionProcess.markMembersComplete(); } - void completeAnnotations(final ImportContext context) { + void completeAnnotations(ImportContext context) { annotations = context.createAnnotations(this); members.completeAnnotations(context); completionProcess.markAnnotationsComplete(); @@ -2142,27 +2142,27 @@ public boolean test(JavaClass input) { }; @PublicAPI(usage = ACCESS) - public static DescribedPredicate type(final Class type) { + public static DescribedPredicate type(Class type) { return equalTo(type.getName()).onResultOf(GET_NAME).as("type " + type.getName()); } @PublicAPI(usage = ACCESS) - public static DescribedPredicate simpleName(final String name) { + public static DescribedPredicate simpleName(String name) { return equalTo(name).onResultOf(GET_SIMPLE_NAME).as("simple name '%s'", name); } @PublicAPI(usage = ACCESS) - public static DescribedPredicate simpleNameStartingWith(final String prefix) { + public static DescribedPredicate simpleNameStartingWith(String prefix) { return new SimpleNameStartingWithPredicate(prefix); } @PublicAPI(usage = ACCESS) - public static DescribedPredicate simpleNameContaining(final String infix) { + public static DescribedPredicate simpleNameContaining(String infix) { return new SimpleNameContainingPredicate(infix); } @PublicAPI(usage = ACCESS) - public static DescribedPredicate simpleNameEndingWith(final String suffix) { + public static DescribedPredicate simpleNameEndingWith(String suffix) { return new SimpleNameEndingWithPredicate(suffix); } @@ -2179,7 +2179,7 @@ public static DescribedPredicate simpleNameEndingWith(final String su * @see #assignableFrom(Class) */ @PublicAPI(usage = ACCESS) - public static DescribedPredicate assignableTo(final Class type) { + public static DescribedPredicate assignableTo(Class type) { return assignableTo(type.getName()); } @@ -2196,7 +2196,7 @@ public static DescribedPredicate assignableTo(final Class type) { * @see #assignableTo(Class) */ @PublicAPI(usage = ACCESS) - public static DescribedPredicate assignableFrom(final Class type) { + public static DescribedPredicate assignableFrom(Class type) { return assignableFrom(type.getName()); } @@ -2204,7 +2204,7 @@ public static DescribedPredicate assignableFrom(final Class type) * Same as {@link #assignableTo(Class)} but takes a fully qualified class name as an argument instead of a class object. */ @PublicAPI(usage = ACCESS) - public static DescribedPredicate assignableTo(final String typeName) { + public static DescribedPredicate assignableTo(String typeName) { return assignableTo(GET_NAME.is(equalTo(typeName)).as(typeName)); } @@ -2212,7 +2212,7 @@ public static DescribedPredicate assignableTo(final String typeName) * Same as {@link #assignableFrom(Class)} but takes a fully qualified class name as an argument instead of a class object. */ @PublicAPI(usage = ACCESS) - public static DescribedPredicate assignableFrom(final String typeName) { + public static DescribedPredicate assignableFrom(String typeName) { return assignableFrom(GET_NAME.is(equalTo(typeName)).as(typeName)); } @@ -2227,7 +2227,7 @@ public static DescribedPredicate assignableFrom(final String typeName * @see #assignableFrom(DescribedPredicate) */ @PublicAPI(usage = ACCESS) - public static DescribedPredicate assignableTo(final DescribedPredicate predicate) { + public static DescribedPredicate assignableTo(DescribedPredicate predicate) { return new AssignableToPredicate(predicate); } @@ -2242,7 +2242,7 @@ public static DescribedPredicate assignableTo(final DescribedPredicat * @see #assignableTo(DescribedPredicate) */ @PublicAPI(usage = ACCESS) - public static DescribedPredicate assignableFrom(final DescribedPredicate predicate) { + public static DescribedPredicate assignableFrom(DescribedPredicate predicate) { return new AssignableFromPredicate(predicate); } @@ -2259,7 +2259,7 @@ public static DescribedPredicate assignableFrom(final DescribedPredic * @see #assignableTo(Class) */ @PublicAPI(usage = ACCESS) - public static DescribedPredicate implement(final Class type) { + public static DescribedPredicate implement(Class type) { if (!type.isInterface()) { throw new InvalidSyntaxUsageException(String.format( "implement(type) can only ever be true, if type is an interface, but type %s is not. " @@ -2272,7 +2272,7 @@ public static DescribedPredicate implement(final Class type) { * Same as {@link #implement(Class)} but takes a fully qualified class name as an argument instead of a class object. */ @PublicAPI(usage = ACCESS) - public static DescribedPredicate implement(final String typeName) { + public static DescribedPredicate implement(String typeName) { return implement(GET_NAME.is(equalTo(typeName)).as(typeName)); } @@ -2285,7 +2285,7 @@ public static DescribedPredicate implement(final String typeName) { * @see #assignableTo(DescribedPredicate) */ @PublicAPI(usage = ACCESS) - public static DescribedPredicate implement(final DescribedPredicate predicate) { + public static DescribedPredicate implement(DescribedPredicate predicate) { DescribedPredicate selfIsImplementation = not(INTERFACES); DescribedPredicate interfacePredicate = predicate.forSubtype().and(INTERFACES); return selfIsImplementation.and(assignableTo(interfacePredicate)) @@ -2302,7 +2302,7 @@ public static DescribedPredicate implement(final DescribedPredicate resideInAPackage(final String packageIdentifier) { + public static DescribedPredicate resideInAPackage(String packageIdentifier) { return resideInAnyPackage(new String[]{packageIdentifier}, String.format("reside in a package '%s'", packageIdentifier)); } @@ -2311,13 +2311,13 @@ public static DescribedPredicate resideInAPackage(final String packag * @see #resideInAPackage(String) */ @PublicAPI(usage = ACCESS) - public static DescribedPredicate resideInAnyPackage(final String... packageIdentifiers) { + public static DescribedPredicate resideInAnyPackage(String... packageIdentifiers) { return resideInAnyPackage(packageIdentifiers, String.format("reside in any package [%s]", joinSingleQuoted(packageIdentifiers))); } - private static DescribedPredicate resideInAnyPackage(final String[] packageIdentifiers, final String description) { - final Set packageMatchers = stream(packageIdentifiers).map(PackageMatcher::of).collect(toSet()); + private static DescribedPredicate resideInAnyPackage(String[] packageIdentifiers, String description) { + Set packageMatchers = stream(packageIdentifiers).map(PackageMatcher::of).collect(toSet()); return new PackageMatchesPredicate(packageMatchers, description); } @@ -2337,7 +2337,7 @@ public static DescribedPredicate resideOutsideOfPackages(String... pa * @see JavaClass#isEquivalentTo(Class) */ @PublicAPI(usage = ACCESS) - public static DescribedPredicate equivalentTo(final Class clazz) { + public static DescribedPredicate equivalentTo(Class clazz) { return new EquivalentToPredicate(clazz); } diff --git a/archunit/src/main/java/com/tngtech/archunit/core/domain/JavaClassDependencies.java b/archunit/src/main/java/com/tngtech/archunit/core/domain/JavaClassDependencies.java index f359087131..42e0368ae7 100644 --- a/archunit/src/main/java/com/tngtech/archunit/core/domain/JavaClassDependencies.java +++ b/archunit/src/main/java/com/tngtech/archunit/core/domain/JavaClassDependencies.java @@ -247,8 +247,8 @@ private > Stream annota } private > Stream annotationDependencies(T annotated) { - final Stream.Builder addToStream = Stream.builder(); - for (final JavaAnnotation annotation : annotated.getAnnotations()) { + Stream.Builder addToStream = Stream.builder(); + for (JavaAnnotation annotation : annotated.getAnnotations()) { Dependency.tryCreateFromAnnotation(annotation).forEach(addToStream); annotation.accept(new DefaultParameterVisitor() { @Override diff --git a/archunit/src/main/java/com/tngtech/archunit/core/domain/JavaClassDescriptor.java b/archunit/src/main/java/com/tngtech/archunit/core/domain/JavaClassDescriptor.java index d3ea8454b0..c3182bff4f 100644 --- a/archunit/src/main/java/com/tngtech/archunit/core/domain/JavaClassDescriptor.java +++ b/archunit/src/main/java/com/tngtech/archunit/core/domain/JavaClassDescriptor.java @@ -200,7 +200,7 @@ public boolean equals(Object obj) { if (obj == null || getClass() != obj.getClass()) { return false; } - final JavaClassDescriptor other = (JavaClassDescriptor) obj; + JavaClassDescriptor other = (JavaClassDescriptor) obj; return Objects.equals(this.getFullyQualifiedClassName(), other.getFullyQualifiedClassName()); } diff --git a/archunit/src/main/java/com/tngtech/archunit/core/domain/JavaClassMembers.java b/archunit/src/main/java/com/tngtech/archunit/core/domain/JavaClassMembers.java index 21f6e57d30..227382853d 100644 --- a/archunit/src/main/java/com/tngtech/archunit/core/domain/JavaClassMembers.java +++ b/archunit/src/main/java/com/tngtech/archunit/core/domain/JavaClassMembers.java @@ -55,7 +55,7 @@ class JavaClassMembers { .addAll(getAllConstructors()) .build()); - JavaClassMembers(final JavaClass owner, Set fields, Set methods, Set constructors, Optional staticInitializer) { + JavaClassMembers(JavaClass owner, Set fields, Set methods, Set constructors, Optional staticInitializer) { this.owner = owner; this.fields = fields; this.methods = methods; diff --git a/archunit/src/main/java/com/tngtech/archunit/core/domain/JavaClasses.java b/archunit/src/main/java/com/tngtech/archunit/core/domain/JavaClasses.java index cfc5109ca4..9e651ed0a0 100644 --- a/archunit/src/main/java/com/tngtech/archunit/core/domain/JavaClasses.java +++ b/archunit/src/main/java/com/tngtech/archunit/core/domain/JavaClasses.java @@ -164,7 +164,7 @@ public boolean equals(Object obj) { if (obj == null || getClass() != obj.getClass()) { return false; } - final JavaClasses other = (JavaClasses) obj; + JavaClasses other = (JavaClasses) obj; return Objects.equals(this.classes.keySet(), other.classes.keySet()) && Objects.equals(this.description, other.description); } diff --git a/archunit/src/main/java/com/tngtech/archunit/core/domain/JavaCodeUnitAccess.java b/archunit/src/main/java/com/tngtech/archunit/core/domain/JavaCodeUnitAccess.java index 5a1dfa0c14..6dab307230 100644 --- a/archunit/src/main/java/com/tngtech/archunit/core/domain/JavaCodeUnitAccess.java +++ b/archunit/src/main/java/com/tngtech/archunit/core/domain/JavaCodeUnitAccess.java @@ -39,7 +39,7 @@ private Predicates() { } @PublicAPI(usage = ACCESS) - public static DescribedPredicate> target(final DescribedPredicate predicate) { + public static DescribedPredicate> target(DescribedPredicate predicate) { return new TargetPredicate<>(predicate); } } diff --git a/archunit/src/main/java/com/tngtech/archunit/core/domain/JavaCodeUnitReference.java b/archunit/src/main/java/com/tngtech/archunit/core/domain/JavaCodeUnitReference.java index c9f55b477d..286487baa7 100644 --- a/archunit/src/main/java/com/tngtech/archunit/core/domain/JavaCodeUnitReference.java +++ b/archunit/src/main/java/com/tngtech/archunit/core/domain/JavaCodeUnitReference.java @@ -39,7 +39,7 @@ private Predicates() { } @PublicAPI(usage = ACCESS) - public static DescribedPredicate> target(final DescribedPredicate predicate) { + public static DescribedPredicate> target(DescribedPredicate predicate) { return new TargetPredicate<>(predicate); } } diff --git a/archunit/src/main/java/com/tngtech/archunit/core/domain/JavaEnumConstant.java b/archunit/src/main/java/com/tngtech/archunit/core/domain/JavaEnumConstant.java index fb61404182..c9910718e8 100644 --- a/archunit/src/main/java/com/tngtech/archunit/core/domain/JavaEnumConstant.java +++ b/archunit/src/main/java/com/tngtech/archunit/core/domain/JavaEnumConstant.java @@ -60,7 +60,7 @@ public boolean equals(Object obj) { if (obj == null || getClass() != obj.getClass()) { return false; } - final JavaEnumConstant other = (JavaEnumConstant) obj; + JavaEnumConstant other = (JavaEnumConstant) obj; return Objects.equals(this.declaringClass, other.declaringClass) && Objects.equals(this.name, other.name); } diff --git a/archunit/src/main/java/com/tngtech/archunit/core/domain/JavaFieldAccess.java b/archunit/src/main/java/com/tngtech/archunit/core/domain/JavaFieldAccess.java index e70d937a76..3815b8a1cd 100644 --- a/archunit/src/main/java/com/tngtech/archunit/core/domain/JavaFieldAccess.java +++ b/archunit/src/main/java/com/tngtech/archunit/core/domain/JavaFieldAccess.java @@ -93,12 +93,12 @@ private Predicates() { } @PublicAPI(usage = ACCESS) - public static DescribedPredicate accessType(final AccessType accessType) { + public static DescribedPredicate accessType(AccessType accessType) { return new AccessTypePredicate(accessType); } @PublicAPI(usage = ACCESS) - public static DescribedPredicate target(final DescribedPredicate predicate) { + public static DescribedPredicate target(DescribedPredicate predicate) { return new TargetPredicate<>(predicate); } diff --git a/archunit/src/main/java/com/tngtech/archunit/core/domain/ReverseDependencies.java b/archunit/src/main/java/com/tngtech/archunit/core/domain/ReverseDependencies.java index 900bfea671..cc7152e6f9 100644 --- a/archunit/src/main/java/com/tngtech/archunit/core/domain/ReverseDependencies.java +++ b/archunit/src/main/java/com/tngtech/archunit/core/domain/ReverseDependencies.java @@ -66,7 +66,7 @@ private ReverseDependencies(ReverseDependencies.Creation creation) { this.directDependenciesToClass = createDirectDependenciesToClassSupplier(creation.allDependencies); } - private static Supplier> createDirectDependenciesToClassSupplier(final List allDependencies) { + private static Supplier> createDirectDependenciesToClassSupplier(List allDependencies) { return Suppliers.memoize(() -> { ImmutableSetMultimap.Builder result = ImmutableSetMultimap.builder(); for (JavaClassDependencies dependencies : allDependencies) { @@ -221,7 +221,7 @@ private void registerConstructors(JavaClass clazz) { } private void registerAnnotations(JavaClass clazz) { - for (final JavaAnnotation annotation : findAnnotations(clazz)) { + for (JavaAnnotation annotation : findAnnotations(clazz)) { annotationTypeDependencies.put(annotation.getRawType(), annotation); annotation.accept(new JavaAnnotation.DefaultParameterVisitor() { @Override @@ -277,7 +277,7 @@ private ResolvingAccessLoader(SetMultimap accessesToSelf) { @Override public Set load(MEMBER member) { ImmutableSet.Builder result = ImmutableSet.builder(); - for (final JavaClass javaClass : getPossibleTargetClassesForAccess(member.getOwner())) { + for (JavaClass javaClass : getPossibleTargetClassesForAccess(member.getOwner())) { for (ACCESS access : this.accessesToSelf.get(javaClass)) { Optional target = access.getTarget().resolveMember(); if (target.isPresent() && target.get().equals(member)) { diff --git a/archunit/src/main/java/com/tngtech/archunit/core/domain/Source.java b/archunit/src/main/java/com/tngtech/archunit/core/domain/Source.java index 433db77526..390ab875b4 100644 --- a/archunit/src/main/java/com/tngtech/archunit/core/domain/Source.java +++ b/archunit/src/main/java/com/tngtech/archunit/core/domain/Source.java @@ -83,7 +83,7 @@ public boolean equals(Object obj) { if (obj == null || getClass() != obj.getClass()) { return false; } - final Source other = (Source) obj; + Source other = (Source) obj; return Objects.equals(this.uri, other.uri) && Objects.equals(this.md5sum, other.md5sum); } @@ -151,7 +151,7 @@ public boolean equals(Object obj) { if (obj == null || getClass() != obj.getClass()) { return false; } - final Md5sum other = (Md5sum) obj; + Md5sum other = (Md5sum) obj; return Arrays.equals(this.md5Bytes, other.md5Bytes) && Objects.equals(this.text, other.text); } diff --git a/archunit/src/main/java/com/tngtech/archunit/core/domain/SourceCodeLocation.java b/archunit/src/main/java/com/tngtech/archunit/core/domain/SourceCodeLocation.java index ee007c2827..90170e64ed 100644 --- a/archunit/src/main/java/com/tngtech/archunit/core/domain/SourceCodeLocation.java +++ b/archunit/src/main/java/com/tngtech/archunit/core/domain/SourceCodeLocation.java @@ -110,7 +110,7 @@ public boolean equals(Object obj) { if (obj == null || getClass() != obj.getClass()) { return false; } - final SourceCodeLocation other = (SourceCodeLocation) obj; + SourceCodeLocation other = (SourceCodeLocation) obj; return Objects.equals(this.sourceClass, other.sourceClass) && Objects.equals(this.lineNumber, other.lineNumber); } diff --git a/archunit/src/main/java/com/tngtech/archunit/core/domain/ThrowsClause.java b/archunit/src/main/java/com/tngtech/archunit/core/domain/ThrowsClause.java index fb77d56198..de796053fe 100644 --- a/archunit/src/main/java/com/tngtech/archunit/core/domain/ThrowsClause.java +++ b/archunit/src/main/java/com/tngtech/archunit/core/domain/ThrowsClause.java @@ -110,7 +110,7 @@ public boolean equals(Object obj) { if (obj == null || getClass() != obj.getClass()) { return false; } - final ThrowsClause other = (ThrowsClause) obj; + ThrowsClause other = (ThrowsClause) obj; return Objects.equals(this.location, other.location) && Objects.equals(this.getTypes(), other.getTypes()); } diff --git a/archunit/src/main/java/com/tngtech/archunit/core/domain/ThrowsDeclaration.java b/archunit/src/main/java/com/tngtech/archunit/core/domain/ThrowsDeclaration.java index d73964f372..30b930c44b 100644 --- a/archunit/src/main/java/com/tngtech/archunit/core/domain/ThrowsDeclaration.java +++ b/archunit/src/main/java/com/tngtech/archunit/core/domain/ThrowsDeclaration.java @@ -124,7 +124,7 @@ public boolean equals(Object obj) { if (obj == null || getClass() != obj.getClass()) { return false; } - final ThrowsDeclaration other = (ThrowsDeclaration) obj; + ThrowsDeclaration other = (ThrowsDeclaration) obj; return Objects.equals(this.getLocation(), other.getLocation()) && Objects.equals(this.type, other.type); } diff --git a/archunit/src/main/java/com/tngtech/archunit/core/domain/properties/CanBeAnnotated.java b/archunit/src/main/java/com/tngtech/archunit/core/domain/properties/CanBeAnnotated.java index 2a28b52419..80dbc44650 100644 --- a/archunit/src/main/java/com/tngtech/archunit/core/domain/properties/CanBeAnnotated.java +++ b/archunit/src/main/java/com/tngtech/archunit/core/domain/properties/CanBeAnnotated.java @@ -107,7 +107,7 @@ private Predicates() { * @param annotationType The type of the annotation to check for */ @PublicAPI(usage = ACCESS) - public static DescribedPredicate annotatedWith(final Class annotationType) { + public static DescribedPredicate annotatedWith(Class annotationType) { checkAnnotationHasReasonableRetention(annotationType); return annotatedWith(annotationType.getName()); @@ -132,7 +132,7 @@ private static boolean isRetentionSource(Class annotationT * @see #annotatedWith(Class) */ @PublicAPI(usage = ACCESS) - public static DescribedPredicate annotatedWith(final String annotationTypeName) { + public static DescribedPredicate annotatedWith(String annotationTypeName) { DescribedPredicate typeNameMatches = GET_RAW_TYPE.then(GET_NAME).is(equalTo(annotationTypeName)); return annotatedWith(typeNameMatches.as("@" + ensureSimpleName(annotationTypeName))); } @@ -143,7 +143,7 @@ public static DescribedPredicate annotatedWith(final String anno * @param predicate Qualifies matching annotations */ @PublicAPI(usage = ACCESS) - public static DescribedPredicate annotatedWith(final DescribedPredicate> predicate) { + public static DescribedPredicate annotatedWith(DescribedPredicate> predicate) { return new AnnotatedPredicate(predicate); } @@ -172,7 +172,7 @@ public boolean test(CanBeAnnotated input) { * @param annotationType The type of the annotation to check for */ @PublicAPI(usage = ACCESS) - public static DescribedPredicate metaAnnotatedWith(final Class annotationType) { + public static DescribedPredicate metaAnnotatedWith(Class annotationType) { checkAnnotationHasReasonableRetention(annotationType); return metaAnnotatedWith(annotationType.getName()); @@ -182,7 +182,7 @@ public static DescribedPredicate metaAnnotatedWith(final Class metaAnnotatedWith(final String annotationTypeName) { + public static DescribedPredicate metaAnnotatedWith(String annotationTypeName) { DescribedPredicate typeNameMatches = GET_RAW_TYPE.then(GET_NAME).is(equalTo(annotationTypeName)); return metaAnnotatedWith(typeNameMatches.as("@" + ensureSimpleName(annotationTypeName))); } @@ -198,7 +198,7 @@ public static DescribedPredicate metaAnnotatedWith(final String * @param predicate Qualifies matching annotations */ @PublicAPI(usage = ACCESS) - public static DescribedPredicate metaAnnotatedWith(final DescribedPredicate> predicate) { + public static DescribedPredicate metaAnnotatedWith(DescribedPredicate> predicate) { return new MetaAnnotatedPredicate(predicate); } @@ -256,7 +256,7 @@ private static boolean isMetaAnnotatedWith( } @PublicAPI(usage = ACCESS) - public static Function, A> toAnnotationOfType(final Class type) { + public static Function, A> toAnnotationOfType(Class type) { return input -> input.as(type); } } diff --git a/archunit/src/main/java/com/tngtech/archunit/core/domain/properties/HasModifiers.java b/archunit/src/main/java/com/tngtech/archunit/core/domain/properties/HasModifiers.java index bc85d6a874..f8cf36360d 100644 --- a/archunit/src/main/java/com/tngtech/archunit/core/domain/properties/HasModifiers.java +++ b/archunit/src/main/java/com/tngtech/archunit/core/domain/properties/HasModifiers.java @@ -37,7 +37,7 @@ private Predicates() { } @PublicAPI(usage = ACCESS) - public static DescribedPredicate modifier(final JavaModifier modifier) { + public static DescribedPredicate modifier(JavaModifier modifier) { return new ModifierPredicate(modifier); } diff --git a/archunit/src/main/java/com/tngtech/archunit/core/domain/properties/HasName.java b/archunit/src/main/java/com/tngtech/archunit/core/domain/properties/HasName.java index af918f37e1..ef2fea7609 100644 --- a/archunit/src/main/java/com/tngtech/archunit/core/domain/properties/HasName.java +++ b/archunit/src/main/java/com/tngtech/archunit/core/domain/properties/HasName.java @@ -113,7 +113,7 @@ private Predicates() { } @PublicAPI(usage = ACCESS) - public static DescribedPredicate name(final String name) { + public static DescribedPredicate name(String name) { return new NameEqualsPredicate(name); } @@ -121,22 +121,22 @@ public static DescribedPredicate name(final String name) { * Matches names against a regular expression. */ @PublicAPI(usage = ACCESS) - public static DescribedPredicate nameMatching(final String regex) { + public static DescribedPredicate nameMatching(String regex) { return new NameMatchingPredicate(regex); } @PublicAPI(usage = ACCESS) - public static DescribedPredicate nameStartingWith(final String prefix) { + public static DescribedPredicate nameStartingWith(String prefix) { return new NameStartingWithPredicate(prefix); } @PublicAPI(usage = ACCESS) - public static DescribedPredicate nameContaining(final String infix) { + public static DescribedPredicate nameContaining(String infix) { return new NameContainingPredicate(infix); } @PublicAPI(usage = ACCESS) - public static DescribedPredicate nameEndingWith(final String postfix) { + public static DescribedPredicate nameEndingWith(String postfix) { return new NameEndingWithPredicate(postfix); } diff --git a/archunit/src/main/java/com/tngtech/archunit/core/domain/properties/HasOwner.java b/archunit/src/main/java/com/tngtech/archunit/core/domain/properties/HasOwner.java index f6fcd60b46..97cf86b5ad 100644 --- a/archunit/src/main/java/com/tngtech/archunit/core/domain/properties/HasOwner.java +++ b/archunit/src/main/java/com/tngtech/archunit/core/domain/properties/HasOwner.java @@ -54,7 +54,7 @@ private With() { } @PublicAPI(usage = ACCESS) - public static DescribedPredicate> owner(final DescribedPredicate predicate) { + public static DescribedPredicate> owner(DescribedPredicate predicate) { return new OwnerPredicate<>(predicate); } } diff --git a/archunit/src/main/java/com/tngtech/archunit/core/domain/properties/HasParameterTypes.java b/archunit/src/main/java/com/tngtech/archunit/core/domain/properties/HasParameterTypes.java index 4dd37d57a6..314d0375cb 100644 --- a/archunit/src/main/java/com/tngtech/archunit/core/domain/properties/HasParameterTypes.java +++ b/archunit/src/main/java/com/tngtech/archunit/core/domain/properties/HasParameterTypes.java @@ -69,23 +69,23 @@ private Predicates() { } @PublicAPI(usage = ACCESS) - public static DescribedPredicate rawParameterTypes(final Class... types) { + public static DescribedPredicate rawParameterTypes(Class... types) { return rawParameterTypes(formatNamesOf(types)); } @PublicAPI(usage = ACCESS) - public static DescribedPredicate rawParameterTypes(final String... types) { + public static DescribedPredicate rawParameterTypes(String... types) { return rawParameterTypes(ImmutableList.copyOf(types)); } @PublicAPI(usage = ACCESS) - public static DescribedPredicate rawParameterTypes(final List typeNames) { + public static DescribedPredicate rawParameterTypes(List typeNames) { return new RawParameterTypesPredicate(equalTo(typeNames).onResultOf(GET_NAMES) .as("[%s]", formatMethodParameterTypeNames(typeNames))); } @PublicAPI(usage = ACCESS) - public static DescribedPredicate rawParameterTypes(final DescribedPredicate> predicate) { + public static DescribedPredicate rawParameterTypes(DescribedPredicate> predicate) { return new RawParameterTypesPredicate(predicate); } diff --git a/archunit/src/main/java/com/tngtech/archunit/core/domain/properties/HasThrowsClause.java b/archunit/src/main/java/com/tngtech/archunit/core/domain/properties/HasThrowsClause.java index a6ff499395..f866067b56 100644 --- a/archunit/src/main/java/com/tngtech/archunit/core/domain/properties/HasThrowsClause.java +++ b/archunit/src/main/java/com/tngtech/archunit/core/domain/properties/HasThrowsClause.java @@ -48,28 +48,28 @@ private Predicates() { @PublicAPI(usage = ACCESS) @SafeVarargs - public static DescribedPredicate> throwsClauseWithTypes(final Class... types) { + public static DescribedPredicate> throwsClauseWithTypes(Class... types) { return throwsClauseWithTypes(formatNamesOf(types)); } @PublicAPI(usage = ACCESS) - public static DescribedPredicate> throwsClauseWithTypes(final String... typeNames) { + public static DescribedPredicate> throwsClauseWithTypes(String... typeNames) { return throwsClauseWithTypes(ImmutableList.copyOf(typeNames)); } @PublicAPI(usage = ACCESS) - public static DescribedPredicate> throwsClauseWithTypes(final List typeNames) { + public static DescribedPredicate> throwsClauseWithTypes(List typeNames) { return throwsClause(equalTo(typeNames).onResultOf(ThrowsClause.Functions.GET_TYPES.then(GET_NAMES)) .as("[%s]", formatThrowsDeclarationTypeNames(typeNames))); } @PublicAPI(usage = ACCESS) - public static DescribedPredicate> throwsClauseContainingType(final Class type) { + public static DescribedPredicate> throwsClauseContainingType(Class type) { return throwsClauseContainingType(type.getName()); } @PublicAPI(usage = ACCESS) - public static DescribedPredicate> throwsClauseContainingType(final String typeName) { + public static DescribedPredicate> throwsClauseContainingType(String typeName) { return throwsClauseContainingType(name(typeName).as(typeName)); } @@ -80,7 +80,7 @@ public static DescribedPredicate> throwsClauseContainingType( } @PublicAPI(usage = ACCESS) - public static DescribedPredicate> throwsClause(final DescribedPredicate> predicate) { + public static DescribedPredicate> throwsClause(DescribedPredicate> predicate) { return new ThrowsTypesPredicate(predicate); } diff --git a/archunit/src/main/java/com/tngtech/archunit/core/importer/AccessRecord.java b/archunit/src/main/java/com/tngtech/archunit/core/importer/AccessRecord.java index 7441194918..9ef25c6b3b 100644 --- a/archunit/src/main/java/com/tngtech/archunit/core/importer/AccessRecord.java +++ b/archunit/src/main/java/com/tngtech/archunit/core/importer/AccessRecord.java @@ -290,7 +290,7 @@ public AccessType getAccessType() { } } - private static Supplier createOriginSupplier(final CodeUnit origin, final ImportedClasses classes) { + private static Supplier createOriginSupplier(CodeUnit origin, ImportedClasses classes) { return Suppliers.memoize(() -> Factory.getOrigin(origin, classes)); } diff --git a/archunit/src/main/java/com/tngtech/archunit/core/importer/ClassFileImporter.java b/archunit/src/main/java/com/tngtech/archunit/core/importer/ClassFileImporter.java index 47573f2fb5..40f94dfe6b 100644 --- a/archunit/src/main/java/com/tngtech/archunit/core/importer/ClassFileImporter.java +++ b/archunit/src/main/java/com/tngtech/archunit/core/importer/ClassFileImporter.java @@ -334,7 +334,7 @@ private void tryAdd(List sources, Location location) { } } - private ClassFileSource unify(final List sources) { + private ClassFileSource unify(List sources) { return Iterables.concat(sources)::iterator; } } diff --git a/archunit/src/main/java/com/tngtech/archunit/core/importer/ClassFileSource.java b/archunit/src/main/java/com/tngtech/archunit/core/importer/ClassFileSource.java index a0fb4fe304..28c17d9b8b 100644 --- a/archunit/src/main/java/com/tngtech/archunit/core/importer/ClassFileSource.java +++ b/archunit/src/main/java/com/tngtech/archunit/core/importer/ClassFileSource.java @@ -76,7 +76,7 @@ private boolean shouldBeConsidered(Path file) { && importOptions.include(Location.of(file)); } - private Supplier newInputStreamSupplierFor(final Path file) { + private Supplier newInputStreamSupplierFor(Path file) { return new InputStreamSupplier() { @Override InputStream getInputStream() throws IOException { @@ -108,16 +108,16 @@ class FromJar implements ClassFileSource { } } - private Predicate classFilesBeneath(final NormalizedResourceName prefix) { + private Predicate classFilesBeneath(NormalizedResourceName prefix) { return input -> input.getName().startsWith(prefix.toEntryName()) && FileToImport.isRelevant(input.getName()); } - private Function toClassFilesInJarOf(final JarURLConnection connection) { + private Function toClassFilesInJarOf(JarURLConnection connection) { return input -> new ClassFileInJar(connection, input); } - private Predicate by(final ImportOptions importOptions) { + private Predicate by(ImportOptions importOptions) { return input -> input.isIncludedIn(importOptions); } diff --git a/archunit/src/main/java/com/tngtech/archunit/core/importer/DomainBuilders.java b/archunit/src/main/java/com/tngtech/archunit/core/importer/DomainBuilders.java index 9feca75c68..3499b18da1 100644 --- a/archunit/src/main/java/com/tngtech/archunit/core/importer/DomainBuilders.java +++ b/archunit/src/main/java/com/tngtech/archunit/core/importer/DomainBuilders.java @@ -116,12 +116,12 @@ public static final class JavaEnumConstantBuilder { JavaEnumConstantBuilder() { } - JavaEnumConstantBuilder withDeclaringClass(final JavaClass declaringClass) { + JavaEnumConstantBuilder withDeclaringClass(JavaClass declaringClass) { this.declaringClass = declaringClass; return this; } - JavaEnumConstantBuilder withName(final String name) { + JavaEnumConstantBuilder withName(String name) { this.name = name; return this; } @@ -401,7 +401,7 @@ JavaMethodBuilder withAnnotationDefaultValue(Function JavaAnnotation build(T owner, ImportedClass abstract static class ValueBuilder { abstract Optional build(T owner, ImportedClasses importedClasses); - static ValueBuilder fromPrimitiveProperty(final Object value) { + static ValueBuilder fromPrimitiveProperty(Object value) { return new ValueBuilder() { @Override Optional build(T owner, ImportedClasses unused) { @@ -595,7 +595,7 @@ Optional build(T owner, ImportedClasses unuse }; } - public static ValueBuilder fromEnumProperty(final JavaClassDescriptor enumType, final String value) { + public static ValueBuilder fromEnumProperty(JavaClassDescriptor enumType, String value) { return new ValueBuilder() { @Override Optional build(T owner, ImportedClasses importedClasses) { @@ -608,7 +608,7 @@ Optional build(T owner, ImportedClasses impor }; } - static ValueBuilder fromClassProperty(final JavaClassDescriptor value) { + static ValueBuilder fromClassProperty(JavaClassDescriptor value) { return new ValueBuilder() { @Override Optional build(T owner, ImportedClasses importedClasses) { @@ -617,7 +617,7 @@ Optional build(T owner, ImportedClasses impor }; } - static ValueBuilder fromAnnotationProperty(final JavaAnnotationBuilder builder) { + static ValueBuilder fromAnnotationProperty(JavaAnnotationBuilder builder) { return new ValueBuilder() { @Override Optional build(T owner, ImportedClasses importedClasses) { @@ -656,7 +656,7 @@ private JavaTypeFinisher() { abstract String getFinishedName(String name); - JavaTypeFinisher after(final JavaTypeFinisher other) { + JavaTypeFinisher after(JavaTypeFinisher other) { return new JavaTypeFinisher() { @Override JavaType finish(JavaType input, ImportedClasses classes) { @@ -992,17 +992,17 @@ public abstract static class JavaAccessBuilder withParameters(final List parameters) { + CodeUnitAccessTargetBuilder withParameters(List parameters) { this.parameters = parameters; return self(); } - CodeUnitAccessTargetBuilder withReturnType(final JavaClass returnType) { + CodeUnitAccessTargetBuilder withReturnType(JavaClass returnType) { this.returnType = returnType; return self(); } diff --git a/archunit/src/main/java/com/tngtech/archunit/core/importer/JavaClassProcessor.java b/archunit/src/main/java/com/tngtech/archunit/core/importer/JavaClassProcessor.java index 7a7a00e741..7949cabbc3 100644 --- a/archunit/src/main/java/com/tngtech/archunit/core/importer/JavaClassProcessor.java +++ b/archunit/src/main/java/com/tngtech/archunit/core/importer/JavaClassProcessor.java @@ -417,12 +417,7 @@ public AnnotationVisitor visitAnnotationDefault() { } @Override - public void visitInvokeDynamicInsn( - final String name, - final String descriptor, - final Handle bootstrapMethodHandle, - final Object... bootstrapMethodArguments - ) { + public void visitInvokeDynamicInsn(String name, String descriptor, Handle bootstrapMethodHandle, Object... bootstrapMethodArguments) { if (isLambdaMetafactory(bootstrapMethodHandle.getOwner())) { Object methodHandleCandidate = bootstrapMethodArguments[1]; if (isAsmMethodHandle(methodHandleCandidate)) { @@ -640,12 +635,12 @@ public void visitEnum(String name, String desc, String value) { } @Override - public AnnotationVisitor visitAnnotation(final String name, String desc) { + public AnnotationVisitor visitAnnotation(String name, String desc) { return new AnnotationProcessor(addAnnotationAsProperty(name, this.annotationBuilder), declarationHandler, handleAnnotationAnnotationProperty(desc, declarationHandler)); } @Override - public AnnotationVisitor visitArray(final String name) { + public AnnotationVisitor visitArray(String name) { return new AnnotationArrayProcessor(new AnnotationArrayContext() { @Override public String getDeclaringAnnotationTypeName() { @@ -670,11 +665,11 @@ public void visitEnd() { } } - private static TakesAnnotationBuilder addAnnotationAtIndex(final SetMultimap annotations, final int index) { + private static TakesAnnotationBuilder addAnnotationAtIndex(SetMultimap annotations, int index) { return annotation -> annotations.put(index, annotation); } - private static TakesAnnotationBuilder addAnnotationAsProperty(final String name, final JavaAnnotationBuilder annotationBuilder) { + private static TakesAnnotationBuilder addAnnotationAsProperty(String name, JavaAnnotationBuilder annotationBuilder) { return builder -> annotationBuilder.addProperty(name, ValueBuilder.fromAnnotationProperty(builder)); } @@ -716,7 +711,7 @@ public AnnotationVisitor visitAnnotation(String name, String desc) { } @Override - public void visitEnum(String name, final String desc, final String value) { + public void visitEnum(String name, String desc, String value) { setDerivedComponentType(JavaEnumConstant.class); values.add(handleAnnotationEnumProperty(desc, value, declarationHandler)); } @@ -856,7 +851,7 @@ private abstract static class ClassAndPrimitiveDistinguishingAnnotationVisitor e @Override public final void visit(String name, Object input) { - final Object value = JavaClassDescriptorImporter.importAsmTypeIfPossible(input); + Object value = JavaClassDescriptorImporter.importAsmTypeIfPossible(input); if (value instanceof JavaClassDescriptor) { visitClass(name, (JavaClassDescriptor) value); } else { diff --git a/archunit/src/main/java/com/tngtech/archunit/core/importer/Location.java b/archunit/src/main/java/com/tngtech/archunit/core/importer/Location.java index ce29d15595..34049547a4 100644 --- a/archunit/src/main/java/com/tngtech/archunit/core/importer/Location.java +++ b/archunit/src/main/java/com/tngtech/archunit/core/importer/Location.java @@ -168,7 +168,7 @@ public boolean equals(Object obj) { if (obj == null || getClass() != obj.getClass()) { return false; } - final Location other = (Location) obj; + Location other = (Location) obj; return Objects.equals(this.uri, other.uri); } @@ -375,8 +375,8 @@ private List getAllFilesBeneath(NormalizedUri uri) throw return getAllFilesBeneath(rootFile.toPath()); } - private List getAllFilesBeneath(final Path root) throws IOException { - final ImmutableList.Builder result = ImmutableList.builder(); + private List getAllFilesBeneath(Path root) throws IOException { + ImmutableList.Builder result = ImmutableList.builder(); Files.walkFileTree(root, new SimpleFileVisitor() { @Override public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) { diff --git a/archunit/src/main/java/com/tngtech/archunit/core/importer/NormalizedResourceName.java b/archunit/src/main/java/com/tngtech/archunit/core/importer/NormalizedResourceName.java index 4929d5a7a4..a8b037db0b 100644 --- a/archunit/src/main/java/com/tngtech/archunit/core/importer/NormalizedResourceName.java +++ b/archunit/src/main/java/com/tngtech/archunit/core/importer/NormalizedResourceName.java @@ -80,7 +80,7 @@ public boolean equals(Object obj) { if (obj == null || getClass() != obj.getClass()) { return false; } - final NormalizedResourceName other = (NormalizedResourceName) obj; + NormalizedResourceName other = (NormalizedResourceName) obj; return Objects.equals(this.resourceName, other.resourceName); } diff --git a/archunit/src/main/java/com/tngtech/archunit/core/importer/NormalizedUri.java b/archunit/src/main/java/com/tngtech/archunit/core/importer/NormalizedUri.java index 0c69c8d86c..6d84ac6baa 100644 --- a/archunit/src/main/java/com/tngtech/archunit/core/importer/NormalizedUri.java +++ b/archunit/src/main/java/com/tngtech/archunit/core/importer/NormalizedUri.java @@ -66,7 +66,7 @@ public boolean equals(Object obj) { if (obj == null || getClass() != obj.getClass()) { return false; } - final NormalizedUri other = (NormalizedUri) obj; + NormalizedUri other = (NormalizedUri) obj; return Objects.equals(this.uri, other.uri); } diff --git a/archunit/src/main/java/com/tngtech/archunit/core/importer/RawAccessRecord.java b/archunit/src/main/java/com/tngtech/archunit/core/importer/RawAccessRecord.java index c092c462e7..f41fde4fee 100644 --- a/archunit/src/main/java/com/tngtech/archunit/core/importer/RawAccessRecord.java +++ b/archunit/src/main/java/com/tngtech/archunit/core/importer/RawAccessRecord.java @@ -181,7 +181,7 @@ public boolean equals(Object obj) { if (obj == null || getClass() != obj.getClass()) { return false; } - final TargetInfo other = (TargetInfo) obj; + TargetInfo other = (TargetInfo) obj; return Objects.equals(this.owner, other.owner) && Objects.equals(this.name, other.name) && Objects.equals(this.desc, other.desc); diff --git a/archunit/src/main/java/com/tngtech/archunit/core/importer/UrlSource.java b/archunit/src/main/java/com/tngtech/archunit/core/importer/UrlSource.java index 67747080aa..374e51ca6e 100644 --- a/archunit/src/main/java/com/tngtech/archunit/core/importer/UrlSource.java +++ b/archunit/src/main/java/com/tngtech/archunit/core/importer/UrlSource.java @@ -59,7 +59,7 @@ class From { private static final String BOOT_CLASS_PATH_PROPERTY_NAME = "sun.boot.class.path"; static UrlSource iterable(Iterable urls) { - final Iterable uniqueUrls = unique(urls); + Iterable uniqueUrls = unique(urls); return new UrlSource() { @Override public Iterator iterator() { diff --git a/archunit/src/main/java/com/tngtech/archunit/core/importer/resolvers/ClassResolver.java b/archunit/src/main/java/com/tngtech/archunit/core/importer/resolvers/ClassResolver.java index 7d40395925..352cfafe29 100644 --- a/archunit/src/main/java/com/tngtech/archunit/core/importer/resolvers/ClassResolver.java +++ b/archunit/src/main/java/com/tngtech/archunit/core/importer/resolvers/ClassResolver.java @@ -122,8 +122,8 @@ private Class classForName(String resolverClassName) { } } - private ClassResolverProvider createProvider(final Class resolverClass, final List args) { - final Optional> listConstructor = tryGetListConstructor(resolverClass); + private ClassResolverProvider createProvider(Class resolverClass, List args) { + Optional> listConstructor = tryGetListConstructor(resolverClass); if (listConstructor.isPresent()) { return new ClassResolverProvider(instantiationException(listConstructor.get(), args)) { @Override @@ -139,7 +139,7 @@ ClassResolver tryGet() throws Exception { } private Function instantiationException( - final Constructor constructor, final List args) { + Constructor constructor, List args) { return cause -> ClassResolverConfigurationException.onInstantiation(constructor, args, cause); } @@ -152,8 +152,8 @@ private Optional> tryGetListConstructor(Class resolverClass) { } } - private ClassResolverProvider tryCreateResolverProviderForDefaultConstructor(final Class resolverClass, final List args) { - final Constructor defaultConstructor; + private ClassResolverProvider tryCreateResolverProviderForDefaultConstructor(Class resolverClass, List args) { + Constructor defaultConstructor; try { defaultConstructor = accessibleConstructor(resolverClass); } catch (NoSuchMethodException e) { diff --git a/archunit/src/main/java/com/tngtech/archunit/lang/AbstractClassesTransformer.java b/archunit/src/main/java/com/tngtech/archunit/lang/AbstractClassesTransformer.java index 9881572053..ebe8dfd9cb 100644 --- a/archunit/src/main/java/com/tngtech/archunit/lang/AbstractClassesTransformer.java +++ b/archunit/src/main/java/com/tngtech/archunit/lang/AbstractClassesTransformer.java @@ -44,7 +44,7 @@ public final DescribedIterable transform(JavaClasses collection) { public abstract Iterable doTransform(JavaClasses collection); @Override - public final ClassesTransformer that(final DescribedPredicate predicate) { + public final ClassesTransformer that(DescribedPredicate predicate) { return new AbstractClassesTransformer(description + " that " + predicate.getDescription()) { @Override public Iterable doTransform(JavaClasses collection) { diff --git a/archunit/src/main/java/com/tngtech/archunit/lang/ArchRule.java b/archunit/src/main/java/com/tngtech/archunit/lang/ArchRule.java index ed98b0f6e4..17a961c582 100644 --- a/archunit/src/main/java/com/tngtech/archunit/lang/ArchRule.java +++ b/archunit/src/main/java/com/tngtech/archunit/lang/ArchRule.java @@ -125,7 +125,7 @@ public EvaluationResult getResult() { @Internal class Factory { - public static ArchRule create(final ClassesTransformer classesTransformer, final ArchCondition condition, final Priority priority) { + public static ArchRule create(ClassesTransformer classesTransformer, ArchCondition condition, Priority priority) { return new SimpleArchRule<>(priority, classesTransformer, condition, Optional.empty(), AllowEmptyShould.AS_CONFIGURED); } diff --git a/archunit/src/main/java/com/tngtech/archunit/lang/EvaluationResult.java b/archunit/src/main/java/com/tngtech/archunit/lang/EvaluationResult.java index dc1f2c6011..ab9fe522e9 100644 --- a/archunit/src/main/java/com/tngtech/archunit/lang/EvaluationResult.java +++ b/archunit/src/main/java/com/tngtech/archunit/lang/EvaluationResult.java @@ -129,7 +129,7 @@ public void add(EvaluationResult part) { public final void handleViolations(ViolationHandler violationHandler, T... __ignored_parameter_to_reify_type__) { Class correspondingObjectType = componentTypeOf(__ignored_parameter_to_reify_type__); ConditionEvent.Handler eventHandler = convertToEventHandler(correspondingObjectType, violationHandler); - for (final ConditionEvent event : violations) { + for (ConditionEvent event : violations) { event.handleWith(eventHandler); } } @@ -189,7 +189,7 @@ private static ArrayList createViolations(ArrayList notMatchedByAny(final Set patterns) { + private static Predicate notMatchedByAny(Set patterns) { return message -> { String normalizedMessage = message.replaceAll("\r*\n", " "); return patterns.stream().noneMatch(pattern -> pattern.matcher(normalizedMessage).matches()); diff --git a/archunit/src/main/java/com/tngtech/archunit/lang/conditions/AllDependenciesCondition.java b/archunit/src/main/java/com/tngtech/archunit/lang/conditions/AllDependenciesCondition.java index 5260223a7a..db82412458 100644 --- a/archunit/src/main/java/com/tngtech/archunit/lang/conditions/AllDependenciesCondition.java +++ b/archunit/src/main/java/com/tngtech/archunit/lang/conditions/AllDependenciesCondition.java @@ -36,7 +36,7 @@ public final class AllDependenciesCondition extends AllAttributesMatchCondition< AllDependenciesCondition( String description, - final DescribedPredicate predicate, + DescribedPredicate predicate, Function> javaClassToRelevantDependencies) { this(description, predicate, javaClassToRelevantDependencies, alwaysFalse()); @@ -44,7 +44,7 @@ public final class AllDependenciesCondition extends AllAttributesMatchCondition< private AllDependenciesCondition( String description, - final DescribedPredicate conditionPredicate, + DescribedPredicate conditionPredicate, Function> javaClassToRelevantDependencies, DescribedPredicate ignorePredicate) { diff --git a/archunit/src/main/java/com/tngtech/archunit/lang/conditions/AndCondition.java b/archunit/src/main/java/com/tngtech/archunit/lang/conditions/AndCondition.java index df75f9d400..becf6c385b 100644 --- a/archunit/src/main/java/com/tngtech/archunit/lang/conditions/AndCondition.java +++ b/archunit/src/main/java/com/tngtech/archunit/lang/conditions/AndCondition.java @@ -54,7 +54,7 @@ public List getDescriptionLines() { } @Override - public void handleWith(final ConditionEvent.Handler handler) { + public void handleWith(ConditionEvent.Handler handler) { for (ConditionWithEvents condition : evaluatedConditions) { condition.getEvents().getViolating().forEach(event -> event.handleWith(handler)); } diff --git a/archunit/src/main/java/com/tngtech/archunit/lang/conditions/AnyDependencyCondition.java b/archunit/src/main/java/com/tngtech/archunit/lang/conditions/AnyDependencyCondition.java index f22c78ed5b..76dbe0fa9d 100644 --- a/archunit/src/main/java/com/tngtech/archunit/lang/conditions/AnyDependencyCondition.java +++ b/archunit/src/main/java/com/tngtech/archunit/lang/conditions/AnyDependencyCondition.java @@ -36,7 +36,7 @@ public final class AnyDependencyCondition extends AnyAttributeMatchesCondition predicate, + DescribedPredicate predicate, Function> javaClassToRelevantDependencies) { this(description, predicate, javaClassToRelevantDependencies, alwaysFalse()); @@ -44,7 +44,7 @@ public final class AnyDependencyCondition extends AnyAttributeMatchesCondition conditionPredicate, + DescribedPredicate conditionPredicate, Function> javaClassToRelevantDependencies, DescribedPredicate ignorePredicate) { diff --git a/archunit/src/main/java/com/tngtech/archunit/lang/conditions/ArchConditions.java b/archunit/src/main/java/com/tngtech/archunit/lang/conditions/ArchConditions.java index 5853942f51..d5d0fead63 100644 --- a/archunit/src/main/java/com/tngtech/archunit/lang/conditions/ArchConditions.java +++ b/archunit/src/main/java/com/tngtech/archunit/lang/conditions/ArchConditions.java @@ -137,12 +137,12 @@ private ArchConditions() { } @PublicAPI(usage = ACCESS) - public static ArchCondition getField(final Class owner, final String fieldName) { + public static ArchCondition getField(Class owner, String fieldName) { return getField(owner.getName(), fieldName); } @PublicAPI(usage = ACCESS) - public static ArchCondition getField(final String ownerName, final String fieldName) { + public static ArchCondition getField(String ownerName, String fieldName) { return getFieldWhere(ownerAndNameAre(ownerName, fieldName)) .as("get field %s.%s", ensureSimpleName(ownerName), fieldName); } @@ -154,12 +154,12 @@ public static ArchCondition getFieldWhere(DescribedPredicate setField(final Class owner, final String fieldName) { + public static ArchCondition setField(Class owner, String fieldName) { return setField(owner.getName(), fieldName); } @PublicAPI(usage = ACCESS) - public static ArchCondition setField(final String ownerName, final String fieldName) { + public static ArchCondition setField(String ownerName, String fieldName) { return setFieldWhere(ownerAndNameAre(ownerName, fieldName)) .as("set field %s.%s", ensureSimpleName(ownerName), fieldName); } @@ -171,12 +171,12 @@ public static ArchCondition setFieldWhere(DescribedPredicate accessField(final Class owner, final String fieldName) { + public static ArchCondition accessField(Class owner, String fieldName) { return accessField(owner.getName(), fieldName); } @PublicAPI(usage = ACCESS) - public static ArchCondition accessField(final String ownerName, final String fieldName) { + public static ArchCondition accessField(String ownerName, String fieldName) { return accessFieldWhere(ownerAndNameAre(ownerName, fieldName)) .as("access field %s.%s", ensureSimpleName(ownerName), fieldName); } @@ -188,7 +188,7 @@ public static ArchCondition accessFieldWhere(DescribedPredicate onlyAccessFieldsThat(final DescribedPredicate predicate) { + public static ArchCondition onlyAccessFieldsThat(DescribedPredicate predicate) { ChainableFunction getTarget = JavaAccess.Functions.Get.target(); DescribedPredicate accessPredicate = getTarget.then(FieldAccessTarget.Functions.RESOLVE_MEMBER) .is(optionalContains(predicate.forSubtype()).or(optionalEmpty())); @@ -215,13 +215,13 @@ public static ArchCondition callMethod(String ownerName, String metho } @PublicAPI(usage = ACCESS) - public static ArchCondition callMethodWhere(final DescribedPredicate predicate) { + public static ArchCondition callMethodWhere(DescribedPredicate predicate) { return new ClassAccessesCondition<>(predicate, GET_METHOD_CALLS_FROM_SELF) .as("call method where " + predicate.getDescription()); } @PublicAPI(usage = ACCESS) - public static ArchCondition onlyCallMethodsThat(final DescribedPredicate predicate) { + public static ArchCondition onlyCallMethodsThat(DescribedPredicate predicate) { ChainableFunction getTarget = JavaAccess.Functions.Get.target(); DescribedPredicate callPredicate = getTarget.then(MethodCallTarget.Functions.RESOLVE_MEMBER) .is(optionalContains(predicate.forSubtype()).or(optionalEmpty())); @@ -248,13 +248,13 @@ public static ArchCondition callConstructor(String ownerName, String. } @PublicAPI(usage = ACCESS) - public static ArchCondition callConstructorWhere(final DescribedPredicate predicate) { + public static ArchCondition callConstructorWhere(DescribedPredicate predicate) { return new ClassAccessesCondition<>(predicate, GET_CONSTRUCTOR_CALLS_FROM_SELF) .as("call constructor where " + predicate.getDescription()); } @PublicAPI(usage = ACCESS) - public static ArchCondition onlyCallConstructorsThat(final DescribedPredicate predicate) { + public static ArchCondition onlyCallConstructorsThat(DescribedPredicate predicate) { ChainableFunction getTarget = JavaAccess.Functions.Get.target(); DescribedPredicate callPredicate = getTarget.then(ConstructorCallTarget.Functions.RESOLVE_MEMBER) .is(optionalContains(predicate.forSubtype()).or(optionalEmpty())); @@ -269,7 +269,7 @@ public static ArchCondition callCodeUnitWhere(DescribedPredicate onlyCallCodeUnitsThat(final DescribedPredicate predicate) { + public static ArchCondition onlyCallCodeUnitsThat(DescribedPredicate predicate) { ChainableFunction, CodeUnitCallTarget> getTarget = JavaAccess.Functions.Get.target(); DescribedPredicate> callPredicate = getTarget.then(CodeUnitCallTarget.Functions.RESOLVE_MEMBER) .is(optionalContains(predicate.forSubtype()).or(optionalEmpty())); @@ -278,7 +278,7 @@ public static ArchCondition onlyCallCodeUnitsThat(final DescribedPred } @PublicAPI(usage = ACCESS) - public static ArchCondition onlyAccessMembersThat(final DescribedPredicate predicate) { + public static ArchCondition onlyAccessMembersThat(DescribedPredicate predicate) { ChainableFunction, AccessTarget> getTarget = JavaAccess.Functions.Get.target(); DescribedPredicate> accessPredicate = getTarget.then(AccessTarget.Functions.RESOLVE_MEMBER) .is(optionalContains(predicate.forSubtype()).or(optionalEmpty())); @@ -292,7 +292,7 @@ public static ArchCondition accessTargetWhere(DescribedPredicate accessClassesThat(final DescribedPredicate predicate) { + public static ArchCondition accessClassesThat(DescribedPredicate predicate) { ChainableFunction, AccessTarget> getTarget = JavaAccess.Functions.Get.target(); DescribedPredicate> accessPredicate = getTarget.then(Get.owner()).is(predicate); return new ClassAccessesCondition<>(accessPredicate, GET_ACCESSES_FROM_SELF) @@ -300,14 +300,14 @@ public static ArchCondition accessClassesThat(final DescribedPredicat } @PublicAPI(usage = ACCESS) - public static ArchCondition onlyAccessClassesThat(final DescribedPredicate predicate) { + public static ArchCondition onlyAccessClassesThat(DescribedPredicate predicate) { ChainableFunction, AccessTarget> getTarget = JavaAccess.Functions.Get.target(); DescribedPredicate> accessPredicate = getTarget.then(Get.owner()).is(predicate); return new AllAccessesCondition("only access classes that", accessPredicate, GET_ACCESSES_FROM_SELF); } @PublicAPI(usage = ACCESS) - public static ArchCondition dependOnClassesThat(final DescribedPredicate predicate) { + public static ArchCondition dependOnClassesThat(DescribedPredicate predicate) { return new AnyDependencyCondition( "depend on classes that " + predicate.getDescription(), GET_TARGET_CLASS.is(predicate), @@ -315,12 +315,12 @@ public static ArchCondition dependOnClassesThat(final DescribedPredic } @PublicAPI(usage = ACCESS) - public static ArchCondition transitivelyDependOnClassesThat(final DescribedPredicate predicate) { + public static ArchCondition transitivelyDependOnClassesThat(DescribedPredicate predicate) { return new TransitiveDependencyCondition(predicate); } @PublicAPI(usage = ACCESS) - public static ArchCondition onlyDependOnClassesThat(final DescribedPredicate predicate) { + public static ArchCondition onlyDependOnClassesThat(DescribedPredicate predicate) { return new AllDependenciesCondition( "only depend on classes that " + predicate.getDescription(), GET_TARGET_CLASS.is(predicate), @@ -452,36 +452,36 @@ static ArchCondition> containOnlyElementsThat(ArchCo return new ContainsOnlyCondition<>(condition); } - private static DescribedPredicate ownerAndNameAre(String ownerName, final String fieldName) { + private static DescribedPredicate ownerAndNameAre(String ownerName, String fieldName) { return JavaFieldAccess.Predicates.target(With.owner(name(ownerName))) .and(JavaFieldAccess.Predicates.target(name(fieldName))) .as(ownerName + "." + fieldName); } @PublicAPI(usage = ACCESS) - public static ArchCondition be(final Class clazz) { + public static ArchCondition be(Class clazz) { return be(clazz.getName()); } @PublicAPI(usage = ACCESS) - public static ArchCondition notBe(final Class clazz) { + public static ArchCondition notBe(Class clazz) { return not(be(clazz)); } @PublicAPI(usage = ACCESS) - public static ArchCondition be(final String className) { + public static ArchCondition be(String className) { return be(fullyQualifiedName(className).as(className)) .describeEventsBy((__, satisfied) -> (satisfied ? "is " : "is not ") + className) .forSubtype(); } @PublicAPI(usage = ACCESS) - public static ArchCondition notBe(final String className) { + public static ArchCondition notBe(String className) { return not(be(className)); } @PublicAPI(usage = ACCESS) - public static ArchCondition haveName(final String name) { + public static ArchCondition haveName(String name) { return have(name(name)); } @@ -503,7 +503,7 @@ ArchCondition notHaveFullName(String fullName) { } @PublicAPI(usage = ACCESS) - public static ArchCondition haveFullyQualifiedName(final String name) { + public static ArchCondition haveFullyQualifiedName(String name) { return have(fullyQualifiedName(name)); } @@ -519,7 +519,7 @@ public static ArchCondition notHaveFullyQualifiedName(String name) { } @PublicAPI(usage = ACCESS) - public static ArchCondition haveSimpleName(final String name) { + public static ArchCondition haveSimpleName(String name) { return have(simpleName(name)); } @@ -529,7 +529,7 @@ public static ArchCondition notHaveSimpleName(String name) { } @PublicAPI(usage = ACCESS) - public static ArchCondition haveSimpleNameStartingWith(final String prefix) { + public static ArchCondition haveSimpleNameStartingWith(String prefix) { return have(simpleNameStartingWith(prefix)); } @@ -539,17 +539,17 @@ public static ArchCondition haveSimpleNameNotStartingWith(String pref } @PublicAPI(usage = ACCESS) - public static ArchCondition haveSimpleNameContaining(final String infix) { + public static ArchCondition haveSimpleNameContaining(String infix) { return have(simpleNameContaining(infix)); } @PublicAPI(usage = ACCESS) - public static ArchCondition haveSimpleNameNotContaining(final String infix) { + public static ArchCondition haveSimpleNameNotContaining(String infix) { return not(haveSimpleNameContaining(infix)).as("have simple name not containing '%s'", infix); } @PublicAPI(usage = ACCESS) - public static ArchCondition haveSimpleNameEndingWith(final String suffix) { + public static ArchCondition haveSimpleNameEndingWith(String suffix) { return have(simpleNameEndingWith(suffix)); } @@ -559,7 +559,7 @@ public static ArchCondition haveSimpleNameNotEndingWith(String suffix } @PublicAPI(usage = ACCESS) - public static ArchCondition haveNameMatching(final String regex) { + public static ArchCondition haveNameMatching(String regex) { return have(nameMatching(regex)); } @@ -611,7 +611,7 @@ public static resideInAPackage(final String packageIdentifier) { + public static ArchCondition resideInAPackage(String packageIdentifier) { return does(JavaClass.Predicates.resideInAPackage(packageIdentifier)); } @@ -632,13 +632,13 @@ public static ArchCondition resideOutsideOfPackages(String... package @PublicAPI(usage = ACCESS) public static ArchCondition haveModifier( - final JavaModifier modifier) { + JavaModifier modifier) { return have(modifier(modifier)); } @PublicAPI(usage = ACCESS) public static ArchCondition notHaveModifier( - final JavaModifier modifier) { + JavaModifier modifier) { return not(ArchConditions.haveModifier(modifier)); } @@ -756,7 +756,7 @@ public static & HasDescription & HasS */ @PublicAPI(usage = ACCESS) public static & HasDescription & HasSourceCodeLocation> ArchCondition beAnnotatedWith( - final DescribedPredicate> predicate) { + DescribedPredicate> predicate) { return be(annotatedWith(predicate)); } @@ -810,7 +810,7 @@ public static & HasDescription & HasS */ @PublicAPI(usage = ACCESS) public static & HasDescription & HasSourceCodeLocation> ArchCondition beMetaAnnotatedWith( - final DescribedPredicate> predicate) { + DescribedPredicate> predicate) { return be(metaAnnotatedWith(predicate)); } @@ -1337,7 +1337,7 @@ private static class HaveOnlyModifiersCondition> getHasModifiers; - HaveOnlyModifiersCondition(String description, final JavaModifier modifier, Function> getHasModifiers) { + HaveOnlyModifiersCondition(String description, JavaModifier modifier, Function> getHasModifiers) { super("have only " + description, be(modifier(modifier).as(modifier.toString().toLowerCase()))); this.getHasModifiers = getHasModifiers; } diff --git a/archunit/src/main/java/com/tngtech/archunit/lang/conditions/JavaAccessPackagePredicate.java b/archunit/src/main/java/com/tngtech/archunit/lang/conditions/JavaAccessPackagePredicate.java index bd239b2c46..25772cd57b 100644 --- a/archunit/src/main/java/com/tngtech/archunit/lang/conditions/JavaAccessPackagePredicate.java +++ b/archunit/src/main/java/com/tngtech/archunit/lang/conditions/JavaAccessPackagePredicate.java @@ -53,7 +53,7 @@ private Creator(Function, String> getPackageName) { this.getPackageName = getPackageName; } - JavaAccessPackagePredicate matching(final String... packageIdentifiers) { + JavaAccessPackagePredicate matching(String... packageIdentifiers) { return new JavaAccessPackagePredicate(packageIdentifiers, getPackageName); } } diff --git a/archunit/src/main/java/com/tngtech/archunit/lang/conditions/JoinCondition.java b/archunit/src/main/java/com/tngtech/archunit/lang/conditions/JoinCondition.java index fa22c0afe1..0e491cd5b3 100644 --- a/archunit/src/main/java/com/tngtech/archunit/lang/conditions/JoinCondition.java +++ b/archunit/src/main/java/com/tngtech/archunit/lang/conditions/JoinCondition.java @@ -107,7 +107,7 @@ abstract static class JoinConditionEvent implements ConditionEvent { } List getUniqueLinesOfViolations() { - final Set result = new TreeSet<>(); + Set result = new TreeSet<>(); for (ConditionWithEvents evaluation : evaluatedConditions) { for (ConditionEvent event : evaluation.events.getViolating()) { result.addAll(event.getDescriptionLines()); diff --git a/archunit/src/main/java/com/tngtech/archunit/lang/conditions/OrCondition.java b/archunit/src/main/java/com/tngtech/archunit/lang/conditions/OrCondition.java index 12b47e041c..c967043df9 100644 --- a/archunit/src/main/java/com/tngtech/archunit/lang/conditions/OrCondition.java +++ b/archunit/src/main/java/com/tngtech/archunit/lang/conditions/OrCondition.java @@ -61,7 +61,7 @@ private String createMessage() { } @Override - public void handleWith(final Handler handler) { + public void handleWith(Handler handler) { handler.handle(singleton(correspondingObject), createMessage()); } } diff --git a/archunit/src/main/java/com/tngtech/archunit/lang/syntax/ArchRuleDefinition.java b/archunit/src/main/java/com/tngtech/archunit/lang/syntax/ArchRuleDefinition.java index b7e3719c61..3c6bf09129 100644 --- a/archunit/src/main/java/com/tngtech/archunit/lang/syntax/ArchRuleDefinition.java +++ b/archunit/src/main/java/com/tngtech/archunit/lang/syntax/ArchRuleDefinition.java @@ -262,28 +262,28 @@ public GivenObjects no(ClassesTransformer classesTransformer) } @PublicAPI(usage = ACCESS) - public GivenClass theClass(final Class clazz) { + public GivenClass theClass(Class clazz) { return theClass(clazz.getName()); } @PublicAPI(usage = ACCESS) - public GivenClass theClass(final String className) { + public GivenClass theClass(String className) { ClassesTransformer theClass = theClassTransformer(className); return new GivenClassInternal(priority, theClass, Function.identity()); } @PublicAPI(usage = ACCESS) - public GivenClass noClass(final Class clazz) { + public GivenClass noClass(Class clazz) { return noClass(clazz.getName()); } @PublicAPI(usage = ACCESS) - public GivenClass noClass(final String className) { + public GivenClass noClass(String className) { ClassesTransformer noClass = theClassTransformer(className).as("no class " + className); return new GivenClassInternal(priority, noClass, ArchRuleDefinition.negateCondition()); } - private ClassesTransformer theClassTransformer(final String className) { + private ClassesTransformer theClassTransformer(String className) { return new AbstractClassesTransformer("the class " + className) { @Override public Iterable doTransform(JavaClasses classes) { diff --git a/archunit/src/main/java/com/tngtech/archunit/lang/syntax/ClassesShouldInternal.java b/archunit/src/main/java/com/tngtech/archunit/lang/syntax/ClassesShouldInternal.java index a533f8bbbf..0ed5d6d2e9 100644 --- a/archunit/src/main/java/com/tngtech/archunit/lang/syntax/ClassesShouldInternal.java +++ b/archunit/src/main/java/com/tngtech/archunit/lang/syntax/ClassesShouldInternal.java @@ -65,12 +65,12 @@ private ClassesShouldInternal(ClassesTransformer classesTransformer, } @Override - public ClassesShouldConjunction be(final Class clazz) { + public ClassesShouldConjunction be(Class clazz) { return addCondition(ArchConditions.be(clazz)); } @Override - public ClassesShouldConjunction notBe(final Class clazz) { + public ClassesShouldConjunction notBe(Class clazz) { return addCondition(ArchConditions.notBe(clazz)); } @@ -85,7 +85,7 @@ public ClassesShouldConjunction notBe(String className) { } @Override - public ClassesShouldConjunction haveFullyQualifiedName(final String name) { + public ClassesShouldConjunction haveFullyQualifiedName(String name) { return addCondition(ArchConditions.haveFullyQualifiedName(name)); } diff --git a/archunit/src/main/java/com/tngtech/archunit/lang/syntax/MembersDeclaredInClassesThat.java b/archunit/src/main/java/com/tngtech/archunit/lang/syntax/MembersDeclaredInClassesThat.java index 974afeffca..ef42907735 100644 --- a/archunit/src/main/java/com/tngtech/archunit/lang/syntax/MembersDeclaredInClassesThat.java +++ b/archunit/src/main/java/com/tngtech/archunit/lang/syntax/MembersDeclaredInClassesThat.java @@ -443,7 +443,7 @@ public CONJUNCTION areNotLocalClasses() { } @Override - public CONJUNCTION belongToAnyOf(final Class... classes) { + public CONJUNCTION belongToAnyOf(Class... classes) { return givenWith(JavaClass.Predicates.belongToAnyOf(classes)); } diff --git a/archunit/src/main/java/com/tngtech/archunit/lang/syntax/ObjectsShouldInternal.java b/archunit/src/main/java/com/tngtech/archunit/lang/syntax/ObjectsShouldInternal.java index 03f43535fb..42528c41e8 100644 --- a/archunit/src/main/java/com/tngtech/archunit/lang/syntax/ObjectsShouldInternal.java +++ b/archunit/src/main/java/com/tngtech/archunit/lang/syntax/ObjectsShouldInternal.java @@ -153,7 +153,7 @@ static AddMode and() { return and(Function.identity()); } - static AddMode and(final Function, ArchCondition> prepareCondition) { + static AddMode and(Function, ArchCondition> prepareCondition) { return new AddMode() { @Override ArchCondition apply(Optional> first, ArchCondition other) { @@ -163,7 +163,7 @@ ArchCondition apply(Optional> first, ArchCondition AddMode or(final Function, ArchCondition> prepareCondition) { + static AddMode or(Function, ArchCondition> prepareCondition) { return new AddMode() { @Override ArchCondition apply(Optional> first, ArchCondition other) { @@ -176,7 +176,7 @@ ArchCondition apply(Optional> first, ArchCondition apply(Optional> first, ArchCondition other); } - static Function, ArchCondition> prependDescription(final String prefix) { + static Function, ArchCondition> prependDescription(String prefix) { return input -> input.as(prefix + " " + input.getDescription()); } } diff --git a/archunit/src/main/java/com/tngtech/archunit/library/Architectures.java b/archunit/src/main/java/com/tngtech/archunit/library/Architectures.java index 59745c27e0..d14304473d 100644 --- a/archunit/src/main/java/com/tngtech/archunit/library/Architectures.java +++ b/archunit/src/main/java/com/tngtech/archunit/library/Architectures.java @@ -435,7 +435,7 @@ private void checkLayerNamesExist(String... layerNames) { } private abstract static class AllClassesAreContainedInArchitectureCheck { - abstract Optional evaluate(final JavaClasses classes, final LayerDefinitions layerDefinitions); + abstract Optional evaluate(JavaClasses classes, LayerDefinitions layerDefinitions); static class Enabled extends AllClassesAreContainedInArchitectureCheck { private final DescribedPredicate ignorePredicate; @@ -444,7 +444,7 @@ private Enabled(DescribedPredicate ignorePredicate) { this.ignorePredicate = ignorePredicate; } - Optional evaluate(final JavaClasses classes, final LayerDefinitions layerDefinitions) { + Optional evaluate(JavaClasses classes, LayerDefinitions layerDefinitions) { return Optional.of(classes().should(beContainedInLayers(layerDefinitions)).evaluate(classes)); } @@ -469,7 +469,7 @@ Optional evaluate(JavaClasses classes, LayerDefinitions layerD } } - private static ArchCondition notBeEmptyFor(final LayeredArchitecture.LayerDefinition layerDefinition) { + private static ArchCondition notBeEmptyFor(LayeredArchitecture.LayerDefinition layerDefinition) { return new LayerShouldNotBeEmptyCondition(layerDefinition); } @@ -477,7 +477,7 @@ private static class LayerShouldNotBeEmptyCondition extends ArchCondition containsPredicateForAll() { return containsPredicateFor(layerDefinitions.keySet()); } - DescribedPredicate containsPredicateFor(final Collection layerNames) { + DescribedPredicate containsPredicateFor(Collection layerNames) { DescribedPredicate result = alwaysFalse(); for (LayerDefinition definition : get(layerNames)) { result = result.or(definition.containsPredicate()); @@ -705,7 +705,7 @@ public LayeredArchitecture consideringAllDependencies() { * @return {@link DependencySettings dependency settings} to be used when checking for violations of the layered architecture */ @PublicAPI(usage = ACCESS) - public LayeredArchitecture consideringOnlyDependenciesInAnyPackage(String packageIdentifier, final String... furtherPackageIdentifiers) { + public LayeredArchitecture consideringOnlyDependenciesInAnyPackage(String packageIdentifier, String... furtherPackageIdentifiers) { String[] packageIdentifiers = Stream.concat(Stream.of(packageIdentifier), Stream.of(furtherPackageIdentifiers)).toArray(String[]::new); return new LayeredArchitecture(setToConsideringOnlyDependenciesInAnyPackage(packageIdentifiers)); } diff --git a/archunit/src/main/java/com/tngtech/archunit/library/DependencyRules.java b/archunit/src/main/java/com/tngtech/archunit/library/DependencyRules.java index 2e3ad55356..c606860280 100644 --- a/archunit/src/main/java/com/tngtech/archunit/library/DependencyRules.java +++ b/archunit/src/main/java/com/tngtech/archunit/library/DependencyRules.java @@ -123,7 +123,7 @@ private static class DependOnUpperPackagesCondition extends ArchCondition directly_call_other_methods_declared_in_t *

*/ @PublicAPI(usage = ACCESS) - public static ArchCondition directly_call_other_methods_declared_in_the_same_class_that(final DescribedPredicate predicate) { + public static ArchCondition directly_call_other_methods_declared_in_the_same_class_that(DescribedPredicate predicate) { return new ArchCondition("directly call other methods declared in the same class that " + predicate.getDescription()) { @Override public void check(JavaClass javaClass, ConditionEvents events) { diff --git a/archunit/src/main/java/com/tngtech/archunit/library/dependencies/Cycle.java b/archunit/src/main/java/com/tngtech/archunit/library/dependencies/Cycle.java index 4f618afbc9..6b3b53ce7f 100644 --- a/archunit/src/main/java/com/tngtech/archunit/library/dependencies/Cycle.java +++ b/archunit/src/main/java/com/tngtech/archunit/library/dependencies/Cycle.java @@ -70,7 +70,7 @@ public boolean equals(Object obj) { if (obj == null || getClass() != obj.getClass()) { return false; } - final Cycle other = (Cycle) obj; + Cycle other = (Cycle) obj; return Objects.equals(this.path.getSetOfEdges(), other.path.getSetOfEdges()); } diff --git a/archunit/src/main/java/com/tngtech/archunit/library/dependencies/Edge.java b/archunit/src/main/java/com/tngtech/archunit/library/dependencies/Edge.java index 8ac1183ba2..327c236f5c 100644 --- a/archunit/src/main/java/com/tngtech/archunit/library/dependencies/Edge.java +++ b/archunit/src/main/java/com/tngtech/archunit/library/dependencies/Edge.java @@ -59,7 +59,7 @@ public boolean equals(Object obj) { if (obj == null || getClass() != obj.getClass()) { return false; } - final Edge other = (Edge) obj; + Edge other = (Edge) obj; return Objects.equals(this.from, other.from) && Objects.equals(this.to, other.to); } diff --git a/archunit/src/main/java/com/tngtech/archunit/library/dependencies/Path.java b/archunit/src/main/java/com/tngtech/archunit/library/dependencies/Path.java index b06eda919c..07cc423310 100644 --- a/archunit/src/main/java/com/tngtech/archunit/library/dependencies/Path.java +++ b/archunit/src/main/java/com/tngtech/archunit/library/dependencies/Path.java @@ -111,7 +111,7 @@ public boolean equals(Object obj) { if (obj == null || getClass() != obj.getClass()) { return false; } - final Path other = (Path) obj; + Path other = (Path) obj; return Objects.equals(this.edges, other.edges); } diff --git a/archunit/src/main/java/com/tngtech/archunit/library/dependencies/Slice.java b/archunit/src/main/java/com/tngtech/archunit/library/dependencies/Slice.java index d59c008fb2..9c5c507974 100644 --- a/archunit/src/main/java/com/tngtech/archunit/library/dependencies/Slice.java +++ b/archunit/src/main/java/com/tngtech/archunit/library/dependencies/Slice.java @@ -169,7 +169,7 @@ public boolean equals(Object obj) { if (obj == null || getClass() != obj.getClass()) { return false; } - final Slice other = (Slice) obj; + Slice other = (Slice) obj; return Objects.equals(this.matchingGroups, other.matchingGroups); } diff --git a/archunit/src/main/java/com/tngtech/archunit/library/dependencies/SliceDependency.java b/archunit/src/main/java/com/tngtech/archunit/library/dependencies/SliceDependency.java index f25f13827f..be0052d26e 100644 --- a/archunit/src/main/java/com/tngtech/archunit/library/dependencies/SliceDependency.java +++ b/archunit/src/main/java/com/tngtech/archunit/library/dependencies/SliceDependency.java @@ -46,7 +46,7 @@ private SliceDependency(Slice origin, Iterable dependenciesToConside this.target = target; } - private SortedSet filterTarget(Iterable dependenciesToConsider, final Slice target) { + private SortedSet filterTarget(Iterable dependenciesToConsider, Slice target) { return stream(dependenciesToConsider.spliterator(), false) .filter(input -> target.contains(input.getTargetClass())) .collect(toCollection(TreeSet::new)); @@ -92,7 +92,7 @@ public boolean equals(Object obj) { if (obj == null || getClass() != obj.getClass()) { return false; } - final SliceDependency other = (SliceDependency) obj; + SliceDependency other = (SliceDependency) obj; return Objects.equals(this.origin, other.origin) && Objects.equals(this.target, other.target); } diff --git a/archunit/src/main/java/com/tngtech/archunit/library/dependencies/SliceIdentifier.java b/archunit/src/main/java/com/tngtech/archunit/library/dependencies/SliceIdentifier.java index 80e6b76533..0f0e829d38 100644 --- a/archunit/src/main/java/com/tngtech/archunit/library/dependencies/SliceIdentifier.java +++ b/archunit/src/main/java/com/tngtech/archunit/library/dependencies/SliceIdentifier.java @@ -60,7 +60,7 @@ public boolean equals(Object obj) { if (obj == null || getClass() != obj.getClass()) { return false; } - final SliceIdentifier other = (SliceIdentifier) obj; + SliceIdentifier other = (SliceIdentifier) obj; return Objects.equals(this.parts, other.parts); } diff --git a/archunit/src/main/java/com/tngtech/archunit/library/dependencies/Slices.java b/archunit/src/main/java/com/tngtech/archunit/library/dependencies/Slices.java index f176ac2f2c..f5381b32d2 100644 --- a/archunit/src/main/java/com/tngtech/archunit/library/dependencies/Slices.java +++ b/archunit/src/main/java/com/tngtech/archunit/library/dependencies/Slices.java @@ -242,7 +242,7 @@ private Slices createSlices(JavaClasses classes) { } @Override - public Slices.Transformer that(final DescribedPredicate predicate) { + public Slices.Transformer that(DescribedPredicate predicate) { String newDescription = this.predicate.joinDescription(getDescription(), predicate.getDescription()); return new Transformer(sliceAssignment, newDescription, namingPattern, this.predicate.add(predicate)); } diff --git a/archunit/src/main/java/com/tngtech/archunit/library/freeze/FreezingArchRule.java b/archunit/src/main/java/com/tngtech/archunit/library/freeze/FreezingArchRule.java index c7a1b318d9..cdc654448f 100644 --- a/archunit/src/main/java/com/tngtech/archunit/library/freeze/FreezingArchRule.java +++ b/archunit/src/main/java/com/tngtech/archunit/library/freeze/FreezingArchRule.java @@ -141,7 +141,7 @@ private EvaluationResult storeViolationsAndReturnSuccess(EvaluationResultLineBre private EvaluationResult removeObsoleteViolationsFromStoreAndReturnNewViolations(EvaluationResultLineBreakAdapter result) { log.debug("Found frozen result for rule '{}'", delegate.getDescription()); - final List knownViolations = store.getViolations(delegate); + List knownViolations = store.getViolations(delegate); CategorizedViolations categorizedViolations = new CategorizedViolations(matcher, result, knownViolations); removeObsoleteViolationsFromStore(categorizedViolations); return filterOutKnownViolations(result, categorizedViolations.getKnownActualViolations()); @@ -155,7 +155,7 @@ private void removeObsoleteViolationsFromStore(CategorizedViolations categorized } } - private EvaluationResult filterOutKnownViolations(EvaluationResultLineBreakAdapter result, final Set knownActualViolations) { + private EvaluationResult filterOutKnownViolations(EvaluationResultLineBreakAdapter result, Set knownActualViolations) { log.debug("Filtering out known violations: {}", knownActualViolations); return result.filterDescriptionsMatching(violation -> !knownActualViolations.contains(violation)); } @@ -293,7 +293,7 @@ Priority getPriority() { return result.getPriority(); } - EvaluationResult filterDescriptionsMatching(final Predicate predicate) { + EvaluationResult filterDescriptionsMatching(Predicate predicate) { return result.filterDescriptionsMatching(input -> predicate.test(ensureUnixLineBreaks(input))); } } diff --git a/archunit/src/main/java/com/tngtech/archunit/library/freeze/ViolationLineMatcherFactory.java b/archunit/src/main/java/com/tngtech/archunit/library/freeze/ViolationLineMatcherFactory.java index 0ae9b7386f..adf53bd360 100644 --- a/archunit/src/main/java/com/tngtech/archunit/library/freeze/ViolationLineMatcherFactory.java +++ b/archunit/src/main/java/com/tngtech/archunit/library/freeze/ViolationLineMatcherFactory.java @@ -97,7 +97,7 @@ private int nextIndexOfCharacterOrEndOfString(char ch) { } private int findStartIndexOfNextRelevantPart() { - final int startOfIgnoredPart = end + 1; + int startOfIgnoredPart = end + 1; int indexOfNonDigit = findIndexOfNextNonDigitChar(startOfIgnoredPart); if (str.charAt(end) == ':') { boolean foundNumber = indexOfNonDigit > startOfIgnoredPart; diff --git a/archunit/src/main/java/com/tngtech/archunit/library/plantuml/rules/Alias.java b/archunit/src/main/java/com/tngtech/archunit/library/plantuml/rules/Alias.java index c036735d37..51425e2b51 100644 --- a/archunit/src/main/java/com/tngtech/archunit/library/plantuml/rules/Alias.java +++ b/archunit/src/main/java/com/tngtech/archunit/library/plantuml/rules/Alias.java @@ -46,7 +46,7 @@ public boolean equals(Object obj) { if (obj == null || getClass() != obj.getClass()) { return false; } - final Alias other = (Alias) obj; + Alias other = (Alias) obj; return Objects.equals(this.value, other.value); } diff --git a/archunit/src/main/java/com/tngtech/archunit/library/plantuml/rules/ComponentIdentifier.java b/archunit/src/main/java/com/tngtech/archunit/library/plantuml/rules/ComponentIdentifier.java index 1c46c35bab..f34e0f85e0 100644 --- a/archunit/src/main/java/com/tngtech/archunit/library/plantuml/rules/ComponentIdentifier.java +++ b/archunit/src/main/java/com/tngtech/archunit/library/plantuml/rules/ComponentIdentifier.java @@ -52,7 +52,7 @@ public boolean equals(Object obj) { if (obj == null || getClass() != obj.getClass()) { return false; } - final ComponentIdentifier other = (ComponentIdentifier) obj; + ComponentIdentifier other = (ComponentIdentifier) obj; return Objects.equals(this.componentName, other.componentName) && Objects.equals(this.alias, other.alias); } diff --git a/archunit/src/main/java/com/tngtech/archunit/library/plantuml/rules/ComponentName.java b/archunit/src/main/java/com/tngtech/archunit/library/plantuml/rules/ComponentName.java index 3ef6df098d..36d86a60f7 100644 --- a/archunit/src/main/java/com/tngtech/archunit/library/plantuml/rules/ComponentName.java +++ b/archunit/src/main/java/com/tngtech/archunit/library/plantuml/rules/ComponentName.java @@ -43,7 +43,7 @@ public boolean equals(Object obj) { if (obj == null || getClass() != obj.getClass()) { return false; } - final ComponentName other = (ComponentName) obj; + ComponentName other = (ComponentName) obj; return Objects.equals(this.value, other.value); } diff --git a/archunit/src/main/java/com/tngtech/archunit/library/plantuml/rules/JavaClassDiagramAssociation.java b/archunit/src/main/java/com/tngtech/archunit/library/plantuml/rules/JavaClassDiagramAssociation.java index 6e9f13d485..1fc8883781 100644 --- a/archunit/src/main/java/com/tngtech/archunit/library/plantuml/rules/JavaClassDiagramAssociation.java +++ b/archunit/src/main/java/com/tngtech/archunit/library/plantuml/rules/JavaClassDiagramAssociation.java @@ -48,7 +48,7 @@ private void validateStereotypes(PlantUmlDiagram plantUmlDiagram) { } } - Set getTargetPackageIdentifiers(final JavaClass javaClass) { + Set getTargetPackageIdentifiers(JavaClass javaClass) { ImmutableSet.Builder result = ImmutableSet.builder(); for (PlantUmlComponent target : getComponentOf(javaClass).getDependencies()) { result.addAll(getPackageIdentifiersFromComponentOf(target)); @@ -68,7 +68,7 @@ private Set getPackageIdentifiersFromComponentOf(PlantUmlComponent compo return result.build(); } - private PlantUmlComponent getComponentOf(final JavaClass javaClass) { + private PlantUmlComponent getComponentOf(JavaClass javaClass) { return getOnlyElement(getAssociatedComponents(javaClass)); } diff --git a/archunit/src/main/java/com/tngtech/archunit/library/plantuml/rules/ParsedDependency.java b/archunit/src/main/java/com/tngtech/archunit/library/plantuml/rules/ParsedDependency.java index e1a93af054..97b302cf7a 100644 --- a/archunit/src/main/java/com/tngtech/archunit/library/plantuml/rules/ParsedDependency.java +++ b/archunit/src/main/java/com/tngtech/archunit/library/plantuml/rules/ParsedDependency.java @@ -47,7 +47,7 @@ public boolean equals(Object obj) { if (obj == null || getClass() != obj.getClass()) { return false; } - final ParsedDependency other = (ParsedDependency) obj; + ParsedDependency other = (ParsedDependency) obj; return Objects.equals(this.origin, other.origin) && Objects.equals(this.target, other.target); } diff --git a/archunit/src/main/java/com/tngtech/archunit/library/plantuml/rules/PlantUmlArchCondition.java b/archunit/src/main/java/com/tngtech/archunit/library/plantuml/rules/PlantUmlArchCondition.java index 55ceec9342..0aa5db88cd 100644 --- a/archunit/src/main/java/com/tngtech/archunit/library/plantuml/rules/PlantUmlArchCondition.java +++ b/archunit/src/main/java/com/tngtech/archunit/library/plantuml/rules/PlantUmlArchCondition.java @@ -135,12 +135,12 @@ public PlantUmlArchCondition ignoreDependenciesWithTarget(DescribedPredicate origin, final Class target) { + public PlantUmlArchCondition ignoreDependencies(Class origin, Class target) { return ignoreDependencies(origin.getName(), target.getName()); } @PublicAPI(usage = ACCESS) - public PlantUmlArchCondition ignoreDependencies(final String origin, final String target) { + public PlantUmlArchCondition ignoreDependencies(String origin, String target) { return ignoreDependencies( GET_ORIGIN_CLASS.is(name(origin)).and(GET_TARGET_CLASS.is(name(target))) .as("ignoring dependencies from %s to %s", origin, target)); @@ -307,8 +307,8 @@ public static Configuration consideringOnlyDependenciesInDiagram() { * e.g. 'com.myapp..'. */ @PublicAPI(usage = ACCESS) - public static Configuration consideringOnlyDependenciesInAnyPackage(String packageIdentifier, final String... furtherPackageIdentifiers) { - final List packageIdentifiers = FluentIterable.from(singleton(packageIdentifier)) + public static Configuration consideringOnlyDependenciesInAnyPackage(String packageIdentifier, String... furtherPackageIdentifiers) { + List packageIdentifiers = FluentIterable.from(singleton(packageIdentifier)) .append(furtherPackageIdentifiers) .toList(); diff --git a/archunit/src/main/java/com/tngtech/archunit/library/plantuml/rules/PlantUmlComponent.java b/archunit/src/main/java/com/tngtech/archunit/library/plantuml/rules/PlantUmlComponent.java index b69b12697c..1b4d871a8c 100644 --- a/archunit/src/main/java/com/tngtech/archunit/library/plantuml/rules/PlantUmlComponent.java +++ b/archunit/src/main/java/com/tngtech/archunit/library/plantuml/rules/PlantUmlComponent.java @@ -79,7 +79,7 @@ public boolean equals(Object obj) { if (obj == null || getClass() != obj.getClass()) { return false; } - final PlantUmlComponent other = (PlantUmlComponent) obj; + PlantUmlComponent other = (PlantUmlComponent) obj; return Objects.equals(this.componentName, other.componentName) && Objects.equals(this.stereotypes, other.stereotypes) && Objects.equals(this.alias, other.alias); diff --git a/archunit/src/main/java/com/tngtech/archunit/library/plantuml/rules/PlantUmlComponentDependency.java b/archunit/src/main/java/com/tngtech/archunit/library/plantuml/rules/PlantUmlComponentDependency.java index 41c293a339..26290e46d5 100644 --- a/archunit/src/main/java/com/tngtech/archunit/library/plantuml/rules/PlantUmlComponentDependency.java +++ b/archunit/src/main/java/com/tngtech/archunit/library/plantuml/rules/PlantUmlComponentDependency.java @@ -45,7 +45,7 @@ public boolean equals(Object obj) { if (obj == null || getClass() != obj.getClass()) { return false; } - final PlantUmlComponentDependency other = (PlantUmlComponentDependency) obj; + PlantUmlComponentDependency other = (PlantUmlComponentDependency) obj; return Objects.equals(this.origin, other.origin) && Objects.equals(this.target, other.target); } diff --git a/archunit/src/main/java/com/tngtech/archunit/library/plantuml/rules/PlantUmlPatterns.java b/archunit/src/main/java/com/tngtech/archunit/library/plantuml/rules/PlantUmlPatterns.java index 7a34afbe2e..0467e77d34 100644 --- a/archunit/src/main/java/com/tngtech/archunit/library/plantuml/rules/PlantUmlPatterns.java +++ b/archunit/src/main/java/com/tngtech/archunit/library/plantuml/rules/PlantUmlPatterns.java @@ -73,7 +73,7 @@ PlantUmlComponentMatcher matchComponent(String input) { return new PlantUmlComponentMatcher(input); } - private Predicate matches(final Pattern pattern) { + private Predicate matches(Pattern pattern) { return input -> pattern.matcher(input).matches(); } diff --git a/archunit/src/main/java/com/tngtech/archunit/library/plantuml/rules/Stereotype.java b/archunit/src/main/java/com/tngtech/archunit/library/plantuml/rules/Stereotype.java index 1d921f140d..d68ac16d5d 100644 --- a/archunit/src/main/java/com/tngtech/archunit/library/plantuml/rules/Stereotype.java +++ b/archunit/src/main/java/com/tngtech/archunit/library/plantuml/rules/Stereotype.java @@ -43,7 +43,7 @@ public boolean equals(Object obj) { if (obj == null || getClass() != obj.getClass()) { return false; } - final Stereotype other = (Stereotype) obj; + Stereotype other = (Stereotype) obj; return Objects.equals(this.value, other.value); } diff --git a/archunit/src/test/java/com/tngtech/archunit/base/ChainableFunctionTest.java b/archunit/src/test/java/com/tngtech/archunit/base/ChainableFunctionTest.java index 425e9a2c48..e34c57f495 100644 --- a/archunit/src/test/java/com/tngtech/archunit/base/ChainableFunctionTest.java +++ b/archunit/src/test/java/com/tngtech/archunit/base/ChainableFunctionTest.java @@ -26,7 +26,7 @@ public void is() { .accepts("8"); } - private DescribedPredicate greaterThan(final int number) { + private DescribedPredicate greaterThan(int number) { return new DescribedPredicate("greater than " + number) { @Override public boolean test(Integer input) { @@ -44,7 +44,7 @@ public Integer apply(String input) { }; } - private ChainableFunction plus(final int number) { + private ChainableFunction plus(int number) { return new ChainableFunction() { @Override public Integer apply(Integer input) { diff --git a/archunit/src/test/java/com/tngtech/archunit/base/DescribedPredicateTest.java b/archunit/src/test/java/com/tngtech/archunit/base/DescribedPredicateTest.java index 6fb67b17d9..d63cad89ac 100644 --- a/archunit/src/test/java/com/tngtech/archunit/base/DescribedPredicateTest.java +++ b/archunit/src/test/java/com/tngtech/archunit/base/DescribedPredicateTest.java @@ -273,7 +273,7 @@ public void allElements_works() { .accepts(ImmutableList.of()); } - private Function constant(final int integer) { + private Function constant(int integer) { return input -> integer; } diff --git a/archunit/src/test/java/com/tngtech/archunit/core/domain/AnnotationProxyTest.java b/archunit/src/test/java/com/tngtech/archunit/core/domain/AnnotationProxyTest.java index f4126c516a..74ecbd4d4e 100644 --- a/archunit/src/test/java/com/tngtech/archunit/core/domain/AnnotationProxyTest.java +++ b/archunit/src/test/java/com/tngtech/archunit/core/domain/AnnotationProxyTest.java @@ -294,7 +294,7 @@ private String formatSubAnnotation(AnnotationPropertiesFormatter formatter, Stri } // NOTE: We do not want this value to be treated as a string by the formatter, and e.g. quoted -> Object - private Object subAnnotationFormatter(final AnnotationPropertiesFormatter formatter, final String value) { + private Object subAnnotationFormatter(AnnotationPropertiesFormatter formatter, String value) { return new Object() { @Override public String toString() { @@ -396,7 +396,7 @@ private List valuesOf(SubAnnotation[] subAnnotations) { return stream(subAnnotations).map(SubAnnotation::value).collect(toList()); } - private Condition matching(final Class annotationType, final Map properties) { + private Condition matching(Class annotationType, Map properties) { return new Condition("matching " + properties) { @Override public boolean matches(String value) { diff --git a/archunit/src/test/java/com/tngtech/archunit/core/domain/JavaClassTest.java b/archunit/src/test/java/com/tngtech/archunit/core/domain/JavaClassTest.java index eaa78bb206..6654d5e962 100644 --- a/archunit/src/test/java/com/tngtech/archunit/core/domain/JavaClassTest.java +++ b/archunit/src/test/java/com/tngtech/archunit/core/domain/JavaClassTest.java @@ -142,7 +142,7 @@ Object notAnArray() { } JavaMethod method = importClassWithContext(IsArrayTestClass.class).getMethod("notAnArray"); - final JavaClass nonArrayType = method.getRawReturnType(); + JavaClass nonArrayType = method.getRawReturnType(); assertThat(nonArrayType.isArray()).isFalse(); assertThat(nonArrayType.tryGetComponentType()).isEmpty(); @@ -428,7 +428,7 @@ public void getMembers_and_getAllMembers() { @Test public void getCodeUnitWithParameterTypes() { - final JavaClass clazz = importClasses(ChildWithFieldAndMethod.class).get(ChildWithFieldAndMethod.class); + JavaClass clazz = importClasses(ChildWithFieldAndMethod.class).get(ChildWithFieldAndMethod.class); assertIllegalArgumentException("childMethod", () -> clazz.getCodeUnitWithParameterTypes("childMethod")); assertIllegalArgumentException("childMethod", () -> clazz.getCodeUnitWithParameterTypes("childMethod", Object.class)); @@ -446,7 +446,7 @@ public void getCodeUnitWithParameterTypes() { @Test public void tryGetCodeUnitWithParameterTypes() { - final JavaClass clazz = importClasses(ChildWithFieldAndMethod.class).get(ChildWithFieldAndMethod.class); + JavaClass clazz = importClasses(ChildWithFieldAndMethod.class).get(ChildWithFieldAndMethod.class); assertThatCodeUnit(clazz.tryGetCodeUnitWithParameterTypes("childMethod", Collections.singletonList(String.class)).get()) .matchesMethod(ChildWithFieldAndMethod.class, "childMethod", String.class); @@ -1976,7 +1976,7 @@ private Set excludeJavaLangObject(Set members) { return members.stream().filter(it -> !it.getOwner().isEquivalentTo(Object.class)).collect(toSet()); } - private JavaClass getOnlyClassSettingField(JavaClasses classes, final String fieldName) { + private JavaClass getOnlyClassSettingField(JavaClasses classes, String fieldName) { return getOnlyElement(classes.that(new DescribedPredicate("") { @Override public boolean test(JavaClass input) { @@ -2053,7 +2053,7 @@ public boolean matches(Dependency value) { }; } - Condition toClassEquivalentTo(final Class clazz) { + Condition toClassEquivalentTo(Class clazz) { return new Condition("any dependency to class " + clazz.getName()) { @Override public boolean matches(Dependency value) { @@ -2062,7 +2062,7 @@ public boolean matches(Dependency value) { }; } - Condition fromClassEquivalentTo(final Class clazz) { + Condition fromClassEquivalentTo(Class clazz) { return new Condition("any dependency from class " + clazz.getName()) { @Override public boolean matches(Dependency value) { @@ -2114,7 +2114,7 @@ class Step3 { targetDescription = target.getSimpleName() + "." + targetName; } - Condition inLineNumber(final int lineNumber) { + Condition inLineNumber(int lineNumber) { return new Condition(String.format( "%s %s %s in line %d", originDescription, descriptionPart, targetDescription, lineNumber)) { @Override @@ -2163,7 +2163,7 @@ private static class AssignableAssert { private Set> assignable = new HashSet<>(); private Class firstType; - public FromEvaluation from(final Class type) { + public FromEvaluation from(Class type) { firstType = type; message = String.format("assignableFrom(%s) matches ", type.getSimpleName()); assignable = ImmutableSet.of(new DescribedPredicate("direct assignable from") { @@ -2175,7 +2175,7 @@ public boolean test(JavaClass input) { return new FromEvaluation(); } - public ToEvaluation to(final Class type) { + public ToEvaluation to(Class type) { firstType = type; message = String.format("assignableTo(%s) matches ", type.getSimpleName()); assignable = ImmutableSet.of(new DescribedPredicate("direct assignable to") { diff --git a/archunit/src/test/java/com/tngtech/archunit/core/domain/JavaClassesTest.java b/archunit/src/test/java/com/tngtech/archunit/core/domain/JavaClassesTest.java index c89fbebdd2..83c362c6b3 100644 --- a/archunit/src/test/java/com/tngtech/archunit/core/domain/JavaClassesTest.java +++ b/archunit/src/test/java/com/tngtech/archunit/core/domain/JavaClassesTest.java @@ -112,7 +112,7 @@ public void trying_to_get_a_missing_class_causes_IllegalArgumentException() { .hasMessage("JavaClasses do not contain JavaClass of type %s", String.class.getName()); } - private DescribedPredicate haveTheNameOf(final Class clazz) { + private DescribedPredicate haveTheNameOf(Class clazz) { return new DescribedPredicate("have the name " + clazz.getSimpleName()) { @Override public boolean test(JavaClass input) { diff --git a/archunit/src/test/java/com/tngtech/archunit/core/domain/JavaCodeUnitTest.java b/archunit/src/test/java/com/tngtech/archunit/core/domain/JavaCodeUnitTest.java index 475eda0f1e..e2b61efd45 100644 --- a/archunit/src/test/java/com/tngtech/archunit/core/domain/JavaCodeUnitTest.java +++ b/archunit/src/test/java/com/tngtech/archunit/core/domain/JavaCodeUnitTest.java @@ -116,7 +116,7 @@ public void creates_parameters_when_raw_parameter_types_do_not_match_generic_par @Test public void falls_back_to_creating_parameters_with_only_generic_types_if_match_between_raw_types_and_generic_types_cannot_be_made() { - final List nonConstant = newArrayList(getClass().getName()); + List nonConstant = newArrayList(getClass().getName()); class LocalClassReferencingNonConstantFromOuterScope { @SuppressWarnings("unused") LocalClassReferencingNonConstantFromOuterScope(List someParameterizedType) { @@ -262,7 +262,7 @@ void method(@SomeParameterAnnotation("test") String param) { } } - final JavaParameter parameter = new ClassFileImporter().importClass(SomeClass.class) + JavaParameter parameter = new ClassFileImporter().importClass(SomeClass.class) .getMethod("method", String.class).getParameters().get(0); SomeParameterAnnotation annotation = parameter.getAnnotationOfType(SomeParameterAnnotation.class); @@ -284,7 +284,7 @@ void method(@SomeParameterAnnotation("test") String param) { } } - final JavaParameter parameter = new ClassFileImporter().importClass(SomeClass.class) + JavaParameter parameter = new ClassFileImporter().importClass(SomeClass.class) .getMethod("method", String.class).getParameters().get(0); assertThat(parameter.tryGetAnnotationOfType(SomeParameterAnnotation.class).get()).isInstanceOf(SomeParameterAnnotation.class); diff --git a/archunit/src/test/java/com/tngtech/archunit/core/domain/JavaPackageTest.java b/archunit/src/test/java/com/tngtech/archunit/core/domain/JavaPackageTest.java index 1a2f8bb808..44fd57f8b7 100644 --- a/archunit/src/test/java/com/tngtech/archunit/core/domain/JavaPackageTest.java +++ b/archunit/src/test/java/com/tngtech/archunit/core/domain/JavaPackageTest.java @@ -239,7 +239,7 @@ public void iterates_all_sub_packages() { public void visits_classes() { JavaPackage defaultPackage = importDefaultPackage(Object.class, String.class, File.class, Serializable.class, Security.class); - final List visitedClasses = new ArrayList<>(); + List visitedClasses = new ArrayList<>(); defaultPackage.traversePackageTree(startsWith("S"), visitedClasses::add); assertThatTypes(visitedClasses).contain(String.class, Serializable.class, Security.class); @@ -252,7 +252,7 @@ public void visits_classes() { public void visits_packages() { JavaPackage defaultPackage = importDefaultPackage(Object.class, Annotation.class, File.class, Security.class); - final List visitedPackages = new ArrayList<>(); + List visitedPackages = new ArrayList<>(); defaultPackage.traversePackageTree(nameContains(".lang"), visitedPackages::add); assertThatPackages(visitedPackages).containPackagesOf(Object.class, Annotation.class); @@ -420,7 +420,7 @@ public void has_package_dependencies_to_this_package_tree() { @Test public void test_getPackageInfo() { JavaPackage annotatedPackage = importPackage("packageexamples.annotated"); - final JavaPackage nonAnnotatedPackage = importPackage("packageexamples"); + JavaPackage nonAnnotatedPackage = importPackage("packageexamples"); assertThat(annotatedPackage.getPackageInfo()).isNotNull(); @@ -452,8 +452,8 @@ public void test_getAnnotations() { @Test public void test_getAnnotationOfType_type() { - final JavaPackage annotatedPackage = importPackage("packageexamples.annotated"); - final JavaPackage nonAnnotatedPackage = importPackage("packageexamples"); + JavaPackage annotatedPackage = importPackage("packageexamples.annotated"); + JavaPackage nonAnnotatedPackage = importPackage("packageexamples"); assertThat(annotatedPackage.getAnnotationOfType(PackageLevelAnnotation.class)).isInstanceOf(PackageLevelAnnotation.class); @@ -466,8 +466,8 @@ public void test_getAnnotationOfType_type() { @Test public void test_getAnnotationOfType_typeName() { - final JavaPackage annotatedPackage = importPackage("packageexamples.annotated"); - final JavaPackage nonAnnotatedPackage = importPackage("packageexamples"); + JavaPackage annotatedPackage = importPackage("packageexamples.annotated"); + JavaPackage nonAnnotatedPackage = importPackage("packageexamples"); assertThatType(annotatedPackage.getAnnotationOfType(PackageLevelAnnotation.class.getName()) .getRawType()).matches(PackageLevelAnnotation.class); @@ -577,7 +577,7 @@ private Predicate nameContains(String infix) { return HasName.Predicates.nameMatching(".*" + quote(infix) + ".*"); } - private DescribedPredicate startsWith(final String prefix) { + private DescribedPredicate startsWith(String prefix) { return GET_SIMPLE_NAME.is(new DescribedPredicate("starts with '%s'", prefix) { @Override public boolean test(String input) { diff --git a/archunit/src/test/java/com/tngtech/archunit/core/domain/TestUtils.java b/archunit/src/test/java/com/tngtech/archunit/core/domain/TestUtils.java index 8c1467b44b..884d1a5cbc 100644 --- a/archunit/src/test/java/com/tngtech/archunit/core/domain/TestUtils.java +++ b/archunit/src/test/java/com/tngtech/archunit/core/domain/TestUtils.java @@ -85,7 +85,7 @@ public static JavaClass importClassWithContext(Class owner) { public static JavaClasses importClassesWithContext(Class... classes) { JavaClasses importedHierarchy = importHierarchies(classes); - final List classNames = formatNamesOf(classes); + List classNames = formatNamesOf(classes); return importedHierarchy.that(new DescribedPredicate("") { @Override public boolean test(JavaClass input) { diff --git a/archunit/src/test/java/com/tngtech/archunit/core/domain/properties/HasModifiersTest.java b/archunit/src/test/java/com/tngtech/archunit/core/domain/properties/HasModifiersTest.java index 99fef778bd..76cc81a587 100644 --- a/archunit/src/test/java/com/tngtech/archunit/core/domain/properties/HasModifiersTest.java +++ b/archunit/src/test/java/com/tngtech/archunit/core/domain/properties/HasModifiersTest.java @@ -16,7 +16,7 @@ public void modifier_predicate() { .hasDescription("modifier PRIVATE"); } - private static HasModifiers hasModifiers(final JavaModifier... modifiers) { + private static HasModifiers hasModifiers(JavaModifier... modifiers) { return () -> ImmutableSet.copyOf(modifiers); } } diff --git a/archunit/src/test/java/com/tngtech/archunit/core/domain/properties/HasNameTest.java b/archunit/src/test/java/com/tngtech/archunit/core/domain/properties/HasNameTest.java index 226fad2ffb..b1ad5ad1d2 100644 --- a/archunit/src/test/java/com/tngtech/archunit/core/domain/properties/HasNameTest.java +++ b/archunit/src/test/java/com/tngtech/archunit/core/domain/properties/HasNameTest.java @@ -74,11 +74,11 @@ private AbstractBooleanAssert assertNameMatches(String input, String regex) { .as(input + " =~ " + regex); } - private HasName newHasName(final String name) { + private HasName newHasName(String name) { return newHasNameAndFullName(name, "full " + name); } - private HasName.AndFullName newHasNameAndFullName(final String name, final String fullName) { + private HasName.AndFullName newHasNameAndFullName(String name, String fullName) { return new HasName.AndFullName() { @Override public String getName() { diff --git a/archunit/src/test/java/com/tngtech/archunit/core/domain/properties/HasOwnerTest.java b/archunit/src/test/java/com/tngtech/archunit/core/domain/properties/HasOwnerTest.java index 4afd80cf39..099ac7144e 100644 --- a/archunit/src/test/java/com/tngtech/archunit/core/domain/properties/HasOwnerTest.java +++ b/archunit/src/test/java/com/tngtech/archunit/core/domain/properties/HasOwnerTest.java @@ -25,7 +25,7 @@ public void function_get_owner() { assertThat(Get.owner().apply(hasOwner)).isEqualTo("owner"); } - private DescribedPredicate startsWith(final String prefix) { + private DescribedPredicate startsWith(String prefix) { return new DescribedPredicate("starts with " + prefix) { @Override public boolean test(String input) { @@ -34,7 +34,7 @@ public boolean test(String input) { }; } - private HasOwner hasOwner(final T owner) { + private HasOwner hasOwner(T owner) { return () -> owner; } } diff --git a/archunit/src/test/java/com/tngtech/archunit/core/domain/properties/HasParameterTypesTest.java b/archunit/src/test/java/com/tngtech/archunit/core/domain/properties/HasParameterTypesTest.java index 8df005f73c..44752cd321 100644 --- a/archunit/src/test/java/com/tngtech/archunit/core/domain/properties/HasParameterTypesTest.java +++ b/archunit/src/test/java/com/tngtech/archunit/core/domain/properties/HasParameterTypesTest.java @@ -50,7 +50,7 @@ public void predicate_on_parameters_by_Predicate() { .hasDescription("raw parameter types some text"); } - private HasParameterTypes newHasParameterTypes(final Class... parameters) { + private HasParameterTypes newHasParameterTypes(Class... parameters) { return new HasParameterTypes() { @Override diff --git a/archunit/src/test/java/com/tngtech/archunit/core/domain/properties/HasReturnTypeTest.java b/archunit/src/test/java/com/tngtech/archunit/core/domain/properties/HasReturnTypeTest.java index b9f80c1368..515ed3f288 100644 --- a/archunit/src/test/java/com/tngtech/archunit/core/domain/properties/HasReturnTypeTest.java +++ b/archunit/src/test/java/com/tngtech/archunit/core/domain/properties/HasReturnTypeTest.java @@ -70,11 +70,11 @@ abstract class TestClass implements Iterable { .as("result of GET_RAW_RETURN_TYPE").isEqualTo(expectedType); } - private HasReturnType newHasReturnType(final JavaClass rawReturnType) { + private HasReturnType newHasReturnType(JavaClass rawReturnType) { return newHasReturnType(rawReturnType, rawReturnType); } - private HasReturnType newHasReturnType(final JavaType genericReturnType, final JavaClass rawReturnType) { + private HasReturnType newHasReturnType(JavaType genericReturnType, JavaClass rawReturnType) { return new HasReturnType() { @Override diff --git a/archunit/src/test/java/com/tngtech/archunit/core/domain/properties/HasThrowsClauseTest.java b/archunit/src/test/java/com/tngtech/archunit/core/domain/properties/HasThrowsClauseTest.java index 24504f6c40..58b758a1c9 100644 --- a/archunit/src/test/java/com/tngtech/archunit/core/domain/properties/HasThrowsClauseTest.java +++ b/archunit/src/test/java/com/tngtech/archunit/core/domain/properties/HasThrowsClauseTest.java @@ -74,7 +74,7 @@ public void predicate_on_parameters_by_Predicate() { } @SafeVarargs - private final HasThrowsClause newHasThrowsClause(final Class... throwsDeclarations) { + private final HasThrowsClause newHasThrowsClause(Class... throwsDeclarations) { return new HasThrowsClause() { @Override public ThrowsClause getThrowsClause() { diff --git a/archunit/src/test/java/com/tngtech/archunit/core/domain/properties/HasTypeTest.java b/archunit/src/test/java/com/tngtech/archunit/core/domain/properties/HasTypeTest.java index 76501337b1..1375e6d3f5 100644 --- a/archunit/src/test/java/com/tngtech/archunit/core/domain/properties/HasTypeTest.java +++ b/archunit/src/test/java/com/tngtech/archunit/core/domain/properties/HasTypeTest.java @@ -50,7 +50,7 @@ public void function_getType() { assertThatType(GET_RAW_TYPE.apply(newHasType(String.class))).matches(String.class); } - private HasType newHasType(final Class owner) { + private HasType newHasType(Class owner) { return new HasType() { @Override diff --git a/archunit/src/test/java/com/tngtech/archunit/core/importer/ClassFileImporterAccessesTest.java b/archunit/src/test/java/com/tngtech/archunit/core/importer/ClassFileImporterAccessesTest.java index 8ef6c56620..370f101243 100644 --- a/archunit/src/test/java/com/tngtech/archunit/core/importer/ClassFileImporterAccessesTest.java +++ b/archunit/src/test/java/com/tngtech/archunit/core/importer/ClassFileImporterAccessesTest.java @@ -830,7 +830,7 @@ public void imports_try_catch_blocks_from_same_starting_label() { // we test that the second recorded block is not cleared out by accident when the first block is closed @SuppressWarnings({"unused", "ConstantConditions", "TryFinallyCanBeTryWithResources", "UnnecessaryReturnStatement"}) class SomeClass { - private void method(final int first, final boolean second) { + private void method(int first, boolean second) { try { Socket client = new Socket("", 0); BufferedReader reader = new BufferedReader(null); @@ -1291,7 +1291,7 @@ private > T getOnlyByCaller(Set calls, JavaC return getOnlyElement(getByCaller(calls, caller)); } - private > Set getByTarget(Set calls, final JavaConstructor target) { + private > Set getByTarget(Set calls, JavaConstructor target) { return getBy(calls, (Predicate>) input -> targetFrom(target).getFullName().equals(input.getTarget().getFullName())); } @@ -1299,19 +1299,19 @@ private > Set getByTargetOwner(Set calls, Class return getByTargetOwner(calls, targetOwner.getName()); } - private > Set getByTargetOwner(Set calls, final String targetOwnerName) { + private > Set getByTargetOwner(Set calls, String targetOwnerName) { return getBy(calls, targetOwnerNameEquals(targetOwnerName)); } - private Predicate> targetOwnerNameEquals(final String targetFqn) { + private Predicate> targetOwnerNameEquals(String targetFqn) { return input -> targetFqn.equals(input.getTarget().getOwner().getName()); } - private > Set getByTargetOwner(Set calls, final JavaClass targetOwner) { + private > Set getByTargetOwner(Set calls, JavaClass targetOwner) { return getBy(calls, input -> targetOwner.equals(input.getTarget().getOwner())); } - private > Set getByCaller(Set calls, final JavaCodeUnit caller) { + private > Set getByCaller(Set calls, JavaCodeUnit caller) { return getBy(calls, input -> caller.equals(input.getOwner())); } diff --git a/archunit/src/test/java/com/tngtech/archunit/core/importer/ClassFileImporterTest.java b/archunit/src/test/java/com/tngtech/archunit/core/importer/ClassFileImporterTest.java index 634a6dd223..9484183d88 100644 --- a/archunit/src/test/java/com/tngtech/archunit/core/importer/ClassFileImporterTest.java +++ b/archunit/src/test/java/com/tngtech/archunit/core/importer/ClassFileImporterTest.java @@ -921,7 +921,7 @@ private void copyClassFile(Class clazz, File targetFolder) throws IOException Files.copy(Paths.get(uriOf(clazz)), new File(targetFolder, clazz.getSimpleName() + ".class").toPath()); } - private Condition targetWithFullName(final String name) { + private Condition targetWithFullName(String name) { return new Condition(String.format("target with name '%s'", name)) { @Override public boolean matches(CodeUnitAccessTarget value) { @@ -930,7 +930,7 @@ public boolean matches(CodeUnitAccessTarget value) { }; } - private static ImportOption importOnly(final Class... classes) { + private static ImportOption importOnly(Class... classes) { return location -> stream(classes).anyMatch(c -> location.contains(urlOf(c).getFile())); } } diff --git a/archunit/src/test/java/com/tngtech/archunit/core/importer/ClassFileSourceTest.java b/archunit/src/test/java/com/tngtech/archunit/core/importer/ClassFileSourceTest.java index 577767e67c..7d4cd85159 100644 --- a/archunit/src/test/java/com/tngtech/archunit/core/importer/ClassFileSourceTest.java +++ b/archunit/src/test/java/com/tngtech/archunit/core/importer/ClassFileSourceTest.java @@ -59,7 +59,7 @@ public static Object[][] expected_classes() { @Test @UseDataProvider("expected_classes") - public void classes_in_JAR_are_filtered(Set givenEntries, ImportOptions importOptions, final Set expectedIncluded) { + public void classes_in_JAR_are_filtered(Set givenEntries, ImportOptions importOptions, Set expectedIncluded) { TestJarFile testJarFile = new TestJarFile(); for (String entry : givenEntries) { testJarFile.withEntry(entry); @@ -74,7 +74,7 @@ public void classes_in_JAR_are_filtered(Set givenEntries, ImportOptions @Test @UseDataProvider("expected_classes") public void classes_from_file_path_are_filtered( - Set givenFiles, ImportOptions importOptions, final Set expectedIncluded) throws IOException { + Set givenFiles, ImportOptions importOptions, Set expectedIncluded) throws IOException { File dir = tempDir.newFolder(); for (String file : givenFiles) { @@ -172,7 +172,7 @@ private void assertSourceMatches(ClassFileSource source, Set expectedInc .hasSameElementsAs(expectedIncluded); } - private static ImportOptions locationContains(final String part) { + private static ImportOptions locationContains(String part) { return new ImportOptions().with(location -> location.contains(part)); } diff --git a/archunit/src/test/java/com/tngtech/archunit/core/importer/DependencyResolutionProcessTestUtils.java b/archunit/src/test/java/com/tngtech/archunit/core/importer/DependencyResolutionProcessTestUtils.java index 553ab47147..4927633b3a 100644 --- a/archunit/src/test/java/com/tngtech/archunit/core/importer/DependencyResolutionProcessTestUtils.java +++ b/archunit/src/test/java/com/tngtech/archunit/core/importer/DependencyResolutionProcessTestUtils.java @@ -23,13 +23,13 @@ public class DependencyResolutionProcessTestUtils { - static JavaClasses importClassesWithOnlyGenericTypeResolution(final Class... classes) { + static JavaClasses importClassesWithOnlyGenericTypeResolution(Class... classes) { return ImporterWithAdjustedResolutionRuns.disableAllIterationsExcept( MAX_ITERATIONS_FOR_GENERIC_SIGNATURE_TYPES_PROPERTY_NAME, MAX_ITERATIONS_FOR_GENERIC_SIGNATURE_TYPES_DEFAULT_VALUE ).importClasses(classes); } - static JavaClass importClassWithOnlyGenericTypeResolution(final Class clazz) { + static JavaClass importClassWithOnlyGenericTypeResolution(Class clazz) { return importClassesWithOnlyGenericTypeResolution(clazz).get(clazz); } @@ -50,11 +50,11 @@ static ImporterWithAdjustedResolutionRuns disableAllIterationsExcept(String prop return new ImporterWithAdjustedResolutionRuns(singleton(propertyName), Optional.of(number)); } - JavaClass importClass(final Class clazz) { + JavaClass importClass(Class clazz) { return importClasses(clazz).get(clazz); } - public JavaClasses importClasses(final Class... classes) { + public JavaClasses importClasses(Class... classes) { return resetConfigurationAround(() -> { ImporterWithAdjustedResolutionRuns.this.setAllIterationsToZeroExcept(propertyNames); return new ClassFileImporter().importClasses(classes); diff --git a/archunit/src/test/java/com/tngtech/archunit/core/importer/ImportTestUtils.java b/archunit/src/test/java/com/tngtech/archunit/core/importer/ImportTestUtils.java index acdce1a2ff..d57b79ebbb 100644 --- a/archunit/src/test/java/com/tngtech/archunit/core/importer/ImportTestUtils.java +++ b/archunit/src/test/java/com/tngtech/archunit/core/importer/ImportTestUtils.java @@ -266,7 +266,7 @@ private static JavaClass simulateImport(Class owner, ImportedTestClasses impo return javaClass; } - private static ImportContext simulateImportContext(final Class inputClass, final ImportedTestClasses importedClasses) { + private static ImportContext simulateImportContext(Class inputClass, ImportedTestClasses importedClasses) { return new ImportContextStub() { @Override public Set createFields(JavaClass owner) { diff --git a/archunit/src/test/java/com/tngtech/archunit/core/importer/LocationTest.java b/archunit/src/test/java/com/tngtech/archunit/core/importer/LocationTest.java index 31afd53c35..d8b4608272 100644 --- a/archunit/src/test/java/com/tngtech/archunit/core/importer/LocationTest.java +++ b/archunit/src/test/java/com/tngtech/archunit/core/importer/LocationTest.java @@ -160,7 +160,7 @@ private NormalizedResourceName oneLevelBelow(Class cla return NormalizedResourceName.from(parentFolder.relativize(absolutePath).toString()); } - private Condition elementWithSubstring(final String substring) { + private Condition elementWithSubstring(String substring) { return new Condition(String.format("element with substring '%s'", substring)) { @Override public boolean matches(Object value) { diff --git a/archunit/src/test/java/com/tngtech/archunit/core/importer/UrlSourceTest.java b/archunit/src/test/java/com/tngtech/archunit/core/importer/UrlSourceTest.java index 17284e39ac..141b289a03 100644 --- a/archunit/src/test/java/com/tngtech/archunit/core/importer/UrlSourceTest.java +++ b/archunit/src/test/java/com/tngtech/archunit/core/importer/UrlSourceTest.java @@ -167,7 +167,7 @@ private String subpath(String... parts) { return Joiner.on(File.separator).join(parts); } - private WrittenJarFile writeJarWithManifestClasspathAttribute(final File folder, String identifier, ManifestClasspathEntry... additionalClasspathManifestClasspathEntries) { + private WrittenJarFile writeJarWithManifestClasspathAttribute(File folder, String identifier, ManifestClasspathEntry... additionalClasspathManifestClasspathEntries) { Set classpathManifestEntries = union(createManifestClasspathEntries(identifier), ImmutableSet.copyOf(additionalClasspathManifestClasspathEntries)); String jarFileName = new TestJarFile() .withManifestAttribute(CLASS_PATH, Joiner.on(" ").join(classpathManifestEntries.stream().map(resolveTo(folder)).collect(toSet()))) @@ -175,7 +175,7 @@ private WrittenJarFile writeJarWithManifestClasspathAttribute(final File folder, return new WrittenJarFile(Paths.get(jarFileName), classpathManifestEntries); } - private Function resolveTo(final File folder) { + private Function resolveTo(File folder) { return manifestClasspathEntry -> manifestClasspathEntry.create(folder); } diff --git a/archunit/src/test/java/com/tngtech/archunit/core/importer/resolvers/ClassResolverFromClassPathTest.java b/archunit/src/test/java/com/tngtech/archunit/core/importer/resolvers/ClassResolverFromClassPathTest.java index c59a7995aa..c56f414ac4 100644 --- a/archunit/src/test/java/com/tngtech/archunit/core/importer/resolvers/ClassResolverFromClassPathTest.java +++ b/archunit/src/test/java/com/tngtech/archunit/core/importer/resolvers/ClassResolverFromClassPathTest.java @@ -73,12 +73,12 @@ public static Object[][] urls_with_spaces() throws MalformedURLException, URISyn @Test @UseDataProvider("urls_with_spaces") - public void is_resilient_against_wrongly_encoded_ClassLoader_resource_URLs(final URL urlReturnedByClassLoader, URI expectedUriDerivedFromUrl) { + public void is_resilient_against_wrongly_encoded_ClassLoader_resource_URLs(URL urlReturnedByClassLoader, URI expectedUriDerivedFromUrl) { // it seems like some OSGI ClassLoaders incorrectly return URLs with unencoded spaces. // This lead to `url.toURI()` throwing an exception -> https://github.com/TNG/ArchUnit/issues/683 verifyUrlCannotBeConvertedToUriInTheCurrentForm(urlReturnedByClassLoader); - final JavaClass expectedJavaClass = importClassWithContext(Object.class); + JavaClass expectedJavaClass = importClassWithContext(Object.class); when(uriImporter.tryImport(expectedUriDerivedFromUrl)).thenReturn(Optional.of(expectedJavaClass)); Optional resolvedClass = withMockedContextClassLoader(classLoaderMock -> { @@ -103,7 +103,7 @@ private T withMockedContextClassLoader(Function doWithClassL } } - private void verifyUrlCannotBeConvertedToUriInTheCurrentForm(final URL url) { + private void verifyUrlCannotBeConvertedToUriInTheCurrentForm(URL url) { assertThatThrownBy(url::toURI).isInstanceOf(URISyntaxException.class); } } diff --git a/archunit/src/test/java/com/tngtech/archunit/core/importer/resolvers/SelectedClassResolverFromClasspathTest.java b/archunit/src/test/java/com/tngtech/archunit/core/importer/resolvers/SelectedClassResolverFromClasspathTest.java index 32d7b61ca0..115bae2653 100644 --- a/archunit/src/test/java/com/tngtech/archunit/core/importer/resolvers/SelectedClassResolverFromClasspathTest.java +++ b/archunit/src/test/java/com/tngtech/archunit/core/importer/resolvers/SelectedClassResolverFromClasspathTest.java @@ -58,7 +58,7 @@ private void assertResolved(Optional resolved, Class expected) { .isTrue(); } - private URI uriFor(final Class clazz) { + private URI uriFor(Class clazz) { return argThat(argument -> argument.toString().contains(clazz.getSimpleName())); } diff --git a/archunit/src/test/java/com/tngtech/archunit/core/importer/testexamples/innerclassimport/ClassWithInnerClass.java b/archunit/src/test/java/com/tngtech/archunit/core/importer/testexamples/innerclassimport/ClassWithInnerClass.java index 15cea835cf..58656366b0 100644 --- a/archunit/src/test/java/com/tngtech/archunit/core/importer/testexamples/innerclassimport/ClassWithInnerClass.java +++ b/archunit/src/test/java/com/tngtech/archunit/core/importer/testexamples/innerclassimport/ClassWithInnerClass.java @@ -3,7 +3,7 @@ @SuppressWarnings("unused") public class ClassWithInnerClass { void callInsideOfAnonymous() { - final CalledClass calledClass = null; + CalledClass calledClass = null; new CanBeCalled() { @Override @@ -14,7 +14,7 @@ public void call() { } void callInsideOfLocalClass() { - final CalledClass calledClass = null; + CalledClass calledClass = null; class LocalCaller { void call() { diff --git a/archunit/src/test/java/com/tngtech/archunit/lang/ArchConditionTest.java b/archunit/src/test/java/com/tngtech/archunit/lang/ArchConditionTest.java index d36611f9de..66c53afda2 100644 --- a/archunit/src/test/java/com/tngtech/archunit/lang/ArchConditionTest.java +++ b/archunit/src/test/java/com/tngtech/archunit/lang/ArchConditionTest.java @@ -76,7 +76,7 @@ public void and_handles_each_violating_object_separately() { ConditionEvents events = ConditionEvents.Factory.create(); condition.check(2, events); - final List handledViolations = new ArrayList<>(); + List handledViolations = new ArrayList<>(); evaluationResultOf(events).handleViolations((Collection violatingObjects, String message) -> handledViolations.add(new HandledViolation(violatingObjects, message))); @@ -120,7 +120,7 @@ public void or_handles_all_violated_conditions_as_unit() { ConditionEvents events = ConditionEvents.Factory.create(); condition.check(1, events); - final List handledViolations = new ArrayList<>(); + List handledViolations = new ArrayList<>(); evaluationResultOf(events).handleViolations((Collection violatingObjects, String message) -> handledViolations.add(new HandledViolation(violatingObjects, message))); @@ -269,10 +269,10 @@ public void from_predicate_describing_events() { .haveOneViolationMessageContaining(String.format("Class <%s> true some description", Object.class.getName())); } - private ArchCondition greaterThan(final int... numbers) { + private ArchCondition greaterThan(int... numbers) { return new ArchCondition("greater than " + Arrays.toString(numbers)) { @Override - public void check(final Integer item, ConditionEvents events) { + public void check(Integer item, ConditionEvents events) { for (int number : numbers) { events.add(greaterThanEvent(item, number)); } @@ -284,10 +284,10 @@ private EvaluationResult evaluationResultOf(ConditionEvents events) { return new EvaluationResult(() -> "irrelevant", events, MEDIUM); } - private ArchCondition endsWith(final int number) { + private ArchCondition endsWith(int number) { return new ArchCondition("ends with " + number) { @Override - public void check(final Integer item, ConditionEvents events) { + public void check(Integer item, ConditionEvents events) { boolean matches = item.toString().endsWith(Integer.toString(number)); events.add(new SimpleConditionEvent(item, matches, item + (matches ? " ends with " : " does not end with ") + number)); @@ -364,7 +364,7 @@ public boolean equals(Object obj) { if (obj == null || getClass() != obj.getClass()) { return false; } - final HandledViolation other = (HandledViolation) obj; + HandledViolation other = (HandledViolation) obj; return Objects.equals(this.objects, other.objects) && Objects.equals(this.message, other.message); } diff --git a/archunit/src/test/java/com/tngtech/archunit/lang/ArchRuleTest.java b/archunit/src/test/java/com/tngtech/archunit/lang/ArchRuleTest.java index 8b96dddaac..077e28a6ac 100644 --- a/archunit/src/test/java/com/tngtech/archunit/lang/ArchRuleTest.java +++ b/archunit/src/test/java/com/tngtech/archunit/lang/ArchRuleTest.java @@ -200,7 +200,7 @@ private void removeFirstActualMessageContaining(String message, List act }; } - private ArchCondition conditionThatReportsErrors(final String... messages) { + private ArchCondition conditionThatReportsErrors(String... messages) { return new ArchCondition("not have errors " + Joiner.on(", ").join(messages)) { @Override public void check(JavaClass item, ConditionEvents events) { @@ -211,7 +211,7 @@ public void check(JavaClass item, ConditionEvents events) { }; } - private static ArchCondition addFixedNumberOfViolations(final int number) { + private static ArchCondition addFixedNumberOfViolations(int number) { return new ArchCondition("be violated exactly %d times", number) { @Override public void check(JavaClass item, ConditionEvents events) { diff --git a/archunit/src/test/java/com/tngtech/archunit/lang/CompositeArchRuleTest.java b/archunit/src/test/java/com/tngtech/archunit/lang/CompositeArchRuleTest.java index 132900671f..21a9c18cb5 100644 --- a/archunit/src/test/java/com/tngtech/archunit/lang/CompositeArchRuleTest.java +++ b/archunit/src/test/java/com/tngtech/archunit/lang/CompositeArchRuleTest.java @@ -130,7 +130,7 @@ private static ArchRule archRuleThatFails() { return createArchRuleWithSatisfied(false); } - private static ArchRule createArchRuleWithSatisfied(final boolean satisfied) { + private static ArchRule createArchRuleWithSatisfied(boolean satisfied) { return ArchRule.Factory.create(new AbstractClassesTransformer("irrelevant") { @Override public Iterable doTransform(JavaClasses collection) { diff --git a/archunit/src/test/java/com/tngtech/archunit/lang/EvaluationResultTest.java b/archunit/src/test/java/com/tngtech/archunit/lang/EvaluationResultTest.java index b695447e40..bbf428d649 100644 --- a/archunit/src/test/java/com/tngtech/archunit/lang/EvaluationResultTest.java +++ b/archunit/src/test/java/com/tngtech/archunit/lang/EvaluationResultTest.java @@ -75,7 +75,7 @@ public void allows_clients_to_handle_violations() { new SimpleConditionEvent(ImmutableList.of("yet another message"), false, "not expected"), new SimpleConditionEvent(ImmutableSet.of("second message"), false, "also expected")); - final Set actual = new HashSet<>(); + Set actual = new HashSet<>(); result.handleViolations((Collection> violatingObject, String message) -> actual.add(getOnlyElement(getOnlyElement(violatingObject)) + ": " + message)); @@ -119,7 +119,7 @@ public void handleViolations_reports_only_violations_referring_to_the_correct_ty SimpleConditionEvent.violated(new CorrectType("handle type"), "I'm violated and correct type"), SimpleConditionEvent.violated(new CorrectSubtype("handle sub type"), "I'm violated and correct sub type")); - final Set handledFailures = new HashSet<>(); + Set handledFailures = new HashSet<>(); result.handleViolations((Collection violatingObjects, String message) -> handledFailures.add(Joiner.on(", ").join(violatingObjects) + ": " + message)); @@ -204,7 +204,7 @@ private ConditionEvents events(ConditionEvent... events) { return result; } - private HasDescription hasDescription(final String description) { + private HasDescription hasDescription(String description) { return () -> description; } diff --git a/archunit/src/test/java/com/tngtech/archunit/lang/FailureDisplayFormatFactoryTest.java b/archunit/src/test/java/com/tngtech/archunit/lang/FailureDisplayFormatFactoryTest.java index bc610c4293..393ab54b3f 100644 --- a/archunit/src/test/java/com/tngtech/archunit/lang/FailureDisplayFormatFactoryTest.java +++ b/archunit/src/test/java/com/tngtech/archunit/lang/FailureDisplayFormatFactoryTest.java @@ -40,7 +40,7 @@ public String formatFailure(HasDescription rule, FailureMessages failureMessages } @SuppressWarnings("SameParameterValue") - private HasDescription hasDescription(final String description) { + private HasDescription hasDescription(String description) { return () -> description; } } diff --git a/archunit/src/test/java/com/tngtech/archunit/lang/SimpleConditionEventTest.java b/archunit/src/test/java/com/tngtech/archunit/lang/SimpleConditionEventTest.java index 158c8902a3..e913263dbe 100644 --- a/archunit/src/test/java/com/tngtech/archunit/lang/SimpleConditionEventTest.java +++ b/archunit/src/test/java/com/tngtech/archunit/lang/SimpleConditionEventTest.java @@ -11,7 +11,7 @@ public class SimpleConditionEventTest { @Test public void passes_corresponding_object_as_single_element_collection_with_message() { - final List messages = new ArrayList<>(); + List messages = new ArrayList<>(); ConditionEvent.Handler handler = (correspondingObjects, message) -> messages.add(getOnlyElement(correspondingObjects) + ": " + message); diff --git a/archunit/src/test/java/com/tngtech/archunit/lang/conditions/ClassAccessesFieldConditionTest.java b/archunit/src/test/java/com/tngtech/archunit/lang/conditions/ClassAccessesFieldConditionTest.java index 720a1c44bf..de51454913 100644 --- a/archunit/src/test/java/com/tngtech/archunit/lang/conditions/ClassAccessesFieldConditionTest.java +++ b/archunit/src/test/java/com/tngtech/archunit/lang/conditions/ClassAccessesFieldConditionTest.java @@ -110,7 +110,7 @@ Set violationMessageParts() { return parts; } - SELF accessInfo(final AccessInfo accessInfo) { + SELF accessInfo(AccessInfo accessInfo) { this.accessInfo = accessInfo; return self(); } diff --git a/archunit/src/test/java/com/tngtech/archunit/lang/extension/ArchUnitExtensionLoaderTest.java b/archunit/src/test/java/com/tngtech/archunit/lang/extension/ArchUnitExtensionLoaderTest.java index b4a8690fb6..fa9a7fa488 100644 --- a/archunit/src/test/java/com/tngtech/archunit/lang/extension/ArchUnitExtensionLoaderTest.java +++ b/archunit/src/test/java/com/tngtech/archunit/lang/extension/ArchUnitExtensionLoaderTest.java @@ -114,8 +114,8 @@ private String expectedExtensionLoadedMessage(String identifier) { return "Loaded " + ArchUnitExtension.class.getSimpleName() + " with id '" + identifier + "'"; } - private Condition containingWord(final String word) { - final Pattern wordPattern = Pattern.compile(" " + quote(word) + "[: ]"); + private Condition containingWord(String word) { + Pattern wordPattern = Pattern.compile(" " + quote(word) + "[: ]"); return new Condition(String.format("containing word '%s'", word)) { @Override public boolean matches(Throwable value) { diff --git a/archunit/src/test/java/com/tngtech/archunit/lang/syntax/elements/ClassesShouldTest.java b/archunit/src/test/java/com/tngtech/archunit/lang/syntax/elements/ClassesShouldTest.java index 7185bb000b..db74bdfae1 100644 --- a/archunit/src/test/java/com/tngtech/archunit/lang/syntax/elements/ClassesShouldTest.java +++ b/archunit/src/test/java/com/tngtech/archunit/lang/syntax/elements/ClassesShouldTest.java @@ -1802,7 +1802,7 @@ static String singleLineFailureReportOf(EvaluationResult result) { } @SuppressWarnings("SameParameterValue") - private static DescribedPredicate> annotation(final Class type) { + private static DescribedPredicate> annotation(Class type) { return new DescribedPredicate>("@" + type.getSimpleName()) { @Override public boolean test(JavaAnnotation input) { diff --git a/archunit/src/test/java/com/tngtech/archunit/lang/syntax/elements/CodeUnitsShouldTest.java b/archunit/src/test/java/com/tngtech/archunit/lang/syntax/elements/CodeUnitsShouldTest.java index b8f2e96b87..e5cd6a3fdb 100644 --- a/archunit/src/test/java/com/tngtech/archunit/lang/syntax/elements/CodeUnitsShouldTest.java +++ b/archunit/src/test/java/com/tngtech/archunit/lang/syntax/elements/CodeUnitsShouldTest.java @@ -624,7 +624,7 @@ public void restricted_constructors_calls_by_code_units_predicate(ArchRule rule) quote(CONSTRUCTOR_ONE_ARG))); } - private static DescribedPredicate doNotHaveParametersOfType(final Class type) { + private static DescribedPredicate doNotHaveParametersOfType(Class type) { return new DescribedPredicate("do not have parameters of type " + type.getSimpleName()) { @Override public boolean test(JavaCodeUnit codeUnit) { diff --git a/archunit/src/test/java/com/tngtech/archunit/lang/syntax/elements/GivenClassesThatTest.java b/archunit/src/test/java/com/tngtech/archunit/lang/syntax/elements/GivenClassesThatTest.java index 46f7479116..15b3f48ff8 100644 --- a/archunit/src/test/java/com/tngtech/archunit/lang/syntax/elements/GivenClassesThatTest.java +++ b/archunit/src/test/java/com/tngtech/archunit/lang/syntax/elements/GivenClassesThatTest.java @@ -932,7 +932,7 @@ static class Evaluator { } public List on(Class... toCheck) { - final List result = new ArrayList<>(); + List result = new ArrayList<>(); JavaClasses classes = importClassesWithContext(toCheck); ArchCondition condition = new ArchCondition("ignored") { @Override diff --git a/archunit/src/test/java/com/tngtech/archunit/lang/syntax/elements/GivenCodeUnitsTest.java b/archunit/src/test/java/com/tngtech/archunit/lang/syntax/elements/GivenCodeUnitsTest.java index ab64cd5005..9475d8a12f 100644 --- a/archunit/src/test/java/com/tngtech/archunit/lang/syntax/elements/GivenCodeUnitsTest.java +++ b/archunit/src/test/java/com/tngtech/archunit/lang/syntax/elements/GivenCodeUnitsTest.java @@ -278,7 +278,7 @@ public void throwable_type_predicates(DescribedRuleStart ruleStart, Collection> oneParameterOfType(final Class type) { + static DescribedPredicate> oneParameterOfType(Class type) { return new DescribedPredicate>("one parameter of type " + type.getName()) { @Override public boolean test(List input) { diff --git a/archunit/src/test/java/com/tngtech/archunit/lang/syntax/elements/GivenMembersTest.java b/archunit/src/test/java/com/tngtech/archunit/lang/syntax/elements/GivenMembersTest.java index 18c8ea64f0..0740081fc5 100644 --- a/archunit/src/test/java/com/tngtech/archunit/lang/syntax/elements/GivenMembersTest.java +++ b/archunit/src/test/java/com/tngtech/archunit/lang/syntax/elements/GivenMembersTest.java @@ -448,7 +448,7 @@ public void check(JavaMember item, ConditionEvents events) { }; } - static DescribedPredicate areNoFieldsWithType(final Class type) { + static DescribedPredicate areNoFieldsWithType(Class type) { return new DescribedPredicate("are no fields with type " + type.getSimpleName()) { @Override public boolean test(JavaMember member) { @@ -457,7 +457,7 @@ public boolean test(JavaMember member) { }; } - static ArchCondition beAnnotatedWith(final Class annotationType) { + static ArchCondition beAnnotatedWith(Class annotationType) { return new ArchCondition("be annotated with @%s", annotationType.getSimpleName()) { @Override public void check(JavaMember member, ConditionEvents events) { diff --git a/archunit/src/test/java/com/tngtech/archunit/library/dependencies/GivenSlicesTest.java b/archunit/src/test/java/com/tngtech/archunit/library/dependencies/GivenSlicesTest.java index 5c8c97d282..1bbb96d1e3 100644 --- a/archunit/src/test/java/com/tngtech/archunit/library/dependencies/GivenSlicesTest.java +++ b/archunit/src/test/java/com/tngtech/archunit/library/dependencies/GivenSlicesTest.java @@ -75,7 +75,7 @@ private GivenSlices testSlices() { return slices().matching(TEST_CLASSES_PACKAGE + ".(*).."); } - private DescribedPredicate descriptionMatching(final String regex) { + private DescribedPredicate descriptionMatching(String regex) { return new DescribedPredicate("description matching '%s'", regex) { @Override public boolean test(Slice input) { @@ -85,7 +85,7 @@ public boolean test(Slice input) { } private Set getSlicesMatchedByFilter(GivenConjunction givenSlices) { - final Set matched = new HashSet<>(); + Set matched = new HashSet<>(); givenSlices.should(new ArchCondition("") { @Override public void check(Slice item, ConditionEvents events) { diff --git a/archunit/src/test/java/com/tngtech/archunit/library/dependencies/SliceRuleTest.java b/archunit/src/test/java/com/tngtech/archunit/library/dependencies/SliceRuleTest.java index 45113833f0..1ace87cfae 100644 --- a/archunit/src/test/java/com/tngtech/archunit/library/dependencies/SliceRuleTest.java +++ b/archunit/src/test/java/com/tngtech/archunit/library/dependencies/SliceRuleTest.java @@ -39,8 +39,8 @@ public class SliceRuleTest { @DataProvider public static Object[][] cycle_limits() { - final int totalNumberOfCycles = getNumberOfCyclesInCompleteGraph(7); - final int halfOfTotal = totalNumberOfCycles / 2; + int totalNumberOfCycles = getNumberOfCyclesInCompleteGraph(7); + int halfOfTotal = totalNumberOfCycles / 2; return $$( $(new Runnable() { @Override @@ -178,13 +178,13 @@ private static SliceRule ruleWithEmptyShould() { return slices().matching("nothing_because_there_is_no_capture_group").should().beFreeOfCycles(); } - private List filterLinesMatching(String text, final String regex) { + private List filterLinesMatching(String text, String regex) { return Splitter.on(lineSeparator()).splitToList(text).stream() .filter(input -> input.matches(".*(" + regex + ").*")) .collect(toList()); } - private Condition> subStringsPerLine(final String... substrings) { + private Condition> subStringsPerLine(String... substrings) { return new Condition>("substrings per line " + Arrays.asList(substrings)) { @Override public boolean matches(List lines) { diff --git a/archunit/src/test/java/com/tngtech/archunit/library/dependencies/SlicesShouldTest.java b/archunit/src/test/java/com/tngtech/archunit/library/dependencies/SlicesShouldTest.java index 23603b6db5..5e5709120d 100644 --- a/archunit/src/test/java/com/tngtech/archunit/library/dependencies/SlicesShouldTest.java +++ b/archunit/src/test/java/com/tngtech/archunit/library/dependencies/SlicesShouldTest.java @@ -110,7 +110,7 @@ private ViolationsAssertion assertViolations(JavaClasses classes, SliceRule rule return new ViolationsAssertion(rule.evaluate(classes)); } - private DescribedPredicate classIn(final String packageRegex) { + private DescribedPredicate classIn(String packageRegex) { return new DescribedPredicate("class in " + packageRegex) { @Override public boolean test(JavaClass input) { diff --git a/archunit/src/test/java/com/tngtech/archunit/library/dependencies/SlicesTest.java b/archunit/src/test/java/com/tngtech/archunit/library/dependencies/SlicesTest.java index 50ba6a4a9c..c09c335c57 100644 --- a/archunit/src/test/java/com/tngtech/archunit/library/dependencies/SlicesTest.java +++ b/archunit/src/test/java/com/tngtech/archunit/library/dependencies/SlicesTest.java @@ -122,7 +122,7 @@ private Optional tryGetSliceOf(Class clazz, Slices slices) { return Optional.empty(); } - private SliceAssignment assignmentOfJavaLangAndUtil(final String description) { + private SliceAssignment assignmentOfJavaLangAndUtil(String description) { return new SliceAssignment() { @Override public String getDescription() { diff --git a/archunit/src/test/java/com/tngtech/archunit/library/freeze/FreezingArchRuleTest.java b/archunit/src/test/java/com/tngtech/archunit/library/freeze/FreezingArchRuleTest.java index 9da3e5426c..570b735a80 100644 --- a/archunit/src/test/java/com/tngtech/archunit/library/freeze/FreezingArchRuleTest.java +++ b/archunit/src/test/java/com/tngtech/archunit/library/freeze/FreezingArchRuleTest.java @@ -544,16 +544,16 @@ RuleCreator withoutViolations() { return new RuleCreator(description, new ArrayList<>(), textModifier); } - RuleCreator withViolations(final String... messages) { + RuleCreator withViolations(String... messages) { List newEvents = Arrays.stream(messages).map(ViolatedEvent::new).collect(toList()); return new RuleCreator(description, newEvents, textModifier); } - RuleCreator withViolations(final ViolatedEvent... events) { + RuleCreator withViolations(ViolatedEvent... events) { return new RuleCreator(description, ImmutableList.copyOf(events), textModifier); } - RuleCreator withStringReplace(final String toReplace, final String replaceWith) { + RuleCreator withStringReplace(String toReplace, String replaceWith) { return new RuleCreator(description, events, input -> input.replace(toReplace, replaceWith)); } diff --git a/archunit/src/test/java/com/tngtech/archunit/library/metrics/ComponentDependencyMetricsTest.java b/archunit/src/test/java/com/tngtech/archunit/library/metrics/ComponentDependencyMetricsTest.java index fe436928e9..1c492d72ae 100644 --- a/archunit/src/test/java/com/tngtech/archunit/library/metrics/ComponentDependencyMetricsTest.java +++ b/archunit/src/test/java/com/tngtech/archunit/library/metrics/ComponentDependencyMetricsTest.java @@ -129,7 +129,7 @@ public void normalized_distance_from_main_sequence_is_calculated_as_distance_fro @Test public void rejects_requesting_metrics_of_unknown_component() { - final ComponentDependencyMetrics metrics = ArchitectureMetrics.componentDependencyMetrics(MetricsComponents.of()); + ComponentDependencyMetrics metrics = ArchitectureMetrics.componentDependencyMetrics(MetricsComponents.of()); List callables = ImmutableList.of( () -> metrics.getEfferentCoupling("unknown"), diff --git a/archunit/src/test/java/com/tngtech/archunit/library/metrics/LakosMetricsTest.java b/archunit/src/test/java/com/tngtech/archunit/library/metrics/LakosMetricsTest.java index ddd6a1ed0b..cd66d2254a 100644 --- a/archunit/src/test/java/com/tngtech/archunit/library/metrics/LakosMetricsTest.java +++ b/archunit/src/test/java/com/tngtech/archunit/library/metrics/LakosMetricsTest.java @@ -198,17 +198,17 @@ private Builder(int ccd) { this.ccd = ccd; } - Builder acd(final double acd) { + Builder acd(double acd) { this.acd = acd; return this; } - Builder racd(final double racd) { + Builder racd(double racd) { this.racd = racd; return this; } - ExpectedMetrics nccd(final double nccd) { + ExpectedMetrics nccd(double nccd) { this.nccd = nccd; return new ExpectedMetrics(this); } diff --git a/archunit/src/test/java/com/tngtech/archunit/library/plantuml/rules/PlantUmlArchConditionTest.java b/archunit/src/test/java/com/tngtech/archunit/library/plantuml/rules/PlantUmlArchConditionTest.java index 8df58ca2db..2e3bdbbacc 100644 --- a/archunit/src/test/java/com/tngtech/archunit/library/plantuml/rules/PlantUmlArchConditionTest.java +++ b/archunit/src/test/java/com/tngtech/archunit/library/plantuml/rules/PlantUmlArchConditionTest.java @@ -259,7 +259,7 @@ private ListAssert assertThatEvaluatedConditionWithConfiguration( return assertThat(result.getFailureReport().getDetails()); } - private Condition> lineMatching(final String pattern) { + private Condition> lineMatching(String pattern) { return new Condition>(String.format("line matching '%s'", pattern)) { @Override public boolean matches(List lines) { diff --git a/archunit/src/test/java/com/tngtech/archunit/library/plantuml/rules/PlantUmlParserTest.java b/archunit/src/test/java/com/tngtech/archunit/library/plantuml/rules/PlantUmlParserTest.java index bcdc17c286..12a02d67b8 100644 --- a/archunit/src/test/java/com/tngtech/archunit/library/plantuml/rules/PlantUmlParserTest.java +++ b/archunit/src/test/java/com/tngtech/archunit/library/plantuml/rules/PlantUmlParserTest.java @@ -167,7 +167,7 @@ public static Object[][] color_testcases() { @Test @UseDataProvider("color_testcases") public void parses_various_colored_components(String color) { - final File diagramFile = TestDiagram.in(temporaryFolder) + File diagramFile = TestDiagram.in(temporaryFolder) .component("SomeComponent").withColor(color).withStereoTypes("..stereotype..") .write(); diff --git a/archunit/src/test/java/com/tngtech/archunit/testutil/ArchConfigurationRule.java b/archunit/src/test/java/com/tngtech/archunit/testutil/ArchConfigurationRule.java index c99e6ced0e..4795c84c43 100644 --- a/archunit/src/test/java/com/tngtech/archunit/testutil/ArchConfigurationRule.java +++ b/archunit/src/test/java/com/tngtech/archunit/testutil/ArchConfigurationRule.java @@ -13,12 +13,12 @@ public class ArchConfigurationRule extends ExternalResource { private boolean beforeHasBeenExecuted = false; private final List configurationInitializers = new ArrayList<>(); - public ArchConfigurationRule resolveAdditionalDependenciesFromClassPath(final boolean enabled) { + public ArchConfigurationRule resolveAdditionalDependenciesFromClassPath(boolean enabled) { addConfigurationInitializer(() -> ArchConfiguration.get().setResolveMissingDependenciesFromClassPath(enabled)); return this; } - public ArchConfigurationRule setFailOnEmptyShould(final boolean allowEmptyShould) { + public ArchConfigurationRule setFailOnEmptyShould(boolean allowEmptyShould) { addConfigurationInitializer(() -> ArchConfiguration.get().setProperty(FAIL_ON_EMPTY_SHOULD_PROPERTY_NAME, String.valueOf(allowEmptyShould))); return this; } diff --git a/archunit/src/test/java/com/tngtech/archunit/testutil/Conditions.java b/archunit/src/test/java/com/tngtech/archunit/testutil/Conditions.java index 4cbd50a108..a5e07aaca7 100644 --- a/archunit/src/test/java/com/tngtech/archunit/testutil/Conditions.java +++ b/archunit/src/test/java/com/tngtech/archunit/testutil/Conditions.java @@ -10,7 +10,7 @@ public final class Conditions { private Conditions() { } - public static Condition> containing(final Condition condition) { + public static Condition> containing(Condition condition) { return new Condition>() { @Override public boolean matches(Iterable value) { @@ -23,7 +23,7 @@ public boolean matches(Iterable value) { }.as("containing an element that " + condition.description()); } - public static Condition codeUnitWithSignature(final String name, final Class... parameters) { + public static Condition codeUnitWithSignature(String name, Class... parameters) { return new Condition() { @Override public boolean matches(JavaCodeUnit value) { diff --git a/archunit/src/test/java/com/tngtech/archunit/testutil/JavaCallQuery.java b/archunit/src/test/java/com/tngtech/archunit/testutil/JavaCallQuery.java index cb7a041d96..9892f4b1f8 100644 --- a/archunit/src/test/java/com/tngtech/archunit/testutil/JavaCallQuery.java +++ b/archunit/src/test/java/com/tngtech/archunit/testutil/JavaCallQuery.java @@ -22,7 +22,7 @@ public JavaCallQuery from(JavaCodeUnit source) { return that(hasOrigin(source)); } - public JavaMethodCall inLineNumber(final int lineNumber) { + public JavaMethodCall inLineNumber(int lineNumber) { Set matchingCalls = that(hasLine(lineNumber)).calls; assertThat(matchingCalls).as("matching calls in line number " + lineNumber).isNotEmpty(); return matchingCalls.iterator().next(); @@ -32,15 +32,15 @@ private JavaCallQuery that(Predicate predicate) { return new JavaCallQuery(calls.stream().filter(predicate).collect(toSet())); } - public static JavaCallQuery methodCallTo(final JavaMethod method) { + public static JavaCallQuery methodCallTo(JavaMethod method) { return new JavaCallQuery(method.getCallsOfSelf()); } - private static Predicate hasLine(final int lineNumber) { + private static Predicate hasLine(int lineNumber) { return input -> input.getLineNumber() == lineNumber; } - private static Predicate hasOrigin(final JavaCodeUnit origin) { + private static Predicate hasOrigin(JavaCodeUnit origin) { return input -> origin.equals(input.getOrigin()); } } diff --git a/archunit/src/test/java/com/tngtech/archunit/testutil/TestLogRecorder.java b/archunit/src/test/java/com/tngtech/archunit/testutil/TestLogRecorder.java index 23c011856f..eeddfb19f7 100644 --- a/archunit/src/test/java/com/tngtech/archunit/testutil/TestLogRecorder.java +++ b/archunit/src/test/java/com/tngtech/archunit/testutil/TestLogRecorder.java @@ -32,7 +32,7 @@ public void append(LogEvent event) { } }; appender.start(); - final LoggerContext ctx = getLoggerContext(); + LoggerContext ctx = getLoggerContext(); LoggerConfig loggerConfig = ctx.getConfiguration().getLoggerConfig(loggerClass.getName()); oldLevel = loggerConfig.getLevel(); loggerConfig.setLevel(level); @@ -49,7 +49,7 @@ public void reset() { return; } - final LoggerContext ctx = getLoggerContext(); + LoggerContext ctx = getLoggerContext(); LoggerConfig loggerConfig = ctx.getConfiguration().getLoggerConfig(loggerClass.getName()); loggerConfig.setLevel(oldLevel); loggerConfig.removeAppender(APPENDER_NAME); diff --git a/archunit/src/test/java/com/tngtech/archunit/testutil/assertion/AccessToFieldAssertion.java b/archunit/src/test/java/com/tngtech/archunit/testutil/assertion/AccessToFieldAssertion.java index c41dff2727..4d0c4dec16 100644 --- a/archunit/src/test/java/com/tngtech/archunit/testutil/assertion/AccessToFieldAssertion.java +++ b/archunit/src/test/java/com/tngtech/archunit/testutil/assertion/AccessToFieldAssertion.java @@ -18,7 +18,7 @@ protected AccessToFieldAssertion newAssertion(JavaFieldAccess access) { return new AccessToFieldAssertion(access); } - public AccessToFieldAssertion isTo(final String name) { + public AccessToFieldAssertion isTo(String name) { return isTo(new Condition("field with name '" + name + "'") { @Override public boolean matches(FieldAccessTarget fieldAccessTarget) { @@ -27,7 +27,7 @@ public boolean matches(FieldAccessTarget fieldAccessTarget) { }); } - public AccessToFieldAssertion isTo(final Class owner, final String name) { + public AccessToFieldAssertion isTo(Class owner, String name) { return isTo(new Condition("field " + owner.getName() + "." + name) { @Override public boolean matches(FieldAccessTarget fieldAccessTarget) { diff --git a/archunit/src/test/java/com/tngtech/archunit/testutil/assertion/CodeUnitAccessAssertion.java b/archunit/src/test/java/com/tngtech/archunit/testutil/assertion/CodeUnitAccessAssertion.java index f361422570..bafc9210de 100644 --- a/archunit/src/test/java/com/tngtech/archunit/testutil/assertion/CodeUnitAccessAssertion.java +++ b/archunit/src/test/java/com/tngtech/archunit/testutil/assertion/CodeUnitAccessAssertion.java @@ -17,7 +17,7 @@ public CodeUnitAccessAssertion(JavaCodeUnitAccess("method " + target.getFullName()) { @Override public boolean matches(AccessTarget.CodeUnitAccessTarget codeUnitAccessTarget) { @@ -28,7 +28,7 @@ public boolean matches(AccessTarget.CodeUnitAccessTarget codeUnitAccessTarget) { }); } - public CodeUnitAccessAssertion isTo(final Class codeUnitOwner) { + public CodeUnitAccessAssertion isTo(Class codeUnitOwner) { return isTo(new Condition() { @Override public boolean matches(AccessTarget.CodeUnitAccessTarget target) { @@ -37,7 +37,7 @@ public boolean matches(AccessTarget.CodeUnitAccessTarget target) { }); } - public CodeUnitAccessAssertion isTo(final String codeUnitName, final Class... parameterTypes) { + public CodeUnitAccessAssertion isTo(String codeUnitName, Class... parameterTypes) { return isTo(new Condition("code unit " + codeUnitName + "(" + formatNamesOf(parameterTypes) + ")") { @Override public boolean matches(AccessTarget.CodeUnitAccessTarget target) { @@ -47,7 +47,7 @@ public boolean matches(AccessTarget.CodeUnitAccessTarget target) { }); } - public CodeUnitAccessAssertion isTo(Class targetClass, String codeUnitName, final Class... parameterTypes) { + public CodeUnitAccessAssertion isTo(Class targetClass, String codeUnitName, Class... parameterTypes) { return isTo(targetClass).isTo(codeUnitName, parameterTypes); } @@ -65,7 +65,7 @@ public CodeUnitAccessAssertion isNotWrappedInTryCatch() { return this; } - private Condition caughtThrowableOfType(final Class expectedThrowable) { + private Condition caughtThrowableOfType(Class expectedThrowable) { return new Condition("caught throwable of type " + expectedThrowable.getSimpleName()) { @Override public boolean matches(TryCatchBlock tryCatchBlock) { diff --git a/archunit/src/test/java/com/tngtech/archunit/testutil/assertion/DependenciesAssertion.java b/archunit/src/test/java/com/tngtech/archunit/testutil/assertion/DependenciesAssertion.java index 20ee669f6e..74d07509da 100644 --- a/archunit/src/test/java/com/tngtech/archunit/testutil/assertion/DependenciesAssertion.java +++ b/archunit/src/test/java/com/tngtech/archunit/testutil/assertion/DependenciesAssertion.java @@ -68,13 +68,13 @@ public DependenciesAssertion doesNotContain(Class expectedOrigin, Class ex return this; } - public DependenciesAssertion contain(final ExpectedDependencies expectedDependencies) { + public DependenciesAssertion contain(ExpectedDependencies expectedDependencies) { matchExpectedDependencies(expectedDependencies) .assertNoMissingDependencies(); return this; } - public DependenciesAssertion containOnly(final ExpectedDependencies expectedDependencies) { + public DependenciesAssertion containOnly(ExpectedDependencies expectedDependencies) { ExpectedDependenciesMatchResult result = matchExpectedDependencies(expectedDependencies); result.assertNoMissingDependencies(); result.assertAllDependenciesMatched(); @@ -84,7 +84,7 @@ public DependenciesAssertion containOnly(final ExpectedDependencies expectedDepe private ExpectedDependenciesMatchResult matchExpectedDependencies(ExpectedDependencies expectedDependencies) { List rest = newArrayList(actual); List missingDependencies = new ArrayList<>(); - for (final ExpectedDependency expectedDependency : expectedDependencies) { + for (ExpectedDependency expectedDependency : expectedDependencies) { if (rest.stream().noneMatch(expectedDependency::matches)) { missingDependencies.add(expectedDependency); } diff --git a/archunit/src/test/java/com/tngtech/archunit/testutil/assertion/ExpectedAccessCreation.java b/archunit/src/test/java/com/tngtech/archunit/testutil/assertion/ExpectedAccessCreation.java index 69b1ec176f..3ed6d7e152 100644 --- a/archunit/src/test/java/com/tngtech/archunit/testutil/assertion/ExpectedAccessCreation.java +++ b/archunit/src/test/java/com/tngtech/archunit/testutil/assertion/ExpectedAccessCreation.java @@ -31,15 +31,15 @@ private Step2(Class originClass, String originCodeUnitName) { this.originCodeUnitName = originCodeUnitName; } - public ExpectedAccessCondition to(final Class targetClass, final String targetName) { + public ExpectedAccessCondition to(Class targetClass, String targetName) { return new ExpectedAccessCondition(originClass, originCodeUnitName, targetClass, targetName); } - public ExpectedFieldAccessCondition toField(AccessType accessType, final Class targetClass, final String targetName) { + public ExpectedFieldAccessCondition toField(AccessType accessType, Class targetClass, String targetName) { return new ExpectedFieldAccessCondition(originClass, originCodeUnitName, accessType, targetClass, targetName); } - public ExpectedConstructorCallCondition toConstructor(final Class targetClass, final Class... paramTypes) { + public ExpectedConstructorCallCondition toConstructor(Class targetClass, Class... paramTypes) { return new ExpectedConstructorCallCondition(originClass, originCodeUnitName, targetClass, formatNamesOf(paramTypes)); } } diff --git a/archunit/src/test/java/com/tngtech/archunit/testutil/assertion/JavaAnnotationAssertion.java b/archunit/src/test/java/com/tngtech/archunit/testutil/assertion/JavaAnnotationAssertion.java index e2d70e8e0a..63b9033f95 100644 --- a/archunit/src/test/java/com/tngtech/archunit/testutil/assertion/JavaAnnotationAssertion.java +++ b/archunit/src/test/java/com/tngtech/archunit/testutil/assertion/JavaAnnotationAssertion.java @@ -85,7 +85,7 @@ public JavaAnnotationAssertion hasExplicitlyDeclaredStringProperty(String proper return this; } - public JavaAnnotationAssertion hasNoExplicitlyDeclaredProperty(final String propertyName) { + public JavaAnnotationAssertion hasNoExplicitlyDeclaredProperty(String propertyName) { String description = annotationPropertyDescription("String", propertyName); assertThat(actual.hasExplicitlyDeclaredProperty(propertyName)) .as(description + " has explicitly declared value") @@ -204,7 +204,7 @@ public boolean equals(Object obj) { if (obj == null || getClass() != obj.getClass()) { return false; } - final SimpleTypeReference other = (SimpleTypeReference) obj; + SimpleTypeReference other = (SimpleTypeReference) obj; return Objects.equals(this.typeName, other.typeName); } @@ -244,7 +244,7 @@ public boolean equals(Object obj) { if (obj == null || getClass() != obj.getClass()) { return false; } - final SimpleEnumConstantReference other = (SimpleEnumConstantReference) obj; + SimpleEnumConstantReference other = (SimpleEnumConstantReference) obj; return Objects.equals(this.type, other.type) && Objects.equals(this.name, other.name); } @@ -266,12 +266,12 @@ static List allOf(Enum[] values) { public static class AnnotationPropertyAssertion { private final List> executeAssertions = new ArrayList<>(); - public AnnotationPropertyAssertion withAnnotationType(final Class annotationType) { + public AnnotationPropertyAssertion withAnnotationType(Class annotationType) { executeAssertions.add(assertion -> assertion.hasType(annotationType)); return this; } - public AnnotationPropertyAssertion withClassProperty(final String propertyName, final Class propertyValue) { + public AnnotationPropertyAssertion withClassProperty(String propertyName, Class propertyValue) { executeAssertions.add(assertion -> assertion.hasClassProperty(propertyName, propertyValue)); return this; } diff --git a/archunit/src/test/java/com/tngtech/archunit/testutil/syntax/MethodChoiceStrategy.java b/archunit/src/test/java/com/tngtech/archunit/testutil/syntax/MethodChoiceStrategy.java index 7d6e316ebe..f3e539d3b6 100644 --- a/archunit/src/test/java/com/tngtech/archunit/testutil/syntax/MethodChoiceStrategy.java +++ b/archunit/src/test/java/com/tngtech/archunit/testutil/syntax/MethodChoiceStrategy.java @@ -37,7 +37,7 @@ public MethodChoiceStrategy exceptMethodsWithName(String string) { return new MethodChoiceStrategy(ignorePredicate.or(methodWithName(string))); } - private Predicate methodWithName(final String methodName) { + private Predicate methodWithName(String methodName) { return input -> input.getName().equals(methodName); } @@ -137,7 +137,7 @@ public boolean equals(Object obj) { if (obj == null || getClass() != obj.getClass()) { return false; } - final MethodKey other = (MethodKey) obj; + MethodKey other = (MethodKey) obj; return Objects.equals(this.name, other.name) && Objects.equals(this.parameterTypes, other.parameterTypes); }