Merge pull request #27 from microsoftgraph/shiftylogic/working

Fixing a bug introduced in the last set of changes plus fixing a few …

Author: shiftylogic

Templates/CSharp/Requests/MethodRequestBuilder.cs.tt

@@ -53,7 +53,7 @@ var methods = overloads
 
 #>
 
-namespace Microsoft.Graph
+namespace <#=method.Namespace.GetNamespaceName()#>
 {
     using System;
     using System.Collections.Generic;

src/GraphODataTemplateWriter/CodeHelpers/ObjC/CodeWriterObjC.cs

@@ -36,17 +36,17 @@ public override string WriteOpeningCommentLine()
             return "";
         }
 
-        public override string WriteClosingCommentLine() 
+        public override string WriteClosingCommentLine()
         {
             return this.NewLineCharacter;
         }
 
-        public override string WriteInlineCommentChar() 
+        public override string WriteInlineCommentChar()
         {
             return "// ";
         }
 
-        public string GetInterfaceLine(OdcmClass entityType, string baseClass = null) 
+        public string GetInterfaceLine(OdcmClass entityType, string baseClass = null)
         {
             string baseEntity = null;
             if (baseClass != null)
@@ -59,7 +59,7 @@ public string GetInterfaceLine(OdcmClass entityType, string baseClass = null)
                                            : this.GetPrefix() + entityType.Base.Name.Substring(entityType.Base.Name.LastIndexOf(".") + 1);
             }
             var interfaceLineBuilder = new StringBuilder();
-            // NSObject lives in Foundation/Foundation.h 
+            // NSObject lives in Foundation/Foundation.h
             var baseImport = (baseEntity.Equals("NSObject")) ? "#import <Foundation/Foundation.h>" : String.Format("#import \"{0}.h\"", baseEntity);
             interfaceLineBuilder.AppendLine(baseImport);
 
@@ -69,7 +69,7 @@ public string GetInterfaceLine(OdcmClass entityType, string baseClass = null)
             return interfaceLineBuilder.ToString();
         }
 
-        public string GetHeaderDoc(string name) 
+        public string GetHeaderDoc(string name)
         {
 
             var stringBuilder = new StringBuilder();
@@ -80,7 +80,7 @@ public string GetHeaderDoc(string name)
             return stringBuilder.ToString();
         }
 
-        public string GetImplementationDoc(string name) 
+        public string GetImplementationDoc(string name)
         {
             var stringBuilder = new StringBuilder();
             stringBuilder.Append(@"/**");
@@ -90,16 +90,16 @@ public string GetImplementationDoc(string name)
             return stringBuilder.ToString();
         }
 
-        public string GetMethodDoc(string name, List<OdcmProperty> parameters) 
+        public string GetMethodDoc(string name, List<OdcmProperty> parameters)
         {
             return "";
         }
-        
-        public string GetParamsForRaw(IEnumerable<string> parameters) 
+
+        public string GetParamsForRaw(IEnumerable<string> parameters)
         {
             string param = "With";
 
-            foreach (var p in parameters) 
+            foreach (var p in parameters)
             {
                 param += param == "With" ? string.Format("{0}:(NSString *) {1} ", char.ToUpper(p[0]) + p.Substring(1), p.ToLowerFirstChar()) :
                  string.Format("{0}:(NSString *) {0} ", p.ToLowerFirstChar());
@@ -110,12 +110,12 @@ public string GetParamsForRaw(IEnumerable<string> parameters)
             return param;
         }
 
-        public string GetParamRaw(string type) 
+        public string GetParamRaw(string type)
         {
             return "NSString *" + type.ToLowerFirstChar();
         }
 
-        public string GetImportsClass(IEnumerable<OdcmProperty> references, IEnumerable<string> extraImports = null, IEnumerable<string> extraClasses = null) 
+        public string GetImportsClass(IEnumerable<OdcmProperty> references, IEnumerable<string> extraImports = null, IEnumerable<string> extraClasses = null)
         {
             if (references != null && references.Any())
             {
@@ -173,7 +173,7 @@ public string GetImportsClass(IEnumerable<OdcmProperty> references, IEnumerable<
             return "";
         }
 
-        public string GetParametersToJsonRaw(IEnumerable<string> parameters) 
+        public string GetParametersToJsonRaw(IEnumerable<string> parameters)
         {
             if (!parameters.Any()) { return new StringBuilder().AppendLine().ToString(); }
 
@@ -260,7 +260,7 @@ public string GetParamsString(IEnumerable<OdcmParameter> parameters)
                     else
                     {
                         param += string.Format("{0}:({1}){2}", paramName, p.Type.GetFullType(), p.Name.ToLowerFirstChar());
-                    }                
+                    }
                 }
                 param += " ";
             }
@@ -326,7 +326,7 @@ public string GetGetterString(string propertyName)
         {
             //Fixes names that violate semantic rules for methods that
             //create owned objects
-            
+
             if(SemanticOwnedObjectsKeywords.Any(x => propertyName.StartsWith(x,StringComparison.OrdinalIgnoreCase)))
             {
                 return "get" + propertyName.ToPascalize();
@@ -338,7 +338,6 @@ public string GetGetterString(string propertyName)
         public string GetPropertyDeclaration(string propertyName, string type)
         {
             var getterName = this.GetGetterString(propertyName);
-            var setterName = "set" + propertyName.ToPascalize();
 
             return "@property (nonatomic, getter=" + getterName + ") " + type + " " + propertyName + ";";
         }

src/GraphODataTemplateWriter/Extensions/OdcmModelExtensions.cs

@@ -137,7 +137,7 @@ public static OdcmProperty GetServiceCollectionNavigationPropertyForPropertyType
             // Try to find the first collection navigation property for the specified type directly on the service
             // class object. Use First() instead of FirstOrDefault() so template generation would fail if not found
             // instead of silently continuing. If an entity is used in a reference property a navigation collection
-            // on the client for that type is required. 
+            // on the client for that type is required.
             return odcmProperty
                 .Class
                 .Namespace
@@ -198,8 +198,6 @@ public static OdcmClass AsOdcmClass(this OdcmObject odcmObject)
 
         public static OdcmEnum AsOdcmEnum(this OdcmObject odcmObject)
         {
-            OdcmEnum foo = odcmObject as OdcmEnum;
-            var bar = foo.Members.LastOrDefault();
             return odcmObject as OdcmEnum;
         }
 

src/GraphODataTemplateWriter/TemplateProcessor/TemplateWriter.cs

@@ -33,7 +33,6 @@ private string PathWriterClassNameFormatString
         private void SetTemplatesDirectory(string templatesDirectory, bool relative = true)
         {
             string programDir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
-            string relativeTemplatesDirectory = templatesDirectory ?? "Templates";
 
             this.TemplatesDirectory = (relative) ? Path.Combine(programDir, templatesDirectory) : templatesDirectory;