yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Align namespaces in Models to Umbraco.Cms.Core

Browse Source
This commit is contained in:
Mole
2021-02-12 12:53:00 +01:00
parent 7ab0c61284
commit 2d561c34e6
16 changed files with 28 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Umbraco.Infrastructure/Compose/BlockEditorComponent.cs
View File

@@ -5,7 +5,6 @@ using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using Umbraco.Cms.Core.Composing;
using Umbraco.Cms.Core.Models.Blocks;
using Umbraco.Core.Models.Blocks;
using Umbraco.Core.PropertyEditors;
using Umbraco.Extensions;

1
src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.MappingProfiles.cs
View File

@@ -4,7 +4,6 @@ using Umbraco.Cms.Core.Mapping;
using Umbraco.Cms.Core.Models.Mapping;
using Umbraco.Core.Security;
using Umbraco.Extensions;
using Umbraco.Web.Models.Mapping;
namespace Umbraco.Cms.Infrastructure.DependencyInjection
{

2
src/Umbraco.Infrastructure/Deploy/IGridCellValueConnector.cs
View File

@@ -1,5 +1,5 @@
using System.Collections.Generic;
using Umbraco.Core.Models;
using Umbraco.Cms.Core.Models;
namespace Umbraco.Cms.Core.Deploy
{

8
src/Umbraco.Infrastructure/Models/Blocks/BlockEditorData.cs
View File

@@ -1,11 +1,9 @@
using Newtonsoft.Json.Linq;
using System;
using System;
using System.Collections.Generic;
using Umbraco.Cms.Core.Models.Blocks;
using Newtonsoft.Json.Linq;
namespace Umbraco.Core.Models.Blocks
namespace Umbraco.Cms.Core.Models.Blocks
{
/// <summary>
/// Convertable block data from json
/// </summary>

10
src/Umbraco.Infrastructure/Models/Blocks/BlockEditorDataConverter.cs
View File

@@ -1,12 +1,10 @@
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using System.Collections.Generic;
using System.Linq;
using System.Collections.Generic;
using Umbraco.Cms.Core.Models.Blocks;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
namespace Umbraco.Core.Models.Blocks
namespace Umbraco.Cms.Core.Models.Blocks
{
/// <summary>
/// Converts the block json data into objects
/// </summary>

8
src/Umbraco.Infrastructure/Models/Blocks/BlockItemData.cs
View File

@@ -1,11 +1,9 @@
using Newtonsoft.Json;
using System;
using System;
using System.Collections.Generic;
using Umbraco.Cms.Core;
using Umbraco.Cms.Core.Models;
using Newtonsoft.Json;
using Umbraco.Core.Serialization;
namespace Umbraco.Core.Models.Blocks
namespace Umbraco.Cms.Core.Models.Blocks
{
/// <summary>
/// Represents a single block's data in raw form

7
src/Umbraco.Infrastructure/Models/Blocks/BlockListEditorDataConverter.cs
View File

@@ -1,9 +1,8 @@
using Newtonsoft.Json.Linq;
using System.Collections.Generic;
using System.Linq;
using System.Collections.Generic;
using Umbraco.Cms.Core.Models.Blocks;
using Newtonsoft.Json.Linq;
namespace Umbraco.Core.Models.Blocks
namespace Umbraco.Cms.Core.Models.Blocks
{
/// <summary>
/// Data converter for the block list property editor

3
src/Umbraco.Infrastructure/Models/Blocks/BlockListLayoutItem.cs
View File

@@ -1,8 +1,7 @@
using Newtonsoft.Json;
using Umbraco.Cms.Core;
using Umbraco.Core.Serialization;
namespace Umbraco.Core.Models.Blocks
namespace Umbraco.Cms.Core.Models.Blocks
{
/// <summary>
/// Used for deserializing the block list layout

6
src/Umbraco.Infrastructure/Models/Blocks/BlockValue.cs
View File

@@ -1,8 +1,8 @@
using Newtonsoft.Json;
using System.Collections.Generic;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using System.Collections.Generic;
namespace Umbraco.Core.Models.Blocks
namespace Umbraco.Cms.Core.Models.Blocks
{
public class BlockValue
{

2
src/Umbraco.Infrastructure/Models/GridValue.cs
View File

@@ -3,7 +3,7 @@ using System.Collections.Generic;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
namespace Umbraco.Core.Models
namespace Umbraco.Cms.Core.Models
{
// TODO: Make a property value converter for this!

6
src/Umbraco.Infrastructure/Models/Mapping/EntityMapDefinition.cs
View File

@@ -1,18 +1,14 @@
using System;
using System.Collections.Generic;
using Examine;
using Umbraco.Cms.Core;
using Umbraco.Cms.Core.Mapping;
using Umbraco.Cms.Core.Models;
using Umbraco.Cms.Core.Models.ContentEditing;
using Umbraco.Cms.Core.Models.Entities;
using Umbraco.Cms.Core.Models.Mapping;
using Umbraco.Cms.Core.Models.Membership;
using Umbraco.Cms.Infrastructure.Examine;
using Umbraco.Extensions;
using Constants = Umbraco.Cms.Core.Constants;
namespace Umbraco.Web.Models.Mapping
namespace Umbraco.Cms.Core.Models.Mapping
{
public class EntityMapDefinition : IMapDefinition
{

2
src/Umbraco.Infrastructure/Models/PathValidationExtensions.cs
View File

@@ -6,7 +6,7 @@ using Umbraco.Cms.Core.Models.Entities;
using Umbraco.Core.Persistence.Dtos;
using Umbraco.Extensions;
namespace Umbraco.Core.Models
namespace Umbraco.Cms.Core.Models
{
/// <summary>
/// Provides extension methods for path validation.

9
src/Umbraco.Infrastructure/PropertyEditors/BlockEditorPropertyEditor.cs
View File

@@ -5,13 +5,12 @@ using System.Linq;
using Microsoft.Extensions.Logging;
using Newtonsoft.Json;
using Umbraco.Cms.Core.Models;
using Umbraco.Cms.Core.Models.Blocks;
using Umbraco.Cms.Core.Models.Editors;
using Umbraco.Cms.Core.PropertyEditors;
using Umbraco.Cms.Core.Serialization;
using Umbraco.Cms.Core.Services;
using Umbraco.Cms.Core.Strings;
using Umbraco.Core.Models.Blocks;
using static Umbraco.Core.Models.Blocks.BlockItemData;
using Umbraco.Extensions;
namespace Umbraco.Web.PropertyEditors
@@ -314,7 +313,7 @@ namespace Umbraco.Web.PropertyEditors
if (!row.PropertyValues.ContainsKey(elementTypeProp.Alias))
{
// set values to null
row.PropertyValues[elementTypeProp.Alias] = new BlockPropertyValue(null, elementTypeProp);
row.PropertyValues[elementTypeProp.Alias] = new BlockItemData.BlockPropertyValue(null, elementTypeProp);
row.RawPropertyValues[elementTypeProp.Alias] = null;
}
}
@@ -398,7 +397,7 @@ namespace Umbraco.Web.PropertyEditors
if (!contentTypePropertyTypes.TryGetValue(contentType.Alias, out var propertyTypes))
propertyTypes = contentTypePropertyTypes[contentType.Alias] = contentType.CompositionPropertyTypes.ToDictionary(x => x.Alias, x => x);
var propValues = new Dictionary<string, BlockPropertyValue>();
var propValues = new Dictionary<string, BlockItemData.BlockPropertyValue>();
// find any keys that are not real property types and remove them
foreach (var prop in block.RawPropertyValues.ToList())
@@ -413,7 +412,7 @@ namespace Umbraco.Web.PropertyEditors
else
{
// set the value to include the resolved property type
propValues[prop.Key] = new BlockPropertyValue(prop.Value, propType);
propValues[prop.Key] = new BlockItemData.BlockPropertyValue(prop.Value, propType);
}
}

9
src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/BlockEditorConverter.cs
View File

@@ -1,14 +1,9 @@
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System;
using Umbraco.Cms.Core;
using Umbraco.Cms.Core.Models.Blocks;
using Umbraco.Cms.Core.Models.PublishedContent;
using Umbraco.Cms.Core.PropertyEditors;
using Umbraco.Cms.Core.PublishedCache;
using Umbraco.Core;
using Umbraco.Core.Models.Blocks;
using Umbraco.Core.PropertyEditors;
using Umbraco.Web.PublishedCache;
namespace Umbraco.Web.PropertyEditors.ValueConverters
{

2
src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/BlockListPropertyValueConverter.cs
View File

@@ -6,14 +6,12 @@ using Umbraco.Cms.Core.Logging;
using Umbraco.Cms.Core.Models.Blocks;
using Umbraco.Cms.Core.Models.PublishedContent;
using Umbraco.Cms.Core.PropertyEditors;
using Umbraco.Core.Models.Blocks;
using Umbraco.Core.PropertyEditors.ValueConverters;
using Umbraco.Extensions;
using Constants = Umbraco.Cms.Core.Constants;
namespace Umbraco.Web.PropertyEditors.ValueConverters
{
[DefaultPropertyValueConverter(typeof(JsonValueConverter))]
public class BlockListPropertyValueConverter : PropertyValueConverterBase
{

2
src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/PathValidationTests.cs
View File

@@ -5,10 +5,10 @@ using System;
using Microsoft.Extensions.Logging;
using Moq;
using NUnit.Framework;
using Umbraco.Cms.Core.Models;
using Umbraco.Cms.Core.Models.Entities;
using Umbraco.Cms.Tests.Common.Builders;
using Umbraco.Cms.Tests.Common.Builders.Extensions;
using Umbraco.Core.Models;
namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Models
{