Rename ActionParameterPropertySource.PropertyName -> PropertyPath

C0nquistadore · C0nquistadore · commit 2ccb7836a493 · 2025-05-21T13:46:18.000+02:00
diff --git a/src/Dibix.Sdk.CodeGeneration/Lookup/ActionTargetDefinitionResolver.cs b/src/Dibix.Sdk.CodeGeneration/Lookup/ActionTargetDefinitionResolver.cs
@@ -129,8 +129,8 @@ private ActionParameter CreateActionParameter(string name, TypeReference type, b
                 PathParameter pathParameter;
                 if (source is ActionParameterPropertySource propertySource)
                 {
-                    apiParameterName = propertySource.PropertyName.Split('.')[0];
-                    _ = IsUserParameter(propertySource.Definition, propertySource.PropertyName, ref location, ref apiParameterName);
+                    apiParameterName = propertySource.PropertyPath.Split('.')[0];
+                    _ = IsUserParameter(propertySource.Definition, propertySource.PropertyPath, ref location, ref apiParameterName);
 
                     if (propertySource.Definition is PathParameterSource)
                     {
diff --git a/src/Dibix.Sdk.CodeGeneration/Lookup/ExternalReflectionActionTargetDefinitionResolver.cs b/src/Dibix.Sdk.CodeGeneration/Lookup/ExternalReflectionActionTargetDefinitionResolver.cs
@@ -101,8 +101,8 @@ private static ActionParameterLocation ResolveParameterLocation(ActionParameterS
 
                 case ActionParameterPropertySource actionParameterPropertySource:
                     ActionParameterLocation location = ActionParameterLocation.NonUser;
-                    apiParameterName = actionParameterPropertySource.PropertyName.Split('.')[0];
-                    IsUserParameter(actionParameterPropertySource.Definition, actionParameterPropertySource.PropertyName, ref location, ref apiParameterName);
+                    apiParameterName = actionParameterPropertySource.PropertyPath.Split('.')[0];
+                    IsUserParameter(actionParameterPropertySource.Definition, actionParameterPropertySource.PropertyPath, ref location, ref apiParameterName);
                     return location;
 
                 case null when explicitLocation is not null: return explicitLocation.Value;
diff --git a/src/Dibix.Sdk.CodeGeneration/Model/ActionParameterClaimSource.cs b/src/Dibix.Sdk.CodeGeneration/Model/ActionParameterClaimSource.cs
@@ -5,16 +5,16 @@ internal sealed class ActionParameterClaimSource : ActionParameterSource, IActio
         private readonly ClaimParameterSource _claimParameterSource;
 
         public ActionParameterSourceDefinition Definition => _claimParameterSource;
-        public string PropertyName { get; }
+        public string PropertyPath { get; }
         public SourceLocation Location { get; }
-        public string ClaimType => _claimParameterSource.GetClaimTypeName(PropertyName);
+        public string ClaimType => _claimParameterSource.GetClaimTypeName(PropertyPath);
         public override TypeReference Type { get; }
 
         public ActionParameterClaimSource(ClaimParameterSource claimParameterSource, string propertyName, SourceLocation location)
         {
             _claimParameterSource = claimParameterSource;
             Type = claimParameterSource.TryGetType(propertyName);
-            PropertyName = propertyName;
+            PropertyPath = propertyName;
             Location = location;
         }
     }
diff --git a/src/Dibix.Sdk.CodeGeneration/Model/ActionParameterPropertySource.cs b/src/Dibix.Sdk.CodeGeneration/Model/ActionParameterPropertySource.cs
@@ -7,17 +7,17 @@ namespace Dibix.Sdk.CodeGeneration
     internal sealed class ActionParameterPropertySource : ActionParameterSource, IActionParameterPropertySource, IActionParameterNestedPropertySource
     {
         public ActionParameterSourceDefinition Definition { get; }
-        public string PropertyName { get; }
+        public string PropertyPath { get; }
         public string Converter { get; }
         public IReadOnlyCollection<ActionParameterPropertySourceNode> Nodes { get; }
         public IReadOnlyCollection<ActionParameterItemSource> ItemSources { get; }
         public SourceLocation Location { get; }
         public override TypeReference Type => Nodes.LastOrDefault()?.Property?.Type;
 
-        public ActionParameterPropertySource(ActionParameterSourceDefinition definition, string propertyName, SourceLocation location, string converter, IList<ActionParameterPropertySourceNode> nodes, IList<ActionParameterItemSource> itemSources)
+        public ActionParameterPropertySource(ActionParameterSourceDefinition definition, string propertyPath, SourceLocation location, string converter, IList<ActionParameterPropertySourceNode> nodes, IList<ActionParameterItemSource> itemSources)
         {
             Definition = definition;
-            PropertyName = propertyName;
+            PropertyPath = propertyPath;
             Location = location;
             Converter = converter;
             Nodes = new ReadOnlyCollection<ActionParameterPropertySourceNode>(nodes);
diff --git a/src/Dibix.Sdk.CodeGeneration/Model/IActionParameterPropertySource.cs b/src/Dibix.Sdk.CodeGeneration/Model/IActionParameterPropertySource.cs
@@ -3,7 +3,7 @@
     internal interface IActionParameterPropertySource
     {
         ActionParameterSourceDefinition Definition { get; }
-        string PropertyName { get; }
+        string PropertyPath { get; }
         SourceLocation Location { get; }
     }
 }
diff --git a/src/Dibix.Sdk.CodeGeneration/Output/ApiDescriptionWriter.cs b/src/Dibix.Sdk.CodeGeneration/Output/ApiDescriptionWriter.cs
@@ -336,7 +336,7 @@ private static void WriteParameter(CodeGenerationContext context, StringWriter w
                     break;
 
                 case ActionParameterPropertySource property:
-                    writer.Write($"{variableName}.ResolveParameterFromSource(\"{parameterName}\", \"{property.Definition.Name}\", \"{property.PropertyName}\"");
+                    writer.Write($"{variableName}.ResolveParameterFromSource(\"{parameterName}\", \"{property.Definition.Name}\", \"{property.PropertyPath}\"");
 
                     if (property.ItemSources.Any())
                     {
diff --git a/src/Dibix.Sdk.CodeGeneration/Validation/ActionParameterFixedPropertySourceValidator.cs b/src/Dibix.Sdk.CodeGeneration/Validation/ActionParameterFixedPropertySourceValidator.cs
@@ -7,11 +7,11 @@ internal abstract class ActionParameterFixedPropertySourceValidator<TSource> : A
     {
         public override bool Validate(ActionParameter rootParameter, ActionParameterInfo currentParameter, IActionParameterPropertySource currentValue, IActionParameterPropertySource parentValue, ActionDefinition actionDefinition, ISchemaRegistry schemaRegistry, ILogger logger)
         {
-            if (Definition.Properties.Any(x => x.Name == currentValue.PropertyName))
+            if (Definition.Properties.Any(x => x.Name == currentValue.PropertyPath))
                 return true;
 
             int column = currentValue.Location.Column + Definition.Name.Length + 1; // Skip source name + dot
-            logger.LogError($"Source '{Definition.Name}' does not support property '{currentValue.PropertyName}'", currentValue.Location.Source, currentValue.Location.Line, column);
+            logger.LogError($"Source '{Definition.Name}' does not support property '{currentValue.PropertyPath}'", currentValue.Location.Source, currentValue.Location.Line, column);
             return false;
         }
     }
diff --git a/src/Dibix.Sdk.CodeGeneration/Validation/EndpointModelValidator.cs b/src/Dibix.Sdk.CodeGeneration/Validation/EndpointModelValidator.cs
@@ -160,7 +160,7 @@ private bool ValidateAsyncFileUpload(ActionDefinition action, ActionParameter pa
             if (action.Target.IsAsync)
                 return true;
 
-            if (parameter.ParameterSource is not ActionParameterPropertySource { Definition: BodyParameterSource, PropertyName: BodyParameterSource.RawPropertyName } propertySource)
+            if (parameter.ParameterSource is not ActionParameterPropertySource { Definition: BodyParameterSource, PropertyPath: BodyParameterSource.RawPropertyName } propertySource)
                 return true;
 
             _logger.LogError($"The parameter '{parameter.InternalParameterName}' accepts a stream, therefore the accessor must be marked with @Async", propertySource.Location);
diff --git a/src/Dibix.Sdk.CodeGeneration/Validation/UserDefinedTypeParameterModelValidator.cs b/src/Dibix.Sdk.CodeGeneration/Validation/UserDefinedTypeParameterModelValidator.cs
@@ -70,7 +70,7 @@ private bool ValidateParameter(ActionParameter parameter, ActionDefinition actio
             ObjectSchemaProperty sourceProperty = bodyObjectSchema.Properties.SingleOrDefault(x => String.Equals(x.Name, parameter.InternalParameterName, StringComparison.OrdinalIgnoreCase));
             ActionParameterPropertySource propertySource = parameter.ParameterSource as ActionParameterPropertySource;
             if (sourceProperty == null && propertySource != null)
-                sourceProperty = bodyObjectSchema.Properties.SingleOrDefault(x => String.Equals(x.Name, propertySource.PropertyName, StringComparison.OrdinalIgnoreCase));
+                sourceProperty = bodyObjectSchema.Properties.SingleOrDefault(x => String.Equals(x.Name, propertySource.PropertyPath, StringComparison.OrdinalIgnoreCase));
 
             ActionTarget target = action.Target;
             if (sourceProperty == null)
diff --git a/src/Dibix.Sdk.CodeGeneration/Validation/ValidationUtility.cs b/src/Dibix.Sdk.CodeGeneration/Validation/ValidationUtility.cs
@@ -6,7 +6,7 @@ internal static class ValidationUtility
     {
         public static bool VerifyPathParameterNotUsedInSource(IActionParameterPropertySource currentValue, ActionDefinition actionDefinition, ActionParameterSourceDefinition sourceDefinition, ILogger logger)
         {
-            string sourcePropertyName = currentValue.PropertyName;
+            string sourcePropertyName = currentValue.PropertyPath;
             if (actionDefinition.PathParameters.ContainsKey(sourcePropertyName))
             {
                 SourceLocation location = currentValue.Location;

Original file line number	Diff line number	Diff line change
`@@ -129,8 +129,8 @@ private ActionParameter CreateActionParameter(string name, TypeReference type, b`
`129`	`129`	`PathParameter pathParameter;`
`130`	`130`	`if (source is ActionParameterPropertySource propertySource)`
`131`	`131`	`{`
`132`		`- apiParameterName = propertySource.PropertyName.Split('.')[0];`
`133`		`- _ = IsUserParameter(propertySource.Definition, propertySource.PropertyName, ref location, ref apiParameterName);`
	`132`	`+ apiParameterName = propertySource.PropertyPath.Split('.')[0];`
	`133`	`+ _ = IsUserParameter(propertySource.Definition, propertySource.PropertyPath, ref location, ref apiParameterName);`
`134`	`134`
`135`	`135`	`if (propertySource.Definition is PathParameterSource)`
`136`	`136`	`{`
Original file line number	Diff line number	Diff line change
`@@ -5,16 +5,16 @@ internal sealed class ActionParameterClaimSource : ActionParameterSource, IActio`
`5`	`5`	`private readonly ClaimParameterSource _claimParameterSource;`
`6`	`6`
`7`	`7`	`public ActionParameterSourceDefinition Definition => _claimParameterSource;`
`8`		`- public string PropertyName { get; }`
	`8`	`+ public string PropertyPath { get; }`
`9`	`9`	`public SourceLocation Location { get; }`
`10`		`- public string ClaimType => _claimParameterSource.GetClaimTypeName(PropertyName);`
	`10`	`+ public string ClaimType => _claimParameterSource.GetClaimTypeName(PropertyPath);`
`11`	`11`	`public override TypeReference Type { get; }`
`12`	`12`
`13`	`13`	`public ActionParameterClaimSource(ClaimParameterSource claimParameterSource, string propertyName, SourceLocation location)`
`14`	`14`	`{`
`15`	`15`	`_claimParameterSource = claimParameterSource;`
`16`	`16`	`Type = claimParameterSource.TryGetType(propertyName);`
`17`		`- PropertyName = propertyName;`
	`17`	`+ PropertyPath = propertyName;`
`18`	`18`	`Location = location;`
`19`	`19`	`}`
`20`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`internal interface IActionParameterPropertySource`
`4`	`4`	`{`
`5`	`5`	`ActionParameterSourceDefinition Definition { get; }`
`6`		`- string PropertyName { get; }`
	`6`	`+ string PropertyPath { get; }`
`7`	`7`	`SourceLocation Location { get; }`
`8`	`8`	`}`
`9`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -336,7 +336,7 @@ private static void WriteParameter(CodeGenerationContext context, StringWriter w`
`336`	`336`	`break;`
`337`	`337`
`338`	`338`	`case ActionParameterPropertySource property:`
`339`		`- writer.Write($"{variableName}.ResolveParameterFromSource(\"{parameterName}\", \"{property.Definition.Name}\", \"{property.PropertyName}\"");`
	`339`	`+ writer.Write($"{variableName}.ResolveParameterFromSource(\"{parameterName}\", \"{property.Definition.Name}\", \"{property.PropertyPath}\"");`
`340`	`340`
`341`	`341`	`if (property.ItemSources.Any())`
`342`	`342`	`{`
Original file line number	Diff line number	Diff line change
`@@ -7,11 +7,11 @@ internal abstract class ActionParameterFixedPropertySourceValidator<TSource> : A`
`7`	`7`	`{`
`8`	`8`	`public override bool Validate(ActionParameter rootParameter, ActionParameterInfo currentParameter, IActionParameterPropertySource currentValue, IActionParameterPropertySource parentValue, ActionDefinition actionDefinition, ISchemaRegistry schemaRegistry, ILogger logger)`
`9`	`9`	`{`
`10`		`- if (Definition.Properties.Any(x => x.Name == currentValue.PropertyName))`
	`10`	`+ if (Definition.Properties.Any(x => x.Name == currentValue.PropertyPath))`
`11`	`11`	`return true;`
`12`	`12`
`13`	`13`	`int column = currentValue.Location.Column + Definition.Name.Length + 1; // Skip source name + dot`
`14`		`- logger.LogError($"Source '{Definition.Name}' does not support property '{currentValue.PropertyName}'", currentValue.Location.Source, currentValue.Location.Line, column);`
	`14`	`+ logger.LogError($"Source '{Definition.Name}' does not support property '{currentValue.PropertyPath}'", currentValue.Location.Source, currentValue.Location.Line, column);`
`15`	`15`	`return false;`
`16`	`16`	`}`
`17`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ internal static class ValidationUtility`
`6`	`6`	`{`
`7`	`7`	`public static bool VerifyPathParameterNotUsedInSource(IActionParameterPropertySource currentValue, ActionDefinition actionDefinition, ActionParameterSourceDefinition sourceDefinition, ILogger logger)`
`8`	`8`	`{`
`9`		`- string sourcePropertyName = currentValue.PropertyName;`
	`9`	`+ string sourcePropertyName = currentValue.PropertyPath;`
`10`	`10`	`if (actionDefinition.PathParameters.ContainsKey(sourcePropertyName))`
`11`	`11`	`{`
`12`	`12`	`SourceLocation location = currentValue.Location;`