Skip to content

Expose the Delivery API CLR type #15150

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kjac merged 4 commits into from
Dec 1, 2023
Merged

Expose the Delivery API CLR type #15150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b12e608
Expose the Delivery API CLR type
vsilvar Nov 6, 2023
7ab801e
Updated field naming and warnings
vsilvar Nov 28, 2023
edf7aae
Added default implementation to prevent breaking change
vsilvar Nov 28, 2023
15b764d
Merge branch 'contrib' into feature/expose_delivery_api_CRL_type
vsilvar Nov 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions src/Umbraco.Core/Models/PublishedContent/IPublishedPropertyType.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,14 @@ public interface IPublishedPropertyType
/// </remarks>
Type ModelClrType { get; }

/// <summary>
/// Gets the property model Delivery Api CLR type.
/// </summary>
/// <remarks>
/// <para>The model CLR type may be a <see cref="ModelType" /> type, or may contain <see cref="ModelType" /> types.</para>
/// </remarks>
Type DeliveryApiModelClrType => ModelClrType;

/// <summary>
/// Gets the property CLR type.
/// </summary>
Expand Down
22 changes: 19 additions & 3 deletions src/Umbraco.Core/Models/PublishedContent/PublishedPropertyType.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ public class PublishedPropertyType : IPublishedPropertyType
private PropertyCacheLevel _deliveryApiCacheLevel;

private Type? _modelClrType;
private Type? _deliveryApiModelClrType;
private Type? _clrType;

#region Constructors
Expand Down Expand Up @@ -191,11 +192,12 @@ private void InitializeLocked()
}
}

var deliveryApiPropertyValueConverter = _converter as IDeliveryApiPropertyValueConverter;

_cacheLevel = _converter?.GetPropertyCacheLevel(this) ?? PropertyCacheLevel.Snapshot;
_deliveryApiCacheLevel = _converter is IDeliveryApiPropertyValueConverter deliveryApiPropertyValueConverter
? deliveryApiPropertyValueConverter.GetDeliveryApiPropertyCacheLevel(this)
: _cacheLevel;
_deliveryApiCacheLevel = deliveryApiPropertyValueConverter?.GetDeliveryApiPropertyCacheLevel(this) ?? _cacheLevel;
_modelClrType = _converter?.GetPropertyValueType(this) ?? typeof(object);
_deliveryApiModelClrType = deliveryApiPropertyValueConverter?.GetDeliveryApiPropertyValueType(this) ?? _modelClrType;
}

/// <inheritdoc />
Expand Down Expand Up @@ -331,6 +333,20 @@ public Type ModelClrType
}
}

/// <inheritdoc />
public Type DeliveryApiModelClrType
{
get
{
if (!_initialized)
{
Initialize();
}

return _deliveryApiModelClrType!;
}
}

/// <inheritdoc />
public Type? ClrType
{
Expand Down