diff --git a/archunit/src/main/java/com/tngtech/archunit/core/domain/JavaPackage.java b/archunit/src/main/java/com/tngtech/archunit/core/domain/JavaPackage.java index 07197dffe1..f76291cdbb 100644 --- a/archunit/src/main/java/com/tngtech/archunit/core/domain/JavaPackage.java +++ b/archunit/src/main/java/com/tngtech/archunit/core/domain/JavaPackage.java @@ -303,7 +303,7 @@ private void setParent(JavaPackage parent) { } /** - * @return all classes directly contained in this package, but not classes in the lower levels of the package tree (compare {@link #getAllClasses()}) + * @return all classes directly contained in this package, but not classes in the lower levels of the package tree (compare {@link #getClassesInPackageTree()}) */ @PublicAPI(usage = ACCESS) public Set getClasses() { @@ -311,13 +311,14 @@ public Set getClasses() { } /** - * @return all classes contained in this package tree (compare {@link #getClasses()}) + * @return all classes contained in this {@link JavaPackage package tree}. I.e. all classes in this package, + * subpackages, subpackages of subpackages, and so on (compare {@link #getClasses()}) */ @PublicAPI(usage = ACCESS) - public Set getAllClasses() { + public Set getClassesInPackageTree() { ImmutableSet.Builder result = ImmutableSet.builder().addAll(classes); for (JavaPackage subpackage : getSubpackages()) { - result.addAll(subpackage.getAllClasses()); + result.addAll(subpackage.getClassesInPackageTree()); } return result.build(); } @@ -512,7 +513,7 @@ private static Set getClassDependenciesFrom(Set classes) */ @PublicAPI(usage = ACCESS) public Set getClassDependenciesFromThisPackageTree() { - return getClassDependenciesFrom(getAllClasses()); + return getClassDependenciesFrom(getClassesInPackageTree()); } /** @@ -541,7 +542,7 @@ private static ImmutableSet getClassDependenciesTo(Set cl */ @PublicAPI(usage = ACCESS) public Set getClassDependenciesToThisPackageTree() { - return getClassDependenciesTo(getAllClasses()); + return getClassDependenciesTo(getClassesInPackageTree()); } /** diff --git a/archunit/src/main/java/com/tngtech/archunit/library/metrics/MetricsComponents.java b/archunit/src/main/java/com/tngtech/archunit/library/metrics/MetricsComponents.java index 8b19f39983..39ba96049f 100644 --- a/archunit/src/main/java/com/tngtech/archunit/library/metrics/MetricsComponents.java +++ b/archunit/src/main/java/com/tngtech/archunit/library/metrics/MetricsComponents.java @@ -121,7 +121,7 @@ public static MetricsComponents from(Collection elements, Function fromPackages(Collection packages) { ImmutableSet.Builder> components = ImmutableSet.builder(); for (JavaPackage javaPackage : packages) { - components.add(MetricsComponent.of(javaPackage.getName(), javaPackage.getAllClasses())); + components.add(MetricsComponent.of(javaPackage.getName(), javaPackage.getClassesInPackageTree())); } return MetricsComponents.of(components.build()); } 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 6d1dcc18fc..c89fbebdd2 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 @@ -40,14 +40,14 @@ public void restriction_on_classes_should_keep_the_original_package_tree() { public void creation_of_JavaClasses_from_existing_classes_should_keep_the_original_package_tree() { JavaClasses classes = JavaClasses.of(singletonList(ALL_CLASSES.get(SomeClass.class))); - assertThat(classes.getDefaultPackage().getAllClasses()).hasSameElementsAs(ALL_CLASSES.getDefaultPackage().getAllClasses()); + assertThat(classes.getDefaultPackage().getClassesInPackageTree()).hasSameElementsAs(ALL_CLASSES.getDefaultPackage().getClassesInPackageTree()); } @Test public void creation_of_JavaClasses_from_empty_classes_should_create_empty_default_package() { JavaClasses classes = JavaClasses.of(emptySet()); - assertThat(classes.getDefaultPackage().getAllClasses()).isEmpty(); + assertThat(classes.getDefaultPackage().getClassesInPackageTree()).isEmpty(); } @Test 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 62039740bf..1a2f8bb808 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 @@ -221,7 +221,7 @@ public void iterates_all_classes() { JavaPackage javaLang = defaultPackage.getPackage("java.lang"); - assertThatTypes(javaLang.getAllClasses()).contain(Object.class, String.class, Annotation.class, Field.class); + assertThatTypes(javaLang.getClassesInPackageTree()).contain(Object.class, String.class, Annotation.class, Field.class); } @Test diff --git a/archunit/src/test/java/com/tngtech/archunit/core/importer/ClassFileImporterSlowTest.java b/archunit/src/test/java/com/tngtech/archunit/core/importer/ClassFileImporterSlowTest.java index ef30c901b7..c449bc3b01 100644 --- a/archunit/src/test/java/com/tngtech/archunit/core/importer/ClassFileImporterSlowTest.java +++ b/archunit/src/test/java/com/tngtech/archunit/core/importer/ClassFileImporterSlowTest.java @@ -171,7 +171,7 @@ public void creates_JavaPackages() { JavaPackage javaPackage = defaultPackage.getPackage("java.lang"); assertThatTypes(javaPackage.getClasses()).contain(Object.class, String.class, Integer.class); - assertThatTypes(javaPackage.getAllClasses()).contain(Object.class, Annotation.class, Field.class); + assertThatTypes(javaPackage.getClassesInPackageTree()).contain(Object.class, Annotation.class, Field.class); assertThat(javaClasses.containPackage("java.util")) .as("Classes contain package 'java.util'").isTrue();