Fix null check syntax

mattbrailsford · mattbrailsford · commit c7b844edf801 · 2024-11-15T11:29:51.000Z
diff --git a/src/Umbraco.Commerce.Deploy/Connectors/ServiceConnectors/UmbracoCommerceCountryServiceConnector.cs b/src/Umbraco.Commerce.Deploy/Connectors/ServiceConnectors/UmbracoCommerceCountryServiceConnector.cs
@@ -145,7 +145,7 @@ await _umbracoCommerceApi.Uow.ExecuteAsync(
                     artifact.Udi.EnsureType(UmbracoCommerceConstants.UdiEntityType.Country);
                     artifact.StoreUdi.EnsureType(UmbracoCommerceConstants.UdiEntityType.Store);
 
-                    Country? entity = await state.Entity?.AsWritableAsync(uow)! ?? await Country.CreateAsync(
+                    Country? entity = state.Entity != null ? await state.Entity.AsWritableAsync(uow) : await Country.CreateAsync(
                         uow,
                         artifact.Udi.Guid,
                         artifact.StoreUdi.Guid,
diff --git a/src/Umbraco.Commerce.Deploy/Connectors/ServiceConnectors/UmbracoCommerceCurrencyServiceConnector.cs b/src/Umbraco.Commerce.Deploy/Connectors/ServiceConnectors/UmbracoCommerceCurrencyServiceConnector.cs
@@ -117,7 +117,7 @@ await _umbracoCommerceApi.Uow.ExecuteAsync(
                     artifact.Udi.EnsureType(UmbracoCommerceConstants.UdiEntityType.Currency);
                     artifact.StoreUdi.EnsureType(UmbracoCommerceConstants.UdiEntityType.Store);
 
-                    Currency? entity = await state.Entity?.AsWritableAsync(uow)! ?? await Currency.CreateAsync(
+                    Currency? entity = state.Entity != null ? await state.Entity.AsWritableAsync(uow) : await Currency.CreateAsync(
                         uow,
                         artifact.Udi.Guid,
                         artifact.StoreUdi.Guid,
diff --git a/src/Umbraco.Commerce.Deploy/Connectors/ServiceConnectors/UmbracoCommerceEmailTemplateServiceConnector.cs b/src/Umbraco.Commerce.Deploy/Connectors/ServiceConnectors/UmbracoCommerceEmailTemplateServiceConnector.cs
@@ -98,7 +98,7 @@ await _umbracoCommerceApi.Uow.ExecuteAsync(
                     artifact.Udi.EnsureType(UmbracoCommerceConstants.UdiEntityType.EmailTemplate);
                     artifact.StoreUdi.EnsureType(UmbracoCommerceConstants.UdiEntityType.Store);
 
-                    EmailTemplate? entity = await state.Entity?.AsWritableAsync(uow)! ?? await EmailTemplate.CreateAsync(
+                    EmailTemplate? entity = state.Entity != null ? await state.Entity.AsWritableAsync(uow) : await EmailTemplate.CreateAsync(
                         uow,
                         artifact.Udi.Guid,
                         artifact.StoreUdi.Guid,
diff --git a/src/Umbraco.Commerce.Deploy/Connectors/ServiceConnectors/UmbracoCommerceExportTemplateServiceConnector.cs b/src/Umbraco.Commerce.Deploy/Connectors/ServiceConnectors/UmbracoCommerceExportTemplateServiceConnector.cs
@@ -94,7 +94,7 @@ await _umbracoCommerceApi.Uow.ExecuteAsync(
                     artifact.Udi.EnsureType(UmbracoCommerceConstants.UdiEntityType.ExportTemplate);
                     artifact.StoreUdi.EnsureType(UmbracoCommerceConstants.UdiEntityType.Store);
 
-                    ExportTemplate? entity = await state.Entity?.AsWritableAsync(uow)! ?? await ExportTemplate.CreateAsync(
+                    ExportTemplate? entity = state.Entity != null ? await state.Entity.AsWritableAsync(uow) : await ExportTemplate.CreateAsync(
                         uow,
                         artifact.Udi.Guid,
                         artifact.StoreUdi.Guid,
diff --git a/src/Umbraco.Commerce.Deploy/Connectors/ServiceConnectors/UmbracoCommerceLocationServiceConnector.cs b/src/Umbraco.Commerce.Deploy/Connectors/ServiceConnectors/UmbracoCommerceLocationServiceConnector.cs
@@ -96,7 +96,7 @@ await _umbracoCommerceApi.Uow.ExecuteAsync(
                     artifact.Udi.EnsureType(UmbracoCommerceConstants.UdiEntityType.Location);
                     artifact.StoreUdi.EnsureType(UmbracoCommerceConstants.UdiEntityType.Store);
 
-                    Location? entity = await state.Entity?.AsWritableAsync(uow)! ?? await Location.CreateAsync(
+                    Location? entity = state.Entity != null ? await state.Entity.AsWritableAsync(uow) : await Location.CreateAsync(
                         uow,
                         artifact.Udi.Guid,
                         artifact.StoreUdi.Guid,
diff --git a/src/Umbraco.Commerce.Deploy/Connectors/ServiceConnectors/UmbracoCommerceOrderStatusServiceConnector.cs b/src/Umbraco.Commerce.Deploy/Connectors/ServiceConnectors/UmbracoCommerceOrderStatusServiceConnector.cs
@@ -90,7 +90,7 @@ await _umbracoCommerceApi.Uow.ExecuteAsync(
                     artifact.Udi.EnsureType(UmbracoCommerceConstants.UdiEntityType.OrderStatus);
                     artifact.StoreUdi.EnsureType(UmbracoCommerceConstants.UdiEntityType.Store);
 
-                    OrderStatus? entity = await state.Entity?.AsWritableAsync(uow)! ?? await OrderStatus.CreateAsync(
+                    OrderStatus? entity = state.Entity != null ? await state.Entity.AsWritableAsync(uow) : await OrderStatus.CreateAsync(
                         uow,
                         artifact.Udi.Guid,
                         artifact.StoreUdi.Guid,
diff --git a/src/Umbraco.Commerce.Deploy/Connectors/ServiceConnectors/UmbracoCommercePaymentMethodServiceConnector.cs b/src/Umbraco.Commerce.Deploy/Connectors/ServiceConnectors/UmbracoCommercePaymentMethodServiceConnector.cs
@@ -197,7 +197,7 @@ await _umbracoCommerceApi.Uow.ExecuteAsync(
                     artifact.Udi.EnsureType(UmbracoCommerceConstants.UdiEntityType.PaymentMethod);
                     artifact.StoreUdi.EnsureType(UmbracoCommerceConstants.UdiEntityType.Store);
 
-                    PaymentMethod? entity = await state.Entity?.AsWritableAsync(uow)! ?? await PaymentMethod.CreateAsync(
+                    PaymentMethod? entity = state.Entity != null ? await state.Entity.AsWritableAsync(uow) : await PaymentMethod.CreateAsync(
                         uow,
                         artifact.Udi.Guid,
                         artifact.StoreUdi.Guid,
diff --git a/src/Umbraco.Commerce.Deploy/Connectors/ServiceConnectors/UmbracoCommercePrintTemplateServiceConnector.cs b/src/Umbraco.Commerce.Deploy/Connectors/ServiceConnectors/UmbracoCommercePrintTemplateServiceConnector.cs
@@ -92,7 +92,7 @@ await _umbracoCommerceApi.Uow.ExecuteAsync(
                     artifact.Udi.EnsureType(UmbracoCommerceConstants.UdiEntityType.PrintTemplate);
                     artifact.StoreUdi.EnsureType(UmbracoCommerceConstants.UdiEntityType.Store);
 
-                    PrintTemplate? entity = await state.Entity?.AsWritableAsync(uow)! ?? await PrintTemplate.CreateAsync(
+                    PrintTemplate? entity = state.Entity != null ? await state.Entity.AsWritableAsync(uow) : await PrintTemplate.CreateAsync(
                         uow,
                         artifact.Udi.Guid,
                         artifact.StoreUdi.Guid,
diff --git a/src/Umbraco.Commerce.Deploy/Connectors/ServiceConnectors/UmbracoCommerceProductAttributePresetServiceConnector.cs b/src/Umbraco.Commerce.Deploy/Connectors/ServiceConnectors/UmbracoCommerceProductAttributePresetServiceConnector.cs
@@ -117,7 +117,7 @@ await _umbracoCommerceApi.Uow.ExecuteAsync(
                     artifact.Udi.EnsureType(UmbracoCommerceConstants.UdiEntityType.ProductAttributePreset);
                     artifact.StoreUdi.EnsureType(UmbracoCommerceConstants.UdiEntityType.Store);
 
-                    ProductAttributePreset? entity = await state.Entity?.AsWritableAsync(uow)! ?? await ProductAttributePreset.CreateAsync(
+                    ProductAttributePreset? entity = state.Entity != null ? await state.Entity.AsWritableAsync(uow) : await ProductAttributePreset.CreateAsync(
                         uow,
                         artifact.Udi.Guid,
                         artifact.StoreUdi.Guid,
diff --git a/src/Umbraco.Commerce.Deploy/Connectors/ServiceConnectors/UmbracoCommerceProductAttributeServiceConnector.cs b/src/Umbraco.Commerce.Deploy/Connectors/ServiceConnectors/UmbracoCommerceProductAttributeServiceConnector.cs
@@ -107,7 +107,7 @@ await _umbracoCommerceApi.Uow.ExecuteAsync(
                     artifact.Udi.EnsureType(UmbracoCommerceConstants.UdiEntityType.ProductAttribute);
                     artifact.StoreUdi.EnsureType(UmbracoCommerceConstants.UdiEntityType.Store);
 
-                    ProductAttribute? entity = await state.Entity?.AsWritableAsync(uow)! ?? await ProductAttribute.CreateAsync(
+                    ProductAttribute? entity = state.Entity != null ? await state.Entity.AsWritableAsync(uow) : await ProductAttribute.CreateAsync(
                         uow,
                         artifact.Udi.Guid,
                         artifact.StoreUdi.Guid,
diff --git a/src/Umbraco.Commerce.Deploy/Connectors/ServiceConnectors/UmbracoCommerceRegionServiceConnector.cs b/src/Umbraco.Commerce.Deploy/Connectors/ServiceConnectors/UmbracoCommerceRegionServiceConnector.cs
@@ -119,7 +119,7 @@ await _umbracoCommerceApi.Uow.ExecuteAsync(
                     artifact.StoreUdi.EnsureType(UmbracoCommerceConstants.UdiEntityType.Store);
                     artifact.CountryUdi.EnsureType(UmbracoCommerceConstants.UdiEntityType.Country);
 
-                    Region? entity = await state.Entity?.AsWritableAsync(uow)! ?? await Region.CreateAsync(
+                    Region? entity = state.Entity != null ? await state.Entity.AsWritableAsync(uow) : await Region.CreateAsync(
                         uow,
                         artifact.Udi.Guid,
                         artifact.StoreUdi.Guid,
diff --git a/src/Umbraco.Commerce.Deploy/Connectors/ServiceConnectors/UmbracoCommerceShippingMethodServiceConnector.cs b/src/Umbraco.Commerce.Deploy/Connectors/ServiceConnectors/UmbracoCommerceShippingMethodServiceConnector.cs
@@ -214,7 +214,7 @@ await _umbracoCommerceApi.Uow.ExecuteAsync(
                     artifact.Udi.EnsureType(UmbracoCommerceConstants.UdiEntityType.ShippingMethod);
                     artifact.StoreUdi.EnsureType(UmbracoCommerceConstants.UdiEntityType.Store);
 
-                    ShippingMethod? entity = await state.Entity?.AsWritableAsync(uow)! ?? await ShippingMethod.CreateAsync(
+                    ShippingMethod? entity = state.Entity != null ? await state.Entity.AsWritableAsync(uow) : await ShippingMethod.CreateAsync(
                         uow,
                         artifact.Udi.Guid,
                         artifact.StoreUdi.Guid,
diff --git a/src/Umbraco.Commerce.Deploy/Connectors/ServiceConnectors/UmbracoCommerceStoreServiceConnector.cs b/src/Umbraco.Commerce.Deploy/Connectors/ServiceConnectors/UmbracoCommerceStoreServiceConnector.cs
@@ -207,7 +207,7 @@ private async Task Pass1Async(ArtifactDeployState<StoreArtifact, StoreReadOnly>
 
                     artifact.Udi.EnsureType(UmbracoCommerceConstants.UdiEntityType.Store);
 
-                    Store? entity = await state.Entity?.AsWritableAsync(uow)! ?? await Store.CreateAsync(
+                    Store? entity = state.Entity != null ? await state.Entity.AsWritableAsync(uow) : await Store.CreateAsync(
                         uow,
                         artifact.Udi.Guid,
                         artifact.Alias,
diff --git a/src/Umbraco.Commerce.Deploy/Connectors/ServiceConnectors/UmbracoCommerceTaxCalculationMethodServiceConnector.cs b/src/Umbraco.Commerce.Deploy/Connectors/ServiceConnectors/UmbracoCommerceTaxCalculationMethodServiceConnector.cs
@@ -96,7 +96,7 @@ await _umbracoCommerceApi.Uow.ExecuteAsync(
                     artifact.Udi.EnsureType(UmbracoCommerceConstants.UdiEntityType.TaxCalculationMethod);
                     artifact.StoreUdi.EnsureType(UmbracoCommerceConstants.UdiEntityType.Store);
 
-                    TaxCalculationMethod? entity = await state.Entity?.AsWritableAsync(uow)! ?? await TaxCalculationMethod.CreateAsync(
+                    TaxCalculationMethod? entity = state.Entity != null ? await state.Entity.AsWritableAsync(uow) : await TaxCalculationMethod.CreateAsync(
                         uow,
                         artifact.Udi.Guid,
                         artifact.StoreUdi.Guid,
diff --git a/src/Umbraco.Commerce.Deploy/Connectors/ServiceConnectors/UmbracoCommerceTaxClassServiceConnector.cs b/src/Umbraco.Commerce.Deploy/Connectors/ServiceConnectors/UmbracoCommerceTaxClassServiceConnector.cs
@@ -128,7 +128,7 @@ await _umbracoCommerceApi.Uow.ExecuteAsync(
                     artifact.Udi.EnsureType(UmbracoCommerceConstants.UdiEntityType.TaxClass);
                     artifact.StoreUdi.EnsureType(UmbracoCommerceConstants.UdiEntityType.Store);
 
-                    TaxClass? entity = await state.Entity?.AsWritableAsync(uow)! ?? await TaxClass.CreateAsync(
+                    TaxClass? entity = state.Entity != null ? await state.Entity.AsWritableAsync(uow) : await TaxClass.CreateAsync(
                         uow,
                         artifact.Udi.Guid,
                         artifact.StoreUdi.Guid,
