Skip to content

Commit 4b61d1f

Browse files
committed
Fix interfaces
1 parent c526bc3 commit 4b61d1f

File tree

8 files changed

+15
-9
lines changed

8 files changed

+15
-9
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,8 @@ dotnet add package Curl.HttpClient.Converter
7777
#### Usage/Examples
7878
```c#
7979
var input = @"curl https://sentry.io/api/0/projects/1/groups/?status=unresolved -d '{""status"": ""resolved""}' -H 'Content-Type: application/json' -u 'username:password' -H 'Accept: application/json' -H 'User-Agent: curl/7.60.0'";
80-
var curlOption = new CurlParser(new ParsingOptions() { MaxUploadFiles = 10 }).Parse(input);
81-
var output = new CurlConverter().ToCsharp(curlOption.Data);
80+
var curlOption = new CurlParser().Parse(input);
81+
var output = new CurlHttpClientConverter().ToCsharp(curlOption.Data);
8282
// Output:
8383
/*
8484
// In production code, don't destroy the HttpClient through using, but better reuse an existing instance

src/Curl.CommandLine.Parser/CurlParser.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@ public class CurlParser : ICurlParser
1212
{
1313
private readonly IEnumerable<ParameterEvaluator> _evaluators;
1414

15+
public CurlParser() : this(new ParsingOptions(10))
16+
{
17+
}
18+
1519
public CurlParser(ParsingOptions parsingOptions)
1620
: this(EvaluatorProvider.All(parsingOptions))
1721
{

src/Curl.CommandLine.Parser/ICurlParser.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,7 @@ namespace Curl.CommandLine.Parser
55
public interface ICurlParser
66
{
77
ConvertResult<CurlOptions> Parse(Span<char> commandLine);
8+
9+
ConvertResult<CurlOptions> Parse(string commandLine);
810
}
911
}

src/Curl.HttpClient.Converter/CurlConverter.cs renamed to src/Curl.HttpClient.Converter/CurlHttpClientConverter.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
namespace Curl.HttpClient.Converter
1717
{
18-
public class CurlConverter : ICurlConverter
18+
public class CurlHttpClientConverter : ICurlConverter
1919
{
2020
private const string RequestVariableName = "request";
2121

@@ -472,7 +472,7 @@ private StatementSyntax[] CreateBasicAuthorizationStatements(CurlOptions options
472472
return new StatementSyntax[] { authorizationEncodingStatement, tryAddHeaderStatement };
473473
}
474474

475-
public ExpressionStatementSyntax CreateSetHttpVersionStatement(CurlOptions options)
475+
private ExpressionStatementSyntax CreateSetHttpVersionStatement(CurlOptions options)
476476
{
477477
var arguments = new LinkedList<ArgumentSyntax>();
478478
var majorVersionArgument = options.HttpVersion switch

src/CurlToCSharp.IntegrationTests/RequestsTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ private static Task<string> ExecuteCurlRequestAsync(string curlArguments)
102102
private static async Task<string> ExecuteCsharpRequestAsync(string curlArguments)
103103
{
104104
var commandLineParser = new CurlParser(new ParsingOptions(int.MaxValue));
105-
var converterService = new CurlConverter();
105+
var converterService = new CurlHttpClientConverter();
106106
var parserResult = commandLineParser.Parse(new Span<char>($"curl {curlArguments}".ToCharArray()));
107107
var csharp = converterService.ToCsharp(parserResult.Data);
108108

src/CurlToCSharp.UnitTests/Services/ConverterServiceTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public class ConverterServiceTests
1515
[Fact]
1616
public void ToCsharp_ValidCurlOptions_CanBeCompiled()
1717
{
18-
var converterService = new CurlConverter();
18+
var converterService = new CurlHttpClientConverter();
1919
var curlOptions = new CurlOptions
2020
{
2121
HttpMethod = HttpMethod.Post.ToString().ToUpper(),
@@ -37,7 +37,7 @@ public void ToCsharp_ValidCurlOptions_CanBeCompiled()
3737
[Fact]
3838
public void ToCsharp_GetRequest_ContainsSendStatement()
3939
{
40-
var converterService = new CurlConverter();
40+
var converterService = new CurlHttpClientConverter();
4141
var curlOptions = new CurlOptions
4242
{
4343
HttpMethod = HttpMethod.Get.ToString().ToUpper(),

src/CurlToCSharp/Infrastructure/IocExtensions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@ public static void RegisterServices(this IServiceCollection services)
1616
.Value.Parsing);
1717

1818
services.AddSingleton<ICurlParser, CurlParser>();
19-
services.AddSingleton<ICurlConverter, CurlConverter>();
19+
services.AddSingleton<ICurlConverter, CurlHttpClientConverter>();
2020
}
2121
}

src/Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="4.0" DefaultTargets="Build">
33
<PropertyGroup>
4-
<VersionPrefix>1.0.0</VersionPrefix>
4+
<VersionPrefix>1.0.1</VersionPrefix>
55
</PropertyGroup>
66

77
<ItemGroup Condition="$(MSBuildProjectName.EndsWith('Tests'))">

0 commit comments

Comments
 (0)