Java beta2 release

AutoRest.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
-VisualStudioVersion = 14.0.25123.0
+VisualStudioVersion = 14.0.23107.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AutoRest.Core", "AutoRest\AutoRest.Core\AutoRest.Core.csproj", "{C876085F-9DC3-41F0-B7B4-17022CD84684}"
 EndProject
@@ -120,6 +120,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AutoRest.Generator.AzureRes
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AutoRest.Generator.AzureResourceSchema.Tests", "AutoRest\Generators\AzureResourceSchema\AzureResourceSchema.Tests\AutoRest.Generator.AzureResourceSchema.Tests.csproj", "{1C3B4A33-E045-4C8F-9202-1B651A686567}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AutoRest.Generator.Azure.Java.Fluent", "AutoRest\Generators\Java\Azure.Java.Fluent\AutoRest.Generator.Azure.Java.Fluent.csproj", "{D35E97FD-E360-4DAA-96D0-DA45F32150B9}"
+EndProject
 Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "CSharp.Tests", "AutoRest\Generators\CSharp\CSharp.Tests\CSharp.Tests.xproj", "{784D4B45-F12A-4B8F-A86C-35A080814A19}"
 EndProject
 Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Azure.CSharp.Tests", "AutoRest\Generators\CSharp\Azure.CSharp.Tests\Azure.CSharp.Tests.xproj", "{43DFEF27-2FD7-4827-A669-DFD2DD1CBBCC}"
@@ -496,6 +498,16 @@ Global
 		{1C3B4A33-E045-4C8F-9202-1B651A686567}.Portable-Release|Any CPU.Build.0 = Release|Any CPU
 		{1C3B4A33-E045-4C8F-9202-1B651A686567}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1C3B4A33-E045-4C8F-9202-1B651A686567}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D35E97FD-E360-4DAA-96D0-DA45F32150B9}.Debug|Any CPU.ActiveCfg = Portable-Debug|Any CPU
+		{D35E97FD-E360-4DAA-96D0-DA45F32150B9}.Net45-Debug|Any CPU.ActiveCfg = Net45-Debug|Any CPU
+		{D35E97FD-E360-4DAA-96D0-DA45F32150B9}.Net45-Debug|Any CPU.Build.0 = Net45-Debug|Any CPU
+		{D35E97FD-E360-4DAA-96D0-DA45F32150B9}.Net45-Release|Any CPU.ActiveCfg = Net45-Release|Any CPU
+		{D35E97FD-E360-4DAA-96D0-DA45F32150B9}.Net45-Release|Any CPU.Build.0 = Net45-Release|Any CPU
+		{D35E97FD-E360-4DAA-96D0-DA45F32150B9}.Portable-Debug|Any CPU.ActiveCfg = Portable-Debug|Any CPU
+		{D35E97FD-E360-4DAA-96D0-DA45F32150B9}.Portable-Debug|Any CPU.Build.0 = Portable-Debug|Any CPU
+		{D35E97FD-E360-4DAA-96D0-DA45F32150B9}.Portable-Release|Any CPU.ActiveCfg = Portable-Release|Any CPU
+		{D35E97FD-E360-4DAA-96D0-DA45F32150B9}.Portable-Release|Any CPU.Build.0 = Portable-Release|Any CPU
+		{D35E97FD-E360-4DAA-96D0-DA45F32150B9}.Release|Any CPU.ActiveCfg = Portable-Release|Any CPU
 		{784D4B45-F12A-4B8F-A86C-35A080814A19}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{784D4B45-F12A-4B8F-A86C-35A080814A19}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{784D4B45-F12A-4B8F-A86C-35A080814A19}.Net45-Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -574,6 +586,7 @@ Global
 		{B6A1FC1E-0779-4900-84EE-262DD0E53FF4} = {EF9E346D-70C6-45F5-8FF9-9B734F4A1298}
 		{654344A5-0556-49C7-BFB3-59676D7440D3} = {B6A1FC1E-0779-4900-84EE-262DD0E53FF4}
 		{1C3B4A33-E045-4C8F-9202-1B651A686567} = {B6A1FC1E-0779-4900-84EE-262DD0E53FF4}
+		{D35E97FD-E360-4DAA-96D0-DA45F32150B9} = {A9C01442-1E93-4C2D-9182-B61C9F53C3FF}
 		{784D4B45-F12A-4B8F-A86C-35A080814A19} = {03E75B1D-A443-4A12-B31F-860DB2B45140}
 		{43DFEF27-2FD7-4827-A669-DFD2DD1CBBCC} = {03E75B1D-A443-4A12-B31F-860DB2B45140}
 		{8192BAA3-C606-4D44-B0D7-46BE7AFA4096} = {03E75B1D-A443-4A12-B31F-860DB2B45140}

AutoRest/AutoRest.Core/CodeNamer.cs

@@ -114,7 +114,7 @@ public virtual void NormalizeClientModel(ServiceClient client)
                 throw new ArgumentNullException("client");
             }
 
-            client.Name = GetTypeName(client.Name);
+            client.Name = GetClientName(client.Name);
             client.Namespace = GetNamespaceName(client.Namespace);
 
             NormalizeClientProperties(client);
@@ -392,6 +392,15 @@ public virtual string GetMethodGroupName(string name)
             return PascalCase(RemoveInvalidCharacters(GetEscapedReservedName(name, "Model")));
         }
 
+        public virtual string GetClientName(string name)
+        {
+            if (string.IsNullOrWhiteSpace(name))
+            {
+                return name;
+            }
+            return PascalCase(RemoveInvalidCharacters(GetEscapedReservedName(name, "Model")));
+        }
+
         /// <summary>
         /// Formats a string for naming a local variable using Camel case by default.
         /// </summary>
@@ -680,7 +689,7 @@ protected virtual void ResolveMethodGroupNameCollision(ServiceClient serviceClie
             }
         }
 
-        private static string ResolveNameConflict(
+        protected static string ResolveNameConflict(
             Dictionary<string, string> exclusionDictionary,
             string typeName,
             string type,

AutoRest/AutoRest.Core/GlobalSuppressions.cs

@@ -60,3 +60,4 @@
 [assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1002:DoNotExposeGenericLists", Scope = "member", Target = "Microsoft.Rest.Generator.ClientModel.ServiceClient.#Methods")]
 [assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1002:DoNotExposeGenericLists", Scope = "member", Target = "Microsoft.Rest.Generator.ClientModel.ServiceClient.#Properties")]
 [assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1002:DoNotExposeGenericLists", Scope = "member", Target = "Microsoft.Rest.Generator.ClientModel.ParameterTransformation.#ParameterMappings")]
+[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1062:Validate arguments of public methods", MessageId = "0", Scope = "member", Target = "Microsoft.Rest.Generator.CodeNamer.#ResolveNameConflict(System.Collections.Generic.Dictionary`2<System.String,System.String>,System.String,System.String,System.String)")]

AutoRest/AutoRest.Core/Settings.cs

@@ -161,7 +161,7 @@ public string Header
                 }
                 else if (value == "MICROSOFT_MIT_NO_CODEGEN")
                 {
-                    _header = MicrosoftMitLicenseHeader;
+                    _header = MicrosoftMitLicenseHeader + Environment.NewLine + "Code generated by Microsoft (R) AutoRest Code Generator.";
                 }
                 else if (value == "NONE")
                 {

AutoRest/AutoRest/AutoRest.json

@@ -24,6 +24,9 @@
     "Azure.Java": {
       "type": "AzureJavaCodeGenerator, AutoRest.Generator.Azure.Java"
     },
+    "Azure.Java.Fluent": {
+      "type": "AzureJavaFluentCodeGenerator, AutoRest.Generator.Azure.Java.Fluent"
+    },
     "Python": {
       "type": "PythonCodeGenerator, AutoRest.Generator.Python"
     },

AutoRest/Generators/Java/Azure.Java.Fluent.Tests/build.gradle

@@ -0,0 +1,99 @@
+apply plugin: 'java'
+apply plugin: 'checkstyle'
+
+group = 'com.microsoft.azure'
+version = '1.0.0-SNAPSHOT'
+
+tasks.withType(JavaCompile) {
+    options.encoding = "UTF-8"
+}
+
+repositories {
+    mavenCentral()
+    maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
+}
+
+checkstyle {
+    toolVersion = "6.9"
+    configFile = new File("$rootDir/Tools/checkstyle/checkstyle.xml")
+    configProperties = [samedir: "$rootDir/Tools/checkstyle"]
+    reportsDir = new File("$rootDir/Tools/checkstyle/reports")
+}
+
+dependencies {
+    compile 'commons-codec:commons-codec:1.10'
+    compile 'com.microsoft.azure:azure-client-runtime:1.0.0-SNAPSHOT'
+    compile 'joda-time:joda-time:2.8.2'
+    compile 'javax.validation:validation-api:1.1.0.Final'
+    testCompile 'junit:junit:4.12'
+    testCompile 'junit:junit-dep:4.11'
+    testCompile 'commons-io:commons-io:2.4'
+}
+
+test {
+    testLogging {
+        events "passed", "skipped", "failed", "standardError"
+    }
+}
+
+javadoc {
+    options.encoding = 'UTF-8'
+}
+
+test {
+    reports.getHtml()
+    reports.html.destination = file("${projectDir}/../../../../TestResults/JavaAzureFluentCodeGen")
+}
+
+task buildRuntime(type: Exec) {
+    workingDir "${projectDir}/../../../../ClientRuntimes/Java"
+    if (System.getProperty('os.name').toLowerCase().contains('windows')) {
+        commandLine 'cmd', '/c', 'gradle', 'uploadArchives'
+    } else {
+        commandLine 'gradle', 'uploadArchives'
+    }
+}
+
+task npmrestore(type: Exec) {
+    workingDir "${projectDir}/../../../TestServer/server"
+    if (System.getProperty('os.name').toLowerCase().contains('windows')) {
+        commandLine 'cmd', '/c', 'npm', 'install'
+    } else {
+        commandLine 'npm', 'install'
+    }
+}
+
+task installforever(type: Exec, dependsOn: 'npmrestore') {
+    if (System.getProperty('os.name').toLowerCase().contains('windows')) {
+        commandLine 'cmd', '/c', 'npm', 'install', '-g', 'forever'
+    } else {
+        commandLine 'npm', 'install', '-g', 'forever'
+    }
+}
+
+task runserver(type: Exec, dependsOn: 'installforever') {
+    workingDir "${projectDir}/../../../TestServer/server"
+    if (System.getProperty('os.name').toLowerCase().contains('windows')) {
+        commandLine 'cmd', '/c', 'forever', 'start', 'startup/www.js'
+    } else {
+        commandLine 'forever', 'start', 'startup/www.js'
+    }
+}
+
+task testcoverage(type: JavaExec, dependsOn: 'runserver') {
+    main = 'fixtures.azurereport.CoverageReporter'
+    classpath = sourceSets.test.runtimeClasspath
+}
+
+task stopserver(type: Exec, dependsOn: 'testcoverage') {
+    workingDir "${projectDir}/../../../TestServer/server"
+    if (System.getProperty('os.name').toLowerCase().contains('windows')) {
+        commandLine 'cmd', '/c', 'forever', 'stop', 'startup/www.js'
+    } else {
+        commandLine 'forever', 'stop', 'startup/www.js'
+    }
+}
+
+tasks.compileJava.dependsOn 'clean'
+tasks.test.dependsOn 'runserver'
+tasks.test.finalizedBy 'stopserver'

AutoRest/Generators/Java/Azure.Java.Fluent.Tests/src/main/java/fixtures/azureparametergrouping/Error.java

@@ -0,0 +1,68 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ * Changes may cause incorrect behavior and will be lost if the code is
+ * regenerated.
+ */
+
+package fixtures.azureparametergrouping;
+
+
+/**
+ * The Error model.
+ */
+public class Error {
+    /**
+     * The status property.
+     */
+    private Integer status;
+
+    /**
+     * The message property.
+     */
+    private String message;
+
+    /**
+     * Get the status value.
+     *
+     * @return the status value
+     */
+    public Integer status() {
+        return this.status;
+    }
+
+    /**
+     * Set the status value.
+     *
+     * @param status the status value to set
+     * @return the Error object itself.
+     */
+    public Error withStatus(Integer status) {
+        this.status = status;
+        return this;
+    }
+
+    /**
+     * Get the message value.
+     *
+     * @return the message value
+     */
+    public String message() {
+        return this.message;
+    }
+
+    /**
+     * Set the message value.
+     *
+     * @param message the message value to set
+     * @return the Error object itself.
+     */
+    public Error withMessage(String message) {
+        this.message = message;
+        return this;
+    }
+
+}

AutoRest/Generators/Java/Azure.Java.Fluent.Tests/src/main/java/fixtures/azureparametergrouping/ErrorException.java

@@ -0,0 +1,89 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ * Changes may cause incorrect behavior and will be lost if the code is
+ * regenerated.
+ */
+
+package fixtures.azureparametergrouping;
+
+import com.microsoft.rest.RestException;
+import retrofit2.Response;
+
+/**
+ * Exception thrown for an invalid response with Error information.
+ */
+public class ErrorException extends RestException {
+    /**
+     * Information about the associated HTTP response.
+     */
+    private Response response;
+    /**
+     * The actual response body.
+     */
+    private Error body;
+    /**
+     * Initializes a new instance of the ErrorException class.
+     */
+    public ErrorException() { }
+    /**
+     * Initializes a new instance of the ErrorException class.
+     *
+     * @param message The exception message.
+     */
+    public ErrorException(final String message) {
+        super(message);
+    }
+    /**
+     * Initializes a new instance of the ErrorException class.
+     *
+     * @param message the exception message
+     * @param cause   exception that caused this exception to occur
+     */
+    public ErrorException(final String message, final Throwable cause) {
+        super(message, cause);
+    }
+    /**
+     * Initializes a new instance of the ErrorException class.
+     *
+     * @param cause exception that caused this exception to occur
+     */
+    public ErrorException(final Throwable cause) {
+        super(cause);
+    }
+    /**
+     * Gets information about the associated HTTP response.
+     *
+     * @return the HTTP response
+     */
+    public Response getResponse() {
+        return response;
+    }
+    /**
+     * Gets the HTTP response body.
+     *
+     * @return the response body
+     */
+    public Error getBody() {
+        return body;
+    }
+    /**
+     * Sets the HTTP response.
+     *
+     * @param response the HTTP response
+     */
+    public void setResponse(Response response) {
+        this.response = response;
+    }
+    /**
+     * Sets the HTTP response body.
+     *
+     * @param body the response body
+     */
+    public void setBody(Error body) {
+        this.body = body;
+    }
+}