Add command-line option for ConnectedService.json file

src/Microsoft.OData.Cli/GenerateOptions.cs

@@ -13,109 +13,117 @@ namespace Microsoft.OData.Cli
     public class GenerateOptions
     {
         /// <summary>
-        /// The URI of the metadata document. The value must be set to a valid service document URI or a local file path
+        /// Gets or sets the URI of the metadata document. The value must be set to a valid service document URI or a local file path.
         /// </summary>
         public string MetadataUri { get; set; }
 
         /// <summary>
-        /// Headers that will get sent along with the request when fetching the metadata document from the service. Format: Header1:HeaderValue, Header2:HeaderValue.
+        /// Gets or sets headers that will get sent along with the request when fetching the metadata document from the service. Format: Header1:HeaderValue, Header2:HeaderValue.
         /// </summary>
         public string CustomHeaders { get; set; }
 
         /// <summary>
-        /// Proxy settings. Format: domain\\user:password@SERVER:PORT.
+        /// Gets or sets the proxy settings. Format: domain\\user:password@SERVER:PORT.
         /// </summary>
         public string Proxy { get; set; }
 
         /// <summary>
-        /// The name of the generated file name
+        /// Gets or sets the name of the generated file name. Defaults to Reference.vb/.cs when not provided.
         /// </summary>
         public string FileName { get; set; }
 
         /// <summary>
-        /// The namespace of the client code generated.
-        /// Example: ODataCliCodeGeneratorSample.NorthWindModel or ODataCliCodeGeneratorSample or it could be a name related to the OData endpoint.
+        /// Gets or sets the namespace for the generated service proxy classes.
         /// </summary>
+        /// <remarks>
+        /// Must be a valid C# identifier name, e.g., MyService.Models.
+        /// When not provided, a namespace that corresponds to the one that the models of the OData service are defined in is used.
+        /// </remarks>
         public string NamespacePrefix { get; set; }
 
         /// <summary>
-        /// Disables entity and property tracking
+        /// Gets or sets a value that determines whether to enable entity and property tracking.
         /// </summary>
-        public bool EnableTracking { get; set; }
+        public bool? EnableTracking { get; set; }
 
         /// <summary>
         /// Gets or sets a value indicating whether to omit runtime version and code generation timestamp from the generated files.
         /// </summary>
-        public bool OmitVersioningInfo { get; set; }
+        public bool? OmitVersioningInfo { get; set; }
 
         /// <summary>
-        /// Disables/Enables upper camel casing
+        /// Gets or sets a value that determines whether to use C# casing style.
         /// </summary>
-        public bool UpperCamelCase { get; set; }
+        public bool? UpperCamelCase { get; set; }
 
         /// <summary>
-        /// Apply the "internal" class modifier on generated classes instead of "public" thereby making them invisible outside the assembly.
+        /// Gets or sets a value that determines whether to apply the "internal" class modifier on generated classes instead of "public" thereby making them invisible outside the assembly.
         /// </summary>
-        public bool EnableInternal { get; set; }
+        public bool? EnableInternal { get; set; }
 
         /// <summary>
-        /// Split the generated classes into separate files instead of generating all the code in a single file.
+        /// Gets or sets a value that determines whether to split the generated classes into separate files instead of generating all the code in a single file.
         /// </summary>
-        public bool MultipleFiles { get; set; }
+        public bool? MultipleFiles { get; set; }
 
         /// <summary>
-        /// Comma-separated list of the names of operation imports to exclude from the generated code. Example: ExcludedOperationImport1,ExcludedOperationImport2.
+        /// Gets or sets the comma-separated list of the names of operation imports to exclude from the generated code. Example: ExcludedOperationImport1,ExcludedOperationImport2.
         /// </summary>
         public string ExcludedOperationImports { get; set; }
 
         /// <summary>
-        /// Comma-separated list of the names of bound operations to exclude from the generated code.Example: BoundOperation1,BoundOperation2.
+        /// Gets or sets the comma-separated list of the names of bound operations to exclude from the generated code.Example: BoundOperation1,BoundOperation2.
         /// </summary>
         public string ExcludedBoundOperations { get; set; }
 
         /// <summary>
-        /// Comma-separated list of the names of entity types to exclude from the generated code.Example: EntityType1,EntityType2,EntityType3.
+        /// Gets or sets the comma-separated list of the names of entity types to exclude from the generated code.Example: EntityType1,EntityType2,EntityType3.
         /// </summary>
         public string ExcludedSchemaTypes { get; set; }
 
         /// <summary>
-        /// This flag indicates whether to ignore unexpected elements and attributes in the metadata document and generate the client code if any.
+        /// Gets or sets a value that determines whether to ignore unexpected elements and attributes in the metadata document and generate the client code if any.
         /// </summary>
-        public bool IgnoreUnexpectedElements { get; set; }
+        public bool? IgnoreUnexpectedElements { get; set; }
 
         /// <summary>
-        /// Full path to output directory
+        /// Gets or sets the path to output directory
         /// </summary>
         public string OutputDir { get; set; }
 
         /// <summary>
-        /// Web proxy network credentials username
+        /// Gets or sets the web proxy network credentials username.
         /// </summary>
         public string WebProxyNetworkCredentialsUsername { get; set; }
 
         /// <summary>
-        /// Web proxy network credentials password
+        /// Gets or sets the web proxy network credentials password.
         /// </summary>
         public string WebProxyNetworkCredentialsPassword { get; set; }
 
         /// <summary>
-        /// Web proxy network credentials domain
+        /// Gets or sets the web proxy network credentials domain.
         /// </summary>
         public string WebProxyNetworkCredentialsDomain { get; set; }
 
         /// <summary>
-        /// A flag to indicate whether to include the web proxy or not
+        /// Gets or sets a value that determines whether to include the web proxy or not.
         /// </summary>
         public bool IncludeWebProxy { get; set; }
 
         /// <summary>
-        /// A web proxy host
+        /// Gets or sets the web proxy host.
         /// </summary>
         public string WebProxyHost { get; set; }
 
         /// <summary>
-        /// A flag to indicate whether to include web proxy network credentials or not.
+        /// Gets or sets a value that determines whether to include web proxy network credentials or not.
         /// </summary>
         public bool IncludeWebProxyNetworkCredentials { get; set; }
+
+        /// <summary>
+        /// Gets or sets the path to OData Connected Service config file (i.e., ConnectedService.json)
+        /// </summary>
+        public string ConfigFile { get; set; }
     }
 }

src/Microsoft.OData.Cli/Models/ConnectedServiceFileData.cs

@@ -0,0 +1,27 @@
+//-----------------------------------------------------------------------------
+// <copyright file="ConnectedServiceFileData.cs" company=".NET Foundation">
+//      Copyright (c) .NET Foundation and Contributors. All rights reserved. 
+//      See License.txt in the project root for license information.
+// </copyright>
+//----------------------------------------------------------------------------
+
+using Microsoft.OData.CodeGen.Models;
+
+namespace Microsoft.OData.Cli.Models
+{
+    /// <summary>
+    /// Represents OData Connected Service config file
+    /// </summary>
+    public class ConnectedServiceFileData
+    {
+        /// <summary>
+        /// Gets or sets the unique Provider ID for the provider/handler. This is used to match a provider with its handlers.
+        /// </summary>
+        public string ProviderId { get; set; }
+
+        /// <summary>
+        /// Gets or sets the OData Connected Service user settings extracted from ConnectedService.json.
+        /// </summary>
+        public BaseUserSettings ExtendedData { get; set; }
+    }
+}

src/Microsoft.OData.CodeGen/Microsoft.OData.CodeGen.csproj

@@ -83,6 +83,8 @@
     <Compile Include="FileHandling\ODataFileOptions.cs" />
     <Compile Include="Logging\IMessageLogger.cs" />
     <Compile Include="Logging\LogMessageCategory.cs" />
+    <Compile Include="Logging\LogMessageCategory.cs" />
+    <Compile Include="Models\BaseUserSettings.cs" />
     <Compile Include="PackageInstallation\IPackageInstaller.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Models\BoundOperationModel.cs" />