From a930db5f50afc4fcb2d6e9ba389164ddaf36d810 Mon Sep 17 00:00:00 2001 From: Simon Gockner Date: Thu, 13 Feb 2020 08:19:50 +0100 Subject: [PATCH] closes #13: unify factories folder location --- GBase.Client/GBaseClient.cs | 1 + GBase.Client/Installers/GBaseClientInstaller.cs | 1 + .../{ => Services}/Factories/IGBaseEntryServiceFactory.cs | 2 +- .../{ => Services}/Factories/IGBaseServiceFactory.cs | 2 +- .../{ => Services}/Factories/IGBaseTableServiceFactory.cs | 2 +- .../Cache/Factories/IXmlDataHandlerCacheEntryFactory.cs | 3 ++- .../Cache/Factories/IXmlDataHandlerCacheFactory.cs | 5 ++++- .../Factories/IXmlDataHandlerCachePropertyEntryFactory.cs | 4 +++- GBase/DataHandling/Cache/XmlDataHandlerCache.cs | 2 +- GBase/DataHandling/Cache/XmlDataHandlerCacheEntry.cs | 2 +- .../Xml => DataHandling}/Factories/IXmlDataHandlerFactory.cs | 4 +++- .../Xml => DataHandling}/Factories/IXmlDataReaderFactory.cs | 4 +++- .../Xml => DataHandling}/Factories/IXmlDataWriterFactory.cs | 4 +++- GBase/DataHandling/XmlDataHandler.cs | 4 ++-- .../FileHandling/Factories/IFileHandlerFactory.cs | 4 +++- GBase/Installers/DataHandlingInstaller.cs | 4 ++-- GBase/Installers/FileHandlingInstaller.cs | 2 +- Test.GBase.Client/IntegrationTest.cs | 1 + Test.GBase/DataHandling/XmlDataHandlerTest.cs | 4 ++-- 19 files changed, 36 insertions(+), 19 deletions(-) rename GBase.Client/{ => Services}/Factories/IGBaseEntryServiceFactory.cs (94%) rename GBase.Client/{ => Services}/Factories/IGBaseServiceFactory.cs (94%) rename GBase.Client/{ => Services}/Factories/IGBaseTableServiceFactory.cs (94%) rename GBase/{Interfaces/DataHandling/Xml => DataHandling}/Cache/Factories/IXmlDataHandlerCacheEntryFactory.cs (89%) rename GBase/{Interfaces/DataHandling/Xml => DataHandling}/Cache/Factories/IXmlDataHandlerCacheFactory.cs (82%) rename GBase/{Interfaces/DataHandling/Xml => DataHandling}/Cache/Factories/IXmlDataHandlerCachePropertyEntryFactory.cs (88%) rename GBase/{Interfaces/DataHandling/Xml => DataHandling}/Factories/IXmlDataHandlerFactory.cs (85%) rename GBase/{Interfaces/DataHandling/Xml => DataHandling}/Factories/IXmlDataReaderFactory.cs (87%) rename GBase/{Interfaces/DataHandling/Xml => DataHandling}/Factories/IXmlDataWriterFactory.cs (89%) rename GBase/{Interfaces => }/FileHandling/Factories/IFileHandlerFactory.cs (86%) diff --git a/GBase.Client/GBaseClient.cs b/GBase.Client/GBaseClient.cs index 9ad9bfe..78f0669 100644 --- a/GBase.Client/GBaseClient.cs +++ b/GBase.Client/GBaseClient.cs @@ -6,6 +6,7 @@ using System.Threading.Tasks; using GBase.Api.Services; using GBase.Client.Factories; using GBase.Client.Interfaces; +using GBase.Client.Services.Factories; namespace GBase.Client { diff --git a/GBase.Client/Installers/GBaseClientInstaller.cs b/GBase.Client/Installers/GBaseClientInstaller.cs index 59aba60..6d2163a 100644 --- a/GBase.Client/Installers/GBaseClientInstaller.cs +++ b/GBase.Client/Installers/GBaseClientInstaller.cs @@ -7,6 +7,7 @@ using GBase.Api.Services; using GBase.Client.Factories; using GBase.Client.Interfaces; using GBase.Client.Services; +using GBase.Client.Services.Factories; using LightweightIocContainer.Interfaces; using LightweightIocContainer.Interfaces.Installers; diff --git a/GBase.Client/Factories/IGBaseEntryServiceFactory.cs b/GBase.Client/Services/Factories/IGBaseEntryServiceFactory.cs similarity index 94% rename from GBase.Client/Factories/IGBaseEntryServiceFactory.cs rename to GBase.Client/Services/Factories/IGBaseEntryServiceFactory.cs index c9f3feb..81167be 100644 --- a/GBase.Client/Factories/IGBaseEntryServiceFactory.cs +++ b/GBase.Client/Services/Factories/IGBaseEntryServiceFactory.cs @@ -6,7 +6,7 @@ using GBase.Api.Communication; using GBase.Api.Services; -namespace GBase.Client.Factories +namespace GBase.Client.Services.Factories { /// /// Factory for the diff --git a/GBase.Client/Factories/IGBaseServiceFactory.cs b/GBase.Client/Services/Factories/IGBaseServiceFactory.cs similarity index 94% rename from GBase.Client/Factories/IGBaseServiceFactory.cs rename to GBase.Client/Services/Factories/IGBaseServiceFactory.cs index a08b9c6..f388315 100644 --- a/GBase.Client/Factories/IGBaseServiceFactory.cs +++ b/GBase.Client/Services/Factories/IGBaseServiceFactory.cs @@ -6,7 +6,7 @@ using GBase.Api.Communication; using GBase.Api.Services; -namespace GBase.Client.Factories +namespace GBase.Client.Services.Factories { /// /// Factory for the diff --git a/GBase.Client/Factories/IGBaseTableServiceFactory.cs b/GBase.Client/Services/Factories/IGBaseTableServiceFactory.cs similarity index 94% rename from GBase.Client/Factories/IGBaseTableServiceFactory.cs rename to GBase.Client/Services/Factories/IGBaseTableServiceFactory.cs index 45c1d0e..accfb26 100644 --- a/GBase.Client/Factories/IGBaseTableServiceFactory.cs +++ b/GBase.Client/Services/Factories/IGBaseTableServiceFactory.cs @@ -6,7 +6,7 @@ using GBase.Api.Communication; using GBase.Api.Services; -namespace GBase.Client.Factories +namespace GBase.Client.Services.Factories { /// /// Factory for the diff --git a/GBase/Interfaces/DataHandling/Xml/Cache/Factories/IXmlDataHandlerCacheEntryFactory.cs b/GBase/DataHandling/Cache/Factories/IXmlDataHandlerCacheEntryFactory.cs similarity index 89% rename from GBase/Interfaces/DataHandling/Xml/Cache/Factories/IXmlDataHandlerCacheEntryFactory.cs rename to GBase/DataHandling/Cache/Factories/IXmlDataHandlerCacheEntryFactory.cs index f5ca37b..2fd08e6 100644 --- a/GBase/Interfaces/DataHandling/Xml/Cache/Factories/IXmlDataHandlerCacheEntryFactory.cs +++ b/GBase/DataHandling/Cache/Factories/IXmlDataHandlerCacheEntryFactory.cs @@ -3,8 +3,9 @@ // Copyright(c) 2020 SimonG. All Rights Reserved. using System; +using GBase.Interfaces.DataHandling.Xml.Cache; -namespace GBase.Interfaces.DataHandling.Xml.Cache.Factories +namespace GBase.DataHandling.Cache.Factories { /// /// Factory for the diff --git a/GBase/Interfaces/DataHandling/Xml/Cache/Factories/IXmlDataHandlerCacheFactory.cs b/GBase/DataHandling/Cache/Factories/IXmlDataHandlerCacheFactory.cs similarity index 82% rename from GBase/Interfaces/DataHandling/Xml/Cache/Factories/IXmlDataHandlerCacheFactory.cs rename to GBase/DataHandling/Cache/Factories/IXmlDataHandlerCacheFactory.cs index 8ebc61a..a354111 100644 --- a/GBase/Interfaces/DataHandling/Xml/Cache/Factories/IXmlDataHandlerCacheFactory.cs +++ b/GBase/DataHandling/Cache/Factories/IXmlDataHandlerCacheFactory.cs @@ -2,7 +2,10 @@ // Created: 2020-02-12 // Copyright(c) 2020 SimonG. All Rights Reserved. -namespace GBase.Interfaces.DataHandling.Xml.Cache.Factories +using GBase.Interfaces.DataHandling.Xml; +using GBase.Interfaces.DataHandling.Xml.Cache; + +namespace GBase.DataHandling.Cache.Factories { /// /// Factory for the diff --git a/GBase/Interfaces/DataHandling/Xml/Cache/Factories/IXmlDataHandlerCachePropertyEntryFactory.cs b/GBase/DataHandling/Cache/Factories/IXmlDataHandlerCachePropertyEntryFactory.cs similarity index 88% rename from GBase/Interfaces/DataHandling/Xml/Cache/Factories/IXmlDataHandlerCachePropertyEntryFactory.cs rename to GBase/DataHandling/Cache/Factories/IXmlDataHandlerCachePropertyEntryFactory.cs index d80bebd..e806e6e 100644 --- a/GBase/Interfaces/DataHandling/Xml/Cache/Factories/IXmlDataHandlerCachePropertyEntryFactory.cs +++ b/GBase/DataHandling/Cache/Factories/IXmlDataHandlerCachePropertyEntryFactory.cs @@ -2,7 +2,9 @@ // Created: 2020-02-12 // Copyright(c) 2020 SimonG. All Rights Reserved. -namespace GBase.Interfaces.DataHandling.Xml.Cache.Factories +using GBase.Interfaces.DataHandling.Xml.Cache; + +namespace GBase.DataHandling.Cache.Factories { /// /// Factory for the diff --git a/GBase/DataHandling/Cache/XmlDataHandlerCache.cs b/GBase/DataHandling/Cache/XmlDataHandlerCache.cs index ce3b125..ac122a0 100644 --- a/GBase/DataHandling/Cache/XmlDataHandlerCache.cs +++ b/GBase/DataHandling/Cache/XmlDataHandlerCache.cs @@ -6,10 +6,10 @@ using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; +using GBase.DataHandling.Cache.Factories; using GBase.Interfaces.DataHandling.Cache; using GBase.Interfaces.DataHandling.Xml; using GBase.Interfaces.DataHandling.Xml.Cache; -using GBase.Interfaces.DataHandling.Xml.Cache.Factories; namespace GBase.DataHandling.Cache { diff --git a/GBase/DataHandling/Cache/XmlDataHandlerCacheEntry.cs b/GBase/DataHandling/Cache/XmlDataHandlerCacheEntry.cs index 850fb95..c7fdf32 100644 --- a/GBase/DataHandling/Cache/XmlDataHandlerCacheEntry.cs +++ b/GBase/DataHandling/Cache/XmlDataHandlerCacheEntry.cs @@ -4,9 +4,9 @@ using System; using System.Collections.Generic; +using GBase.DataHandling.Cache.Factories; using GBase.Interfaces.DataHandling.Cache; using GBase.Interfaces.DataHandling.Xml.Cache; -using GBase.Interfaces.DataHandling.Xml.Cache.Factories; namespace GBase.DataHandling.Cache { diff --git a/GBase/Interfaces/DataHandling/Xml/Factories/IXmlDataHandlerFactory.cs b/GBase/DataHandling/Factories/IXmlDataHandlerFactory.cs similarity index 85% rename from GBase/Interfaces/DataHandling/Xml/Factories/IXmlDataHandlerFactory.cs rename to GBase/DataHandling/Factories/IXmlDataHandlerFactory.cs index 7f303f8..7b416c9 100644 --- a/GBase/Interfaces/DataHandling/Xml/Factories/IXmlDataHandlerFactory.cs +++ b/GBase/DataHandling/Factories/IXmlDataHandlerFactory.cs @@ -2,7 +2,9 @@ // Created: 2020-02-12 // Copyright(c) 2020 SimonG. All Rights Reserved. -namespace GBase.Interfaces.DataHandling.Xml.Factories +using GBase.Interfaces.DataHandling.Xml; + +namespace GBase.DataHandling.Factories { /// /// Factory for the diff --git a/GBase/Interfaces/DataHandling/Xml/Factories/IXmlDataReaderFactory.cs b/GBase/DataHandling/Factories/IXmlDataReaderFactory.cs similarity index 87% rename from GBase/Interfaces/DataHandling/Xml/Factories/IXmlDataReaderFactory.cs rename to GBase/DataHandling/Factories/IXmlDataReaderFactory.cs index ce4fe53..3670de9 100644 --- a/GBase/Interfaces/DataHandling/Xml/Factories/IXmlDataReaderFactory.cs +++ b/GBase/DataHandling/Factories/IXmlDataReaderFactory.cs @@ -2,7 +2,9 @@ // Created: 2020-02-12 // Copyright(c) 2020 SimonG. All Rights Reserved. -namespace GBase.Interfaces.DataHandling.Xml.Factories +using GBase.Interfaces.DataHandling.Xml; + +namespace GBase.DataHandling.Factories { /// /// Factory for the diff --git a/GBase/Interfaces/DataHandling/Xml/Factories/IXmlDataWriterFactory.cs b/GBase/DataHandling/Factories/IXmlDataWriterFactory.cs similarity index 89% rename from GBase/Interfaces/DataHandling/Xml/Factories/IXmlDataWriterFactory.cs rename to GBase/DataHandling/Factories/IXmlDataWriterFactory.cs index 785c56a..3c17344 100644 --- a/GBase/Interfaces/DataHandling/Xml/Factories/IXmlDataWriterFactory.cs +++ b/GBase/DataHandling/Factories/IXmlDataWriterFactory.cs @@ -2,7 +2,9 @@ // Created: 2020-02-12 // Copyright(c) 2020 SimonG. All Rights Reserved. -namespace GBase.Interfaces.DataHandling.Xml.Factories +using GBase.Interfaces.DataHandling.Xml; + +namespace GBase.DataHandling.Factories { /// /// Factory for the diff --git a/GBase/DataHandling/XmlDataHandler.cs b/GBase/DataHandling/XmlDataHandler.cs index f0926c6..7c620af 100644 --- a/GBase/DataHandling/XmlDataHandler.cs +++ b/GBase/DataHandling/XmlDataHandler.cs @@ -7,11 +7,11 @@ using System.Collections.Generic; using System.Linq; using System.Threading; using System.Threading.Tasks; +using GBase.DataHandling.Cache.Factories; +using GBase.DataHandling.Factories; using GBase.Interfaces.DataHandling; using GBase.Interfaces.DataHandling.Xml; using GBase.Interfaces.DataHandling.Xml.Cache; -using GBase.Interfaces.DataHandling.Xml.Cache.Factories; -using GBase.Interfaces.DataHandling.Xml.Factories; namespace GBase.DataHandling { diff --git a/GBase/Interfaces/FileHandling/Factories/IFileHandlerFactory.cs b/GBase/FileHandling/Factories/IFileHandlerFactory.cs similarity index 86% rename from GBase/Interfaces/FileHandling/Factories/IFileHandlerFactory.cs rename to GBase/FileHandling/Factories/IFileHandlerFactory.cs index 65245e7..fddd1b5 100644 --- a/GBase/Interfaces/FileHandling/Factories/IFileHandlerFactory.cs +++ b/GBase/FileHandling/Factories/IFileHandlerFactory.cs @@ -3,7 +3,9 @@ // Copyright(c) 2020 SimonG. All Rights Reserved. -namespace GBase.Interfaces.FileHandling.Factories +using GBase.Interfaces.FileHandling; + +namespace GBase.FileHandling.Factories { /// /// Factory for the diff --git a/GBase/Installers/DataHandlingInstaller.cs b/GBase/Installers/DataHandlingInstaller.cs index b96f793..cd523e5 100644 --- a/GBase/Installers/DataHandlingInstaller.cs +++ b/GBase/Installers/DataHandlingInstaller.cs @@ -5,10 +5,10 @@ using GBase.DataHandling; using GBase.DataHandling.Cache; +using GBase.DataHandling.Cache.Factories; +using GBase.DataHandling.Factories; using GBase.Interfaces.DataHandling.Xml; using GBase.Interfaces.DataHandling.Xml.Cache; -using GBase.Interfaces.DataHandling.Xml.Cache.Factories; -using GBase.Interfaces.DataHandling.Xml.Factories; using LightweightIocContainer.Interfaces; using LightweightIocContainer.Interfaces.Installers; diff --git a/GBase/Installers/FileHandlingInstaller.cs b/GBase/Installers/FileHandlingInstaller.cs index a28af51..a025bb3 100644 --- a/GBase/Installers/FileHandlingInstaller.cs +++ b/GBase/Installers/FileHandlingInstaller.cs @@ -4,8 +4,8 @@ using GBase.FileHandling; +using GBase.FileHandling.Factories; using GBase.Interfaces.FileHandling; -using GBase.Interfaces.FileHandling.Factories; using LightweightIocContainer.Interfaces; using LightweightIocContainer.Interfaces.Installers; diff --git a/Test.GBase.Client/IntegrationTest.cs b/Test.GBase.Client/IntegrationTest.cs index 645dd82..37c4d7a 100644 --- a/Test.GBase.Client/IntegrationTest.cs +++ b/Test.GBase.Client/IntegrationTest.cs @@ -3,6 +3,7 @@ using GBase.Api.Communication; using GBase.Client; using GBase.Client.Factories; using GBase.Client.Interfaces; +using GBase.Client.Services.Factories; using Moq; using NUnit.Framework; diff --git a/Test.GBase/DataHandling/XmlDataHandlerTest.cs b/Test.GBase/DataHandling/XmlDataHandlerTest.cs index 727d272..d9641c6 100644 --- a/Test.GBase/DataHandling/XmlDataHandlerTest.cs +++ b/Test.GBase/DataHandling/XmlDataHandlerTest.cs @@ -6,10 +6,10 @@ using System.Collections.Generic; using System.Threading; using System.Threading.Tasks; using GBase.DataHandling; +using GBase.DataHandling.Cache.Factories; +using GBase.DataHandling.Factories; using GBase.Interfaces.DataHandling.Xml; using GBase.Interfaces.DataHandling.Xml.Cache; -using GBase.Interfaces.DataHandling.Xml.Cache.Factories; -using GBase.Interfaces.DataHandling.Xml.Factories; using Moq; using NUnit.Framework;