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

Removes the need for .Current in some places, adds TODO notes to test a theory, removes IUmbracoEntity from ISimpleContentType since all tests seem to pass without it and because the SimpleContentTypeMapper doesn't actually use ISimpleContentType i don't think it's needed, we'll see what the tests say.

Browse Source
This commit is contained in:
Shannon
2019-02-07 12:43:11 +11:00
parent 9df0f384af
commit 123daed990
9 changed files with 74 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Umbraco.Core/Models/ISimpleContentType.cs
View File

@@ -5,8 +5,11 @@ namespace Umbraco.Core.Models
/// <summary>
/// Represents a simplified view of a content type.
/// </summary>
public interface ISimpleContentType : IUmbracoEntity
public interface ISimpleContentType
{
int Id { get; }
string Name { get; }
/// <summary>
/// Gets the alias of the content type.
/// </summary>

2
src/Umbraco.Core/Models/PropertyCollection.cs
View File

@@ -93,7 +93,7 @@ namespace Umbraco.Core.Models
}
/// <summary>
/// Adds a property.
/// Adds or update a property.
/// </summary>
internal new void Add(Property property)
{

73
src/Umbraco.Core/Models/SimpleContentType.cs
View File

@@ -9,9 +9,6 @@ namespace Umbraco.Core.Models
/// </summary>
public class SimpleContentType : ISimpleContentType
{
private readonly int _id;
private readonly string _name;
/// <summary>
/// Initializes a new instance of the <see cref="SimpleContentType"/> class.
/// </summary>
@@ -39,13 +36,12 @@ namespace Umbraco.Core.Models
{
if (contentType == null) throw new ArgumentNullException(nameof(contentType));
_id = contentType.Id;
Id = contentType.Id;
Alias = contentType.Alias;
Variations = contentType.Variations;
Icon = contentType.Icon;
IsContainer = contentType.IsContainer;
Icon = contentType.Icon;
_name = contentType.Name;
Name = contentType.Name;
AllowedAsRoot = contentType.AllowedAsRoot;
IsElement = contentType.IsElement;
}
@@ -53,12 +49,7 @@ namespace Umbraco.Core.Models
/// <inheritdoc />
public string Alias { get; }
/// <inheritdoc />
public int Id
{
get => _id;
set => throw new NotSupportedException();
}
public int Id { get; }
/// <inheritdoc />
public ITemplate DefaultTemplate { get; }
@@ -71,13 +62,8 @@ namespace Umbraco.Core.Models
/// <inheritdoc />
public bool IsContainer { get; }
/// <inheritdoc />
public string Name
{
get => _name;
set => throw new NotSupportedException();
}
public string Name { get; }
/// <inheritdoc />
public bool AllowedAsRoot { get; }
@@ -120,30 +106,29 @@ namespace Umbraco.Core.Models
// we have to have all this, because we're an IUmbracoEntity, because that is
// required by the query expression visitor / SimpleContentTypeMapper
public object DeepClone() => throw new NotImplementedException();
public Guid Key { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
public DateTime CreateDate { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
public DateTime UpdateDate { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
public DateTime? DeleteDate { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
public bool HasIdentity => throw new NotImplementedException();
public int CreatorId { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
public int ParentId { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
public void SetParent(ITreeEntity parent) => throw new NotImplementedException();
public int Level { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
public string Path { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
public int SortOrder { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
public bool Trashed => throw new NotImplementedException();
public bool IsDirty() => throw new NotImplementedException();
public bool IsPropertyDirty(string propName) => throw new NotImplementedException();
public IEnumerable<string> GetDirtyProperties() => throw new NotImplementedException();
public void ResetDirtyProperties() => throw new NotImplementedException();
public bool WasDirty() => throw new NotImplementedException();
public bool WasPropertyDirty(string propertyName) => throw new NotImplementedException();
public void ResetWereDirtyProperties() => throw new NotImplementedException();
public void ResetDirtyProperties(bool rememberDirty) => throw new NotImplementedException();
public IEnumerable<string> GetWereDirtyProperties() => throw new NotImplementedException();
//string ITreeEntity.Name { get => this.Name; set => throw new NotImplementedException(); }
//int IEntity.Id { get => this.Id; set => throw new NotImplementedException(); }
//bool IEntity.HasIdentity => this.Id != default;
//int ITreeEntity.CreatorId { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
//int ITreeEntity.ParentId { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
//int ITreeEntity.Level { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
//string ITreeEntity.Path { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
//int ITreeEntity.SortOrder { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
//bool ITreeEntity.Trashed => throw new NotImplementedException();
//Guid IEntity.Key { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
//DateTime IEntity.CreateDate { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
//DateTime IEntity.UpdateDate { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
//DateTime? IEntity.DeleteDate { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
//void ITreeEntity.SetParent(ITreeEntity parent) => throw new NotImplementedException();
//object IDeepCloneable.DeepClone() => throw new NotImplementedException();
//bool IRememberBeingDirty.WasDirty() => throw new NotImplementedException();
//bool IRememberBeingDirty.WasPropertyDirty(string propertyName) => throw new NotImplementedException();
//void IRememberBeingDirty.ResetWereDirtyProperties() => throw new NotImplementedException();
//void IRememberBeingDirty.ResetDirtyProperties(bool rememberDirty) => throw new NotImplementedException();
//IEnumerable<string> IRememberBeingDirty.GetWereDirtyProperties() => throw new NotImplementedException();
//bool ICanBeDirty.IsDirty() => throw new NotImplementedException();
//bool ICanBeDirty.IsPropertyDirty(string propName) => throw new NotImplementedException();
//IEnumerable<string> ICanBeDirty.GetDirtyProperties() => throw new NotImplementedException();
//void ICanBeDirty.ResetDirtyProperties() => throw new NotImplementedException();
}
}