Skip to content

Commit 748e7c8

Browse files
authored
Delete FunctionsJava (#4653)
1 parent 8f8ff17 commit 748e7c8

File tree

4 files changed

+2
-41
lines changed

4 files changed

+2
-41
lines changed

src/WebJobs.Script/Rpc/Configuration/WorkerConfigFactory.cs

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
using Microsoft.Azure.WebJobs.Script.Config;
1111
using Microsoft.Extensions.Configuration;
1212
using Microsoft.Extensions.Logging;
13-
using Microsoft.Extensions.Logging.Abstractions;
1413
using Newtonsoft.Json.Linq;
1514

1615
namespace Microsoft.Azure.WebJobs.Script.Rpc
@@ -116,7 +115,6 @@ internal void AddProvider(string workerDir)
116115
{
117116
try
118117
{
119-
Dictionary<string, WorkerDescription> descriptionProfiles = new Dictionary<string, WorkerDescription>();
120118
string workerConfigPath = Path.Combine(workerDir, LanguageWorkerConstants.WorkerConfigFileName);
121119
if (!File.Exists(workerConfigPath))
122120
{
@@ -131,14 +129,6 @@ internal void AddProvider(string workerDir)
131129
var languageSection = _config.GetSection($"{LanguageWorkerConstants.LanguageWorkersSectionName}:{workerDescription.Language}");
132130
workerDescription.Arguments = workerDescription.Arguments ?? new List<string>();
133131

134-
descriptionProfiles = GetWorkerDescriptionProfiles(workerConfig);
135-
if (ScriptSettingsManager.Instance.IsAppServiceEnvironment)
136-
{
137-
// Overwrite default Description with AppServiceEnv profile
138-
// TODO:pgopa delete after ANT78
139-
workerDescription = GetWorkerDescriptionFromProfiles(LanguageWorkerConstants.WorkerDescriptionAppServiceEnvProfileName, descriptionProfiles, workerDescription);
140-
}
141-
142132
GetDefaultExecutablePathFromAppSettings(workerDescription, languageSection);
143133
AddArgumentsFromAppSettings(workerDescription, languageSection);
144134

src/WebJobs.Script/WebJobs.Script.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
<NoWarn>NU1701</NoWarn>
3939
</PackageReference>
4040
<PackageReference Include="Microsoft.Azure.AppService.Proxy.Client" Version="2.0.8100001-0126c21e" />
41-
<PackageReference Include="Microsoft.Azure.Functions.JavaWorker" Version="1.4.1" />
41+
<PackageReference Include="Microsoft.Azure.Functions.JavaWorker" Version="1.5.0" />
4242
<PackageReference Include="Microsoft.Azure.Functions.NodeJsWorker" Version="1.0.3" />
4343
<PackageReference Include="Microsoft.Azure.Functions.PowerShellWorker" Version="0.1.111-preview" />
4444
<PackageReference Include="Microsoft.Azure.WebJobs" Version="3.0.10" />

test/WebJobs.Script.Tests.Integration/WebJobs.Script.Tests.Integration.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
<PackageReference Include="Microsoft.Azure.EventHubs" Version="2.1.0" />
4040
<PackageReference Include="Microsoft.Azure.Functions.NodeJsWorker" Version="1.0.3" />
4141
<PackageReference Include="Microsoft.Azure.WebJobs.Extensions.Storage" Version="3.0.7" />
42-
<PackageReference Include="Microsoft.Azure.Functions.JavaWorker" Version="1.4.1" />
42+
<PackageReference Include="Microsoft.Azure.Functions.JavaWorker" Version="1.5.0" />
4343
<PackageReference Include="Microsoft.Azure.Mobile.Client" Version="4.0.2" />
4444
<PackageReference Include="Microsoft.Azure.ServiceBus" Version="3.1.0" />
4545
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="2.2.0" />

test/WebJobs.Script.Tests/Rpc/GenericWorkerProviderTests.cs

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -193,35 +193,6 @@ public void ReadWorkerProviderFromConfig_InvalidWorker()
193193
Assert.Empty(providers);
194194
}
195195

196-
[Fact]
197-
public void ReadWorkerProviderFromConfig_AddAppSvcProfile_ReturnsAppServiceEnvDescription()
198-
{
199-
var expectedArguments = new string[] { "-v", "verbose" };
200-
var configs = new List<TestLanguageWorkerConfig>() { MakeTestConfig(testLanguage, expectedArguments, false, LanguageWorkerConstants.WorkerDescriptionAppServiceEnvProfileName) };
201-
var testLogger = new TestLogger(testLanguage);
202-
203-
WorkerDescription testWorkerDescription = GetTestDefaultWorkerDescription(testLanguage, expectedArguments);
204-
// Creates temp directory w/ worker.config.json and runs ReadWorkerProviderFromConfig
205-
IEnumerable<IWorkerProvider> providers = TestReadWorkerProviderFromConfig(configs, testLogger, null, null, true);
206-
Assert.Single(providers);
207-
208-
IWorkerProvider worker = providers.FirstOrDefault();
209-
var actualWorkerDescription = worker.GetDescription();
210-
211-
Assert.Equal("myFooPath", worker.GetDescription().DefaultExecutablePath);
212-
Assert.Equal(testWorkerDescription.DefaultWorkerPath, actualWorkerDescription.DefaultWorkerPath);
213-
Assert.False(testWorkerDescription.Extensions.Except(actualWorkerDescription.Extensions).Any());
214-
Assert.Equal($"{testLanguage}", worker.GetDescription().Language);
215-
if (testWorkerDescription.Arguments == null)
216-
{
217-
Assert.Null(actualWorkerDescription.Arguments);
218-
}
219-
else
220-
{
221-
Assert.False(testWorkerDescription.Arguments.Except(actualWorkerDescription.Arguments).Any());
222-
}
223-
}
224-
225196
[Fact]
226197
public void ReadWorkerProviderFromConfig_AddProfile_ReturnsDefaultDescription()
227198
{

0 commit comments

Comments
 (0)