Skip to content

Commit 214e1bb

Browse files
committed
Merge branch 'maintenance/flatten-namespaces' into develop
In the name of organization, we've created a relatively granular folder structure. And, by convention, we've mapped our namespaces to those folders. Generally, that's a good practice. But useful file organization is different from useful namespace organization. As such, I've differentiated between the two by introducing `_camelCase` folders whose types are part of the parent namespace, but allow related files to be grouped on the file system. As part of this, I've collapsed the `OnTopic.ViewModels.Items` and `OnTopic.ViewModels.Collections` back into the `OnTopic.ViewModels` namespace. I've also created the `/OnTopic/Mapping/_exceptions`, `/OnTopic/Repositories/_exceptions`, and `/OnTopic/Repositories/_eventArgs` folders for collecting exception and events argument classes without altering their namespaces. None of this will impact OnTopic 4.0.0 migrations, since e.g. the `OnTopic.ViewModels` namespace was originally flat. It might break early integrations of the preview releases of OnTopic, though.
2 parents 0ec541f + a165f74 commit 214e1bb

26 files changed

Lines changed: 9 additions & 18 deletions

OnTopic.Tests/TopicMappingServiceTest.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
using OnTopic.Tests.ViewModels;
2424
using OnTopic.Tests.ViewModels.Metadata;
2525
using OnTopic.ViewModels;
26-
using OnTopic.ViewModels.Items;
2726

2827
namespace OnTopic.Tests {
2928

OnTopic.Tests/ViewModels/DescendentTopicViewModel.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
\=============================================================================================================================*/
66
using OnTopic.Mapping.Annotations;
77
using OnTopic.ViewModels;
8-
using OnTopic.ViewModels.Collections;
98

109
namespace OnTopic.Tests.ViewModels {
1110

OnTopic.Tests/ViewModels/FilteredContentTypeTopicViewModel.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
\=============================================================================================================================*/
66
using OnTopic.Mapping.Annotations;
77
using OnTopic.ViewModels;
8-
using OnTopic.ViewModels.Collections;
98

109
namespace OnTopic.Tests.ViewModels {
1110

OnTopic.Tests/ViewModels/FilteredInvalidTopicViewModel.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
\=============================================================================================================================*/
66
using OnTopic.Mapping.Annotations;
77
using OnTopic.ViewModels;
8-
using OnTopic.ViewModels.Collections;
98

109
namespace OnTopic.Tests.ViewModels {
1110

OnTopic.Tests/ViewModels/FilteredTopicViewModel.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
\=============================================================================================================================*/
66
using OnTopic.Mapping.Annotations;
77
using OnTopic.ViewModels;
8-
using OnTopic.ViewModels.Collections;
98

109
namespace OnTopic.Tests.ViewModels {
1110

OnTopic.Tests/ViewModels/MetadataLookupTopicViewModel.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
\=============================================================================================================================*/
66
using OnTopic.Mapping.Annotations;
77
using OnTopic.ViewModels;
8-
using OnTopic.ViewModels.Collections;
98

109
namespace OnTopic.Tests.ViewModels {
1110

OnTopic.ViewModels/ContentListTopicViewModel.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
| Client Ignia, LLC
44
| Project Topics Library
55
\=============================================================================================================================*/
6-
using OnTopic.ViewModels.Collections;
7-
using OnTopic.ViewModels.Items;
86

97
namespace OnTopic.ViewModels {
108

OnTopic.ViewModels/TopicViewModelLookupService.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
using System.Collections.Generic;
88
using System.Reflection;
99
using OnTopic.Lookup;
10-
using OnTopic.ViewModels.Items;
1110

1211
namespace OnTopic.ViewModels {
1312

OnTopic.ViewModels/Collections/TopicViewModelCollection.cs renamed to OnTopic.ViewModels/_collections/TopicViewModelCollection.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
using OnTopic.Internal.Diagnostics;
1111
using OnTopic.Models;
1212

13-
namespace OnTopic.ViewModels.Collections {
13+
namespace OnTopic.ViewModels {
1414

1515
/*============================================================================================================================
1616
| VIEW MODEL: TOPIC COLLECTION

OnTopic.ViewModels/Items/ContentItemTopicViewModel.cs renamed to OnTopic.ViewModels/_items/ContentItemTopicViewModel.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
\=============================================================================================================================*/
66
using System;
77

8-
namespace OnTopic.ViewModels.Items {
8+
namespace OnTopic.ViewModels {
99

1010
/*============================================================================================================================
1111
| VIEW MODEL: CONTENT ITEM TOPIC

0 commit comments

Comments
 (0)