Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Rename .net client. #264

Merged
merged 1 commit into from
Nov 29, 2019
Merged

Rename .net client. #264

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion client/DotNet/Armada.Client.Test/Tests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ public async Task TestSimpleJobSubmitFlow()
{
var jobSet = $"set-{Guid.NewGuid()}";

var client = new Client("http://localhost:8080", new HttpClient());
var client = new ArmadaClient("http://localhost:8080", new HttpClient());
await client.CreateQueueAsync("test", new ApiQueue {PriorityFactor = 200});

var pod = new V1PodSpec
Expand Down
0 client/DotNet/ArmadaClient.sln → client/DotNet/Armada.Client.sln
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion client/DotNet/Armada.Client/Armada.Client.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
</ItemGroup>

<Target Name="NSwag" BeforeTargets="Build">
<Exec Command="$(NSwagExe_Core30) openapi2csclient /ProtectedMethods:Client.GetJobSetEventsAsync /classname:Client /namespace:GResearch.Armada.Client /input:../../../internal/armada/api/api.swagger.json /output:ClientGenerated.cs" />
<Exec Command="$(NSwagExe_Core30) openapi2csclient /ProtectedMethods:ArmadaClient.GetJobSetEventsAsync /classname:ArmadaClient /namespace:GResearch.Armada.Client /input:../../../internal/armada/api/api.swagger.json /output:ClientGenerated.cs" />
</Target>

</Project>
2 changes: 1 addition & 1 deletion client/DotNet/Armada.Client/Client.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ public class StreamResponse<T>
public string Error { get; set; }
}

public partial class Client
public partial class ArmadaClient
{
public async Task<IEnumerable<StreamResponse<ApiEventStreamMessage>>> GetJobEventsStream(string jobSetId,
string fromMessage = null, bool watch = false)
Expand Down
4 changes: 2 additions & 2 deletions client/DotNet/Armada.Client/ClientGenerated.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ namespace GResearch.Armada.Client
using System = global::System;

[System.CodeDom.Compiler.GeneratedCode("NSwag", "13.1.3.0 (NJsonSchema v10.0.27.0 (Newtonsoft.Json v12.0.0.0))")]
public partial class Client
public partial class ArmadaClient
{
private string _baseUrl = "";
private System.Net.Http.HttpClient _httpClient;
private System.Lazy<Newtonsoft.Json.JsonSerializerSettings> _settings;

public Client(string baseUrl, System.Net.Http.HttpClient httpClient)
public ArmadaClient(string baseUrl, System.Net.Http.HttpClient httpClient)
{
BaseUrl = baseUrl;
_httpClient = httpClient;
Expand Down