merge master

README.md

@@ -35,16 +35,16 @@ AutoRest can be run on macOS and *nix using [Mono](http://www.mono-project.com/d
 Or [Docker](https://docs.docker.com/engine/installation):
 
   # Download Swagger.json example
-  curl -O https://raw.githubusercontent.com/Azure/autorest/master/Samples/petstore/petstore.json
+  `curl -O https://raw.githubusercontent.com/Azure/autorest/master/Samples/petstore/petstore.json`
 
   # Download latest AutoRest Docker image
-  docker pull azuresdk/autorest:latest
+  `docker pull azuresdk/autorest:latest`
 
   # Run AutoRest using Docker, mounting the current folder (pwd) into /home inside the container
-  docker run -it --rm -v $(pwd):/home azuresdk/autorest:latest autorest \
+  `docker run -it --rm -v $(pwd):/home azuresdk/autorest:latest autorest \
     -CodeGenerator CSharp \
     -Input /home/petstore.json \
-    -OutputDirectory /home/CSharp_PetStore -Namespace PetStore
+    -OutputDirectory /home/CSharp_PetStore -Namespace PetStore`
 
 ## Building AutoRest
 AutoRest is developed primarily in C# but generates code for multiple languages. See [this link](docs/developer/guide/building-code.md) to build and test AutoRest.

Samples/petstore/Go/client.go

@@ -18,30 +18,30 @@ const (
     // APIVersion is the version of the Petstore
     APIVersion = "1.0.0"
 
-    // DefaultBaseURI is the default URI used for the service Petstore
-    DefaultBaseURI = "http://petstore.swagger.io/v2"
+        // DefaultBaseURI is the default URI used for the service Petstore
+        DefaultBaseURI = "http://petstore.swagger.io/v2"
 )
 
 // ManagementClient is the base client for Petstore.
 type ManagementClient struct {
     autorest.Client
-    BaseURI string
+        BaseURI string
     APIVersion string
 }
 
 // New creates an instance of the ManagementClient client.
 func New()ManagementClient {
-    return NewWithBaseURI(DefaultBaseURI, )
+        return NewWithBaseURI(DefaultBaseURI, )
 }
 
-// NewWithBaseURI creates an instance of the ManagementClient client.
-func NewWithBaseURI(baseURI string, ) ManagementClient {
-   return ManagementClient{
-        Client: autorest.NewClientWithUserAgent(UserAgent()),
-        BaseURI: baseURI,
-        APIVersion: APIVersion,
+    // NewWithBaseURI creates an instance of the ManagementClient client.
+    func NewWithBaseURI(baseURI string, ) ManagementClient {
+        return ManagementClient{
+            Client: autorest.NewClientWithUserAgent(UserAgent()),
+            BaseURI: baseURI,
+            APIVersion: APIVersion,
+        }
     }
-}
 
     // AddPet adds a new pet to the store. You may receive an HTTP invalid input if
     // your pet is invalid.

Samples/petstore/Go/version.go

@@ -2,25 +2,41 @@ package petstore
 
 
 import (
+    "bytes"
     "fmt"
+    "strings"
 )
 
 const (
     major = "0"
     minor = "0"
     patch = "0"
-    // Always begin a "tag" with a dash (as per http://semver.org)
-    tag   = "-beta"
-    semVerFormat = "%s.%s.%s%s"
+    tag   = ""
     userAgentFormat = "Azure-SDK-For-Go/%s arm-%s/%s"
 )
+// cached results of UserAgent and Version to prevent repeated operations.
+var (
+    userAgent string
+    version string
+)
 
 // UserAgent returns the UserAgent string to use when sending http.Requests.
 func UserAgent() string {
-    return fmt.Sprintf(userAgentFormat, Version(), "petstore", "1.0.0")
+    if userAgent == "" {
+        userAgent = fmt.Sprintf(userAgentFormat, Version(), "petstore", "1.0.0")
+    }
+    return userAgent
 }
 
 // Version returns the semantic version (see http://semver.org) of the client.
 func Version() string {
-    return fmt.Sprintf(semVerFormat, major, minor, patch, tag)
+    if version == "" {
+        versionBuilder := bytes.NewBufferString(fmt.Sprintf("%s.%s.%s", major, minor, patch))
+        if tag != "" {
+            versionBuilder.WriteRune('-')
+            versionBuilder.WriteString(strings.TrimPrefix(tag, "-"))
+        }
+        version = string(versionBuilder.Bytes())
+    }
+    return version
 }

attic/gulpfile.js

@@ -140,6 +140,7 @@ var goMappings = {
   'url':['../../dev/TestServer/swagger/url.json','urlgroup'],
   'validation':['../../dev/TestServer/swagger/validation.json', 'validationgroup'],
   'paging':['../../dev/TestServer/swagger/paging.json', 'paginggroup'],
+  'more-custom-base-uri':['../../dev/TestServer/swagger/custom-baseUrl-more-options.json', 'morecustombaseurigroup'],
   'azurereport':['../../dev/TestServer/swagger/azure-report.json', 'azurereport']
 };
 

docs/developer/guide/building-code.md

@@ -13,7 +13,7 @@ Expected time around 100 minutes to install.
 - Windows 10 Anniversary - (has PackageManagement, developer mode and supports WSL.)
 - JDK 8
 - Android SDK
-- NodeJS
+- NodeJS (LTS Version: v6.9.4 or higher)
 - Gulp
 - Ruby 2.3
 - Ruby Devkit

gulpfile.iced

@@ -57,33 +57,39 @@ autorest = (args) ->
 ############################################### 
 task 'test', "runs all tests", ->
   run 'test-cs',
+      'test-go'
+      'test-java'
       'test-node'
-      'test-ruby'
       'test-python'
-      'test-go'
+      'test-ruby'
 
-############################################### 
+###############################################
+task 'test-go', 'runs Go tests', -> # FAILS, but also on master branch...
+  exec "glide up",               { cwd: './src/generator/AutoRest.Go.Tests/src/tests' }
+  exec "go fmt ./generated/...", { cwd: './src/generator/AutoRest.Go.Tests/src/tests' }
+  exec "go run ./runner.go",     { cwd: './src/generator/AutoRest.Go.Tests/src/tests' }
+
+###############################################
+task 'test-java', 'runs Java tests', ->
+  exec "mvn test", { cwd: './src/generator/AutoRest.Java.Tests/' }
+  exec "mvn test", { cwd: './src/generator/AutoRest.Java.Azure.Tests/' }
+
+###############################################
 task 'test-node', 'runs NodeJS tests', ->
-  exec "npm test", { cwd: './src/generator/AutoRest.NodeJS.Tests/' }
+  #exec "npm test", { cwd: './src/generator/AutoRest.NodeJS.Tests/' }
   exec "npm test", { cwd: './src/generator/AutoRest.NodeJS.Azure.Tests/' }
 
-############################################### 
+###############################################
 task 'test-python', 'runs Python tests', ->
   exec "tox", { cwd: './src/generator/AutoRest.Python.Tests/' }
   exec "tox", { cwd: './src/generator/AutoRest.Python.Azure.Tests/' }
 
-############################################### 
+###############################################
 task 'test-ruby', 'runs Ruby tests', ->
   exec "ruby RspecTests/tests_runner.rb", { cwd: './src/generator/AutoRest.Ruby.Tests/' }
   exec "ruby RspecTests/tests_runner.rb", { cwd: './src/generator/AutoRest.Ruby.Azure.Tests/' }
 
-############################################### 
-task 'test-go', 'runs Go tests', ['regenerate-go'], -> # FAILS, but also on master branch...
-  exec "glide up",               { cwd: './src/generator/AutoRest.Go.Tests/src/tests' }
-  exec "go fmt ./generated/...", { cwd: './src/generator/AutoRest.Go.Tests/src/tests' }
-  exec "go run ./runner.go",     { cwd: './src/generator/AutoRest.Go.Tests/src/tests' }
-
-############################################### 
+###############################################
 # LEGACY 
 # Instead: have bunch of configuration files sitting in a well-known spot, discover them, feed them to AutoRest, done.
 

pom.xml

@@ -70,12 +70,12 @@
       <dependency>
         <groupId>com.microsoft.rest</groupId>
         <artifactId>client-runtime</artifactId>
-        <version>1.0.0-beta5-SNAPSHOT</version>
+        <version>1.0.0-beta6-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>com.microsoft.azure</groupId>
         <artifactId>azure-client-runtime</artifactId>
-        <version>1.0.0-beta5-SNAPSHOT</version>
+        <version>1.0.0-beta6-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>commons-codec</groupId>

src/core/AutoRest.Core/Properties/Resources.resx

@@ -323,4 +323,7 @@
   <data name="InvalidMutabilityValueForReadOnly" xml:space="preserve">
     <value>When property is modeled as "readOnly": true then x-ms-mutability extension can only have "read" value. When property is modeled as "readOnly": false then applying x-ms-mutability extension with only "read" value is not allowed. Extension contains invalid values: '{0}'.</value>
   </data>
+  <data name="BooleanPropertyNotRecommended" xml:space="preserve">
+    <value>Booleans are not descriptive and make them hard to use. Instead use string enums with allowed set of values defined: '{0}'.</value>
+  </data>
 </root>

src/core/AutoRest/Simplify/CSharpSimplifier.cs

@@ -16,7 +16,6 @@
 using Newtonsoft.Json;
 using AutoRest.Core.Utilities;
 using System.Net;
-using System.Reflection;
 
 namespace AutoRest.Simplify
 {