Skip to content

Commit bedd305

Browse files
authored
Merge pull request #24757 from ggailey777/java
Java updates that missed yesterday
2 parents c817804 + b9bc37b commit bedd305

9 files changed

+21
-18
lines changed

articles/azure-functions/functions-compare-logic-apps-ms-flow-webjobs.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ ms.devlang: multiple
1414
ms.topic: overview
1515
ms.tgt_pltfrm: multiple
1616
ms.workload: na
17-
ms.date: 09/07/2017
17+
ms.date: 10/03/2017
1818
ms.author: glenga
1919
ms.custom: mvc
2020
---
@@ -96,10 +96,12 @@ The following table summarizes the differences between Functions and WebJobs:
9696
| PowerShell |experimental |supported |
9797
| C# |supported |supported |
9898
| F# |supported |not supported |
99+
| JavaScript |supported |supported |
99100
| Bash |experimental |supported |
101+
| Java |supported | not supported |
100102
| PHP |experimental |supported |
101103
| Python |experimental |supported |
102-
| JavaScript |supported |supported |
104+
103105

104106
Whether to use Functions or WebJobs ultimately depends on what you're already doing with App Service. If you have an App Service
105107
app for which you want to run code snippets, and you want to manage them together in the same DevOps environment, use WebJobs. In the following scenarios, use Functions.

articles/azure-functions/functions-create-first-java-maven.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ ms.topic: quickstart
1212
ms.tgt_pltfrm: multiple
1313
ms.devlang: java
1414
ms.workload: na
15-
ms.date: 09/12/2017
16-
ms.author: routlaw
15+
ms.date: 10/03/2017
16+
ms.author: routlaw, glenga
1717
ms.custom: mvc, devcenter
1818
---
1919

articles/azure-functions/functions-overview.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@ ms.custom: H1Hack27Feb2017, mvc
2222

2323
---
2424
# An introduction to Azure Functions
25-
Azure Functions is a solution for easily running small pieces of code, or "functions," in the cloud. You can write just the code you need for the problem at hand, without worrying about a whole application or the infrastructure to run it. Functions can make development even more productive, and you can use your development language of choice, such as C#, F#, Node.js, Python, or PHP. Pay only for the time your code runs and trust Azure to scale as needed. Azure Functions lets you develop serverless applications on Microsoft Azure.
25+
Azure Functions is a solution for easily running small pieces of code, or "functions," in the cloud. You can write just the code you need for the problem at hand, without worrying about a whole application or the infrastructure to run it. Functions can make development even more productive, and you can use your development language of choice, such as C#, F#, Node.js, Java, Python, or PHP. Pay only for the time your code runs and trust Azure to scale as needed. Azure Functions lets you develop serverless applications on Microsoft Azure.
2626

2727
This topic provides a high-level overview of Azure Functions. If you want to jump right in and get started with Azure Functions, start with [Create your first Azure Function](functions-create-first-azure-function.md). If you are looking for more technical information about Functions, see the [developer reference](functions-reference.md).
2828

2929
## Features
3030
Here are some key features of Azure Functions:
3131

32-
* **Choice of language** - Write functions using C#, F#, Node.js, Python, PHP, batch, bash, or any executable.
32+
* **Choice of language** - Write functions using C#, F#, Node.js, Java, Python, PHP, batch, bash, or any executable.
3333
* **Pay-per-use pricing model** - Pay only for the time spent running your code. See the Consumption hosting plan option in the [pricing section](#pricing).
3434
* **Bring your own dependencies** - Functions supports NuGet and NPM, so you can use your favorite libraries.
3535
* **Integrated security** - Protect HTTP-triggered functions with OAuth providers such as Azure Active Directory, Facebook, Google, Twitter, and Microsoft Account.

articles/azure-functions/functions-reference-csharp.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -442,6 +442,4 @@ For more information, see the following resources:
442442

443443
* [Best Practices for Azure Functions](functions-best-practices.md)
444444
* [Azure Functions developer reference](functions-reference.md)
445-
* [Azure Functions F# developer reference](functions-reference-fsharp.md)
446-
* [Azure Functions NodeJS developer reference](functions-reference-node.md)
447445
* [Azure Functions triggers and bindings](functions-triggers-bindings.md)

articles/azure-functions/functions-reference-fsharp.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -267,8 +267,6 @@ For more information, see the following resources:
267267
* [F# Guide](/dotnet/articles/fsharp/index)
268268
* [Best Practices for Azure Functions](functions-best-practices.md)
269269
* [Azure Functions developer reference](functions-reference.md)
270-
* [Azure Functions C# developer reference](functions-reference-csharp.md)
271-
* [Azure Functions NodeJS developer reference](functions-reference-node.md)
272270
* [Azure Functions triggers and bindings](functions-triggers-bindings.md)
273271
* [Azure Functions testing](functions-test-a-function.md)
274272
* [Azure Functions scaling](functions-scale.md)

articles/azure-functions/functions-reference-java.md

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -293,4 +293,11 @@ public class Function {
293293
return String.format(req);
294294
}
295295
}
296-
```
296+
```
297+
298+
## Next steps
299+
For more information, see the following resources:
300+
301+
* [Best practices for Azure Functions](functions-best-practices.md)
302+
* [Azure Functions developer reference](functions-reference.md)
303+
* [Azure Functions triggers and bindings](functions-triggers-bindings.md)

articles/azure-functions/functions-reference-node.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,5 @@ For more information, see the following resources:
326326

327327
* [Best practices for Azure Functions](functions-best-practices.md)
328328
* [Azure Functions developer reference](functions-reference.md)
329-
* [Azure Functions C# developer reference](functions-reference-csharp.md)
330-
* [Azure Functions F# developer reference](functions-reference-fsharp.md)
331329
* [Azure Functions triggers and bindings](functions-triggers-bindings.md)
332330

includes/functions-bindings-intro.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
This is reference information for Azure Functions developers. If you're new to Azure Functions, start with the following resources:
22

3-
* [Create your first function](../articles/azure-functions/functions-create-first-azure-function.md)
4-
* [Azure Functions developer reference](../articles/azure-functions/functions-reference.md)
5-
* [C#](../articles/azure-functions/functions-reference-csharp.md), [F#](../articles/azure-functions/functions-reference-fsharp.md), or [Node](../articles/azure-functions/functions-reference-node.md) developer reference
6-
* [Azure Functions triggers and bindings concepts](..\articles\azure-functions\functions-triggers-bindings.md)
3+
* [Create your first function](../articles/azure-functions/functions-create-first-azure-function.md).
4+
* [Azure Functions developer reference](../articles/azure-functions/functions-reference.md).
5+
* [C#](../articles/azure-functions/functions-reference-csharp.md), [F#](../articles/azure-functions/functions-reference-fsharp.md), [Node](../articles/azure-functions/functions-reference-node.md), or [Java](..\articles\azure-functions\functions-reference-java.md) developer reference.
6+
* [Azure Functions triggers and bindings concepts](..\articles\azure-functions\functions-triggers-bindings.md).
77

includes/functions-selector-languages.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
> * [F# script](../articles/azure-functions/functions-reference-fsharp.md)
44
> * [JavaScript](../articles/azure-functions/functions-reference-node.md)
55
> * [Java](../articles/azure-functions/functions-reference-java.md)
6-
6+

0 commit comments

Comments
 (0)