diff --git a/.gulp/regeneration.iced b/.gulp/regeneration.iced index 78437d8d1a..e30c01115e 100644 --- a/.gulp/regeneration.iced +++ b/.gulp/regeneration.iced @@ -53,8 +53,10 @@ task 'regenerate', 'regenerate samples', (done) -> ) (find path.join(each.path, "..")) - .filter((file) -> file.match(/\.(yaml)$/)) + .filter((file) -> file.match(/\.(yaml)$/) && ! file.match(/deprecated/) ) .forEach((file) -> + # sed "-i", /.*deprecated.*\n/gi, "", file # + (cat file).replace(/.*deprecated.*\n/g, "").to(file) # remove deprecated from outputs sed "-i", /.*autorest[a-zA-Z0-9]*.src.*/gi, "", file # source file names sed "-i", /^version:.*autorest-core["']?/gi , "", file # autorest-core path as reported by bootstrapper again! sed "-i", /file\:\/\/\/.*Custom transformations.*/gi, "", file # fix path in file diff --git a/Samples/1b-code-generation-multilang/Azure.NodeJS/LICENSE.txt b/Samples/1b-code-generation-multilang/Azure.NodeJS/LICENSE.txt deleted file mode 100644 index a70e8cf660..0000000000 --- a/Samples/1b-code-generation-multilang/Azure.NodeJS/LICENSE.txt +++ /dev/null @@ -1,21 +0,0 @@ -The MIT License (MIT) - -Copyright (c) 2018 Microsoft - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/Samples/1b-code-generation-multilang/Java/SwaggerPetstore.java b/Samples/1b-code-generation-multilang/Go/cowstoreapi/interfaces.go similarity index 100% rename from Samples/1b-code-generation-multilang/Java/SwaggerPetstore.java rename to Samples/1b-code-generation-multilang/Go/cowstoreapi/interfaces.go diff --git a/Samples/1b-code-generation-multilang/Java/implementation/SwaggerPetstoreImpl.java b/Samples/1b-code-generation-multilang/Java/src/main/java/javanamespace/SwaggerPetstore.java similarity index 100% rename from Samples/1b-code-generation-multilang/Java/implementation/SwaggerPetstoreImpl.java rename to Samples/1b-code-generation-multilang/Java/src/main/java/javanamespace/SwaggerPetstore.java diff --git a/Samples/1b-code-generation-multilang/Java/implementation/package-info.java b/Samples/1b-code-generation-multilang/Java/src/main/java/javanamespace/implementation/SwaggerPetstoreImpl.java similarity index 100% rename from Samples/1b-code-generation-multilang/Java/implementation/package-info.java rename to Samples/1b-code-generation-multilang/Java/src/main/java/javanamespace/implementation/SwaggerPetstoreImpl.java diff --git a/Samples/1b-code-generation-multilang/Java/models/package-info.java b/Samples/1b-code-generation-multilang/Java/src/main/java/javanamespace/implementation/package-info.java similarity index 100% rename from Samples/1b-code-generation-multilang/Java/models/package-info.java rename to Samples/1b-code-generation-multilang/Java/src/main/java/javanamespace/implementation/package-info.java diff --git a/Samples/1b-code-generation-multilang/Java/models/Error.java b/Samples/1b-code-generation-multilang/Java/src/main/java/javanamespace/models/Error.java similarity index 100% rename from Samples/1b-code-generation-multilang/Java/models/Error.java rename to Samples/1b-code-generation-multilang/Java/src/main/java/javanamespace/models/Error.java diff --git a/Samples/1b-code-generation-multilang/Java/models/ErrorException.java b/Samples/1b-code-generation-multilang/Java/src/main/java/javanamespace/models/ErrorException.java similarity index 100% rename from Samples/1b-code-generation-multilang/Java/models/ErrorException.java rename to Samples/1b-code-generation-multilang/Java/src/main/java/javanamespace/models/ErrorException.java diff --git a/Samples/1b-code-generation-multilang/Java/models/ListPetsHeaders.java b/Samples/1b-code-generation-multilang/Java/src/main/java/javanamespace/models/ListPetsHeaders.java similarity index 100% rename from Samples/1b-code-generation-multilang/Java/models/ListPetsHeaders.java rename to Samples/1b-code-generation-multilang/Java/src/main/java/javanamespace/models/ListPetsHeaders.java diff --git a/Samples/1b-code-generation-multilang/Java/models/Pet.java b/Samples/1b-code-generation-multilang/Java/src/main/java/javanamespace/models/Pet.java similarity index 100% rename from Samples/1b-code-generation-multilang/Java/models/Pet.java rename to Samples/1b-code-generation-multilang/Java/src/main/java/javanamespace/models/Pet.java diff --git a/Samples/1b-code-generation-multilang/Java/package-info.java b/Samples/1b-code-generation-multilang/Java/src/main/java/javanamespace/models/package-info.java similarity index 100% rename from Samples/1b-code-generation-multilang/Java/package-info.java rename to Samples/1b-code-generation-multilang/Java/src/main/java/javanamespace/models/package-info.java diff --git a/Samples/3c-guards/OtherClient/implementation/package-info.java b/Samples/1b-code-generation-multilang/Java/src/main/java/javanamespace/package-info.java similarity index 100% rename from Samples/3c-guards/OtherClient/implementation/package-info.java rename to Samples/1b-code-generation-multilang/Java/src/main/java/javanamespace/package-info.java diff --git a/Samples/1b-code-generation-multilang/NodeJS/LICENSE.txt b/Samples/1b-code-generation-multilang/NodeJS/LICENSE.txt deleted file mode 100644 index a70e8cf660..0000000000 --- a/Samples/1b-code-generation-multilang/NodeJS/LICENSE.txt +++ /dev/null @@ -1,21 +0,0 @@ -The MIT License (MIT) - -Copyright (c) 2018 Microsoft - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/Samples/1b-code-generation-multilang/shell/stdout.txt b/Samples/1b-code-generation-multilang/shell/stdout.txt index 17d46a9413..7935661c41 100644 --- a/Samples/1b-code-generation-multilang/shell/stdout.txt +++ b/Samples/1b-code-generation-multilang/shell/stdout.txt @@ -1 +1,5 @@ https://aka.ms/autorest +INFORMATION: Getting the package version from the pre-existing package.json file in the output folder. +INFORMATION: Getting the package version from the pre-existing package.json file in the output folder. +INFORMATION: Pre-existing package.json file in the output folder didn't contain a non-empty version property. +INFORMATION: Pre-existing package.json file in the output folder didn't contain a non-empty version property. diff --git a/Samples/1f-output-to-stdout/shell/stdout.txt b/Samples/1f-output-to-stdout/shell/stdout.txt index 76a39675ca..877dce3491 100644 --- a/Samples/1f-output-to-stdout/shell/stdout.txt +++ b/Samples/1f-output-to-stdout/shell/stdout.txt @@ -1,6 +1,6 @@ - "content": "---\ndirective:\n - from: swagger-document\n where: $.definitions.*.additionalProperties\n transform: |\n return typeof $ === \"boolean\"\n ? ($ ? { type: \"object\" } : undefined)\n : $\n reason: polyfill\n - from: swagger-document\n where: >-\n $..*[?(typeof @.modelAsString === \"boolean\" && typeof @.oldModelAsString\n !== \"boolean\")]\n transform: $.oldModelAsString = $.modelAsString\ninput-file:\n - tiny.yaml\noutput-artifact:\n - configuration.yaml\n - preserved-files\n - source-file-csharp\n - source-file-jsonrpcclient\nrequire: []\ntry-require:\n - readme.clear-output-folder.md\n - readme.no-upgrade-check.md\n - readme.skip-upgrade-check.md\n - ./readme.csharp.md\nuse: []\nclear-output-folder: {}\nuse-extension:\n '@microsoft.azure/autorest.csharp': ~2.3.79\n '@microsoft.azure/autorest.modeler': 2.3.55\nversion: autorest-core\nno-upgrade-check: {}\nskip-upgrade-check: {}\noutput-folder: 'stdout://'\nmessage-format: json\ncsharp: true\ninfo: yaml\nazure-arm: false\nopenapi-type: arm\npipeline:\n swagger-document/reflect-api-versions-cs:\n input:\n - identity\n - individual/identity\n - csharp/emitter\n scope: reflect-api-versions\n suffixes: []\n swagger-document/reflect-api-versions-cs/emitter:\n input: reflect-api-versions-cs\n scope: scope-reflect-api-versions-cs-emitter\n suffixes: []\n pipeline-emitter:\n scope: scope-pipeline-emitter\n suffixes:\n - ''\n configuration-emitter:\n scope: scope-configuration-emitter\n suffixes:\n - ''\n swagger-document-override/md-override-loader:\n output-artifact: immediate-config\n scope: perform-load\n suffixes:\n - ''\n swagger-document/loader:\n output-artifact: swagger-document\n scope: perform-load\n suffixes:\n - ''\n swagger-document/individual/transform:\n input: loader\n output-artifact: swagger-document\n suffixes:\n - ''\n swagger-document/individual/schema-validator:\n input: transform\n output-artifact: swagger-document\n suffixes:\n - ''\n swagger-document/individual/identity:\n input: schema-validator\n output-artifact: swagger-document\n suffixes:\n - ''\n swagger-document/compose:\n input: individual/identity\n output-artifact: swagger-document\n suffixes:\n - ''\n swagger-document/transform-immediate:\n input:\n - swagger-document-override/md-override-loader\n - compose\n output-artifact: swagger-document\n suffixes:\n - ''\n swagger-document/transform:\n input: transform-immediate\n output-artifact: swagger-document\n suffixes:\n - ''\n swagger-document/identity:\n input: transform\n output-artifact: swagger-document\n suffixes:\n - ''\n swagger-document/emitter:\n input: identity\n scope: scope-swagger-document/emitter\n suffixes:\n - ''\n openapi-document/openapi-document-converter:\n input: swagger-document/identity\n output-artifact: openapi-document\n suffixes:\n - ''\n openapi-document/transform:\n input: openapi-document-converter\n output-artifact: openapi-document\n suffixes:\n - ''\n openapi-document/component-modifiers:\n input: transform\n output-artifact: openapi-document\n suffixes:\n - ''\n openapi-document/identity:\n input: component-modifiers\n output-artifact: openapi-document\n suffixes:\n - ''\n openapi-document/emitter:\n input: identity\n scope: scope-openapi-document/emitter\n suffixes:\n - ''\n swagger-document/model-validator:\n input: swagger-document/identity\n scope: model-validator\n suffixes: []\n swagger-document/semantic-validator:\n input: swagger-document/identity\n scope: semantic-validator\n suffixes: []\n csharp/imodeler1:\n input: openapi-document/identity\n output-artifact: code-model-v1\n scope: csharp\n suffixes:\n - ''\n csharp/commonmarker:\n input: imodeler1\n output-artifact: code-model-v1\n suffixes:\n - ''\n csharp/cm/transform:\n input: commonmarker\n output-artifact: code-model-v1\n suffixes:\n - ''\n csharp/cm/emitter:\n input: transform\n scope: scope-cm/emitter\n suffixes:\n - ''\n csharp/generate:\n plugin: csharp\n input: cm/transform\n output-artifact: source-file-csharp\n suffixes:\n - ''\n csharp/simplifier:\n plugin: csharp-simplifier\n input: generate\n output-artifact: source-file-csharp\n suffixes:\n - ''\n csharp/transform:\n input: simplifier\n output-artifact: source-file-csharp\n scope: scope-transform-string\n suffixes:\n - ''\n csharp/emitter:\n input: transform\n scope: scope-csharp/emitter\n suffixes:\n - ''\n jsonrpcclient/imodeler1:\n input: openapi-document/identity\n output-artifact: code-model-v1\n scope: jsonrpcclient\n suffixes: []\n jsonrpcclient/generate:\n plugin: jsonrpcclient\n input: imodeler1\n output-artifact: source-file-jsonrpcclient\n suffixes: []\n jsonrpcclient/transform:\n input: generate\n output-artifact: source-file-jsonrpcclient\n scope: scope-transform-string\n suffixes: []\n jsonrpcclient/emitter:\n input: transform\n scope: scope-jsonrpcclient/emitter\n suffixes: []\nscope-reflect-api-versions-cs-emitter:\n input-artifact: source-file-csharp\n output-uri-expr: $key\nscope-pipeline-emitter:\n input-artifact: pipeline\n is-object: true\n output-uri-expr: |\n \"pipeline\"\nscope-configuration-emitter:\n input-artifact: configuration\n is-object: true\n output-uri-expr: |\n \"configuration\"\nperform-load: true\nscope-swagger-document/emitter:\n input-artifact: swagger-document\n is-object: true\n output-uri-expr: >\n $config[\"output-file\"] || \n\n ($config.namespace ? $config.namespace.replace(/:/g,'_') : undefined) || \n\n $config[\"input-file\"][0].split('/').reverse()[0].split('\\\\').reverse()[0].replace(/\\.json$/,\n \"\")\nscope-openapi-document/emitter:\n input-artifact: openapi-document\n is-object: true\n output-uri-expr: >\n $config[\"output-file\"] || \n\n ($config.namespace ? $config.namespace.replace(/:/g,'_') : undefined) || \n\n $config[\"input-file\"][0].split('/').reverse()[0].split('\\\\').reverse()[0].replace(/\\.json$/,\n \"\")\nscope-cm/emitter:\n input-artifact: code-model-v1\n is-object: true\n output-uri-expr: |\n \"code-model-v1\"\nclient-side-validation: true\ndeclare-directive:\n set: '{ transform: return ${JSON.stringify($)} }'\n where-operation: |-\n (() => {\n switch ($context.from) {\n case \"code-model-v1\":\n return { from: \"code-model-v1\", where: $.operations[*].methods[?(@.serializedName == ${JSON.stringify($)})] };\n case \"swagger-document\":\n default:\n return { from: \"swagger-document\", where: $.paths.*[?(@.operationId == ${JSON.stringify($)})] };\n }\n })()\n where-model: |-\n (() => {\n switch ($context.from) {\n case \"code-model-v1\":\n throw \"not implemented\";\n case \"swagger-document\":\n default:\n return { from: \"swagger-document\", where: $.definitions[${JSON.stringify($)}] };\n }\n })()\n remove-operation: |-\n {\n from: 'swagger-document',\n \"where-operation\": $,\n transform: 'return undefined'\n }\n rename-operation: |-\n {\n from: 'swagger-document',\n \"where-operation\": $.from,\n transform: $.operationId = ${JSON.stringify($.to)}\n }\n remove-model: |-\n {\n from: 'swagger-document',\n \"where-model\": $,\n transform: 'return undefined'\n }\n rename-model: |-\n [{\n from: 'swagger-document',\n where: '$.definitions',\n transform: if ($[${JSON.stringify($.from)}]) { $[${JSON.stringify($.to)}] = $[${JSON.stringify($.from)}]; delete $[${JSON.stringify($.from)}]; }\n }, {\n from: 'swagger-document',\n where: $..['$ref'],\n transform: $ = $ === \"#/definitions/${$.from}\" ? \"#/definitions/${$.to}\" : $\n }]\n remove-property: |-\n {\n from: 'swagger-document',\n transform: delete $.properties[${JSON.stringify($)}]\n }\n rename-property: |-\n {\n from: 'swagger-document',\n transform: if ($.properties[${JSON.stringify($.from)}]) { $.properties[${JSON.stringify($.to)}] = $.properties[${JSON.stringify($.from)}]; delete $.properties[${JSON.stringify($.from)}]; }\n }\nused-extension:\n - '[\"@microsoft.azure/autorest.csharp\",\"~2.3.79\"]'\n - '[\"@microsoft.azure/autorest.modeler\",\"2.3.55\"]'\nscope-csharp/emitter:\n input-artifact: source-file-csharp\nscope-jsonrpcclient/emitter:\n input-artifact: source-file-jsonrpcclient\nhelp-content:\n csharp:\n activationScope: csharp\n categoryFriendlyName: 'C# Generator'\n settings:\n - key: azure-arm\n description: generate code in Azure flavor\n - key: fluent\n description: generate code in fluent flavor\n - key: namespace\n description: determines the root namespace to be used in generated code\n type: string\n required: true\n - key: license-header\n description: >-\n text to include as a header comment in generated files (magic strings:\n MICROSOFT_MIT, MICROSOFT_APACHE, MICROSOFT_MIT_NO_VERSION,\n MICROSOFT_APACHE_NO_VERSION, MICROSOFT_MIT_NO_CODEGEN)\n type: string\n - key: payload-flattening-threshold\n description: >-\n max. number of properties in a request body. If the number of\n properties in the request body is less than or equal to this value,\n these properties will be represented as individual method arguments\n instead\n type: number\n - key: add-credentials\n description: >-\n include a credential property and constructor parameter supporting\n different authentication behaviors\n - key: override-client-name\n description: >-\n overrides the name of the client class (usually derived from\n $.info.title)\n type: string\n - key: use-internal-constructors\n description: >-\n generate constructors with internal instead of public visibility\n (useful for convenience layers)\n - key: sync-methods\n description: >-\n determines amount of synchronous wrappers to generate; default:\n essential\n type: '\"essential\" | \"all\" | \"none\"'\n - key: use-datetimeoffset\n description: use DateTimeOffset instead of DateTime to model date/time types\n - key: client-side-validation\n description: >-\n whether to validate parametersat ... + "content": "---\ndirective:\n - from: swagger-document\n where: $.definitions.*.additionalProperties\n transform: |\n return typeof $ === \"boolean\"\n ? ($ ? { type: \"object\" } : undefined)\n : $\n reason: polyfill\n - from: swagger-document\n where: >-\n $..*[?(typeof @.modelAsString === \"boolean\" && typeof @.oldModelAsString\n !== \"boolean\")]\n transform: $.oldModelAsString = $.modelAsString\ninput-file:\n - tiny.yaml\noutput-artifact:\n - configuration.yaml\n - preserved-files\n - source-file-csharp\n - source-file-jsonrpcclient\nrequire: []\ntry-require:\n - readme.clear-output-folder.md\n - readme.no-upgrade-check.md\n - readme.skip-upgrade-check.md\n - ./readme.csharp.md\nuse: []\nclear-output-folder: {}\nuse-extension:\n '@microsoft.azure/autorest.csharp': ~2.3.79\n '@microsoft.azure/autorest.modeler': 2.3.55\nversion: autorest-core\nno-upgrade-check: {}\nskip-upgrade-check: {}\noutput-folder: 'stdout://'\nmessage-format: json\ncsharp: true\ninfo: yaml\nazure-arm: false\nopenapi-type: arm\npipeline:\n swagger-document/reflect-api-versions-cs:\n input:\n - identity\n - individual/identity\n - csharp/emitter\n scope: reflect-api-versions\n suffixes: []\n swagger-document/reflect-api-versions-cs/emitter:\n input: reflect-api-versions-cs\n scope: scope-reflect-api-versions-cs-emitter\n suffixes: []\n pipeline-emitter:\n scope: scope-pipeline-emitter\n suffixes:\n - ''\n configuration-emitter:\n scope: scope-configuration-emitter\n suffixes:\n - ''\n swagger-document-override/md-override-loader:\n output-artifact: immediate-config\n scope: perform-load\n suffixes:\n - ''\n swagger-document/loader:\n output-artifact: swagger-document\n scope: perform-load\n suffixes:\n - ''\n swagger-document/individual/transform:\n input: loader\n output-artifact: swagger-document\n suffixes:\n - ''\n swagger-document/individual/schema-validator:\n input: transform\n output-artifact: swagger-document\n suffixes:\n - ''\n swagger-document/individual/identity:\n input: schema-validator\n output-artifact: swagger-document\n suffixes:\n - ''\n swagger-document/compose:\n input: individual/identity\n output-artifact: swagger-document\n suffixes:\n - ''\n swagger-document/transform-immediate:\n input:\n - swagger-document-override/md-override-loader\n - compose\n output-artifact: swagger-document\n suffixes:\n - ''\n swagger-document/transform:\n input: transform-immediate\n output-artifact: swagger-document\n suffixes:\n - ''\n swagger-document/identity:\n input: transform\n output-artifact: swagger-document\n suffixes:\n - ''\n swagger-document/emitter:\n input: identity\n scope: scope-swagger-document/emitter\n suffixes:\n - ''\n openapi-document/openapi-document-converter:\n input: swagger-document/identity\n output-artifact: openapi-document\n suffixes:\n - ''\n openapi-document/transform:\n input: openapi-document-converter\n output-artifact: openapi-document\n suffixes:\n - ''\n openapi-document/component-modifiers:\n input: transform\n output-artifact: openapi-document\n suffixes:\n - ''\n openapi-document/identity:\n input: component-modifiers\n output-artifact: openapi-document\n suffixes:\n - ''\n openapi-document/emitter:\n input: identity\n scope: scope-openapi-document/emitter\n suffixes:\n - ''\n swagger-document/model-validator:\n input: swagger-document/identity\n scope: model-validator\n suffixes: []\n swagger-document/semantic-validator:\n input: swagger-document/identity\n scope: semantic-validator\n suffixes: []\n csharp/imodeler1:\n input: openapi-document/identity\n output-artifact: code-model-v1\n scope: csharp\n suffixes:\n - ''\n csharp/commonmarker:\n input: imodeler1\n output-artifact: code-model-v1\n suffixes:\n - ''\n csharp/cm/transform:\n input: commonmarker\n output-artifact: code-model-v1\n suffixes:\n - ''\n csharp/cm/emitter:\n input: transform\n scope: scope-cm/emitter\n suffixes:\n - ''\n csharp/generate:\n plugin: csharp\n input: cm/transform\n output-artifact: source-file-csharp\n suffixes:\n - ''\n csharp/simplifier:\n plugin: csharp-simplifier\n input: generate\n output-artifact: source-file-csharp\n suffixes:\n - ''\n csharp/transform:\n input: simplifier\n output-artifact: source-file-csharp\n scope: scope-transform-string\n suffixes:\n - ''\n csharp/emitter:\n input: transform\n scope: scope-csharp/emitter\n suffixes:\n - ''\n jsonrpcclient/imodeler1:\n input: openapi-document/identity\n output-artifact: code-model-v1\n scope: jsonrpcclient\n suffixes: []\n jsonrpcclient/generate:\n plugin: jsonrpcclient\n input: imodeler1\n output-artifact: source-file-jsonrpcclient\n suffixes: []\n jsonrpcclient/transform:\n input: generate\n output-artifact: source-file-jsonrpcclient\n scope: scope-transform-string\n suffixes: []\n jsonrpcclient/emitter:\n input: transform\n scope: scope-jsonrpcclient/emitter\n suffixes: []\nscope-reflect-api-versions-cs-emitter:\n input-artifact: source-file-csharp\n output-uri-expr: $key\nscope-pipeline-emitter:\n input-artifact: pipeline\n is-object: true\n output-uri-expr: |\n \"pipeline\"\nscope-configuration-emitter:\n input-artifact: configuration\n is-object: true\n output-uri-expr: |\n \"configuration\"\nperform-load: true\nscope-swagger-document/emitter:\n input-artifact: swagger-document\n is-object: true\n output-uri-expr: >\n $config[\"output-file\"] || \n\n ($config.namespace ? $config.namespace.replace(/:/g,'_') : undefined) || \n\n $config[\"input-file\"][0].split('/').reverse()[0].split('\\\\').reverse()[0].replace(/\\.json$/,\n \"\") \nscope-cm/emitter:\n input-artifact: code-model-v1\n is-object: true\n output-uri-expr: |\n \"code-model-v1\"\nscope-openapi-document/emitter:\n input-artifact: openapi-document\n is-object: true\n output-uri-expr: >\n $config[\"output-file\"] || \n\n ($config.namespace ? $config.namespace.replace(/:/g,'_') : undefined) || \n\n $config[\"input-file\"][0].split('/').reverse()[0].split('\\\\').reverse()[0].replace(/\\.json$/,\n \"\")\nclient-side-validation: true\ndeclare-directive:\n set: '{ transform: return ${JSON.stringify($)} }'\n where-operation: |-\n (() => {\n switch ($context.from) {\n case \"code-model-v1\":\n return { from: \"code-model-v1\", where: $.operations[*].methods[?(@.serializedName == ${JSON.stringify($)})] };\n case \"swagger-document\":\n default:\n return { from: \"swagger-document\", where: $.paths.*[?(@.operationId == ${JSON.stringify($)})] };\n }\n })()\n where-model: |-\n (() => {\n switch ($context.from) {\n case \"code-model-v1\":\n throw \"not implemented\";\n case \"swagger-document\":\n default:\n return { from: \"swagger-document\", where: $.definitions[${JSON.stringify($)}] };\n }\n })()\n remove-operation: |-\n {\n from: 'swagger-document',\n \"where-operation\": $,\n transform: 'return undefined'\n }\n rename-operation: |-\n {\n from: 'swagger-document',\n \"where-operation\": $.from,\n transform: $.operationId = ${JSON.stringify($.to)}\n }\n remove-model: |-\n {\n from: 'swagger-document',\n \"where-model\": $,\n transform: 'return undefined'\n }\n rename-model: |-\n [{\n from: 'swagger-document',\n where: '$.definitions',\n transform: if ($[${JSON.stringify($.from)}]) { $[${JSON.stringify($.to)}] = $[${JSON.stringify($.from)}]; delete $[${JSON.stringify($.from)}]; }\n }, {\n from: 'swagger-document',\n where: $..['$ref'],\n transform: $ = $ === \"#/definitions/${$.from}\" ? \"#/definitions/${$.to}\" : $\n }]\n remove-property: |-\n {\n from: 'swagger-document',\n transform: delete $.properties[${JSON.stringify($)}]\n }\n rename-property: |-\n {\n from: 'swagger-document',\n transform: if ($.properties[${JSON.stringify($.from)}]) { $.properties[${JSON.stringify($.to)}] = $.properties[${JSON.stringify($.from)}]; delete $.properties[${JSON.stringify($.from)}]; }\n }\nused-extension:\n - '[\"@microsoft.azure/autorest.csharp\",\"~2.3.79\"]'\n - '[\"@microsoft.azure/autorest.modeler\",\"2.3.55\"]'\nskip-simplifier-on-namespace:\n - System.Security.Permissions\nscope-csharp/emitter:\n input-artifact: source-file-csharp\nscope-jsonrpcclient/emitter:\n input-artifact: source-file-jsonrpcclient\nhelp-content:\n csharp:\n activationScope: csharp\n categoryFriendlyName: 'C# Generator'\n settings:\n - key: azure-arm\n description: generate code in Azure flavor\n - key: fluent\n description: generate code in fluent flavor\n - key: namespace\n description: determines the root namespace to be used in generated code\n type: string\n required: true\n - key: license-header\n description: >-\n text to include as a header comment in generated files (magic strings:\n MICROSOFT_MIT, MICROSOFT_APACHE, MICROSOFT_MIT_NO_VERSION,\n MICROSOFT_APACHE_NO_VERSION, MICROSOFT_MIT_NO_CODEGEN)\n type: string\n - key: payload-flattening-threshold\n description: >-\n max. number of properties in a request body. If the number of\n properties in the request body is less than or equal to this value,\n these properties will be represented as individual method arguments\n instead\n type: number\n - key: add-credentials\n description: >-\n include a credential property and constructor parameter supporting\n different authentication behaviors\n - key: override-client-name\n description: >-\n overrides the name of the client class (usually derived from\n $.info.title)\n type: string\n - key: use-internal-constructors\n description: >-\n generate constructors with internal instead of public visibility\n (useful for convenience layers)\n - key: sync-methods\n description: >-\n determines amount of synchronous wrappers to generate; default:\n essential\n type: '\"essential\" | \"all\" | \"none\"'\n - key: use-datetimeoffset\n description: use DateTimeOffset instead of DateTime to model date/time types\n - key: client-side-validation\n description: >-\n whether to validate parametersat ... "content": "// \r\n// Code generated by Microsoft (R) AutoRest Code Generator.\r\n// Changes may cause incorrect behavior and will be lost if the code is\r\n// regenerated.\r\n// \r\n\r\nnamespace Tiny.Models\r\n{\r\n using Microsoft.Rest;\r\n using Newtonsoft.Json;\r\n using System.Linq;\r\n\r\n /// \r\n /// A cowbell.\r\n /// \r\n public partial class Cowbell\r\n {\r\n /// \r\n /// Initializes a new instance of the Cowbell class.\r\n /// \r\n public Cowbell()\r\n {\r\n CustomInit();\r\n }\r\n\r\n /// \r\n /// Initializes a new instance of the Cowbell class.\r\n /// \r\n public Cowbell(string name, long? id = default(long?))\r\n {\r\n Id = id;\r\n Name = name;\r\n CustomInit();\r\n }\r\n\r\n /// \r\n /// An initialization method that performs custom operations like setting defaults\r\n /// \r\n partial void CustomInit();\r\n\r\n /// \r\n /// \r\n [JsonProperty(PropertyName = \"id\")]\r\n public long? Id { get; set; }\r\n\r\n /// \r\n /// \r\n [JsonProperty(PropertyName = \"name\")]\r\n public string Name { get; set; }\r\n\r\n /// \r\n /// Validate the object.\r\n /// \r\n /// \r\n /// Thrown if validation fails\r\n /// \r\n public virtual void Validate()\r\n {\r\n if (Name == null)\r\n {\r\n throw new ValidationException(ValidationRules.CannotBeNull, \"Name\");\r\n }\r\n }\r\n }\r\n}\r\n", - "content": "// \r\n// Code generated by Microsoft (R) AutoRest Code Generator.\r\n// Changes may cause incorrect behavior and will be lost if the code is\r\n// regenerated.\r\n// \r\n\r\nnamespace Tiny\r\n{\r\n using Microsoft.Rest;\r\n using Microsoft.Rest.Serialization;\r\n using Models;\r\n using Newtonsoft.Json;\r\n using System.Collections;\r\n using System.Collections.Generic;\r\n using System.Net;\r\n using System.Net.Http;\r\n\r\n /// \r\n /// This is a sample.\r\n /// \r\n public partial class CowbellFactory : ServiceClient, ICowbellFactory\r\n {\r\n /// \r\n /// The base URI of the service.\r\n /// \r\n public System.Uri BaseUri { get; set; }\r\n\r\n /// \r\n /// Gets or sets json serialization settings.\r\n /// \r\n public JsonSerializerSettings SerializationSettings { get; private set; }\r\n\r\n /// \r\n /// Gets or sets json deserialization settings.\r\n /// \r\n public JsonSerializerSettings DeserializationSettings { get; private set; }\r\n\r\n /// \r\n /// Gets the ICowbellOperations.\r\n /// \r\n public virtual ICowbellOperations Cowbell { get; private set; }\r\n\r\n /// \r\n /// Initializes a new instance of the CowbellFactory class.\r\n /// \r\n /// \r\n /// Optional. The delegating handlers to add to the http client pipeline.\r\n /// \r\n public CowbellFactory(params DelegatingHandler[] handlers) : base(handlers)\r\n {\r\n Initialize();\r\n }\r\n\r\n /// \r\n /// Initializes a new instance of the CowbellFactory class.\r\n /// \r\n /// \r\n /// Optional. The http client handler used to handle http transport.\r\n /// \r\n /// \r\n /// Optional. The delegating handlers to add to the http client pipeline.\r\n /// \r\n public CowbellFactory(HttpClientHandler rootHandler, params DelegatingHandler[] handlers) : base(rootHandler, handlers)\r\n {\r\n Initialize();\r\n }\r\n\r\n /// \r\n /// Initializes a new instance of the CowbellFactory class.\r\n /// \r\n /// \r\n /// Optional. The base URI of the service.\r\n /// \r\n /// \r\n /// Optional. The delegating handlers to add to the http client pipeline.\r\n /// \r\n /// \r\n /// Thrown when a required parameter is null\r\n /// \r\n public CowbellFactory(System.Uri baseUri, params DelegatingHandler[] handlers) : this(handlers)\r\n {\r\n if (baseUri == null)\r\n {\r\n throw new System.ArgumentNullException(\"baseUri\");\r\n }\r\n BaseUri = baseUri;\r\n }\r\n\r\n /// \r\n /// Initializes a new instance of the CowbellFactory class.\r\n /// \r\n /// \r\n /// Optional. The base URI of the service.\r\n /// \r\n /// \r\n /// Optional. The http client handler used to handle http transport.\r\n /// \r\n /// \r\n /// Optional. The delegating handlers to add to the http client pipeline.\r\n /// \r\n /// \r\n /// Thrown when a required parameter is null\r\n /// \r\n public CowbellFactory(System.Uri baseUri, HttpClientHandler rootHandler, params DelegatingHandler[] handlers) : this(rootHandler, handlers)\r\n {\r\n if (baseUri == null)\r\n {\r\n throw new System.ArgumentNullException(\"baseUri\");\r\n }\r\n BaseUri = baseUri;\r\n }\r\n\r\n /// \r\n /// An optional partial-method to perform custom initialization.\r\n ///\r\n partial void CustomInitialize();\r\n /// \r\n /// Initializes client properties.\r\n /// \r\n private void Initialize()\r\n {\r\n Cowbell = new CowbellOperations(this);\r\n BaseUri = new System.Uri(\"https://localhost\");\r\n SerializationSettings = new JsonSerializerSettings\r\n {\r\n Formatting = Newtonsoft.Json.Formatting.Indented,\r\n DateFormatHandling = Newtonsoft.Json.DateFormatHandling.IsoDateFormat,\r\n DateTimeZoneHandling = Newtonsoft.Json.DateTimeZoneHandling.Utc,\r\n NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore,\r\n ReferenceLoopHandling = Newtonsoft.Json.ReferenceLoopHandling.Serialize,\r\n ContractResolver = new ReadOnlyJsonContractResolver(),\r\n Converters = new List\r\n {\r\n new Iso8601TimeSpanConverter()\r\n }\r\n };\r\n DeserializationSettings = new JsonSerializerSettings\r\n {\r\n DateFormatHandling = Newtonsoft.Json.DateFormatHandling.IsoDateFormat,\r\n DateTimeZoneHandling = Newtonsoft.Json.DateTimeZoneHandling.Utc,\r\n NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore,\r\n ReferenceLoopHandling = Newtonsoft.Json.ReferenceLoopHandling.Serialize,\r\n ContractResolver = new ReadOnlyJsonContractResolver(),\r\n Converters = new List\r\n {\r\n new Iso8601TimeSpanConverter()\r\n }\r\n };\r\n CustomInitialize();\r\n }\r\n }\r\n}\r\n", + "content": "// \r\n// Code generated by Microsoft (R) AutoRest Code Generator.\r\n// Changes may cause incorrect behavior and will be lost if the code is\r\n// regenerated.\r\n// \r\n\r\nnamespace Tiny\r\n{\r\n using Microsoft.Rest;\r\n using Microsoft.Rest.Serialization;\r\n using Models;\r\n using Newtonsoft.Json;\r\n using System.Collections;\r\n using System.Collections.Generic;\r\n using System.Net;\r\n using System.Net.Http;\r\n\r\n /// \r\n /// This is a sample.\r\n /// \r\n public partial class CowbellFactory : ServiceClient, ICowbellFactory\r\n {\r\n /// \r\n /// The base URI of the service.\r\n /// \r\n public System.Uri BaseUri { get; set; }\r\n\r\n /// \r\n /// Gets or sets json serialization settings.\r\n /// \r\n public JsonSerializerSettings SerializationSettings { get; private set; }\r\n\r\n /// \r\n /// Gets or sets json deserialization settings.\r\n /// \r\n public JsonSerializerSettings DeserializationSettings { get; private set; }\r\n\r\n /// \r\n /// Gets the ICowbellOperations.\r\n /// \r\n public virtual ICowbellOperations Cowbell { get; private set; }\r\n\r\n /// \r\n /// Initializes a new instance of the CowbellFactory class.\r\n /// \r\n /// \r\n /// HttpClient to be used\r\n /// \r\n /// \r\n /// True: will dispose the provided httpClient on calling CowbellFactory.Dispose(). False: will not dispose provided httpClient\r\n public CowbellFactory(HttpClient httpClient, bool disposeHttpClient) : base(httpClient, disposeHttpClient)\r\n {\r\n Initialize();\r\n }\r\n\r\n /// \r\n /// Initializes a new instance of the CowbellFactory class.\r\n /// \r\n /// \r\n /// Optional. The delegating handlers to add to the http client pipeline.\r\n /// \r\n public CowbellFactory(params DelegatingHandler[] handlers) : base(handlers)\r\n {\r\n Initialize();\r\n }\r\n\r\n /// \r\n /// Initializes a new instance of the CowbellFactory class.\r\n /// \r\n /// \r\n /// Optional. The http client handler used to handle http transport.\r\n /// \r\n /// \r\n /// Optional. The delegating handlers to add to the http client pipeline.\r\n /// \r\n public CowbellFactory(HttpClientHandler rootHandler, params DelegatingHandler[] handlers) : base(rootHandler, handlers)\r\n {\r\n Initialize();\r\n }\r\n\r\n /// \r\n /// Initializes a new instance of the CowbellFactory class.\r\n /// \r\n /// \r\n /// Optional. The base URI of the service.\r\n /// \r\n /// \r\n /// Optional. The delegating handlers to add to the http client pipeline.\r\n /// \r\n /// \r\n /// Thrown when a required parameter is null\r\n /// \r\n public CowbellFactory(System.Uri baseUri, params DelegatingHandler[] handlers) : this(handlers)\r\n {\r\n if (baseUri == null)\r\n {\r\n throw new System.ArgumentNullException(\"baseUri\");\r\n }\r\n BaseUri = baseUri;\r\n }\r\n\r\n /// \r\n /// Initializes a new instance of the CowbellFactory class.\r\n /// \r\n /// \r\n /// Optional. The base URI of the service.\r\n /// \r\n /// \r\n /// Optional. The http client handler used to handle http transport.\r\n /// \r\n /// \r\n /// Optional. The delegating handlers to add to the http client pipeline.\r\n /// \r\n /// \r\n /// Thrown when a required parameter is null\r\n /// \r\n public CowbellFactory(System.Uri baseUri, HttpClientHandler rootHandler, params DelegatingHandler[] handlers) : this(rootHandler, handlers)\r\n {\r\n if (baseUri == null)\r\n {\r\n throw new System.ArgumentNullException(\"baseUri\");\r\n }\r\n BaseUri = baseUri;\r\n }\r\n\r\n /// \r\n /// An optional partial-method to perform custom initialization.\r\n ///\r\n partial void CustomInitialize();\r\n /// \r\n /// Initializes client properties.\r\n /// \r\n private void Initialize()\r\n {\r\n Cowbell = new CowbellOperations(this);\r\n BaseUri = new System.Uri(\"https://localhost\");\r\n SerializationSettings = new JsonSerializerSettings\r\n {\r\n Formatting = Newtonsoft.Json.Formatting.Indented,\r\n DateFormatHandling = Newtonsoft.Json.DateFormatHandling.IsoDateFormat,\r\n DateTimeZoneHandling = Newtonsoft.Json.DateTimeZoneHandling.Utc,\r\n NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore,\r\n ReferenceLoopHandling = Newtonsoft.Json.ReferenceLoopHandling.Serialize,\r\n ContractResolver = new ReadOnlyJsonContractResolver(),\r\n Converters = new List\r\n {\r\n new Iso8601TimeSpanConverter()\r\n }\r\n };\r\n DeserializationSettings = new JsonSerializerSettings\r\n {\r\n DateFormatHandling = Newtonsoft.Json.DateFormatHandling.IsoDateFormat,\r\n DateTimeZoneHandling = Newtonsoft.Json.DateTimeZoneHandling.Utc,\r\n NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore,\r\n ReferenceLoopHandling = Newtonsoft.Json.ReferenceLoopHandling.Serialize,\r\n ContractResolver = new ReadOnlyJsonContractResolver(),\r\n Converters = new List\r\n {\r\n new Iso8601TimeSpanConverter()\r\n }\r\n };\r\n CustomInitialize();\r\n }\r\n }\r\n}\r\n", "content": "// \r\n// Code generated by Microsoft (R) AutoRest Code Generator.\r\n// Changes may cause incorrect behavior and will be lost if the code is\r\n// regenerated.\r\n// \r\n\r\nnamespace Tiny\r\n{\r\n using Microsoft.Rest;\r\n using Models;\r\n using System.Collections;\r\n using System.Collections.Generic;\r\n using System.IO;\r\n using System.Linq;\r\n using System.Net;\r\n using System.Net.Http;\r\n using System.Threading;\r\n using System.Threading.Tasks;\r\n\r\n /// \r\n /// CowbellOperations operations.\r\n /// \r\n public partial class CowbellOperations : IServiceOperations, ICowbellOperations\r\n {\r\n /// \r\n /// Initializes a new instance of the CowbellOperations class.\r\n /// \r\n /// \r\n /// Reference to the service client.\r\n /// \r\n /// \r\n /// Thrown when a required parameter is null\r\n /// \r\n public CowbellOperations(CowbellFactory client)\r\n {\r\n if (client == null)\r\n {\r\n throw new System.ArgumentNullException(\"client\");\r\n }\r\n Client = client;\r\n }\r\n\r\n /// \r\n /// Gets a reference to the CowbellFactory\r\n /// \r\n public CowbellFactory Client { get; private set; }\r\n\r\n /// \r\n /// A good description.\r\n /// \r\n /// \r\n /// \r\n /// \r\n /// Headers that will be added to request.\r\n /// \r\n /// \r\n /// The cancellation token.\r\n /// \r\n /// \r\n /// Thrown when the operation returned an invalid status code\r\n /// \r\n /// \r\n /// Thrown when a required parameter is null\r\n /// \r\n /// \r\n /// Thrown when a required parameter is null\r\n /// \r\n /// \r\n /// A response object containing the response body and response headers.\r\n /// \r\n public async Task AddWithHttpMessagesAsync(Cowbell body, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))\r\n {\r\n if (body == null)\r\n {\r\n throw new ValidationException(ValidationRules.CannotBeNull, \"body\");\r\n }\r\n if (body != null)\r\n {\r\n body.Validate();\r\n }\r\n // Tracing\r\n bool _shouldTrace = ServiceClientTracing.IsEnabled;\r\n string _invocationId = null;\r\n if (_shouldTrace)\r\n {\r\n _invocationId = ServiceClientTracing.NextInvocationId.ToString();\r\n Dictionary tracingParameters = new Dictionary();\r\n tracingParameters.Add(\"body\", body);\r\n tracingParameters.Add(\"cancellationToken\", cancellationToken);\r\n ServiceClientTracing.Enter(_invocationId, this, \"Add\", tracingParameters);\r\n }\r\n // Construct URL\r\n var _baseUrl = Client.BaseUri.AbsoluteUri;\r\n var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith(\"/\") ? \"\" : \"/\")), \"cowbell\").ToString();\r\n // Create HTTP transport objects\r\n var _httpRequest = new HttpRequestMessage();\r\n HttpResponseMessage _httpResponse = null;\r\n _httpRequest.Method = new HttpMethod(\"POST\");\r\n _httpRequest.RequestUri = new System.Uri(_url);\r\n // Set Headers\r\n\r\n\r\n if (customHeaders != null)\r\n {\r\n foreach(var _header in customHeaders)\r\n {\r\n if (_httpRequest.Headers.Contains(_header.Key))\r\n {\r\n _httpRequest.Headers.Remove(_header.Key);\r\n }\r\n _httpRequest.Headers.TryAddWithoutValidation(_header.Key, _header.Value);\r\n }\r\n }\r\n\r\n // Serialize Request\r\n string _requestContent = null;\r\n if(body != null)\r\n {\r\n _requestContent = Microsoft.Rest.Serialization.SafeJsonConvert.SerializeObject(body, Client.SerializationSettings);\r\n _httpRequest.Content = new StringContent(_requestContent, System.Text.Encoding.UTF8);\r\n _httpRequest.Content.Headers.ContentType =System.Net.Http.Headers.MediaTypeHeaderValue.Parse(\"application/json; charset=utf-8\");\r\n }\r\n // Send Request\r\n if (_shouldTrace)\r\n {\r\n ServiceClientTracing.SendRequest(_invocationId, _httpRequest);\r\n }\r\n cancellationToken.ThrowIfCancellationRequested();\r\n _httpResponse = await Client.HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);\r\n if (_shouldTrace)\r\n {\r\n ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse);\r\n }\r\n HttpStatusCode _statusCode = _httpResponse.StatusCode;\r\n cancellationToken.ThrowIfCancellationRequested();\r\n string _responseContent = null;\r\n if ((int)_statusCode != 200)\r\n {\r\n var ex = new HttpOperationException(string.Format(\"Operation returned an invalid status code '{0}'\", _statusCode));\r\n if (_httpResponse.Content != null) {\r\n _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);\r\n }\r\n else {\r\n _responseContent = string.Empty;\r\n }\r\n ex.Request = new HttpRequestMessageWrapper(_httpRequest, _requestContent);\r\n ex.Response = new HttpResponseMessageWrapper(_httpResponse, _responseContent);\r\n if (_shouldTrace)\r\n {\r\n ServiceClientTracing.Error(_invocationId, ex);\r\n }\r\n _httpRequest.Dispose();\r\n if (_httpResponse != null)\r\n {\r\n _httpResponse.Dispose();\r\n }\r\n throw ex;\r\n }\r\n // Create Result\r\n var _result = new HttpOperationResponse();\r\n _result.Request = _httpRequest;\r\n _result.Response = _httpResponse;\r\n if (_shouldTrace)\r\n {\r\n ServiceClientTracing.Exit(_invocationId, _result);\r\n }\r\n return _result;\r\n }\r\n\r\n }\r\n}\r\n", "content": "// \r\n// Code generated by Microsoft (R) AutoRest Code Generator.\r\n// Changes may cause incorrect behavior and will be lost if the code is\r\n// regenerated.\r\n// \r\n\r\nnamespace Tiny\r\n{\r\n using Microsoft.Rest;\r\n using Models;\r\n using System.Collections;\r\n using System.Collections.Generic;\r\n using System.Threading;\r\n using System.Threading.Tasks;\r\n\r\n /// \r\n /// CowbellOperations operations.\r\n /// \r\n public partial interface ICowbellOperations\r\n {\r\n /// \r\n /// A good description.\r\n /// \r\n /// \r\n /// \r\n /// \r\n /// The headers that will be added to request.\r\n /// \r\n /// \r\n /// The cancellation token.\r\n /// \r\n /// \r\n /// Thrown when the operation returned an invalid status code\r\n /// \r\n /// \r\n /// Thrown when a required parameter is null\r\n /// \r\n Task AddWithHttpMessagesAsync(Cowbell body, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));\r\n }\r\n}\r\n", "content": "// \r\n// Code generated by Microsoft (R) AutoRest Code Generator.\r\n// Changes may cause incorrect behavior and will be lost if the code is\r\n// regenerated.\r\n// \r\n\r\nnamespace Tiny\r\n{\r\n using Models;\r\n using Newtonsoft.Json;\r\n\r\n /// \r\n /// This is a sample.\r\n /// \r\n public partial interface ICowbellFactory : System.IDisposable\r\n {\r\n /// \r\n /// The base URI of the service.\r\n /// \r\n System.Uri BaseUri { get; set; }\r\n\r\n /// \r\n /// Gets or sets json serialization settings.\r\n /// \r\n JsonSerializerSettings SerializationSettings { get; }\r\n\r\n /// \r\n /// Gets or sets json deserialization settings.\r\n /// \r\n JsonSerializerSettings DeserializationSettings { get; }\r\n\r\n\r\n /// \r\n /// Gets the ICowbellOperations.\r\n /// \r\n ICowbellOperations Cowbell { get; }\r\n\r\n }\r\n}\r\n", diff --git a/Samples/2a-validation/NodeJS/LICENSE.txt b/Samples/2a-validation/NodeJS/LICENSE.txt deleted file mode 100644 index a70e8cf660..0000000000 --- a/Samples/2a-validation/NodeJS/LICENSE.txt +++ /dev/null @@ -1,21 +0,0 @@ -The MIT License (MIT) - -Copyright (c) 2018 Microsoft - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/Samples/2a-validation/shell/stdout.txt b/Samples/2a-validation/shell/stdout.txt index 0a8c85d008..b0dd8acbad 100644 --- a/Samples/2a-validation/shell/stdout.txt +++ b/Samples/2a-validation/shell/stdout.txt @@ -35,6 +35,8 @@ - https://raw.githubusercontent.com/Azure/azure-rest-api-specs/d374d03801e97737ddb32e01f20513e7b2bbd9c3/arm-storage/2015-06-15/swagger/storage.json:74:6 ($.paths["/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}"].put) - https://raw.githubusercontent.com/Azure/azure-rest-api-specs/d374d03801e97737ddb32e01f20513e7b2bbd9c3/arm-storage/2015-06-15/swagger/storage.json:800:4 ($.definitions.Resource) https://aka.ms/autorest +INFORMATION: Getting the package version from the pre-existing package.json file in the output folder. +INFORMATION: Pre-existing package.json file in the output folder didn't contain a non-empty version property. WARNING (DescriptionAndTitleMissing/R4000/SDKViolation): 'keyName' model/property lacks 'description' and 'title' property. Consider adding a 'description'/'title' element. Accurate description/title is essential for maintaining reference documentation. WARNING (DescriptionAndTitleMissing/R4000/SDKViolation): 'name' model/property lacks 'description' and 'title' property. Consider adding a 'description'/'title' element. Accurate description/title is essential for maintaining reference documentation. WARNING (DescriptionAndTitleMissing/R4000/SDKViolation): 'properties' model/property lacks 'description' and 'title' property. Consider adding a 'description'/'title' element. Accurate description/title is essential for maintaining reference documentation. diff --git a/Samples/3b-custom-transformations/Client/code-model-v1.norm.yaml b/Samples/3b-custom-transformations/Client/code-model-v1.norm.yaml index 76ae075cb4..b9a4125665 100644 --- a/Samples/3b-custom-transformations/Client/code-model-v1.norm.yaml +++ b/Samples/3b-custom-transformations/Client/code-model-v1.norm.yaml @@ -17,7 +17,6 @@ modelTypes: - $id: '2' $type: CompositeType containsConstantProperties: false - deprecated: false name: $id: '15' fixed: false @@ -28,7 +27,6 @@ modelTypes: defaultValue: $id: '4' fixed: false - deprecated: false documentation: $id: '5' fixed: false @@ -38,7 +36,6 @@ modelTypes: modelType: $id: '7' $type: PrimaryType - deprecated: false knownPrimaryType: string name: $id: '8' @@ -57,7 +54,6 @@ modelTypes: $id: '10' fixed: false raw: Microsoft.Storage/storageAccounts - deprecated: false documentation: $id: '11' fixed: false @@ -67,7 +63,6 @@ modelTypes: modelType: $id: '13' $type: PrimaryType - deprecated: false knownPrimaryType: string name: $id: '14' @@ -84,7 +79,6 @@ modelTypes: - $id: '16' $type: CompositeType containsConstantProperties: false - deprecated: false documentation: The CheckNameAvailability operation response. name: $id: '39' @@ -96,7 +90,6 @@ modelTypes: defaultValue: $id: '18' fixed: false - deprecated: false documentation: $id: '19' fixed: false @@ -110,7 +103,6 @@ modelTypes: modelType: $id: '21' $type: PrimaryType - deprecated: false knownPrimaryType: boolean name: $id: '22' @@ -128,7 +120,6 @@ modelTypes: defaultValue: $id: '24' fixed: false - deprecated: false documentation: $id: '25' fixed: false @@ -146,7 +137,6 @@ modelTypes: modelType: $id: '27' $type: EnumType - deprecated: false modelAsString: false name: $id: '32' @@ -156,7 +146,6 @@ modelTypes: underlyingType: $id: '30' $type: PrimaryType - deprecated: false knownPrimaryType: string name: $id: '31' @@ -181,7 +170,6 @@ modelTypes: defaultValue: $id: '34' fixed: false - deprecated: false documentation: $id: '35' fixed: false @@ -192,7 +180,6 @@ modelTypes: modelType: $id: '37' $type: PrimaryType - deprecated: false knownPrimaryType: string name: $id: '38' @@ -209,7 +196,6 @@ modelTypes: - $id: '40' $type: CompositeType containsConstantProperties: false - deprecated: false name: $id: '54' fixed: false @@ -220,7 +206,6 @@ modelTypes: defaultValue: $id: '42' fixed: false - deprecated: false documentation: $id: '43' fixed: false @@ -236,7 +221,6 @@ modelTypes: modelType: $id: '45' $type: EnumType - deprecated: false modelAsString: false name: $id: '53' @@ -246,7 +230,6 @@ modelTypes: underlyingType: $id: '51' $type: PrimaryType - deprecated: false knownPrimaryType: string name: $id: '52' @@ -279,7 +262,6 @@ modelTypes: - $id: '55' $type: CompositeType containsConstantProperties: false - deprecated: false documentation: The parameters to provide for the account. extensions: x-ms-azure-resource: true @@ -293,7 +275,6 @@ modelTypes: defaultValue: $id: '57' fixed: false - deprecated: false documentation: $id: '58' fixed: false @@ -304,7 +285,6 @@ modelTypes: modelType: $id: '60' $type: PrimaryType - deprecated: false knownPrimaryType: string name: $id: '61' @@ -322,7 +302,6 @@ modelTypes: defaultValue: $id: '63' fixed: false - deprecated: false documentation: $id: '64' fixed: false @@ -333,7 +312,6 @@ modelTypes: modelType: $id: '66' $type: DictionaryType - deprecated: false name: $id: '69' fixed: false @@ -341,7 +319,6 @@ modelTypes: valueType: $id: '67' $type: PrimaryType - deprecated: false knownPrimaryType: string name: $id: '68' @@ -359,7 +336,6 @@ modelTypes: defaultValue: $id: '71' fixed: false - deprecated: false documentation: $id: '72' fixed: false @@ -381,7 +357,6 @@ modelTypes: - $id: '75' $type: CompositeType containsConstantProperties: false - deprecated: false documentation: >- The URIs that are used to perform a retrieval of a public blob, queue or table object. @@ -395,7 +370,6 @@ modelTypes: defaultValue: $id: '77' fixed: false - deprecated: false documentation: $id: '78' fixed: false @@ -406,7 +380,6 @@ modelTypes: modelType: $id: '80' $type: PrimaryType - deprecated: false knownPrimaryType: string name: $id: '81' @@ -424,7 +397,6 @@ modelTypes: defaultValue: $id: '83' fixed: false - deprecated: false documentation: $id: '84' fixed: false @@ -435,7 +407,6 @@ modelTypes: modelType: $id: '86' $type: PrimaryType - deprecated: false knownPrimaryType: string name: $id: '87' @@ -453,7 +424,6 @@ modelTypes: defaultValue: $id: '89' fixed: false - deprecated: false documentation: $id: '90' fixed: false @@ -464,7 +434,6 @@ modelTypes: modelType: $id: '92' $type: PrimaryType - deprecated: false knownPrimaryType: string name: $id: '93' @@ -482,7 +451,6 @@ modelTypes: defaultValue: $id: '95' fixed: false - deprecated: false documentation: $id: '96' fixed: false @@ -493,7 +461,6 @@ modelTypes: modelType: $id: '98' $type: PrimaryType - deprecated: false knownPrimaryType: string name: $id: '99' @@ -510,7 +477,6 @@ modelTypes: - $id: '101' $type: CompositeType containsConstantProperties: false - deprecated: false documentation: >- The custom domain assigned to this storage account. This can be set via Update. @@ -524,7 +490,6 @@ modelTypes: defaultValue: $id: '103' fixed: false - deprecated: false documentation: $id: '104' fixed: false @@ -535,7 +500,6 @@ modelTypes: modelType: $id: '106' $type: PrimaryType - deprecated: false knownPrimaryType: string name: $id: '107' @@ -553,7 +517,6 @@ modelTypes: defaultValue: $id: '109' fixed: false - deprecated: false documentation: $id: '110' fixed: false @@ -566,7 +529,6 @@ modelTypes: modelType: $id: '112' $type: PrimaryType - deprecated: false knownPrimaryType: boolean name: $id: '113' @@ -583,7 +545,6 @@ modelTypes: - $id: '115' $type: CompositeType containsConstantProperties: false - deprecated: false name: $id: '181' fixed: false @@ -594,7 +555,6 @@ modelTypes: defaultValue: $id: '117' fixed: false - deprecated: false documentation: $id: '118' fixed: false @@ -612,7 +572,6 @@ modelTypes: modelType: $id: '120' $type: EnumType - deprecated: false modelAsString: false name: $id: '126' @@ -622,7 +581,6 @@ modelTypes: underlyingType: $id: '124' $type: PrimaryType - deprecated: false knownPrimaryType: string name: $id: '125' @@ -650,7 +608,6 @@ modelTypes: defaultValue: $id: '128' fixed: false - deprecated: false documentation: $id: '129' fixed: false @@ -677,7 +634,6 @@ modelTypes: defaultValue: $id: '132' fixed: false - deprecated: false documentation: $id: '133' fixed: false @@ -702,7 +658,6 @@ modelTypes: defaultValue: $id: '136' fixed: false - deprecated: false documentation: $id: '137' fixed: false @@ -713,7 +668,6 @@ modelTypes: modelType: $id: '139' $type: PrimaryType - deprecated: false knownPrimaryType: string name: $id: '140' @@ -731,7 +685,6 @@ modelTypes: defaultValue: $id: '142' fixed: false - deprecated: false documentation: $id: '143' fixed: false @@ -749,7 +702,6 @@ modelTypes: modelType: $id: '145' $type: EnumType - deprecated: false modelAsString: false name: $id: '150' @@ -759,7 +711,6 @@ modelTypes: underlyingType: $id: '148' $type: PrimaryType - deprecated: false knownPrimaryType: string name: $id: '149' @@ -784,7 +735,6 @@ modelTypes: defaultValue: $id: '152' fixed: false - deprecated: false documentation: $id: '153' fixed: false @@ -799,7 +749,6 @@ modelTypes: modelType: $id: '155' $type: PrimaryType - deprecated: false format: date-time knownPrimaryType: dateTime name: @@ -818,7 +767,6 @@ modelTypes: defaultValue: $id: '158' fixed: false - deprecated: false documentation: $id: '159' fixed: false @@ -832,7 +780,6 @@ modelTypes: modelType: $id: '161' $type: PrimaryType - deprecated: false knownPrimaryType: string name: $id: '162' @@ -850,7 +797,6 @@ modelTypes: defaultValue: $id: '164' fixed: false - deprecated: false documentation: $id: '165' fixed: false @@ -880,7 +826,6 @@ modelTypes: defaultValue: $id: '168' fixed: false - deprecated: false documentation: $id: '169' fixed: false @@ -891,7 +836,6 @@ modelTypes: modelType: $id: '171' $type: PrimaryType - deprecated: false format: date-time knownPrimaryType: dateTime name: @@ -910,7 +854,6 @@ modelTypes: defaultValue: $id: '174' fixed: false - deprecated: false documentation: $id: '175' fixed: false @@ -934,7 +877,6 @@ modelTypes: defaultValue: $id: '178' fixed: false - deprecated: false documentation: $id: '179' fixed: false @@ -961,7 +903,6 @@ modelTypes: $id: '187' $type: CompositeType containsConstantProperties: false - deprecated: false extensions: x-ms-azure-resource: true name: @@ -974,7 +915,6 @@ modelTypes: defaultValue: $id: '189' fixed: false - deprecated: false documentation: $id: '190' fixed: false @@ -985,7 +925,6 @@ modelTypes: modelType: $id: '192' $type: PrimaryType - deprecated: false knownPrimaryType: string name: $id: '193' @@ -1003,7 +942,6 @@ modelTypes: defaultValue: $id: '195' fixed: false - deprecated: false documentation: $id: '196' fixed: false @@ -1014,7 +952,6 @@ modelTypes: modelType: $id: '198' $type: PrimaryType - deprecated: false knownPrimaryType: string name: $id: '199' @@ -1032,7 +969,6 @@ modelTypes: defaultValue: $id: '201' fixed: false - deprecated: false documentation: $id: '202' fixed: false @@ -1043,7 +979,6 @@ modelTypes: modelType: $id: '204' $type: PrimaryType - deprecated: false knownPrimaryType: string name: $id: '205' @@ -1061,7 +996,6 @@ modelTypes: defaultValue: $id: '207' fixed: false - deprecated: false documentation: $id: '208' fixed: false @@ -1072,7 +1006,6 @@ modelTypes: modelType: $id: '210' $type: PrimaryType - deprecated: false knownPrimaryType: string name: $id: '211' @@ -1090,7 +1023,6 @@ modelTypes: defaultValue: $id: '213' fixed: false - deprecated: false documentation: $id: '214' fixed: false @@ -1101,7 +1033,6 @@ modelTypes: modelType: $id: '216' $type: DictionaryType - deprecated: false name: $id: '219' fixed: false @@ -1109,7 +1040,6 @@ modelTypes: valueType: $id: '217' $type: PrimaryType - deprecated: false knownPrimaryType: string name: $id: '218' @@ -1124,7 +1054,6 @@ modelTypes: serializedName: tags serializedName: Resource containsConstantProperties: false - deprecated: false documentation: The storage account. name: $id: '221' @@ -1136,7 +1065,6 @@ modelTypes: defaultValue: $id: '184' fixed: false - deprecated: false documentation: $id: '185' fixed: false @@ -1158,7 +1086,6 @@ modelTypes: - $id: '222' $type: CompositeType containsConstantProperties: false - deprecated: false documentation: The access keys for the storage account. name: $id: '235' @@ -1170,7 +1097,6 @@ modelTypes: defaultValue: $id: '224' fixed: false - deprecated: false documentation: $id: '225' fixed: false @@ -1181,7 +1107,6 @@ modelTypes: modelType: $id: '227' $type: PrimaryType - deprecated: false knownPrimaryType: string name: $id: '228' @@ -1199,7 +1124,6 @@ modelTypes: defaultValue: $id: '230' fixed: false - deprecated: false documentation: $id: '231' fixed: false @@ -1210,7 +1134,6 @@ modelTypes: modelType: $id: '233' $type: PrimaryType - deprecated: false knownPrimaryType: string name: $id: '234' @@ -1227,7 +1150,6 @@ modelTypes: - $id: '236' $type: CompositeType containsConstantProperties: false - deprecated: false documentation: The list storage accounts operation response. name: $id: '243' @@ -1239,7 +1161,6 @@ modelTypes: defaultValue: $id: '238' fixed: false - deprecated: false documentation: $id: '239' fixed: false @@ -1250,7 +1171,6 @@ modelTypes: modelType: $id: '241' $type: SequenceType - deprecated: false elementType: $ref: '182' name: @@ -1267,7 +1187,6 @@ modelTypes: - $id: '244' $type: CompositeType containsConstantProperties: false - deprecated: false name: $id: '253' fixed: false @@ -1278,7 +1197,6 @@ modelTypes: defaultValue: $id: '246' fixed: false - deprecated: false documentation: $id: '247' fixed: false @@ -1308,7 +1226,6 @@ modelTypes: defaultValue: $id: '250' fixed: false - deprecated: false documentation: $id: '251' fixed: false @@ -1333,7 +1250,6 @@ modelTypes: - $id: '254' $type: CompositeType containsConstantProperties: false - deprecated: false documentation: The parameters to update on the account. extensions: x-ms-azure-resource: true @@ -1347,7 +1263,6 @@ modelTypes: defaultValue: $id: '256' fixed: false - deprecated: false documentation: $id: '257' fixed: false @@ -1358,7 +1273,6 @@ modelTypes: modelType: $id: '259' $type: DictionaryType - deprecated: false name: $id: '262' fixed: false @@ -1366,7 +1280,6 @@ modelTypes: valueType: $id: '260' $type: PrimaryType - deprecated: false knownPrimaryType: string name: $id: '261' @@ -1384,7 +1297,6 @@ modelTypes: defaultValue: $id: '264' fixed: false - deprecated: false documentation: $id: '265' fixed: false @@ -1406,7 +1318,6 @@ modelTypes: - $id: '268' $type: CompositeType containsConstantProperties: false - deprecated: false name: $id: '275' fixed: false @@ -1417,7 +1328,6 @@ modelTypes: defaultValue: $id: '270' fixed: false - deprecated: false documentation: $id: '271' fixed: false @@ -1427,7 +1337,6 @@ modelTypes: modelType: $id: '273' $type: PrimaryType - deprecated: false knownPrimaryType: string name: $id: '274' @@ -1444,7 +1353,6 @@ modelTypes: - $id: '276' $type: CompositeType containsConstantProperties: false - deprecated: false documentation: The Usage Names. name: $id: '289' @@ -1456,7 +1364,6 @@ modelTypes: defaultValue: $id: '278' fixed: false - deprecated: false documentation: $id: '279' fixed: false @@ -1467,7 +1374,6 @@ modelTypes: modelType: $id: '281' $type: PrimaryType - deprecated: false knownPrimaryType: string name: $id: '282' @@ -1485,7 +1391,6 @@ modelTypes: defaultValue: $id: '284' fixed: false - deprecated: false documentation: $id: '285' fixed: false @@ -1496,7 +1401,6 @@ modelTypes: modelType: $id: '287' $type: PrimaryType - deprecated: false knownPrimaryType: string name: $id: '288' @@ -1513,7 +1417,6 @@ modelTypes: - $id: '290' $type: CompositeType containsConstantProperties: false - deprecated: false documentation: DESCRIBES STORAGE RESOURCE USAGE. name: $id: '321' @@ -1525,7 +1428,6 @@ modelTypes: defaultValue: $id: '292' fixed: false - deprecated: false documentation: $id: '293' fixed: false @@ -1541,7 +1443,6 @@ modelTypes: modelType: $id: '295' $type: EnumType - deprecated: false modelAsString: false name: $id: '304' @@ -1551,7 +1452,6 @@ modelTypes: underlyingType: $id: '302' $type: PrimaryType - deprecated: false knownPrimaryType: string name: $id: '303' @@ -1588,7 +1488,6 @@ modelTypes: defaultValue: $id: '306' fixed: false - deprecated: false documentation: $id: '307' fixed: false @@ -1601,7 +1500,6 @@ modelTypes: modelType: $id: '309' $type: PrimaryType - deprecated: false format: int32 knownPrimaryType: int name: @@ -1620,7 +1518,6 @@ modelTypes: defaultValue: $id: '312' fixed: false - deprecated: false documentation: $id: '313' fixed: false @@ -1633,7 +1530,6 @@ modelTypes: modelType: $id: '315' $type: PrimaryType - deprecated: false format: int32 knownPrimaryType: int name: @@ -1652,7 +1548,6 @@ modelTypes: defaultValue: $id: '318' fixed: false - deprecated: false documentation: $id: '319' fixed: false @@ -1673,7 +1568,6 @@ modelTypes: - $id: '322' $type: CompositeType containsConstantProperties: false - deprecated: false documentation: The List Usages operation response. name: $id: '329' @@ -1685,7 +1579,6 @@ modelTypes: defaultValue: $id: '324' fixed: false - deprecated: false documentation: $id: '325' fixed: false @@ -1696,7 +1589,6 @@ modelTypes: modelType: $id: '327' $type: SequenceType - deprecated: false elementType: $ref: '290' name: @@ -1721,7 +1613,6 @@ operations: defaultResponse: $id: '363' isNullable: true - deprecated: false description: >- Checks that the account name has sufficient cowbell (in order to prevent fevers). @@ -1744,7 +1635,6 @@ operations: defaultValue: $id: '345' fixed: false - deprecated: false documentation: $id: '346' fixed: false @@ -1771,7 +1661,6 @@ operations: defaultValue: $id: '349' fixed: false - deprecated: false documentation: $id: '350' fixed: false @@ -1782,7 +1671,6 @@ operations: modelType: $id: '352' $type: PrimaryType - deprecated: false knownPrimaryType: string name: $id: '353' @@ -1800,7 +1688,6 @@ operations: defaultValue: $id: '355' fixed: false - deprecated: false documentation: $id: '356' fixed: false @@ -1814,7 +1701,6 @@ operations: modelType: $id: '358' $type: PrimaryType - deprecated: false knownPrimaryType: string name: $id: '359' @@ -1847,7 +1733,6 @@ operations: defaultResponse: $id: '398' isNullable: true - deprecated: false description: >- Asynchronously creates a new storage account with the specified parameters. Existing accounts cannot be updated with this API and @@ -1875,7 +1760,6 @@ operations: defaultValue: $id: '367' fixed: false - deprecated: false documentation: $id: '368' fixed: false @@ -1886,7 +1770,6 @@ operations: modelType: $id: '370' $type: PrimaryType - deprecated: false knownPrimaryType: string name: $id: '371' @@ -1905,7 +1788,6 @@ operations: defaultValue: $id: '373' fixed: false - deprecated: false documentation: $id: '374' fixed: false @@ -1919,7 +1801,6 @@ operations: modelType: $id: '376' $type: PrimaryType - deprecated: false knownPrimaryType: string name: $id: '377' @@ -1935,7 +1816,6 @@ operations: defaultValue: $id: '379' fixed: false - deprecated: false documentation: $id: '380' fixed: false @@ -1959,7 +1839,6 @@ operations: defaultValue: $id: '383' fixed: false - deprecated: false documentation: $id: '384' fixed: false @@ -1970,7 +1849,6 @@ operations: modelType: $id: '386' $type: PrimaryType - deprecated: false knownPrimaryType: string name: $id: '387' @@ -1988,7 +1866,6 @@ operations: defaultValue: $id: '389' fixed: false - deprecated: false documentation: $id: '390' fixed: false @@ -2002,7 +1879,6 @@ operations: modelType: $id: '392' $type: PrimaryType - deprecated: false knownPrimaryType: string name: $id: '393' @@ -2038,7 +1914,6 @@ operations: defaultResponse: $id: '429' isNullable: true - deprecated: false description: Deletes a storage account in Microsoft Azure. group: $id: '426' @@ -2057,7 +1932,6 @@ operations: defaultValue: $id: '402' fixed: false - deprecated: false documentation: $id: '403' fixed: false @@ -2068,7 +1942,6 @@ operations: modelType: $id: '405' $type: PrimaryType - deprecated: false knownPrimaryType: string name: $id: '406' @@ -2087,7 +1960,6 @@ operations: defaultValue: $id: '408' fixed: false - deprecated: false documentation: $id: '409' fixed: false @@ -2101,7 +1973,6 @@ operations: modelType: $id: '411' $type: PrimaryType - deprecated: false knownPrimaryType: string name: $id: '412' @@ -2119,7 +1990,6 @@ operations: defaultValue: $id: '414' fixed: false - deprecated: false documentation: $id: '415' fixed: false @@ -2130,7 +2000,6 @@ operations: modelType: $id: '417' $type: PrimaryType - deprecated: false knownPrimaryType: string name: $id: '418' @@ -2148,7 +2017,6 @@ operations: defaultValue: $id: '420' fixed: false - deprecated: false documentation: $id: '421' fixed: false @@ -2162,7 +2030,6 @@ operations: modelType: $id: '423' $type: PrimaryType - deprecated: false knownPrimaryType: string name: $id: '424' @@ -2193,7 +2060,6 @@ operations: defaultResponse: $id: '459' isNullable: true - deprecated: false description: >- Returns the properties for the specified storage account including but not limited to name, account type, location, and account status. The @@ -2215,7 +2081,6 @@ operations: defaultValue: $id: '433' fixed: false - deprecated: false documentation: $id: '434' fixed: false @@ -2226,7 +2091,6 @@ operations: modelType: $id: '436' $type: PrimaryType - deprecated: false knownPrimaryType: string name: $id: '437' @@ -2245,7 +2109,6 @@ operations: defaultValue: $id: '439' fixed: false - deprecated: false documentation: $id: '440' fixed: false @@ -2259,7 +2122,6 @@ operations: modelType: $id: '442' $type: PrimaryType - deprecated: false knownPrimaryType: string name: $id: '443' @@ -2277,7 +2139,6 @@ operations: defaultValue: $id: '445' fixed: false - deprecated: false documentation: $id: '446' fixed: false @@ -2288,7 +2149,6 @@ operations: modelType: $id: '448' $type: PrimaryType - deprecated: false knownPrimaryType: string name: $id: '449' @@ -2306,7 +2166,6 @@ operations: defaultValue: $id: '451' fixed: false - deprecated: false documentation: $id: '452' fixed: false @@ -2320,7 +2179,6 @@ operations: modelType: $id: '454' $type: PrimaryType - deprecated: false knownPrimaryType: string name: $id: '455' @@ -2353,7 +2211,6 @@ operations: defaultResponse: $id: '493' isNullable: true - deprecated: false description: >- Updates the account type or tags for a storage account. It can also be used to add a custom domain (note that custom domains cannot be added @@ -2387,7 +2244,6 @@ operations: defaultValue: $id: '463' fixed: false - deprecated: false documentation: $id: '464' fixed: false @@ -2398,7 +2254,6 @@ operations: modelType: $id: '466' $type: PrimaryType - deprecated: false knownPrimaryType: string name: $id: '467' @@ -2417,7 +2272,6 @@ operations: defaultValue: $id: '469' fixed: false - deprecated: false documentation: $id: '470' fixed: false @@ -2431,7 +2285,6 @@ operations: modelType: $id: '472' $type: PrimaryType - deprecated: false knownPrimaryType: string name: $id: '473' @@ -2447,7 +2300,6 @@ operations: defaultValue: $id: '475' fixed: false - deprecated: false documentation: $id: '476' fixed: false @@ -2473,7 +2325,6 @@ operations: defaultValue: $id: '479' fixed: false - deprecated: false documentation: $id: '480' fixed: false @@ -2484,7 +2335,6 @@ operations: modelType: $id: '482' $type: PrimaryType - deprecated: false knownPrimaryType: string name: $id: '483' @@ -2502,7 +2352,6 @@ operations: defaultValue: $id: '485' fixed: false - deprecated: false documentation: $id: '486' fixed: false @@ -2516,7 +2365,6 @@ operations: modelType: $id: '488' $type: PrimaryType - deprecated: false knownPrimaryType: string name: $id: '489' @@ -2549,7 +2397,6 @@ operations: defaultResponse: $id: '523' isNullable: true - deprecated: false description: Lists the access keys for the specified storage account. group: $id: '521' @@ -2568,7 +2415,6 @@ operations: defaultValue: $id: '497' fixed: false - deprecated: false documentation: $id: '498' fixed: false @@ -2579,7 +2425,6 @@ operations: modelType: $id: '500' $type: PrimaryType - deprecated: false knownPrimaryType: string name: $id: '501' @@ -2598,7 +2443,6 @@ operations: defaultValue: $id: '503' fixed: false - deprecated: false documentation: $id: '504' fixed: false @@ -2609,7 +2453,6 @@ operations: modelType: $id: '506' $type: PrimaryType - deprecated: false knownPrimaryType: string name: $id: '507' @@ -2627,7 +2470,6 @@ operations: defaultValue: $id: '509' fixed: false - deprecated: false documentation: $id: '510' fixed: false @@ -2638,7 +2480,6 @@ operations: modelType: $id: '512' $type: PrimaryType - deprecated: false knownPrimaryType: string name: $id: '513' @@ -2656,7 +2497,6 @@ operations: defaultValue: $id: '515' fixed: false - deprecated: false documentation: $id: '516' fixed: false @@ -2670,7 +2510,6 @@ operations: modelType: $id: '518' $type: PrimaryType - deprecated: false knownPrimaryType: string name: $id: '519' @@ -2703,7 +2542,6 @@ operations: defaultResponse: $id: '541' isNullable: true - deprecated: false description: >- Lists all the storage accounts available under the subscription. Note that storage keys are not returned; use the ListKeys operation for @@ -2730,7 +2568,6 @@ operations: defaultValue: $id: '527' fixed: false - deprecated: false documentation: $id: '528' fixed: false @@ -2741,7 +2578,6 @@ operations: modelType: $id: '530' $type: PrimaryType - deprecated: false knownPrimaryType: string name: $id: '531' @@ -2759,7 +2595,6 @@ operations: defaultValue: $id: '533' fixed: false - deprecated: false documentation: $id: '534' fixed: false @@ -2773,7 +2608,6 @@ operations: modelType: $id: '536' $type: PrimaryType - deprecated: false knownPrimaryType: string name: $id: '537' @@ -2806,7 +2640,6 @@ operations: defaultResponse: $id: '565' isNullable: true - deprecated: false description: >- Lists all the storage accounts available under the given resource group. Note that storage keys are not returned; use the ListKeys @@ -2831,7 +2664,6 @@ operations: defaultValue: $id: '545' fixed: false - deprecated: false documentation: $id: '546' fixed: false @@ -2842,7 +2674,6 @@ operations: modelType: $id: '548' $type: PrimaryType - deprecated: false knownPrimaryType: string name: $id: '549' @@ -2860,7 +2691,6 @@ operations: defaultValue: $id: '551' fixed: false - deprecated: false documentation: $id: '552' fixed: false @@ -2871,7 +2701,6 @@ operations: modelType: $id: '554' $type: PrimaryType - deprecated: false knownPrimaryType: string name: $id: '555' @@ -2889,7 +2718,6 @@ operations: defaultValue: $id: '557' fixed: false - deprecated: false documentation: $id: '558' fixed: false @@ -2903,7 +2731,6 @@ operations: modelType: $id: '560' $type: PrimaryType - deprecated: false knownPrimaryType: string name: $id: '561' @@ -2936,7 +2763,6 @@ operations: defaultResponse: $id: '599' isNullable: true - deprecated: false description: Regenerates the access keys for the specified storage account. extensions: x-ms-requestBody-index: '2' @@ -2957,7 +2783,6 @@ operations: defaultValue: $id: '569' fixed: false - deprecated: false documentation: $id: '570' fixed: false @@ -2968,7 +2793,6 @@ operations: modelType: $id: '572' $type: PrimaryType - deprecated: false knownPrimaryType: string name: $id: '573' @@ -2987,7 +2811,6 @@ operations: defaultValue: $id: '575' fixed: false - deprecated: false documentation: $id: '576' fixed: false @@ -3001,7 +2824,6 @@ operations: modelType: $id: '578' $type: PrimaryType - deprecated: false knownPrimaryType: string name: $id: '579' @@ -3017,7 +2839,6 @@ operations: defaultValue: $id: '581' fixed: false - deprecated: false documentation: $id: '582' fixed: false @@ -3043,7 +2864,6 @@ operations: defaultValue: $id: '585' fixed: false - deprecated: false documentation: $id: '586' fixed: false @@ -3054,7 +2874,6 @@ operations: modelType: $id: '588' $type: PrimaryType - deprecated: false knownPrimaryType: string name: $id: '589' @@ -3072,7 +2891,6 @@ operations: defaultValue: $id: '591' fixed: false - deprecated: false documentation: $id: '592' fixed: false @@ -3086,7 +2904,6 @@ operations: modelType: $id: '594' $type: PrimaryType - deprecated: false knownPrimaryType: string name: $id: '595' @@ -3135,7 +2952,6 @@ operations: "$id": "345", "fixed": false }, - "deprecated": false, "documentation": { "$id": "346", "fixed": false, @@ -3167,7 +2983,6 @@ operations: "$id": "349", "fixed": false }, - "deprecated": false, "documentation": { "$id": "350", "fixed": false, @@ -3190,7 +3005,6 @@ operations: "fixed": false, "raw": "String" }, - "deprecated": false } }, { @@ -3204,7 +3018,6 @@ operations: "$id": "355", "fixed": false }, - "deprecated": false, "documentation": { "$id": "356", "fixed": false, @@ -3227,7 +3040,6 @@ operations: "fixed": false, "raw": "String" }, - "deprecated": false } } ], @@ -3274,7 +3086,6 @@ operations: "extensions": { "x-ms-requestBody-index": "0" }, - "deprecated": false, "hidden": false }, { @@ -3288,7 +3099,6 @@ operations: "$id": "367", "fixed": false }, - "deprecated": false, "documentation": { "$id": "368", "fixed": false, @@ -3311,7 +3121,6 @@ operations: "fixed": false, "raw": "String" }, - "deprecated": false } }, { @@ -3326,7 +3135,6 @@ operations: "$id": "373", "fixed": false }, - "deprecated": false, "documentation": { "$id": "374", "fixed": false, @@ -3349,7 +3157,6 @@ operations: "fixed": false, "raw": "String" }, - "deprecated": false } }, { @@ -3360,7 +3167,6 @@ operations: "$id": "379", "fixed": false }, - "deprecated": false, "documentation": { "$id": "380", "fixed": false, @@ -3392,7 +3198,6 @@ operations: "$id": "383", "fixed": false }, - "deprecated": false, "documentation": { "$id": "384", "fixed": false, @@ -3415,7 +3220,6 @@ operations: "fixed": false, "raw": "String" }, - "deprecated": false } }, { @@ -3429,7 +3233,6 @@ operations: "$id": "389", "fixed": false }, - "deprecated": false, "documentation": { "$id": "390", "fixed": false, @@ -3452,7 +3255,6 @@ operations: "fixed": false, "raw": "String" }, - "deprecated": false } } ], @@ -3504,7 +3306,6 @@ operations: "x-ms-long-running-operation": true, "x-ms-requestBody-index": "2" }, - "deprecated": false, "hidden": false }, { @@ -3518,7 +3319,6 @@ operations: "$id": "402", "fixed": false }, - "deprecated": false, "documentation": { "$id": "403", "fixed": false, @@ -3541,7 +3341,6 @@ operations: "fixed": false, "raw": "String" }, - "deprecated": false } }, { @@ -3556,7 +3355,6 @@ operations: "$id": "408", "fixed": false }, - "deprecated": false, "documentation": { "$id": "409", "fixed": false, @@ -3579,7 +3377,6 @@ operations: "fixed": false, "raw": "String" }, - "deprecated": false } }, { @@ -3593,7 +3390,6 @@ operations: "$id": "414", "fixed": false }, - "deprecated": false, "documentation": { "$id": "415", "fixed": false, @@ -3616,7 +3412,6 @@ operations: "fixed": false, "raw": "String" }, - "deprecated": false } }, { @@ -3630,7 +3425,6 @@ operations: "$id": "420", "fixed": false }, - "deprecated": false, "documentation": { "$id": "421", "fixed": false, @@ -3653,7 +3447,6 @@ operations: "fixed": false, "raw": "String" }, - "deprecated": false } } ], @@ -3694,7 +3487,6 @@ operations: "responseContentTypes": [ "application/json" ], - "deprecated": false, "hidden": false }, { @@ -3708,7 +3500,6 @@ operations: "$id": "433", "fixed": false }, - "deprecated": false, "documentation": { "$id": "434", "fixed": false, @@ -3731,7 +3522,6 @@ operations: "fixed": false, "raw": "String" }, - "deprecated": false } }, { @@ -3746,7 +3536,6 @@ operations: "$id": "439", "fixed": false }, - "deprecated": false, "documentation": { "$id": "440", "fixed": false, @@ -3769,7 +3558,6 @@ operations: "fixed": false, "raw": "String" }, - "deprecated": false } }, { @@ -3783,7 +3571,6 @@ operations: "$id": "445", "fixed": false }, - "deprecated": false, "documentation": { "$id": "446", "fixed": false, @@ -3806,7 +3593,6 @@ operations: "fixed": false, "raw": "String" }, - "deprecated": false } }, { @@ -3820,7 +3606,6 @@ operations: "$id": "451", "fixed": false }, - "deprecated": false, "documentation": { "$id": "452", "fixed": false, @@ -3843,7 +3628,6 @@ operations: "fixed": false, "raw": "String" }, - "deprecated": false } } ], @@ -3887,7 +3671,6 @@ operations: "application/json", "text/json" ], - "deprecated": false, "hidden": false }, { @@ -3901,7 +3684,6 @@ operations: "$id": "463", "fixed": false }, - "deprecated": false, "documentation": { "$id": "464", "fixed": false, @@ -3924,7 +3706,6 @@ operations: "fixed": false, "raw": "String" }, - "deprecated": false } }, { @@ -3939,7 +3720,6 @@ operations: "$id": "469", "fixed": false }, - "deprecated": false, "documentation": { "$id": "470", "fixed": false, @@ -3962,7 +3742,6 @@ operations: "fixed": false, "raw": "String" }, - "deprecated": false } }, { @@ -3973,7 +3752,6 @@ operations: "$id": "475", "fixed": false }, - "deprecated": false, "documentation": { "$id": "476", "fixed": false, @@ -4005,7 +3783,6 @@ operations: "$id": "479", "fixed": false }, - "deprecated": false, "documentation": { "$id": "480", "fixed": false, @@ -4028,7 +3805,6 @@ operations: "fixed": false, "raw": "String" }, - "deprecated": false } }, { @@ -4042,7 +3818,6 @@ operations: "$id": "485", "fixed": false }, - "deprecated": false, "documentation": { "$id": "486", "fixed": false, @@ -4065,7 +3840,6 @@ operations: "fixed": false, "raw": "String" }, - "deprecated": false } } ], @@ -4112,7 +3886,6 @@ operations: "extensions": { "x-ms-requestBody-index": "2" }, - "deprecated": false, "hidden": false }, { @@ -4126,7 +3899,6 @@ operations: "$id": "497", "fixed": false }, - "deprecated": false, "documentation": { "$id": "498", "fixed": false, @@ -4149,7 +3921,6 @@ operations: "fixed": false, "raw": "String" }, - "deprecated": false } }, { @@ -4164,7 +3935,6 @@ operations: "$id": "503", "fixed": false }, - "deprecated": false, "documentation": { "$id": "504", "fixed": false, @@ -4187,7 +3957,6 @@ operations: "fixed": false, "raw": "String" }, - "deprecated": false } }, { @@ -4201,7 +3970,6 @@ operations: "$id": "509", "fixed": false }, - "deprecated": false, "documentation": { "$id": "510", "fixed": false, @@ -4224,7 +3992,6 @@ operations: "fixed": false, "raw": "String" }, - "deprecated": false } }, { @@ -4238,7 +4005,6 @@ operations: "$id": "515", "fixed": false }, - "deprecated": false, "documentation": { "$id": "516", "fixed": false, @@ -4261,7 +4027,6 @@ operations: "fixed": false, "raw": "String" }, - "deprecated": false } } ], @@ -4305,7 +4070,6 @@ operations: "application/json", "text/json" ], - "deprecated": false, "hidden": false }, { @@ -4322,7 +4086,6 @@ operations: "$id": "527", "fixed": false }, - "deprecated": false, "documentation": { "$id": "528", "fixed": false, @@ -4345,7 +4108,6 @@ operations: "fixed": false, "raw": "String" }, - "deprecated": false } }, { @@ -4359,7 +4121,6 @@ operations: "$id": "533", "fixed": false }, - "deprecated": false, "documentation": { "$id": "534", "fixed": false, @@ -4382,7 +4143,6 @@ operations: "fixed": false, "raw": "String" }, - "deprecated": false } } ], @@ -4431,7 +4191,6 @@ operations: "nextLinkName": null } }, - "deprecated": false, "hidden": false }, { @@ -4445,7 +4204,6 @@ operations: "$id": "545", "fixed": false }, - "deprecated": false, "documentation": { "$id": "546", "fixed": false, @@ -4468,7 +4226,6 @@ operations: "fixed": false, "raw": "String" }, - "deprecated": false } }, { @@ -4482,7 +4239,6 @@ operations: "$id": "551", "fixed": false }, - "deprecated": false, "documentation": { "$id": "552", "fixed": false, @@ -4505,7 +4261,6 @@ operations: "fixed": false, "raw": "String" }, - "deprecated": false } }, { @@ -4519,7 +4274,6 @@ operations: "$id": "557", "fixed": false }, - "deprecated": false, "documentation": { "$id": "558", "fixed": false, @@ -4542,7 +4296,6 @@ operations: "fixed": false, "raw": "String" }, - "deprecated": false } } ], @@ -4591,7 +4344,6 @@ operations: "nextLinkName": null } }, - "deprecated": false, "hidden": false }, { @@ -4605,7 +4357,6 @@ operations: "$id": "569", "fixed": false }, - "deprecated": false, "documentation": { "$id": "570", "fixed": false, @@ -4628,7 +4379,6 @@ operations: "fixed": false, "raw": "String" }, - "deprecated": false } }, { @@ -4643,7 +4393,6 @@ operations: "$id": "575", "fixed": false }, - "deprecated": false, "documentation": { "$id": "576", "fixed": false, @@ -4666,7 +4415,6 @@ operations: "fixed": false, "raw": "String" }, - "deprecated": false } }, { @@ -4677,7 +4425,6 @@ operations: "$id": "581", "fixed": false }, - "deprecated": false, "documentation": { "$id": "582", "fixed": false, @@ -4709,7 +4456,6 @@ operations: "$id": "585", "fixed": false }, - "deprecated": false, "documentation": { "$id": "586", "fixed": false, @@ -4732,7 +4478,6 @@ operations: "fixed": false, "raw": "String" }, - "deprecated": false } }, { @@ -4746,7 +4491,6 @@ operations: "$id": "591", "fixed": false }, - "deprecated": false, "documentation": { "$id": "592", "fixed": false, @@ -4769,7 +4513,6 @@ operations: "fixed": false, "raw": "String" }, - "deprecated": false } } ], @@ -4816,7 +4559,6 @@ operations: "extensions": { "x-ms-requestBody-index": "2" }, - "deprecated": false, "hidden": false } ], @@ -4840,7 +4582,6 @@ operations: defaultResponse: $id: '620' isNullable: true - deprecated: false description: >- Gets the current usage count and the limit for the resources under the subscription. @@ -4866,7 +4607,6 @@ operations: defaultValue: $id: '606' fixed: false - deprecated: false documentation: $id: '607' fixed: false @@ -4877,7 +4617,6 @@ operations: modelType: $id: '609' $type: PrimaryType - deprecated: false knownPrimaryType: string name: $id: '610' @@ -4895,7 +4634,6 @@ operations: defaultValue: $id: '612' fixed: false - deprecated: false documentation: $id: '613' fixed: false @@ -4909,7 +4647,6 @@ operations: modelType: $id: '615' $type: PrimaryType - deprecated: false knownPrimaryType: string name: $id: '616' @@ -4960,7 +4697,6 @@ operations: "$id": "606", "fixed": false }, - "deprecated": false, "documentation": { "$id": "607", "fixed": false, @@ -4983,7 +4719,6 @@ operations: "fixed": false, "raw": "String" }, - "deprecated": false } }, { @@ -4997,7 +4732,6 @@ operations: "$id": "612", "fixed": false }, - "deprecated": false, "documentation": { "$id": "613", "fixed": false, @@ -5020,7 +4754,6 @@ operations: "fixed": false, "raw": "String" }, - "deprecated": false } } ], @@ -5069,7 +4802,6 @@ operations: "nextLinkName": null } }, - "deprecated": false, "hidden": false } ], @@ -5093,7 +4825,6 @@ properties: defaultValue: $id: '331' fixed: false - deprecated: false documentation: $id: '332' fixed: false @@ -5107,7 +4838,6 @@ properties: modelType: $id: '334' $type: PrimaryType - deprecated: false knownPrimaryType: string name: $id: '335' @@ -5125,7 +4855,6 @@ properties: defaultValue: $id: '337' fixed: false - deprecated: false documentation: $id: '338' fixed: false @@ -5136,7 +4865,6 @@ properties: modelType: $id: '340' $type: PrimaryType - deprecated: false knownPrimaryType: string name: $id: '341' diff --git a/Samples/3b-custom-transformations/generated/configuration.yaml b/Samples/3b-custom-transformations/generated/configuration.yaml index 393f081042..3dec0ef632 100644 --- a/Samples/3b-custom-transformations/generated/configuration.yaml +++ b/Samples/3b-custom-transformations/generated/configuration.yaml @@ -286,7 +286,12 @@ scope-swagger-document/emitter: ($config.namespace ? $config.namespace.replace(/:/g,'_') : undefined) || $config["input-file"][0].split('/').reverse()[0].split('\\').reverse()[0].replace(/\.json$/, - "") + "") +scope-cm/emitter: + input-artifact: code-model-v1 + is-object: true + output-uri-expr: | + "code-model-v1" scope-openapi-document/emitter: input-artifact: openapi-document is-object: true @@ -297,11 +302,6 @@ scope-openapi-document/emitter: $config["input-file"][0].split('/').reverse()[0].split('\\').reverse()[0].replace(/\.json$/, "") -scope-cm/emitter: - input-artifact: code-model-v1 - is-object: true - output-uri-expr: | - "code-model-v1" client-side-validation: true declare-directive: set: '{ transform: `return ${JSON.stringify($)}` }' @@ -368,6 +368,8 @@ used-extension: - '["@microsoft.azure/classic-openapi-validator","~1.0.9"]' - '["@microsoft.azure/openapi-validator","~1.0.2"]' - '["@microsoft.azure/autorest.modeler","2.3.55"]' +skip-simplifier-on-namespace: + - System.Security.Permissions scope-csharp/emitter: input-artifact: source-file-csharp scope-jsonrpcclient/emitter: diff --git a/Samples/3c-guards/OtherClient/StorageAccounts.java b/Samples/3c-guards/OtherClient/src/main/java/StorageAccounts.java similarity index 100% rename from Samples/3c-guards/OtherClient/StorageAccounts.java rename to Samples/3c-guards/OtherClient/src/main/java/StorageAccounts.java diff --git a/Samples/3c-guards/OtherClient/StorageManagementClient.java b/Samples/3c-guards/OtherClient/src/main/java/StorageManagementClient.java similarity index 100% rename from Samples/3c-guards/OtherClient/StorageManagementClient.java rename to Samples/3c-guards/OtherClient/src/main/java/StorageManagementClient.java diff --git a/Samples/3c-guards/OtherClient/Usages.java b/Samples/3c-guards/OtherClient/src/main/java/Usages.java similarity index 100% rename from Samples/3c-guards/OtherClient/Usages.java rename to Samples/3c-guards/OtherClient/src/main/java/Usages.java diff --git a/Samples/3c-guards/OtherClient/implementation/StorageAccountsImpl.java b/Samples/3c-guards/OtherClient/src/main/java/implementation/StorageAccountsImpl.java similarity index 100% rename from Samples/3c-guards/OtherClient/implementation/StorageAccountsImpl.java rename to Samples/3c-guards/OtherClient/src/main/java/implementation/StorageAccountsImpl.java diff --git a/Samples/3c-guards/OtherClient/implementation/StorageManagementClientImpl.java b/Samples/3c-guards/OtherClient/src/main/java/implementation/StorageManagementClientImpl.java similarity index 100% rename from Samples/3c-guards/OtherClient/implementation/StorageManagementClientImpl.java rename to Samples/3c-guards/OtherClient/src/main/java/implementation/StorageManagementClientImpl.java diff --git a/Samples/3c-guards/OtherClient/implementation/UsagesImpl.java b/Samples/3c-guards/OtherClient/src/main/java/implementation/UsagesImpl.java similarity index 100% rename from Samples/3c-guards/OtherClient/implementation/UsagesImpl.java rename to Samples/3c-guards/OtherClient/src/main/java/implementation/UsagesImpl.java diff --git a/Samples/3c-guards/OtherClient/models/package-info.java b/Samples/3c-guards/OtherClient/src/main/java/implementation/package-info.java similarity index 100% rename from Samples/3c-guards/OtherClient/models/package-info.java rename to Samples/3c-guards/OtherClient/src/main/java/implementation/package-info.java diff --git a/Samples/3c-guards/OtherClient/models/AccountStatus.java b/Samples/3c-guards/OtherClient/src/main/java/models/AccountStatus.java similarity index 100% rename from Samples/3c-guards/OtherClient/models/AccountStatus.java rename to Samples/3c-guards/OtherClient/src/main/java/models/AccountStatus.java diff --git a/Samples/3c-guards/OtherClient/models/AccountType.java b/Samples/3c-guards/OtherClient/src/main/java/models/AccountType.java similarity index 100% rename from Samples/3c-guards/OtherClient/models/AccountType.java rename to Samples/3c-guards/OtherClient/src/main/java/models/AccountType.java diff --git a/Samples/3c-guards/OtherClient/models/CheckNameAvailabilityResult.java b/Samples/3c-guards/OtherClient/src/main/java/models/CheckNameAvailabilityResult.java similarity index 100% rename from Samples/3c-guards/OtherClient/models/CheckNameAvailabilityResult.java rename to Samples/3c-guards/OtherClient/src/main/java/models/CheckNameAvailabilityResult.java diff --git a/Samples/3c-guards/OtherClient/models/CustomDomain.java b/Samples/3c-guards/OtherClient/src/main/java/models/CustomDomain.java similarity index 100% rename from Samples/3c-guards/OtherClient/models/CustomDomain.java rename to Samples/3c-guards/OtherClient/src/main/java/models/CustomDomain.java diff --git a/Samples/3c-guards/OtherClient/models/Endpoints.java b/Samples/3c-guards/OtherClient/src/main/java/models/Endpoints.java similarity index 100% rename from Samples/3c-guards/OtherClient/models/Endpoints.java rename to Samples/3c-guards/OtherClient/src/main/java/models/Endpoints.java diff --git a/Samples/3c-guards/OtherClient/models/ProvisioningState.java b/Samples/3c-guards/OtherClient/src/main/java/models/ProvisioningState.java similarity index 100% rename from Samples/3c-guards/OtherClient/models/ProvisioningState.java rename to Samples/3c-guards/OtherClient/src/main/java/models/ProvisioningState.java diff --git a/Samples/3c-guards/OtherClient/models/Reason.java b/Samples/3c-guards/OtherClient/src/main/java/models/Reason.java similarity index 100% rename from Samples/3c-guards/OtherClient/models/Reason.java rename to Samples/3c-guards/OtherClient/src/main/java/models/Reason.java diff --git a/Samples/3c-guards/OtherClient/models/Resource.java b/Samples/3c-guards/OtherClient/src/main/java/models/Resource.java similarity index 100% rename from Samples/3c-guards/OtherClient/models/Resource.java rename to Samples/3c-guards/OtherClient/src/main/java/models/Resource.java diff --git a/Samples/3c-guards/OtherClient/models/StorageAccount.java b/Samples/3c-guards/OtherClient/src/main/java/models/StorageAccount.java similarity index 100% rename from Samples/3c-guards/OtherClient/models/StorageAccount.java rename to Samples/3c-guards/OtherClient/src/main/java/models/StorageAccount.java diff --git a/Samples/3c-guards/OtherClient/models/StorageAccountCheckNameAvailabilityParameters.java b/Samples/3c-guards/OtherClient/src/main/java/models/StorageAccountCheckNameAvailabilityParameters.java similarity index 100% rename from Samples/3c-guards/OtherClient/models/StorageAccountCheckNameAvailabilityParameters.java rename to Samples/3c-guards/OtherClient/src/main/java/models/StorageAccountCheckNameAvailabilityParameters.java diff --git a/Samples/3c-guards/OtherClient/models/StorageAccountCreateParameters.java b/Samples/3c-guards/OtherClient/src/main/java/models/StorageAccountCreateParameters.java similarity index 100% rename from Samples/3c-guards/OtherClient/models/StorageAccountCreateParameters.java rename to Samples/3c-guards/OtherClient/src/main/java/models/StorageAccountCreateParameters.java diff --git a/Samples/3c-guards/OtherClient/models/StorageAccountKeys.java b/Samples/3c-guards/OtherClient/src/main/java/models/StorageAccountKeys.java similarity index 100% rename from Samples/3c-guards/OtherClient/models/StorageAccountKeys.java rename to Samples/3c-guards/OtherClient/src/main/java/models/StorageAccountKeys.java diff --git a/Samples/3c-guards/OtherClient/models/StorageAccountListResult.java b/Samples/3c-guards/OtherClient/src/main/java/models/StorageAccountListResult.java similarity index 100% rename from Samples/3c-guards/OtherClient/models/StorageAccountListResult.java rename to Samples/3c-guards/OtherClient/src/main/java/models/StorageAccountListResult.java diff --git a/Samples/3c-guards/OtherClient/models/StorageAccountRegenerateKeyParameters.java b/Samples/3c-guards/OtherClient/src/main/java/models/StorageAccountRegenerateKeyParameters.java similarity index 100% rename from Samples/3c-guards/OtherClient/models/StorageAccountRegenerateKeyParameters.java rename to Samples/3c-guards/OtherClient/src/main/java/models/StorageAccountRegenerateKeyParameters.java diff --git a/Samples/3c-guards/OtherClient/models/StorageAccountUpdateParameters.java b/Samples/3c-guards/OtherClient/src/main/java/models/StorageAccountUpdateParameters.java similarity index 100% rename from Samples/3c-guards/OtherClient/models/StorageAccountUpdateParameters.java rename to Samples/3c-guards/OtherClient/src/main/java/models/StorageAccountUpdateParameters.java diff --git a/Samples/3c-guards/OtherClient/models/Usage.java b/Samples/3c-guards/OtherClient/src/main/java/models/Usage.java similarity index 100% rename from Samples/3c-guards/OtherClient/models/Usage.java rename to Samples/3c-guards/OtherClient/src/main/java/models/Usage.java diff --git a/Samples/3c-guards/OtherClient/models/UsageListResult.java b/Samples/3c-guards/OtherClient/src/main/java/models/UsageListResult.java similarity index 100% rename from Samples/3c-guards/OtherClient/models/UsageListResult.java rename to Samples/3c-guards/OtherClient/src/main/java/models/UsageListResult.java diff --git a/Samples/3c-guards/OtherClient/models/UsageName.java b/Samples/3c-guards/OtherClient/src/main/java/models/UsageName.java similarity index 100% rename from Samples/3c-guards/OtherClient/models/UsageName.java rename to Samples/3c-guards/OtherClient/src/main/java/models/UsageName.java diff --git a/Samples/3c-guards/OtherClient/models/UsageUnit.java b/Samples/3c-guards/OtherClient/src/main/java/models/UsageUnit.java similarity index 100% rename from Samples/3c-guards/OtherClient/models/UsageUnit.java rename to Samples/3c-guards/OtherClient/src/main/java/models/UsageUnit.java diff --git a/Samples/3c-guards/OtherClient/package-info.java b/Samples/3c-guards/OtherClient/src/main/java/models/package-info.java similarity index 100% rename from Samples/3c-guards/OtherClient/package-info.java rename to Samples/3c-guards/OtherClient/src/main/java/models/package-info.java diff --git a/Samples/3e-batch-mode/output2/implementation/package-info.java b/Samples/3c-guards/OtherClient/src/main/java/package-info.java similarity index 100% rename from Samples/3e-batch-mode/output2/implementation/package-info.java rename to Samples/3c-guards/OtherClient/src/main/java/package-info.java diff --git a/Samples/3e-batch-mode/output2/StorageAccounts.java b/Samples/3e-batch-mode/output2/src/main/java/StorageAccounts.java similarity index 100% rename from Samples/3e-batch-mode/output2/StorageAccounts.java rename to Samples/3e-batch-mode/output2/src/main/java/StorageAccounts.java diff --git a/Samples/3e-batch-mode/output2/StorageManagementClient.java b/Samples/3e-batch-mode/output2/src/main/java/StorageManagementClient.java similarity index 100% rename from Samples/3e-batch-mode/output2/StorageManagementClient.java rename to Samples/3e-batch-mode/output2/src/main/java/StorageManagementClient.java diff --git a/Samples/3e-batch-mode/output2/Usages.java b/Samples/3e-batch-mode/output2/src/main/java/Usages.java similarity index 100% rename from Samples/3e-batch-mode/output2/Usages.java rename to Samples/3e-batch-mode/output2/src/main/java/Usages.java diff --git a/Samples/3e-batch-mode/output2/implementation/StorageAccountsImpl.java b/Samples/3e-batch-mode/output2/src/main/java/implementation/StorageAccountsImpl.java similarity index 100% rename from Samples/3e-batch-mode/output2/implementation/StorageAccountsImpl.java rename to Samples/3e-batch-mode/output2/src/main/java/implementation/StorageAccountsImpl.java diff --git a/Samples/3e-batch-mode/output2/implementation/StorageManagementClientImpl.java b/Samples/3e-batch-mode/output2/src/main/java/implementation/StorageManagementClientImpl.java similarity index 100% rename from Samples/3e-batch-mode/output2/implementation/StorageManagementClientImpl.java rename to Samples/3e-batch-mode/output2/src/main/java/implementation/StorageManagementClientImpl.java diff --git a/Samples/3e-batch-mode/output2/implementation/UsagesImpl.java b/Samples/3e-batch-mode/output2/src/main/java/implementation/UsagesImpl.java similarity index 100% rename from Samples/3e-batch-mode/output2/implementation/UsagesImpl.java rename to Samples/3e-batch-mode/output2/src/main/java/implementation/UsagesImpl.java diff --git a/Samples/3e-batch-mode/output2/models/package-info.java b/Samples/3e-batch-mode/output2/src/main/java/implementation/package-info.java similarity index 100% rename from Samples/3e-batch-mode/output2/models/package-info.java rename to Samples/3e-batch-mode/output2/src/main/java/implementation/package-info.java diff --git a/Samples/3e-batch-mode/output2/models/AccountStatus.java b/Samples/3e-batch-mode/output2/src/main/java/models/AccountStatus.java similarity index 100% rename from Samples/3e-batch-mode/output2/models/AccountStatus.java rename to Samples/3e-batch-mode/output2/src/main/java/models/AccountStatus.java diff --git a/Samples/3e-batch-mode/output2/models/AccountType.java b/Samples/3e-batch-mode/output2/src/main/java/models/AccountType.java similarity index 100% rename from Samples/3e-batch-mode/output2/models/AccountType.java rename to Samples/3e-batch-mode/output2/src/main/java/models/AccountType.java diff --git a/Samples/3e-batch-mode/output2/models/CheckNameAvailabilityResult.java b/Samples/3e-batch-mode/output2/src/main/java/models/CheckNameAvailabilityResult.java similarity index 100% rename from Samples/3e-batch-mode/output2/models/CheckNameAvailabilityResult.java rename to Samples/3e-batch-mode/output2/src/main/java/models/CheckNameAvailabilityResult.java diff --git a/Samples/3e-batch-mode/output2/models/CustomDomain.java b/Samples/3e-batch-mode/output2/src/main/java/models/CustomDomain.java similarity index 100% rename from Samples/3e-batch-mode/output2/models/CustomDomain.java rename to Samples/3e-batch-mode/output2/src/main/java/models/CustomDomain.java diff --git a/Samples/3e-batch-mode/output2/models/Endpoints.java b/Samples/3e-batch-mode/output2/src/main/java/models/Endpoints.java similarity index 100% rename from Samples/3e-batch-mode/output2/models/Endpoints.java rename to Samples/3e-batch-mode/output2/src/main/java/models/Endpoints.java diff --git a/Samples/3e-batch-mode/output2/models/ProvisioningState.java b/Samples/3e-batch-mode/output2/src/main/java/models/ProvisioningState.java similarity index 100% rename from Samples/3e-batch-mode/output2/models/ProvisioningState.java rename to Samples/3e-batch-mode/output2/src/main/java/models/ProvisioningState.java diff --git a/Samples/3e-batch-mode/output2/models/Reason.java b/Samples/3e-batch-mode/output2/src/main/java/models/Reason.java similarity index 100% rename from Samples/3e-batch-mode/output2/models/Reason.java rename to Samples/3e-batch-mode/output2/src/main/java/models/Reason.java diff --git a/Samples/3e-batch-mode/output2/models/Resource.java b/Samples/3e-batch-mode/output2/src/main/java/models/Resource.java similarity index 100% rename from Samples/3e-batch-mode/output2/models/Resource.java rename to Samples/3e-batch-mode/output2/src/main/java/models/Resource.java diff --git a/Samples/3e-batch-mode/output2/models/StorageAccount.java b/Samples/3e-batch-mode/output2/src/main/java/models/StorageAccount.java similarity index 100% rename from Samples/3e-batch-mode/output2/models/StorageAccount.java rename to Samples/3e-batch-mode/output2/src/main/java/models/StorageAccount.java diff --git a/Samples/3e-batch-mode/output2/models/StorageAccountCheckNameAvailabilityParameters.java b/Samples/3e-batch-mode/output2/src/main/java/models/StorageAccountCheckNameAvailabilityParameters.java similarity index 100% rename from Samples/3e-batch-mode/output2/models/StorageAccountCheckNameAvailabilityParameters.java rename to Samples/3e-batch-mode/output2/src/main/java/models/StorageAccountCheckNameAvailabilityParameters.java diff --git a/Samples/3e-batch-mode/output2/models/StorageAccountCreateParameters.java b/Samples/3e-batch-mode/output2/src/main/java/models/StorageAccountCreateParameters.java similarity index 100% rename from Samples/3e-batch-mode/output2/models/StorageAccountCreateParameters.java rename to Samples/3e-batch-mode/output2/src/main/java/models/StorageAccountCreateParameters.java diff --git a/Samples/3e-batch-mode/output2/models/StorageAccountKeys.java b/Samples/3e-batch-mode/output2/src/main/java/models/StorageAccountKeys.java similarity index 100% rename from Samples/3e-batch-mode/output2/models/StorageAccountKeys.java rename to Samples/3e-batch-mode/output2/src/main/java/models/StorageAccountKeys.java diff --git a/Samples/3e-batch-mode/output2/models/StorageAccountListResult.java b/Samples/3e-batch-mode/output2/src/main/java/models/StorageAccountListResult.java similarity index 100% rename from Samples/3e-batch-mode/output2/models/StorageAccountListResult.java rename to Samples/3e-batch-mode/output2/src/main/java/models/StorageAccountListResult.java diff --git a/Samples/3e-batch-mode/output2/models/StorageAccountRegenerateKeyParameters.java b/Samples/3e-batch-mode/output2/src/main/java/models/StorageAccountRegenerateKeyParameters.java similarity index 100% rename from Samples/3e-batch-mode/output2/models/StorageAccountRegenerateKeyParameters.java rename to Samples/3e-batch-mode/output2/src/main/java/models/StorageAccountRegenerateKeyParameters.java diff --git a/Samples/3e-batch-mode/output2/models/StorageAccountUpdateParameters.java b/Samples/3e-batch-mode/output2/src/main/java/models/StorageAccountUpdateParameters.java similarity index 100% rename from Samples/3e-batch-mode/output2/models/StorageAccountUpdateParameters.java rename to Samples/3e-batch-mode/output2/src/main/java/models/StorageAccountUpdateParameters.java diff --git a/Samples/3e-batch-mode/output2/models/Usage.java b/Samples/3e-batch-mode/output2/src/main/java/models/Usage.java similarity index 100% rename from Samples/3e-batch-mode/output2/models/Usage.java rename to Samples/3e-batch-mode/output2/src/main/java/models/Usage.java diff --git a/Samples/3e-batch-mode/output2/models/UsageListResult.java b/Samples/3e-batch-mode/output2/src/main/java/models/UsageListResult.java similarity index 100% rename from Samples/3e-batch-mode/output2/models/UsageListResult.java rename to Samples/3e-batch-mode/output2/src/main/java/models/UsageListResult.java diff --git a/Samples/3e-batch-mode/output2/models/UsageName.java b/Samples/3e-batch-mode/output2/src/main/java/models/UsageName.java similarity index 100% rename from Samples/3e-batch-mode/output2/models/UsageName.java rename to Samples/3e-batch-mode/output2/src/main/java/models/UsageName.java diff --git a/Samples/3e-batch-mode/output2/models/UsageUnit.java b/Samples/3e-batch-mode/output2/src/main/java/models/UsageUnit.java similarity index 100% rename from Samples/3e-batch-mode/output2/models/UsageUnit.java rename to Samples/3e-batch-mode/output2/src/main/java/models/UsageUnit.java diff --git a/Samples/3e-batch-mode/output2/package-info.java b/Samples/3e-batch-mode/output2/src/main/java/models/package-info.java similarity index 100% rename from Samples/3e-batch-mode/output2/package-info.java rename to Samples/3e-batch-mode/output2/src/main/java/models/package-info.java diff --git a/Samples/test/deprecated/ClientJava/implementation/package-info.java b/Samples/3e-batch-mode/output2/src/main/java/package-info.java similarity index 100% rename from Samples/test/deprecated/ClientJava/implementation/package-info.java rename to Samples/3e-batch-mode/output2/src/main/java/package-info.java diff --git a/Samples/test/deprecated/ClientJava/Deprecated.java b/Samples/test/deprecated/ClientGo/api/interfaces.go similarity index 100% rename from Samples/test/deprecated/ClientJava/Deprecated.java rename to Samples/test/deprecated/ClientGo/api/interfaces.go diff --git a/Samples/test/deprecated/ClientJava/Paths.java b/Samples/test/deprecated/ClientJava/src/main/java/Deprecated.java similarity index 100% rename from Samples/test/deprecated/ClientJava/Paths.java rename to Samples/test/deprecated/ClientJava/src/main/java/Deprecated.java diff --git a/Samples/test/deprecated/ClientJava/implementation/DeprecatedImpl.java b/Samples/test/deprecated/ClientJava/src/main/java/Paths.java similarity index 100% rename from Samples/test/deprecated/ClientJava/implementation/DeprecatedImpl.java rename to Samples/test/deprecated/ClientJava/src/main/java/Paths.java diff --git a/Samples/test/deprecated/ClientJava/implementation/PathsImpl.java b/Samples/test/deprecated/ClientJava/src/main/java/implementation/DeprecatedImpl.java similarity index 100% rename from Samples/test/deprecated/ClientJava/implementation/PathsImpl.java rename to Samples/test/deprecated/ClientJava/src/main/java/implementation/DeprecatedImpl.java diff --git a/Samples/test/deprecated/ClientJava/models/ChildPet.java b/Samples/test/deprecated/ClientJava/src/main/java/implementation/PathsImpl.java similarity index 100% rename from Samples/test/deprecated/ClientJava/models/ChildPet.java rename to Samples/test/deprecated/ClientJava/src/main/java/implementation/PathsImpl.java diff --git a/Samples/test/deprecated/ClientJava/models/package-info.java b/Samples/test/deprecated/ClientJava/src/main/java/implementation/package-info.java similarity index 100% rename from Samples/test/deprecated/ClientJava/models/package-info.java rename to Samples/test/deprecated/ClientJava/src/main/java/implementation/package-info.java diff --git a/Samples/test/deprecated/ClientJava/models/Enum1Custom.java b/Samples/test/deprecated/ClientJava/src/main/java/models/ChildPet.java similarity index 100% rename from Samples/test/deprecated/ClientJava/models/Enum1Custom.java rename to Samples/test/deprecated/ClientJava/src/main/java/models/ChildPet.java diff --git a/Samples/test/deprecated/ClientJava/models/Enum1No.java b/Samples/test/deprecated/ClientJava/src/main/java/models/Enum1Custom.java similarity index 100% rename from Samples/test/deprecated/ClientJava/models/Enum1No.java rename to Samples/test/deprecated/ClientJava/src/main/java/models/Enum1Custom.java diff --git a/Samples/test/deprecated/ClientJava/models/Enum1Replaced.java b/Samples/test/deprecated/ClientJava/src/main/java/models/Enum1No.java similarity index 100% rename from Samples/test/deprecated/ClientJava/models/Enum1Replaced.java rename to Samples/test/deprecated/ClientJava/src/main/java/models/Enum1No.java diff --git a/Samples/test/deprecated/ClientJava/models/Enum1Yes.java b/Samples/test/deprecated/ClientJava/src/main/java/models/Enum1Replaced.java similarity index 100% rename from Samples/test/deprecated/ClientJava/models/Enum1Yes.java rename to Samples/test/deprecated/ClientJava/src/main/java/models/Enum1Replaced.java diff --git a/Samples/test/deprecated/ClientJava/models/Enum2Custom.java b/Samples/test/deprecated/ClientJava/src/main/java/models/Enum1Yes.java similarity index 100% rename from Samples/test/deprecated/ClientJava/models/Enum2Custom.java rename to Samples/test/deprecated/ClientJava/src/main/java/models/Enum1Yes.java diff --git a/Samples/test/deprecated/ClientJava/models/Enum2No.java b/Samples/test/deprecated/ClientJava/src/main/java/models/Enum2Custom.java similarity index 100% rename from Samples/test/deprecated/ClientJava/models/Enum2No.java rename to Samples/test/deprecated/ClientJava/src/main/java/models/Enum2Custom.java diff --git a/Samples/test/deprecated/ClientJava/models/Enum2Replaced.java b/Samples/test/deprecated/ClientJava/src/main/java/models/Enum2No.java similarity index 100% rename from Samples/test/deprecated/ClientJava/models/Enum2Replaced.java rename to Samples/test/deprecated/ClientJava/src/main/java/models/Enum2No.java diff --git a/Samples/test/deprecated/ClientJava/models/Enum2Yes.java b/Samples/test/deprecated/ClientJava/src/main/java/models/Enum2Replaced.java similarity index 100% rename from Samples/test/deprecated/ClientJava/models/Enum2Yes.java rename to Samples/test/deprecated/ClientJava/src/main/java/models/Enum2Replaced.java diff --git a/Samples/test/deprecated/ClientJava/models/Enum3Custom.java b/Samples/test/deprecated/ClientJava/src/main/java/models/Enum2Yes.java similarity index 100% rename from Samples/test/deprecated/ClientJava/models/Enum3Custom.java rename to Samples/test/deprecated/ClientJava/src/main/java/models/Enum2Yes.java diff --git a/Samples/test/deprecated/ClientJava/models/Enum3No.java b/Samples/test/deprecated/ClientJava/src/main/java/models/Enum3Custom.java similarity index 100% rename from Samples/test/deprecated/ClientJava/models/Enum3No.java rename to Samples/test/deprecated/ClientJava/src/main/java/models/Enum3Custom.java diff --git a/Samples/test/deprecated/ClientJava/models/Enum3Replaced.java b/Samples/test/deprecated/ClientJava/src/main/java/models/Enum3No.java similarity index 100% rename from Samples/test/deprecated/ClientJava/models/Enum3Replaced.java rename to Samples/test/deprecated/ClientJava/src/main/java/models/Enum3No.java diff --git a/Samples/test/deprecated/ClientJava/models/Enum3Yes.java b/Samples/test/deprecated/ClientJava/src/main/java/models/Enum3Replaced.java similarity index 100% rename from Samples/test/deprecated/ClientJava/models/Enum3Yes.java rename to Samples/test/deprecated/ClientJava/src/main/java/models/Enum3Replaced.java diff --git a/Samples/test/deprecated/ClientJava/models/Pet.java b/Samples/test/deprecated/ClientJava/src/main/java/models/Enum3Yes.java similarity index 100% rename from Samples/test/deprecated/ClientJava/models/Pet.java rename to Samples/test/deprecated/ClientJava/src/main/java/models/Enum3Yes.java diff --git a/Samples/test/deprecated/ClientJava/models/PetCustom.java b/Samples/test/deprecated/ClientJava/src/main/java/models/Pet.java similarity index 100% rename from Samples/test/deprecated/ClientJava/models/PetCustom.java rename to Samples/test/deprecated/ClientJava/src/main/java/models/Pet.java diff --git a/Samples/test/deprecated/ClientJava/models/PetNo.java b/Samples/test/deprecated/ClientJava/src/main/java/models/PetCustom.java similarity index 100% rename from Samples/test/deprecated/ClientJava/models/PetNo.java rename to Samples/test/deprecated/ClientJava/src/main/java/models/PetCustom.java diff --git a/Samples/test/deprecated/ClientJava/models/PetReplaced.java b/Samples/test/deprecated/ClientJava/src/main/java/models/PetNo.java similarity index 100% rename from Samples/test/deprecated/ClientJava/models/PetReplaced.java rename to Samples/test/deprecated/ClientJava/src/main/java/models/PetNo.java diff --git a/Samples/test/deprecated/ClientJava/models/PetYes.java b/Samples/test/deprecated/ClientJava/src/main/java/models/PetReplaced.java similarity index 100% rename from Samples/test/deprecated/ClientJava/models/PetYes.java rename to Samples/test/deprecated/ClientJava/src/main/java/models/PetReplaced.java diff --git a/Samples/test/deprecated/ClientJava/package-info.java b/Samples/test/deprecated/ClientJava/src/main/java/models/PetYes.java similarity index 100% rename from Samples/test/deprecated/ClientJava/package-info.java rename to Samples/test/deprecated/ClientJava/src/main/java/models/PetYes.java diff --git a/Samples/test/stream-with-content-type/ClientJava/implementation/package-info.java b/Samples/test/deprecated/ClientJava/src/main/java/models/package-info.java similarity index 100% rename from Samples/test/stream-with-content-type/ClientJava/implementation/package-info.java rename to Samples/test/deprecated/ClientJava/src/main/java/models/package-info.java diff --git a/Samples/test/stream-with-content-type/ClientJava/models/package-info.java b/Samples/test/deprecated/ClientJava/src/main/java/package-info.java similarity index 100% rename from Samples/test/stream-with-content-type/ClientJava/models/package-info.java rename to Samples/test/deprecated/ClientJava/src/main/java/package-info.java diff --git a/Samples/test/deprecated/ClientNode/LICENSE.txt b/Samples/test/deprecated/ClientNode/LICENSE.txt deleted file mode 100644 index a70e8cf660..0000000000 --- a/Samples/test/deprecated/ClientNode/LICENSE.txt +++ /dev/null @@ -1,21 +0,0 @@ -The MIT License (MIT) - -Copyright (c) 2018 Microsoft - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/Samples/test/deprecated/deprecated.yaml b/Samples/test/deprecated/deprecated.yaml index a12943695f..b7afb1e43e 100644 --- a/Samples/test/deprecated/deprecated.yaml +++ b/Samples/test/deprecated/deprecated.yaml @@ -254,4 +254,4 @@ definitions: - b x-ms-enum: oldModelAsString: true - name: Enum3Replaced + name: Enum3Replaced \ No newline at end of file diff --git a/Samples/test/deprecated/shell/stdout.txt b/Samples/test/deprecated/shell/stdout.txt index 17d46a9413..b7e52630e2 100644 --- a/Samples/test/deprecated/shell/stdout.txt +++ b/Samples/test/deprecated/shell/stdout.txt @@ -1 +1,3 @@ https://aka.ms/autorest +INFORMATION: Getting the package version from the pre-existing package.json file in the output folder. +INFORMATION: Pre-existing package.json file in the output folder didn't contain a non-empty version property. diff --git a/Samples/test/hidden-methods/Client/code-model-v1.yaml b/Samples/test/hidden-methods/Client/code-model-v1.yaml index 75f813d050..bb31c0cc34 100644 --- a/Samples/test/hidden-methods/Client/code-model-v1.yaml +++ b/Samples/test/hidden-methods/Client/code-model-v1.yaml @@ -13,7 +13,6 @@ modelTypes: $id: '4' fixed: false raw: '42' - deprecated: false documentation: $id: '5' fixed: false @@ -33,7 +32,6 @@ modelTypes: $id: '8' fixed: false raw: Long - deprecated: false - $id: '9' isReadOnly: false realPath: @@ -43,7 +41,6 @@ modelTypes: $id: '10' fixed: false raw: shiny - deprecated: false documentation: $id: '11' fixed: false @@ -62,7 +59,6 @@ modelTypes: $id: '14' fixed: false raw: String - deprecated: false serializedName: Cowbell documentation: A cowbell. containsConstantProperties: false @@ -70,7 +66,6 @@ modelTypes: $id: '15' fixed: false raw: Cowbell - deprecated: false name: CowbellFactory namespace: '' modelsName: Models @@ -88,7 +83,6 @@ operations: defaultValue: $id: '19' fixed: false - deprecated: false documentation: $id: '20' fixed: false @@ -131,7 +125,6 @@ operations: - application/json extensions: x-ms-requestBody-index: '0' - deprecated: false hidden: false name: $id: '27' diff --git a/Samples/test/hidden-methods/ClientFancy/code-model-v1.yaml b/Samples/test/hidden-methods/ClientFancy/code-model-v1.yaml index b9f8efa854..e75de612ef 100644 --- a/Samples/test/hidden-methods/ClientFancy/code-model-v1.yaml +++ b/Samples/test/hidden-methods/ClientFancy/code-model-v1.yaml @@ -13,7 +13,6 @@ modelTypes: $id: '4' fixed: false raw: '42' - deprecated: false documentation: $id: '5' fixed: false @@ -33,7 +32,6 @@ modelTypes: $id: '8' fixed: false raw: Long - deprecated: false - $id: '9' isReadOnly: false realPath: @@ -43,7 +41,6 @@ modelTypes: $id: '10' fixed: false raw: shiny - deprecated: false documentation: $id: '11' fixed: false @@ -62,7 +59,6 @@ modelTypes: $id: '14' fixed: false raw: String - deprecated: false serializedName: Cowbell documentation: A cowbell. containsConstantProperties: false @@ -70,7 +66,6 @@ modelTypes: $id: '15' fixed: false raw: Cowbell - deprecated: false name: CowbellFactory namespace: '' modelsName: Models @@ -88,7 +83,6 @@ operations: defaultValue: $id: '19' fixed: false - deprecated: false documentation: $id: '20' fixed: false @@ -131,7 +125,6 @@ operations: - application/json extensions: x-ms-requestBody-index: '0' - deprecated: false hidden: true name: $id: '27' diff --git a/Samples/test/stream-with-content-type/ClientJava/CowbellModerator.java b/Samples/test/stream-with-content-type/ClientGo/api/interfaces.go similarity index 100% rename from Samples/test/stream-with-content-type/ClientJava/CowbellModerator.java rename to Samples/test/stream-with-content-type/ClientGo/api/interfaces.go diff --git a/Samples/test/stream-with-content-type/ClientJava/Images.java b/Samples/test/stream-with-content-type/ClientJava/src/main/java/CowbellModerator.java similarity index 100% rename from Samples/test/stream-with-content-type/ClientJava/Images.java rename to Samples/test/stream-with-content-type/ClientJava/src/main/java/CowbellModerator.java diff --git a/Samples/test/stream-with-content-type/ClientJava/Texts.java b/Samples/test/stream-with-content-type/ClientJava/src/main/java/Images.java similarity index 100% rename from Samples/test/stream-with-content-type/ClientJava/Texts.java rename to Samples/test/stream-with-content-type/ClientJava/src/main/java/Images.java diff --git a/Samples/test/stream-with-content-type/ClientJava/implementation/CowbellModeratorImpl.java b/Samples/test/stream-with-content-type/ClientJava/src/main/java/Texts.java similarity index 100% rename from Samples/test/stream-with-content-type/ClientJava/implementation/CowbellModeratorImpl.java rename to Samples/test/stream-with-content-type/ClientJava/src/main/java/Texts.java diff --git a/Samples/test/stream-with-content-type/ClientJava/implementation/ImagesImpl.java b/Samples/test/stream-with-content-type/ClientJava/src/main/java/implementation/CowbellModeratorImpl.java similarity index 100% rename from Samples/test/stream-with-content-type/ClientJava/implementation/ImagesImpl.java rename to Samples/test/stream-with-content-type/ClientJava/src/main/java/implementation/CowbellModeratorImpl.java diff --git a/Samples/test/stream-with-content-type/ClientJava/implementation/TextsImpl.java b/Samples/test/stream-with-content-type/ClientJava/src/main/java/implementation/ImagesImpl.java similarity index 100% rename from Samples/test/stream-with-content-type/ClientJava/implementation/TextsImpl.java rename to Samples/test/stream-with-content-type/ClientJava/src/main/java/implementation/ImagesImpl.java diff --git a/Samples/test/stream-with-content-type/ClientJava/models/ContentTypes.java b/Samples/test/stream-with-content-type/ClientJava/src/main/java/implementation/TextsImpl.java similarity index 100% rename from Samples/test/stream-with-content-type/ClientJava/models/ContentTypes.java rename to Samples/test/stream-with-content-type/ClientJava/src/main/java/implementation/TextsImpl.java diff --git a/Samples/test/stream-with-content-type/ClientJava/package-info.java b/Samples/test/stream-with-content-type/ClientJava/src/main/java/implementation/package-info.java similarity index 100% rename from Samples/test/stream-with-content-type/ClientJava/package-info.java rename to Samples/test/stream-with-content-type/ClientJava/src/main/java/implementation/package-info.java diff --git a/Samples/test/stream-with-content-type/ClientJava/models/ImageType.java b/Samples/test/stream-with-content-type/ClientJava/src/main/java/models/ContentTypes.java similarity index 100% rename from Samples/test/stream-with-content-type/ClientJava/models/ImageType.java rename to Samples/test/stream-with-content-type/ClientJava/src/main/java/models/ContentTypes.java diff --git a/Samples/test/stream-with-content-type/ClientJava/models/ImageTypeRestricted.java b/Samples/test/stream-with-content-type/ClientJava/src/main/java/models/ImageType.java similarity index 100% rename from Samples/test/stream-with-content-type/ClientJava/models/ImageTypeRestricted.java rename to Samples/test/stream-with-content-type/ClientJava/src/main/java/models/ImageType.java diff --git a/Samples/test/stream-with-content-type/ClientJava/models/ImageTypeRestrictedStrings.java b/Samples/test/stream-with-content-type/ClientJava/src/main/java/models/ImageTypeRestricted.java similarity index 100% rename from Samples/test/stream-with-content-type/ClientJava/models/ImageTypeRestrictedStrings.java rename to Samples/test/stream-with-content-type/ClientJava/src/main/java/models/ImageTypeRestricted.java diff --git a/Samples/test/stream-with-content-type/ClientJava/src/main/java/models/ImageTypeRestrictedStrings.java b/Samples/test/stream-with-content-type/ClientJava/src/main/java/models/ImageTypeRestrictedStrings.java new file mode 100644 index 0000000000..9d6cafc2c3 --- /dev/null +++ b/Samples/test/stream-with-content-type/ClientJava/src/main/java/models/ImageTypeRestrictedStrings.java @@ -0,0 +1 @@ +SRC \ No newline at end of file diff --git a/Samples/test/stream-with-content-type/ClientJava/src/main/java/models/package-info.java b/Samples/test/stream-with-content-type/ClientJava/src/main/java/models/package-info.java new file mode 100644 index 0000000000..9d6cafc2c3 --- /dev/null +++ b/Samples/test/stream-with-content-type/ClientJava/src/main/java/models/package-info.java @@ -0,0 +1 @@ +SRC \ No newline at end of file diff --git a/Samples/test/stream-with-content-type/ClientJava/src/main/java/package-info.java b/Samples/test/stream-with-content-type/ClientJava/src/main/java/package-info.java new file mode 100644 index 0000000000..9d6cafc2c3 --- /dev/null +++ b/Samples/test/stream-with-content-type/ClientJava/src/main/java/package-info.java @@ -0,0 +1 @@ +SRC \ No newline at end of file diff --git a/Samples/test/stream-with-content-type/ClientNode/LICENSE.txt b/Samples/test/stream-with-content-type/ClientNode/LICENSE.txt deleted file mode 100644 index a70e8cf660..0000000000 --- a/Samples/test/stream-with-content-type/ClientNode/LICENSE.txt +++ /dev/null @@ -1,21 +0,0 @@ -The MIT License (MIT) - -Copyright (c) 2018 Microsoft - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/Samples/test/stream-with-content-type/shell/stdout.txt b/Samples/test/stream-with-content-type/shell/stdout.txt index 17d46a9413..b7e52630e2 100644 --- a/Samples/test/stream-with-content-type/shell/stdout.txt +++ b/Samples/test/stream-with-content-type/shell/stdout.txt @@ -1 +1,3 @@ https://aka.ms/autorest +INFORMATION: Getting the package version from the pre-existing package.json file in the output folder. +INFORMATION: Pre-existing package.json file in the output folder didn't contain a non-empty version property. diff --git a/src/autorest-core/app.ts b/src/autorest-core/app.ts index 91319eebe2..cddbfa3709 100644 --- a/src/autorest-core/app.ts +++ b/src/autorest-core/app.ts @@ -504,11 +504,13 @@ async function batch(api: AutoRest): Promise { const batchTaskConfigReference: any = {}; api.AddConfiguration(batchTaskConfigReference); for (const batchTaskConfig of config.GetEntry("batch" as any)) { - outputMessage(api, { - Channel: Channel.Information, - Text: `Processing batch task - ${JSON.stringify(batchTaskConfig)} .` - }, () => { }); - + const isjson = (args.rawSwitches["message-format"] === "json" || args.rawSwitches["message-format"] === "yaml"); + if (!isjson) { + outputMessage(api, { + Channel: Channel.Information, + Text: `Processing batch task - ${JSON.stringify(batchTaskConfig)} .` + }, () => { }); + } // update batch task config section for (const key of Object.keys(batchTaskConfigReference)) delete batchTaskConfigReference[key]; Object.assign(batchTaskConfigReference, batchTaskConfig); diff --git a/src/autorest-core/lib/configuration.ts b/src/autorest-core/lib/configuration.ts index b1a9b20382..19822addfc 100644 --- a/src/autorest-core/lib/configuration.ts +++ b/src/autorest-core/lib/configuration.ts @@ -751,7 +751,7 @@ export class Configuration { } await includeFn(); - + const mf = createView().GetEntry('message-format'); // 5. resolve extensions const extMgr = await Configuration.extensionManager; const addedExtensions = new Set(); @@ -782,11 +782,14 @@ export class Configuration { } catch (e) { } if (await exists(localPath)) { - // local package - messageEmitter.Message.Dispatch({ - Channel: Channel.Information, - Text: `> Loading local AutoRest extension '${additionalExtension.name}' (${localPath})` - }); + if (mf !== 'json' && mf !== 'yaml') { + // local package + messageEmitter.Message.Dispatch({ + Channel: Channel.Information, + Text: `> Loading local AutoRest extension '${additionalExtension.name}' (${localPath})` + }); + + } const pack = await extMgr.findPackage(additionalExtension.name, localPath); const extension = new LocalExtension(pack, localPath); @@ -800,10 +803,12 @@ export class Configuration { // remote package const installedExtension = await extMgr.getInstalledExtension(additionalExtension.name, additionalExtension.source); if (installedExtension) { - messageEmitter.Message.Dispatch({ - Channel: Channel.Information, - Text: `> Loading AutoRest extension '${additionalExtension.name}' (${additionalExtension.source}->${installedExtension.version})` - }); + if (mf !== 'json' && mf !== 'yaml') { + messageEmitter.Message.Dispatch({ + Channel: Channel.Information, + Text: `> Loading AutoRest extension '${additionalExtension.name}' (${additionalExtension.source}->${installedExtension.version})` + }); + } // start extension ext = loadedExtensions[additionalExtension.fullyQualified] = { extension: installedExtension,