Skip to content

Commit e3f0e57

Browse files
ethanhannethanhann
committed
Remove unused interfaces, and refactor job namespace
1 parent 37fb0d6 commit e3f0e57

24 files changed

+35
-200
lines changed

‎IntegrationEngine.ConsoleHost/IntegrationJobs/CarReport/CarMailMessageJob.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
using IntegrationEngine.ConsoleHost.IntegrationPoints;
2-
using IntegrationEngine.Core.Jobs;
2+
using IntegrationEngine.Core.IntegrationJob;
33
using IntegrationEngine.Core.Mail;
44
using System;
55
using System.Collections.Generic;
@@ -8,7 +8,7 @@
88

99
namespace IntegrationEngine.ConsoleHost.Car
1010
{
11-
public class CarMailMessageJob : IMailJob, IParameterizedJob
11+
public class CarMailMessageJob : IParameterizedJob
1212
{
1313
public IMailClient MailClient { get; set; }
1414
public IDictionary<string, string> Parameters { get; set; }

‎IntegrationEngine.ConsoleHost/IntegrationJobs/CarReport/CarReportJob.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
using System;
2-
using IntegrationEngine.Core.Jobs;
2+
using IntegrationEngine.Core.IntegrationJob;
33
using IntegrationEngine.Core.Reports;
44

55
namespace IntegrationEngine.ConsoleHost.IntegrationJobs.CarReport

‎IntegrationEngine.ConsoleHost/IntegrationJobs/SampleSqlReport/SampleSqlReportJob.cs‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using IntegrationEngine.Core.Jobs;
1+
using IntegrationEngine.ConsoleHost.IntegrationPoints;
2+
using IntegrationEngine.Core.IntegrationJob;
23
using IntegrationEngine.Core.Mail;
34
using RazorEngine;
45
using RazorEngine.Templating;
@@ -7,9 +8,16 @@
78

89
namespace IntegrationEngine.ConsoleHost.IntegrationJobs.SampleSqlReport
910
{
10-
public class SampleSqlReportJob : SqlJob
11+
public class SampleSqlReportJob : IIntegrationJob
1112
{
12-
public override void Run()
13+
public IMailClient MailClient { get; set; }
14+
15+
public SampleSqlReportJob (FooMailClient fooMailClient)
16+
{
17+
MailClient = fooMailClient;
18+
}
19+
20+
public void Run()
1321
{
1422
try
1523
{

‎IntegrationEngine.ConsoleHost/IntegrationJobs/SampleSqlReport/SampleSqlReportJobWithIntegrationPoints.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using IntegrationEngine.Core.Jobs;
1+
using IntegrationEngine.Core.IntegrationJob;
22
using IntegrationEngine.ConsoleHost.IntegrationPoints;
33
using RazorEngine;
44
using RazorEngine.Templating;

‎IntegrationEngine.Core.net40/IntegrationEngine.Core.net40.csproj‎

Lines changed: 9 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -111,30 +111,6 @@
111111
<Compile Include="..\IntegrationEngine.Core\IntegrationPoint\IIntegrationPointT.cs">
112112
<Link>IIntegrationPointT.cs</Link>
113113
</Compile>
114-
<Compile Include="..\IntegrationEngine.Core\Jobs\IElasticsearchJob.cs">
115-
<Link>IElasticsearchJob.cs</Link>
116-
</Compile>
117-
<Compile Include="..\IntegrationEngine.Core\Jobs\IIntegrationJob.cs">
118-
<Link>IIntegrationJob.cs</Link>
119-
</Compile>
120-
<Compile Include="..\IntegrationEngine.Core\Jobs\ILogJob.cs">
121-
<Link>ILogJob.cs</Link>
122-
</Compile>
123-
<Compile Include="..\IntegrationEngine.Core\Jobs\IMailJob.cs">
124-
<Link>IMailJob.cs</Link>
125-
</Compile>
126-
<Compile Include="..\IntegrationEngine.Core\Jobs\IntegrationJobRunFailureException.cs">
127-
<Link>IntegrationJobRunFailureException.cs</Link>
128-
</Compile>
129-
<Compile Include="..\IntegrationEngine.Core\Jobs\IParameterizedJob.cs">
130-
<Link>IParameterizedJob.cs</Link>
131-
</Compile>
132-
<Compile Include="..\IntegrationEngine.Core\Jobs\ISqlJob.cs">
133-
<Link>ISqlJob.cs</Link>
134-
</Compile>
135-
<Compile Include="..\IntegrationEngine.Core\Jobs\SqlJob.cs">
136-
<Link>SqlJob.cs</Link>
137-
</Compile>
138114
<Compile Include="..\IntegrationEngine.Core\Mail\IMailClient.cs">
139115
<Link>IMailClient.cs</Link>
140116
</Compile>
@@ -223,6 +199,15 @@
223199
<Compile Include="..\IntegrationEngine.Core\ServiceStack\JsonServiceClientAdapter.cs">
224200
<Link>JsonServiceClientAdapter.cs</Link>
225201
</Compile>
202+
<Compile Include="..\IntegrationEngine.Core\IntegrationJob\IIntegrationJob.cs">
203+
<Link>IIntegrationJob.cs</Link>
204+
</Compile>
205+
<Compile Include="..\IntegrationEngine.Core\IntegrationJob\IntegrationJobRunFailureException.cs">
206+
<Link>IntegrationJobRunFailureException.cs</Link>
207+
</Compile>
208+
<Compile Include="..\IntegrationEngine.Core\IntegrationJob\IParameterizedJob.cs">
209+
<Link>IParameterizedJob.cs</Link>
210+
</Compile>
226211
</ItemGroup>
227212
<ItemGroup>
228213
<None Include="App.config" />

‎IntegrationEngine.Core/IntegrationEngine.Core.csproj‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -97,14 +97,7 @@
9797
<Compile Include="Elasticsearch\ElasticClientAdapter.cs" />
9898
<Compile Include="IntegrationPoint\IIntegrationPointT.cs" />
9999
<Compile Include="IntegrationPoint\IIntegrationPoint.cs" />
100-
<Compile Include="Jobs\IIntegrationJob.cs" />
101-
<Compile Include="Jobs\ILogJob.cs" />
102-
<Compile Include="Jobs\IMailJob.cs" />
103-
<Compile Include="Jobs\IntegrationJobRunFailureException.cs" />
104100
<Compile Include="Configuration\IntegrationPointConfigurationAttribute.cs" />
105-
<Compile Include="Jobs\IParameterizedJob.cs" />
106-
<Compile Include="Jobs\ISqlJob.cs" />
107-
<Compile Include="Jobs\SqlJob.cs" />
108101
<Compile Include="Mail\IMailClient.cs" />
109102
<Compile Include="Mail\MailClient.cs" />
110103
<Compile Include="MessageQueue\IMessageQueueClient.cs" />
@@ -119,7 +112,6 @@
119112
<Compile Include="Storage\IntegrationEngineContext.cs" />
120113
<Compile Include="Storage\IntegrationEngineDbConfiguration.cs" />
121114
<Compile Include="Storage\IRepository.cs" />
122-
<Compile Include="Jobs\IElasticsearchJob.cs" />
123115
<Compile Include="Storage\IElasticsearchRepository.cs" />
124116
<Compile Include="Storage\ElasticsearchRepository.cs" />
125117
<Compile Include="Storage\IDatabaseRepository.cs" />
@@ -145,6 +137,9 @@
145137
<Compile Include="Configuration\JsonServiceConfiguration.cs" />
146138
<Compile Include="Configuration\IJsonServiceConfiguration.cs" />
147139
<Compile Include="ServiceStack\IJsonServiceClient.cs" />
140+
<Compile Include="IntegrationJob\IIntegrationJob.cs" />
141+
<Compile Include="IntegrationJob\IntegrationJobRunFailureException.cs" />
142+
<Compile Include="IntegrationJob\IParameterizedJob.cs" />
148143
</ItemGroup>
149144
<ItemGroup>
150145
<None Include="App.config" />

‎IntegrationEngine.Core/Jobs/IElasticSearchJob.cs‎

Lines changed: 0 additions & 14 deletions
This file was deleted.

‎IntegrationEngine.Core/Jobs/IElasticsearchJob.cs‎

Lines changed: 0 additions & 14 deletions
This file was deleted.

‎IntegrationEngine.Core/Jobs/IIntegrationJob.cs‎

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎IntegrationEngine.Core/Jobs/ILogJob.cs‎

Lines changed: 0 additions & 9 deletions
This file was deleted.

0 commit comments

Comments
 (0)