dotnet format run

Kentico · Jul 22, 2024 · ea5b2a6 · ea5b2a6
1 parent 45d664a
commit ea5b2a6
Show file tree

Hide file tree

Showing 29 changed files with 143 additions and 63 deletions.
diff --git a/KVA/Migration.Toolkit.Source/Handlers/MigrateCustomTablesHandler.cs b/KVA/Migration.Toolkit.Source/Handlers/MigrateCustomTablesHandler.cs
@@ -29,7 +29,7 @@ public class MigrateCustomTablesHandler(
     BulkDataCopyService bulkDataCopyService,
     IEntityMapper<ICmsClass, DataClassInfo> dataClassMapper,
     PrimaryKeyMappingContext primaryKeyMappingContext
-    // ReusableSchemaService reusableSchemaService
+// ReusableSchemaService reusableSchemaService
 )
     : IRequestHandler<MigrateCustomTablesCommand, CommandResult>
 {

diff --git a/KVA/Migration.Toolkit.Source/Handlers/MigratePagesCommandHandler.cs b/KVA/Migration.Toolkit.Source/Handlers/MigratePagesCommandHandler.cs
@@ -231,6 +231,9 @@ public async Task<CommandResult> Handle(MigratePagesCommand request, Cancellatio
                                 webPageItemInfo = wp;
                                 break;
                             }
+
+                            default:
+                                break;
                         }
                     }
 
@@ -397,6 +400,9 @@ private async Task MigratePageUrlPaths(Guid webPageItemGuid, int webPageItemId,
 
                                 break;
                             }
+
+                            default:
+                                break;
                         }
                     }
                 }
@@ -465,6 +471,9 @@ private async Task MigratePageUrlPaths(Guid webPageItemGuid, int webPageItemId,
 
                             break;
                         }
+
+                        default:
+                            break;
                     }
                 }
             }
@@ -526,6 +535,9 @@ private async Task MigratePageUrlPaths(Guid webPageItemGuid, int webPageItemId,
 
                         break;
                     }
+
+                    default:
+                        break;
                 }
             }
         }

diff --git a/KVA/Migration.Toolkit.Source/Helpers/PageBuilderWidgetsPatcher.cs b/KVA/Migration.Toolkit.Source/Helpers/PageBuilderWidgetsPatcher.cs
@@ -68,6 +68,9 @@ public static void DeferredPatchProperties(JObject propertyContainer, TreePathCo
 
                         break;
                     }
+
+                    default:
+                        break;
                 }
             }
         }

diff --git a/KVA/Migration.Toolkit.Source/Helpers/Printer.cs b/KVA/Migration.Toolkit.Source/Helpers/Printer.cs
@@ -39,19 +39,13 @@ public static string GetEntityIdentityPrint<T>(T model, bool printType = true)
     {
         string currentTypeName = ReflectionHelper<T>.CurrentType.Name;
 
-        string Fallback(object obj)
-        {
-            return printType
+        string Fallback(object obj) => printType
                 ? $"{currentTypeName}({SerializationHelper.SerializeOnlyNonComplexProperties(obj)})"
                 : $"{SerializationHelper.SerializeOnlyNonComplexProperties(obj)}";
-        }
 
-        string FormatModel(string inner)
-        {
-            return printType
+        string FormatModel(string inner) => printType
                 ? $"{currentTypeName}({inner})"
                 : $"{inner}";
-        }
 
         return model switch
         {

diff --git a/KVA/Migration.Toolkit.Source/Mappers/CmsClassMapper.cs b/KVA/Migration.Toolkit.Source/Mappers/CmsClassMapper.cs
@@ -121,6 +121,9 @@ protected override DataClassInfo MapInternal(ICmsClass source, DataClassInfo tar
             {
                 break;
             }
+
+            default:
+                break;
         }
 
         switch (source)
@@ -143,12 +146,12 @@ protected override DataClassInfo MapInternal(ICmsClass source, DataClassInfo tar
 
             // Target Form,null
             case
-                {
-                    ClassIsDocumentType: false,
-                    ClassIsCoupledClass: true,
-                    ClassIsForm: true
-                    // ClassIsPage: false
-                }
+            {
+                ClassIsDocumentType: false,
+                ClassIsCoupledClass: true,
+                ClassIsForm: true
+                // ClassIsPage: false
+            }
                 :
             {
                 target.ClassType = ClassType.FORM;
@@ -189,6 +192,9 @@ protected override DataClassInfo MapInternal(ICmsClass source, DataClassInfo tar
                 target = PatchDataClassInfo(target, out string? oldPrimaryKeyName, out string? documentNameField);
                 break;
             }
+
+            default:
+                break;
         }
 
         return target;

diff --git a/KVA/Migration.Toolkit.Source/Mappers/CmsFormMapper.cs b/KVA/Migration.Toolkit.Source/Mappers/CmsFormMapper.cs
@@ -54,6 +54,9 @@ protected override BizFormInfo MapInternal(ICmsForm source, BizFormInfo target,
                 target.FormBuilderLayout = s.FormBuilderLayout;
                 break;
             }
+
+            default:
+                break;
         }
 
         if (mappingHelper.TranslateRequiredId<ICmsClass>(c => c.ClassID, source.FormClassID, out int formClassId))
@@ -112,6 +115,9 @@ protected override CmsForm MapInternal(ICmsForm source, CmsForm target, bool new
                 target.FormBuilderLayout = s.FormBuilderLayout;
                 break;
             }
+
+            default:
+                break;
         }
 
         // TODO tk: 2022-05-20 new deduce: target.FormAfterSubmitMode = source.FormAfterSubmitMode;

diff --git a/KVA/Migration.Toolkit.Source/Mappers/ContentItemMapper.cs b/KVA/Migration.Toolkit.Source/Mappers/ContentItemMapper.cs
@@ -136,13 +136,13 @@ protected override IEnumerable<IUmtModel> MapInternal(CmsTreeMapperSource source
 
             DateTime? scheduledPublishWhen = null;
             DateTime? scheduleUnpublishWhen = null;
-            
+
             if (cmsDocument.DocumentPublishFrom is { } publishFrom)
             {
                 var now = Service.Resolve<IDateTimeNowService>().GetDateTimeNow();
                 if (publishFrom > now)
                 {
-                    versionStatus = VersionStatus.Unpublished;    
+                    versionStatus = VersionStatus.Unpublished;
                 }
                 else
                 {
@@ -155,7 +155,7 @@ protected override IEnumerable<IUmtModel> MapInternal(CmsTreeMapperSource source
                 var now = Service.Resolve<IDateTimeNowService>().GetDateTimeNow();
                 if (publishTo < now)
                 {
-                    versionStatus = VersionStatus.Unpublished;    
+                    versionStatus = VersionStatus.Unpublished;
                 }
                 else
                 {
@@ -183,6 +183,9 @@ protected override IEnumerable<IUmtModel> MapInternal(CmsTreeMapperSource source
                     contentItemCommonDataPageTemplateConfiguration = doc.DocumentPageTemplateConfiguration;
                     break;
                 }
+
+                default:
+                    break;
             }
 
             PatchJsonDefinitions(source.CmsTree.NodeSiteID, ref contentItemCommonDataPageTemplateConfiguration, ref contentItemCommonDataPageBuilderWidgets, out bool ndp);
@@ -308,7 +311,7 @@ protected override IEnumerable<IUmtModel> MapInternal(CmsTreeMapperSource source
                 ContentItemLanguageMetadataHasImageAsset = false,
                 ContentItemLanguageMetadataContentLanguageGuid = languageGuid, // DocumentCulture -> language entity needs to be created and its ID used here
                 ContentItemLanguageMetadataScheduledPublishWhen = scheduledPublishWhen,
-                ContentItemLanguageMetadataScheduledUnpublishWhen = scheduleUnpublishWhen 
+                ContentItemLanguageMetadataScheduledUnpublishWhen = scheduleUnpublishWhen
             };
             yield return languageMetadataInfo;
         }
@@ -650,6 +653,9 @@ ICmsClass nodeClass
 
                             break;
                         }
+
+                        default:
+                            break;
                     }
                 }
                 else
@@ -848,6 +854,9 @@ private void WalkProperties(int siteId, JObject properties, List<EditingFormCont
                             logger.LogTrace("Value migrated from {Old} model to {New} model", oldFormComponent, newFormComponent);
                             break;
                         }
+
+                        default:
+                            break;
                     }
                 }
                 else if (FieldMappingInstance.BuiltInModel.SupportedInKxpLegacyMode.Contains(editingFcm.FormComponentIdentifier))

diff --git a/KVA/Migration.Toolkit.Source/Mappers/PageTemplateConfigurationMapper.cs b/KVA/Migration.Toolkit.Source/Mappers/PageTemplateConfigurationMapper.cs
@@ -204,6 +204,9 @@ private void WalkProperties(int siteId, JObject properties, List<EditingFormCont
                             // TODO tomas.krch 2024-03-27: implement!
                             break;
                         }
+
+                        default:
+                            break;
                     }
                 }
                 else if (FieldMappingInstance.BuiltInModel.SupportedInKxpLegacyMode.Contains(editingFcm.FormComponentIdentifier))

diff --git a/Migration.Toolkit.CLI/ConfigurationValidator.cs b/Migration.Toolkit.CLI/ConfigurationValidator.cs
@@ -123,13 +123,10 @@ public static IEnumerable<ValidationMessage> GetValidationErrors(IConfigurationR
             var customMigrationModel = optInFeatures?.GetValue<CustomMigrationModel>(ConfigurationNames.CustomMigration);
             if (customMigrationModel is { FieldMigrations.Length: > 0 })
             {
-                static ValidationMessage Required(int item, string fieldName)
-                {
-                    return new ValidationMessage(
+                static ValidationMessage Required(int item, string fieldName) => new ValidationMessage(
                         ValidationMessageType.Error,
                         $"Custom DataType migration at index [{item}] is missing value '{fieldName}', supply value or remove whole DataType migration."
                     );
-                }
 
                 var fieldMigrations = customMigrationModel.FieldMigrations;
 

diff --git a/Migration.Toolkit.CLI/Program.cs b/Migration.Toolkit.CLI/Program.cs
@@ -69,6 +69,8 @@
                 Console.WriteLine();
             }
 
+            break;
+        default:
             break;
     }
 }

diff --git a/Migration.Toolkit.Common/SemanticVersion.cs b/Migration.Toolkit.Common/SemanticVersion.cs
@@ -53,6 +53,9 @@ public static bool TryParse(string? s, [NotNullWhen(true)] out SemanticVersion?
                     semVer = new SemanticVersion(major, minor, hotfix);
                     return true;
                 }
+
+                default:
+                    break;
             }
         }
 

diff --git a/Migration.Toolkit.Common/Services/BulkCopy/BulkDataCopyService.cs b/Migration.Toolkit.Common/Services/BulkCopy/BulkDataCopyService.cs
@@ -56,6 +56,8 @@ public bool CheckForTableColumnsDifferences(string tableName, Dictionary<string,
                     logger.LogError("Table {Table} pairing source({SourceColumnName}) <> target({TargetColumnName}) has failed", tableName, result?.A, result?.B);
                     anyFailedColumnCheck = true;
                     break;
+                default:
+                    break;
             }
         }
 

diff --git a/Migration.Toolkit.Core.K11/Handlers/MigrateContactManagementCommandHandler.cs b/Migration.Toolkit.Core.K11/Handlers/MigrateContactManagementCommandHandler.cs
@@ -195,6 +195,9 @@ private ValueInterceptorResult ContactValueInterceptor(int ordinal, string colum
                         .WithData(currentRow));
                     return ValueInterceptorResult.SkipRow;
                 }
+
+                default:
+                    break;
             }
         }
 
@@ -210,6 +213,9 @@ private ValueInterceptorResult ContactValueInterceptor(int ordinal, string colum
                         .WithData(currentRow));
                     return ValueInterceptorResult.SkipRow;
                 }
+
+                default:
+                    break;
             }
         }
 
@@ -225,6 +231,9 @@ private ValueInterceptorResult ContactValueInterceptor(int ordinal, string colum
                         .WithData(currentRow));
                     return ValueInterceptorResult.SkipRow;
                 }
+
+                default:
+                    break;
             }
         }
 
@@ -333,6 +342,9 @@ private ValueInterceptorResult ActivityValueInterceptor(int columnOrdinal, strin
                             return ValueInterceptorResult.SkipRow;
                     }
                 }
+
+                default:
+                    break;
             }
         }
 

diff --git a/Migration.Toolkit.Core.K11/Helpers/Printer.cs b/Migration.Toolkit.Core.K11/Helpers/Printer.cs
@@ -38,19 +38,13 @@ public static string GetEntityIdentityPrint<T>(T model, bool printType = true)
     {
         string currentTypeName = ReflectionHelper<T>.CurrentType.Name;
 
-        string Fallback(object obj)
-        {
-            return printType
+        string Fallback(object obj) => printType
                 ? $"{currentTypeName}({SerializationHelper.SerializeOnlyNonComplexProperties(obj)})"
                 : $"{SerializationHelper.SerializeOnlyNonComplexProperties(obj)}";
-        }
 
-        string FormatModel(string inner)
-        {
-            return printType
+        string FormatModel(string inner) => printType
                 ? $"{currentTypeName}({inner})"
                 : $"{inner}";
-        }
 
         return model switch
         {
@@ -74,7 +68,7 @@ string FormatModel(string inner)
             KXP.Models.CmsConsentAgreement item => FormatModel($"ID={item.ConsentAgreementId}, GUID={item.ConsentAgreementGuid}"),
             KXP.Models.CmsSettingsKey item => FormatModel($"ID={item.KeyId}, GUID={item.KeyGuid}, Name={item.KeyName}"),
 
-            Toolkit.K11.Models.CmsRole item => FormatModel($"ID={item.RoleId}, GUID={item.RoleGuid}, Name={item.RoleName}, SiteId={item.SiteId}"),
+            CmsRole item => FormatModel($"ID={item.RoleId}, GUID={item.RoleGuid}, Name={item.RoleName}, SiteId={item.SiteId}"),
             CmsAttachment item => FormatModel($"ID={item.AttachmentId}, GUID={item.AttachmentGuid}, Name={item.AttachmentName}"),
             CmsClass item => FormatModel($"ID={item.ClassId}, GUID={item.ClassGuid}, Name={item.ClassName}"),
             CmsConsent item => FormatModel($"ID={item.ConsentId}, GUID={item.ConsentGuid}, Name={item.ConsentName}"),

diff --git a/Migration.Toolkit.Core.K11/Mappers/CmsSettingsCategoryMapper.cs b/Migration.Toolkit.Core.K11/Mappers/CmsSettingsCategoryMapper.cs
@@ -57,6 +57,9 @@ protected override KXP.Models.CmsSettingsCategory MapInternal(CmsSettingsCategor
                         addFailure(new MapperResultFailure<KXP.Models.CmsSettingsCategory>(result.HandbookReference));
                         break;
                     }
+
+                    default:
+                        break;
                 }
             }
         }
@@ -79,6 +82,9 @@ protected override KXP.Models.CmsSettingsCategory MapInternal(CmsSettingsCategor
                     addFailure(new MapperResultFailure<KXP.Models.CmsSettingsCategory>(result.HandbookReference));
                     break;
                 }
+
+                default:
+                    break;
             }
         }
         else if (mappingHelper.TranslateIdAllowNulls<CmsCategory>(c => c.CategoryId, source.CategoryParentId, out int? categoryParentId))

diff --git a/Migration.Toolkit.Core.K11/Mappers/OmContactMapper.cs b/Migration.Toolkit.Core.K11/Mappers/OmContactMapper.cs
@@ -69,6 +69,9 @@ protected override KXP.Models.OmContact MapInternal(OmContact source, KXP.Models
                     addFailure(new MapperResultFailure<KXP.Models.OmContact>(result?.HandbookReference));
                     break;
                 }
+
+                default:
+                    break;
             }
         }
         else

diff --git a/Migration.Toolkit.Core.KX12/Handlers/MigrateContactManagementCommandHandler.cs b/Migration.Toolkit.Core.KX12/Handlers/MigrateContactManagementCommandHandler.cs
@@ -195,6 +195,9 @@ private ValueInterceptorResult ContactValueInterceptor(int ordinal, string colum
                         .WithData(currentRow));
                     return ValueInterceptorResult.SkipRow;
                 }
+
+                default:
+                    break;
             }
         }
 
@@ -210,6 +213,9 @@ private ValueInterceptorResult ContactValueInterceptor(int ordinal, string colum
                         .WithData(currentRow));
                     return ValueInterceptorResult.SkipRow;
                 }
+
+                default:
+                    break;
             }
         }
 
@@ -225,6 +231,9 @@ private ValueInterceptorResult ContactValueInterceptor(int ordinal, string colum
                         .WithData(currentRow));
                     return ValueInterceptorResult.SkipRow;
                 }
+
+                default:
+                    break;
             }
         }
 
@@ -337,6 +346,9 @@ private ValueInterceptorResult ActivityValueInterceptor(int columnOrdinal, strin
                             return ValueInterceptorResult.SkipRow;
                     }
                 }
+
+                default:
+                    break;
             }
         }
-Original file line number
+Diff line change
@@ Expand Up @@
                                     webPageItemInfo = wp;
                                     break;
                                 }
+                                default:
+                                    break;
                             }
                         }
@@ Expand Down Expand Up @@
                                     break;
                                 }
+                                default:
+                                    break;
                             }
                         }
                     }
@@ Expand Down Expand Up @@
                                 break;
                             }
+                            default:
+                                break;
                         }
                     }
                 }
@@ Expand Down Expand Up @@
                             break;
                         }
+                        default:
+                            break;
                     }
                 }
             }
@@ Expand Down @@