Refactor code for improved clarity and consistency

This commit updates various code sections to eliminate unnecessary punctuation, aligns collection initializations with standard syntax, and improves conditional expressions for enhanced readability. These changes enhance code clarity, maintainability, and consistency across the project without altering functionality.
ONLYOFFICE · Dec 9, 2024 · a9a76a7 · a9a76a7
1 parent e9d6a36
commit a9a76a7
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 9 deletions.
diff --git a/common/ASC.Common/Utils/SwaggerCustomFilter.cs b/common/ASC.Common/Utils/SwaggerCustomFilter.cs
@@ -221,7 +221,7 @@ private OpenApiSchema UpdateSchema(Type checkType, OpenApiSchema result)
 
             if (enumDataString.Count > 0)
             {
-                result.OneOf = new List<OpenApiSchema>()
+                result.OneOf = new List<OpenApiSchema>
                 {
                     new()
                     {

diff --git a/products/ASC.Files/Core/ApiModels/ResponseDto/ConfigurationDto.cs b/products/ASC.Files/Core/ApiModels/ResponseDto/ConfigurationDto.cs
@@ -395,7 +395,7 @@ public async Task<ConfigurationDto<T>> Convert(Configuration<T> source, File<T>
             ErrorMessage = source.Error
         };
 
-        result.EditorUrl = FilesLinkUtility.AddQueryString(result.EditorUrl, new Dictionary<string, string>() {
+        result.EditorUrl = FilesLinkUtility.AddQueryString(result.EditorUrl, new Dictionary<string, string> {
             { FilesLinkUtility.ShardKey, result.Document?.Key }
         });
 

diff --git a/products/ASC.Files/Core/GlobalUsings.cs b/products/ASC.Files/Core/GlobalUsings.cs
@@ -49,7 +49,7 @@
 global using System.Text.Unicode;
 global using System.Web;
 global using System.Xml;
-global using ASC.Api.Collections;
+
 global using ASC.Api.Core;
 global using ASC.Api.Core.Extensions;
 global using ASC.Api.Core.Model;

diff --git a/products/ASC.Files/Core/Helpers/DocumentService.cs b/products/ASC.Files/Core/Helpers/DocumentService.cs
@@ -148,7 +148,7 @@ public static string GenerateRevisionId(string expectedKey)
 
         documentRevisionId = GenerateRevisionId(documentRevisionId);
 
-        documentConverterUrl = FilesLinkUtility.AddQueryString(documentConverterUrl, new Dictionary<string, string>() {
+        documentConverterUrl = FilesLinkUtility.AddQueryString(documentConverterUrl, new Dictionary<string, string> {
             { FilesLinkUtility.ShardKey, documentRevisionId }
         });
 
@@ -231,7 +231,7 @@ public static async Task<CommandResponse> CommandRequestAsync(FileUtility fileUt
         string signatureSecret,
         IHttpClientFactory clientFactory)
     {
-        documentTrackerUrl = FilesLinkUtility.AddQueryString(documentTrackerUrl, new Dictionary<string, string>() {
+        documentTrackerUrl = FilesLinkUtility.AddQueryString(documentTrackerUrl, new Dictionary<string, string> {
             { FilesLinkUtility.ShardKey, documentRevisionId }
         });
 
@@ -344,7 +344,7 @@ public static async Task<CommandResponse> CommandRequestAsync(FileUtility fileUt
        string signatureSecret,
        IHttpClientFactory clientFactory)
     {
-        docbuilderUrl = FilesLinkUtility.AddQueryString(docbuilderUrl, new Dictionary<string, string>() {
+        docbuilderUrl = FilesLinkUtility.AddQueryString(docbuilderUrl, new Dictionary<string, string> {
             { FilesLinkUtility.ShardKey, requestKey }
         });
 

diff --git a/products/ASC.Files/Core/Services/DocumentService/DocumentServiceHelper.cs b/products/ASC.Files/Core/Services/DocumentService/DocumentServiceHelper.cs
@@ -376,7 +376,7 @@ public Options GetOptions<T>(Folder<T> room)
         }
         paragrahs.Add(new Paragraph(runs));
 
-        var options = new Options()
+        var options = new Options
         {
             WatermarkOnDraw = new WatermarkOnDraw(watermarkSettings.ImageWidth * watermarkSettings.ImageScale / 100, watermarkSettings.ImageHeight * watermarkSettings.ImageScale / 100 , watermarkSettings.ImageUrl, watermarkSettings.Rotate, paragrahs)
         };

diff --git a/products/ASC.Files/Core/Services/WCFService/FileOperations/FileOperationsManager.cs b/products/ASC.Files/Core/Services/WCFService/FileOperations/FileOperationsManager.cs
@@ -452,7 +452,7 @@ private static (List<FilesDownloadOperationItem<int>>, List<FilesDownloadOperati
                 if (item.Id.TryGetProperty("password", out var p))
                 {
                     password = p.GetString();
-                };
+                }
 
                 if (key.ValueKind == JsonValueKind.Number)
                 {

diff --git a/products/ASC.Files/Core/Utils/EntryManager.cs b/products/ASC.Files/Core/Utils/EntryManager.cs
@@ -1556,7 +1556,7 @@ public async Task<File<T>> SaveEditingAsync<T>(T fileId, string fileExtension, s
                         var resultFolder = await folderDao.GetFolderAsync(origProperties.FormFilling.ResultsFolderId);
                         var resultFile = await fileDao.GetFileAsync(origProperties.FormFilling.ResultsFileID);
 
-                        if (resultFolder == null || resultFolder.FolderType != FolderType.FormFillingFolderDone)
+                        if (resultFolder is not { FolderType: FolderType.FormFillingFolderDone })
                         {
                             logger.LogDebug("Result folder: {Folder} not found.", origProperties.FormFilling.ResultsFolderId);
-Original file line number
+Diff line change
@@ Expand Up @@
                 if (enumDataString.Count > 0)
                 {
-                    result.OneOf = new List<OpenApiSchema>()
+                    result.OneOf = new List<OpenApiSchema>
                     {
                         new()
                         {
@@ Expand Down @@