Skip to content

Commit 3de22b5

Browse files
sergey-shandarsergey-shandar
committed
rename
1 parent a318191 commit 3de22b5

15 files changed

+39
-39
lines changed

‎src/ResourceManager/Common/Commands.Common.Strategies/Commands.Common.Strategies.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,9 @@
7676
<Compile Include="GetAsyncOperation.cs" />
7777
<Compile Include="GetAsyncParams.cs" />
7878
<Compile Include="IClient.cs" />
79-
<Compile Include="IResourceBaseConfig.cs" />
80-
<Compile Include="IResourceBaseConfigVisitor.cs" />
81-
<Compile Include="IResourceBaseStrategy.cs" />
79+
<Compile Include="IEntityConfig.cs" />
80+
<Compile Include="IEntityConfigVisitor.cs" />
81+
<Compile Include="IEntityStrategy.cs" />
8282
<Compile Include="IState.cs" />
8383
<Compile Include="TargetDependencies.cs" />
8484
<Compile Include="TypedDictionary.cs" />

‎src/ResourceManager/Common/Commands.Common.Strategies/CreateOrUpdateAsyncOperation.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,11 @@ public Task CreateOrUpdateAsync<Model, ParentModel>(NestedResourceConfig<Model,
5959
where ParentModel : class
6060
=> CreateOrUpdateAsync(config.Parent);
6161

62-
public Task CreateOrUpdateAsync(IResourceBaseConfig config)
62+
public Task CreateOrUpdateAsync(IEntityConfig config)
6363
=> config.Accept(new Visitor(), this);
6464
}
6565

66-
sealed class Visitor : IResourceBaseConfigVisitor<Context, Task>
66+
sealed class Visitor : IEntityConfigVisitor<Context, Task>
6767
{
6868
public Task Visit<Model>(ResourceConfig<Model> config, Context context)
6969
where Model : class

‎src/ResourceManager/Common/Commands.Common.Strategies/GetAsyncOperation.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public static async Task<IState> GetAsync<Model>(
1919
return context.Result;
2020
}
2121

22-
static Task AddStateAsyncResourceBase(this AsyncOperationContext context, IResourceBaseConfig config)
22+
static Task AddStateAsyncResourceBase(this AsyncOperationContext context, IEntityConfig config)
2323
=> config.Accept(new AddStateAsyncVisitor(), context);
2424

2525
static async Task AddStateAsync<Model>(this AsyncOperationContext context, ResourceConfig<Model> config)
@@ -58,7 +58,7 @@ static Task AddStateAsync<Model, ParentModel>(
5858
where ParentModel : class
5959
=> context.AddStateAsyncResourceBase(config.Parent);
6060

61-
sealed class AddStateAsyncVisitor : IResourceBaseConfigVisitor<AsyncOperationContext, Task>
61+
sealed class AddStateAsyncVisitor : IEntityConfigVisitor<AsyncOperationContext, Task>
6262
{
6363
public Task Visit<Model>(
6464
ResourceConfig<Model> config, AsyncOperationContext context)

‎src/ResourceManager/Common/Commands.Common.Strategies/IResourceBaseConfig.cs renamed to ‎src/ResourceManager/Common/Commands.Common.Strategies/IEntityConfig.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,24 @@
22

33
namespace Microsoft.Azure.Commands.Common.Strategies
44
{
5-
public interface IResourceBaseConfig
5+
public interface IEntityConfig
66
{
7-
IResourceBaseStrategy Strategy { get; }
7+
IEntityStrategy Strategy { get; }
88

99
string Name { get; }
1010

1111
Result Accept<Context, Result>(
12-
IResourceBaseConfigVisitor<Context, Result> visitor, Context context);
12+
IEntityConfigVisitor<Context, Result> visitor, Context context);
1313

1414
IEnumerable<string> GetId(string subscription);
1515

1616
IResourceConfig Resource { get; }
1717
}
1818

19-
public interface IResourceBaseConfig<Model> : IResourceBaseConfig
19+
public interface IResourceBaseConfig<Model> : IEntityConfig
2020
where Model : class
2121
{
2222
Result Accept<Context, Result>(
23-
IResourceBaseConfigVisitor<Model, Context, Result> visitor, Context context);
23+
IEntityConfigVisitor<Model, Context, Result> visitor, Context context);
2424
}
2525
}

‎src/ResourceManager/Common/Commands.Common.Strategies/IResourceBaseConfigVisitor.cs renamed to ‎src/ResourceManager/Common/Commands.Common.Strategies/IEntityConfigVisitor.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
namespace Microsoft.Azure.Commands.Common.Strategies
22
{
3-
public interface IResourceBaseConfigVisitor<Context, Result>
3+
public interface IEntityConfigVisitor<Context, Result>
44
{
55
Result Visit<Model>(ResourceConfig<Model> config, Context context)
66
where Model : class;
@@ -11,7 +11,7 @@ Result Visit<Model, ParentModel>(
1111
where ParentModel : class;
1212
}
1313

14-
public interface IResourceBaseConfigVisitor<Model, Context, Result>
14+
public interface IEntityConfigVisitor<Model, Context, Result>
1515
where Model : class
1616
{
1717
Result Visit(ResourceConfig<Model> config, Context context);

‎src/ResourceManager/Common/Commands.Common.Strategies/IResourceBaseStrategy.cs renamed to ‎src/ResourceManager/Common/Commands.Common.Strategies/IEntityStrategy.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
namespace Microsoft.Azure.Commands.Common.Strategies
22
{
3-
public interface IResourceBaseStrategy
3+
public interface IEntityStrategy
44
{
55
}
66
}

‎src/ResourceManager/Common/Commands.Common.Strategies/IState.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ public interface IState
88
Model Get<Model>(ResourceConfig<Model> config)
99
where Model : class;
1010

11-
bool Contains(IResourceBaseConfig config);
11+
bool Contains(IEntityConfig config);
1212
}
1313

1414
public static class StateExtensions
@@ -24,7 +24,7 @@ public static Model GetResourceBase<Model>(
2424
where Model : class
2525
=> config.Accept(new GetVisitor<Model>(), state);
2626

27-
sealed class GetVisitor<Model> : IResourceBaseConfigVisitor<Model, IState, Model>
27+
sealed class GetVisitor<Model> : IEntityConfigVisitor<Model, IState, Model>
2828
where Model : class
2929
{
3030
public Model Visit(ResourceConfig<Model> config, IState state)

‎src/ResourceManager/Common/Commands.Common.Strategies/NestedResourceConfig.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public sealed class NestedResourceConfig<Model, ParentModel> : IResourceBaseConf
2828

2929
public Func<Model> CreateModel { get; }
3030

31-
IResourceBaseStrategy IResourceBaseConfig.Strategy => Strategy;
31+
IEntityStrategy IEntityConfig.Strategy => Strategy;
3232

3333
public IResourceConfig Resource => Parent.Resource;
3434

@@ -45,11 +45,11 @@ public NestedResourceConfig(
4545
}
4646

4747
public Result Accept<Context, Result>(
48-
IResourceBaseConfigVisitor<Context, Result> visitor, Context context)
48+
IEntityConfigVisitor<Context, Result> visitor, Context context)
4949
=> visitor.Visit(this, context);
5050

5151
public Result Accept<Context, Result>(
52-
IResourceBaseConfigVisitor<Model, Context, Result> visitor, Context context)
52+
IEntityConfigVisitor<Model, Context, Result> visitor, Context context)
5353
=> visitor.Visit(this, context);
5454

5555
public IEnumerable<string> GetId(string subscription)

‎src/ResourceManager/Common/Commands.Common.Strategies/NestedResourceStrategy.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
namespace Microsoft.Azure.Commands.Common.Strategies
55
{
6-
public sealed class NestedResourceStrategy<Model, ParentModel> : IResourceBaseStrategy
6+
public sealed class NestedResourceStrategy<Model, ParentModel> : IEntityStrategy
77
{
88
public Func<string, IEnumerable<string>> GetId { get; }
99

‎src/ResourceManager/Common/Commands.Common.Strategies/Network/NetworkInterfaceStrategy.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,6 @@ public static ResourceConfig<NetworkInterface> CreateNetworkInterfaceConfig(
4343
Id = networkSecurityGroup.GetId(subscription).IdToString()
4444
}
4545
},
46-
new IResourceBaseConfig[] { subnet, publicIPAddress, networkSecurityGroup });
46+
new IEntityConfig[] { subnet, publicIPAddress, networkSecurityGroup });
4747
}
4848
}

‎src/ResourceManager/Common/Commands.Common.Strategies/ResourceConfig.cs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55

66
namespace Microsoft.Azure.Commands.Common.Strategies
77
{
8-
public interface IResourceConfig : IResourceBaseConfig
8+
public interface IResourceConfig : IEntityConfig
99
{
1010
string ResourceGroupName { get; }
1111

12-
IEnumerable<IResourceBaseConfig> Dependencies { get; }
12+
IEnumerable<IEntityConfig> Dependencies { get; }
1313
}
1414

1515
public sealed class ResourceConfig<Model> : IResourceBaseConfig<Model>, IResourceConfig
@@ -23,9 +23,9 @@ public sealed class ResourceConfig<Model> : IResourceBaseConfig<Model>, IResourc
2323

2424
public Func<string, Model> CreateModel { get; }
2525

26-
public IEnumerable<IResourceBaseConfig> Dependencies { get; }
26+
public IEnumerable<IEntityConfig> Dependencies { get; }
2727

28-
IResourceBaseStrategy IResourceBaseConfig.Strategy => Strategy;
28+
IEntityStrategy IEntityConfig.Strategy => Strategy;
2929

3030
public IResourceConfig Resource => this;
3131

@@ -34,7 +34,7 @@ public ResourceConfig(
3434
string resourceGroupName,
3535
string name,
3636
Func<string, Model> createModel,
37-
IEnumerable<IResourceBaseConfig> dependencies)
37+
IEnumerable<IEntityConfig> dependencies)
3838
{
3939
Strategy = strategy;
4040
ResourceGroupName = resourceGroupName;
@@ -44,11 +44,11 @@ public ResourceConfig(
4444
}
4545

4646
public Result Accept<Context, Result>(
47-
IResourceBaseConfigVisitor<Context, Result> visitor, Context context)
47+
IEntityConfigVisitor<Context, Result> visitor, Context context)
4848
=> visitor.Visit(this, context);
4949

5050
public Result Accept<Context, Result>(
51-
IResourceBaseConfigVisitor<Model, Context, Result> visitor, Context context)
51+
IEntityConfigVisitor<Model, Context, Result> visitor, Context context)
5252
=> visitor.Visit(this, context);
5353

5454
public IEnumerable<string> GetId(string subscription)
@@ -69,7 +69,7 @@ public static ResourceConfig<Model> CreateConfig<Model>(
6969
string resourceGroupName,
7070
string name,
7171
Func<string, Model> createModel = null,
72-
IEnumerable<IResourceBaseConfig> dependencies = null)
72+
IEnumerable<IEntityConfig> dependencies = null)
7373
where Model : class, new()
7474
=> new ResourceConfig<Model>(
7575
strategy,
@@ -83,7 +83,7 @@ public static ResourceConfig<Model> CreateConfig<Model>(
8383
ResourceConfig<ResourceGroup> resourceGroup,
8484
string name,
8585
Func<string, Model> createModel = null,
86-
IEnumerable<IResourceBaseConfig> dependencies = null)
86+
IEnumerable<IEntityConfig> dependencies = null)
8787
where Model : class, new()
8888
=> strategy.CreateConfig(
8989
resourceGroup.Name,
@@ -94,7 +94,7 @@ public static ResourceConfig<Model> CreateConfig<Model>(
9494
public static string IdToString(this IEnumerable<string> id)
9595
=> "/" + string.Join("/", id);
9696

97-
public static string DefaultIdStr(this IResourceBaseConfig config)
97+
public static string DefaultIdStr(this IEntityConfig config)
9898
=> config.GetId(string.Empty).IdToString();
9999
}
100100
}

‎src/ResourceManager/Common/Commands.Common.Strategies/ResourceStrategy.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
namespace Microsoft.Azure.Commands.Common.Strategies
88
{
9-
public sealed class ResourceStrategy<Model> : IResourceBaseStrategy
9+
public sealed class ResourceStrategy<Model> : IEntityStrategy
1010
{
1111
public Func<string, IEnumerable<string>> GetId { get; }
1212

‎src/ResourceManager/Common/Commands.Common.Strategies/State.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public Model GetOrAdd<Model>(ResourceConfig<Model> config, Func<Model> f)
1313
where Model : class
1414
=> Map.GetOrAdd(config.DefaultIdStr(), _ => f()) as Model;
1515

16-
public bool Contains(IResourceBaseConfig config)
16+
public bool Contains(IEntityConfig config)
1717
=> Map.ContainsKey(config.DefaultIdStr());
1818

1919
ConcurrentDictionary<string, object> Map { get; }

‎src/ResourceManager/Common/Commands.Common.Strategies/StateLocation.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ namespace Microsoft.Azure.Commands.Common.Strategies
55
{
66
public static class StateLocation
77
{
8-
public static string GetLocation(this IState state, IResourceBaseConfig config)
8+
public static string GetLocation(this IState state, IEntityConfig config)
99
=> config.Accept(new GetLocationVisitor(), state)?.Location;
1010

11-
sealed class GetLocationVisitor : IResourceBaseConfigVisitor<IState, DependencyLocation>
11+
sealed class GetLocationVisitor : IEntityConfigVisitor<IState, DependencyLocation>
1212
{
1313
public DependencyLocation Visit<Model>(ResourceConfig<Model> config, IState state)
1414
where Model : class

‎src/ResourceManager/Common/Commands.Common.Strategies/TargetState.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public Context(IState current, string subscription, string location)
2828
Location = location;
2929
}
3030

31-
public void AddIfRequired(IResourceBaseConfig config)
31+
public void AddIfRequired(IEntityConfig config)
3232
{
3333
if (!Current.Contains(config))
3434
{
@@ -67,7 +67,7 @@ public Model GetOrAdd<Model, ParentModel>(
6767
}
6868
}
6969

70-
sealed class AddVisitor : IResourceBaseConfigVisitor<Context, Void>
70+
sealed class AddVisitor : IEntityConfigVisitor<Context, Void>
7171
{
7272
public Void Visit<Model>(ResourceConfig<Model> config, Context context)
7373
where Model : class
@@ -86,7 +86,7 @@ public Void Visit<Model, ParentModel>(
8686
}
8787
}
8888

89-
sealed class GetOrAddVisitor<Model> : IResourceBaseConfigVisitor<Model, Context, Model>
89+
sealed class GetOrAddVisitor<Model> : IEntityConfigVisitor<Model, Context, Model>
9090
where Model : class
9191
{
9292
public Model Visit(ResourceConfig<Model> config, Context context)

0 commit comments

Comments
 (0)