revert the exposing of internal name

Author: roblankey

src/JsonApiDotNetCore/Models/HasManyAttribute.cs

@@ -1,3 +1,5 @@
+using System;
+
 namespace JsonApiDotNetCore.Models
 {
     public class HasManyAttribute : RelationshipAttribute
@@ -7,7 +9,6 @@ public class HasManyAttribute : RelationshipAttribute
         /// </summary>
         /// 
         /// <param name="publicName">The relationship name as exposed by the API</param>
-        /// <param name="internalName">The relationship name as defined in the entity layer, if not provided defaults to the variable name</param>
         /// <param name="documentLinks">Which links are available. Defaults to <see cref="Link.All"/></param>
         /// <param name="canInclude">Whether or not this relationship can be included using the <c>?include=public-name</c> query string</param>
         /// 
@@ -22,23 +23,22 @@ public class HasManyAttribute : RelationshipAttribute
         /// </code>
         /// 
         /// </example>
-        public HasManyAttribute(string publicName, string internalName = null, Link documentLinks = Link.All, 
-            bool canInclude = true)
-        : base(publicName, internalName, documentLinks, canInclude)
+        public HasManyAttribute(string publicName, Link documentLinks = Link.All, bool canInclude = true)
+        : base(publicName, documentLinks, canInclude)
         { }
 
         /// <summary>
         /// Sets the value of the property identified by this attribute
         /// </summary>
-        /// <param name="entity">The target object</param>
+        /// <param name="resource">The target object</param>
         /// <param name="newValue">The new property value</param>
-        public override void SetValue(object entity, object newValue)
+        public override void SetValue(object resource, object newValue)
         {
-            var propertyInfo = entity
+            var propertyInfo = resource
                 .GetType()
                 .GetProperty(InternalRelationshipName);
 
-            propertyInfo.SetValue(entity, newValue);
+            propertyInfo.SetValue(resource, newValue);
         }
     }
 }

src/JsonApiDotNetCore/Models/HasOneAttribute.cs

@@ -1,3 +1,5 @@
+using System;
+
 namespace JsonApiDotNetCore.Models
 {
     public class HasOneAttribute : RelationshipAttribute
@@ -7,10 +9,9 @@ public class HasOneAttribute : RelationshipAttribute
         /// </summary>
         /// 
         /// <param name="publicName">The relationship name as exposed by the API</param>
-        /// <param name="internalName">The relationship name as defined in the entity layer, if not provided defaults to the variable name</param>
         /// <param name="documentLinks">Which links are available. Defaults to <see cref="Link.All"/></param>
         /// <param name="canInclude">Whether or not this relationship can be included using the <c>?include=public-name</c> query string</param>
-        /// <param name="withForiegnKey">The foreign key property name. Defaults to <c>"{RelationshipName}Id"</c></param>
+        /// <param name="withForeignKey">The foreign key property name. Defaults to <c>"{RelationshipName}Id"</c></param>
         /// 
         /// <example>
         /// Using an alternative foreign key:
@@ -25,17 +26,16 @@ public class HasOneAttribute : RelationshipAttribute
         /// </code>
         /// 
         /// </example>
-        public HasOneAttribute(string publicName, string internalName = null, Link documentLinks = Link.All, 
-            bool canInclude = true, string withForiegnKey = null)
-        : base(publicName, internalName, documentLinks, canInclude)
+        public HasOneAttribute(string publicName, Link documentLinks = Link.All, bool canInclude = true, string withForeignKey = null)
+        : base(publicName, documentLinks, canInclude)
         {
-            _explicitIdentifiablePropertyName = withForiegnKey;
+            _explicitIdentifiablePropertyName = withForeignKey;
         }
 
         private readonly string _explicitIdentifiablePropertyName;
 
         /// <summary>
-        /// The independent entity identifier.
+        /// The independent resource identifier.
         /// </summary>
         public string IdentifiablePropertyName => string.IsNullOrWhiteSpace(_explicitIdentifiablePropertyName)
             ? $"{InternalRelationshipName}Id"
@@ -44,19 +44,19 @@ public HasOneAttribute(string publicName, string internalName = null, Link docum
         /// <summary>
         /// Sets the value of the property identified by this attribute
         /// </summary>
-        /// <param name="entity">The target object</param>
+        /// <param name="resource">The target object</param>
         /// <param name="newValue">The new property value</param>
-        public override void SetValue(object entity, object newValue)
+        public override void SetValue(object resource, object newValue)
         {
             var propertyName = (newValue?.GetType() == Type)
                 ? InternalRelationshipName
                 : IdentifiablePropertyName;
 
-            var propertyInfo = entity
+            var propertyInfo = resource
                 .GetType()
                 .GetProperty(propertyName);
 
-            propertyInfo.SetValue(entity, newValue);
+            propertyInfo.SetValue(resource, newValue);
         }
 
         // HACK: this will likely require boxing
@@ -65,16 +65,16 @@ public override void SetValue(object entity, object newValue)
         /// Gets the value of the independent identifier (e.g. Article.AuthorId)
         /// </summary>
         /// 
-        /// <param name="entity">
+        /// <param name="resource">
         /// An instance of dependent resource
         /// </param>
         /// 
         /// <returns>
         /// The property value or null if the property does not exist on the model.
         /// </returns>
-        internal object GetIdentifiablePropertyValue(object entity) => entity
+        internal object GetIdentifiablePropertyValue(object resource) => resource
                 .GetType()
                 .GetProperty(IdentifiablePropertyName)
-                ?.GetValue(entity);
+                ?.GetValue(resource);
     }
 }

src/JsonApiDotNetCore/Models/RelationshipAttribute.cs

@@ -4,17 +4,16 @@ namespace JsonApiDotNetCore.Models
 {
     public abstract class RelationshipAttribute : Attribute
     {
-        protected RelationshipAttribute(string publicName, string internalName, Link documentLinks, bool canInclude)
+        protected RelationshipAttribute(string publicName, Link documentLinks, bool canInclude)
         {
             PublicRelationshipName = publicName;
             DocumentLinks = documentLinks;
             CanInclude = canInclude;
-            InternalRelationshipName = internalName;
         }
 
         public string PublicRelationshipName { get; }
         public string InternalRelationshipName { get; internal set; }
-
+        
         /// <summary>
         /// The related entity type. This does not necessarily match the navigation property type.
         /// In the case of a HasMany relationship, this value will be the generic argument type.