rename

sergey-shandar · sergey-shandar · commit 3de22b5fdf33 · 2017-11-21T22:36:05.000-08:00
diff --git a/src/ResourceManager/Common/Commands.Common.Strategies/Commands.Common.Strategies.csproj b/src/ResourceManager/Common/Commands.Common.Strategies/Commands.Common.Strategies.csproj
@@ -76,9 +76,9 @@
     <Compile Include="GetAsyncOperation.cs" />
     <Compile Include="GetAsyncParams.cs" />
     <Compile Include="IClient.cs" />
-    <Compile Include="IResourceBaseConfig.cs" />
-    <Compile Include="IResourceBaseConfigVisitor.cs" />
-    <Compile Include="IResourceBaseStrategy.cs" />
+    <Compile Include="IEntityConfig.cs" />
+    <Compile Include="IEntityConfigVisitor.cs" />
+    <Compile Include="IEntityStrategy.cs" />
     <Compile Include="IState.cs" />
     <Compile Include="TargetDependencies.cs" />
     <Compile Include="TypedDictionary.cs" />
diff --git a/src/ResourceManager/Common/Commands.Common.Strategies/CreateOrUpdateAsyncOperation.cs b/src/ResourceManager/Common/Commands.Common.Strategies/CreateOrUpdateAsyncOperation.cs
@@ -59,11 +59,11 @@ public Task CreateOrUpdateAsync<Model, ParentModel>(NestedResourceConfig<Model,
                 where ParentModel : class
                 => CreateOrUpdateAsync(config.Parent);
 
-            public Task CreateOrUpdateAsync(IResourceBaseConfig config)
+            public Task CreateOrUpdateAsync(IEntityConfig config)
                 => config.Accept(new Visitor(), this);
         }
 
-        sealed class Visitor : IResourceBaseConfigVisitor<Context, Task>
+        sealed class Visitor : IEntityConfigVisitor<Context, Task>
         {
             public Task Visit<Model>(ResourceConfig<Model> config, Context context)
                 where Model : class
diff --git a/src/ResourceManager/Common/Commands.Common.Strategies/GetAsyncOperation.cs b/src/ResourceManager/Common/Commands.Common.Strategies/GetAsyncOperation.cs
@@ -19,7 +19,7 @@ public static async Task<IState> GetAsync<Model>(
             return context.Result;
         }
 
-        static Task AddStateAsyncResourceBase(this AsyncOperationContext context, IResourceBaseConfig config)
+        static Task AddStateAsyncResourceBase(this AsyncOperationContext context, IEntityConfig config)
             => config.Accept(new AddStateAsyncVisitor(), context);
 
         static async Task AddStateAsync<Model>(this AsyncOperationContext context, ResourceConfig<Model> config)
@@ -58,7 +58,7 @@ static Task AddStateAsync<Model, ParentModel>(
             where ParentModel : class
             => context.AddStateAsyncResourceBase(config.Parent);
 
-        sealed class AddStateAsyncVisitor : IResourceBaseConfigVisitor<AsyncOperationContext, Task>
+        sealed class AddStateAsyncVisitor : IEntityConfigVisitor<AsyncOperationContext, Task>
         {
             public Task Visit<Model>(
                 ResourceConfig<Model> config, AsyncOperationContext context)
diff --git a/src/ResourceManager/Common/Commands.Common.Strategies/IEntityConfig.cs b/src/ResourceManager/Common/Commands.Common.Strategies/IEntityConfig.cs
@@ -2,24 +2,24 @@
 
 namespace Microsoft.Azure.Commands.Common.Strategies
 {
-    public interface IResourceBaseConfig
+    public interface IEntityConfig
     {
-        IResourceBaseStrategy Strategy { get; }
+        IEntityStrategy Strategy { get; }
 
         string Name { get; }
 
         Result Accept<Context, Result>(
-            IResourceBaseConfigVisitor<Context, Result> visitor, Context context);
+            IEntityConfigVisitor<Context, Result> visitor, Context context);
 
         IEnumerable<string> GetId(string subscription);
 
         IResourceConfig Resource { get; }
     }
 
-    public interface IResourceBaseConfig<Model> : IResourceBaseConfig
+    public interface IResourceBaseConfig<Model> : IEntityConfig
         where Model : class
     {
         Result Accept<Context, Result>(
-            IResourceBaseConfigVisitor<Model, Context, Result> visitor, Context context);
+            IEntityConfigVisitor<Model, Context, Result> visitor, Context context);
     }
 }
diff --git a/src/ResourceManager/Common/Commands.Common.Strategies/IEntityConfigVisitor.cs b/src/ResourceManager/Common/Commands.Common.Strategies/IEntityConfigVisitor.cs
@@ -1,6 +1,6 @@
 ﻿namespace Microsoft.Azure.Commands.Common.Strategies
 {
-    public interface IResourceBaseConfigVisitor<Context, Result>
+    public interface IEntityConfigVisitor<Context, Result>
     {
         Result Visit<Model>(ResourceConfig<Model> config, Context context)
             where Model : class;
@@ -11,7 +11,7 @@ Result Visit<Model, ParentModel>(
             where ParentModel : class;
     }
 
-    public interface IResourceBaseConfigVisitor<Model, Context, Result>
+    public interface IEntityConfigVisitor<Model, Context, Result>
         where Model : class
     {
         Result Visit(ResourceConfig<Model> config, Context context);
diff --git a/src/ResourceManager/Common/Commands.Common.Strategies/IEntityStrategy.cs b/src/ResourceManager/Common/Commands.Common.Strategies/IEntityStrategy.cs
@@ -1,6 +1,6 @@
 ﻿namespace Microsoft.Azure.Commands.Common.Strategies
 {
-    public interface IResourceBaseStrategy
+    public interface IEntityStrategy
     {
     }
 }
diff --git a/src/ResourceManager/Common/Commands.Common.Strategies/IState.cs b/src/ResourceManager/Common/Commands.Common.Strategies/IState.cs
@@ -8,7 +8,7 @@ public interface IState
         Model Get<Model>(ResourceConfig<Model> config)
             where Model : class;
 
-        bool Contains(IResourceBaseConfig config);
+        bool Contains(IEntityConfig config);
     }
 
     public static class StateExtensions
@@ -24,7 +24,7 @@ public static Model GetResourceBase<Model>(
             where Model : class
             => config.Accept(new GetVisitor<Model>(), state);
 
-        sealed class GetVisitor<Model> : IResourceBaseConfigVisitor<Model, IState, Model>
+        sealed class GetVisitor<Model> : IEntityConfigVisitor<Model, IState, Model>
             where Model : class
         {
             public Model Visit(ResourceConfig<Model> config, IState state)
diff --git a/src/ResourceManager/Common/Commands.Common.Strategies/NestedResourceConfig.cs b/src/ResourceManager/Common/Commands.Common.Strategies/NestedResourceConfig.cs
@@ -28,7 +28,7 @@ public sealed class NestedResourceConfig<Model, ParentModel> : IResourceBaseConf
 
         public Func<Model> CreateModel { get; }
 
-        IResourceBaseStrategy IResourceBaseConfig.Strategy => Strategy;
+        IEntityStrategy IEntityConfig.Strategy => Strategy;
 
         public IResourceConfig Resource => Parent.Resource;
 
@@ -45,11 +45,11 @@ public NestedResourceConfig(
         }
 
         public Result Accept<Context, Result>(
-            IResourceBaseConfigVisitor<Context, Result> visitor, Context context)
+            IEntityConfigVisitor<Context, Result> visitor, Context context)
             => visitor.Visit(this, context);
 
         public Result Accept<Context, Result>(
-            IResourceBaseConfigVisitor<Model, Context, Result> visitor, Context context)
+            IEntityConfigVisitor<Model, Context, Result> visitor, Context context)
             => visitor.Visit(this, context);
 
         public IEnumerable<string> GetId(string subscription)
diff --git a/src/ResourceManager/Common/Commands.Common.Strategies/NestedResourceStrategy.cs b/src/ResourceManager/Common/Commands.Common.Strategies/NestedResourceStrategy.cs
@@ -3,7 +3,7 @@
 
 namespace Microsoft.Azure.Commands.Common.Strategies
 {
-    public sealed class NestedResourceStrategy<Model, ParentModel> : IResourceBaseStrategy
+    public sealed class NestedResourceStrategy<Model, ParentModel> : IEntityStrategy
     {
         public Func<string, IEnumerable<string>> GetId { get; }
 
diff --git a/src/ResourceManager/Common/Commands.Common.Strategies/Network/NetworkInterfaceStrategy.cs b/src/ResourceManager/Common/Commands.Common.Strategies/Network/NetworkInterfaceStrategy.cs
@@ -43,6 +43,6 @@ public static ResourceConfig<NetworkInterface> CreateNetworkInterfaceConfig(
                         Id = networkSecurityGroup.GetId(subscription).IdToString()
                     }
                 },
-                new IResourceBaseConfig[] { subnet, publicIPAddress, networkSecurityGroup });
+                new IEntityConfig[] { subnet, publicIPAddress, networkSecurityGroup });
     }
 }
diff --git a/src/ResourceManager/Common/Commands.Common.Strategies/ResourceConfig.cs b/src/ResourceManager/Common/Commands.Common.Strategies/ResourceConfig.cs
@@ -5,11 +5,11 @@
 
 namespace Microsoft.Azure.Commands.Common.Strategies
 {
-    public interface IResourceConfig : IResourceBaseConfig
+    public interface IResourceConfig : IEntityConfig
     {
         string ResourceGroupName { get; }
 
-        IEnumerable<IResourceBaseConfig> Dependencies { get; }
+        IEnumerable<IEntityConfig> Dependencies { get; }
     }
 
     public sealed class ResourceConfig<Model> : IResourceBaseConfig<Model>, IResourceConfig
@@ -23,9 +23,9 @@ public sealed class ResourceConfig<Model> : IResourceBaseConfig<Model>, IResourc
 
         public Func<string, Model> CreateModel { get; }
 
-        public IEnumerable<IResourceBaseConfig> Dependencies { get; }
+        public IEnumerable<IEntityConfig> Dependencies { get; }
 
-        IResourceBaseStrategy IResourceBaseConfig.Strategy => Strategy;
+        IEntityStrategy IEntityConfig.Strategy => Strategy;
 
         public IResourceConfig Resource => this;
 
@@ -34,7 +34,7 @@ public ResourceConfig(
             string resourceGroupName,
             string name,
             Func<string, Model> createModel,
-            IEnumerable<IResourceBaseConfig> dependencies)
+            IEnumerable<IEntityConfig> dependencies)
         {
             Strategy = strategy;
             ResourceGroupName = resourceGroupName;
@@ -44,11 +44,11 @@ public ResourceConfig(
         }
 
         public Result Accept<Context, Result>(
-            IResourceBaseConfigVisitor<Context, Result> visitor, Context context)
+            IEntityConfigVisitor<Context, Result> visitor, Context context)
             => visitor.Visit(this, context);
 
         public Result Accept<Context, Result>(
-            IResourceBaseConfigVisitor<Model, Context, Result> visitor, Context context)
+            IEntityConfigVisitor<Model, Context, Result> visitor, Context context)
             => visitor.Visit(this, context);
 
         public IEnumerable<string> GetId(string subscription)
@@ -69,7 +69,7 @@ public static ResourceConfig<Model> CreateConfig<Model>(
             string resourceGroupName,
             string name,
             Func<string, Model> createModel = null,
-            IEnumerable<IResourceBaseConfig> dependencies = null)
+            IEnumerable<IEntityConfig> dependencies = null)
             where Model : class, new()
             => new ResourceConfig<Model>(
                 strategy,
@@ -83,7 +83,7 @@ public static ResourceConfig<Model> CreateConfig<Model>(
             ResourceConfig<ResourceGroup> resourceGroup,
             string name,
             Func<string, Model> createModel = null,
-            IEnumerable<IResourceBaseConfig> dependencies = null)
+            IEnumerable<IEntityConfig> dependencies = null)
             where Model : class, new()
             => strategy.CreateConfig(
                 resourceGroup.Name, 
@@ -94,7 +94,7 @@ public static ResourceConfig<Model> CreateConfig<Model>(
         public static string IdToString(this IEnumerable<string> id)
             => "/" + string.Join("/", id);
 
-        public static string DefaultIdStr(this IResourceBaseConfig config)
+        public static string DefaultIdStr(this IEntityConfig config)
             => config.GetId(string.Empty).IdToString();
     }
 }
diff --git a/src/ResourceManager/Common/Commands.Common.Strategies/ResourceStrategy.cs b/src/ResourceManager/Common/Commands.Common.Strategies/ResourceStrategy.cs
@@ -6,7 +6,7 @@
 
 namespace Microsoft.Azure.Commands.Common.Strategies
 {
-    public sealed class ResourceStrategy<Model> : IResourceBaseStrategy
+    public sealed class ResourceStrategy<Model> : IEntityStrategy
     {
         public Func<string, IEnumerable<string>> GetId { get; }
 
diff --git a/src/ResourceManager/Common/Commands.Common.Strategies/State.cs b/src/ResourceManager/Common/Commands.Common.Strategies/State.cs
@@ -13,7 +13,7 @@ public Model GetOrAdd<Model>(ResourceConfig<Model> config, Func<Model> f)
             where Model : class
             => Map.GetOrAdd(config.DefaultIdStr(), _ => f()) as Model;
 
-        public bool Contains(IResourceBaseConfig config)
+        public bool Contains(IEntityConfig config)
             => Map.ContainsKey(config.DefaultIdStr());
 
         ConcurrentDictionary<string, object> Map { get; }
diff --git a/src/ResourceManager/Common/Commands.Common.Strategies/StateLocation.cs b/src/ResourceManager/Common/Commands.Common.Strategies/StateLocation.cs
@@ -5,10 +5,10 @@ namespace Microsoft.Azure.Commands.Common.Strategies
 {
     public static class StateLocation
     {
-        public static string GetLocation(this IState state, IResourceBaseConfig config)
+        public static string GetLocation(this IState state, IEntityConfig config)
             => config.Accept(new GetLocationVisitor(), state)?.Location;
 
-        sealed class GetLocationVisitor : IResourceBaseConfigVisitor<IState, DependencyLocation>
+        sealed class GetLocationVisitor : IEntityConfigVisitor<IState, DependencyLocation>
         {
             public DependencyLocation Visit<Model>(ResourceConfig<Model> config, IState state)
                 where Model : class
diff --git a/src/ResourceManager/Common/Commands.Common.Strategies/TargetState.cs b/src/ResourceManager/Common/Commands.Common.Strategies/TargetState.cs
@@ -28,7 +28,7 @@ public Context(IState current, string subscription, string location)
                 Location = location;
             }
 
-            public void AddIfRequired(IResourceBaseConfig config)
+            public void AddIfRequired(IEntityConfig config)
             {
                 if (!Current.Contains(config))
                 {
@@ -67,7 +67,7 @@ public Model GetOrAdd<Model, ParentModel>(
             }
         }
 
-        sealed class AddVisitor : IResourceBaseConfigVisitor<Context, Void>
+        sealed class AddVisitor : IEntityConfigVisitor<Context, Void>
         {
             public Void Visit<Model>(ResourceConfig<Model> config, Context context)
                 where Model : class
@@ -86,7 +86,7 @@ public Void Visit<Model, ParentModel>(
             }
         }
 
-        sealed class GetOrAddVisitor<Model> : IResourceBaseConfigVisitor<Model, Context, Model>
+        sealed class GetOrAddVisitor<Model> : IEntityConfigVisitor<Model, Context, Model>
             where Model : class
         {
             public Model Visit(ResourceConfig<Model> config, Context context)

Original file line number	Diff line number	Diff line change
`@@ -59,11 +59,11 @@ public Task CreateOrUpdateAsync<Model, ParentModel>(NestedResourceConfig<Model,`
`59`	`59`	`where ParentModel : class`
`60`	`60`	`=> CreateOrUpdateAsync(config.Parent);`
`61`	`61`
`62`		`- public Task CreateOrUpdateAsync(IResourceBaseConfig config)`
	`62`	`+ public Task CreateOrUpdateAsync(IEntityConfig config)`
`63`	`63`	`=> config.Accept(new Visitor(), this);`
`64`	`64`	`}`
`65`	`65`
`66`		`- sealed class Visitor : IResourceBaseConfigVisitor<Context, Task>`
	`66`	`+ sealed class Visitor : IEntityConfigVisitor<Context, Task>`
`67`	`67`	`{`
`68`	`68`	`public Task Visit<Model>(ResourceConfig<Model> config, Context context)`
`69`	`69`	`where Model : class`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ public static async Task<IState> GetAsync<Model>(`
`19`	`19`	`return context.Result;`
`20`	`20`	`}`
`21`	`21`
`22`		`- static Task AddStateAsyncResourceBase(this AsyncOperationContext context, IResourceBaseConfig config)`
	`22`	`+ static Task AddStateAsyncResourceBase(this AsyncOperationContext context, IEntityConfig config)`
`23`	`23`	`=> config.Accept(new AddStateAsyncVisitor(), context);`
`24`	`24`
`25`	`25`	`static async Task AddStateAsync<Model>(this AsyncOperationContext context, ResourceConfig<Model> config)`
`@@ -58,7 +58,7 @@ static Task AddStateAsync<Model, ParentModel>(`
`58`	`58`	`where ParentModel : class`
`59`	`59`	`=> context.AddStateAsyncResourceBase(config.Parent);`
`60`	`60`
`61`		`- sealed class AddStateAsyncVisitor : IResourceBaseConfigVisitor<AsyncOperationContext, Task>`
	`61`	`+ sealed class AddStateAsyncVisitor : IEntityConfigVisitor<AsyncOperationContext, Task>`
`62`	`62`	`{`
`63`	`63`	`public Task Visit<Model>(`
`64`	`64`	`ResourceConfig<Model> config, AsyncOperationContext context)`
Original file line number	Diff line number	Diff line change
`@@ -2,24 +2,24 @@`
`2`	`2`
`3`	`3`	`namespace Microsoft.Azure.Commands.Common.Strategies`
`4`	`4`	`{`
`5`		`- public interface IResourceBaseConfig`
	`5`	`+ public interface IEntityConfig`
`6`	`6`	`{`
`7`		`- IResourceBaseStrategy Strategy { get; }`
	`7`	`+ IEntityStrategy Strategy { get; }`
`8`	`8`
`9`	`9`	`string Name { get; }`
`10`	`10`
`11`	`11`	`Result Accept<Context, Result>(`
`12`		`- IResourceBaseConfigVisitor<Context, Result> visitor, Context context);`
	`12`	`+ IEntityConfigVisitor<Context, Result> visitor, Context context);`
`13`	`13`
`14`	`14`	`IEnumerable<string> GetId(string subscription);`
`15`	`15`
`16`	`16`	`IResourceConfig Resource { get; }`
`17`	`17`	`}`
`18`	`18`
`19`		`- public interface IResourceBaseConfig<Model> : IResourceBaseConfig`
	`19`	`+ public interface IResourceBaseConfig<Model> : IEntityConfig`
`20`	`20`	`where Model : class`
`21`	`21`	`{`
`22`	`22`	`Result Accept<Context, Result>(`
`23`		`- IResourceBaseConfigVisitor<Model, Context, Result> visitor, Context context);`
	`23`	`+ IEntityConfigVisitor<Model, Context, Result> visitor, Context context);`
`24`	`24`	`}`
`25`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`namespace Microsoft.Azure.Commands.Common.Strategies`
`2`	`2`	`{`
`3`		`- public interface IResourceBaseConfigVisitor<Context, Result>`
	`3`	`+ public interface IEntityConfigVisitor<Context, Result>`
`4`	`4`	`{`
`5`	`5`	`Result Visit<Model>(ResourceConfig<Model> config, Context context)`
`6`	`6`	`where Model : class;`
`@@ -11,7 +11,7 @@ Result Visit<Model, ParentModel>(`
`11`	`11`	`where ParentModel : class;`
`12`	`12`	`}`
`13`	`13`
`14`		`- public interface IResourceBaseConfigVisitor<Model, Context, Result>`
	`14`	`+ public interface IEntityConfigVisitor<Model, Context, Result>`
`15`	`15`	`where Model : class`
`16`	`16`	`{`
`17`	`17`	`Result Visit(ResourceConfig<Model> config, Context context);`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`namespace Microsoft.Azure.Commands.Common.Strategies`
`2`	`2`	`{`
`3`		`- public interface IResourceBaseStrategy`
	`3`	`+ public interface IEntityStrategy`
`4`	`4`	`{`
`5`	`5`	`}`
`6`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ public interface IState`
`8`	`8`	`Model Get<Model>(ResourceConfig<Model> config)`
`9`	`9`	`where Model : class;`
`10`	`10`
`11`		`- bool Contains(IResourceBaseConfig config);`
	`11`	`+ bool Contains(IEntityConfig config);`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`public static class StateExtensions`
`@@ -24,7 +24,7 @@ public static Model GetResourceBase<Model>(`
`24`	`24`	`where Model : class`
`25`	`25`	`=> config.Accept(new GetVisitor<Model>(), state);`
`26`	`26`
`27`		`- sealed class GetVisitor<Model> : IResourceBaseConfigVisitor<Model, IState, Model>`
	`27`	`+ sealed class GetVisitor<Model> : IEntityConfigVisitor<Model, IState, Model>`
`28`	`28`	`where Model : class`
`29`	`29`	`{`
`30`	`30`	`public Model Visit(ResourceConfig<Model> config, IState state)`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`
`4`	`4`	`namespace Microsoft.Azure.Commands.Common.Strategies`
`5`	`5`	`{`
`6`		`- public sealed class NestedResourceStrategy<Model, ParentModel> : IResourceBaseStrategy`
	`6`	`+ public sealed class NestedResourceStrategy<Model, ParentModel> : IEntityStrategy`
`7`	`7`	`{`
`8`	`8`	`public Func<string, IEnumerable<string>> GetId { get; }`
`9`	`9`
Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,6 @@ public static ResourceConfig<NetworkInterface> CreateNetworkInterfaceConfig(`
`43`	`43`	`Id = networkSecurityGroup.GetId(subscription).IdToString()`
`44`	`44`	`}`
`45`	`45`	`},`
`46`		`- new IResourceBaseConfig[] { subnet, publicIPAddress, networkSecurityGroup });`
	`46`	`+ new IEntityConfig[] { subnet, publicIPAddress, networkSecurityGroup });`
`47`	`47`	`}`
`48`	`48`	`}`