Skip to content

Commit 3a594a7

Browse files
fgatherfgather
authored
Merge pull request #20 from TNG/refactor-namespaces
create new namespace structure
2 parents 20f5bee + 0b55449 commit 3a594a7

File tree

146 files changed

+1394
-1895
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

146 files changed

+1394
-1895
lines changed

‎ArchUnit.sln.DotSettings

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,13 @@
44
<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/BRACES_FOR_IFELSE/@EntryValue">Required</s:String>
55
<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/BRACES_FOR_WHILE/@EntryValue">Required</s:String>
66
<s:String x:Key="/Default/CodeStyle/FileHeader/FileHeaderText/@EntryValue"> Copyright 2019 Florian Gather &lt;florian.gather@tngtech.com&gt;
7-
Copyright 2019 Paula Ruiz &lt;paularuiz22@gmail.com&gt;
87
Copyright 2019 Fritz Brandhuber &lt;fritz.brandhuber@tngtech.com&gt;
8+
Copyright 2020 Pavel Fischer &lt;rubbiroid@gmail.com&gt;
99

1010
SPDX-License-Identifier: Apache-2.0
1111
</s:String>
1212
<s:Boolean x:Key="/Default/CodeStyle/Naming/CSharpNaming/ApplyAutoDetectedRules/@EntryValue">False</s:Boolean>
13+
<s:String x:Key="/Default/CustomTools/CustomToolsData/@EntryValue"></s:String>
1314
<s:Boolean x:Key="/Default/UserDictionary/Words/=archrule/@EntryIndexedValue">True</s:Boolean>
1415
<s:Boolean x:Key="/Default/UserDictionary/Words/=intf/@EntryIndexedValue">True</s:Boolean>
1516
<s:Boolean x:Key="/Default/UserDictionary/Words/=lambda/@EntryIndexedValue">True</s:Boolean>

‎ArchUnitNET.NUnit/ArchRuleAssert.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ public static class ArchRuleAssert
2020
/// <param name="archRule">The rule to test the architecture with</param>
2121
public static void FulfilsRule(Architecture architecture, IArchRule archRule)
2222
{
23-
if (!architecture.FulfilsRule(archRule))
23+
if (!archRule.HasNoViolations(architecture))
2424
{
25-
Assert.Fail(architecture.EvaluateRule(archRule).ToErrorMessage());
25+
Assert.Fail(archRule.Evaluate(architecture).ToErrorMessage());
2626
}
2727
}
2828
}

‎ArchUnitNET.NUnitTests/RuleEvaluationTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
//
55
// SPDX-License-Identifier: Apache-2.0
66

7-
using ArchUnitNET.Core;
87
using ArchUnitNET.Domain;
98
using ArchUnitNET.Fluent;
109
using ArchUnitNET.Fluent.Extensions;
10+
using ArchUnitNET.Loader;
1111
using ArchUnitNET.NUnit;
1212
using NUnit.Framework;
1313
using static ArchUnitNET.Fluent.ArchRuleDefinition;

‎ArchUnitNET.xUnit/Asserts/ArchRuleAsserts.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ partial class Assert
2222
/// <exception cref="FailedArchRuleException">Thrown if the rule is violated</exception>
2323
public static void ArchRule(Architecture architecture, IArchRule archRule)
2424
{
25-
if (!architecture.FulfilsRule(archRule))
25+
if (!archRule.HasNoViolations(architecture))
2626
{
2727
throw new FailedArchRuleException(architecture, archRule);
2828
}

‎ArchUnitNET.xUnit/Asserts/Sdk/Exceptions/FailedArchRuleException.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public class FailedArchRuleException : XunitException
2020
/// <param name="architecture">The architecture which was tested</param>
2121
/// <param name="archRule">The archrule that failed</param>
2222
public FailedArchRuleException(Architecture architecture, IArchRule archRule)
23-
: this(architecture.EvaluateRule(archRule))
23+
: this(archRule.Evaluate(architecture))
2424
{
2525
}
2626

‎ArchUnitNET/ArchUnitNET.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<RootNamespace>ArchUnitNET</RootNamespace>
77
<PackageId>TngTech.ArchUnitNET</PackageId>
88
<Title>ArchUnit C#</Title>
9-
<Authors>Florian Gather, Paula Ruiz, Fritz Brandhuber</Authors>
9+
<Authors>Florian Gather, Paula Ruiz, Fritz Brandhuber, Pavel Fischer</Authors>
1010
<Company>TNG Technology Consulting GmbH</Company>
1111
<Description>C# Version of ArchUnit (see: archunit.org)</Description>
1212
<PackageLicenseUrl>https://apache.org/licenses/LICENSE-2.0</PackageLicenseUrl>

‎ArchUnitNET/ArchitectureExceptions/ArchitectureException.cs

Lines changed: 0 additions & 17 deletions
This file was deleted.

‎ArchUnitNET/Domain/Architecture.cs

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,8 @@ public Architecture(IEnumerable<Assembly> allAssemblies, IEnumerable<Namespace>
2626
}
2727

2828
public IEnumerable<Assembly> Assemblies => _allAssemblies.Where(assembly => !assembly.IsOnlyReferenced);
29-
3029
public IEnumerable<Namespace> Namespaces { get; }
31-
3230
public IEnumerable<IType> Types { get; }
33-
3431
public IEnumerable<Class> Classes => Types.OfType<Class>();
3532
public IEnumerable<Interface> Interfaces => Types.OfType<Interface>();
3633
public IEnumerable<Attribute> Attributes => Types.OfType<Attribute>();
@@ -39,22 +36,12 @@ public Architecture(IEnumerable<Assembly> allAssemblies, IEnumerable<Namespace>
3936
public IEnumerable<MethodMember> MethodMembers => Members.OfType<MethodMember>();
4037
public IEnumerable<IMember> Members => Types.SelectMany(type => type.Members);
4138

42-
public bool FulfilsRule(IArchRule archRule)
43-
{
44-
return archRule.HasNoViolations(this);
45-
}
46-
4739
public IEnumerable<T> GetOrCreateObjects<T>(IObjectProvider<T> objectProvider,
4840
Func<Architecture, IEnumerable<T>> providingFunction) where T : ICanBeAnalyzed
4941
{
5042
return _objectProviderCache.GetOrCreateObjects(objectProvider, providingFunction);
5143
}
5244

53-
public IEnumerable<EvaluationResult> EvaluateRule(IArchRule archRule)
54-
{
55-
return archRule.Evaluate(this);
56-
}
57-
5845
public override bool Equals(object obj)
5946
{
6047
if (ReferenceEquals(null, obj))

‎ArchUnitNET/Domain/ArchitectureCacheKey.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
using System;
88
using System.Collections.Generic;
99
using System.Linq;
10-
using ArchUnitNET.Fluent.Extensions;
10+
using ArchUnitNET.Domain.Extensions;
1111

1212
namespace ArchUnitNET.Domain
1313
{

‎ArchUnitNET/Domain/Class.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66

77
using System.Collections.Generic;
88
using System.Linq;
9-
using ArchUnitNET.Domain.Dependencies.Types;
10-
using ArchUnitNET.Fluent.Extensions;
9+
using ArchUnitNET.Domain.Dependencies;
10+
using ArchUnitNET.Domain.Extensions;
1111
using JetBrains.Annotations;
1212

1313
namespace ArchUnitNET.Domain
@@ -101,7 +101,7 @@ public bool IsAssignableTo(IType assignableToType)
101101
public bool IsAssignableTo(string pattern, bool useRegularExpressions = false)
102102
{
103103
return pattern != null && this.GetAssignableTypes()
104-
.Any(type => type.FullNameMatches(pattern, useRegularExpressions));
104+
.Any(type => type.FullNameMatches(pattern, useRegularExpressions));
105105
}
106106

107107
public override string ToString()

‎ArchUnitNET/Domain/Dependencies/Members/AttributeMemberDependency.cs renamed to ‎ArchUnitNET/Domain/Dependencies/AttributeMemberDependency.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
using Equ;
88

9-
namespace ArchUnitNET.Domain.Dependencies.Members
9+
namespace ArchUnitNET.Domain.Dependencies
1010
{
1111
public class AttributeMemberDependency : MemberwiseEquatable<AttributeMemberDependency>, IMemberTypeDependency
1212
{

‎ArchUnitNET/Domain/Dependencies/Types/AttributeTypeDependency.cs renamed to ‎ArchUnitNET/Domain/Dependencies/AttributeTypeDependency.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
using Equ;
88

9-
namespace ArchUnitNET.Domain.Dependencies.Types
9+
namespace ArchUnitNET.Domain.Dependencies
1010
{
1111
public class AttributeTypeDependency : MemberwiseEquatable<AttributeTypeDependency>, ITypeDependency
1212
{

‎ArchUnitNET/Domain/Dependencies/Members/BodyTypeMemberDependency.cs renamed to ‎ArchUnitNET/Domain/Dependencies/BodyTypeMemberDependency.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
using Equ;
88

9-
namespace ArchUnitNET.Domain.Dependencies.Members
9+
namespace ArchUnitNET.Domain.Dependencies
1010
{
1111
public class BodyTypeMemberDependency : MemberwiseEquatable<BodyTypeMemberDependency>,
1212
IMemberTypeDependency

‎ArchUnitNET/Domain/Dependencies/Members/FieldTypeDependency.cs renamed to ‎ArchUnitNET/Domain/Dependencies/FieldTypeDependency.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
using Equ;
88

9-
namespace ArchUnitNET.Domain.Dependencies.Members
9+
namespace ArchUnitNET.Domain.Dependencies
1010
{
1111
public class FieldTypeDependency : MemberwiseEquatable<FieldTypeDependency>, IMemberTypeDependency
1212
{

‎ArchUnitNET/Domain/Dependencies/Members/IMemberMemberDependency.cs renamed to ‎ArchUnitNET/Domain/Dependencies/IMemberMemberDependency.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
//
55
// SPDX-License-Identifier: Apache-2.0
66

7-
namespace ArchUnitNET.Domain.Dependencies.Members
7+
namespace ArchUnitNET.Domain.Dependencies
88
{
99
public interface IMemberMemberDependency : IMemberTypeDependency
1010
{

‎ArchUnitNET/Domain/Dependencies/Members/IMemberTypeDependency.cs renamed to ‎ArchUnitNET/Domain/Dependencies/IMemberTypeDependency.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,7 @@
44
//
55
// SPDX-License-Identifier: Apache-2.0
66

7-
using ArchUnitNET.Domain.Dependencies.Types;
8-
9-
namespace ArchUnitNET.Domain.Dependencies.Members
7+
namespace ArchUnitNET.Domain.Dependencies
108
{
119
public interface IMemberTypeDependency : ITypeDependency
1210
{

‎ArchUnitNET/Domain/Dependencies/Types/ITypeDependency.cs renamed to ‎ArchUnitNET/Domain/Dependencies/ITypeDependency.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
//
55
// SPDX-License-Identifier: Apache-2.0
66

7-
namespace ArchUnitNET.Domain.Dependencies.Types
7+
namespace ArchUnitNET.Domain.Dependencies
88
{
99
public interface ITypeDependency
1010
{

‎ArchUnitNET/Domain/Dependencies/Types/ImplementsInterfaceDependency.cs renamed to ‎ArchUnitNET/Domain/Dependencies/ImplementsInterfaceDependency.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
using Equ;
88

9-
namespace ArchUnitNET.Domain.Dependencies.Types
9+
namespace ArchUnitNET.Domain.Dependencies
1010
{
1111
public class ImplementsInterfaceDependency : MemberwiseEquatable<ImplementsInterfaceDependency>, ITypeDependency
1212
{

‎ArchUnitNET/Domain/Dependencies/Types/InheritsBaseClassDependency.cs renamed to ‎ArchUnitNET/Domain/Dependencies/InheritsBaseClassDependency.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
using Equ;
88

9-
namespace ArchUnitNET.Domain.Dependencies.Types
9+
namespace ArchUnitNET.Domain.Dependencies
1010
{
1111
public class InheritsBaseClassDependency : MemberwiseEquatable<InheritsBaseClassDependency>, ITypeDependency
1212
{

‎ArchUnitNET/Domain/Dependencies/Members/MethodCallDependency.cs renamed to ‎ArchUnitNET/Domain/Dependencies/MethodCallDependency.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
//
55
// SPDX-License-Identifier: Apache-2.0
66

7-
namespace ArchUnitNET.Domain.Dependencies.Members
7+
namespace ArchUnitNET.Domain.Dependencies
88
{
99
public class MethodCallDependency : IMemberMemberDependency
1010
{

‎ArchUnitNET/Domain/Dependencies/Members/MethodSignatureDependency.cs renamed to ‎ArchUnitNET/Domain/Dependencies/MethodSignatureDependency.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
using Equ;
88

9-
namespace ArchUnitNET.Domain.Dependencies.Members
9+
namespace ArchUnitNET.Domain.Dependencies
1010
{
1111
public class MethodSignatureDependency : MemberwiseEquatable<MethodSignatureDependency>,
1212
IMemberTypeDependency

‎ArchUnitNET/Domain/Dependencies/Members/PropertyTypeDependency.cs renamed to ‎ArchUnitNET/Domain/Dependencies/PropertyTypeDependency.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
using Equ;
88

9-
namespace ArchUnitNET.Domain.Dependencies.Members
9+
namespace ArchUnitNET.Domain.Dependencies
1010
{
1111
public class PropertyTypeDependency : MemberwiseEquatable<PropertyTypeDependency>, IMemberTypeDependency
1212
{

‎ArchUnitNET/Domain/Dependencies/Types/TypeReferenceDependency.cs renamed to ‎ArchUnitNET/Domain/Dependencies/TypeReferenceDependency.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
using Equ;
88

9-
namespace ArchUnitNET.Domain.Dependencies.Types
9+
namespace ArchUnitNET.Domain.Dependencies
1010
{
1111
public class TypeReferenceDependency : MemberwiseEquatable<TypeReferenceDependency>, ITypeDependency
1212
{

‎ArchUnitNET/Domain/Dependencies/Types/AttributeAssemblyDependency.cs

Lines changed: 0 additions & 23 deletions
This file was deleted.

‎ArchUnitNET/ArchitectureExceptions/AssemblyDoesNotExistInArchitecture.cs renamed to ‎ArchUnitNET/Domain/Exceptions/AssemblyDoesNotExistInArchitecture.cs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,12 @@
66

77
using System;
88

9-
namespace ArchUnitNET.ArchitectureExceptions
9+
namespace ArchUnitNET.Domain.Exceptions
1010
{
1111
public class AssemblyDoesNotExistInArchitecture : Exception
1212
{
1313
public AssemblyDoesNotExistInArchitecture(string message) : base(message)
1414
{
1515
}
16-
17-
public AssemblyDoesNotExistInArchitecture(string message, Exception innerException) : base(message,
18-
innerException)
19-
{
20-
}
2116
}
2217
}

‎ArchUnitNET/ArchitectureExceptions/InvalidStateException.cs renamed to ‎ArchUnitNET/Domain/Exceptions/InvalidStateException.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
using System;
88

9-
namespace ArchUnitNET.ArchitectureExceptions
9+
namespace ArchUnitNET.Domain.Exceptions
1010
{
1111
public class InvalidStateException : Exception
1212
{

‎ArchUnitNET/ArchitectureExceptions/MultipleOccurrencesInSequenceException.cs renamed to ‎ArchUnitNET/Domain/Exceptions/MultipleOccurrencesInSequenceException.cs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,12 @@
66

77
using System;
88

9-
namespace ArchUnitNET.ArchitectureExceptions
9+
namespace ArchUnitNET.Domain.Exceptions
1010
{
1111
public class MultipleOccurrencesInSequenceException : Exception
1212
{
1313
public MultipleOccurrencesInSequenceException(string message) : base(message)
1414
{
1515
}
16-
17-
public MultipleOccurrencesInSequenceException(string message, Exception innerException) : base(message,
18-
innerException)
19-
{
20-
}
2116
}
2217
}

‎ArchUnitNET/ArchitectureExceptions/TypeDoesNotExistInArchitecture.cs renamed to ‎ArchUnitNET/Domain/Exceptions/TypeDoesNotExistInArchitecture.cs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,12 @@
66

77
using System;
88

9-
namespace ArchUnitNET.ArchitectureExceptions
9+
namespace ArchUnitNET.Domain.Exceptions
1010
{
1111
public class TypeDoesNotExistInArchitecture : Exception
1212
{
1313
public TypeDoesNotExistInArchitecture(string message) : base(message)
1414
{
1515
}
16-
17-
public TypeDoesNotExistInArchitecture(string message, Exception innerException) : base(message, innerException)
18-
{
19-
}
2016
}
2117
}

‎ArchUnitNET/Fluent/Extensions/ArchitectureExtensions.cs renamed to ‎ArchUnitNET/Domain/Extensions/ArchitectureExtensions.cs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,10 @@
55
// SPDX-License-Identifier: Apache-2.0
66

77
using System;
8-
using ArchUnitNET.ArchitectureExceptions;
9-
using ArchUnitNET.Domain;
8+
using ArchUnitNET.Domain.Exceptions;
109
using JetBrains.Annotations;
11-
using Attribute = ArchUnitNET.Domain.Attribute;
1210

13-
namespace ArchUnitNET.Fluent.Extensions
11+
namespace ArchUnitNET.Domain.Extensions
1412
{
1513
public static class ArchitectureExtensions
1614
{

0 commit comments

Comments
 (0)