Spring/spring-hateoas
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

#1958 - Upgrade to ArchUnit 1.0.1.

Browse Source
This commit is contained in:
Oliver Drotbohm
2023-04-13 22:36:39 +02:00
parent deeb391eb5
commit 925b0f7f38
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@@ -675,7 +675,7 @@
<dependency>
<groupId>com.tngtech.archunit</groupId>
<artifactId>archunit</artifactId>
<version>0.16.0</version>
<version>1.0.1</version>
<scope>test</scope>
</dependency>

12
src/test/java/org/springframework/hateoas/ArchitectureTest.java
View File

@@ -18,6 +18,9 @@ package org.springframework.hateoas;
import static com.tngtech.archunit.core.domain.JavaClass.Predicates.*;
import static org.springframework.hateoas.ArchitectureTest.Architecture.*;
import java.util.Collection;
import java.util.List;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInstance;
import org.junit.jupiter.api.TestInstance.Lifecycle;
@@ -29,7 +32,6 @@ import com.tngtech.archunit.core.domain.JavaClass;
import com.tngtech.archunit.core.domain.JavaClasses;
import com.tngtech.archunit.core.importer.ClassFileImporter;
import com.tngtech.archunit.core.importer.ImportOption;
import com.tngtech.archunit.core.importer.ImportOptions;
import com.tngtech.archunit.lang.syntax.ArchRuleDefinition;
import com.tngtech.archunit.library.dependencies.SliceRule;
import com.tngtech.archunit.library.dependencies.SlicesRuleDefinition;
@@ -42,7 +44,7 @@ import com.tngtech.archunit.library.dependencies.SlicesRuleDefinition;
@TestInstance(Lifecycle.PER_CLASS)
class ArchitectureTest {
ImportOptions options = new ImportOptions().with(ImportOption.Predefined.DO_NOT_INCLUDE_TESTS);
Collection<ImportOption> options = List.of(ImportOption.Predefined.DO_NOT_INCLUDE_TESTS);
JavaClasses classes = new ClassFileImporter(options) //
.importPackages("org.springframework.hateoas", "org.springframework");
@@ -99,14 +101,14 @@ class ArchitectureTest {
/*
* (non-Javadoc)
* @see com.tngtech.archunit.base.DescribedPredicate#apply(java.lang.Object)
* @see java.util.function.Predicate#test(java.lang.Object)
*/
@Override
public boolean apply(@Nullable JavaClass input) {
public boolean test(@Nullable JavaClass input) {
return input != null && input.getDirectDependenciesFromSelf().stream() //
.map(Dependency::getTargetClass) //
.anyMatch(predicate::apply);
.anyMatch(predicate::test);
}
};
}