Merge pull request #274 from microsoftgraph/bugfix/java-import-keyword

Bugfix/java import keyword

Author: baywet

Templates/Android/BaseModel.template.tt

@@ -43,7 +43,7 @@
     }
 
     public string MethodName(OdcmObject c) {
-        return c.Name.Substring(c.Name.IndexOf(".") + 1).ToUpperFirstChar();
+        return c.Name.Substring(c.Name.IndexOf(".") + 1).SanitizePropertyName(property).ToUpperFirstChar();
     }
 
     public string MethodFullName(OdcmObject c) {

Templates/Java/BaseJavaModel.template.tt

@@ -43,7 +43,7 @@
     }
 
     public string MethodName(OdcmObject c) {
-        return c.Name.Substring(c.Name.IndexOf(".") + 1).ToUpperFirstChar();
+        return c.Name.Substring(c.Name.IndexOf(".") + 1).SanitizePropertyName(c).ToUpperFirstChar();
     }
 
     public string MethodFullName(OdcmObject c) {
@@ -1089,7 +1089,7 @@ public {1} {2}{3}{4} {{";
                 propertyName.SplitCamelCase(),
                 property.Name,
                 propertyType,
-                property.Name.SanitizePropertyName(property).ToLowerFirstChar(),
+                property.Name.ToLowerFirstChar().SanitizePropertyName(property),
 				GetSanitizedDescription(property));
         }
         return sb.ToString();

src/GraphODataTemplateWriter/CodeHelpers/CSharp/TypeHelperCSharp.cs

@@ -198,7 +198,7 @@ public static bool IsComplex(this OdcmType type)
 
         public static bool IsComplex(this string t)
         {
-            return !TypeHelperCSharp.SimpleTypes.Contains(t);
+            return !SimpleTypes.Contains(t);
         }
 
         public static string GetNamespaceName(this OdcmNamespace namespaceObject)

src/GraphODataTemplateWriter/CodeHelpers/Java/TypeHelperJava.cs

@@ -10,17 +10,11 @@ namespace Microsoft.Graph.ODataTemplateWriter.CodeHelpers.Java
 
     public static class TypeHelperJava
     {
-        private static Logger logger = LogManager.GetCurrentClassLogger();
+        private static readonly Logger logger = LogManager.GetCurrentClassLogger();
         public const string ReservedPrefix = "msgraph";
-        public static HashSet<string> ReservedNames
-        {
-            get
-            {
-                return new HashSet<string>(StringComparer.OrdinalIgnoreCase) {
-                    "abstract", "continue", "for", "new", "switch", "assert", "default", "if", "package", "synchronized", "boolean", "do", "goto", "private", "this", "break", "double", "implements", "protected", "throw", "byte", "else", "import", "public", "throws", "case", "enum", "instanceof", "return", "transient", "catch", "extends", "int", "short", "try", "char", "final", "interface", "static", "void", "class", "finally", "long", "strictfp", "volatile", "const", "float", "native", "super", "while", "true", "false", "null"
-                };
-            }
-        }
+        public static Lazy<HashSet<string>> ReservedNames { get; private set; } = new Lazy<HashSet<string>>(() => new HashSet<string>(StringComparer.OrdinalIgnoreCase) {
+                    "abstract", "continue", "for", "new", "switch", "assert", "default", "if", "package", "synchronized", "boolean", "do", "goto", "private", "this", "break", "double", "implements", "protected", "throw", "byte", "else", "import", "public", "throws", "case", "enum", "instanceof", "return", "transient", "catch", "extends", "int", "short", "try", "char", "final", "interface", "static", "void", "class", "finally", "long", "strictfp", "volatile", "const", "float", "native", "super", "while", "true", "false", "null", "import"
+                });
 
         public static string GetReservedPrefix(this OdcmType @type)
         {
@@ -73,7 +67,7 @@ public static string GetTypeString(this OdcmProperty property)
         {
             var propertyType = property.Projection.Type;
             var typeString = GetTypeString(propertyType);
-            if (propertyType.Namespace != OdcmNamespace.Edm && ReservedNames.Contains(typeString))
+            if (propertyType.Namespace != OdcmNamespace.Edm && ReservedNames.Value.Contains(typeString))
             {
                 typeString = "com.microsoft.graph.models.extensions." + typeString;
             }
@@ -95,27 +89,19 @@ public static string GetToLowerFirstCharName(this OdcmProperty property)
 
         public static string SanitizePropertyName(this string property, OdcmObject odcmProperty = null)
         {
-            if (ReservedNames.Contains(property))
+            if (ReservedNames.Value.Contains(property))
             {
-                logger.Info("Property \"{0}\" is a reserved word in Java. Converting to \"{1}{0}\"", property, ReservedPrefix);
-                return ReservedPrefix + property;
+                var result = ReservedPrefix + property.ToUpperFirstChar();
+                logger.Info($"Property \"{property}\" is a reserved word in Java. Converting to \"{result}\"");
+                return result;
             }
-
-            if (odcmProperty != null && property == odcmProperty.Name.ToUpperFirstChar())
+            else if (property == odcmProperty?.Name?.ToUpperFirstChar() && !(odcmProperty?.Name?.StartsWith("_") ?? false))
             {
-                // Check whether the property type is the same as the class name.
-                if (odcmProperty.Projection.Type.Name.ToUpperFirstChar() == odcmProperty.Name.ToUpperFirstChar())
-                {
-                    // Name the property: {metadataName} + "Property"
-                    logger.Info("Property type \"{0}\" has the same name as the class. Converting to \"{0}Property\"", property);
-                    return string.Concat(property, "Property");
-                }
-
                 // Name the property by its type. Sanitize it in case the type is a reserved name.  
-                return odcmProperty.Projection.Type.Name.ToUpperFirstChar().SanitizePropertyName(odcmProperty);
+                return odcmProperty?.Projection?.Type?.Name?.ToUpperFirstChar()?.SanitizePropertyName(odcmProperty) ?? odcmProperty?.Name?.SanitizePropertyName();
             }
-
-            return property.Replace("@", string.Empty).Replace(".", string.Empty);
+            else
+                return property?.Replace("@", string.Empty)?.Replace(".", string.Empty);
         }
 
         public static string GetToLowerImport(this OdcmProperty property)