Skip to content

Commit

Permalink
Incorporate API Review feedback
Browse files Browse the repository at this point in the history 
Part of dotnet#24743
  • Loading branch information
@bricelam
bricelam committed Jul 30, 2021
1 parent 428c37d commit 6a1d9de
Show file tree
Hide file tree
Showing 9 changed files with 23 additions and 23 deletions.
10 changes: 5 additions & 5 deletions src/EFCore.Design/Design/OperationExecutor.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -488,10 +488,10 @@ private IEnumerable<IDictionary> GetMigrationsImpl(
/// <summary>
/// Represents an operation to generate a compiled model from the DbContext.
/// </summary>
public class Optimize : OperationBase
public class OptimizeContext : OperationBase
{
/// <summary>
/// <para>Initializes a new instance of the <see cref="Optimize" /> class.</para>
/// <para>Initializes a new instance of the <see cref="OptimizeContext" /> class.</para>
/// <para>The arguments supported by <paramref name="args" /> are:</para>
/// <para><c>outputDir</c>--The directory to put files in. Paths are relative to the project directory.</para>
/// <para><c>modelNamespace</c>--Specify to override the namespace of the generated model.</para>
Expand All @@ -500,7 +500,7 @@ public class Optimize : OperationBase
/// <param name="executor"> The operation executor. </param>
/// <param name="resultHandler"> The <see cref="IOperationResultHandler" />. </param>
/// <param name="args"> The operation arguments. </param>
public Optimize(
public OptimizeContext(
OperationExecutor executor,
IOperationResultHandler resultHandler,
IDictionary args)
Expand All @@ -513,11 +513,11 @@ public Optimize(
var modelNamespace = (string?)args["modelNamespace"];
var contextType = (string?)args["contextType"];

Execute(() => executor.OptimizeImpl(outputDir, modelNamespace, contextType));
Execute(() => executor.OptimizeContextImpl(outputDir, modelNamespace, contextType));
}
}

private void OptimizeImpl(string? outputDir, string? modelNamespace, string? contextType)
private void OptimizeContextImpl(string? outputDir, string? modelNamespace, string? contextType)
=> ContextOperations.Optimize(outputDir, modelNamespace, contextType);

/// <summary>
Expand Down
6 changes: 3 additions & 3 deletions src/EFCore.InMemory/Infrastructure/InMemoryDbContextOptionsBuilder.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,14 +46,14 @@ DbContextOptionsBuilder IInMemoryDbContextOptionsBuilderInfrastructure.OptionsBu
/// Enables nullability check for all properties across all entities within the in-memory database.
/// </para>
/// </summary>
/// <param name="nullabilityCheckEnabled"> If <see langword="true" />, then nullability check is enforced. </param>
/// <param name="nullChecksEnabled"> If <see langword="true" />, then nullability check is enforced. </param>
/// <returns> The same builder instance so that multiple calls can be chained. </returns>
public virtual InMemoryDbContextOptionsBuilder EnableNullabilityCheck(bool nullabilityCheckEnabled = true)
public virtual InMemoryDbContextOptionsBuilder EnableNullChecks(bool nullChecksEnabled = true)
{
var extension = OptionsBuilder.Options.FindExtension<InMemoryOptionsExtension>()
?? new InMemoryOptionsExtension();

extension = extension.WithNullabilityCheckEnabled(nullabilityCheckEnabled);
extension = extension.WithNullabilityCheckEnabled(nullChecksEnabled);

((IDbContextOptionsBuilderInfrastructure)OptionsBuilder).AddOrUpdateExtension(extension);

Expand Down
2 changes: 1 addition & 1 deletion src/EFCore.Relational/Query/RelationalCollectionShaperExpression.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ public RelationalCollectionShaperExpression(
/// A unique id for this collection shaper.
/// </summary>
[Obsolete("CollectionId are not stored in shaper anymore. Shaper compiler assigns it as needed.")]
public virtual int? CollectionId { get; }
public virtual int CollectionId { get; }

/// <summary>
/// The identifier for the parent element.
Expand Down
2 changes: 1 addition & 1 deletion src/EFCore.Relational/Query/RelationalSplitCollectionShaperExpression.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ public RelationalSplitCollectionShaperExpression(
/// A unique id for this collection shaper.
/// </summary>
[Obsolete("CollectionId are not stored in shaper anymore. Shaper compiler assigns it as needed.")]
public virtual int? CollectionId { get; }
public virtual int CollectionId { get; }

/// <summary>
/// The identifier for the parent element.
Expand Down
2 changes: 1 addition & 1 deletion src/ef/Commands/DbContextOptimizeCommand.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ internal partial class DbContextOptimizeCommand
protected override int Execute(string[] args)
{
using var executor = CreateExecutor(args);
executor.Optimize(
executor.OptimizeContext(
_outputDir!.Value(),
_namespace!.Value(),
Context!.Value());
Expand Down
2 changes: 1 addition & 1 deletion src/ef/IOperationExecutor.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ internal interface IOperationExecutor : IDisposable
IDictionary GetContextInfo(string? name);
void UpdateDatabase(string? migration, string? connectionString, string? contextType);
IEnumerable<IDictionary> GetContextTypes();
void Optimize(string? outputDir, string? modelNamespace, string? contextType);
void OptimizeContext(string? outputDir, string? modelNamespace, string? contextType);

IDictionary ScaffoldContext(
string provider,
Expand Down
4 changes: 2 additions & 2 deletions src/ef/OperationExecutorBase.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -140,9 +140,9 @@ public void UpdateDatabase(string? migration, string? connectionString, string?
public IEnumerable<IDictionary> GetContextTypes()
=> InvokeOperation<IEnumerable<IDictionary>>("GetContextTypes");

public void Optimize(string? outputDir, string? modelNamespace, string? contextType)
public void OptimizeContext(string? outputDir, string? modelNamespace, string? contextType)
=> InvokeOperation(
"Optimize",
"OptimizeContext",
new Dictionary<string, object?>
{
["outputDir"] = outputDir,
Expand Down
16 changes: 8 additions & 8 deletions test/EFCore.InMemory.FunctionalTests/NullabilityCheckInMemoryTest.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public void IsRequired_for_property_throws_while_inserting_null_value()

var optionsBuilder = new DbContextOptionsBuilder()
.UseModel(modelBuilder.FinalizeModel())
.UseInMemoryDatabase(nameof(NullabilityCheckInMemoryTest), b => b.EnableNullabilityCheck())
.UseInMemoryDatabase(nameof(NullabilityCheckInMemoryTest), b => b.EnableNullChecks())
.UseInternalServiceProvider(Fixture.ServiceProvider);

using var context = new DbContext(optionsBuilder.Options);
Expand All @@ -53,7 +53,7 @@ public void IsRequired_for_property_throws_while_inserting_null_value_sensitive(

var optionsBuilder = new DbContextOptionsBuilder()
.UseModel(modelBuilder.FinalizeModel())
.UseInMemoryDatabase(nameof(NullabilityCheckInMemoryTest), b => b.EnableNullabilityCheck())
.UseInMemoryDatabase(nameof(NullabilityCheckInMemoryTest), b => b.EnableNullChecks())
.UseInternalServiceProvider(InMemoryFixture.DefaultNullabilitySensitiveCheckProvider)
.EnableSensitiveDataLogging();

Expand All @@ -80,7 +80,7 @@ public void IsRequired_for_property_throws_while_inserting_null_value_sensitive_

var optionsBuilder = new DbContextOptionsBuilder()
.UseModel(modelBuilder.FinalizeModel())
.UseInMemoryDatabase(nameof(NullabilityCheckInMemoryTest), b => b.EnableNullabilityCheck())
.UseInMemoryDatabase(nameof(NullabilityCheckInMemoryTest), b => b.EnableNullChecks())
.UseInternalServiceProvider(InMemoryFixture.DefaultNullabilitySensitiveCheckProvider)
.EnableSensitiveDataLogging();

Expand All @@ -103,7 +103,7 @@ public void RequiredAttribute_for_property_throws_while_inserting_null_value()

var optionsBuilder = new DbContextOptionsBuilder()
.UseModel(modelBuilder.FinalizeModel())
.UseInMemoryDatabase(nameof(NullabilityCheckInMemoryTest), b => b.EnableNullabilityCheck())
.UseInMemoryDatabase(nameof(NullabilityCheckInMemoryTest), b => b.EnableNullChecks())
.UseInternalServiceProvider(Fixture.ServiceProvider);

using var context = new DbContext(optionsBuilder.Options);
Expand All @@ -127,7 +127,7 @@ public void RequiredAttribute_And_IsRequired_for_properties_throws_while_inserti

var optionsBuilder = new DbContextOptionsBuilder()
.UseModel(modelBuilder.FinalizeModel())
.UseInMemoryDatabase(nameof(NullabilityCheckInMemoryTest), b => b.EnableNullabilityCheck())
.UseInMemoryDatabase(nameof(NullabilityCheckInMemoryTest), b => b.EnableNullChecks())
.UseInternalServiceProvider(Fixture.ServiceProvider);

using var context = new DbContext(optionsBuilder.Options);
Expand All @@ -144,7 +144,7 @@ public void Can_insert_null_value_with_IsRequired_for_property_if_nullability_ch

var optionsBuilder = new DbContextOptionsBuilder()
.UseModel(modelBuilder.FinalizeModel())
.UseInMemoryDatabase(Guid.NewGuid().ToString(), b => b.EnableNullabilityCheck(false))
.UseInMemoryDatabase(Guid.NewGuid().ToString(), b => b.EnableNullChecks(false))
.UseInternalServiceProvider(InMemoryFixture.DefaultNullabilityCheckProvider);

using var context = new DbContext(optionsBuilder.Options);
Expand All @@ -162,7 +162,7 @@ public void Can_insert_null_value_with_RequiredAttribute_for_property_if_nullabi

var optionsBuilder = new DbContextOptionsBuilder()
.UseModel(modelBuilder.FinalizeModel())
.UseInMemoryDatabase(nameof(NullabilityCheckInMemoryTest), b => b.EnableNullabilityCheck(false))
.UseInMemoryDatabase(nameof(NullabilityCheckInMemoryTest), b => b.EnableNullChecks(false))
.UseInternalServiceProvider(InMemoryFixture.DefaultNullabilityCheckProvider);

using var context = new DbContext(optionsBuilder.Options);
Expand All @@ -180,7 +180,7 @@ public void Can_insert_null_values_with_RequiredAttribute_and_IsRequired_for_pro

var optionsBuilder = new DbContextOptionsBuilder()
.UseModel(modelBuilder.FinalizeModel())
.UseInMemoryDatabase(nameof(NullabilityCheckInMemoryTest), b => b.EnableNullabilityCheck(false))
.UseInMemoryDatabase(nameof(NullabilityCheckInMemoryTest), b => b.EnableNullChecks(false))
.UseInternalServiceProvider(InMemoryFixture.DefaultNullabilityCheckProvider);

using var context = new DbContext(optionsBuilder.Options);
Expand Down
2 changes: 1 addition & 1 deletion test/EFCore.InMemory.Tests/ModelBuilding/InMemoryModelBuilderGenericTest.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public virtual void Can_use_self_referencing_overlapping_FK_PK()
var contextOptions = new DbContextOptionsBuilder()
.UseModel(modelBuilder.Model.FinalizeModel())
.UseInternalServiceProvider(InMemoryFixture.DefaultNullabilityCheckProvider)
.UseInMemoryDatabase("Can_use_self_referencing_overlapping_FK_PK", b => b.EnableNullabilityCheck(false))
.UseInMemoryDatabase("Can_use_self_referencing_overlapping_FK_PK", b => b.EnableNullChecks(false))
.Options;

using (var context = new DbContext(contextOptions))
Expand Down

0 comments on commit 6a1d9de

Please sign in to comment.