IGetParameters, ICreateParameters

huangpf · Oct 27, 2017 · bc0fb77 · bc0fb77
1 parent 7abf7d4
commit bc0fb77
Show file tree

Hide file tree

Showing 10 changed files with 45 additions and 15 deletions.
diff --git a/experiments/Azure.Experiments/Azure.Experiments/Compute/VirtualMachineParameters.cs b/experiments/Azure.Experiments/Azure.Experiments/Compute/VirtualMachineParameters.cs
@@ -5,7 +5,8 @@
 
 namespace Microsoft.Azure.Experiments.Compute
 {
-    public sealed class VirtualMachineParameters : ResourceParameters<VirtualMachine>
+    public sealed class VirtualMachineParameters
+        : ResourceParameters<VirtualMachine>
     {
         public NetworkInterfaceParameters Ni { get; }
 
@@ -18,7 +19,8 @@ public VirtualMachineParameters(
             Ni = ni;
         }
 
-        protected override Task<VirtualMachine> GetAsync(Context context, GetMap map)
+        protected override Task<VirtualMachine> GetAsync(
+            Context context, IGetParameters _)
             => context
                 .CreateCompute()
                 .VirtualMachines

diff --git a/...e.Experiments/Azure.Experiments/GetMap.cs → ...iments/Azure.Experiments/GetParameters.cs b/...e.Experiments/Azure.Experiments/GetMap.cs → ...iments/Azure.Experiments/GetParameters.cs
@@ -4,7 +4,7 @@
 
 namespace Microsoft.Azure.Experiments
 {
-    public sealed class GetMap
+    public sealed class GetParameters : IGetParameters
     {
         public async Task<T> GetOrAdd<T>(Parameters<T> parameters, Func<Task<T>> get)
             where T : class

diff --git a/experiments/Azure.Experiments/Azure.Experiments/ICreateParameters.cs b/experiments/Azure.Experiments/Azure.Experiments/ICreateParameters.cs
@@ -0,0 +1,8 @@
+namespace Microsoft.Azure.Experiments
+{
+    public interface ICreateParameters
+    {
+        T Get<T>(Parameters<T> parameters)
+            where T : class;
+    }
+}
diff --git a/experiments/Azure.Experiments/Azure.Experiments/IGetParameters.cs b/experiments/Azure.Experiments/Azure.Experiments/IGetParameters.cs
@@ -0,0 +1,11 @@
+using System;
+using System.Threading.Tasks;
+
+namespace Microsoft.Azure.Experiments
+{
+    public interface IGetParameters
+    {
+        Task<T> GetOrAdd<T>(Parameters<T> parameters, Func<Task<T>> get)
+            where T : class;
+    }
+}
diff --git a/experiments/Azure.Experiments/Azure.Experiments/Network/NetworkInterfaceParameters.cs b/experiments/Azure.Experiments/Azure.Experiments/Network/NetworkInterfaceParameters.cs
@@ -27,7 +27,7 @@ public NetworkInterfaceParameters(
             Pia = pia;
         }
 
-        protected override Task<NetworkInterface> GetAsync(Context context, GetMap map)
+        protected override Task<NetworkInterface> GetAsync(Context context, IGetParameters _)
             => context
                 .CreateNetwork()
                 .NetworkInterfaces

diff --git a/experiments/Azure.Experiments/Azure.Experiments/Network/NetworkSecurityGroupParameters.cs b/experiments/Azure.Experiments/Azure.Experiments/Network/NetworkSecurityGroupParameters.cs
@@ -13,7 +13,8 @@ public NetworkSecurityGroupParameters(
         {
         }
 
-        protected override Task<NetworkSecurityGroup> GetAsync(Context context, GetMap map)
+        protected override Task<NetworkSecurityGroup> GetAsync(
+            Context context, IGetParameters _)
             => context
                 .CreateNetwork()
                 .NetworkSecurityGroups

diff --git a/experiments/Azure.Experiments/Azure.Experiments/Network/PublicIpAddressParameters.cs b/experiments/Azure.Experiments/Azure.Experiments/Network/PublicIpAddressParameters.cs
@@ -5,7 +5,7 @@
 
 namespace Microsoft.Azure.Experiments.Network
 {
-    public sealed class PublicIpAddressParameters 
+    public sealed class PublicIpAddressParameters
         : ResourceParameters<PublicIPAddress>
     {
         public PublicIpAddressParameters(
@@ -14,7 +14,8 @@ public PublicIpAddressParameters(
         {
         }
 
-        protected override Task<PublicIPAddress> GetAsync(Context context, GetMap map)
+        protected override Task<PublicIPAddress> GetAsync(
+            Context context, IGetParameters _)
             => context
                 .CreateNetwork()
                 .PublicIPAddresses

diff --git a/experiments/Azure.Experiments/Azure.Experiments/Network/SubnetParameters.cs b/experiments/Azure.Experiments/Azure.Experiments/Network/SubnetParameters.cs
@@ -15,9 +15,11 @@ public SubnetParameters(
             VirtualNetwork = virtualNetwork;
         }
 
-        protected override async Task<Subnet> GetAsync(Context context, GetMap map)
+        protected override async Task<Subnet> GetAsync(
+            Context context, IGetParameters getParameters)
         {
-            var virtualNetwork = await VirtualNetwork.GetOrNullAsync(context, map);
+            var virtualNetwork =
+                await VirtualNetwork.GetOrNullAsync(context, getParameters);
             return virtualNetwork?.Subnets.FirstOrDefault(s => s.Name == Name);
         }
     }

diff --git a/experiments/Azure.Experiments/Azure.Experiments/Network/VirtualNetworkParameters.cs b/experiments/Azure.Experiments/Azure.Experiments/Network/VirtualNetworkParameters.cs
@@ -13,7 +13,8 @@ public VirtualNetworkParameters(
         {
         }
 
-        protected override Task<VirtualNetwork> GetAsync(Context context, GetMap map)
+        protected override Task<VirtualNetwork> GetAsync(
+            Context context, IGetParameters _)
             => context
                 .CreateNetwork()
                 .VirtualNetworks

diff --git a/experiments/Azure.Experiments/Azure.Experiments/Parameters.cs b/experiments/Azure.Experiments/Azure.Experiments/Parameters.cs
@@ -30,14 +30,14 @@ protected Parameters(string name, IEnumerable<Parameters> parameters)
         {
         }
 
-        public async Task<T> GetOrNullAsync(Context context, GetMap map)
-            => await map.GetOrAdd(
-                this, 
+        public Task<T> GetOrNullAsync(Context context, IGetParameters getParameters)
+            => getParameters.GetOrAdd(
+                this,
                 async () => 
                 {
                     try
                     {
-                        return await GetAsync(context, map);
+                        return await GetAsync(context, getParameters);
                     }
                     catch (CloudException e)
                         when (e.Response.StatusCode == HttpStatusCode.NotFound)
@@ -46,6 +46,10 @@ public async Task<T> GetOrNullAsync(Context context, GetMap map)
                     }
                 });
 
-        protected abstract Task<T> GetAsync(Context context, GetMap map);
+        protected abstract Task<T> GetAsync(
+            Context context, IGetParameters getParameters);
+
+        //protected abstract Task<T> CreateAsync(
+        //    Context context, ICreateParameters createParameters);
     }
 }