From a5cf37f8ee8d61eedb6ef261f3f0ee0110f9fd4b Mon Sep 17 00:00:00 2001 From: Daniel Rocha Date: Sat, 26 Feb 2022 11:45:19 +0800 Subject: [PATCH 1/8] Added content to support the new Render codegen settings --- .../maps/data-plane/Render/readme.java.md | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/specification/maps/data-plane/Render/readme.java.md b/specification/maps/data-plane/Render/readme.java.md index d29cb26ee591..60e2433aded3 100644 --- a/specification/maps/data-plane/Render/readme.java.md +++ b/specification/maps/data-plane/Render/readme.java.md @@ -1,9 +1,36 @@ ## Java ``` yaml $(java) +directive: + - rename-model: + from: MapTileset + to: MapTilesetPrivate + - from: swagger-document + where: '$.parameters["BoundingBoxSouthWest"]' + transform: > + $["x-ms-parameter-grouping"]["name"] = "BoundingBoxPrivate"; + - from: swagger-document + where: '$.parameters["BoundingBoxNorthEast"]' + transform: > + $["x-ms-parameter-grouping"]["name"] = "BoundingBoxPrivate"; + - from: swagger-document + where: '$.parameters["bbox"]' + transform: > + $["x-ms-client-name"] = "BoundingBoxPrivate"; + java: namespace: com.azure.maps.render license-header: MICROSOFT_MIT_NO_CODEGEN payload-flattening-threshold: 0 output-folder: $(azure-libraries-for-java-folder)/azure-maps-render + add-context-parameter: true + context-client-method-parameter: true + client-logger: true + generate-client-as-impl: true + sync-methods: all + generate-sync-async-clients: false + polling: {} + models-subpackage: implementation.models + custom-types-subpackage: models + custom-types: LocalizedMapView,MapImageStyle,RasterTileFormat,StaticMapLayer,MapTileSize,TileIndex,TilesetID,Copyright,CopyrightCaption,MapAttribution,RegionCopyrights,RegionCopyrightsCountry,ErrorAdditionalInfo,ErrorDetail,ErrorResponse,ErrorResponseException ``` \ No newline at end of file From 91e0f75ec9ec178daf5f1e90013773e7a3aad2e4 Mon Sep 17 00:00:00 2001 From: Daniel Rocha Date: Sat, 26 Feb 2022 11:45:58 +0800 Subject: [PATCH 2/8] Changed license settings --- specification/maps/data-plane/Render/readme.java.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/maps/data-plane/Render/readme.java.md b/specification/maps/data-plane/Render/readme.java.md index 60e2433aded3..9dcbe94332df 100644 --- a/specification/maps/data-plane/Render/readme.java.md +++ b/specification/maps/data-plane/Render/readme.java.md @@ -20,7 +20,7 @@ directive: java: namespace: com.azure.maps.render - license-header: MICROSOFT_MIT_NO_CODEGEN + license-header: MICROSOFT_MIT_SMALL payload-flattening-threshold: 0 output-folder: $(azure-libraries-for-java-folder)/azure-maps-render add-context-parameter: true From 1ae2c32fb94078ad95a0217f26396cacfe21e8f9 Mon Sep 17 00:00:00 2001 From: Daniel Rocha Date: Sat, 26 Feb 2022 11:50:54 +0800 Subject: [PATCH 3/8] Added settings for Route code generation --- .../maps/data-plane/Route/readme.java.md | 23 ++++++++++++++++++- specification/maps/data-plane/Route/readme.md | 6 +++++ 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/specification/maps/data-plane/Route/readme.java.md b/specification/maps/data-plane/Route/readme.java.md index cc6d4cd306fc..1241cd78b5a3 100644 --- a/specification/maps/data-plane/Route/readme.java.md +++ b/specification/maps/data-plane/Route/readme.java.md @@ -1,9 +1,30 @@ ## Java ``` yaml $(java) + +directive: + - rename-model: + from: RouteMatrix + to: RouteMatrixPrivate + - rename-model: + from: RouteMatrixResult + to: RouteMatrixResultPrivate + - rename-model: + from: RouteMatrixQuery + to: RouteMatrixQueryPrivate java: namespace: com.azure.maps.route license-header: MICROSOFT_MIT_NO_CODEGEN payload-flattening-threshold: 0 - output-folder: $(azure-libraries-for-java-folder)/azure-maps-route + output-folder: $(azure-libraries-for-java-folder)/azure-maps-route + add-context-parameter: true + context-client-method-parameter: true + client-logger: true + generate-client-as-impl: true + sync-methods: all + generate-sync-async-clients: false + polling: {} + models-subpackage: implementation.models + custom-types-subpackage: models + custom-types: AlternativeRouteType,BatchResultSummary,ComputeTravelTime,DelayMagnitude,DrivingSide,EffectiveSetting,ErrorAdditionalInfo,ErrorDetail,ErrorResponse,ErrorResponseException,GuidanceInstructionType,GuidanceManeuver,InclineLevel,JunctionType,Report,ResponseSectionType,ResponseTravelMode,Route,RouteAvoidType,RouteDirections,RouteDirectionsBatchResult,RouteGuidance,RouteInstructionGroup,RouteInstructionsType,RouteLegSummary,RouteMatrixSummary,RouteOptimizedWaypoint,RouteRangeResult,RouteReport,RouteRepresentationForBestOrder,RouteSection,RouteSectionTec,RouteSectionTecCause,RouteSummary,RouteType,SectionType,SimpleCategory,TravelMode,VehicleEngineType,VehicleLoadType,WindingnessLevel ``` \ No newline at end of file diff --git a/specification/maps/data-plane/Route/readme.md b/specification/maps/data-plane/Route/readme.md index de4e872281cd..441d61d7230f 100644 --- a/specification/maps/data-plane/Route/readme.md +++ b/specification/maps/data-plane/Route/readme.md @@ -32,6 +32,12 @@ tag: 1.0-preview add-credentials: true credential-default-policy-type: BearerTokenCredentialPolicy credential-scopes: https://atlas.microsoft.com/.default +track2: true +verbose: true +sdk-integration: true +modelerfour: + additional-checks: false + lenient-model-deduplication: true ``` From 1371b7d4c5f865a7964e3afb0ed926b762583592 Mon Sep 17 00:00:00 2001 From: Daniel Rocha Date: Sat, 26 Feb 2022 12:15:18 +0800 Subject: [PATCH 4/8] Added Search codegen settings --- .../maps/data-plane/Search/readme.java.md | 65 ++++++++++++++++++- .../maps/data-plane/Search/readme.md | 6 ++ 2 files changed, 69 insertions(+), 2 deletions(-) diff --git a/specification/maps/data-plane/Search/readme.java.md b/specification/maps/data-plane/Search/readme.java.md index 1c7182d89c56..0a669aed9e5a 100644 --- a/specification/maps/data-plane/Search/readme.java.md +++ b/specification/maps/data-plane/Search/readme.java.md @@ -1,9 +1,70 @@ ## Java ``` yaml $(java) + +directive: + - rename-model: + from: Address + to: AddressPrivate + - rename-model: + from: AddressRanges + to: AddressRangesPrivate + - rename-model: + from: SearchAddressResult + to: SearchAddressResultPrivate + - rename-model: + from: SearchAddressResultItem + to: SearchAddressResultItemPrivate + - rename-model: + from: ReverseSearchAddressResult + to: ReverseSearchAddressResultPrivate + - rename-model: + from: ReverseSearchAddressResultItem + to: ReverseSearchAddressResultItemPrivate + - rename-model: + from: ReverseSearchCrossStreetAddressResult + to: ReverseSearchCrossStreetAddressResultPrivate + - rename-model: + from: ReverseSearchCrossStreetAddressResultItem + to: ReverseSearchCrossStreetAddressResultItemPrivate + - rename-model: + from: EntryPoint + to: EntryPointPrivate + - rename-model: + from: SearchSummary + to: SearchSummaryPrivate + - rename-model: + from: SearchAddressBatchResult + to: SearchAddressBatchResultPrivate + - rename-model: + from: SearchAddressBatchItem + to: SearchAddressBatchItemPrivate + - rename-model: + from: ReverseSearchAddressBatchProcessResult + to: ReverseSearchAddressBatchResultPrivate + - rename-model: + from: ReverseSearchAddressBatchItem + to: ReverseSearchAddressBatchItemPrivate + - rename-model: + from: BoundingBox + to: BoundingBoxPrivate + - rename-model: + from: Polygon + to: PolygonPrivate + java: namespace: com.azure.maps.search - license-header: MICROSOFT_MIT_NO_CODEGEN + license-header: MICROSOFT_MIT_SMALL payload-flattening-threshold: 0 - output-folder: $(azure-libraries-for-java-folder)/azure-maps-search + output-folder: $(azure-libraries-for-java-folder)/azure-maps-search + add-context-parameter: true + context-client-method-parameter: true + client-logger: true + generate-client-as-impl: true + sync-methods: all + generate-sync-async-clients: false + polling: {} + models-subpackage: implementation.models + custom-types-subpackage: models + custom-types: BatchResultSummary,BrandName,Classification,ClassificationName,DataSource,ErrorAdditionalInfo,ErrorDetail,ErrorResponseException,ElectricVehicleConnector,EntryPointType,GeographicEntityType,GeometryIdentifier,LocalizedMapView,OperatingHoursTime,OperatingHoursRange,MatchType,OperatingHours,OperatingHoursTimeRange,PointOfInterest,PointOfInterestCategory,PointOfInterestCategorySet,PointOfInterestCategoryTreeResult,PointOfInterestExtendedPostalCodes,RoadUseType,SearchAddressResultType,SearchIndexes,ErrorResponse,QueryType ``` \ No newline at end of file diff --git a/specification/maps/data-plane/Search/readme.md b/specification/maps/data-plane/Search/readme.md index e5bfb48ca605..649ee30e0e2a 100644 --- a/specification/maps/data-plane/Search/readme.md +++ b/specification/maps/data-plane/Search/readme.md @@ -32,6 +32,12 @@ tag: 1.0-preview add-credentials: true credential-default-policy-type: BearerTokenCredentialPolicy credential-scopes: https://atlas.microsoft.com/.default +track2: true +verbose: true +sdk-integration: true +modelerfour: + additional-checks: false + lenient-model-deduplication: true ``` From 825663e2f9db94cee32da8ba90253b75fe9524ca Mon Sep 17 00:00:00 2001 From: Daniel Rocha Date: Sat, 26 Feb 2022 12:29:21 +0800 Subject: [PATCH 5/8] Modified codegen settings for Render --- specification/maps/data-plane/Render/readme.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/specification/maps/data-plane/Render/readme.md b/specification/maps/data-plane/Render/readme.md index 252789e625af..e8c9005424b0 100644 --- a/specification/maps/data-plane/Render/readme.md +++ b/specification/maps/data-plane/Render/readme.md @@ -32,6 +32,12 @@ tag: 2.1-preview add-credentials: true credential-default-policy-type: BearerTokenCredentialPolicy credential-scopes: https://atlas.microsoft.com/.default +track2: true +verbose: true +sdk-integration: true +modelerfour: + additional-checks: false + lenient-model-deduplication: true ``` ### Tag: 2.1-preview From 3cc389bbfc4dd61352590b494ec15296fb0c7a14 Mon Sep 17 00:00:00 2001 From: Daniel Rocha Date: Sat, 26 Feb 2022 12:31:35 +0800 Subject: [PATCH 6/8] Modified x-ms-client-name to boundingBoxPrivate --- specification/maps/data-plane/Render/preview/2.1/render.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/maps/data-plane/Render/preview/2.1/render.json b/specification/maps/data-plane/Render/preview/2.1/render.json index 78f775c0d62b..cc45bc787c05 100644 --- a/specification/maps/data-plane/Render/preview/2.1/render.json +++ b/specification/maps/data-plane/Render/preview/2.1/render.json @@ -410,7 +410,7 @@ }, { "name": "bbox", - "x-ms-client-name": "boundingBox", + "x-ms-client-name": "boundingBoxPrivate", "in": "query", "description": "Bounding box. Projection used - EPSG:3857. Format : 'minLon, minLat,\nmaxLon, maxLat'. \n\nNote: Either bbox or center are required\nparameters. They are mutually exclusive. It shouldn’t be used with\nheight or width.\n\nThe maximum allowed ranges for Lat and Lon are defined for each zoom level\nin the table at the top of this page.", "type": "array", From c72f854333f218fa938ed4ccc69e45f19b152b12 Mon Sep 17 00:00:00 2001 From: Daniel Rocha Date: Sat, 26 Feb 2022 13:47:50 +0800 Subject: [PATCH 7/8] Fixed model validation errors pointed out by OAV --- .../2.1/examples/SuccessfulAttributionRequest.json | 2 +- .../examples/SuccessfulBoundingBoxCopyrightRequest.json | 4 ++-- .../2.1/examples/SuccessfulStaticImageRequest.json | 2 +- .../preview/2.1/examples/SuccessfulTileRequest.json | 2 +- .../maps/data-plane/Render/preview/2.1/render.json | 8 ++++++-- 5 files changed, 11 insertions(+), 7 deletions(-) diff --git a/specification/maps/data-plane/Render/preview/2.1/examples/SuccessfulAttributionRequest.json b/specification/maps/data-plane/Render/preview/2.1/examples/SuccessfulAttributionRequest.json index 47de6f12f5e0..d76ea7c56979 100644 --- a/specification/maps/data-plane/Render/preview/2.1/examples/SuccessfulAttributionRequest.json +++ b/specification/maps/data-plane/Render/preview/2.1/examples/SuccessfulAttributionRequest.json @@ -3,7 +3,7 @@ "api-version": "2.1", "tilesetId": "microsoft.base", "zoom": 6, - "bounds": "-122.414162,47.579490,-122.247157,47.668372" + "bounds": [-122.414162,47.579490,-122.247157,47.668372] }, "responses": { "200": { diff --git a/specification/maps/data-plane/Render/preview/2.1/examples/SuccessfulBoundingBoxCopyrightRequest.json b/specification/maps/data-plane/Render/preview/2.1/examples/SuccessfulBoundingBoxCopyrightRequest.json index 8bd58db3b8e3..196d8e3c8848 100644 --- a/specification/maps/data-plane/Render/preview/2.1/examples/SuccessfulBoundingBoxCopyrightRequest.json +++ b/specification/maps/data-plane/Render/preview/2.1/examples/SuccessfulBoundingBoxCopyrightRequest.json @@ -2,8 +2,8 @@ "parameters": { "api-version": "1.0", "format": "json", - "mincoordinates": "52.41064,4.84228", - "maxcoordinates": "52.41072,4.84239", + "mincoordinates": [52.41064,4.84228], + "maxcoordinates": [52.41072,4.84239], "text": "yes" }, "responses": { diff --git a/specification/maps/data-plane/Render/preview/2.1/examples/SuccessfulStaticImageRequest.json b/specification/maps/data-plane/Render/preview/2.1/examples/SuccessfulStaticImageRequest.json index c747d41a9d99..096225ee28ea 100644 --- a/specification/maps/data-plane/Render/preview/2.1/examples/SuccessfulStaticImageRequest.json +++ b/specification/maps/data-plane/Render/preview/2.1/examples/SuccessfulStaticImageRequest.json @@ -3,7 +3,7 @@ "api-version": "1.0", "format": "png", "zoom": 2, - "bbox": "1.355233,42.982261,24.980233,56.526017", + "bbox": [1.355233,42.982261,24.980233,56.526017], "layer": "basic", "style": "main" }, diff --git a/specification/maps/data-plane/Render/preview/2.1/examples/SuccessfulTileRequest.json b/specification/maps/data-plane/Render/preview/2.1/examples/SuccessfulTileRequest.json index 704199bbd1e7..f25f2444327a 100644 --- a/specification/maps/data-plane/Render/preview/2.1/examples/SuccessfulTileRequest.json +++ b/specification/maps/data-plane/Render/preview/2.1/examples/SuccessfulTileRequest.json @@ -11,7 +11,7 @@ "headers": { "Content-Type": "application/vnd.mapbox-vector-tile" }, - "body": "{file}" + "body": "binary image string" } } } diff --git a/specification/maps/data-plane/Render/preview/2.1/render.json b/specification/maps/data-plane/Render/preview/2.1/render.json index cc45bc787c05..c18ff4f80cfa 100644 --- a/specification/maps/data-plane/Render/preview/2.1/render.json +++ b/specification/maps/data-plane/Render/preview/2.1/render.json @@ -119,7 +119,9 @@ "200": { "description": "The tile returned from a successful API call.", "schema": { - "$ref": "../2.0/render.json#/definitions/MapTile" + "type": "object", + "format": "file", + "readOnly": true }, "headers": { "Content-Type": { @@ -268,7 +270,9 @@ "200": { "description": "This tile is returned from a successful Get Map State Tile call", "schema": { - "$ref": "../2.0/render.json#/definitions/MapTile" + "type": "object", + "format": "file", + "readOnly": true }, "headers": { "Content-Type": { From 680c17d46a2d221bbffee5ca340871a9a6bc895f Mon Sep 17 00:00:00 2001 From: Daniel Rocha Date: Sat, 26 Feb 2022 13:54:56 +0800 Subject: [PATCH 8/8] Ran prettier to fix pipeline errors --- .../2.1/examples/SuccessfulAttributionRequest.json | 7 ++++++- .../SuccessfulBoundingBoxCopyrightRequest.json | 10 ++++++++-- .../2.1/examples/SuccessfulStaticImageRequest.json | 7 ++++++- 3 files changed, 20 insertions(+), 4 deletions(-) diff --git a/specification/maps/data-plane/Render/preview/2.1/examples/SuccessfulAttributionRequest.json b/specification/maps/data-plane/Render/preview/2.1/examples/SuccessfulAttributionRequest.json index d76ea7c56979..a30a5f26b4ff 100644 --- a/specification/maps/data-plane/Render/preview/2.1/examples/SuccessfulAttributionRequest.json +++ b/specification/maps/data-plane/Render/preview/2.1/examples/SuccessfulAttributionRequest.json @@ -3,7 +3,12 @@ "api-version": "2.1", "tilesetId": "microsoft.base", "zoom": 6, - "bounds": [-122.414162,47.579490,-122.247157,47.668372] + "bounds": [ + -122.414162, + 47.579490, + -122.247157, + 47.668372 + ] }, "responses": { "200": { diff --git a/specification/maps/data-plane/Render/preview/2.1/examples/SuccessfulBoundingBoxCopyrightRequest.json b/specification/maps/data-plane/Render/preview/2.1/examples/SuccessfulBoundingBoxCopyrightRequest.json index 196d8e3c8848..be91cd7afda9 100644 --- a/specification/maps/data-plane/Render/preview/2.1/examples/SuccessfulBoundingBoxCopyrightRequest.json +++ b/specification/maps/data-plane/Render/preview/2.1/examples/SuccessfulBoundingBoxCopyrightRequest.json @@ -2,8 +2,14 @@ "parameters": { "api-version": "1.0", "format": "json", - "mincoordinates": [52.41064,4.84228], - "maxcoordinates": [52.41072,4.84239], + "mincoordinates": [ + 52.41064, + 4.84228 + ], + "maxcoordinates": [ + 52.41072, + 4.84239 + ], "text": "yes" }, "responses": { diff --git a/specification/maps/data-plane/Render/preview/2.1/examples/SuccessfulStaticImageRequest.json b/specification/maps/data-plane/Render/preview/2.1/examples/SuccessfulStaticImageRequest.json index 096225ee28ea..88b6598b1943 100644 --- a/specification/maps/data-plane/Render/preview/2.1/examples/SuccessfulStaticImageRequest.json +++ b/specification/maps/data-plane/Render/preview/2.1/examples/SuccessfulStaticImageRequest.json @@ -3,7 +3,12 @@ "api-version": "1.0", "format": "png", "zoom": 2, - "bbox": [1.355233,42.982261,24.980233,56.526017], + "bbox": [ + 1.355233, + 42.982261, + 24.980233, + 56.526017 + ], "layer": "basic", "style": "main" },