renaming.

Author: sergey-shandar

src/ResourceManager/Common/Commands.Common.Strategies/AsyncOperationVisitor.cs

@@ -8,15 +8,15 @@ namespace Microsoft.Azure.Commands.Common.Strategies
     /// It's a base class for asynchronous operation visitors, such as 
     /// CreateOrUpdateAsyncOperation and GetAsyncOperation visitors.
     /// </summary>
-    abstract class AsyncOperationVisitor : IResourceConfigVisitor<Task<object>>
+    abstract class AsyncOperationVisitor : IResourceBaseConfigVisitor<Task<object>>
     {
         public IClient Client { get; }
 
         public CancellationToken CancellationToken { get; }
 
         public State Result { get; } = new State();
 
-        public async Task<object> GetOrAddUntyped(IResourceConfig config)
+        public async Task<object> GetOrAddUntyped(IResourceBaseConfig config)
             => await TaskMap.GetOrAdd(
                 config.DefaultIdStr(),
                 async _ =>
@@ -29,7 +29,7 @@ public async Task<object> GetOrAddUntyped(IResourceConfig config)
                     return model;
                 });
 
-        public async Task<Model> GetOrAdd<Model>(IResourceConfig<Model> config)
+        public async Task<Model> GetOrAdd<Model>(IResourceBaseConfig<Model> config)
             where Model : class
         {
             var model = await GetOrAddUntyped(config);

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

@@ -77,9 +77,9 @@
     <Compile Include="GetAsyncParams.cs" />
     <Compile Include="IClient.cs" />
     <Compile Include="IReport.cs" />
-    <Compile Include="IResourceConfig.cs" />
-    <Compile Include="IResourceConfigVisitor.cs" />
-    <Compile Include="IResourceStrategy.cs" />
+    <Compile Include="IResourceBaseConfig.cs" />
+    <Compile Include="IResourceBaseConfigVisitor.cs" />
+    <Compile Include="IResourceBaseStrategy.cs" />
     <Compile Include="IState.cs" />
     <Compile Include="NestedResourceConfig.cs" />
     <Compile Include="NestedResourceStrategy.cs" />

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

@@ -17,7 +17,7 @@ public static class CreateOrUpdateAsyncOperation
         /// <param name="cancellationToken"></param>
         /// <returns>An Azure state.</returns>
         public static async Task<IState> CreateOrUpdateAsync<Model>(
-            this IResourceConfig<Model> config,
+            this IResourceBaseConfig<Model> config,
             IClient client,
             IState target,
             CancellationToken cancellationToken)

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

@@ -17,7 +17,7 @@ public static class GetAsyncOperation
         /// <param name="cancellationToken"></param>
         /// <returns>An Azure state.</returns>
         public static async Task<IState> GetAsync<Model>(
-            this IResourceConfig<Model> resourceConfig,
+            this IResourceBaseConfig<Model> resourceConfig,
             IClient client,
             CancellationToken cancellationToken)
             where Model : class

src/ResourceManager/Common/Commands.Common.Strategies/IReport.cs

@@ -2,7 +2,7 @@
 {
     public interface IReport
     {
-        void Start(IResourceConfig config);
-        void Done(IResourceConfig config);
+        void Start(IResourceBaseConfig config);
+        void Done(IResourceBaseConfig config);
     }
 }

src/ResourceManager/Common/Commands.Common.Strategies/IResourceBaseConfig.cs

@@ -0,0 +1,17 @@
+using System.Collections.Generic;
+
+namespace Microsoft.Azure.Commands.Common.Strategies
+{
+    public interface IResourceBaseConfig
+    {
+        Result Apply<Result>(IResourceBaseConfigVisitor<Result> visitor);
+
+        IEnumerable<string> GetId(string subscription);
+    }
+
+    public interface IResourceBaseConfig<Model> : IResourceBaseConfig
+        where Model : class
+    {
+        Result Apply<Result>(IResourceBaseConfigVisitor<Model, Result> visitor);
+    }
+}

src/ResourceManager/Common/Commands.Common.Strategies/IResourceBaseConfigVisitor.cs

@@ -0,0 +1,21 @@
+namespace Microsoft.Azure.Commands.Common.Strategies
+{
+    public interface IResourceBaseConfigVisitor<Result>
+    {
+        Result Visit<Model>(ResourceConfig<Model> config)
+            where Model : class;
+
+        Result Visit<Model, ParentModel>(NestedResourceConfig<Model, ParentModel> config)
+            where Model : class
+            where ParentModel : class;
+    }
+
+    public interface IResourceBaseConfigVisitor<Model, Result>
+        where Model : class
+    {
+        Result Visit(ResourceConfig<Model> config);
+
+        Result Visit<ParentModel>(NestedResourceConfig<Model, ParentModel> config)
+            where ParentModel : class;
+    }
+}

src/ResourceManager/Common/Commands.Common.Strategies/IResourceStrategy.cs renamed to src/ResourceManager/Common/Commands.Common.Strategies/IResourceBaseStrategy.cs

@@ -1,6 +1,6 @@
 namespace Microsoft.Azure.Commands.Common.Strategies
 {
-    public interface IResourceStrategy
+    public interface IResourceBaseStrategy
     {
     }
 }

src/ResourceManager/Common/Commands.Common.Strategies/IResourceConfig.cs

@@ -4,10 +4,51 @@
     /// An Azure state which is a dictionary of models.
     /// </summary>
     public interface IState
+    {
+        Model GetOrNull<Model>(IResourceBaseConfig<Model> config)
+            where Model : class;
+
+        object GetOrNullUntyped(IResourceBaseConfig config);
+    }
+
+    /*
+    public static class StateExtension
+    {
+        public static Model GetNestedOrNull<Model, ParentModel>(
+            this IState state, NestedResourceConfig<Model, ParentModel> config)
+            where Model : class
+            where ParentModel : class
+        {
+            var parentModel = config.Parent.Apply(new GetOrNullVisitor(state)) as Model;
+        }
+
+        sealed class GetOrNullVisitor : IResourceConfigVisitor<object>
+        {
+            public GetOrNullVisitor(IState state)
+            {
+                State = state;
+            }
+
+            public object Visit<Model>(ResourceConfig<Model> config) where Model : class
+                => State.GetOrNull(config);
+
+            public object Visit<Model, ParentModel>(NestedResourceConfig<Model, ParentModel> config)
+                where Model : class
+                where ParentModel : class
+                => State.GetNestedOrNull(config);
+
+            IState State { get; }
+        }
+    }
+    */
+
+    /*
+    public interface IState
     {
         Model GetOrNull<Model>(IResourceConfig<Model> config)
             where Model : class;
 
         object GetOrNullUntyped(IResourceConfig config);
     }
+    */
 }

src/ResourceManager/Common/Commands.Common.Strategies/IResourceConfigVisitor.cs

@@ -8,29 +8,29 @@ public static class NestedResourceConfig
     {
         public static NestedResourceConfig<Model, ParentModel> CreateConfig<Model, ParentModel>(
             this NestedResourceStrategy<Model, ParentModel> strategy,
-            IResourceConfig<ParentModel> parent,
+            IResourceBaseConfig<ParentModel> parent,
             string name,
             Func<Model> create)
             where Model : class
             where ParentModel : class
             => new NestedResourceConfig<Model, ParentModel>(strategy, parent, name, create);
     }
 
-    public sealed class NestedResourceConfig<Model, ParentModel> : IResourceConfig<Model>
+    public sealed class NestedResourceConfig<Model, ParentModel> : IResourceBaseConfig<Model>
         where Model : class
         where ParentModel : class
     {
         public NestedResourceStrategy<Model, ParentModel> Policy { get; }
 
         public string Name { get; }
 
-        public IResourceConfig<ParentModel> Parent { get; }
+        public IResourceBaseConfig<ParentModel> Parent { get; }
 
         public Func<Model> CreateModel { get; }
 
         public NestedResourceConfig(
             NestedResourceStrategy<Model, ParentModel> policy,            
-            IResourceConfig<ParentModel> parent,
+            IResourceBaseConfig<ParentModel> parent,
             string name,
             Func<Model> createModel)
         {
@@ -40,7 +40,10 @@ public NestedResourceConfig(
             CreateModel = createModel;
         }
 
-        public Result Apply<Result>(IResourceConfigVisitor<Result> visitor)
+        public Result Apply<Result>(IResourceBaseConfigVisitor<Result> visitor)
+            => visitor.Visit(this);
+
+        public Result Apply<Result>(IResourceBaseConfigVisitor<Model, Result> visitor)
             => visitor.Visit(this);
 
         public IEnumerable<string> GetId(string subscription)

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

@@ -3,7 +3,7 @@
 
 namespace Microsoft.Azure.Commands.Common.Strategies
 {
-    public sealed class NestedResourceStrategy<Model, ParentModel> : IResourceStrategy
+    public sealed class NestedResourceStrategy<Model, ParentModel> : IResourceBaseStrategy
     {
         public Func<string, IEnumerable<string>> GetId { get; }
 

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

@@ -43,6 +43,6 @@ public static ResourceConfig<NetworkInterface> CreateNetworkInterfaceConfig(
                         Id = networkSecurityGroup.GetId(subscription).IdToString()
                     }
                 },
-                new IResourceConfig[] { subnet, publicIPAddress, networkSecurityGroup });
+                new IResourceBaseConfig[] { subnet, publicIPAddress, networkSecurityGroup });
     }
 }

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

@@ -5,7 +5,7 @@
 
 namespace Microsoft.Azure.Commands.Common.Strategies
 {
-    public sealed class ResourceConfig<Model> : IResourceConfig<Model>
+    public sealed class ResourceConfig<Model> : IResourceBaseConfig<Model>
         where Model : class
     {
         public ResourceStrategy<Model> Strategy { get; }
@@ -16,14 +16,14 @@ public sealed class ResourceConfig<Model> : IResourceConfig<Model>
 
         public Func<string, Model> CreateModel { get; }
 
-        public IEnumerable<IResourceConfig> Dependencies { get; }
+        public IEnumerable<IResourceBaseConfig> Dependencies { get; }
 
         public ResourceConfig(
             ResourceStrategy<Model> strategy,
             string resourceGroupName,
             string name,
             Func<string, Model> createModel,
-            IEnumerable<IResourceConfig> dependencies)
+            IEnumerable<IResourceBaseConfig> dependencies)
         {
             Strategy = strategy;
             ResourceGroupName = resourceGroupName;
@@ -32,7 +32,10 @@ public ResourceConfig(
             Dependencies = dependencies;
         }
 
-        public Result Apply<Result>(IResourceConfigVisitor<Result> visitor)
+        public Result Apply<Result>(IResourceBaseConfigVisitor<Result> visitor)
+            => visitor.Visit(this);
+
+        public Result Apply<Result>(IResourceBaseConfigVisitor<Model, Result> visitor)
             => visitor.Visit(this);
 
         public IEnumerable<string> GetId(string subscription)
@@ -53,7 +56,7 @@ public static ResourceConfig<Model> CreateConfig<Model>(
             string resourceGroupName,
             string name,
             Func<string, Model> createModel = null,
-            IEnumerable<IResourceConfig> dependencies = null)
+            IEnumerable<IResourceBaseConfig> dependencies = null)
             where Model : class, new()
             => new ResourceConfig<Model>(
                 strategy,
@@ -67,7 +70,7 @@ public static ResourceConfig<Model> CreateConfig<Model>(
             ResourceConfig<ResourceGroup> resourceGroup,
             string name,
             Func<string, Model> createModel = null,
-            IEnumerable<IResourceConfig> dependencies = null)
+            IEnumerable<IResourceBaseConfig> dependencies = null)
             where Model : class, new()
             => strategy.CreateConfig(
                 resourceGroup.Name, 
@@ -78,7 +81,7 @@ public static ResourceConfig<Model> CreateConfig<Model>(
         public static string IdToString(this IEnumerable<string> id)
             => "/" + string.Join("/", id);
 
-        public static string DefaultIdStr(this IResourceConfig config)
+        public static string DefaultIdStr(this IResourceBaseConfig config)
             => config.GetId(string.Empty).IdToString();
     }
 }

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

@@ -6,7 +6,7 @@
 
 namespace Microsoft.Azure.Commands.Common.Strategies
 {
-    public sealed class ResourceStrategy<Model> : IResourceStrategy
+    public sealed class ResourceStrategy<Model> : IResourceBaseStrategy
     {
         public Func<string, IEnumerable<string>> GetId { get; }
 

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

@@ -5,18 +5,18 @@ namespace Microsoft.Azure.Commands.Common.Strategies
 {
     sealed class State : IState
     {
-        public object GetOrNullUntyped(IResourceConfig config)
+        public object GetOrNullUntyped(IResourceBaseConfig config)
             => Map.GetOrNull(config.DefaultIdStr());
 
-        public Model GetOrNull<Model>(IResourceConfig<Model> config)
+        public Model GetOrNull<Model>(IResourceBaseConfig<Model> config)
             where Model : class
             => GetOrNullUntyped(config) as Model;
 
-        public Model GetOrAdd<Model>(IResourceConfig<Model> config, Func<Model> f)
+        public Model GetOrAdd<Model>(IResourceBaseConfig<Model> config, Func<Model> f)
             where Model : class
             => GetOrAddUntyped(config, f) as Model;
 
-        public object GetOrAddUntyped(IResourceConfig config, Func<object> f)
+        public object GetOrAddUntyped(IResourceBaseConfig config, Func<object> f)
             => Map.GetOrAdd(config.DefaultIdStr(), _ => f());
 
         ConcurrentDictionary<string, object> Map { get; }

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

@@ -5,7 +5,7 @@ namespace Microsoft.Azure.Commands.Common.Strategies
 {
     public static class StateLocation
     {
-        public static string GetLocation(this IState state, IResourceConfig config)
+        public static string GetLocation(this IState state, IResourceBaseConfig config)
             => config.Apply(new Visitor(state))?.Location;
 
         class DependencyLocation
@@ -41,7 +41,7 @@ static DependencyLocation Merge(this DependencyLocation a, DependencyLocation b)
             return a.Location == b.Location ? a : new DependencyLocation(null, a.IsCompulsory);
         }
 
-        sealed class Visitor : IResourceConfigVisitor<DependencyLocation>
+        sealed class Visitor : IResourceBaseConfigVisitor<DependencyLocation>
         {
             public DependencyLocation Visit<Model>(ResourceConfig<Model> config) 
                 where Model : class