Skip to content

#36 simplified the Package rule #43

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hohwille merged 18 commits into from
Mar 27, 2023
Merged

#36 simplified the Package rule #43

Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
6b0cff2
Merge pull request #1 from zichriste/master
moritzLanger Jan 17, 2023
db3baea
Merge pull request #2 from devonfw-sample/master
moritzLanger Jan 19, 2023
c51ba5c
implemeted PackeageRuleTest
moritzLanger Feb 6, 2023
df9194c
Merge pull request #3 from devonfw-sample/master
moritzLanger Feb 6, 2023
96b2a49
implement PackageRuleTest
moritzLanger Feb 6, 2023
6aaafd0
Merge branch 'master' of https://github.com/moritzLanger/archunit
moritzLanger Feb 6, 2023
a43473c
Merge branch 'master' into master
hohwille Feb 7, 2023
aefe838
implemented suggestions/improvements
moritzLanger Feb 9, 2023
963a40d
Merge branch 'master' of https://github.com/moritzLanger/archunit
moritzLanger Feb 9, 2023
2f0591c
removed Println
moritzLanger Feb 9, 2023
1b0cb97
removed 1 Space
moritzLanger Feb 9, 2023
cbee2e6
removed unnessary Import
moritzLanger Feb 9, 2023
fb55de0
added Spaces to message + Capitalised Constant
moritzLanger Feb 13, 2023
84573ff
Fix Point mistake in ROOT_PACKAGE
moritzLanger Feb 13, 2023
b5711fb
fixed minor mistake in DEFAULT_PATTERN
moritzLanger Feb 13, 2023
d58f047
Merge pull request #5 from devonfw-sample/master
moritzLanger Feb 13, 2023
55fb4b8
Merge pull request #10 from devonfw-sample/master
moritzLanger Mar 24, 2023
28c4131
#36 Package Rules is now simplified
moritzLanger Mar 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 3 additions & 44 deletions src/test/java/com/devonfw/sample/archunit/PackageRuleTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
package com.devonfw.sample.archunit;
import static com.tngtech.archunit.lang.syntax.ArchRuleDefinition.classes;

import java.util.regex.Matcher;
import java.util.regex.Pattern;

import com.tngtech.archunit.core.domain.JavaClass;
import com.tngtech.archunit.core.importer.ImportOption;
import com.tngtech.archunit.junit.AnalyzeClasses;
Expand All @@ -19,43 +16,6 @@
@AnalyzeClasses(packages = "com.devonfw.sample.archunit", importOptions = ImportOption.DoNotIncludeTests.class)
public class PackageRuleTest {

/* Layer */
private static final String LAYER_COMMON = "common";

private static final String LAYER_DATA_ACCESS = "dataaccess";

private static final String LAYER_LOGIC = "logic";

private static final String LAYER_SERVICE = "service";

private static final String LAYER_CLIENT = "client";

private static final String LAYER_BATCH = "batch";

/* Pattern */
private static final String PATTERN_SEGMENT = "[a-z0-9_]+";

private static final String PATTERN_LAYERS = LAYER_COMMON + "|" + LAYER_DATA_ACCESS + "|" + LAYER_SERVICE + "|"
+ LAYER_LOGIC + "|" + LAYER_BATCH + "|" + LAYER_CLIENT;

private static final String ROOT_PACKAGE =
// ....1..........................2
"(" + PATTERN_SEGMENT + ")(\\." + PATTERN_SEGMENT + ")*";

private static final String DEFAULT_PATTERN =
// ....1......................2...........................3...........................4
"(" + ROOT_PACKAGE + ")\\.(" + PATTERN_SEGMENT + ")\\.(" + PATTERN_LAYERS + ")(\\." + PATTERN_SEGMENT + ")*";

public static final String COMMON_PATTERN =
// ....1......................2...........................3...........................4
"(" + ROOT_PACKAGE + ")\\.(" + PATTERN_SEGMENT + ")\\.(" + LAYER_COMMON + ")(\\." + PATTERN_SEGMENT + ")*";

public static final String DATAACCESS_PATTERN =
// ....1......................2...........................3...........................4
"(" + ROOT_PACKAGE + ")\\.(" + PATTERN_SEGMENT + ")\\.(" + LAYER_DATA_ACCESS + ")(\\." + PATTERN_SEGMENT + ")*";

private static final Pattern PATTERN = Pattern.compile(DEFAULT_PATTERN);

/* ArchRule and Condition */
@ArchTest
public ArchRule shouldHaveValidLayers = classes().should(containsValidPackageStructureCondition());
Expand All @@ -66,10 +26,9 @@ private static ArchCondition<JavaClass> containsValidPackageStructureCondition()
}) {
@Override
public void check(JavaClass javaClass, ConditionEvents events) {

Matcher matcher = PATTERN.matcher(javaClass.getPackageName());
String message = javaClass.getSimpleName() + " test result is " + matcher.matches();
events.add(new SimpleConditionEvent(javaClass, matcher.matches(), message));
PackageStructure packageStructure = PackageStructure.of(javaClass);
String message = javaClass.getSimpleName() + " test result is " + packageStructure.isValid();
events.add(new SimpleConditionEvent(javaClass, packageStructure.isValid(), message));
}
};
};
Expand Down