IlyaSobolev/DocSpace-buildtools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix-messages: IDE0074

Browse Source
This commit is contained in:
SuhorukovAnton 2020-09-29 14:51:34 +03:00
parent a055c71610
commit 9b6ccc19f0
6 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/ASC.Core.Common/Context/Impl/UserManager.cs
View File

@ -67,7 +67,7 @@ namespace ASC.Core
private Constants Constants { get; }
private Tenant tenant;
private Tenant Tenant { get { return tenant ?? (tenant = TenantManager.GetCurrentTenant()); } }
private Tenant Tenant { get { return tenant ??= TenantManager.GetCurrentTenant(); } }
public UserManager()
{

2
common/ASC.Core.Common/Tenants/TenantUtil.cs
View File

@ -80,7 +80,7 @@ namespace ASC.Core.Tenants
{
get
{
return timeZoneInfo ?? (timeZoneInfo = TimeZoneConverter.GetTimeZone(TenantManager.GetCurrentTenant().TimeZone));
return timeZoneInfo ??= TimeZoneConverter.GetTimeZone(TenantManager.GetCurrentTenant().TimeZone);
}
}
public DateTime DateTimeFromUtc(DateTime utc)

2
common/services/ASC.Data.Backup/Tasks/Modules/ModuleSpecificsBase.cs
View File

@ -43,7 +43,7 @@ namespace ASC.Data.Backup.Tasks.Modules
private string _connectionStringName;
public virtual string ConnectionStringName
{
get { return _connectionStringName ?? (_connectionStringName = ModuleName.ToString().ToLower()); }
get { return _connectionStringName ??= ModuleName.ToString().ToLower(); }
}
public abstract IEnumerable<TableInfo> Tables { get; }

2
products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveStorage.cs vendored
View File

@ -72,7 +72,7 @@ namespace ASC.Files.Thirdparty.OneDrive
private OneDriveClient OnedriveClient
{
get { return _onedriveClientCache ?? (_onedriveClientCache = new OneDriveClient(new OneDriveAuthProvider(AccessToken))); }
get { return _onedriveClientCache ??= new OneDriveClient(new OneDriveAuthProvider(AccessToken)); }
}
public bool IsOpened { get; private set; }

24
web/ASC.Web.Core/Files/FileUtility.cs
View File

@ -219,13 +219,13 @@ namespace ASC.Web.Core.Files
}
private List<string> extsIndexing;
private List<string> ExtsIndexing { get => extsIndexing ?? (extsIndexing = (Configuration.GetSection("files:index").Get<string[]>() ?? new string[] { }).ToList()); }
private List<string> ExtsIndexing { get => extsIndexing ??= (Configuration.GetSection("files:index").Get<string[]>() ?? new string[] { }).ToList(); }
private List<string> extsImagePreviewed;
public List<string> ExtsImagePreviewed { get => extsImagePreviewed ?? (extsImagePreviewed = (Configuration.GetSection("files:viewed-images").Get<string[]>() ?? new string[] { }).ToList()); }
public List<string> ExtsImagePreviewed { get => extsImagePreviewed ??= (Configuration.GetSection("files:viewed-images").Get<string[]>() ?? new string[] { }).ToList(); }
private List<string> extsMediaPreviewed;
public List<string> ExtsMediaPreviewed { get => extsMediaPreviewed ?? (extsMediaPreviewed = (Configuration.GetSection("files:viewed-media").Get<string[]>() ?? new string[] { }).ToList()); }
public List<string> ExtsMediaPreviewed { get => extsMediaPreviewed ??= (Configuration.GetSection("files:viewed-media").Get<string[]>() ?? new string[] { }).ToList(); }
private List<string> extsWebPreviewed;
public List<string> ExtsWebPreviewed
@ -237,7 +237,7 @@ namespace ASC.Web.Core.Files
return new List<string>();
}
return extsWebPreviewed ?? (extsWebPreviewed = (Configuration.GetSection("files:docservice:viewed-docs").Get<string[]>() ?? new string[] { }).ToList());
return extsWebPreviewed ??= (Configuration.GetSection("files:docservice:viewed-docs").Get<string[]>() ?? new string[] { }).ToList();
}
}
@ -251,12 +251,12 @@ namespace ASC.Web.Core.Files
return new List<string>();
}
return extsWebEdited ?? (extsWebEdited = (Configuration.GetSection("files:docservice:edited-docs").Get<string[]>() ?? new string[] { }).ToList());
return extsWebEdited ??= (Configuration.GetSection("files:docservice:edited-docs").Get<string[]>() ?? new string[] { }).ToList();
}
}
public List<string> extsWebEncrypt;
public List<string> ExtsWebEncrypt { get => extsWebEncrypt ?? (extsWebEncrypt = (Configuration.GetSection("files:docservice:encrypted-docs").Get<string[]>() ?? new string[] { }).ToList()); }
public List<string> ExtsWebEncrypt { get => extsWebEncrypt ??= (Configuration.GetSection("files:docservice:encrypted-docs").Get<string[]>() ?? new string[] { }).ToList(); }
private List<string> extsWebReviewed;
public List<string> ExtsWebReviewed
@ -268,7 +268,7 @@ namespace ASC.Web.Core.Files
return new List<string>();
}
return extsWebReviewed ?? (extsWebReviewed = (Configuration.GetSection("files:docservice:reviewed-docs").Get<string[]>() ?? new string[] { }).ToList());
return extsWebReviewed ??= (Configuration.GetSection("files:docservice:reviewed-docs").Get<string[]>() ?? new string[] { }).ToList();
}
}
@ -282,7 +282,7 @@ namespace ASC.Web.Core.Files
return new List<string>();
}
return extsWebCustomFilterEditing ?? (extsWebCustomFilterEditing = (Configuration.GetSection("files:docservice:customfilter-docs").Get<string[]>() ?? new string[] { }).ToList());
return extsWebCustomFilterEditing ??= (Configuration.GetSection("files:docservice:customfilter-docs").Get<string[]>() ?? new string[] { }).ToList();
}
}
@ -296,7 +296,7 @@ namespace ASC.Web.Core.Files
return new List<string>();
}
return extsWebRestrictedEditing ?? (extsWebRestrictedEditing = (Configuration.GetSection("files:docservice:formfilling-docs").Get<string[]>() ?? new string[] { }).ToList());
return extsWebRestrictedEditing ??= (Configuration.GetSection("files:docservice:formfilling-docs").Get<string[]>() ?? new string[] { }).ToList();
}
}
@ -310,7 +310,7 @@ namespace ASC.Web.Core.Files
return new List<string>();
}
return extsWebCommented ?? (extsWebCommented = (Configuration.GetSection("files:docservice:commented-docs").Get<string[]>() ?? new string[] { }).ToList());
return extsWebCommented ??= (Configuration.GetSection("files:docservice:commented-docs").Get<string[]>() ?? new string[] { }).ToList();
}
}
@ -326,14 +326,14 @@ namespace ASC.Web.Core.Files
return new List<string>();
}
return extsMustConvert ?? (extsMustConvert = (Configuration.GetSection("files:docservice:convert-docs").Get<string[]>() ?? new string[] { }).ToList());
return extsMustConvert ??= (Configuration.GetSection("files:docservice:convert-docs").Get<string[]>() ?? new string[] { }).ToList();
}
}
private List<string> extsCoAuthoring;
public List<string> ExtsCoAuthoring
{
get => extsCoAuthoring ?? (extsCoAuthoring = (Configuration.GetSection("files:docservice:coauthor-docs").Get<string[]>() ?? new string[] { }).ToList());
get => extsCoAuthoring ??= (Configuration.GetSection("files:docservice:coauthor-docs").Get<string[]>() ?? new string[] { }).ToList();
}
private IConfiguration Configuration { get; }

16
web/ASC.Web.Core/Users/UserPhotoManager.cs
View File

@ -199,7 +199,7 @@ namespace ASC.Web.Core.Users
public ILog Log { get; }
private Tenant tenant;
public Tenant Tenant { get { return tenant ?? (tenant = TenantManager.GetCurrentTenant()); } }
public Tenant Tenant { get { return tenant ??= TenantManager.GetCurrentTenant(); } }
//note: using auto stop queue
private readonly WorkerQueue<ResizeWorkerItem> ResizeQueue;//TODO: configure
@ -229,7 +229,7 @@ namespace ASC.Web.Core.Users
public string defaultAbsoluteWebPath;
public string GetDefaultPhotoAbsoluteWebPath()
{
return defaultAbsoluteWebPath ?? (defaultAbsoluteWebPath = WebImageSupplier.GetAbsoluteWebPath(_defaultAvatar));
return defaultAbsoluteWebPath ??= WebImageSupplier.GetAbsoluteWebPath(_defaultAvatar);
}
public string GetRetinaPhotoURL(Guid userID)
@ -292,31 +292,31 @@ namespace ASC.Web.Core.Users
public string defaultSmallPhotoURL;
public string GetDefaultSmallPhotoURL()
{
return defaultSmallPhotoURL ?? (defaultSmallPhotoURL = GetDefaultPhotoAbsoluteWebPath(SmallFotoSize));
return defaultSmallPhotoURL ??= GetDefaultPhotoAbsoluteWebPath(SmallFotoSize);
}
public string defaultMediumPhotoURL;
public string GetDefaultMediumPhotoURL()
{
return defaultMediumPhotoURL ?? (defaultMediumPhotoURL = GetDefaultPhotoAbsoluteWebPath(MediumFotoSize));
return defaultMediumPhotoURL ??= GetDefaultPhotoAbsoluteWebPath(MediumFotoSize);
}
public string defaultBigPhotoURL;
public string GetDefaultBigPhotoURL()
{
return defaultBigPhotoURL ?? (defaultBigPhotoURL = GetDefaultPhotoAbsoluteWebPath(BigFotoSize));
return defaultBigPhotoURL ??= GetDefaultPhotoAbsoluteWebPath(BigFotoSize);
}
public string defaultMaxPhotoURL;
public string GetDefaultMaxPhotoURL()
{
return defaultMaxPhotoURL ?? (defaultMaxPhotoURL = GetDefaultPhotoAbsoluteWebPath(MaxFotoSize));
return defaultMaxPhotoURL ??= GetDefaultPhotoAbsoluteWebPath(MaxFotoSize);
}
public string defaultRetinaPhotoURL;
public string GetDefaultRetinaPhotoURL()
{
return defaultRetinaPhotoURL ?? (defaultRetinaPhotoURL = GetDefaultPhotoAbsoluteWebPath(RetinaFotoSize));
return defaultRetinaPhotoURL ??= GetDefaultPhotoAbsoluteWebPath(RetinaFotoSize);
}
@ -855,7 +855,7 @@ namespace ASC.Web.Core.Users
private IDataStore dataStore;
private IDataStore GetDataStore()
{
return dataStore ?? (dataStore = StorageFactory.GetStorage(Tenant.TenantId.ToString(), "userPhotos"));
return dataStore ??= StorageFactory.GetStorage(Tenant.TenantId.ToString(), "userPhotos");
}
public static CacheSize ToCache(Size size) =>