Merge pull request #955 from jianghaolu/javavnext

Extend paging functionality
Azure · Apr 16, 2016 · 0e14ae1 · 0e14ae1
2 parents 91d73c6 + f674f3c
commit 0e14ae1
Show file tree

Hide file tree

Showing 600 changed files with 8,854 additions and 12,905 deletions.
diff --git a/AutoRest/AutoRest.Core/CodeNamer.cs b/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,

diff --git a/AutoRest/AutoRest.Core/GlobalSuppressions.cs b/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)")]
diff --git a/...s/src/main/java/fixtures/azureparametergrouping/AutoRestParameterGroupingTestService.java b/...s/src/main/java/fixtures/azureparametergrouping/AutoRestParameterGroupingTestService.java
diff --git a/...Java.Tests/src/main/java/fixtures/azureparametergrouping/ParameterGroupingOperations.java b/...Java.Tests/src/main/java/fixtures/azureparametergrouping/ParameterGroupingOperations.java
diff --git a/...RestParameterGroupingTestServiceImpl.java → ...RestParameterGroupingTestServiceImpl.java b/...RestParameterGroupingTestServiceImpl.java → ...RestParameterGroupingTestServiceImpl.java
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-package fixtures.azureparametergrouping;
+package fixtures.azureparametergrouping.implementation.api;
 
 import com.microsoft.azure.AzureClient;
 import com.microsoft.azure.AzureServiceClient;
@@ -20,9 +20,9 @@
 import retrofit2.Retrofit;
 
 /**
- * Initializes a new instance of the AutoRestParameterGroupingTestService class.
+ * Initializes a new instance of the AutoRestParameterGroupingTestServiceImpl class.
  */
-public final class AutoRestParameterGroupingTestServiceImpl extends AzureServiceClient implements AutoRestParameterGroupingTestService {
+public final class AutoRestParameterGroupingTestServiceImpl extends AzureServiceClient {
     /** The URL used as the base for all cloud service requests. */
     private final AutoRestBaseUrl baseUrl;
     /** the {@link AzureClient} used for long running operations. */
@@ -121,11 +121,11 @@ public void setGenerateClientRequestId(boolean generateClientRequestId) {
     }
 
     /**
-     * Gets the ParameterGroupingOperations object to access its operations.
-     * @return the ParameterGroupingOperations object.
+     * Gets the ParameterGroupingsInner object to access its operations.
+     * @return the ParameterGroupingsInner object.
      */
-    public ParameterGroupingOperations getParameterGroupingOperations() {
-        return new ParameterGroupingOperationsImpl(this.retrofitBuilder.client(clientBuilder.build()).build(), this);
+    public ParameterGroupingsInner parameterGroupings() {
+        return new ParameterGroupingsInner(this.retrofitBuilder.client(clientBuilder.build()).build(), this);
     }
 
     /**