Merge pull request #87 from kdeng00/update_namespace

Migrating to modern c# namespace

Authorization/Handlers/HasScopeHandler.cs

@@ -6,10 +6,10 @@ using Microsoft.AspNetCore.Authorization;
 
 using Icarus.Authorization;
 
-namespace Icarus.Authorization.Handlers
+namespace Icarus.Authorization.Handlers;
+
+public class HasScopeHandler : AuthorizationHandler<HasScopeRequirement>
 {
-    public class HasScopeHandler : AuthorizationHandler<HasScopeRequirement>
-    {
     protected override Task HandleRequirementAsync(AuthorizationHandlerContext context, HasScopeRequirement requirement)
     {
         if (!context.User.HasClaim(c => c.Type == "scope" && c.Issuer == requirement.Issuer))
@@ -27,5 +27,4 @@ namespace Icarus.Authorization.Handlers
 
         return Task.CompletedTask;
     }
-    }
 }

Authorization/HasScopeRequirement.cs

@@ -2,10 +2,10 @@ using System;
 
 using Microsoft.AspNetCore.Authorization;
 
-namespace Icarus.Authorization
+namespace Icarus.Authorization;
+
+public class HasScopeRequirement : IAuthorizationRequirement
 {
-    public class HasScopeRequirement : IAuthorizationRequirement
-    {
     public string Issuer { get; }
     public string Scope { get; }
 
@@ -15,5 +15,4 @@ namespace Icarus.Authorization
         Scope = scope ?? throw new ArgumentNullException(nameof(scope));
         Issuer = issuer ?? throw new ArgumentNullException(nameof(issuer));
     }
-    }
 }

Certs/Signing.cs

@@ -6,10 +6,10 @@ using Org.BouncyCastle.Crypto.Parameters;
 using Org.BouncyCastle.OpenSsl;
 
 
-namespace Icarus.Certs
+namespace Icarus.Certs;
+
+public class SigningIssuerCertificate : IDisposable
 {
-    public class SigningIssuerCertificate : IDisposable
-    {
     private readonly RSACryptoServiceProvider _rsa;
 
     public SigningIssuerCertificate()
@@ -40,11 +40,11 @@ namespace Icarus.Certs
     {
         _rsa?.Dispose();
     }
-    }
+}
 
 
-    public class SigningAudienceCertificate : IDisposable
-    {
+public class SigningAudienceCertificate : IDisposable
+{
     private readonly RSACryptoServiceProvider _rsa;
 
     public SigningAudienceCertificate()
@@ -76,5 +76,4 @@ namespace Icarus.Certs
     {
         _rsa?.Dispose();
     }
-    }
 }

Constants/DirectoryPaths.cs

@@ -1,11 +1,10 @@
 using System;
 using System.IO;
 
-namespace Icarus.Constants
+namespace Icarus.Constants;
+
+public class DirectoryPaths
 {
-    public class DirectoryPaths
-    {
     public static string CoverArtPath =>
         Directory.GetCurrentDirectory() + "/Images/Stock/CoverArt.png";
-    }
 }

Controllers/Managers/AlbumManager.cs

@@ -9,10 +9,10 @@ using Icarus.Controllers.Utilities;
 using Icarus.Models;
 using Icarus.Database.Contexts;
 
-namespace Icarus.Controllers.Managers
+namespace Icarus.Controllers.Managers;
+
+public class AlbumManager : BaseManager
 {
-    public class AlbumManager : BaseManager
-    {
     #region Fields
     private AlbumContext _albumContext;
     #endregion
@@ -151,5 +151,4 @@ namespace Icarus.Controllers.Managers
         return songs.Count;
     }
     #endregion
-    }
 }

Controllers/Managers/ArtistManager.cs

@@ -9,10 +9,10 @@ using Icarus.Controllers.Utilities;
 using Icarus.Models;
 using Icarus.Database.Contexts;
 
-namespace Icarus.Controllers.Managers
+namespace Icarus.Controllers.Managers;
+
+public class ArtistManager : BaseManager
 {
-    public class ArtistManager : BaseManager
-    {
     #region Fields
     private ArtistContext _artistContext;
     #endregion
@@ -133,5 +133,4 @@ namespace Icarus.Controllers.Managers
         return songs.Count;
     }
     #endregion
-    }
 }

Controllers/Managers/BaseManagers.cs

@@ -3,14 +3,13 @@ using System;
 using Microsoft.Extensions.Configuration;
 using NLog;
 
-namespace Icarus.Controllers.Managers
+namespace Icarus.Controllers.Managers;
+
+public class BaseManager
 {
-    public class BaseManager
-    {
     #region Fields
     protected static Logger _logger = NLog.Web.NLogBuilder.ConfigureNLog("nlog.config").GetCurrentClassLogger();
     protected IConfiguration _config;
     protected string _connectionString;
     #endregion
-    }
 }

Controllers/Managers/CoverArtManager.cs

@@ -12,10 +12,10 @@ using Icarus.Database.Contexts;
 using Icarus.Models;
 using Icarus.Types;
 
-namespace Icarus.Controllers.Managers
+namespace Icarus.Controllers.Managers;
+
+public class CoverArtManager : BaseManager
 {
-    public class CoverArtManager : BaseManager
-    {
     #region Fields
     private string _rootCoverArtPath;
     private CoverArtContext _coverArtContext;
@@ -168,5 +168,4 @@ namespace Icarus.Controllers.Managers
         }
     }
     #endregion
-    }
 }

Controllers/Managers/DirectoryManager.cs

@@ -7,11 +7,11 @@ using Microsoft.Extensions.Configuration;
 using Icarus.Models;
 using Icarus.Types;
 
-namespace Icarus.Controllers.Managers
+namespace Icarus.Controllers.Managers;
+
+// NOTE: Do not use metadata for the song's metadata
+public class DirectoryManager : BaseManager
 {
-    // NOTE: Do not use metadata for the song's metadata
-    public class DirectoryManager : BaseManager
-    {
     #region Fields
     private Song _song;
     private string _rootSongDirectory;
@@ -228,5 +228,4 @@ namespace Icarus.Controllers.Managers
         return output;
     }
     #endregion
-    }
 }

Controllers/Managers/GenreManager.cs

@@ -9,10 +9,10 @@ using Icarus.Controllers.Utilities;
 using Icarus.Models;
 using Icarus.Database.Contexts;
 
-namespace Icarus.Controllers.Managers
+namespace Icarus.Controllers.Managers;
+
+public class GenreManager : BaseManager
 {
-    public class GenreManager : BaseManager
-    {
     #region Fields
     private GenreContext _genreContext;
     #endregion
@@ -133,5 +133,4 @@ namespace Icarus.Controllers.Managers
         return songs.Count;
     }
     #endregion
-    }
 }

Controllers/Managers/SongManager.cs

@@ -15,10 +15,10 @@ using Icarus.Controllers.Utilities;
 using Icarus.Models;
 using Icarus.Database.Contexts;
 
-namespace Icarus.Controllers.Managers
+namespace Icarus.Controllers.Managers;
+
+public class SongManager : BaseManager
 {
-    public class SongManager : BaseManager
-    {
     #region Fields
     private string _tempDirectoryRoot;
     private string _archiveDirectoryRoot;
@@ -503,5 +503,4 @@ namespace Icarus.Controllers.Managers
         sngContext.SaveChanges();
     }
     #endregion    
-    }
 }

Controllers/Managers/TokenManager.cs

@@ -16,16 +16,15 @@ using Org.BouncyCastle.Crypto;
 using Org.BouncyCastle.Crypto.Parameters;
 using Org.BouncyCastle.OpenSsl;
 using Org.BouncyCastle.Security;
-
 using RestSharp;
 
 using Icarus.Models;
 
-namespace Icarus.Controllers.Managers
+namespace Icarus.Controllers.Managers;
+
+#region Classes
+public class TokenManager : BaseManager
 {
-    #region Classes
-    public class TokenManager : BaseManager
-    {
     #region Fields
     private string _clientId;
     private string _clientSecret;
@@ -405,6 +404,5 @@ namespace Icarus.Controllers.Managers
         public string TokenType { get; set; }
     }
     #endregion
-    }
-    #endregion
 }
+#endregion

Controllers/Utilities/MetadataRetriever.cs

@@ -7,10 +7,10 @@ using TagLib;
 
 using Icarus.Models;
 
-namespace Icarus.Controllers.Utilities
+namespace Icarus.Controllers.Utilities;
+
+public class MetadataRetriever
 {
-    public class MetadataRetriever
-    {
     #region Fields
     private static NLog.Logger _logger = NLog.Web.NLogBuilder.ConfigureNLog("nlog.config").GetCurrentClassLogger();
     private Song _updatedSong;
@@ -341,5 +341,4 @@ namespace Icarus.Controllers.Utilities
         return false;
     }
     #endregion
-    }
 }

Controllers/Utilities/PasswordEncryption.cs

@@ -7,10 +7,10 @@ using NLog;
 
 using Icarus.Models;
 
-namespace Icarus.Controllers.Utilities
+namespace Icarus.Controllers.Utilities;
+
+public class PasswordEncryption
 {
-    public class PasswordEncryption
-    {
     #region Fields
     private static Logger _logger = NLog.LogManager.GetCurrentClassLogger();
     #endregion
@@ -86,5 +86,4 @@ namespace Icarus.Controllers.Utilities
         return salt;
     }
     #endregion
-    }
 }

Controllers/Utilities/SongCompression.cs

@@ -2,16 +2,15 @@ using System;
 using System.IO;
 using System.Threading.Tasks;
 
-using Microsoft.AspNetCore.Http;
-
 using Ionic.Zip;
+using Microsoft.AspNetCore.Http;
 
 using Icarus.Models;
 
-namespace Icarus.Controllers.Utilities
+namespace Icarus.Controllers.Utilities;
+
+public class SongCompression
 {
-    public class SongCompression
-    {
     #region Fields
     string _compressedSongFilename;
     string _tempDirectory;
@@ -126,5 +125,4 @@ namespace Icarus.Controllers.Utilities
         return stripped;
     }
     #endregion
-    }
 }

Controllers/v1/AlbumController.cs

@@ -10,13 +10,13 @@ using Microsoft.Extensions.Logging;
 using Icarus.Models;
 using Icarus.Database.Contexts;
 
-namespace Icarus.Controllers.V1
+namespace Icarus.Controllers.V1;
+
+[Route("api/v1/album")]
+[ApiController]
+[Authorize]
+public class AlbumController : BaseController
 {
-    [Route("api/v1/album")]
-    [ApiController]
-    [Authorize]
-    public class AlbumController : BaseController
-    {
     #region Fields
     private readonly ILogger<AlbumController> _logger;
     private string _connectionString;
@@ -73,5 +73,4 @@ namespace Icarus.Controllers.V1
             return NotFound();
     }
     #endregion
-    }
 }

Controllers/v1/ArtistController.cs

@@ -9,13 +9,13 @@ using Microsoft.Extensions.Logging;
 using Icarus.Models;
 using Icarus.Database.Contexts;
 
-namespace Icarus.Controllers.V1
+namespace Icarus.Controllers.V1;
+
+[Route("api/v1/artist")]
+[ApiController]
+[Authorize]
+public class ArtistController : BaseController
 {
-    [Route("api/v1/artist")]
-    [ApiController]
-    [Authorize]
-    public class ArtistController : BaseController
-    {
     #region Fields
     private readonly ILogger<ArtistController> _logger;
     private string _connectionString;
@@ -70,5 +70,4 @@ namespace Icarus.Controllers.V1
             return NotFound();
     }
     #endregion
-    }
 }

Controllers/v1/BaseController.cs

@@ -7,10 +7,10 @@ using Microsoft.Extensions.Configuration;
 using Icarus.Controllers.Managers;
 
 
-namespace Icarus.Controllers.V1
+namespace Icarus.Controllers.V1;
+
+public class BaseController : ControllerBase
 {
-    public class BaseController : ControllerBase
-    {
     #region Fiends
     protected IConfiguration _config;
     #endregion
@@ -49,5 +49,4 @@ namespace Icarus.Controllers.V1
         return tokMgr.IsTokenValid(scope, token);
     }
     #endregion
-    }
 }

Controllers/v1/CoverArtController.cs

@@ -11,13 +11,13 @@ using Icarus.Controllers.Managers;
 using Icarus.Database.Contexts;
 using Icarus.Models;
 
-namespace Icarus.Controllers.V1
+namespace Icarus.Controllers.V1;
+
+[Route("api/v1/coverart")]
+[ApiController]
+[Authorize]
+public class CoverArtController : BaseController
 {
-    [Route("api/v1/coverart")]
-    [ApiController]
-    [Authorize]
-    public class CoverArtController : BaseController
-    {
     #region Fields
     private readonly ILogger<CoverArtController> _logger;
     private string _connectionString;
@@ -79,5 +79,4 @@ namespace Icarus.Controllers.V1
         }
     }
     #endregion
-    }
 }

Controllers/v1/GenreController.cs

@@ -10,13 +10,13 @@ using Microsoft.Extensions.Logging;
 using Icarus.Models;
 using Icarus.Database.Contexts;
 
-namespace Icarus.Controllers.V1
+namespace Icarus.Controllers.V1;
+
+[Route("api/v1/genre")]
+[ApiController]
+[Authorize]
+public class GenreController : BaseController
 {
-    [Route("api/v1/genre")]
-    [ApiController]
-    [Authorize]
-    public class GenreController : BaseController
-    {
     #region Fields
     private readonly ILogger<GenreController> _logger;
     private string _connectionString;
@@ -73,5 +73,4 @@ namespace Icarus.Controllers.V1
             return NotFound(new Genre());
     }
     #endregion
-    }
 }

Controllers/v1/LoginController.cs

@@ -10,12 +10,12 @@ using Icarus.Controllers.Utilities;
 using Icarus.Models;
 using Icarus.Database.Contexts;
 
-namespace Icarus.Controllers.V1
+namespace Icarus.Controllers.V1;
+
+[Route("api/v1/login")]
+[ApiController]
+public class LoginController : ControllerBase
 {
-    [Route("api/v1/login")]
-    [ApiController]
-    public class LoginController : ControllerBase
-    {
     #region Fields
     private string _connectionString;
     private IConfiguration _config;
@@ -93,5 +93,4 @@ namespace Icarus.Controllers.V1
         return NotFound(loginRes);
     }
     #endregion
-    }
 }

Controllers/v1/RegisterController.cs

@@ -12,12 +12,12 @@ using Icarus.Controllers.Utilities;
 using Icarus.Models;
 using Icarus.Database.Contexts;
 
-namespace Icarus.Controllers.V1
+namespace Icarus.Controllers.V1;
+
+[Route("api/v1/register")]
+[ApiController]
+public class RegisterController : ControllerBase
 {
-    [Route("api/v1/register")]
-    [ApiController]
-    public class RegisterController : ControllerBase
-    {
     #region Fields
     private string _connectionString;
     private IConfiguration _config;
@@ -81,5 +81,4 @@ namespace Icarus.Controllers.V1
             return Ok(registerResult);
         }
     }
-    }
 }

Controllers/v1/SongCompressedDataControllers.cs

@@ -15,13 +15,13 @@ using Icarus.Controllers.Utilities;
 using Icarus.Models;
 using Icarus.Database.Contexts;
 
-namespace Icarus.Controllers.V1
+namespace Icarus.Controllers.V1;
+
+[Route("api/v1/song/compressed/data")]
+[ApiController]
+[Authorize]
+public class SongCompressedDataController : BaseController
 {
-    [Route("api/v1/song/compressed/data")]
-    [ApiController]
-    [Authorize]
-    public class SongCompressedDataController : BaseController
-    {
     #region Fields
     private string _connectionString;
     private string _songTempDir;
@@ -60,5 +60,4 @@ namespace Icarus.Controllers.V1
         return File(song.Data, "application/x-msdownload", cmp.CompressedSongFilename);
     }
     #endregion
-    }
 }

Controllers/v1/SongController.cs

@@ -14,13 +14,13 @@ using Icarus.Controllers.Utilities;
 using Icarus.Models;
 using Icarus.Database.Contexts;
 
-namespace Icarus.Controllers.V1
+namespace Icarus.Controllers.V1;
+
+[Route("api/v1/song")]
+[ApiController]
+[Authorize]
+public class SongController : BaseController
 {
-    [Route("api/v1/song")]
-    [ApiController]
-    [Authorize]
-    public class SongController : BaseController
-    {
     #region Fields
     private readonly ILogger<SongController> _logger;
     private string _connectionString;
@@ -103,5 +103,4 @@ namespace Icarus.Controllers.V1
     }
     #endregion
     #endregion
-    }
 }

Controllers/v1/SongDataController.cs

@@ -16,13 +16,13 @@ using Icarus.Controllers.Managers;
 using Icarus.Models;
 using Icarus.Database.Contexts;
 
-namespace Icarus.Controllers.V1
+namespace Icarus.Controllers.V1;
+
+[Route("api/v1/song/data")]
+[ApiController]
+[Authorize]
+public class SongDataController : BaseController
 {
-    [Route("api/v1/song/data")]
-    [ApiController]
-    [Authorize]
-    public class SongDataController : BaseController
-    {
     #region Fields
     private string _connectionString;
     private ILogger<SongDataController> _logger;
@@ -163,5 +163,4 @@ namespace Icarus.Controllers.V1
         [FromForm(Name = "metadata")]
         public string SongFile { get; set; }
     }
-    }
 }

Controllers/v1/SongStreamController.cs

@@ -16,13 +16,13 @@ using Icarus.Models;
 using Icarus.Controllers.Managers;
 using Icarus.Database.Contexts;
 
-namespace Icarus.Controllers.V1
+namespace Icarus.Controllers.V1;
+
+[Route("api/v1/song/stream")]
+[ApiController]
+[Authorize]
+public class SongStreamController : BaseController
 {
-    [Route("api/v1/song/stream")]
-    [ApiController]
-    [Authorize]
-    public class SongStreamController : BaseController
-    {
     #region Fields
     private ILogger<SongStreamController> _logger;
     private string _connectionString;
@@ -65,5 +65,4 @@ namespace Icarus.Controllers.V1
         return file;
     }
     #endregion
-    }
 }

Database/Contexts/AlbumContext.cs

@@ -6,10 +6,10 @@ using Microsoft.EntityFrameworkCore;
 
 using Icarus.Models;
 
-namespace Icarus.Database.Contexts
+namespace Icarus.Database.Contexts;
+
+public class AlbumContext : DbContext
 {
-    public class AlbumContext : DbContext
-    {
     public DbSet<Album> Albums { get; set; }
 
     public AlbumContext(DbContextOptions<AlbumContext> options) : base(options) { }
@@ -33,5 +33,4 @@ namespace Icarus.Database.Contexts
     {
         return Albums.FirstOrDefault(alb => alb.AlbumID == album.AlbumID) != null ? true : false;
     }
-    }
 }

Database/Contexts/ArtistContext.cs

@@ -6,10 +6,10 @@ using Microsoft.EntityFrameworkCore;
 
 using Icarus.Models;
 
-namespace Icarus.Database.Contexts
+namespace Icarus.Database.Contexts;
+
+public class ArtistContext : DbContext
 {
-    public class ArtistContext : DbContext
-    {
     public DbSet<Artist> Artists { get; set; }
 
     public ArtistContext(DbContextOptions<ArtistContext> options) : base (options) { }
@@ -35,5 +35,4 @@ namespace Icarus.Database.Contexts
     {
         return Artists.FirstOrDefault(arst => arst.ArtistID == artist.ArtistID) != null ? true : false;
     }
-    }
 }

Database/Contexts/CoverArtContext.cs

@@ -6,10 +6,10 @@ using Microsoft.EntityFrameworkCore;
 
 using Icarus.Models;
 
-namespace Icarus.Database.Contexts
+namespace Icarus.Database.Contexts;
+
+public class CoverArtContext : DbContext
 {
-    public class CoverArtContext : DbContext
-    {
     public DbSet<CoverArt> CoverArtImages { get; set; }
 
     public CoverArtContext(DbContextOptions<CoverArtContext> options) : base(options) { }
@@ -33,5 +33,4 @@ namespace Icarus.Database.Contexts
     {
         return CoverArtImages.FirstOrDefault(cov => cov.CoverArtID == cover.CoverArtID) != null ? true : false;
     }
-    }
 }

Database/Contexts/GenreContext.cs

@@ -6,10 +6,10 @@ using Microsoft.EntityFrameworkCore;
 
 using Icarus.Models;
 
-namespace Icarus.Database.Contexts
+namespace Icarus.Database.Contexts;
+
+public class GenreContext : DbContext
 {
-    public class GenreContext : DbContext
-    {
     public DbSet<Genre> Genres { get; set; }
     public GenreContext(DbContextOptions<GenreContext> options) : base(options) { }
     public GenreContext(string connString) : base(new DbContextOptionsBuilder<GenreContext>()
@@ -33,5 +33,4 @@ namespace Icarus.Database.Contexts
     {
         return Genres.FirstOrDefault(gnr => gnr.GenreID == genre.GenreID) != null ? true : false;
     }
-    }
 }

Database/Contexts/SongContext.cs

@@ -6,10 +6,10 @@ using Microsoft.EntityFrameworkCore;
 
 using Icarus.Models;
         
-namespace Icarus.Database.Contexts
+namespace Icarus.Database.Contexts;
+
+public class SongContext : DbContext
 {
-    public class SongContext : DbContext
-    {
     public DbSet<Song> Songs { get; set; }
 
     public SongContext(string connString) : base(new DbContextOptionsBuilder<SongContext>()
@@ -85,5 +85,4 @@ namespace Icarus.Database.Contexts
     {
         return Songs.FirstOrDefault(sng => sng.SongID == song.SongID) != null ? true : false;
     }
-    }
 }

Database/Contexts/UserContext.cs

@@ -12,10 +12,10 @@ using Microsoft.Extensions.DependencyInjection;
 
 using Icarus.Models;
         
-namespace Icarus.Database.Contexts
+namespace Icarus.Database.Contexts;
+
+public class UserContext : DbContext
 {
-    public class UserContext : DbContext
-    {
     public DbSet<User> Users { get; set; }
 
 
@@ -49,5 +49,4 @@ namespace Icarus.Database.Contexts
     {
         return Users.FirstOrDefault(usr => usr.UserID == user.UserID) != null ? true : false;
     }
-    }
 }

Models/Album.cs

@@ -4,10 +4,10 @@ using System.ComponentModel.DataAnnotations.Schema;
 
 using Newtonsoft.Json;
 
-namespace Icarus.Models
+namespace Icarus.Models;
+
+public class Album
 {
-    public class Album
-    {
     [JsonProperty("album_id")]
     public int AlbumID { get; set; }
     [JsonProperty("title")]
@@ -24,5 +24,4 @@ namespace Icarus.Models
     [JsonIgnore]
     [NotMapped]
     public List<Song> Songs { get; set; }
-    }
 }

Models/Artist.cs

@@ -4,10 +4,10 @@ using System.ComponentModel.DataAnnotations.Schema;
 
 using Newtonsoft.Json;
 
-namespace Icarus.Models
+namespace Icarus.Models;
+
+public class Artist
 {
-    public class Artist
-    {
     [JsonProperty("artist_id")]
     public int ArtistID { get; set; }
     [JsonProperty("name")]
@@ -16,9 +16,7 @@ namespace Icarus.Models
     [JsonProperty("song_count")]
     [NotMapped]
     public int SongCount { get; set; }
-
     [JsonIgnore]
     [NotMapped]
     public List<Song> Songs { get; set; }
-    }
 }

Models/BaseResult.cs

@@ -2,11 +2,10 @@ using System;
 
 using Newtonsoft.Json;
 
-namespace Icarus.Models
+namespace Icarus.Models;
+
+public class BaseResult
 {
-    public class BaseResult
-    {
     [JsonProperty("message")]
     public string Message { get; set; }
-    }
 }

Models/CoverArt.cs

@@ -6,10 +6,10 @@ using System.Text;
 
 using Newtonsoft.Json;
 
-namespace Icarus.Models
+namespace Icarus.Models;
+
+public class CoverArt
 {
-    public class CoverArt
-    {
     #region Properties
     [JsonProperty("cover_art_id")]
     public int CoverArtID { get; set; }
@@ -39,5 +39,4 @@ namespace Icarus.Models
         return (flag == 0) ? filename : $"{filename}{extension}";
     }
     #endregion
-    }
 }

Models/Genre.cs

@@ -4,10 +4,10 @@ using System.ComponentModel.DataAnnotations.Schema;
 
 using Newtonsoft.Json;
 
-namespace Icarus.Models
+namespace Icarus.Models;
+
+public class Genre
 {
-    public class Genre
-    {
     [JsonProperty("genre_id")]
     public int GenreID { get; set; }
     [JsonProperty("genre")]
@@ -19,5 +19,4 @@ namespace Icarus.Models
     [JsonIgnore]
     [NotMapped]
     public List<Song> Songs { get; set; }
-    }
 }

Models/LoginResult.cs

@@ -2,10 +2,10 @@ using System;
 
 using Newtonsoft.Json;
 
-namespace Icarus.Models
+namespace Icarus.Models;
+
+public class LoginResult : BaseResult
 {
-    public class LoginResult : BaseResult
-    {
     [JsonProperty("user_id")]
     public int UserID { get; set; }
     [JsonProperty("username")]
@@ -16,5 +16,4 @@ namespace Icarus.Models
     public string TokenType { get; set; }
     [JsonProperty("expiration")]
     public int Expiration { get; set; }
-    }
 }

Models/RegisterResult.cs

@@ -2,13 +2,12 @@ using System;
 
 using Newtonsoft.Json;
 
-namespace Icarus.Models
+namespace Icarus.Models;
+
+public class RegisterResult : BaseResult
 {
-    public class RegisterResult : BaseResult
-    {
     [JsonProperty("username")]
     public string Username { get; set; }
     [JsonProperty("successfully_registered")]
     public bool SuccessfullyRegistered { get; set; }
-    }
 }

Models/Song.cs

@@ -5,10 +5,10 @@ using System.Threading.Tasks;
 
 using Newtonsoft.Json;
 
-namespace Icarus.Models
+namespace Icarus.Models;
+
+public class Song
 {
-    public class Song
-    {
     #region Properties
     [JsonProperty("song_id")]
     public int SongID { get; set; }
@@ -98,5 +98,4 @@ namespace Icarus.Models
         return flag == 0 ? filename : $"{filename}{extension}";
     }
     #endregion
-    }
 }

Models/SongData.cs

@@ -1,12 +1,11 @@
 using System;
 using System.Text;
 
-namespace Icarus.Models
+namespace Icarus.Models;
+
+public class SongData
 {
-    public class SongData
-    {
     public int ID { get; set; }
     public byte[] Data { get; set; }
     public int SongID { get; set; }
-    }
 }

Models/SongResult.cs

@@ -2,13 +2,12 @@ using System;
 
 using Newtonsoft.Json;
 
-namespace Icarus.Models
+namespace Icarus.Models;
+
+public class SongResult
 {
-    public class SongResult
-    {
     [JsonProperty("message")]
     public string Message { get; set; }
     [JsonProperty("song_title")]
     public string SongTitle { get; set; }
-    }
 }

Models/Token.cs

@@ -4,10 +4,10 @@ using System.Linq;
 using Newtonsoft.Json;
 
 
-namespace Icarus.Models
+namespace Icarus.Models;
+
+public class Token
 {
-    public class Token
-    {
     #region Properties
     [JsonProperty("scope")]
     public string Scope { get; set; }
@@ -52,5 +52,4 @@ namespace Icarus.Models
         return result;
     }
     #endregion
-    }
 }

Models/User.cs

@@ -5,11 +5,11 @@ using System.Linq;
 
 using Newtonsoft.Json;
 
-namespace Icarus.Models
+namespace Icarus.Models;
+
+[Table("User")]
+public class User
 {
-    [Table("User")]
-    public class User
-    {
     #region Properties
     [JsonProperty("user_id")]
     [Column("UserID")]
@@ -53,5 +53,4 @@ namespace Icarus.Models
         return claims;
     }
     #endregion
-    }
 }

Program.cs

@@ -11,10 +11,10 @@ using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 using NLog.Web;
 
-namespace Icarus
+namespace Icarus;
+
+public class Program
 {
-    public class Program
-    {
     public static void Main(string[] args)
     {
         var logger = NLog.Web.NLogBuilder.ConfigureNLog("nlog.config").GetCurrentClassLogger();
@@ -42,5 +42,4 @@ namespace Icarus
             {
                 webBuilder.UseStartup<Startup>();
             });
-    }
 }

Startup.cs

@@ -20,10 +20,9 @@ using NLog.Web.AspNetCore;
 
 using Icarus.Database.Contexts;
 
-namespace Icarus
+namespace Icarus;
+public class Startup
 {
-    public class Startup
-    {
     #region Constructors
     public Startup(IConfiguration configuration)
     {
@@ -123,5 +122,4 @@ namespace Icarus
         });
     }
     #endregion
-    }
 }

Types/CoverArtTypes.cs

@@ -1,10 +1,9 @@
 using System;
 
-namespace Icarus.Types
+namespace Icarus.Types;
+
+public enum CoverArtField
 {
-    public enum CoverArtField
-    {
     SongTitle = 0,
     ImagePath
-    };
-}
+};

Types/DirectoryTypes.cs

@@ -1,10 +1,9 @@
 using System;
 
-namespace Icarus.Types
+namespace Icarus.Types;
+
+public enum DirectoryType
 {
-    public enum DirectoryType
-    {
     Music = 0,
     CoverArt
-    };
-}
+};