Skip to content

Commit fce7607

Browse files
ethanhannethanhann
committed
Allow parameterless methods to be callued in the console client
1 parent fbbc5ec commit fce7607

File tree

19 files changed

+209
-119
lines changed

19 files changed

+209
-119
lines changed

‎IntegrationEngine.Client.net40/IntegrationEngine.Client.net40.csproj‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
44
<PropertyGroup>
55
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -32,10 +32,6 @@
3232
<WarningLevel>4</WarningLevel>
3333
</PropertyGroup>
3434
<ItemGroup>
35-
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
36-
<SpecificVersion>False</SpecificVersion>
37-
<HintPath>..\packages\Newtonsoft.Json.6.0.8\lib\net40\Newtonsoft.Json.dll</HintPath>
38-
</Reference>
3935
<Reference Include="RestSharp">
4036
<HintPath>..\packages\RestSharp.105.0.1\lib\net4\RestSharp.dll</HintPath>
4137
</Reference>
@@ -46,6 +42,9 @@
4642
<Reference Include="Microsoft.CSharp" />
4743
<Reference Include="System.Data" />
4844
<Reference Include="System.Xml" />
45+
<Reference Include="Newtonsoft.Json">
46+
<HintPath>..\packages\Newtonsoft.Json.6.0.8\lib\net40\Newtonsoft.Json.dll</HintPath>
47+
</Reference>
4948
</ItemGroup>
5049
<ItemGroup>
5150
<Compile Include="..\configuration\SharedAssemblyInfo.cs">
@@ -64,7 +63,7 @@
6463
</ItemGroup>
6564
<ItemGroup>
6665
<ProjectReference Include="..\IntegrationEngine.Model.net40\IntegrationEngine.Model.net40.csproj">
67-
<Project>{dfcd19ce-a96a-4b19-8cf1-9cac560e7f42}</Project>
66+
<Project>{DFCD19CE-A96A-4B19-8CF1-9CAC560E7F42}</Project>
6867
<Name>IntegrationEngine.Model.net40</Name>
6968
</ProjectReference>
7069
</ItemGroup>

‎IntegrationEngine.Client/IInEngineClient.cs‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
using InEngineTimeZone = IntegrationEngine.Model.TimeZone;
2+
using IntegrationEngine.Model;
3+
using System;
4+
using System.Collections.Generic;
5+
using System.Net;
6+
7+
namespace IntegrationEngine.Client
8+
{
9+
public interface IInEngineClient
10+
{
11+
HttpStatusCode Ping();
12+
IList<CronTrigger> GetCronTriggers();
13+
CronTrigger GetCronTriggerById(string id);
14+
CronTrigger CreateCronTrigger(CronTrigger cronTrigger);
15+
CronTrigger UpdateCronTrigger(CronTrigger cronTrigger);
16+
CronTrigger DeleteCronTrigger(string id);
17+
IList<SimpleTrigger> GetSimpleTriggers();
18+
SimpleTrigger GetSimpleTriggerById(string id);
19+
SimpleTrigger CreateSimpleTrigger(SimpleTrigger simpleTrigger);
20+
SimpleTrigger UpdateSimpleTrigger(SimpleTrigger simpleTrigger);
21+
SimpleTrigger DeleteSimpleTrigger(string id);
22+
IList<InEngineTimeZone> GetTimeZones();
23+
IList<string> GetJobTypes();
24+
HealthStatus GetHealthStatus();
25+
}
26+
}
27+

‎IntegrationEngine.Client/InEngineClient.cs‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,11 @@
55
using IntegrationEngine.Model;
66
using RestSharp;
77
using Newtonsoft.Json;
8+
using System.Net;
89

910
namespace IntegrationEngine.Client
1011
{
11-
public class InEngineClient
12+
public class InEngineClient : IInEngineClient
1213
{
1314
public RestClient RestClient { get; set; }
1415

@@ -22,6 +23,11 @@ public InEngineClient(string apiUrl)
2223
RestClient = new RestClient(apiUrl);
2324
}
2425

26+
public HttpStatusCode Ping()
27+
{
28+
return RestClient.Execute(new RestRequest(EndpointName.HealthStatus, Method.GET)).StatusCode;
29+
}
30+
2531
#region CronTrigger
2632
public IList<CronTrigger> GetCronTriggers()
2733
{

‎IntegrationEngine.Client/IntegrationEngine.Client.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,13 @@
3030
<ConsolePause>false</ConsolePause>
3131
</PropertyGroup>
3232
<ItemGroup>
33-
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
34-
<SpecificVersion>False</SpecificVersion>
35-
<HintPath>..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
36-
</Reference>
3733
<Reference Include="System" />
3834
<Reference Include="RestSharp">
3935
<HintPath>..\packages\RestSharp.105.0.1\lib\net4\RestSharp.dll</HintPath>
4036
</Reference>
37+
<Reference Include="Newtonsoft.Json">
38+
<HintPath>..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
39+
</Reference>
4140
</ItemGroup>
4241
<ItemGroup>
4342
<Compile Include="..\configuration\SharedAssemblyInfo.cs">
@@ -46,6 +45,7 @@
4645
<Compile Include="InEngineClient.cs" />
4746
<Compile Include="Properties\AssemblyInfo.cs" />
4847
<Compile Include="EndpointName.cs" />
48+
<Compile Include="IInEngineClient.cs" />
4949
</ItemGroup>
5050
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
5151
<ItemGroup>

‎IntegrationEngine.ConsoleClient/IntegrationEngine.ConsoleClient.csproj‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
44
<PropertyGroup>
55
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -8,13 +8,12 @@
88
<OutputType>Exe</OutputType>
99
<AppDesignerFolder>Properties</AppDesignerFolder>
1010
<RootNamespace>IntegrationEngine.ConsoleClient</RootNamespace>
11-
<AssemblyName>IntegrationEngine.ConsoleClient</AssemblyName>
11+
<AssemblyName>inengine</AssemblyName>
1212
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
1414
<TargetFrameworkProfile />
1515
</PropertyGroup>
1616
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
17-
<PlatformTarget>AnyCPU</PlatformTarget>
1817
<DebugSymbols>true</DebugSymbols>
1918
<DebugType>full</DebugType>
2019
<Optimize>false</Optimize>
@@ -42,23 +41,28 @@
4241
<Reference Include="Microsoft.CSharp" />
4342
<Reference Include="System.Data" />
4443
<Reference Include="System.Xml" />
44+
<Reference Include="CommandLine">
45+
<HintPath>..\packages\CommandLineParser.1.9.71\lib\net45\CommandLine.dll</HintPath>
46+
</Reference>
4547
</ItemGroup>
4648
<ItemGroup>
4749
<Compile Include="Program.cs" />
4850
<Compile Include="Properties\AssemblyInfo.cs" />
51+
<Compile Include="Options.cs" />
4952
</ItemGroup>
5053
<ItemGroup>
5154
<ProjectReference Include="..\IntegrationEngine.Client\IntegrationEngine.Client.csproj">
52-
<Project>{f3fcb706-f0dd-46c1-b121-785757fae9b9}</Project>
55+
<Project>{F3FCB706-F0DD-46C1-B121-785757FAE9B9}</Project>
5356
<Name>IntegrationEngine.Client</Name>
5457
</ProjectReference>
5558
<ProjectReference Include="..\IntegrationEngine.Model\IntegrationEngine.Model.csproj">
56-
<Project>{0b499fe4-0bdb-4080-bcb7-f8d4ce54a4ff}</Project>
59+
<Project>{0B499FE4-0BDB-4080-BCB7-F8D4CE54A4FF}</Project>
5760
<Name>IntegrationEngine.Model</Name>
5861
</ProjectReference>
5962
</ItemGroup>
6063
<ItemGroup>
6164
<None Include="app.config" />
65+
<None Include="packages.config" />
6266
</ItemGroup>
6367
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
6468
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.

‎IntegrationEngine.ConsoleClient/Options.cs‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
using CommandLine;
2+
using System;
3+
using System.Collections.Generic;
4+
using IntegrationEngine.Client;
5+
6+
namespace IntegrationEngine.ConsoleClient
7+
{
8+
9+
public class Options
10+
{
11+
[Option('m', "method", Required = true, HelpText = "Call a method from IntegrationEngine.Client.")]
12+
public string MethodName { get; set; }
13+
14+
[Option('u', "url", Required = false, HelpText = "Web API url.")]
15+
public string WebApiUrl { get; set; }
16+
}
17+
}

‎IntegrationEngine.ConsoleClient/Program.cs‎

Lines changed: 31 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
using IntegrationEngine.Client;
1+
using CommandLine;
2+
using CommandLine.Text;
3+
using IntegrationEngine.Client;
4+
using IntegrationEngine.Model;
5+
using Newtonsoft.Json;
26
using System;
37
using System.Collections.Generic;
48
using System.Linq;
@@ -10,10 +14,32 @@ class Program
1014
{
1115
static void Main(string[] args)
1216
{
13-
var client = new InEngineClient();
14-
var triggers = client.GetCronTriggers();
15-
Console.WriteLine(triggers.Count);
16-
Console.ReadLine();
17+
var options = new Options();
18+
if (!CommandLine.Parser.Default.ParseArguments(args, options))
19+
return;
20+
var client = !string.IsNullOrWhiteSpace(options.WebApiUrl) ?
21+
new InEngineClient(options.WebApiUrl) :
22+
new InEngineClient();
23+
var type = client.GetType();
24+
if (!type.GetMethods().Where(x => x.Name == options.MethodName && !x.GetParameters().Any()).Any())
25+
{
26+
Console.WriteLine("Method '{0}' does not exist", options.MethodName);
27+
var availableMethods = typeof(IInEngineClient).GetMethods()
28+
.Where(x => !x.GetParameters().Any())
29+
.Select(x => x.Name)
30+
.ToList();
31+
Console.WriteLine("Available methods: '{0}'", string.Join(", ", availableMethods));
32+
return;
33+
}
34+
var method = type.GetMethod(options.MethodName);
35+
dynamic result = method.Invoke(client, null);
36+
if (result == null)
37+
Console.WriteLine("The web API did not return a result. Is the URL correct and the server online? Try -mPing.");
38+
else if (method.ReturnType.GetInterface("IEnumerable") != null)
39+
foreach (var item in result)
40+
Console.WriteLine(item);
41+
else
42+
Console.WriteLine(result);
1743
}
1844
}
1945
}

‎IntegrationEngine.ConsoleClient/packages.config‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<packages>
3+
<package id="CommandLineParser" version="1.9.71" targetFramework="net45" />
4+
</packages>

‎IntegrationEngine.Model.Tests/IntegrationEngine.Model.Tests.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
44
<PropertyGroup>
55
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -67,11 +67,11 @@
6767
</ItemGroup>
6868
<ItemGroup>
6969
<ProjectReference Include="..\IntegrationEngine.Model\IntegrationEngine.Model.csproj">
70-
<Project>{0b499fe4-0bdb-4080-bcb7-f8d4ce54a4ff}</Project>
70+
<Project>{0B499FE4-0BDB-4080-BCB7-F8D4CE54A4FF}</Project>
7171
<Name>IntegrationEngine.Model</Name>
7272
</ProjectReference>
7373
<ProjectReference Include="..\UnitTesting\UnitTesting.csproj">
74-
<Project>{3a6e4fab-025b-450c-a286-911bad1f8e05}</Project>
74+
<Project>{3A6E4FAB-025B-450C-A286-911BAD1F8E05}</Project>
7575
<Name>UnitTesting</Name>
7676
</ProjectReference>
7777
</ItemGroup>

‎IntegrationEngine.Model.net40/IntegrationEngine.Model.net40.csproj‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,17 +42,16 @@
4242
<Reference Include="Nest">
4343
<HintPath>..\packages\NEST.1.3.1\lib\Nest.dll</HintPath>
4444
</Reference>
45-
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
46-
<SpecificVersion>False</SpecificVersion>
47-
<HintPath>..\packages\Newtonsoft.Json.6.0.1\lib\net40\Newtonsoft.Json.dll</HintPath>
48-
</Reference>
4945
<Reference Include="System" />
5046
<Reference Include="System.Core" />
5147
<Reference Include="System.Xml.Linq" />
5248
<Reference Include="System.Data.DataSetExtensions" />
5349
<Reference Include="Microsoft.CSharp" />
5450
<Reference Include="System.Data" />
5551
<Reference Include="System.Xml" />
52+
<Reference Include="Newtonsoft.Json">
53+
<HintPath>..\packages\Newtonsoft.Json.6.0.1\lib\net40\Newtonsoft.Json.dll</HintPath>
54+
</Reference>
5655
</ItemGroup>
5756
<ItemGroup>
5857
<Compile Include="..\configuration\SharedAssemblyInfo.cs">

0 commit comments

Comments
 (0)