Skip to content

Commit f510319

Browse files
gregwintersteingathogojr
authored andcommitted
Update for changes introduced with pull request #364 (fix CLI exclusions)
1 parent ed9f241 commit f510319

1 file changed

Lines changed: 7 additions & 3 deletions

File tree

src/Microsoft.OData.Cli/GenerateCommand.cs

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -247,6 +247,10 @@ private TServiceConfig GetServiceConfiguration<TServiceConfig>(GenerateOptions g
247247
}
248248

249249
var namespacePrefix = string.IsNullOrEmpty(generateOptions.NamespacePrefix) ? fileOptions?.NamespacePrefix : generateOptions.NamespacePrefix;
250+
var excludedSchemaTypes = generateOptions.ExcludedSchemaTypes?.Split(",").Select(type => type.Trim()).ToList();
251+
var excludedBoundOperations = generateOptions.ExcludedBoundOperations?.Split(",").Select(type => type.Trim()).ToList();
252+
var excludedOperationImports = generateOptions.ExcludedOperationImports?.Split(",").Select(type => type.Trim()).ToList();
253+
250254
serviceConfig = new TServiceConfig
251255
{
252256
Endpoint = string.IsNullOrEmpty(generateOptions.MetadataUri) ? fileOptions?.Endpoint : generateOptions.MetadataUri,
@@ -265,7 +269,7 @@ private TServiceConfig GetServiceConfiguration<TServiceConfig>(GenerateOptions g
265269
UseDataServiceCollection = generateOptions.EnableTracking || (fileOptions?.UseDataServiceCollection ?? false),
266270
MakeTypesInternal = generateOptions.EnableInternal || (fileOptions?.MakeTypesInternal ?? false),
267271
GenerateMultipleFiles = generateOptions.MultipleFiles || (fileOptions?.GenerateMultipleFiles ?? false),
268-
ExcludedSchemaTypes = generateOptions.ExcludedSchemaTypes != null && generateOptions.ExcludedSchemaTypes.Any() ? generateOptions.ExcludedSchemaTypes : fileOptions?.ExcludedSchemaTypes,
272+
ExcludedSchemaTypes = excludedSchemaTypes != null && excludedSchemaTypes.Any() ? excludedSchemaTypes : fileOptions?.ExcludedSchemaTypes,
269273
};
270274

271275
if (serviceConfig is ServiceConfigurationV4)
@@ -275,8 +279,8 @@ private TServiceConfig GetServiceConfiguration<TServiceConfig>(GenerateOptions g
275279
serviceConfigurationV4.EnableNamingAlias = generateOptions.UpperCamelCase || (fileOptions?.EnableNamingAlias ?? false);
276280
serviceConfigurationV4.IgnoreUnexpectedElementsAndAttributes = generateOptions.IgnoreUnexpectedElements || (fileOptions?.IgnoreUnexpectedElementsAndAttributes ?? false);
277281
serviceConfigurationV4.IncludeT4File = fileOptions?.IncludeT4File ?? false;
278-
serviceConfigurationV4.ExcludedOperationImports = generateOptions.ExcludedOperationImports != null && generateOptions.ExcludedOperationImports.Any() ? generateOptions.ExcludedOperationImports : fileOptions?.ExcludedOperationImports;
279-
serviceConfigurationV4.ExcludedBoundOperations = generateOptions.ExcludedBoundOperations != null && generateOptions.ExcludedBoundOperations.Any() ? generateOptions.ExcludedBoundOperations : fileOptions?.ExcludedBoundOperations;
282+
serviceConfigurationV4.ExcludedOperationImports = excludedOperationImports != null && excludedOperationImports.Any() ? excludedOperationImports : fileOptions?.ExcludedOperationImports;
283+
serviceConfigurationV4.ExcludedBoundOperations = excludedBoundOperations != null && excludedBoundOperations.Any() ? excludedBoundOperations : fileOptions?.ExcludedBoundOperations;
280284
}
281285

282286
return serviceConfig;

0 commit comments

Comments
 (0)