Skip to content

Commit 3241e8d

Browse files
committed
InterfaceConverter, IBaseClient and ICollectionPage
1 parent 5c7c9a8 commit 3241e8d

File tree

3 files changed

+23
-9
lines changed

3 files changed

+23
-9
lines changed

Templates/CSharp/Requests/IEntityCollectionPage.cs.tt

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@
55

66
var prop = host.CurrentType.AsOdcmProperty();
77
var @namespace = prop.Class.AsOdcmClass().Namespace.GetNamespaceName();
8+
9+
var interfaceConverterTypeName = @namespace.GetMiddlewareTypeName("InterfaceConverter");
10+
var iCollectionPageTypeName = @namespace.GetMiddlewareTypeName("ICollectionPage");
11+
var iBaseClientTypeName = @namespace.GetMiddlewareTypeName("IBaseClient");
12+
813
var innerEntityType = prop.GetTypeString(@namespace);
914
if (innerEntityType.EndsWith("Request"))
1015
{
@@ -25,8 +30,8 @@ namespace <#=@namespace#>
2530
/// <summary>
2631
/// The interface I<#=entityCollectionPage#>.
2732
/// </summary>
28-
[JsonConverter(typeof(InterfaceConverter<<#=entityCollectionPage#>>))]
29-
public interface I<#=entityCollectionPage#> : ICollectionPage<<#=innerEntityType#>>
33+
[JsonConverter(typeof(<#=interfaceConverterTypeName#><<#=entityCollectionPage#>>))]
34+
public interface I<#=entityCollectionPage#> : <#=iCollectionPageTypeName#><<#=innerEntityType#>>
3035
{
3136
/// <summary>
3237
/// Gets the next page <see cref="I<#=entityCollectionRequest#>"/> instance.
@@ -36,6 +41,6 @@ namespace <#=@namespace#>
3641
/// <summary>
3742
/// Initializes the NextPageRequest property.
3843
/// </summary>
39-
void InitializeNextPageRequest(IBaseClient client, string nextPageLinkString);
44+
void InitializeNextPageRequest(<#=iBaseClientTypeName#> client, string nextPageLinkString);
4045
}
4146
}

Templates/CSharp/Requests/IEntityCollectionWithReferencesPage.cs.tt

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@
55

66
var prop = host.CurrentType.AsOdcmProperty();
77
var @namespace = prop.Class.AsOdcmClass().Namespace.GetNamespaceName();
8+
9+
var interfaceConverterTypeName = @namespace.GetMiddlewareTypeName("InterfaceConverter");
10+
var iCollectionPageTypeName = @namespace.GetMiddlewareTypeName("ICollectionPage");
11+
var iBaseClientTypeName = @namespace.GetMiddlewareTypeName("IBaseClient");
12+
813
var innerEntityType = prop.GetTypeString(@namespace);
914
var entityCollectionRequest = this.GetPropertyCollectionWithReferencesRequestName(prop);
1015
var entityCollectionPage = string.Concat(this.GetEntityNameString(prop.Class), prop.Name.ToCheckedCase(), "CollectionWithReferencesPage");
@@ -20,8 +25,8 @@ namespace <#=@namespace#>
2025
/// <summary>
2126
/// The interface I<#=entityCollectionPage#>.
2227
/// </summary>
23-
[JsonConverter(typeof(InterfaceConverter<<#=entityCollectionPage#>>))]
24-
public interface I<#=entityCollectionPage#> : ICollectionPage<<#=innerEntityType#>>
28+
[JsonConverter(typeof(<#=interfaceConverterTypeName#><<#=entityCollectionPage#>>))]
29+
public interface I<#=entityCollectionPage#> : <#=iCollectionPageTypeName#><<#=innerEntityType#>>
2530
{
2631
/// <summary>
2732
/// Gets the next page <see cref="I<#=entityCollectionRequest#>"/> instance.
@@ -31,6 +36,6 @@ namespace <#=@namespace#>
3136
/// <summary>
3237
/// Initializes the NextPageRequest property.
3338
/// </summary>
34-
void InitializeNextPageRequest(IBaseClient client, string nextPageLinkString);
39+
void InitializeNextPageRequest(<#=iBaseClientTypeName#> client, string nextPageLinkString);
3540
}
3641
}

Templates/CSharp/Requests/IMethodCollectionPage.cs.tt

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@
66
var method = host.CurrentType.AsOdcmMethod();
77
var @namespace = method.Namespace.GetNamespaceName();
88

9+
var interfaceConverterTypeName = @namespace.GetMiddlewareTypeName("InterfaceConverter");
10+
var iCollectionPageTypeName = @namespace.GetMiddlewareTypeName("ICollectionPage");
11+
var iBaseClientTypeName = @namespace.GetMiddlewareTypeName("IBaseClient");
12+
913
var returnType = method.ReturnType.GetTypeString(@namespace);
1014

1115
var responseNamePrefix = method.Class.Name.ToCheckedCase() + method.Name.Substring(method.Name.IndexOf('.') + 1).ToCheckedCase();
@@ -21,8 +25,8 @@ namespace <#=@namespace#>
2125
/// <summary>
2226
/// The interface I<#=entityCollectionPage#>.
2327
/// </summary>
24-
[JsonConverter(typeof(InterfaceConverter<<#=entityCollectionPage#>>))]
25-
public interface I<#=entityCollectionPage#> : ICollectionPage<<#=returnType#>>
28+
[JsonConverter(typeof(<#=interfaceConverterTypeName#><<#=entityCollectionPage#>>))]
29+
public interface I<#=entityCollectionPage#> : <#=iCollectionPageTypeName#><<#=returnType#>>
2630
{
2731
/// <summary>
2832
/// Gets the next page <see cref="I<#=entityCollectionRequest#>"/> instance.
@@ -32,6 +36,6 @@ namespace <#=@namespace#>
3236
/// <summary>
3337
/// Initializes the NextPageRequest property.
3438
/// </summary>
35-
void InitializeNextPageRequest(IBaseClient client, string nextPageLinkString);
39+
void InitializeNextPageRequest(<#=iBaseClientTypeName#> client, string nextPageLinkString);
3640
}
3741
}

0 commit comments

Comments
 (0)