IGetParameters, ICreateParameters

sergey-shandar · sergey-shandar · commit bc0fb776e6ef · 2017-10-27T11:23:03.000-07:00
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/experiments/Azure.Experiments/Azure.Experiments/GetParameters.cs b/experiments/Azure.Experiments/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);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,8 @@`
`5`	`5`
`6`	`6`	`namespace Microsoft.Azure.Experiments.Compute`
`7`	`7`	`{`
`8`		`- public sealed class VirtualMachineParameters : ResourceParameters<VirtualMachine>`
	`8`	`+ public sealed class VirtualMachineParameters`
	`9`	`+ : ResourceParameters<VirtualMachine>`
`9`	`10`	`{`
`10`	`11`	`public NetworkInterfaceParameters Ni { get; }`
`11`	`12`
`@@ -18,7 +19,8 @@ public VirtualMachineParameters(`
`18`	`19`	`Ni = ni;`
`19`	`20`	`}`
`20`	`21`
`21`		`- protected override Task<VirtualMachine> GetAsync(Context context, GetMap map)`
	`22`	`+ protected override Task<VirtualMachine> GetAsync(`
	`23`	`+ Context context, IGetParameters _)`
`22`	`24`	`=> context`
`23`	`25`	`.CreateCompute()`
`24`	`26`	`.VirtualMachines`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`
`5`	`5`	`namespace Microsoft.Azure.Experiments`
`6`	`6`	`{`
`7`		`- public sealed class GetMap`
	`7`	`+ public sealed class GetParameters : IGetParameters`
`8`	`8`	`{`
`9`	`9`	`public async Task<T> GetOrAdd<T>(Parameters<T> parameters, Func<Task<T>> get)`
`10`	`10`	`where T : class`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ public NetworkInterfaceParameters(`
`27`	`27`	`Pia = pia;`
`28`	`28`	`}`
`29`	`29`
`30`		`- protected override Task<NetworkInterface> GetAsync(Context context, GetMap map)`
	`30`	`+ protected override Task<NetworkInterface> GetAsync(Context context, IGetParameters _)`
`31`	`31`	`=> context`
`32`	`32`	`.CreateNetwork()`
`33`	`33`	`.NetworkInterfaces`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,8 @@ public NetworkSecurityGroupParameters(`
`13`	`13`	`{`
`14`	`14`	`}`
`15`	`15`
`16`		`- protected override Task<NetworkSecurityGroup> GetAsync(Context context, GetMap map)`
	`16`	`+ protected override Task<NetworkSecurityGroup> GetAsync(`
	`17`	`+ Context context, IGetParameters _)`
`17`	`18`	`=> context`
`18`	`19`	`.CreateNetwork()`
`19`	`20`	`.NetworkSecurityGroups`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`
`6`	`6`	`namespace Microsoft.Azure.Experiments.Network`
`7`	`7`	`{`
`8`		`- public sealed class PublicIpAddressParameters`
	`8`	`+ public sealed class PublicIpAddressParameters`
`9`	`9`	`: ResourceParameters<PublicIPAddress>`
`10`	`10`	`{`
`11`	`11`	`public PublicIpAddressParameters(`
`@@ -14,7 +14,8 @@ public PublicIpAddressParameters(`
`14`	`14`	`{`
`15`	`15`	`}`
`16`	`16`
`17`		`- protected override Task<PublicIPAddress> GetAsync(Context context, GetMap map)`
	`17`	`+ protected override Task<PublicIPAddress> GetAsync(`
	`18`	`+ Context context, IGetParameters _)`
`18`	`19`	`=> context`
`19`	`20`	`.CreateNetwork()`
`20`	`21`	`.PublicIPAddresses`
Original file line number	Diff line number	Diff line change
`@@ -15,9 +15,11 @@ public SubnetParameters(`
`15`	`15`	`VirtualNetwork = virtualNetwork;`
`16`	`16`	`}`
`17`	`17`
`18`		`- protected override async Task<Subnet> GetAsync(Context context, GetMap map)`
	`18`	`+ protected override async Task<Subnet> GetAsync(`
	`19`	`+ Context context, IGetParameters getParameters)`
`19`	`20`	`{`
`20`		`- var virtualNetwork = await VirtualNetwork.GetOrNullAsync(context, map);`
	`21`	`+ var virtualNetwork =`
	`22`	`+ await VirtualNetwork.GetOrNullAsync(context, getParameters);`
`21`	`23`	`return virtualNetwork?.Subnets.FirstOrDefault(s => s.Name == Name);`
`22`	`24`	`}`
`23`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,8 @@ public VirtualNetworkParameters(`
`13`	`13`	`{`
`14`	`14`	`}`
`15`	`15`
`16`		`- protected override Task<VirtualNetwork> GetAsync(Context context, GetMap map)`
	`16`	`+ protected override Task<VirtualNetwork> GetAsync(`
	`17`	`+ Context context, IGetParameters _)`
`17`	`18`	`=> context`
`18`	`19`	`.CreateNetwork()`
`19`	`20`	`.VirtualNetworks`
Original file line number	Diff line number	Diff line change
`@@ -30,14 +30,14 @@ protected Parameters(string name, IEnumerable<Parameters> parameters)`
`30`	`30`	`{`
`31`	`31`	`}`
`32`	`32`
`33`		`- public async Task<T> GetOrNullAsync(Context context, GetMap map)`
`34`		`- => await map.GetOrAdd(`
`35`		`- this,`
	`33`	`+ public Task<T> GetOrNullAsync(Context context, IGetParameters getParameters)`
	`34`	`+ => getParameters.GetOrAdd(`
	`35`	`+ this,`
`36`	`36`	`async () =>`
`37`	`37`	`{`
`38`	`38`	`try`
`39`	`39`	`{`
`40`		`- return await GetAsync(context, map);`
	`40`	`+ return await GetAsync(context, getParameters);`
`41`	`41`	`}`
`42`	`42`	`catch (CloudException e)`
`43`	`43`	`when (e.Response.StatusCode == HttpStatusCode.NotFound)`
`@@ -46,6 +46,10 @@ public async Task<T> GetOrNullAsync(Context context, GetMap map)`
`46`	`46`	`}`
`47`	`47`	`});`
`48`	`48`
`49`		`- protected abstract Task<T> GetAsync(Context context, GetMap map);`
	`49`	`+ protected abstract Task<T> GetAsync(`
	`50`	`+ Context context, IGetParameters getParameters);`
	`51`	`+`
	`52`	`+ //protected abstract Task<T> CreateAsync(`
	`53`	`+ // Context context, ICreateParameters createParameters);`
`50`	`54`	`}`
`51`	`55`	`}`