Prefer model xml name only if present in XML properties (#268)

* Prefer model xml name if present in XML properties, otherwise use property XML name * Bump to v2.0.21
Azure · Jul 10, 2018 · cd3d5d4 · cd3d5d4
1 parent 65f93d6
commit cd3d5d4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 13 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@microsoft.azure/autorest.java",
-  "version": "2.0.20",
+  "version": "2.0.21",
   "description": "The Java extension for classic generators in AutoRest.",
   "scripts": {
     "autorest": "autorest",
@@ -53,4 +53,4 @@
   "dependencies": {
     "dotnet-2.0.0": "^1.1.0"
   }
-}
+}
diff --git a/src/JavaCodeGenerator.cs b/src/JavaCodeGenerator.cs
@@ -1775,20 +1775,14 @@ private static ServiceModelProperty ParseModelProperty(AutoRestProperty autoRest
             }
 
             string xmlName;
-            if (autoRestProperty.ModelType is AutoRestCompositeType)
+            try
             {
-                xmlName = autoRestProperty.ModelType.XmlName;
+                xmlName = autoRestProperty.ModelType.XmlProperties?.Name
+                    ?? autoRestProperty.XmlName;
             }
-            else
+            catch
             {
-                try
-                {
-                    xmlName = autoRestProperty.XmlName;
-                }
-                catch
-                {
-                    xmlName = null;
-                }
+                xmlName = null;
             }
 
             List<string> annotationArgumentList = new List<string>()