code cleanup

OwnChar/Data/IDataManager.cs

@@ -1,7 +1,7 @@
 using OwnChar.Model;
 
-namespace OwnChar.Data
-{
+namespace OwnChar.Data;
+
 public interface IDataManager
 {
     // Login
@@ -17,4 +17,3 @@ namespace OwnChar.Data
     abstract UserProfile? GetOwner(Group group);
     abstract IEnumerable<UserProfile>? GetMembers(Group group);
 }
-}

OwnChar/Data/IDataProvider.cs

@@ -1,7 +1,7 @@
 using OwnChar.Model;
 
-namespace OwnChar.Data
-{
+namespace OwnChar.Data;
+
 public interface IDataProvider
 {
     // General
@@ -26,4 +26,3 @@ namespace OwnChar.Data
     abstract UserProfile? GetOwner(Group group);
     abstract UserProfile? GetOwner(Character character);
 }
-}

OwnChar/Data/Managers/ClientDataManager.cs

@@ -1,6 +1,5 @@
-namespace OwnChar.Data.Managers
-{
+namespace OwnChar.Data.Managers;
+
 public class ClientDataManager
 {
 }
-}

OwnChar/Data/Managers/DefaultDataManager.cs

@@ -1,7 +1,7 @@
 using OwnChar.Model;
 
-namespace OwnChar.Data.Managers
-{
+namespace OwnChar.Data.Managers;
+
 public class DefaultDataManager(IDataProvider dataProvider) : IDataManager
 {
     private const string defaultUsername = "admin";
@@ -76,4 +76,3 @@ namespace OwnChar.Data.Managers
         return true;
     }
 }
-}

OwnChar/Data/Providers/JsonFile/JsonFile.cs

@@ -1,12 +1,10 @@
 using OwnChar.Data.Providers.JsonFile.Model;
-using OwnChar.Model;
 
-namespace OwnChar.Data.Providers.JsonFile
-{
+namespace OwnChar.Data.Providers.JsonFile;
+
 public class JsonFile
 {
     public List<JsonUserAccount> UserAccounts { get; } = [];
     public List<JsonCharacter> Characters { get; } = [];
     public List<JsonGroup> Groups { get; } = [];
 }
-}

OwnChar/Data/Providers/JsonFile/JsonFileDataProvider.cs

@@ -1,10 +1,9 @@
 using Newtonsoft.Json;
 using OwnChar.Data.Providers.JsonFile.Model;
 using OwnChar.Model;
-using System.Net.NetworkInformation;
 
-namespace OwnChar.Data.Providers.JsonFile
-{
+namespace OwnChar.Data.Providers.JsonFile;
+
 public class JsonFileDataProvider : IDataProvider
 {
     public JsonFile JsonFile { get; protected set; }
@@ -218,4 +217,3 @@ namespace OwnChar.Data.Providers.JsonFile
         return null;
     }
 }
-}

OwnChar/Data/Providers/JsonFile/Model/JsonCharacter.cs

@@ -1,11 +1,10 @@
 using OwnChar.Model;
 
-namespace OwnChar.Data.Providers.JsonFile.Model
-{
+namespace OwnChar.Data.Providers.JsonFile.Model;
+
 public class JsonCharacter : Character
 {
     public virtual JsonUserProfile? Owner { get; set; }
     public virtual List<JsonProp> Properties { get; } = [];
     public virtual List<JsonPropCat> PropertyCategories { get; } = [];
 }
-}

OwnChar/Data/Providers/JsonFile/Model/JsonGroup.cs

@@ -1,11 +1,10 @@
 using OwnChar.Model;
 
-namespace OwnChar.Data.Providers.JsonFile.Model
-{
+namespace OwnChar.Data.Providers.JsonFile.Model;
+
 public class JsonGroup : Group
 {
     public virtual JsonUserProfile? Owner { get; set; }
     public virtual List<JsonUserProfile> Members { get; } = [];
     public virtual List<JsonCharacter> Characters { get; } = [];
 }
-}

OwnChar/Data/Providers/JsonFile/Model/JsonProp.cs

@@ -1,9 +1,8 @@
 using OwnChar.Model;
 
-namespace OwnChar.Data.Providers.JsonFile.Model
-{
+namespace OwnChar.Data.Providers.JsonFile.Model;
+
 public class JsonProp : Property
 {
     public virtual JsonPropCat? Category { get; set; } = null;
 }
-}

OwnChar/Data/Providers/JsonFile/Model/JsonPropCat.cs

@@ -1,8 +1,7 @@
 using OwnChar.Model;
 
-namespace OwnChar.Data.Providers.JsonFile.Model
-{
+namespace OwnChar.Data.Providers.JsonFile.Model;
+
 public class JsonPropCat : PropertyCategory
 {
 }
-}

OwnChar/Data/Providers/JsonFile/Model/JsonUserAccount.cs

@@ -2,8 +2,8 @@
 using Newtonsoft.Json.Converters;
 using OwnChar.Model;
 
-namespace OwnChar.Data.Providers.JsonFile.Model
-{
+namespace OwnChar.Data.Providers.JsonFile.Model;
+
 public class JsonUserAccount : UserAccount
 {
     public virtual JsonUserProfile? Profile { get; set; }
@@ -11,4 +11,3 @@ namespace OwnChar.Data.Providers.JsonFile.Model
     [JsonConverter(typeof(StringEnumConverter))]
     public override UserType Type { get => base.Type; set => base.Type = value; }
 }
-}

OwnChar/Data/Providers/JsonFile/Model/JsonUserProfile.cs

@@ -1,8 +1,7 @@
 using OwnChar.Model;
 
-namespace OwnChar.Data.Providers.JsonFile.Model
-{
+namespace OwnChar.Data.Providers.JsonFile.Model;
+
 public class JsonUserProfile : UserProfile
 {
 }
-}

OwnChar/Manager/CharacterManager.cs

@@ -1,7 +1,7 @@
 using OwnChar.Model;
 
-namespace OwnChar.Manager
-{
+namespace OwnChar.Manager;
+
 public class CharacterManager(OwnCharManager manager)
 {
     public OwnCharManager Manager { get; } = manager;
@@ -16,4 +16,3 @@ namespace OwnChar.Manager
         throw new NotImplementedException();
     }
 }
-}

OwnChar/Manager/Exceptions/LoginException.cs

@@ -1,6 +1,5 @@
-namespace OwnChar.Manager.Exceptions
-{
+namespace OwnChar.Manager.Exceptions;
+
 public class LoginException(string message) : Exception(message)
 {
 }
-}

OwnChar/Manager/GroupsManager.cs

@@ -1,7 +1,7 @@
 using OwnChar.Model;
 
-namespace OwnChar.Manager
-{
+namespace OwnChar.Manager;
+
 public class GroupsManager(OwnCharManager manager)
 {
     public OwnCharManager Manager { get; } = manager;
@@ -18,4 +18,3 @@ namespace OwnChar.Manager
         return Manager.DataManager?.GetMembers(group);
     }
 }
-}

OwnChar/Manager/OwnCharManager.cs

@@ -3,8 +3,8 @@ using OwnChar.Manager.Exceptions;
 using OwnChar.Model;
 using Pilz.Cryptography;
 
-namespace OwnChar.Manager
-{
+namespace OwnChar.Manager;
+
 public class OwnCharManager
 {
     // User
@@ -57,4 +57,3 @@ namespace OwnChar.Manager
         return DataManager?.Logout(CurrentUser) ?? true;
     }
 }
-}

OwnChar/Manager/UserManager.cs

@@ -1,8 +1,8 @@
 using OwnChar.Model;
 using Pilz.Cryptography;
 
-namespace OwnChar.Manager
-{
+namespace OwnChar.Manager;
+
 public class UserManager(OwnCharManager manager)
 {
     public OwnCharManager Manager { get; } = manager;
@@ -27,4 +27,3 @@ namespace OwnChar.Manager
         return Manager.DataManager?.DeleteUserAccount(account) ?? false;
     }
 }
-}

OwnChar/Model/Character.cs

@@ -1,7 +1,6 @@
-namespace OwnChar.Model
-{
+namespace OwnChar.Model;
+
 public abstract class Character : IOwnCharObject
 {
     public virtual string? Name { get; set; }
 }
-}

OwnChar/Model/Group.cs

@@ -1,8 +1,7 @@
-namespace OwnChar.Model
-{
+namespace OwnChar.Model;
+
 public abstract class Group : IOwnCharObject
 {
     public virtual string? Name { get; set; }
     public virtual bool IsInternal { get; set; }
 }
-}

OwnChar/Model/IOwnCharObject.cs

@@ -1,6 +1,5 @@
-namespace OwnChar.Model
-{
+namespace OwnChar.Model;
+
 public interface IOwnCharObject
 {
 }
-}

OwnChar/Model/Property.cs

@@ -1,8 +1,7 @@
-namespace OwnChar.Model
-{
+namespace OwnChar.Model;
+
 public abstract class Property : IOwnCharObject
 {
     public virtual string? Name { get; set; }
     public virtual object? Value { get; set; }
 }
-}

OwnChar/Model/PropertyCategory.cs

@@ -1,7 +1,6 @@
-namespace OwnChar.Model
-{
+namespace OwnChar.Model;
+
 public abstract class PropertyCategory : IOwnCharObject
 {
     public virtual string? Name { get; set; }
 }
-}

OwnChar/Model/UserAccount.cs

@@ -1,5 +1,5 @@
-namespace OwnChar.Model
-{
+namespace OwnChar.Model;
+
 public abstract class UserAccount : IOwnCharObject
 {
     public virtual string? Username { get; set; }
@@ -7,4 +7,3 @@
     public virtual string? Email { get; set; }
     public virtual UserType Type { get; set; }
 }
-}

OwnChar/Model/UserProfile.cs

@@ -1,7 +1,6 @@
-namespace OwnChar.Model
-{
+namespace OwnChar.Model;
+
 public abstract class UserProfile : IOwnCharObject
 {
     public virtual string? Name { get; set; }
 }
-}

OwnChar/Model/UserType.cs

@@ -1,9 +1,8 @@
-namespace OwnChar.Model
-{
+namespace OwnChar.Model;
+
 public enum UserType
 {
     Guest,
     User,
     Admin
 }
-}

OwnChar/Utils.cs

@@ -1,7 +1,7 @@
 using Pilz.Cryptography;
 
-namespace OwnChar
-{
+namespace OwnChar;
+
 public static class Utils
 {
     public static string HashPassword(string username, SecureString password)
@@ -10,4 +10,3 @@ namespace OwnChar
         return (username + ":" + password).GetHashCode().ToString();
     }
 }
-}