diff --git a/PinkParrot.sln b/PinkParrot.sln index 58de44fd2..43bff9ab8 100644 --- a/PinkParrot.sln +++ b/PinkParrot.sln @@ -14,27 +14,23 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "PinkParrot", "src\PinkParro EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "pinkparrot_infrastructure", "pinkparrot_infrastructure", "{8CF53B92-5EB1-461D-98F8-70DA9B603FBF}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "pinkparrot_core", "pinkparrot_core", "{4C6B06C2-6D77-4E0E-AE32-D7050236433A}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "pinkparrot_domain", "pinkparrot_domain", "{4C6B06C2-6D77-4E0E-AE32-D7050236433A}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "PinkParrot.Core.Tests", "src\pinkparrot_core\PinkParrot.Core.Tests\PinkParrot.Core.Tests.xproj", "{4A27B9DE-F553-4A82-B866-A29EF8A5A0AF}" +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "PinkParrot.Core", "src\PinkParrot.Core\PinkParrot.Core.xproj", "{47F3C27E-698B-4EDF-A7E8-D7F4232AFBB0}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "PinkParrot.Core", "src\pinkparrot_core\PinkParrot.Core\PinkParrot.Core.xproj", "{47F3C27E-698B-4EDF-A7E8-D7F4232AFBB0}" +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "PinkParrot.Infrastructure.Tests", "src\PinkParrot.Infrastructure.Tests\PinkParrot.Infrastructure.Tests.xproj", "{840C02B1-48F8-4C8A-8862-8A3FDEFDE8D5}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "PinkParrot.Infrastructure.Tests", "src\pinkparrot_infrastructure\PinkParrot.Infrastructure.Tests\PinkParrot.Infrastructure.Tests.xproj", "{840C02B1-48F8-4C8A-8862-8A3FDEFDE8D5}" +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "PinkParrot.Infrastructure", "src\PinkParrot.Infrastructure\PinkParrot.Infrastructure.xproj", "{BD1C30A8-8FFA-4A92-A9BD-B67B1CDDD84C}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "PinkParrot.Infrastructure", "src\pinkparrot_infrastructure\PinkParrot.Infrastructure\PinkParrot.Infrastructure.xproj", "{BD1C30A8-8FFA-4A92-A9BD-B67B1CDDD84C}" +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "PinkParrot.Events", "src\PinkParrot.Events\PinkParrot.Events.xproj", "{25F66C64-058A-4D44-BC0C-F12A054F9A91}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "pinkparrot_events", "pinkparrot_events", "{6AE39761-FD74-45CD-99CF-73D3D2E5D064}" +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "PinkParrot.Write", "src\PinkParrot.Write\PinkParrot.Write.xproj", "{A85201C6-6AF8-4B63-8365-08F741050438}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "PinkParrot.Events", "src\pinkparrot_events\PinkParrot.Events\PinkParrot.Events.xproj", "{25F66C64-058A-4D44-BC0C-F12A054F9A91}" +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "PinkParrot.Read", "src\PinkParrot.Read\PinkParrot.Read.xproj", "{A92B4734-2587-4F6F-97A3-741BE48709A5}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "pinkparrot_write", "pinkparrot_write", "{4AED438F-684F-4FAE-B016-21CF2EAEA79F}" +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "PinkParrot.Store.MongoDb", "src\PinkParrot.Store.MongoDb\PinkParrot.Store.MongoDb.xproj", "{28F8E9E2-FE24-41F7-A888-9FC244A9E2DD}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "PinkParrot.Write", "src\pinkparrot_write\PinkParrot.Write\PinkParrot.Write.xproj", "{A85201C6-6AF8-4B63-8365-08F741050438}" -EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "PinkParrot.Read", "src\pinkparrot_read\PinkParrot.Read\PinkParrot.Read.xproj", "{A92B4734-2587-4F6F-97A3-741BE48709A5}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "pinkparrot_read", "pinkparrot_read", "{2CDAF493-B88E-48BD-9634-B5128C106199}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "pinkparrot_store", "pinkparrot_store", "{4082AA58-D410-4C52-8E88-3B0A4E860B28}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -46,10 +42,6 @@ Global {61F6BBCE-A080-4400-B194-70E2F5D2096E}.Debug|Any CPU.Build.0 = Debug|Any CPU {61F6BBCE-A080-4400-B194-70E2F5D2096E}.Release|Any CPU.ActiveCfg = Release|Any CPU {61F6BBCE-A080-4400-B194-70E2F5D2096E}.Release|Any CPU.Build.0 = Release|Any CPU - {4A27B9DE-F553-4A82-B866-A29EF8A5A0AF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4A27B9DE-F553-4A82-B866-A29EF8A5A0AF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4A27B9DE-F553-4A82-B866-A29EF8A5A0AF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4A27B9DE-F553-4A82-B866-A29EF8A5A0AF}.Release|Any CPU.Build.0 = Release|Any CPU {47F3C27E-698B-4EDF-A7E8-D7F4232AFBB0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {47F3C27E-698B-4EDF-A7E8-D7F4232AFBB0}.Debug|Any CPU.Build.0 = Debug|Any CPU {47F3C27E-698B-4EDF-A7E8-D7F4232AFBB0}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -74,18 +66,22 @@ Global {A92B4734-2587-4F6F-97A3-741BE48709A5}.Debug|Any CPU.Build.0 = Debug|Any CPU {A92B4734-2587-4F6F-97A3-741BE48709A5}.Release|Any CPU.ActiveCfg = Release|Any CPU {A92B4734-2587-4F6F-97A3-741BE48709A5}.Release|Any CPU.Build.0 = Release|Any CPU + {28F8E9E2-FE24-41F7-A888-9FC244A9E2DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {28F8E9E2-FE24-41F7-A888-9FC244A9E2DD}.Debug|Any CPU.Build.0 = Debug|Any CPU + {28F8E9E2-FE24-41F7-A888-9FC244A9E2DD}.Release|Any CPU.ActiveCfg = Release|Any CPU + {28F8E9E2-FE24-41F7-A888-9FC244A9E2DD}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution {61F6BBCE-A080-4400-B194-70E2F5D2096E} = {24A3171D-2905-49C9-8A49-A473799014E8} - {4A27B9DE-F553-4A82-B866-A29EF8A5A0AF} = {4C6B06C2-6D77-4E0E-AE32-D7050236433A} {47F3C27E-698B-4EDF-A7E8-D7F4232AFBB0} = {4C6B06C2-6D77-4E0E-AE32-D7050236433A} {840C02B1-48F8-4C8A-8862-8A3FDEFDE8D5} = {8CF53B92-5EB1-461D-98F8-70DA9B603FBF} {BD1C30A8-8FFA-4A92-A9BD-B67B1CDDD84C} = {8CF53B92-5EB1-461D-98F8-70DA9B603FBF} - {25F66C64-058A-4D44-BC0C-F12A054F9A91} = {6AE39761-FD74-45CD-99CF-73D3D2E5D064} - {A85201C6-6AF8-4B63-8365-08F741050438} = {4AED438F-684F-4FAE-B016-21CF2EAEA79F} - {A92B4734-2587-4F6F-97A3-741BE48709A5} = {2CDAF493-B88E-48BD-9634-B5128C106199} + {25F66C64-058A-4D44-BC0C-F12A054F9A91} = {4C6B06C2-6D77-4E0E-AE32-D7050236433A} + {A85201C6-6AF8-4B63-8365-08F741050438} = {4C6B06C2-6D77-4E0E-AE32-D7050236433A} + {A92B4734-2587-4F6F-97A3-741BE48709A5} = {4C6B06C2-6D77-4E0E-AE32-D7050236433A} + {28F8E9E2-FE24-41F7-A888-9FC244A9E2DD} = {4082AA58-D410-4C52-8E88-3B0A4E860B28} EndGlobalSection EndGlobal diff --git a/global.json b/global.json index 60ab9b437..3b8ca85e4 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "projects": [ "src" ], "sdk": { - "version": "1.0.0-preview2-003121" + "version": "1.0.0-preview2-003133" } } diff --git a/src/pinkparrot_core/PinkParrot.Core/PinkParrot.Core.xproj b/src/PinkParrot.Core/PinkParrot.Core.xproj similarity index 100% rename from src/pinkparrot_core/PinkParrot.Core/PinkParrot.Core.xproj rename to src/PinkParrot.Core/PinkParrot.Core.xproj diff --git a/src/pinkparrot_core/PinkParrot.Core/Schemas/Field.cs b/src/PinkParrot.Core/Schemas/Field.cs similarity index 100% rename from src/pinkparrot_core/PinkParrot.Core/Schemas/Field.cs rename to src/PinkParrot.Core/Schemas/Field.cs diff --git a/src/pinkparrot_core/PinkParrot.Core/Schemas/FieldProperties.cs b/src/PinkParrot.Core/Schemas/FieldProperties.cs similarity index 100% rename from src/pinkparrot_core/PinkParrot.Core/Schemas/FieldProperties.cs rename to src/PinkParrot.Core/Schemas/FieldProperties.cs diff --git a/src/pinkparrot_core/PinkParrot.Core/Schemas/FieldRegistry.cs b/src/PinkParrot.Core/Schemas/FieldRegistry.cs similarity index 100% rename from src/pinkparrot_core/PinkParrot.Core/Schemas/FieldRegistry.cs rename to src/PinkParrot.Core/Schemas/FieldRegistry.cs diff --git a/src/pinkparrot_core/PinkParrot.Core/Schemas/Field_Generic.cs b/src/PinkParrot.Core/Schemas/Field_Generic.cs similarity index 100% rename from src/pinkparrot_core/PinkParrot.Core/Schemas/Field_Generic.cs rename to src/PinkParrot.Core/Schemas/Field_Generic.cs diff --git a/src/pinkparrot_core/PinkParrot.Core/Schemas/IRegisteredField.cs b/src/PinkParrot.Core/Schemas/IRegisteredField.cs similarity index 100% rename from src/pinkparrot_core/PinkParrot.Core/Schemas/IRegisteredField.cs rename to src/PinkParrot.Core/Schemas/IRegisteredField.cs diff --git a/src/pinkparrot_core/PinkParrot.Core/Schemas/NamedElementProperties.cs b/src/PinkParrot.Core/Schemas/NamedElementProperties.cs similarity index 100% rename from src/pinkparrot_core/PinkParrot.Core/Schemas/NamedElementProperties.cs rename to src/PinkParrot.Core/Schemas/NamedElementProperties.cs diff --git a/src/pinkparrot_core/PinkParrot.Core/Schemas/NumberField.cs b/src/PinkParrot.Core/Schemas/NumberField.cs similarity index 100% rename from src/pinkparrot_core/PinkParrot.Core/Schemas/NumberField.cs rename to src/PinkParrot.Core/Schemas/NumberField.cs diff --git a/src/pinkparrot_core/PinkParrot.Core/Schemas/NumberFieldProperties.cs b/src/PinkParrot.Core/Schemas/NumberFieldProperties.cs similarity index 100% rename from src/pinkparrot_core/PinkParrot.Core/Schemas/NumberFieldProperties.cs rename to src/PinkParrot.Core/Schemas/NumberFieldProperties.cs diff --git a/src/pinkparrot_core/PinkParrot.Core/Schemas/Schema.cs b/src/PinkParrot.Core/Schemas/Schema.cs similarity index 100% rename from src/pinkparrot_core/PinkParrot.Core/Schemas/Schema.cs rename to src/PinkParrot.Core/Schemas/Schema.cs diff --git a/src/pinkparrot_core/PinkParrot.Core/Schemas/SchemaProperties.cs b/src/PinkParrot.Core/Schemas/SchemaProperties.cs similarity index 100% rename from src/pinkparrot_core/PinkParrot.Core/Schemas/SchemaProperties.cs rename to src/PinkParrot.Core/Schemas/SchemaProperties.cs diff --git a/src/pinkparrot_core/PinkParrot.Core/project.json b/src/PinkParrot.Core/project.json similarity index 78% rename from src/pinkparrot_core/PinkParrot.Core/project.json rename to src/PinkParrot.Core/project.json index dc9aa12ab..3c49796b0 100644 --- a/src/pinkparrot_core/PinkParrot.Core/project.json +++ b/src/PinkParrot.Core/project.json @@ -1,26 +1,22 @@ { - "version": "1.0.0-*", - "dependencies": { - "EventStore.ClientAPI.DotNetCore": "1.0.0", "NETStandard.Library": "1.6.0", "NodaTime": "2.0.0-alpha20160729", "PinkParrot.Infrastructure": "1.0.0-*", "protobuf-net": "2.1.0" }, - "frameworks": { "netcoreapp1.0": { "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0" + "version": "1.0.1" } } } }, - "tooling": { "defaultNamespace": "PinkParrot.Core" - } + }, + "version": "1.0.0-*" } diff --git a/src/pinkparrot_events/PinkParrot.Events/.gitignore b/src/PinkParrot.Events/.gitignore similarity index 100% rename from src/pinkparrot_events/PinkParrot.Events/.gitignore rename to src/PinkParrot.Events/.gitignore diff --git a/src/pinkparrot_events/PinkParrot.Events/PinkParrot.Events.xproj b/src/PinkParrot.Events/PinkParrot.Events.xproj similarity index 100% rename from src/pinkparrot_events/PinkParrot.Events/PinkParrot.Events.xproj rename to src/PinkParrot.Events/PinkParrot.Events.xproj diff --git a/src/pinkparrot_events/PinkParrot.Events/Schemas/FieldAdded.cs b/src/PinkParrot.Events/Schemas/FieldAdded.cs similarity index 100% rename from src/pinkparrot_events/PinkParrot.Events/Schemas/FieldAdded.cs rename to src/PinkParrot.Events/Schemas/FieldAdded.cs diff --git a/src/pinkparrot_events/PinkParrot.Events/Schemas/FieldDeleted.cs b/src/PinkParrot.Events/Schemas/FieldDeleted.cs similarity index 100% rename from src/pinkparrot_events/PinkParrot.Events/Schemas/FieldDeleted.cs rename to src/PinkParrot.Events/Schemas/FieldDeleted.cs diff --git a/src/pinkparrot_events/PinkParrot.Events/Schemas/FieldDisabled.cs b/src/PinkParrot.Events/Schemas/FieldDisabled.cs similarity index 100% rename from src/pinkparrot_events/PinkParrot.Events/Schemas/FieldDisabled.cs rename to src/PinkParrot.Events/Schemas/FieldDisabled.cs diff --git a/src/pinkparrot_events/PinkParrot.Events/Schemas/FieldEnabled.cs b/src/PinkParrot.Events/Schemas/FieldEnabled.cs similarity index 100% rename from src/pinkparrot_events/PinkParrot.Events/Schemas/FieldEnabled.cs rename to src/PinkParrot.Events/Schemas/FieldEnabled.cs diff --git a/src/pinkparrot_events/PinkParrot.Events/Schemas/FieldHidden.cs b/src/PinkParrot.Events/Schemas/FieldHidden.cs similarity index 100% rename from src/pinkparrot_events/PinkParrot.Events/Schemas/FieldHidden.cs rename to src/PinkParrot.Events/Schemas/FieldHidden.cs diff --git a/src/pinkparrot_events/PinkParrot.Events/Schemas/FieldShown.cs b/src/PinkParrot.Events/Schemas/FieldShown.cs similarity index 100% rename from src/pinkparrot_events/PinkParrot.Events/Schemas/FieldShown.cs rename to src/PinkParrot.Events/Schemas/FieldShown.cs diff --git a/src/pinkparrot_events/PinkParrot.Events/Schemas/FieldUpdated.cs b/src/PinkParrot.Events/Schemas/FieldUpdated.cs similarity index 100% rename from src/pinkparrot_events/PinkParrot.Events/Schemas/FieldUpdated.cs rename to src/PinkParrot.Events/Schemas/FieldUpdated.cs diff --git a/src/pinkparrot_events/PinkParrot.Events/Schemas/SchemaCreated.cs b/src/PinkParrot.Events/Schemas/SchemaCreated.cs similarity index 100% rename from src/pinkparrot_events/PinkParrot.Events/Schemas/SchemaCreated.cs rename to src/PinkParrot.Events/Schemas/SchemaCreated.cs diff --git a/src/pinkparrot_events/PinkParrot.Events/Schemas/SchemaDeleted.cs b/src/PinkParrot.Events/Schemas/SchemaDeleted.cs similarity index 100% rename from src/pinkparrot_events/PinkParrot.Events/Schemas/SchemaDeleted.cs rename to src/PinkParrot.Events/Schemas/SchemaDeleted.cs diff --git a/src/pinkparrot_events/PinkParrot.Events/Schemas/SchemaUpdated.cs b/src/PinkParrot.Events/Schemas/SchemaUpdated.cs similarity index 100% rename from src/pinkparrot_events/PinkParrot.Events/Schemas/SchemaUpdated.cs rename to src/PinkParrot.Events/Schemas/SchemaUpdated.cs diff --git a/src/pinkparrot_events/PinkParrot.Events/TenantEvent.cs b/src/PinkParrot.Events/TenantEvent.cs similarity index 100% rename from src/pinkparrot_events/PinkParrot.Events/TenantEvent.cs rename to src/PinkParrot.Events/TenantEvent.cs diff --git a/src/pinkparrot_events/PinkParrot.Events/project.json b/src/PinkParrot.Events/project.json similarity index 93% rename from src/pinkparrot_events/PinkParrot.Events/project.json rename to src/PinkParrot.Events/project.json index 8421dc721..c3c07f1fe 100644 --- a/src/pinkparrot_events/PinkParrot.Events/project.json +++ b/src/PinkParrot.Events/project.json @@ -13,7 +13,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0" + "version": "1.0.1" } } } diff --git a/src/pinkparrot_infrastructure/PinkParrot.Infrastructure.Tests/CollectionExtensionsTests.cs b/src/PinkParrot.Infrastructure.Tests/CollectionExtensionsTests.cs similarity index 100% rename from src/pinkparrot_infrastructure/PinkParrot.Infrastructure.Tests/CollectionExtensionsTests.cs rename to src/PinkParrot.Infrastructure.Tests/CollectionExtensionsTests.cs diff --git a/src/pinkparrot_infrastructure/PinkParrot.Infrastructure.Tests/DispatchingTests.cs b/src/PinkParrot.Infrastructure.Tests/DispatchingTests.cs similarity index 100% rename from src/pinkparrot_infrastructure/PinkParrot.Infrastructure.Tests/DispatchingTests.cs rename to src/PinkParrot.Infrastructure.Tests/DispatchingTests.cs diff --git a/src/pinkparrot_infrastructure/PinkParrot.Infrastructure.Tests/EnumExtensionsTests.cs b/src/PinkParrot.Infrastructure.Tests/EnumExtensionsTests.cs similarity index 100% rename from src/pinkparrot_infrastructure/PinkParrot.Infrastructure.Tests/EnumExtensionsTests.cs rename to src/PinkParrot.Infrastructure.Tests/EnumExtensionsTests.cs diff --git a/src/pinkparrot_infrastructure/PinkParrot.Infrastructure.Tests/GuardTests.cs b/src/PinkParrot.Infrastructure.Tests/GuardTests.cs similarity index 100% rename from src/pinkparrot_infrastructure/PinkParrot.Infrastructure.Tests/GuardTests.cs rename to src/PinkParrot.Infrastructure.Tests/GuardTests.cs diff --git a/src/pinkparrot_infrastructure/PinkParrot.Infrastructure.Tests/PinkParrot.Infrastructure.Tests.xproj b/src/PinkParrot.Infrastructure.Tests/PinkParrot.Infrastructure.Tests.xproj similarity index 100% rename from src/pinkparrot_infrastructure/PinkParrot.Infrastructure.Tests/PinkParrot.Infrastructure.Tests.xproj rename to src/PinkParrot.Infrastructure.Tests/PinkParrot.Infrastructure.Tests.xproj diff --git a/src/pinkparrot_infrastructure/PinkParrot.Infrastructure.Tests/PropertiesBagTests.cs b/src/PinkParrot.Infrastructure.Tests/PropertiesBagTests.cs similarity index 100% rename from src/pinkparrot_infrastructure/PinkParrot.Infrastructure.Tests/PropertiesBagTests.cs rename to src/PinkParrot.Infrastructure.Tests/PropertiesBagTests.cs diff --git a/src/pinkparrot_infrastructure/PinkParrot.Infrastructure.Tests/Reflection/PropertiesTypeAccessorTest.cs b/src/PinkParrot.Infrastructure.Tests/Reflection/PropertiesTypeAccessorTest.cs similarity index 100% rename from src/pinkparrot_infrastructure/PinkParrot.Infrastructure.Tests/Reflection/PropertiesTypeAccessorTest.cs rename to src/PinkParrot.Infrastructure.Tests/Reflection/PropertiesTypeAccessorTest.cs diff --git a/src/pinkparrot_infrastructure/PinkParrot.Infrastructure.Tests/Reflection/SimpleMapperTests.cs b/src/PinkParrot.Infrastructure.Tests/Reflection/SimpleMapperTests.cs similarity index 100% rename from src/pinkparrot_infrastructure/PinkParrot.Infrastructure.Tests/Reflection/SimpleMapperTests.cs rename to src/PinkParrot.Infrastructure.Tests/Reflection/SimpleMapperTests.cs diff --git a/src/pinkparrot_infrastructure/PinkParrot.Infrastructure.Tests/TypeNameRegistryTests.cs b/src/PinkParrot.Infrastructure.Tests/TypeNameRegistryTests.cs similarity index 100% rename from src/pinkparrot_infrastructure/PinkParrot.Infrastructure.Tests/TypeNameRegistryTests.cs rename to src/PinkParrot.Infrastructure.Tests/TypeNameRegistryTests.cs diff --git a/src/PinkParrot.Infrastructure.Tests/project.json b/src/PinkParrot.Infrastructure.Tests/project.json new file mode 100644 index 000000000..499886e3c --- /dev/null +++ b/src/PinkParrot.Infrastructure.Tests/project.json @@ -0,0 +1,29 @@ +{ + "buildOptions": { + "copyToOutput": { + "include": [ + "xunit.runner.json" + ] + } + }, + "dependencies": { + "dotnet-test-xunit": "2.2.0-preview2-build1029", + "PinkParrot.Infrastructure": "1.0.0-*", + "xunit": "2.2.0-beta3-build3402" + }, + "frameworks": { + "netcoreapp1.0": { + "dependencies": { + "Microsoft.NETCore.App": { + "type": "platform", + "version": "1.0.1" + } + } + } + }, + "testRunner": "xunit", + "tooling": { + "defaultNamespace": "PinkParrot.Core.Tests" + }, + "version": "1.0.0-*" +} \ No newline at end of file diff --git a/src/pinkparrot_core/PinkParrot.Core.Tests/xunit.runner.json b/src/PinkParrot.Infrastructure.Tests/xunit.runner.json similarity index 100% rename from src/pinkparrot_core/PinkParrot.Core.Tests/xunit.runner.json rename to src/PinkParrot.Infrastructure.Tests/xunit.runner.json diff --git a/src/pinkparrot_infrastructure/PinkParrot.Infrastructure/CQRS/Autofac/AutofacDomainObjectFactory.cs b/src/PinkParrot.Infrastructure/CQRS/Autofac/AutofacDomainObjectFactory.cs similarity index 100% rename from src/pinkparrot_infrastructure/PinkParrot.Infrastructure/CQRS/Autofac/AutofacDomainObjectFactory.cs rename to src/PinkParrot.Infrastructure/CQRS/Autofac/AutofacDomainObjectFactory.cs diff --git a/src/pinkparrot_infrastructure/PinkParrot.Infrastructure/CQRS/Commands/AggregateCommand.cs b/src/PinkParrot.Infrastructure/CQRS/Commands/AggregateCommand.cs similarity index 100% rename from src/pinkparrot_infrastructure/PinkParrot.Infrastructure/CQRS/Commands/AggregateCommand.cs rename to src/PinkParrot.Infrastructure/CQRS/Commands/AggregateCommand.cs diff --git a/src/pinkparrot_infrastructure/PinkParrot.Infrastructure/CQRS/Commands/CommandContext.cs b/src/PinkParrot.Infrastructure/CQRS/Commands/CommandContext.cs similarity index 100% rename from src/pinkparrot_infrastructure/PinkParrot.Infrastructure/CQRS/Commands/CommandContext.cs rename to src/PinkParrot.Infrastructure/CQRS/Commands/CommandContext.cs diff --git a/src/pinkparrot_infrastructure/PinkParrot.Infrastructure/CQRS/Commands/CommandHandler.cs b/src/PinkParrot.Infrastructure/CQRS/Commands/CommandHandler.cs similarity index 100% rename from src/pinkparrot_infrastructure/PinkParrot.Infrastructure/CQRS/Commands/CommandHandler.cs rename to src/PinkParrot.Infrastructure/CQRS/Commands/CommandHandler.cs diff --git a/src/pinkparrot_infrastructure/PinkParrot.Infrastructure/CQRS/Commands/CommandingExtensions.cs b/src/PinkParrot.Infrastructure/CQRS/Commands/CommandingExtensions.cs similarity index 100% rename from src/pinkparrot_infrastructure/PinkParrot.Infrastructure/CQRS/Commands/CommandingExtensions.cs rename to src/PinkParrot.Infrastructure/CQRS/Commands/CommandingExtensions.cs diff --git a/src/pinkparrot_infrastructure/PinkParrot.Infrastructure/CQRS/Commands/IAggregateCommand.cs b/src/PinkParrot.Infrastructure/CQRS/Commands/IAggregateCommand.cs similarity index 100% rename from src/pinkparrot_infrastructure/PinkParrot.Infrastructure/CQRS/Commands/IAggregateCommand.cs rename to src/PinkParrot.Infrastructure/CQRS/Commands/IAggregateCommand.cs diff --git a/src/pinkparrot_infrastructure/PinkParrot.Infrastructure/CQRS/Commands/ICommand.cs b/src/PinkParrot.Infrastructure/CQRS/Commands/ICommand.cs similarity index 100% rename from src/pinkparrot_infrastructure/PinkParrot.Infrastructure/CQRS/Commands/ICommand.cs rename to src/PinkParrot.Infrastructure/CQRS/Commands/ICommand.cs diff --git a/src/pinkparrot_infrastructure/PinkParrot.Infrastructure/CQRS/Commands/ICommandBus.cs b/src/PinkParrot.Infrastructure/CQRS/Commands/ICommandBus.cs similarity index 100% rename from src/pinkparrot_infrastructure/PinkParrot.Infrastructure/CQRS/Commands/ICommandBus.cs rename to src/PinkParrot.Infrastructure/CQRS/Commands/ICommandBus.cs diff --git a/src/pinkparrot_infrastructure/PinkParrot.Infrastructure/CQRS/Commands/ICommandHandler.cs b/src/PinkParrot.Infrastructure/CQRS/Commands/ICommandHandler.cs similarity index 100% rename from src/pinkparrot_infrastructure/PinkParrot.Infrastructure/CQRS/Commands/ICommandHandler.cs rename to src/PinkParrot.Infrastructure/CQRS/Commands/ICommandHandler.cs diff --git a/src/pinkparrot_infrastructure/PinkParrot.Infrastructure/CQRS/Commands/IDomainObjectFactory.cs b/src/PinkParrot.Infrastructure/CQRS/Commands/IDomainObjectFactory.cs similarity index 100% rename from src/pinkparrot_infrastructure/PinkParrot.Infrastructure/CQRS/Commands/IDomainObjectFactory.cs rename to src/PinkParrot.Infrastructure/CQRS/Commands/IDomainObjectFactory.cs diff --git a/src/pinkparrot_infrastructure/PinkParrot.Infrastructure/CQRS/Commands/IDomainObjectRepository.cs b/src/PinkParrot.Infrastructure/CQRS/Commands/IDomainObjectRepository.cs similarity index 100% rename from src/pinkparrot_infrastructure/PinkParrot.Infrastructure/CQRS/Commands/IDomainObjectRepository.cs rename to src/PinkParrot.Infrastructure/CQRS/Commands/IDomainObjectRepository.cs diff --git a/src/pinkparrot_infrastructure/PinkParrot.Infrastructure/CQRS/Commands/InMemoryCommandBus.cs b/src/PinkParrot.Infrastructure/CQRS/Commands/InMemoryCommandBus.cs similarity index 100% rename from src/pinkparrot_infrastructure/PinkParrot.Infrastructure/CQRS/Commands/InMemoryCommandBus.cs rename to src/PinkParrot.Infrastructure/CQRS/Commands/InMemoryCommandBus.cs diff --git a/src/pinkparrot_infrastructure/PinkParrot.Infrastructure/CQRS/CommonHeaders.cs b/src/PinkParrot.Infrastructure/CQRS/CommonHeaders.cs similarity index 100% rename from src/pinkparrot_infrastructure/PinkParrot.Infrastructure/CQRS/CommonHeaders.cs rename to src/PinkParrot.Infrastructure/CQRS/CommonHeaders.cs diff --git a/src/pinkparrot_infrastructure/PinkParrot.Infrastructure/CQRS/DomainObject.cs b/src/PinkParrot.Infrastructure/CQRS/DomainObject.cs similarity index 100% rename from src/pinkparrot_infrastructure/PinkParrot.Infrastructure/CQRS/DomainObject.cs rename to src/PinkParrot.Infrastructure/CQRS/DomainObject.cs diff --git a/src/pinkparrot_infrastructure/PinkParrot.Infrastructure/CQRS/Envelope.cs b/src/PinkParrot.Infrastructure/CQRS/Envelope.cs similarity index 100% rename from src/pinkparrot_infrastructure/PinkParrot.Infrastructure/CQRS/Envelope.cs rename to src/PinkParrot.Infrastructure/CQRS/Envelope.cs diff --git a/src/pinkparrot_infrastructure/PinkParrot.Infrastructure/CQRS/EnvelopeExtensions.cs b/src/PinkParrot.Infrastructure/CQRS/EnvelopeExtensions.cs similarity index 100% rename from src/pinkparrot_infrastructure/PinkParrot.Infrastructure/CQRS/EnvelopeExtensions.cs rename to src/PinkParrot.Infrastructure/CQRS/EnvelopeExtensions.cs diff --git a/src/pinkparrot_infrastructure/PinkParrot.Infrastructure/CQRS/EnvelopeFactory.cs b/src/PinkParrot.Infrastructure/CQRS/EnvelopeFactory.cs similarity index 100% rename from src/pinkparrot_infrastructure/PinkParrot.Infrastructure/CQRS/EnvelopeFactory.cs rename to src/PinkParrot.Infrastructure/CQRS/EnvelopeFactory.cs diff --git a/src/pinkparrot_infrastructure/PinkParrot.Infrastructure/CQRS/EnvelopeHeaders.cs b/src/PinkParrot.Infrastructure/CQRS/EnvelopeHeaders.cs similarity index 100% rename from src/pinkparrot_infrastructure/PinkParrot.Infrastructure/CQRS/EnvelopeHeaders.cs rename to src/PinkParrot.Infrastructure/CQRS/EnvelopeHeaders.cs diff --git a/src/pinkparrot_infrastructure/PinkParrot.Infrastructure/CQRS/EventStore/DefaultNameResolver.cs b/src/PinkParrot.Infrastructure/CQRS/EventStore/DefaultNameResolver.cs similarity index 100% rename from src/pinkparrot_infrastructure/PinkParrot.Infrastructure/CQRS/EventStore/DefaultNameResolver.cs rename to src/PinkParrot.Infrastructure/CQRS/EventStore/DefaultNameResolver.cs diff --git a/src/pinkparrot_infrastructure/PinkParrot.Infrastructure/CQRS/EventStore/EventStoreBus.cs b/src/PinkParrot.Infrastructure/CQRS/EventStore/EventStoreBus.cs similarity index 100% rename from src/pinkparrot_infrastructure/PinkParrot.Infrastructure/CQRS/EventStore/EventStoreBus.cs rename to src/PinkParrot.Infrastructure/CQRS/EventStore/EventStoreBus.cs diff --git a/src/pinkparrot_infrastructure/PinkParrot.Infrastructure/CQRS/EventStore/EventStoreDomainObjectRepository.cs b/src/PinkParrot.Infrastructure/CQRS/EventStore/EventStoreDomainObjectRepository.cs similarity index 100% rename from src/pinkparrot_infrastructure/PinkParrot.Infrastructure/CQRS/EventStore/EventStoreDomainObjectRepository.cs rename to src/PinkParrot.Infrastructure/CQRS/EventStore/EventStoreDomainObjectRepository.cs diff --git a/src/pinkparrot_infrastructure/PinkParrot.Infrastructure/CQRS/EventStore/EventStoreFormatter.cs b/src/PinkParrot.Infrastructure/CQRS/EventStore/EventStoreFormatter.cs similarity index 100% rename from src/pinkparrot_infrastructure/PinkParrot.Infrastructure/CQRS/EventStore/EventStoreFormatter.cs rename to src/PinkParrot.Infrastructure/CQRS/EventStore/EventStoreFormatter.cs diff --git a/src/pinkparrot_infrastructure/PinkParrot.Infrastructure/CQRS/EventStore/IStreamNameResolver.cs b/src/PinkParrot.Infrastructure/CQRS/EventStore/IStreamNameResolver.cs similarity index 100% rename from src/pinkparrot_infrastructure/PinkParrot.Infrastructure/CQRS/EventStore/IStreamNameResolver.cs rename to src/PinkParrot.Infrastructure/CQRS/EventStore/IStreamNameResolver.cs diff --git a/src/pinkparrot_infrastructure/PinkParrot.Infrastructure/CQRS/EventStore/IStreamPositionStorage.cs b/src/PinkParrot.Infrastructure/CQRS/EventStore/IStreamPositionStorage.cs similarity index 100% rename from src/pinkparrot_infrastructure/PinkParrot.Infrastructure/CQRS/EventStore/IStreamPositionStorage.cs rename to src/PinkParrot.Infrastructure/CQRS/EventStore/IStreamPositionStorage.cs diff --git a/src/pinkparrot_infrastructure/PinkParrot.Infrastructure/CQRS/Events/ICatchEventConsumer.cs b/src/PinkParrot.Infrastructure/CQRS/Events/ICatchEventConsumer.cs similarity index 100% rename from src/pinkparrot_infrastructure/PinkParrot.Infrastructure/CQRS/Events/ICatchEventConsumer.cs rename to src/PinkParrot.Infrastructure/CQRS/Events/ICatchEventConsumer.cs diff --git a/src/pinkparrot_infrastructure/PinkParrot.Infrastructure/CQRS/Events/IEvent.cs b/src/PinkParrot.Infrastructure/CQRS/Events/IEvent.cs similarity index 100% rename from src/pinkparrot_infrastructure/PinkParrot.Infrastructure/CQRS/Events/IEvent.cs rename to src/PinkParrot.Infrastructure/CQRS/Events/IEvent.cs diff --git a/src/pinkparrot_infrastructure/PinkParrot.Infrastructure/CQRS/Events/IEventConsumer.cs b/src/PinkParrot.Infrastructure/CQRS/Events/IEventConsumer.cs similarity index 100% rename from src/pinkparrot_infrastructure/PinkParrot.Infrastructure/CQRS/Events/IEventConsumer.cs rename to src/PinkParrot.Infrastructure/CQRS/Events/IEventConsumer.cs diff --git a/src/pinkparrot_infrastructure/PinkParrot.Infrastructure/CQRS/Events/ILiveEventConsumer.cs b/src/PinkParrot.Infrastructure/CQRS/Events/ILiveEventConsumer.cs similarity index 100% rename from src/pinkparrot_infrastructure/PinkParrot.Infrastructure/CQRS/Events/ILiveEventConsumer.cs rename to src/PinkParrot.Infrastructure/CQRS/Events/ILiveEventConsumer.cs diff --git a/src/pinkparrot_infrastructure/PinkParrot.Infrastructure/CQRS/IAggregate.cs b/src/PinkParrot.Infrastructure/CQRS/IAggregate.cs similarity index 100% rename from src/pinkparrot_infrastructure/PinkParrot.Infrastructure/CQRS/IAggregate.cs rename to src/PinkParrot.Infrastructure/CQRS/IAggregate.cs diff --git a/src/pinkparrot_infrastructure/PinkParrot.Infrastructure/CQRS/ITenantAggregate.cs b/src/PinkParrot.Infrastructure/CQRS/ITenantAggregate.cs similarity index 100% rename from src/pinkparrot_infrastructure/PinkParrot.Infrastructure/CQRS/ITenantAggregate.cs rename to src/PinkParrot.Infrastructure/CQRS/ITenantAggregate.cs diff --git a/src/pinkparrot_infrastructure/PinkParrot.Infrastructure/CollectionExtensions.cs b/src/PinkParrot.Infrastructure/CollectionExtensions.cs similarity index 100% rename from src/pinkparrot_infrastructure/PinkParrot.Infrastructure/CollectionExtensions.cs rename to src/PinkParrot.Infrastructure/CollectionExtensions.cs diff --git a/src/pinkparrot_infrastructure/PinkParrot.Infrastructure/Dispatching/ActionContextDispatcher.cs b/src/PinkParrot.Infrastructure/Dispatching/ActionContextDispatcher.cs similarity index 100% rename from src/pinkparrot_infrastructure/PinkParrot.Infrastructure/Dispatching/ActionContextDispatcher.cs rename to src/PinkParrot.Infrastructure/Dispatching/ActionContextDispatcher.cs diff --git a/src/pinkparrot_infrastructure/PinkParrot.Infrastructure/Dispatching/ActionContextDispatcherFactory.cs b/src/PinkParrot.Infrastructure/Dispatching/ActionContextDispatcherFactory.cs similarity index 100% rename from src/pinkparrot_infrastructure/PinkParrot.Infrastructure/Dispatching/ActionContextDispatcherFactory.cs rename to src/PinkParrot.Infrastructure/Dispatching/ActionContextDispatcherFactory.cs diff --git a/src/pinkparrot_infrastructure/PinkParrot.Infrastructure/Dispatching/ActionDispatcher.cs b/src/PinkParrot.Infrastructure/Dispatching/ActionDispatcher.cs similarity index 100% rename from src/pinkparrot_infrastructure/PinkParrot.Infrastructure/Dispatching/ActionDispatcher.cs rename to src/PinkParrot.Infrastructure/Dispatching/ActionDispatcher.cs diff --git a/src/pinkparrot_infrastructure/PinkParrot.Infrastructure/Dispatching/ActionDispatcherFactory.cs b/src/PinkParrot.Infrastructure/Dispatching/ActionDispatcherFactory.cs similarity index 100% rename from src/pinkparrot_infrastructure/PinkParrot.Infrastructure/Dispatching/ActionDispatcherFactory.cs rename to src/PinkParrot.Infrastructure/Dispatching/ActionDispatcherFactory.cs diff --git a/src/pinkparrot_infrastructure/PinkParrot.Infrastructure/Dispatching/DispatchExtensions.cs b/src/PinkParrot.Infrastructure/Dispatching/DispatchExtensions.cs similarity index 100% rename from src/pinkparrot_infrastructure/PinkParrot.Infrastructure/Dispatching/DispatchExtensions.cs rename to src/PinkParrot.Infrastructure/Dispatching/DispatchExtensions.cs diff --git a/src/pinkparrot_infrastructure/PinkParrot.Infrastructure/Dispatching/FuncContextDispatcher.cs b/src/PinkParrot.Infrastructure/Dispatching/FuncContextDispatcher.cs similarity index 100% rename from src/pinkparrot_infrastructure/PinkParrot.Infrastructure/Dispatching/FuncContextDispatcher.cs rename to src/PinkParrot.Infrastructure/Dispatching/FuncContextDispatcher.cs diff --git a/src/pinkparrot_infrastructure/PinkParrot.Infrastructure/Dispatching/FuncContextDispatcherFactory.cs b/src/PinkParrot.Infrastructure/Dispatching/FuncContextDispatcherFactory.cs similarity index 100% rename from src/pinkparrot_infrastructure/PinkParrot.Infrastructure/Dispatching/FuncContextDispatcherFactory.cs rename to src/PinkParrot.Infrastructure/Dispatching/FuncContextDispatcherFactory.cs diff --git a/src/pinkparrot_infrastructure/PinkParrot.Infrastructure/Dispatching/FuncDispatcher.cs b/src/PinkParrot.Infrastructure/Dispatching/FuncDispatcher.cs similarity index 100% rename from src/pinkparrot_infrastructure/PinkParrot.Infrastructure/Dispatching/FuncDispatcher.cs rename to src/PinkParrot.Infrastructure/Dispatching/FuncDispatcher.cs diff --git a/src/pinkparrot_infrastructure/PinkParrot.Infrastructure/Dispatching/FuncDispatcherFactory.cs b/src/PinkParrot.Infrastructure/Dispatching/FuncDispatcherFactory.cs similarity index 100% rename from src/pinkparrot_infrastructure/PinkParrot.Infrastructure/Dispatching/FuncDispatcherFactory.cs rename to src/PinkParrot.Infrastructure/Dispatching/FuncDispatcherFactory.cs diff --git a/src/pinkparrot_infrastructure/PinkParrot.Infrastructure/Dispatching/Helper.cs b/src/PinkParrot.Infrastructure/Dispatching/Helper.cs similarity index 100% rename from src/pinkparrot_infrastructure/PinkParrot.Infrastructure/Dispatching/Helper.cs rename to src/PinkParrot.Infrastructure/Dispatching/Helper.cs diff --git a/src/pinkparrot_infrastructure/PinkParrot.Infrastructure/DomainException.cs b/src/PinkParrot.Infrastructure/DomainException.cs similarity index 100% rename from src/pinkparrot_infrastructure/PinkParrot.Infrastructure/DomainException.cs rename to src/PinkParrot.Infrastructure/DomainException.cs diff --git a/src/pinkparrot_infrastructure/PinkParrot.Infrastructure/DomainObjectDeletedException.cs b/src/PinkParrot.Infrastructure/DomainObjectDeletedException.cs similarity index 100% rename from src/pinkparrot_infrastructure/PinkParrot.Infrastructure/DomainObjectDeletedException.cs rename to src/PinkParrot.Infrastructure/DomainObjectDeletedException.cs diff --git a/src/pinkparrot_infrastructure/PinkParrot.Infrastructure/DomainObjectException.cs b/src/PinkParrot.Infrastructure/DomainObjectException.cs similarity index 100% rename from src/pinkparrot_infrastructure/PinkParrot.Infrastructure/DomainObjectException.cs rename to src/PinkParrot.Infrastructure/DomainObjectException.cs diff --git a/src/pinkparrot_infrastructure/PinkParrot.Infrastructure/DomainObjectNotFoundException.cs b/src/PinkParrot.Infrastructure/DomainObjectNotFoundException.cs similarity index 100% rename from src/pinkparrot_infrastructure/PinkParrot.Infrastructure/DomainObjectNotFoundException.cs rename to src/PinkParrot.Infrastructure/DomainObjectNotFoundException.cs diff --git a/src/pinkparrot_infrastructure/PinkParrot.Infrastructure/DomainObjectVersionException.cs b/src/PinkParrot.Infrastructure/DomainObjectVersionException.cs similarity index 100% rename from src/pinkparrot_infrastructure/PinkParrot.Infrastructure/DomainObjectVersionException.cs rename to src/PinkParrot.Infrastructure/DomainObjectVersionException.cs diff --git a/src/pinkparrot_infrastructure/PinkParrot.Infrastructure/EnumExtensions.cs b/src/PinkParrot.Infrastructure/EnumExtensions.cs similarity index 100% rename from src/pinkparrot_infrastructure/PinkParrot.Infrastructure/EnumExtensions.cs rename to src/PinkParrot.Infrastructure/EnumExtensions.cs diff --git a/src/pinkparrot_infrastructure/PinkParrot.Infrastructure/Extensions.cs b/src/PinkParrot.Infrastructure/Extensions.cs similarity index 100% rename from src/pinkparrot_infrastructure/PinkParrot.Infrastructure/Extensions.cs rename to src/PinkParrot.Infrastructure/Extensions.cs diff --git a/src/pinkparrot_infrastructure/PinkParrot.Infrastructure/Guard.cs b/src/PinkParrot.Infrastructure/Guard.cs similarity index 100% rename from src/pinkparrot_infrastructure/PinkParrot.Infrastructure/Guard.cs rename to src/PinkParrot.Infrastructure/Guard.cs diff --git a/src/pinkparrot_infrastructure/PinkParrot.Infrastructure/IValidatable.cs b/src/PinkParrot.Infrastructure/IValidatable.cs similarity index 100% rename from src/pinkparrot_infrastructure/PinkParrot.Infrastructure/IValidatable.cs rename to src/PinkParrot.Infrastructure/IValidatable.cs diff --git a/src/pinkparrot_infrastructure/PinkParrot.Infrastructure/Json/PropertiesBagConverter.cs b/src/PinkParrot.Infrastructure/Json/PropertiesBagConverter.cs similarity index 100% rename from src/pinkparrot_infrastructure/PinkParrot.Infrastructure/Json/PropertiesBagConverter.cs rename to src/PinkParrot.Infrastructure/Json/PropertiesBagConverter.cs diff --git a/src/pinkparrot_infrastructure/PinkParrot.Infrastructure/Json/TypeNameSerializationBinder.cs b/src/PinkParrot.Infrastructure/Json/TypeNameSerializationBinder.cs similarity index 100% rename from src/pinkparrot_infrastructure/PinkParrot.Infrastructure/Json/TypeNameSerializationBinder.cs rename to src/PinkParrot.Infrastructure/Json/TypeNameSerializationBinder.cs diff --git a/src/pinkparrot_infrastructure/PinkParrot.Infrastructure/PinkParrot.Infrastructure.xproj b/src/PinkParrot.Infrastructure/PinkParrot.Infrastructure.xproj similarity index 90% rename from src/pinkparrot_infrastructure/PinkParrot.Infrastructure/PinkParrot.Infrastructure.xproj rename to src/PinkParrot.Infrastructure/PinkParrot.Infrastructure.xproj index c7fc160b4..7fe1c9497 100644 --- a/src/pinkparrot_infrastructure/PinkParrot.Infrastructure/PinkParrot.Infrastructure.xproj +++ b/src/PinkParrot.Infrastructure/PinkParrot.Infrastructure.xproj @@ -4,7 +4,6 @@ 14.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - bd1c30a8-8ffa-4a92-a9bd-b67b1cddd84c @@ -13,9 +12,13 @@ .\bin\ v4.5.2 - 2.0 - + + + + + + \ No newline at end of file diff --git a/src/pinkparrot_infrastructure/PinkParrot.Infrastructure/PropertiesBag.cs b/src/PinkParrot.Infrastructure/PropertiesBag.cs similarity index 100% rename from src/pinkparrot_infrastructure/PinkParrot.Infrastructure/PropertiesBag.cs rename to src/PinkParrot.Infrastructure/PropertiesBag.cs diff --git a/src/pinkparrot_infrastructure/PinkParrot.Infrastructure/PropertyValue.cs b/src/PinkParrot.Infrastructure/PropertyValue.cs similarity index 100% rename from src/pinkparrot_infrastructure/PinkParrot.Infrastructure/PropertyValue.cs rename to src/PinkParrot.Infrastructure/PropertyValue.cs diff --git a/src/pinkparrot_infrastructure/PinkParrot.Infrastructure/Reflection/IPropertyAccessor.cs b/src/PinkParrot.Infrastructure/Reflection/IPropertyAccessor.cs similarity index 100% rename from src/pinkparrot_infrastructure/PinkParrot.Infrastructure/Reflection/IPropertyAccessor.cs rename to src/PinkParrot.Infrastructure/Reflection/IPropertyAccessor.cs diff --git a/src/pinkparrot_infrastructure/PinkParrot.Infrastructure/Reflection/PropertiesTypeAccessor.cs b/src/PinkParrot.Infrastructure/Reflection/PropertiesTypeAccessor.cs similarity index 100% rename from src/pinkparrot_infrastructure/PinkParrot.Infrastructure/Reflection/PropertiesTypeAccessor.cs rename to src/PinkParrot.Infrastructure/Reflection/PropertiesTypeAccessor.cs diff --git a/src/pinkparrot_infrastructure/PinkParrot.Infrastructure/Reflection/PropertyAccessor.cs b/src/PinkParrot.Infrastructure/Reflection/PropertyAccessor.cs similarity index 100% rename from src/pinkparrot_infrastructure/PinkParrot.Infrastructure/Reflection/PropertyAccessor.cs rename to src/PinkParrot.Infrastructure/Reflection/PropertyAccessor.cs diff --git a/src/pinkparrot_infrastructure/PinkParrot.Infrastructure/Reflection/ReflectionExtensions.cs b/src/PinkParrot.Infrastructure/Reflection/ReflectionExtensions.cs similarity index 100% rename from src/pinkparrot_infrastructure/PinkParrot.Infrastructure/Reflection/ReflectionExtensions.cs rename to src/PinkParrot.Infrastructure/Reflection/ReflectionExtensions.cs diff --git a/src/pinkparrot_infrastructure/PinkParrot.Infrastructure/Reflection/SimpleMapper.cs b/src/PinkParrot.Infrastructure/Reflection/SimpleMapper.cs similarity index 100% rename from src/pinkparrot_infrastructure/PinkParrot.Infrastructure/Reflection/SimpleMapper.cs rename to src/PinkParrot.Infrastructure/Reflection/SimpleMapper.cs diff --git a/src/pinkparrot_infrastructure/PinkParrot.Infrastructure/Tasks/TaskExtensions.cs b/src/PinkParrot.Infrastructure/Tasks/TaskExtensions.cs similarity index 100% rename from src/pinkparrot_infrastructure/PinkParrot.Infrastructure/Tasks/TaskExtensions.cs rename to src/PinkParrot.Infrastructure/Tasks/TaskExtensions.cs diff --git a/src/pinkparrot_infrastructure/PinkParrot.Infrastructure/Tasks/TaskHelper.cs b/src/PinkParrot.Infrastructure/Tasks/TaskHelper.cs similarity index 100% rename from src/pinkparrot_infrastructure/PinkParrot.Infrastructure/Tasks/TaskHelper.cs rename to src/PinkParrot.Infrastructure/Tasks/TaskHelper.cs diff --git a/src/pinkparrot_infrastructure/PinkParrot.Infrastructure/TypeNameAttribute.cs b/src/PinkParrot.Infrastructure/TypeNameAttribute.cs similarity index 100% rename from src/pinkparrot_infrastructure/PinkParrot.Infrastructure/TypeNameAttribute.cs rename to src/PinkParrot.Infrastructure/TypeNameAttribute.cs diff --git a/src/pinkparrot_infrastructure/PinkParrot.Infrastructure/TypeNameRegistry.cs b/src/PinkParrot.Infrastructure/TypeNameRegistry.cs similarity index 100% rename from src/pinkparrot_infrastructure/PinkParrot.Infrastructure/TypeNameRegistry.cs rename to src/PinkParrot.Infrastructure/TypeNameRegistry.cs diff --git a/src/pinkparrot_infrastructure/PinkParrot.Infrastructure/ValidationError.cs b/src/PinkParrot.Infrastructure/ValidationError.cs similarity index 100% rename from src/pinkparrot_infrastructure/PinkParrot.Infrastructure/ValidationError.cs rename to src/PinkParrot.Infrastructure/ValidationError.cs diff --git a/src/pinkparrot_infrastructure/PinkParrot.Infrastructure/ValidationException.cs b/src/PinkParrot.Infrastructure/ValidationException.cs similarity index 100% rename from src/pinkparrot_infrastructure/PinkParrot.Infrastructure/ValidationException.cs rename to src/PinkParrot.Infrastructure/ValidationException.cs diff --git a/src/pinkparrot_infrastructure/PinkParrot.Infrastructure/ValidationExtensions.cs b/src/PinkParrot.Infrastructure/ValidationExtensions.cs similarity index 100% rename from src/pinkparrot_infrastructure/PinkParrot.Infrastructure/ValidationExtensions.cs rename to src/PinkParrot.Infrastructure/ValidationExtensions.cs diff --git a/src/pinkparrot_infrastructure/PinkParrot.Infrastructure/project.json b/src/PinkParrot.Infrastructure/project.json similarity index 78% rename from src/pinkparrot_infrastructure/PinkParrot.Infrastructure/project.json rename to src/PinkParrot.Infrastructure/project.json index 9b7cd192c..c04b93ec3 100644 --- a/src/pinkparrot_infrastructure/PinkParrot.Infrastructure/project.json +++ b/src/PinkParrot.Infrastructure/project.json @@ -2,11 +2,10 @@ "version": "1.0.0-*", "dependencies": { "Autofac": "4.1.0", - "EventStore.ClientAPI.DotNetCore": "1.0.0", + "EventStore.ClientAPI.NetCore": "0.0.1-alpha", "Microsoft.Extensions.Logging": "1.0.0", - "MongoDB.Driver": "2.3.0-rc1", "NETStandard.Library": "1.6.0", - "Newtonsoft.Json": "9.0.1", + "Newtonsoft.Json": "9.0.2-beta1", "NodaTime": "2.0.0-alpha20160729", "protobuf-net": "2.1.0", "System.Linq": "4.1.0", @@ -17,7 +16,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0" + "version": "1.0.1" } } } diff --git a/src/pinkparrot_read/PinkParrot.Read/Services/ITenantProvider.cs b/src/PinkParrot.Read/Infrastructure/Services/ITenantProvider.cs similarity index 91% rename from src/pinkparrot_read/PinkParrot.Read/Services/ITenantProvider.cs rename to src/PinkParrot.Read/Infrastructure/Services/ITenantProvider.cs index 89817f790..b1e1cdfcb 100644 --- a/src/pinkparrot_read/PinkParrot.Read/Services/ITenantProvider.cs +++ b/src/PinkParrot.Read/Infrastructure/Services/ITenantProvider.cs @@ -9,7 +9,7 @@ using System; using System.Threading.Tasks; -namespace PinkParrot.Read.Services +namespace PinkParrot.Read.Infrastructure.Services { public interface ITenantProvider { diff --git a/src/pinkparrot_read/PinkParrot.Read/Services/Implementations/TenantProvider.cs b/src/PinkParrot.Read/Infrastructure/Services/Implementations/TenantProvider.cs similarity index 90% rename from src/pinkparrot_read/PinkParrot.Read/Services/Implementations/TenantProvider.cs rename to src/PinkParrot.Read/Infrastructure/Services/Implementations/TenantProvider.cs index c5c7a5649..65bc5637f 100644 --- a/src/pinkparrot_read/PinkParrot.Read/Services/Implementations/TenantProvider.cs +++ b/src/PinkParrot.Read/Infrastructure/Services/Implementations/TenantProvider.cs @@ -9,7 +9,7 @@ using System; using System.Threading.Tasks; -namespace PinkParrot.Read.Services.Implementations +namespace PinkParrot.Read.Infrastructure.Services.Implementations { public sealed class TenantProvider : ITenantProvider { diff --git a/src/pinkparrot_read/PinkParrot.Read/PinkParrot.Read.xproj b/src/PinkParrot.Read/PinkParrot.Read.xproj similarity index 100% rename from src/pinkparrot_read/PinkParrot.Read/PinkParrot.Read.xproj rename to src/PinkParrot.Read/PinkParrot.Read.xproj diff --git a/src/pinkparrot_read/PinkParrot.Read/Repositories/IEntity.cs b/src/PinkParrot.Read/Schemas/Repositories/IEntity.cs similarity index 91% rename from src/pinkparrot_read/PinkParrot.Read/Repositories/IEntity.cs rename to src/PinkParrot.Read/Schemas/Repositories/IEntity.cs index 953657adc..7db15490f 100644 --- a/src/pinkparrot_read/PinkParrot.Read/Repositories/IEntity.cs +++ b/src/PinkParrot.Read/Schemas/Repositories/IEntity.cs @@ -8,7 +8,7 @@ using System; -namespace PinkParrot.Read.Repositories +namespace PinkParrot.Read.Schemas.Repositories { public interface IEntity { diff --git a/src/pinkparrot_read/PinkParrot.Read/Repositories/ISchemaEntity.cs b/src/PinkParrot.Read/Schemas/Repositories/ISchemaEntity.cs similarity index 90% rename from src/pinkparrot_read/PinkParrot.Read/Repositories/ISchemaEntity.cs rename to src/PinkParrot.Read/Schemas/Repositories/ISchemaEntity.cs index 0ac8231f5..1bae35aed 100644 --- a/src/pinkparrot_read/PinkParrot.Read/Repositories/ISchemaEntity.cs +++ b/src/PinkParrot.Read/Schemas/Repositories/ISchemaEntity.cs @@ -5,7 +5,7 @@ // Copyright (c) PinkParrot Group // All rights reserved. // ========================================================================== -namespace PinkParrot.Read.Repositories +namespace PinkParrot.Read.Schemas.Repositories { public interface ISchemaEntity : ITenantEntity { diff --git a/src/PinkParrot.Read/Schemas/Repositories/ISchemaEntityWithSchema.cs b/src/PinkParrot.Read/Schemas/Repositories/ISchemaEntityWithSchema.cs new file mode 100644 index 000000000..04e33ad32 --- /dev/null +++ b/src/PinkParrot.Read/Schemas/Repositories/ISchemaEntityWithSchema.cs @@ -0,0 +1,17 @@ +// ========================================================================== +// EntityWithSchema.cs +// PinkParrot Headless CMS +// ========================================================================== +// Copyright (c) PinkParrot Group +// All rights reserved. +// ========================================================================== + +using PinkParrot.Core.Schemas; + +namespace PinkParrot.Read.Schemas.Repositories +{ + public interface ISchemaEntityWithSchema : ISchemaEntity + { + Schema Schema { get; } + } +} diff --git a/src/pinkparrot_read/PinkParrot.Read/Repositories/ISchemaRepository.cs b/src/PinkParrot.Read/Schemas/Repositories/ISchemaRepository.cs similarity index 75% rename from src/pinkparrot_read/PinkParrot.Read/Repositories/ISchemaRepository.cs rename to src/PinkParrot.Read/Schemas/Repositories/ISchemaRepository.cs index 853be2a25..597164033 100644 --- a/src/pinkparrot_read/PinkParrot.Read/Repositories/ISchemaRepository.cs +++ b/src/PinkParrot.Read/Schemas/Repositories/ISchemaRepository.cs @@ -10,7 +10,7 @@ using System; using System.Collections.Generic; using System.Threading.Tasks; -namespace PinkParrot.Read.Repositories +namespace PinkParrot.Read.Schemas.Repositories { public interface ISchemaRepository { @@ -18,8 +18,8 @@ namespace PinkParrot.Read.Repositories Task FindSchemaIdAsync(Guid tenantId, string name); - Task FindSchemaAsync(Guid tenantId, string name); + Task FindSchemaAsync(Guid tenantId, string name); - Task FindSchemaAsync(Guid schemaId); + Task FindSchemaAsync(Guid schemaId); } } diff --git a/src/pinkparrot_read/PinkParrot.Read/Repositories/ITenantEntity.cs b/src/PinkParrot.Read/Schemas/Repositories/ITenantEntity.cs similarity index 90% rename from src/pinkparrot_read/PinkParrot.Read/Repositories/ITenantEntity.cs rename to src/PinkParrot.Read/Schemas/Repositories/ITenantEntity.cs index db84f6935..f4f2cab7a 100644 --- a/src/pinkparrot_read/PinkParrot.Read/Repositories/ITenantEntity.cs +++ b/src/PinkParrot.Read/Schemas/Repositories/ITenantEntity.cs @@ -8,7 +8,7 @@ using System; -namespace PinkParrot.Read.Repositories +namespace PinkParrot.Read.Schemas.Repositories { public interface ITenantEntity : IEntity { diff --git a/src/pinkparrot_read/PinkParrot.Read/Services/ISchemaProvider.cs b/src/PinkParrot.Read/Schemas/Services/ISchemaProvider.cs similarity index 92% rename from src/pinkparrot_read/PinkParrot.Read/Services/ISchemaProvider.cs rename to src/PinkParrot.Read/Schemas/Services/ISchemaProvider.cs index eac10cb9a..34576e382 100644 --- a/src/pinkparrot_read/PinkParrot.Read/Services/ISchemaProvider.cs +++ b/src/PinkParrot.Read/Schemas/Services/ISchemaProvider.cs @@ -9,7 +9,7 @@ using System; using System.Threading.Tasks; -namespace PinkParrot.Read.Services +namespace PinkParrot.Read.Schemas.Services { public interface ISchemaProvider { diff --git a/src/pinkparrot_read/PinkParrot.Read/Services/Implementations/CachingSchemaProvider.cs b/src/PinkParrot.Read/Schemas/Services/Implementations/CachingSchemaProvider.cs similarity index 84% rename from src/pinkparrot_read/PinkParrot.Read/Services/Implementations/CachingSchemaProvider.cs rename to src/PinkParrot.Read/Schemas/Services/Implementations/CachingSchemaProvider.cs index d2d00b58e..466365a57 100644 --- a/src/pinkparrot_read/PinkParrot.Read/Services/Implementations/CachingSchemaProvider.cs +++ b/src/PinkParrot.Read/Schemas/Services/Implementations/CachingSchemaProvider.cs @@ -13,11 +13,11 @@ using PinkParrot.Events.Schemas; using PinkParrot.Infrastructure; using PinkParrot.Infrastructure.CQRS; using PinkParrot.Infrastructure.CQRS.Events; -using PinkParrot.Read.Repositories; +using PinkParrot.Read.Schemas.Repositories; // ReSharper disable InvertIf -namespace PinkParrot.Read.Services.Implementations +namespace PinkParrot.Read.Schemas.Services.Implementations { public class CachingSchemaProvider : ISchemaProvider, ILiveEventConsumer { @@ -25,6 +25,11 @@ namespace PinkParrot.Read.Services.Implementations private readonly IMemoryCache cache; private readonly ISchemaRepository repository; + public sealed class CacheItem + { + public ISchemaEntityWithSchema Entity; + } + public CachingSchemaProvider(IMemoryCache cache, ISchemaRepository repository) { Guard.NotNull(cache, nameof(cache)); @@ -40,11 +45,13 @@ namespace PinkParrot.Read.Services.Implementations Guard.NotNullOrEmpty(name, nameof(name)); var cacheKey = BuildModelsCacheKey(tenantId, name); - var cacheItem = cache.Get(cacheKey); + var cacheItem = cache.Get(cacheKey); if (cacheItem == null) { - cacheItem = await repository.FindSchemaAsync(tenantId, name) ?? new EntityWithSchema(null, null); + var schema = await repository.FindSchemaAsync(tenantId, name); + + cacheItem = new CacheItem { Entity = schema }; cache.Set(cacheKey, cacheItem, CacheDuration); @@ -54,7 +61,7 @@ namespace PinkParrot.Read.Services.Implementations } } - return cacheItem.Entity?.Id; + return cacheItem?.Entity?.Id; } public Task On(Envelope @event) diff --git a/src/pinkparrot_read/PinkParrot.Read/project.json b/src/PinkParrot.Read/project.json similarity index 88% rename from src/pinkparrot_read/PinkParrot.Read/project.json rename to src/PinkParrot.Read/project.json index 192caa595..fc21afab5 100644 --- a/src/pinkparrot_read/PinkParrot.Read/project.json +++ b/src/PinkParrot.Read/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.Extensions.Caching.Memory": "1.0.0", - "MongoDB.Driver": "2.3.0-rc1", + "MongoDB.Driver": "2.4.0-beta1", "NETStandard.Library": "1.6.0", "NodaTime": "2.0.0-alpha20160729", "PinkParrot.Core": "1.0.0-*", @@ -16,7 +16,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0" + "version": "1.0.1" } } } diff --git a/src/pinkparrot_read/PinkParrot.Read/Repositories/Implementations/Mongo/MongoPosition.cs b/src/PinkParrot.Store.MongoDb/Infrastructure/MongoPosition.cs similarity index 91% rename from src/pinkparrot_read/PinkParrot.Read/Repositories/Implementations/Mongo/MongoPosition.cs rename to src/PinkParrot.Store.MongoDb/Infrastructure/MongoPosition.cs index 1b5d41df1..8d58c798d 100644 --- a/src/pinkparrot_read/PinkParrot.Read/Repositories/Implementations/Mongo/MongoPosition.cs +++ b/src/PinkParrot.Store.MongoDb/Infrastructure/MongoPosition.cs @@ -10,7 +10,7 @@ using System.Runtime.Serialization; using MongoDB.Bson; using MongoDB.Bson.Serialization.Attributes; -namespace PinkParrot.Read.Repositories.Implementations.Mongo +namespace PinkParrot.Store.MongoDb.Infrastructure { [DataContract] public class MongoPosition diff --git a/src/pinkparrot_read/PinkParrot.Read/Repositories/Implementations/Mongo/MongoPositionStorage.cs b/src/PinkParrot.Store.MongoDb/Infrastructure/MongoPositionStorage.cs similarity index 92% rename from src/pinkparrot_read/PinkParrot.Read/Repositories/Implementations/Mongo/MongoPositionStorage.cs rename to src/PinkParrot.Store.MongoDb/Infrastructure/MongoPositionStorage.cs index 3da6baf00..9571f132a 100644 --- a/src/pinkparrot_read/PinkParrot.Read/Repositories/Implementations/Mongo/MongoPositionStorage.cs +++ b/src/PinkParrot.Store.MongoDb/Infrastructure/MongoPositionStorage.cs @@ -9,11 +9,11 @@ using MongoDB.Bson; using MongoDB.Driver; using PinkParrot.Infrastructure.CQRS.EventStore; -using PinkParrot.Infrastructure.MongoDb; +using PinkParrot.Store.MongoDb.Utils; // ReSharper disable InvertIf -namespace PinkParrot.Read.Repositories.Implementations.Mongo +namespace PinkParrot.Store.MongoDb.Infrastructure { public sealed class MongoPositionStorage : MongoRepositoryBase, IStreamPositionStorage { diff --git a/src/PinkParrot.Store.MongoDb/PinkParrot.Store.MongoDb.xproj b/src/PinkParrot.Store.MongoDb/PinkParrot.Store.MongoDb.xproj new file mode 100644 index 000000000..7d872c1b5 --- /dev/null +++ b/src/PinkParrot.Store.MongoDb/PinkParrot.Store.MongoDb.xproj @@ -0,0 +1,21 @@ + + + + 14.0 + $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) + + + + + 28f8e9e2-fe24-41f7-a888-9fc244a9e2dd + PinkParrot.Store.MongoDb + .\obj + .\bin\ + v4.6.1 + + + + 2.0 + + + diff --git a/src/PinkParrot.Store.MongoDb/Properties/AssemblyInfo.cs b/src/PinkParrot.Store.MongoDb/Properties/AssemblyInfo.cs new file mode 100644 index 000000000..01fc833cc --- /dev/null +++ b/src/PinkParrot.Store.MongoDb/Properties/AssemblyInfo.cs @@ -0,0 +1,19 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("PinkParrot.Store.MongoDb")] +[assembly: AssemblyTrademark("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: Guid("28f8e9e2-fe24-41f7-a888-9fc244a9e2dd")] diff --git a/src/pinkparrot_read/PinkParrot.Read/Models/FieldDto.cs b/src/PinkParrot.Store.MongoDb/Schemas/Models/FieldDto.cs similarity index 96% rename from src/pinkparrot_read/PinkParrot.Read/Models/FieldDto.cs rename to src/PinkParrot.Store.MongoDb/Schemas/Models/FieldDto.cs index c2db13356..e914141c9 100644 --- a/src/pinkparrot_read/PinkParrot.Read/Models/FieldDto.cs +++ b/src/PinkParrot.Store.MongoDb/Schemas/Models/FieldDto.cs @@ -8,7 +8,7 @@ using PinkParrot.Core.Schemas; -namespace PinkParrot.Read.Models +namespace PinkParrot.Store.MongoDb.Schemas.Models { public class FieldDto { diff --git a/src/pinkparrot_read/PinkParrot.Read/Models/SchemaDto.cs b/src/PinkParrot.Store.MongoDb/Schemas/Models/SchemaDto.cs similarity index 97% rename from src/pinkparrot_read/PinkParrot.Read/Models/SchemaDto.cs rename to src/PinkParrot.Store.MongoDb/Schemas/Models/SchemaDto.cs index 6ad92e387..87d1a1607 100644 --- a/src/pinkparrot_read/PinkParrot.Read/Models/SchemaDto.cs +++ b/src/PinkParrot.Store.MongoDb/Schemas/Models/SchemaDto.cs @@ -14,7 +14,7 @@ using PinkParrot.Infrastructure; // ReSharper disable UseObjectOrCollectionInitializer // ReSharper disable InvertIf -namespace PinkParrot.Read.Models +namespace PinkParrot.Store.MongoDb.Schemas.Models { public sealed class SchemaDto { diff --git a/src/pinkparrot_read/PinkParrot.Read/Repositories/Implementations/Mongo/MongoSchemaEntity.cs b/src/PinkParrot.Store.MongoDb/Schemas/MongoSchemaEntity.cs similarity index 59% rename from src/pinkparrot_read/PinkParrot.Read/Repositories/Implementations/Mongo/MongoSchemaEntity.cs rename to src/PinkParrot.Store.MongoDb/Schemas/MongoSchemaEntity.cs index 6c4b39698..05d7d715a 100644 --- a/src/pinkparrot_read/PinkParrot.Read/Repositories/Implementations/Mongo/MongoSchemaEntity.cs +++ b/src/PinkParrot.Store.MongoDb/Schemas/MongoSchemaEntity.cs @@ -9,11 +9,18 @@ using System; using MongoDB.Bson; using MongoDB.Bson.Serialization.Attributes; +using Newtonsoft.Json; +using PinkParrot.Core.Schemas; +using PinkParrot.Read.Schemas.Repositories; +using PinkParrot.Store.MongoDb.Schemas.Models; +using PinkParrot.Store.MongoDb.Utils; -namespace PinkParrot.Read.Repositories.Implementations.Mongo +namespace PinkParrot.Store.MongoDb.Schemas { - public sealed class MongoSchemaEntity : ISchemaEntity + public sealed class MongoSchemaEntity : ISchemaEntityWithSchema { + private Schema schema; + [BsonId] [BsonElement] [BsonRepresentation(BsonType.String)] @@ -42,5 +49,22 @@ namespace PinkParrot.Read.Repositories.Implementations.Mongo [BsonRequired] [BsonElement] public BsonDocument Schema { get; set; } + + Schema ISchemaEntityWithSchema.Schema + { + get { return schema; } + } + + public void DeserializeSchema(JsonSerializerSettings serializerSettings, FieldRegistry fieldRegistry) + { + if (schema != null) + { + return; + } + + var dto = Schema.ToJsonObject(serializerSettings); + + schema = dto?.ToSchema(fieldRegistry); + } } } diff --git a/src/pinkparrot_read/PinkParrot.Read/Repositories/Implementations/Mongo/MongoSchemaRepository.cs b/src/PinkParrot.Store.MongoDb/Schemas/MongoSchemaRepository.cs similarity index 90% rename from src/pinkparrot_read/PinkParrot.Read/Repositories/Implementations/Mongo/MongoSchemaRepository.cs rename to src/PinkParrot.Store.MongoDb/Schemas/MongoSchemaRepository.cs index 660ab7638..4255b2e81 100644 --- a/src/pinkparrot_read/PinkParrot.Read/Repositories/Implementations/Mongo/MongoSchemaRepository.cs +++ b/src/PinkParrot.Store.MongoDb/Schemas/MongoSchemaRepository.cs @@ -18,10 +18,11 @@ using PinkParrot.Infrastructure; using PinkParrot.Infrastructure.CQRS; using PinkParrot.Infrastructure.CQRS.Events; using PinkParrot.Infrastructure.Dispatching; -using PinkParrot.Infrastructure.MongoDb; -using PinkParrot.Read.Models; +using PinkParrot.Read.Schemas.Repositories; +using PinkParrot.Store.MongoDb.Schemas.Models; +using PinkParrot.Store.MongoDb.Utils; -namespace PinkParrot.Read.Repositories.Implementations.Mongo +namespace PinkParrot.Store.MongoDb.Schemas { public sealed class MongoSchemaRepository : MongoRepositoryBase, ISchemaRepository, ICatchEventConsumer { @@ -50,22 +51,26 @@ namespace PinkParrot.Read.Repositories.Implementations.Mongo return entities.OfType().ToList(); } - public async Task FindSchemaAsync(Guid tenantId, string name) + public async Task FindSchemaAsync(Guid tenantId, string name) { var entity = await Collection.Find(s => s.Name == name && s.TenantId == tenantId && !s.IsDeleted) .FirstOrDefaultAsync(); - return entity != null ? new EntityWithSchema(entity, Deserialize(entity)) : null; + entity?.DeserializeSchema(serializerSettings, fieldRegistry); + + return entity; } - public async Task FindSchemaAsync(Guid schemaId) + public async Task FindSchemaAsync(Guid schemaId) { var entity = await Collection.Find(s => s.Id == schemaId && !s.IsDeleted) .FirstOrDefaultAsync(); - return entity != null ? new EntityWithSchema(entity, Deserialize(entity)) : null; + entity?.DeserializeSchema(serializerSettings, fieldRegistry); + + return entity; } public async Task FindSchemaIdAsync(Guid tenantId, string name) diff --git a/src/pinkparrot_read/PinkParrot.Read/Repositories/Implementations/EntityMapper.cs b/src/PinkParrot.Store.MongoDb/Utils/EntityMapper.cs similarity index 96% rename from src/pinkparrot_read/PinkParrot.Read/Repositories/Implementations/EntityMapper.cs rename to src/PinkParrot.Store.MongoDb/Utils/EntityMapper.cs index 9b53a6169..d58f0770a 100644 --- a/src/pinkparrot_read/PinkParrot.Read/Repositories/Implementations/EntityMapper.cs +++ b/src/PinkParrot.Store.MongoDb/Utils/EntityMapper.cs @@ -12,9 +12,9 @@ using MongoDB.Bson; using MongoDB.Driver; using Newtonsoft.Json; using PinkParrot.Infrastructure.CQRS; -using PinkParrot.Infrastructure.MongoDb; +using PinkParrot.Read.Schemas.Repositories; -namespace PinkParrot.Read.Repositories.Implementations +namespace PinkParrot.Store.MongoDb.Utils { public static class EntityMapper { diff --git a/src/pinkparrot_infrastructure/PinkParrot.Infrastructure/MongoDb/MongoExtensions.cs b/src/PinkParrot.Store.MongoDb/Utils/MongoExtensions.cs similarity index 95% rename from src/pinkparrot_infrastructure/PinkParrot.Infrastructure/MongoDb/MongoExtensions.cs rename to src/PinkParrot.Store.MongoDb/Utils/MongoExtensions.cs index 06fc0806a..c86764058 100644 --- a/src/pinkparrot_infrastructure/PinkParrot.Infrastructure/MongoDb/MongoExtensions.cs +++ b/src/PinkParrot.Store.MongoDb/Utils/MongoExtensions.cs @@ -9,7 +9,7 @@ using System.Threading.Tasks; using MongoDB.Driver; -namespace PinkParrot.Infrastructure.MongoDb +namespace PinkParrot.Store.MongoDb.Utils { public static class MongoExtensions { diff --git a/src/pinkparrot_infrastructure/PinkParrot.Infrastructure/MongoDb/MongoRepositoryBase.cs b/src/PinkParrot.Store.MongoDb/Utils/MongoRepositoryBase.cs similarity index 97% rename from src/pinkparrot_infrastructure/PinkParrot.Infrastructure/MongoDb/MongoRepositoryBase.cs rename to src/PinkParrot.Store.MongoDb/Utils/MongoRepositoryBase.cs index f208a2844..34025f8e8 100644 --- a/src/pinkparrot_infrastructure/PinkParrot.Infrastructure/MongoDb/MongoRepositoryBase.cs +++ b/src/PinkParrot.Store.MongoDb/Utils/MongoRepositoryBase.cs @@ -9,8 +9,9 @@ using System.Globalization; using System.Threading.Tasks; using MongoDB.Driver; +using PinkParrot.Infrastructure; -namespace PinkParrot.Infrastructure.MongoDb +namespace PinkParrot.Store.MongoDb.Utils { public abstract class MongoRepositoryBase { diff --git a/src/PinkParrot.Store.MongoDb/project.json b/src/PinkParrot.Store.MongoDb/project.json new file mode 100644 index 000000000..f4e796622 --- /dev/null +++ b/src/PinkParrot.Store.MongoDb/project.json @@ -0,0 +1,21 @@ +{ + "dependencies": { + "MongoDB.Driver": "2.4.0-beta1", + "NETStandard.Library": "1.6.0", + "PinkParrot.Core": "1.0.0-*", + "PinkParrot.Events": "1.0.0-*", + "PinkParrot.Infrastructure": "1.0.0-*", + "PinkParrot.Read": "1.0.0-*" + }, + "frameworks": { + "netcoreapp1.0": { + "dependencies": { + "Microsoft.NETCore.App": { + "type": "platform", + "version": "1.0.1" + } + } + } + }, + "version": "1.0.0-*" +} diff --git a/src/pinkparrot_write/PinkParrot.Write/.gitignore b/src/PinkParrot.Write/.gitignore similarity index 100% rename from src/pinkparrot_write/PinkParrot.Write/.gitignore rename to src/PinkParrot.Write/.gitignore diff --git a/src/pinkparrot_write/PinkParrot.Write/ITenantCommand.cs b/src/PinkParrot.Write/ITenantCommand.cs similarity index 100% rename from src/pinkparrot_write/PinkParrot.Write/ITenantCommand.cs rename to src/PinkParrot.Write/ITenantCommand.cs diff --git a/src/pinkparrot_write/PinkParrot.Write/PinkParrot.Write.xproj b/src/PinkParrot.Write/PinkParrot.Write.xproj similarity index 100% rename from src/pinkparrot_write/PinkParrot.Write/PinkParrot.Write.xproj rename to src/PinkParrot.Write/PinkParrot.Write.xproj diff --git a/src/pinkparrot_write/PinkParrot.Write/Schemas/Commands/AddField.cs b/src/PinkParrot.Write/Schemas/Commands/AddField.cs similarity index 100% rename from src/pinkparrot_write/PinkParrot.Write/Schemas/Commands/AddField.cs rename to src/PinkParrot.Write/Schemas/Commands/AddField.cs diff --git a/src/pinkparrot_write/PinkParrot.Write/Schemas/Commands/CreateSchema.cs b/src/PinkParrot.Write/Schemas/Commands/CreateSchema.cs similarity index 100% rename from src/pinkparrot_write/PinkParrot.Write/Schemas/Commands/CreateSchema.cs rename to src/PinkParrot.Write/Schemas/Commands/CreateSchema.cs diff --git a/src/pinkparrot_write/PinkParrot.Write/Schemas/Commands/DeleteField.cs b/src/PinkParrot.Write/Schemas/Commands/DeleteField.cs similarity index 100% rename from src/pinkparrot_write/PinkParrot.Write/Schemas/Commands/DeleteField.cs rename to src/PinkParrot.Write/Schemas/Commands/DeleteField.cs diff --git a/src/pinkparrot_write/PinkParrot.Write/Schemas/Commands/DeleteSchema.cs b/src/PinkParrot.Write/Schemas/Commands/DeleteSchema.cs similarity index 100% rename from src/pinkparrot_write/PinkParrot.Write/Schemas/Commands/DeleteSchema.cs rename to src/PinkParrot.Write/Schemas/Commands/DeleteSchema.cs diff --git a/src/pinkparrot_write/PinkParrot.Write/Schemas/Commands/DisableField.cs b/src/PinkParrot.Write/Schemas/Commands/DisableField.cs similarity index 100% rename from src/pinkparrot_write/PinkParrot.Write/Schemas/Commands/DisableField.cs rename to src/PinkParrot.Write/Schemas/Commands/DisableField.cs diff --git a/src/pinkparrot_write/PinkParrot.Write/Schemas/Commands/EnableField.cs b/src/PinkParrot.Write/Schemas/Commands/EnableField.cs similarity index 100% rename from src/pinkparrot_write/PinkParrot.Write/Schemas/Commands/EnableField.cs rename to src/PinkParrot.Write/Schemas/Commands/EnableField.cs diff --git a/src/pinkparrot_write/PinkParrot.Write/Schemas/Commands/HideField.cs b/src/PinkParrot.Write/Schemas/Commands/HideField.cs similarity index 100% rename from src/pinkparrot_write/PinkParrot.Write/Schemas/Commands/HideField.cs rename to src/PinkParrot.Write/Schemas/Commands/HideField.cs diff --git a/src/pinkparrot_write/PinkParrot.Write/Schemas/Commands/ShowField.cs b/src/PinkParrot.Write/Schemas/Commands/ShowField.cs similarity index 100% rename from src/pinkparrot_write/PinkParrot.Write/Schemas/Commands/ShowField.cs rename to src/PinkParrot.Write/Schemas/Commands/ShowField.cs diff --git a/src/pinkparrot_write/PinkParrot.Write/Schemas/Commands/UpdateField.cs b/src/PinkParrot.Write/Schemas/Commands/UpdateField.cs similarity index 100% rename from src/pinkparrot_write/PinkParrot.Write/Schemas/Commands/UpdateField.cs rename to src/PinkParrot.Write/Schemas/Commands/UpdateField.cs diff --git a/src/pinkparrot_write/PinkParrot.Write/Schemas/Commands/UpdateSchema.cs b/src/PinkParrot.Write/Schemas/Commands/UpdateSchema.cs similarity index 100% rename from src/pinkparrot_write/PinkParrot.Write/Schemas/Commands/UpdateSchema.cs rename to src/PinkParrot.Write/Schemas/Commands/UpdateSchema.cs diff --git a/src/pinkparrot_write/PinkParrot.Write/Schemas/SchemaCommandHandler.cs b/src/PinkParrot.Write/Schemas/SchemaCommandHandler.cs similarity index 99% rename from src/pinkparrot_write/PinkParrot.Write/Schemas/SchemaCommandHandler.cs rename to src/PinkParrot.Write/Schemas/SchemaCommandHandler.cs index f8a728a14..fad18eb18 100644 --- a/src/pinkparrot_write/PinkParrot.Write/Schemas/SchemaCommandHandler.cs +++ b/src/PinkParrot.Write/Schemas/SchemaCommandHandler.cs @@ -14,7 +14,7 @@ using PinkParrot.Core.Schemas; using PinkParrot.Infrastructure; using PinkParrot.Infrastructure.CQRS.Commands; using PinkParrot.Infrastructure.Dispatching; -using PinkParrot.Read.Services; +using PinkParrot.Read.Schemas.Services; using PinkParrot.Write.Schemas.Commands; namespace PinkParrot.Write.Schemas diff --git a/src/pinkparrot_write/PinkParrot.Write/Schemas/SchemaDomainObject.cs b/src/PinkParrot.Write/Schemas/SchemaDomainObject.cs similarity index 100% rename from src/pinkparrot_write/PinkParrot.Write/Schemas/SchemaDomainObject.cs rename to src/PinkParrot.Write/Schemas/SchemaDomainObject.cs diff --git a/src/pinkparrot_write/PinkParrot.Write/TenantCommand.cs b/src/PinkParrot.Write/TenantCommand.cs similarity index 100% rename from src/pinkparrot_write/PinkParrot.Write/TenantCommand.cs rename to src/PinkParrot.Write/TenantCommand.cs diff --git a/src/pinkparrot_write/PinkParrot.Write/project.json b/src/PinkParrot.Write/project.json similarity index 94% rename from src/pinkparrot_write/PinkParrot.Write/project.json rename to src/PinkParrot.Write/project.json index 43b86a783..1b4d2d458 100644 --- a/src/pinkparrot_write/PinkParrot.Write/project.json +++ b/src/PinkParrot.Write/project.json @@ -15,7 +15,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0" + "version": "1.0.1" } } } diff --git a/src/PinkParrot/Configurations/InfrastructureModule.cs b/src/PinkParrot/Configurations/InfrastructureModule.cs index 5e9ba3095..c93c1b7b1 100644 --- a/src/PinkParrot/Configurations/InfrastructureModule.cs +++ b/src/PinkParrot/Configurations/InfrastructureModule.cs @@ -20,7 +20,7 @@ using PinkParrot.Infrastructure.CQRS.Autofac; using PinkParrot.Infrastructure.CQRS.Commands; using PinkParrot.Infrastructure.CQRS.EventStore; using PinkParrot.Pipeline; -using PinkParrot.Read.Repositories.Implementations.Mongo; +using PinkParrot.Store.MongoDb.Infrastructure; namespace PinkParrot.Configurations { diff --git a/src/PinkParrot/Configurations/ReadModule.cs b/src/PinkParrot/Configurations/ReadModule.cs index 61584a378..c214d0938 100644 --- a/src/PinkParrot/Configurations/ReadModule.cs +++ b/src/PinkParrot/Configurations/ReadModule.cs @@ -8,10 +8,12 @@ using Autofac; using PinkParrot.Infrastructure.CQRS.Events; -using PinkParrot.Read.Repositories; -using PinkParrot.Read.Repositories.Implementations.Mongo; -using PinkParrot.Read.Services; -using PinkParrot.Read.Services.Implementations; +using PinkParrot.Read.Infrastructure.Services; +using PinkParrot.Read.Infrastructure.Services.Implementations; +using PinkParrot.Read.Schemas.Repositories; +using PinkParrot.Read.Schemas.Services; +using PinkParrot.Read.Schemas.Services.Implementations; +using PinkParrot.Store.MongoDb.Schemas; namespace PinkParrot.Configurations { diff --git a/src/PinkParrot/Configurations/Serializers.cs b/src/PinkParrot/Configurations/Serializers.cs index e03d772cb..241e011fa 100644 --- a/src/PinkParrot/Configurations/Serializers.cs +++ b/src/PinkParrot/Configurations/Serializers.cs @@ -22,7 +22,7 @@ namespace PinkParrot.Configurations { private static JsonSerializerSettings ConfigureJson(JsonSerializerSettings settings) { - settings.Binder = new TypeNameSerializationBinder(); + settings.SerializationBinder = new TypeNameSerializationBinder(); settings.ContractResolver = new CamelCasePropertyNamesContractResolver(); settings.Converters.Add(new PropertiesBagConverter()); settings.NullValueHandling = NullValueHandling.Ignore; diff --git a/src/PinkParrot/Modules/Api/Schemas/SchemasController.cs b/src/PinkParrot/Modules/Api/Schemas/SchemasController.cs index 35da7592f..63f48ead7 100644 --- a/src/PinkParrot/Modules/Api/Schemas/SchemasController.cs +++ b/src/PinkParrot/Modules/Api/Schemas/SchemasController.cs @@ -16,8 +16,8 @@ using PinkParrot.Infrastructure.CQRS.Commands; using PinkParrot.Infrastructure.Reflection; using PinkParrot.Modules.Api.Schemas.Models; using PinkParrot.Pipeline; -using PinkParrot.Read.Models; -using PinkParrot.Read.Repositories; +using PinkParrot.Read.Schemas.Repositories; +using PinkParrot.Store.MongoDb.Schemas.Models; using PinkParrot.Write.Schemas.Commands; namespace PinkParrot.Modules.Api.Schemas diff --git a/src/PinkParrot/Pipeline/CommandHandlers/EnrichWithAggregateIdHandler.cs b/src/PinkParrot/Pipeline/CommandHandlers/EnrichWithAggregateIdHandler.cs index 2d369051c..a96b4a77c 100644 --- a/src/PinkParrot/Pipeline/CommandHandlers/EnrichWithAggregateIdHandler.cs +++ b/src/PinkParrot/Pipeline/CommandHandlers/EnrichWithAggregateIdHandler.cs @@ -11,7 +11,7 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc.Infrastructure; using PinkParrot.Infrastructure; using PinkParrot.Infrastructure.CQRS.Commands; -using PinkParrot.Read.Services; +using PinkParrot.Read.Schemas.Services; using PinkParrot.Write; using PinkParrot.Write.Schemas; diff --git a/src/PinkParrot/Pipeline/TenantMiddleware.cs b/src/PinkParrot/Pipeline/TenantMiddleware.cs index dbeb1e105..b52093692 100644 --- a/src/PinkParrot/Pipeline/TenantMiddleware.cs +++ b/src/PinkParrot/Pipeline/TenantMiddleware.cs @@ -9,7 +9,7 @@ using System; using System.Threading.Tasks; using Microsoft.AspNetCore.Http; -using PinkParrot.Read.Services; +using PinkParrot.Read.Infrastructure.Services; namespace PinkParrot.Pipeline { diff --git a/src/PinkParrot/project.json b/src/PinkParrot/project.json index c1cabf022..d59db9696 100644 --- a/src/PinkParrot/project.json +++ b/src/PinkParrot/project.json @@ -1,15 +1,15 @@ { "dependencies": { - "Autofac": "4.1.0", + "Autofac": "4.1.1", "Autofac.Extensions.DependencyInjection": "4.0.0", "Microsoft.AspNetCore.Diagnostics": "1.0.0", - "Microsoft.AspNetCore.Mvc": "1.0.0", + "Microsoft.AspNetCore.Mvc": "1.0.1", "Microsoft.AspNetCore.Razor.Tools": { "version": "1.0.0-preview2-final", "type": "build" }, "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0", - "Microsoft.AspNetCore.Server.Kestrel": "1.0.0", + "Microsoft.AspNetCore.Server.Kestrel": "1.0.1", "Microsoft.AspNetCore.StaticFiles": "1.0.0", "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.0.0", "Microsoft.Extensions.Configuration.Json": "1.0.0", @@ -18,17 +18,18 @@ "Microsoft.Extensions.Logging.Debug": "1.0.0", "Microsoft.Extensions.Options.ConfigurationExtensions": "1.0.0", "Microsoft.NETCore.App": { - "version": "1.0.0", + "version": "1.0.1", "type": "platform" }, - "MongoDB.Driver": "2.3.0-rc1", + "MongoDB.Driver": "2.4.0-beta1", "OpenCover": "4.6.519", "PinkParrot.Core": "1.0.0-*", "PinkParrot.Events": "1.0.0-*", "PinkParrot.Infrastructure": "1.0.0-*", "PinkParrot.Read": "1.0.0-*", + "PinkParrot.Store.MongoDb": "1.0.0-*", "PinkParrot.Write": "1.0.0-*", - "ReportGenerator": "2.4.5" + "ReportGenerator": "2.5.0-beta1" }, "tools": { diff --git a/src/pinkparrot_core/PinkParrot.Core.Tests/PinkParrot.Core.Tests.xproj b/src/pinkparrot_core/PinkParrot.Core.Tests/PinkParrot.Core.Tests.xproj deleted file mode 100644 index 1290e1f9d..000000000 --- a/src/pinkparrot_core/PinkParrot.Core.Tests/PinkParrot.Core.Tests.xproj +++ /dev/null @@ -1,19 +0,0 @@ - - - - 14.0.25420 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 4a27b9de-f553-4a82-b866-a29ef8a5a0af - PinkParrot.Core.Tests - .\obj - .\bin\ - - - - 2.0 - - - \ No newline at end of file diff --git a/src/pinkparrot_core/PinkParrot.Core.Tests/project.json b/src/pinkparrot_core/PinkParrot.Core.Tests/project.json deleted file mode 100644 index d06272be5..000000000 --- a/src/pinkparrot_core/PinkParrot.Core.Tests/project.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "version": "1.0.0-*", - "testRunner": "xunit", - "dependencies": { - "dotnet-test-xunit": "2.2.0-preview2-build1029", - "PinkParrot.Core": "1.0.0-*", - "xunit": "2.2.0-beta2-build3300" - }, - "frameworks": { - "netcoreapp1.0": { - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.0" - } - } - } - }, - "buildOptions": { - "copyToOutput": { - "include": [ - "xunit.runner.json" - ] - } - }, - "tooling": { - "defaultNamespace": "PinkParrot.Core.Tests" - } -} \ No newline at end of file diff --git a/src/pinkparrot_infrastructure/PinkParrot.Infrastructure.Tests/project.json b/src/pinkparrot_infrastructure/PinkParrot.Infrastructure.Tests/project.json deleted file mode 100644 index baaaf4223..000000000 --- a/src/pinkparrot_infrastructure/PinkParrot.Infrastructure.Tests/project.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "version": "1.0.0-*", - "testRunner": "xunit", - "dependencies": { - "dotnet-test-xunit": "2.2.0-preview2-build1029", - "PinkParrot.Infrastructure": "1.0.0-*", - "xunit": "2.2.0-beta2-build3300" - }, - "frameworks": { - "netcoreapp1.0": { - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.0" - } - } - } - }, - "buildOptions": { - "copyToOutput": { - "include": [ - "xunit.runner.json" - ] - } - }, - "tooling": { - "defaultNamespace": "PinkParrot.Core.Tests" - } -} \ No newline at end of file diff --git a/src/pinkparrot_infrastructure/PinkParrot.Infrastructure.Tests/xunit.runner.json b/src/pinkparrot_infrastructure/PinkParrot.Infrastructure.Tests/xunit.runner.json deleted file mode 100644 index 6b3f1f87d..000000000 --- a/src/pinkparrot_infrastructure/PinkParrot.Infrastructure.Tests/xunit.runner.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "diagnosticMessages": false, - "methodDisplay": "classAndMethod", - "parallelizeTestCollections": true -} diff --git a/src/pinkparrot_read/PinkParrot.Read/Repositories/EntityWithSchema.cs b/src/pinkparrot_read/PinkParrot.Read/Repositories/EntityWithSchema.cs deleted file mode 100644 index 603698076..000000000 --- a/src/pinkparrot_read/PinkParrot.Read/Repositories/EntityWithSchema.cs +++ /dev/null @@ -1,26 +0,0 @@ -// ========================================================================== -// EntityWithSchema.cs -// PinkParrot Headless CMS -// ========================================================================== -// Copyright (c) PinkParrot Group -// All rights reserved. -// ========================================================================== - -using PinkParrot.Core.Schemas; - -namespace PinkParrot.Read.Repositories -{ - public sealed class EntityWithSchema - { - public ISchemaEntity Entity { get; } - - public Schema Schema { get; } - - internal EntityWithSchema(ISchemaEntity entity, Schema schema) - { - Entity = entity; - - Schema = schema; - } - } -}