Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions internal/cmd/testdata/success_csharp.golden
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ namespace TestNamespace
{
return services
.AddSingleton(_ => Api.Instance)
.AddSingleton(provider => provider.GetRequiredService<Api>().GetClient())
.AddSingleton<IFeatureClient, FeatureClient>(provider => provider.GetRequiredService<Api>().GetClient())
.AddSingleton<GeneratedClient>();
}

Expand All @@ -55,7 +55,7 @@ namespace TestNamespace
{
return services
.AddSingleton(_ => Api.Instance)
.AddSingleton(provider => provider.GetRequiredService<Api>().GetClient(domain))
.AddSingleton<IFeatureClient, FeatureClient>(provider => provider.GetRequiredService<Api>().GetClient(domain))
.AddSingleton<GeneratedClient>();
}
}
Expand Down
4 changes: 2 additions & 2 deletions internal/generators/csharp/csharp.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ namespace {{ if .Params.Custom.Namespace }}{{ .Params.Custom.Namespace }}{{ else
{
return services
.AddSingleton(_ => Api.Instance)
.AddSingleton(provider => provider.GetRequiredService<Api>().GetClient())
.AddSingleton<IFeatureClient, FeatureClient>(provider => provider.GetRequiredService<Api>().GetClient())
.AddSingleton<GeneratedClient>();
}

Expand All @@ -49,7 +49,7 @@ namespace {{ if .Params.Custom.Namespace }}{{ .Params.Custom.Namespace }}{{ else
{
return services
.AddSingleton(_ => Api.Instance)
.AddSingleton(provider => provider.GetRequiredService<Api>().GetClient(domain))
.AddSingleton<IFeatureClient, FeatureClient>(provider => provider.GetRequiredService<Api>().GetClient(domain))
.AddSingleton<GeneratedClient>();
}
}
Expand Down
4 changes: 2 additions & 2 deletions test/csharp-integration/OpenFeature.g.cs
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public static IServiceCollection AddOpenFeature(this IServiceCollection services
{
return services
.AddSingleton(_ => Api.Instance)
.AddSingleton(provider => provider.GetRequiredService<Api>().GetClient())
.AddSingleton<IFeatureClient, FeatureClient>(provider => provider.GetRequiredService<Api>().GetClient())
.AddSingleton<GeneratedClient>();
}

Expand All @@ -55,7 +55,7 @@ public static IServiceCollection AddOpenFeature(this IServiceCollection services
{
return services
.AddSingleton(_ => Api.Instance)
.AddSingleton(provider => provider.GetRequiredService<Api>().GetClient(domain))
.AddSingleton<IFeatureClient, FeatureClient>(provider => provider.GetRequiredService<Api>().GetClient(domain))
.AddSingleton<GeneratedClient>();
}
}
Expand Down
7 changes: 3 additions & 4 deletions test/csharp-integration/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,9 @@ static void Main(string[] args)

// Test DI initialization
var services = new ServiceCollection();
// Register OpenFeature services manually for the test
services.AddSingleton(_ => Api.Instance);
services.AddSingleton<IFeatureClient>(_ => Api.Instance.GetClient());
services.AddSingleton<GeneratedClient>();

services.AddOpenFeature();

var serviceProvider = services.BuildServiceProvider();

// Test client retrieval from DI
Expand Down
4 changes: 2 additions & 2 deletions test/csharp-integration/expected/OpenFeature.cs
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public static IServiceCollection AddOpenFeature(this IServiceCollection services
{
return services
.AddSingleton(_ => Api.Instance)
.AddSingleton(provider => provider.GetRequiredService<Api>().GetClient())
.AddSingleton<IFeatureClient, FeatureClient>(provider => provider.GetRequiredService<Api>().GetClient())
.AddSingleton<GeneratedClient>();
}

Expand All @@ -39,7 +39,7 @@ public static IServiceCollection AddOpenFeature(this IServiceCollection services
{
return services
.AddSingleton(_ => Api.Instance)
.AddSingleton(provider => provider.GetRequiredService<Api>().GetClient(domain))
.AddSingleton<IFeatureClient, FeatureClient>(provider => provider.GetRequiredService<Api>().GetClient(domain))
.AddSingleton<GeneratedClient>();
}
}
Expand Down
4 changes: 2 additions & 2 deletions test/csharp-integration/expected/OpenFeature.g.cs
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public static IServiceCollection AddOpenFeature(this IServiceCollection services
{
return services
.AddSingleton(_ => Api.Instance)
.AddSingleton(provider => provider.GetRequiredService<Api>().GetClient())
.AddSingleton<IFeatureClient, FeatureClient>(provider => provider.GetRequiredService<Api>().GetClient())
.AddSingleton<GeneratedClient>();
}

Expand All @@ -38,7 +38,7 @@ public static IServiceCollection AddOpenFeature(this IServiceCollection services
{
return services
.AddSingleton(_ => Api.Instance)
.AddSingleton(provider => provider.GetRequiredService<Api>().GetClient(domain))
.AddSingleton<IFeatureClient, FeatureClient>(provider => provider.GetRequiredService<Api>().GetClient(domain))
.AddSingleton<GeneratedClient>();
}
}
Expand Down
Loading