Merge pull request #229 from contentful/fix-strong-typing-for-data

Fix strong typing for data
contentful · Mar 13, 2021 · c4b7282 · c4b7282
2 parents 84e756b + 7f81d3f
commit c4b7282
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 20 deletions.
diff --git a/Contentful.AspNetCore/Contentful.AspNetCore.csproj b/Contentful.AspNetCore/Contentful.AspNetCore.csproj
@@ -13,10 +13,10 @@
     <PackageProjectUrl>https://github.com/contentful/contentful.net</PackageProjectUrl>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <RepositoryType>git</RepositoryType>
-    <Version>6.0.2</Version>
-    <AssemblyVersion>6.0.2.0</AssemblyVersion>
+    <Version>6.0.3</Version>
+    <AssemblyVersion>6.0.3.0</AssemblyVersion>
     <RepositoryUrl>https://github.com/contentful/contentful.net</RepositoryUrl>
-    <FileVersion>6.0.2.0</FileVersion>
+    <FileVersion>6.0.3.0</FileVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
     <DocumentationFile>bin\Release\netstandard1.5\Contentful.AspNetCore.xml</DocumentationFile>
@@ -25,7 +25,7 @@
     <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="contentful.csharp" Version="6.0.2" />
+    <PackageReference Include="contentful.csharp" Version="6.0.3" />
     <PackageReference Include="gitlink" Version="3.1.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>

diff --git a/Contentful.Core/Contentful.Core.csproj b/Contentful.Core/Contentful.Core.csproj
@@ -18,9 +18,9 @@
     <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
     <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
     <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
-    <AssemblyVersion>6.0.2.0</AssemblyVersion>
-    <FileVersion>6.0.2.0</FileVersion>
-    <Version>6.0.2</Version>
+    <AssemblyVersion>6.0.3.0</AssemblyVersion>
+    <FileVersion>6.0.3.0</FileVersion>
+    <Version>6.0.3</Version>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="gitlink" Version="3.1.0">

diff --git a/Contentful.Core/Models/AuthoringModels.cs b/Contentful.Core/Models/AuthoringModels.cs
@@ -19,7 +19,7 @@ public class Document
         /// <summary>
         /// The additional data of the node.
         /// </summary>
-        public object Data { get; set; }
+        public GenericStructureData Data { get; set; }
 
         /// <summary>
         /// The list of content this document contains.
@@ -40,7 +40,7 @@ public class Text : IContent
         /// <summary>
         /// The additional data of the node.
         /// </summary>
-        public object Data { get; set; }
+        public GenericStructureData Data { get; set; }
 
         /// <summary>
         /// The textual value.
@@ -114,7 +114,7 @@ public class Paragraph : IContent
         /// <summary>
         /// The additional data of the node.
         /// </summary>
-        public object Data { get; set; }
+        public GenericStructureData Data { get; set; }
 
         /// <summary>
         /// The list of content this paragraph contains.
@@ -135,7 +135,7 @@ public class Heading1 : IContent, IHeading
         /// <summary>
         /// The additional data of the node.
         /// </summary>
-        public object Data { get; set; }
+        public GenericStructureData Data { get; set; }
 
         /// <summary>
         /// The list of content this heading contains.
@@ -156,7 +156,7 @@ public class Heading2 : IContent, IHeading
         /// <summary>
         /// The additional data of the node.
         /// </summary>
-        public object Data { get; set; }
+        public GenericStructureData Data { get; set; }
 
         /// <summary>
         /// The list of content this heading contains.
@@ -177,7 +177,7 @@ public class Heading3 : IContent, IHeading
         /// <summary>
         /// The additional data of the node.
         /// </summary>
-        public object Data { get; set; }
+        public GenericStructureData Data { get; set; }
 
         /// <summary>
         /// The list of content this heading contains.
@@ -198,7 +198,7 @@ public class Heading4 : IContent, IHeading
         /// <summary>
         /// The additional data of the node.
         /// </summary>
-        public object Data { get; set; }
+        public GenericStructureData Data { get; set; }
 
         /// <summary>
         /// The list of content this heading contains.
@@ -219,7 +219,7 @@ public class Heading5 : IContent, IHeading
         /// <summary>
         /// The additional data of the node.
         /// </summary>
-        public object Data { get; set; }
+        public GenericStructureData Data { get; set; }
 
         /// <summary>
         /// The list of content this heading contains.
@@ -240,7 +240,7 @@ public class Heading6 : IContent, IHeading
         /// <summary>
         /// The additional data of the node.
         /// </summary>
-        public object Data { get; set; }
+        public GenericStructureData Data { get; set; }
 
         /// <summary>
         /// The list of content this heading contains.
@@ -288,7 +288,7 @@ public class List : IContent
         /// <summary>
         /// The additional data of the node.
         /// </summary>
-        public object Data { get; set; }
+        public GenericStructureData Data { get; set; }
 
         /// <summary>
         /// The list of content this paragraph contains.
@@ -309,7 +309,7 @@ public class ListItem : IContent
         /// <summary>
         /// The additional data of the node.
         /// </summary>
-        public object Data { get; set; }
+        public GenericStructureData Data { get; set; }
 
         /// <summary>
         /// The list of content this paragraph contains.
@@ -330,7 +330,7 @@ public class Quote : IContent
         /// <summary>
         /// The additional data of the node.
         /// </summary>
-        public object Data { get; set; }
+        public GenericStructureData Data { get; set; }
 
         /// <summary>
         /// The list of content this paragraph contains.
@@ -351,7 +351,7 @@ public class HorizontalRuler : IContent
         /// <summary>
         /// The additional data of the node.
         /// </summary>
-        public object Data { get; set; }
+        public GenericStructureData Data { get; set; }
     }
 
     /// <summary>
@@ -418,6 +418,17 @@ public class EntryStructureData
         public IContent Target { get; set; }
     }
 
+    /// <summary>
+    /// Represents the data property of the generic node tpes
+    /// </summary>
+    public class GenericStructureData
+    {
+        /// <summary>
+        /// The entry this hyperlink targets
+        /// </summary>
+        public object Target { get; set; }
+    }
+
     /// <summary>
     /// Represents an hyperlink to an asset.
     /// </summary>