From 55e19403d803cdaca187af4dd9b5b9b74f265edc Mon Sep 17 00:00:00 2001 From: Anu Thomas Chandy Date: Thu, 28 Jun 2018 13:34:02 -0700 Subject: [PATCH 1/2] java tag for automation --- .../resource-manager/readme.md | 49 +++++++++++++------ 1 file changed, 34 insertions(+), 15 deletions(-) diff --git a/specification/applicationinsights/resource-manager/readme.md b/specification/applicationinsights/resource-manager/readme.md index f023307843e2..f55bfbea90ac 100644 --- a/specification/applicationinsights/resource-manager/readme.md +++ b/specification/applicationinsights/resource-manager/readme.md @@ -356,21 +356,6 @@ Please also specify `--go-sdk-folder=`. - -``` yaml $(java) -azure-arm: true -fluent: true -namespace: com.microsoft.azure.management.applicationinsights -license-header: MICROSOFT_MIT_NO_CODEGEN -payload-flattening-threshold: 1 -output-folder: $(azure-libraries-for-java-folder)/azure-mgmt-applicationinsights -``` - ### Tag: schema-2015-05-preview These settings apply only when `--tag=schema-2015-05-01` is specified on the @@ -390,4 +375,38 @@ input-file: override-info: title: ApplicationInsightsManagementClient +``` + +## Java + +These settings apply only when `--java` is specified on the command line. +Please also specify `--azure-libraries-for-java-folder=`. + +``` yaml $(java) +azure-arm: true +fluent: true +namespace: com.microsoft.azure.management.applicationinsights +license-header: MICROSOFT_MIT_NO_CODEGEN +payload-flattening-threshold: 1 +output-folder: $(azure-libraries-for-java-folder)/azure-mgmt-applicationinsights +``` + +### Java multi-api + +``` yaml $(java) && $(multiapi) +batch: + - tag: package-2015-05 +``` + +### Tag: package-2015-05 and java + +These settings apply only when `--tag=package-2015-05 --java` is specified on the command line. +Please also specify `--azure-libraries-for-java=`. + +``` yaml $(tag) == 'package-2015-05' && $(java) && $(multiapi) +java: + namespace: com.microsoft.azure.management.applicationinsights.v2015_05_01 + output-folder: $(azure-libraries-for-java-folder)/applicationinsights/resource-manager/v2015_05_01 +regenerate-manager: true +generate-interface: true ``` \ No newline at end of file From 190ab39fd849acebb0ff3546dc03ee4de9b94c42 Mon Sep 17 00:00:00 2001 From: Anu Thomas Chandy Date: Thu, 28 Jun 2018 14:24:29 -0700 Subject: [PATCH 2/2] Using plural for operation group name consistently --- .../2015-05-01/componentAnnotations_API.json | 18 ++++++++++++++---- .../componentWorkItemConfigs_API.json | 18 ++++++++++++++---- .../stable/2015-05-01/favorites_API.json | 8 ++++---- .../stable/2015-05-01/workbooks_API.json | 16 ++++++++++------ .../stable/2015-05-01/analyticsItems_API.json | 8 ++++---- 5 files changed, 46 insertions(+), 22 deletions(-) diff --git a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2015-05-01/componentAnnotations_API.json b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2015-05-01/componentAnnotations_API.json index 2b255b46b138..bec9de28a5cb 100644 --- a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2015-05-01/componentAnnotations_API.json +++ b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2015-05-01/componentAnnotations_API.json @@ -62,10 +62,7 @@ "200": { "description": "successful operation", "schema": { - "type": "array", - "items": { - "$ref": "#/definitions/Annotation" - } + "$ref": "#/definitions/AnnotationsListResult" } }, "default": { @@ -246,6 +243,19 @@ } } }, + "AnnotationsListResult": { + "properties": { + "value": { + "type": "array", + "readOnly": true, + "items": { + "$ref": "#/definitions/Annotation" + }, + "description": "An array of annotations." + } + }, + "description": "Annotations list result." + }, "InnerError": { "type": "object", "description": "Inner error", diff --git a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2015-05-01/componentWorkItemConfigs_API.json b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2015-05-01/componentWorkItemConfigs_API.json index 76e8e17042b3..dfacb9dd2d7d 100644 --- a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2015-05-01/componentWorkItemConfigs_API.json +++ b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2015-05-01/componentWorkItemConfigs_API.json @@ -56,10 +56,7 @@ "200": { "description": "successful operation", "schema": { - "type": "array", - "items": { - "$ref": "#/definitions/WorkItemConfiguration" - } + "$ref": "#/definitions/WorkItemConfigurationsListResult" } }, "default": { @@ -218,6 +215,19 @@ } } }, + "WorkItemConfigurationsListResult": { + "properties": { + "value": { + "type": "array", + "readOnly": true, + "items": { + "$ref": "#/definitions/WorkItemConfiguration" + }, + "description": "An array of work item configurations." + } + }, + "description": "Work item configuration list result." + }, "WorkItemCreateConfiguration": { "type": "object", "description": "Work item configuration creation payload", diff --git a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2015-05-01/favorites_API.json b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2015-05-01/favorites_API.json index 3ed275e160aa..326b26c0aae5 100644 --- a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2015-05-01/favorites_API.json +++ b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2015-05-01/favorites_API.json @@ -85,7 +85,7 @@ "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Insights/components/{resourceName}/favorites/{favoriteId}": { "get": { "description": "Get a single favorite by its FavoriteId, defined within an Application Insights component.", - "operationId": "Favorite_Get", + "operationId": "Favorites_Get", "parameters": [ { "$ref": "#/parameters/ResourceGroupNameParameter" @@ -119,7 +119,7 @@ }, "put": { "description": "Adds a new favorites to an Application Insights component.", - "operationId": "Favorite_Add", + "operationId": "Favorites_Add", "parameters": [ { "$ref": "#/parameters/ResourceGroupNameParameter" @@ -162,7 +162,7 @@ }, "patch": { "description": "Updates a favorite that has already been added to an Application Insights component.", - "operationId": "Favorite_Update", + "operationId": "Favorites_Update", "parameters": [ { "$ref": "#/parameters/ResourceGroupNameParameter" @@ -205,7 +205,7 @@ }, "delete": { "description": "Remove a favorite that is associated to an Application Insights component.", - "operationId": "Favorite_Delete", + "operationId": "Favorites_Delete", "parameters": [ { "$ref": "#/parameters/ResourceGroupNameParameter" diff --git a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2015-05-01/workbooks_API.json b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2015-05-01/workbooks_API.json index 3caba25d74eb..60b4f9f28063 100644 --- a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2015-05-01/workbooks_API.json +++ b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2015-05-01/workbooks_API.json @@ -62,7 +62,7 @@ "200": { "description": "A list containing 0 or more workbook definitions.", "schema": { - "$ref": "#/definitions/Workbooks" + "$ref": "#/definitions/WorkbooksListResult" } }, "default": { @@ -72,6 +72,9 @@ } } }, + "x-ms-pageable": { + "nextLinkName": null + }, "x-ms-examples": { "WorkbooksList": { "$ref": "./examples/WorkbooksList.json" @@ -82,7 +85,7 @@ "/subscriptions/{subscriptionId}/resourceGroup/{resourceGroupName}/providers/microsoft.insights/workbooks/{resourceName}": { "get": { "description": "Get a single workbook by its resourceName.", - "operationId": "Workbook_Get", + "operationId": "Workbooks_Get", "parameters": [ { "$ref": "#/parameters/SubscriptionIdParameter" @@ -119,7 +122,7 @@ }, "delete": { "description": "Delete a workbook.", - "operationId": "Workbook_Delete", + "operationId": "Workbooks_Delete", "parameters": [ { "$ref": "#/parameters/SubscriptionIdParameter" @@ -156,7 +159,7 @@ }, "put": { "description": "Create a new workbook.", - "operationId": "Workbook_CreateOrUpdate", + "operationId": "Workbooks_CreateOrUpdate", "parameters": [ { "$ref": "#/parameters/SubscriptionIdParameter" @@ -208,7 +211,7 @@ }, "patch": { "description": "Updates a workbook that has already been added.", - "operationId": "Workbook_Update", + "operationId": "Workbooks_Update", "parameters": [ { "$ref": "#/parameters/SubscriptionIdParameter" @@ -290,10 +293,11 @@ "x-ms-azure-resource": true, "description": "An azure resource object" }, - "Workbooks": { + "WorkbooksListResult": { "properties": { "value": { "type": "array", + "readOnly": true, "items": { "$ref": "#/definitions/Workbook" }, diff --git a/specification/applicationinsights/resource-manager/microsoft.insights/stable/2015-05-01/analyticsItems_API.json b/specification/applicationinsights/resource-manager/microsoft.insights/stable/2015-05-01/analyticsItems_API.json index 650fde28d3fe..3dc461ce9927 100644 --- a/specification/applicationinsights/resource-manager/microsoft.insights/stable/2015-05-01/analyticsItems_API.json +++ b/specification/applicationinsights/resource-manager/microsoft.insights/stable/2015-05-01/analyticsItems_API.json @@ -37,7 +37,7 @@ "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/microsoft.insights/components/{resourceName}/{scopePath}": { "get": { "description": "Gets a list of Analytics Items defined within an Application Insights component.", - "operationId": "AnalyticsItem_List", + "operationId": "AnalyticsItems_List", "parameters": [ { "$ref": "#/parameters/SubscriptionIdParameter" @@ -85,7 +85,7 @@ "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/microsoft.insights/components/{resourceName}/{scopePath}/item": { "get": { "description": "Gets a specific Analytics Items defined within an Application Insights component.", - "operationId": "AnalyticsItem_Get", + "operationId": "AnalyticsItems_Get", "parameters": [ { "$ref": "#/parameters/SubscriptionIdParameter" @@ -125,7 +125,7 @@ }, "put": { "description": "Adds or Updates a specific Analytics Item within an Application Insights component.", - "operationId": "AnalyticsItem_Put", + "operationId": "AnalyticsItems_Put", "parameters": [ { "$ref": "#/parameters/SubscriptionIdParameter" @@ -171,7 +171,7 @@ }, "delete": { "description": "Deletes a specific Analytics Items defined within an Application Insights component.", - "operationId": "AnalyticsItem_Delete", + "operationId": "AnalyticsItems_Delete", "parameters": [ { "$ref": "#/parameters/SubscriptionIdParameter"