From f84436fe1d10cde44afccdc655907cceeb14a744 Mon Sep 17 00:00:00 2001 From: Timo Notheisen Date: Mon, 14 Jul 2025 08:18:06 +0200 Subject: [PATCH 1/3] fix: call the correct methods Signed-off-by: Timo Notheisen --- .../Fluent/Syntax/Elements/Types/TypePredicatesDefinition.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ArchUnitNET/Fluent/Syntax/Elements/Types/TypePredicatesDefinition.cs b/ArchUnitNET/Fluent/Syntax/Elements/Types/TypePredicatesDefinition.cs index a6cff98e1..8bb2b637a 100644 --- a/ArchUnitNET/Fluent/Syntax/Elements/Types/TypePredicatesDefinition.cs +++ b/ArchUnitNET/Fluent/Syntax/Elements/Types/TypePredicatesDefinition.cs @@ -368,7 +368,7 @@ public static IPredicate ResideInAssembly(string fullName) public static IPredicate ResideInAssemblyMatching(string pattern) { return new SimplePredicate( - type => type.ResidesInAssembly(pattern), + type => type.ResidesInAssemblyMatching(pattern), "reside in assembly with full name matching \"" + pattern + "\"" ); } @@ -681,7 +681,7 @@ public static IPredicate DoNotResideInNamespace(string fullName) public static IPredicate DoNotResideInNamespaceMatching(string pattern) { return new SimplePredicate( - type => !type.ResidesInNamespace(pattern), + type => !type.ResidesInNamespaceMatching(pattern), "do not reside in namespace with full name matching \"" + pattern + "\"" ); } From b33e4fd2ac38365290a0d09488e3c822e6443f7e Mon Sep 17 00:00:00 2001 From: Timo Notheisen Date: Mon, 14 Jul 2025 08:29:42 +0200 Subject: [PATCH 2/3] fix: one more occurrence Signed-off-by: Timo Notheisen --- ArchUnitNET/Fluent/Syntax/Elements/Types/GivenTypesThat.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ArchUnitNET/Fluent/Syntax/Elements/Types/GivenTypesThat.cs b/ArchUnitNET/Fluent/Syntax/Elements/Types/GivenTypesThat.cs index 8c2cdc8c3..d60a5b8c5 100644 --- a/ArchUnitNET/Fluent/Syntax/Elements/Types/GivenTypesThat.cs +++ b/ArchUnitNET/Fluent/Syntax/Elements/Types/GivenTypesThat.cs @@ -138,7 +138,7 @@ public TGivenRuleTypeConjunction ResideInNamespace(string fullName) public TGivenRuleTypeConjunction ResideInNamespaceMatching(string pattern) { _ruleCreator.AddPredicate( - TypePredicatesDefinition.ResideInNamespace(pattern) + TypePredicatesDefinition.ResideInNamespaceMatching(pattern) ); return Create(_ruleCreator); } From 3dd46458e56a964a5c81dfafb23b61b54561e3b4 Mon Sep 17 00:00:00 2001 From: Timo Notheisen Date: Mon, 14 Jul 2025 08:35:24 +0200 Subject: [PATCH 3/3] fix: more occurrences Signed-off-by: Timo Notheisen --- ArchUnitNET/Fluent/Syntax/Elements/ShouldRelateToObjectsThat.cs | 2 +- .../Fluent/Syntax/Elements/Types/TypeConditionsDefinition.cs | 2 +- .../Fluent/Syntax/Elements/Types/TypePredicatesDefinition.cs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ArchUnitNET/Fluent/Syntax/Elements/ShouldRelateToObjectsThat.cs b/ArchUnitNET/Fluent/Syntax/Elements/ShouldRelateToObjectsThat.cs index 259bbf7f3..7635b6114 100644 --- a/ArchUnitNET/Fluent/Syntax/Elements/ShouldRelateToObjectsThat.cs +++ b/ArchUnitNET/Fluent/Syntax/Elements/ShouldRelateToObjectsThat.cs @@ -896,7 +896,7 @@ public TRuleTypeShouldConjunction DoNotHaveName(string name) public TRuleTypeShouldConjunction DoNotHaveNameMatching(string pattern) { _ruleCreator.ContinueComplexCondition( - ObjectPredicatesDefinition.DoNotHaveName(pattern) + ObjectPredicatesDefinition.DoNotHaveNameMatching(pattern) ); return Create(_ruleCreator); } diff --git a/ArchUnitNET/Fluent/Syntax/Elements/Types/TypeConditionsDefinition.cs b/ArchUnitNET/Fluent/Syntax/Elements/Types/TypeConditionsDefinition.cs index 740bac75c..a64098f89 100644 --- a/ArchUnitNET/Fluent/Syntax/Elements/Types/TypeConditionsDefinition.cs +++ b/ArchUnitNET/Fluent/Syntax/Elements/Types/TypeConditionsDefinition.cs @@ -534,7 +534,7 @@ public static ICondition ResideInNamespace(string fullName) public static ICondition ResideInNamespaceMatching(string pattern) { return new SimpleCondition( - type => type.ResidesInNamespace(pattern), + type => type.ResidesInNamespaceMatching(pattern), obj => "does reside in " + obj.Namespace.FullName, "reside in namespace with full name matching \"" + pattern + "\"" ); diff --git a/ArchUnitNET/Fluent/Syntax/Elements/Types/TypePredicatesDefinition.cs b/ArchUnitNET/Fluent/Syntax/Elements/Types/TypePredicatesDefinition.cs index 8bb2b637a..d4fbebd13 100644 --- a/ArchUnitNET/Fluent/Syntax/Elements/Types/TypePredicatesDefinition.cs +++ b/ArchUnitNET/Fluent/Syntax/Elements/Types/TypePredicatesDefinition.cs @@ -697,7 +697,7 @@ public static IPredicate DoNotResideInAssembly(string fullName) public static IPredicate DoNotResideInAssemblyMatching(string pattern) { return new SimplePredicate( - type => !type.ResidesInAssembly(pattern), + type => !type.ResidesInAssemblyMatching(pattern), "do not reside in assembly with full name matching \"" + pattern + "\"" ); }