Merge pull request #145 from TelerikAcademy/CodeRefactorings

Code refactorings
TelerikAcademy · Aug 16, 2015 · 5011727 · 5011727
2 parents c4f9a17 + 44522bb
commit 5011727
Show file tree

Hide file tree

Showing 23 changed files with 14 additions and 27 deletions.
diff --git a/Source/Client/Showcase.Client.App/Properties/AssemblyInfo.cs b/Source/Client/Showcase.Client.App/Properties/AssemblyInfo.cs
@@ -1,5 +1,4 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // General Information about an assembly is controlled through the following 

diff --git a/Source/Client/Showcase.Client.App/app/home-page/layer-slider-directive.html b/Source/Client/Showcase.Client.App/app/home-page/layer-slider-directive.html
@@ -10,7 +10,7 @@
 							durationin:2000;
 							delayin:300;
 							offsetxout:-50;
-							durationout:1000;" style="top: 370px; left: 200px; font-weight: 300; height: 40px; padding: 0px 10px; font-size: 30px; line-height: 37px; color: rgb(169, 69, 69); white-space: nowrap; width: auto; border-width: 0px; margin-left: 0px; margin-top: 0px; transform-origin: 50% 50% 0px; transform: matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, -0.002, 0, 0, 0, 1); opacity: 0.7; visibility: visible; filter: none; background: rgba(255, 255, 255, 0.85098);">
+							durationout:1000;" style="top: 370px; left: 200px; font-weight: 300; height: 40px; padding: 0 10px; font-size: 30px; line-height: 37px; color: rgb(169, 69, 69); white-space: nowrap; width: auto; border-width: 0; margin-left: 0; margin-top: 0; transform-origin: 50% 50% 0; transform: matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, -0.002, 0, 0, 0, 1); opacity: 0.7; visibility: visible; filter: none; background: rgba(255, 255, 255, 0.85098);">
                 <a href="/projects/{{project.id}}/{{project.titleUrl}}" style="color: white;">{{project.title}}</a>
             </p>
         </div>

diff --git a/Source/Data/Showcase.Data.Common/Properties/AssemblyInfo.cs b/Source/Data/Showcase.Data.Common/Properties/AssemblyInfo.cs
@@ -1,5 +1,4 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // General Information about an assembly is controlled through the following 

diff --git a/Source/Data/Showcase.Data.Models/File.cs b/Source/Data/Showcase.Data.Models/File.cs
@@ -2,8 +2,6 @@
 {
     using System.ComponentModel.DataAnnotations.Schema;
 
-    using Showcase.Data.Common;
-
     [Table("Files")]
     public class File : FileInfo
     {

diff --git a/Source/Data/Showcase.Data.Models/Properties/AssemblyInfo.cs b/Source/Data/Showcase.Data.Models/Properties/AssemblyInfo.cs
@@ -1,5 +1,4 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // General Information about an assembly is controlled through the following 

diff --git a/Source/Data/Showcase.Data/Properties/AssemblyInfo.cs b/Source/Data/Showcase.Data/Properties/AssemblyInfo.cs
@@ -1,5 +1,4 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // General Information about an assembly is controlled through the following 

diff --git a/Source/Server/Showcase.Server.Api/Controllers/SearchController.cs b/Source/Server/Showcase.Server.Api/Controllers/SearchController.cs
@@ -2,7 +2,6 @@
 {
     using System.Web.Http;
 
-    using AutoMapper;
     using AutoMapper.QueryableExtensions;
 
     using Showcase.Server.Api.Controllers.Base;

diff --git a/Source/Server/Showcase.Server.Api/Properties/AssemblyInfo.cs b/Source/Server/Showcase.Server.Api/Properties/AssemblyInfo.cs
@@ -1,5 +1,4 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // General Information about an assembly is controlled through the following

diff --git a/Source/Server/Showcase.Server.Common/Properties/AssemblyInfo.cs b/Source/Server/Showcase.Server.Common/Properties/AssemblyInfo.cs
@@ -1,5 +1,4 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // General Information about an assembly is controlled through the following 

diff --git a/Source/Server/Showcase.Server.DataTransferModels/Properties/AssemblyInfo.cs b/Source/Server/Showcase.Server.DataTransferModels/Properties/AssemblyInfo.cs
@@ -1,5 +1,4 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // General Information about an assembly is controlled through the following 

diff --git a/Source/Server/Showcase.Server.DataTransferModels/User/UserResponseModel.cs b/Source/Server/Showcase.Server.DataTransferModels/User/UserResponseModel.cs
@@ -35,7 +35,7 @@ public void CreateMappings(IConfiguration configuration)
         {
             string visitorUsername = null;
             string username = null;
-            bool isAdmin = false;
+            bool isAdmin = false; // TODO: Value is always false?
             configuration.CreateMap<User, UserResponseModel>()
                 .ForMember(u => u.ProjectsCount, opt => opt.MapFrom(u => u.Projects.Count))
                 .ForMember(u => u.CommentsCount, opt => opt.MapFrom(u => u.Comments.Count))

diff --git a/Source/Server/Showcase.Server.Infrastructure/Auth/ApplicationOAuthProvider.cs b/Source/Server/Showcase.Server.Infrastructure/Auth/ApplicationOAuthProvider.cs
@@ -1,7 +1,6 @@
 namespace Showcase.Server.Infrastructure.Auth
 {
     using System;
-    using System.Collections.Generic;
     using System.Threading.Tasks;
 
     using Microsoft.Owin.Security;
@@ -115,12 +114,12 @@ private bool IsValidContext(OAuthGrantResourceOwnerCredentialsContext context)
             }
             else if (string.IsNullOrEmpty(context.UserName) || string.IsNullOrWhiteSpace(context.UserName))
             {
-                context.SetError("invalid_grant", string.Format("Information is not valid"));
+                context.SetError("invalid_grant", "Information is not valid");
                 isValid = false;
             }
             else if (string.IsNullOrEmpty(context.Password) || string.IsNullOrWhiteSpace(context.Password))
             {
-                context.SetError("invalid_grant", string.Format("Information is not valid"));
+                context.SetError("invalid_grant", "Information is not valid");
                 isValid = false;
             }
 
@@ -134,7 +133,7 @@ private async Task<User> LoginUser(OAuthGrantResourceOwnerCredentialsContext con
             // Check if remote login credentials are correct
             if (user == null)
             {
-                context.SetError("invalid_grant", string.Format("Information is not valid"));
+                context.SetError("invalid_grant", "Information is not valid");
                 return null;
             }
 

diff --git a/Source/Server/Showcase.Server.Infrastructure/FileSystem/FileSystemService.cs b/Source/Server/Showcase.Server.Infrastructure/FileSystem/FileSystemService.cs
@@ -44,6 +44,7 @@ private async Task SaveFile(byte[] content, string path)
             await Task.Run(async () =>
             {
                 var filePath = HostingEnvironment.MapPath(path);
+                //// TODO: filePath can be null
                 var fileInfo = new FileInfo(filePath);
                 fileInfo.Directory.Create();
                 using (var fileWriter = new FileStream(filePath, FileMode.CreateNew))

diff --git a/Source/Server/Showcase.Server.Infrastructure/Formatters/RazorFormatter.cs b/Source/Server/Showcase.Server.Infrastructure/Formatters/RazorFormatter.cs
@@ -49,6 +49,7 @@ public override Task WriteToStreamAsync(Type type, object value, Stream writeStr
             var task = Task.Factory.StartNew(() =>
             {
                 var viewPath = HostingEnvironment.MapPath(CrawlersIndexView);
+                //// TODO: viewPath can be null
                 var template = File.ReadAllText(viewPath);
 
                 if (!Engine.Razor.IsTemplateCached(type.Name, type))

diff --git a/Source/Server/Showcase.Server.Infrastructure/Properties/AssemblyInfo.cs b/Source/Server/Showcase.Server.Infrastructure/Properties/AssemblyInfo.cs
@@ -1,5 +1,4 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // General Information about an assembly is controlled through the following 

diff --git a/Source/Server/Showcase.Server.Infrastructure/Validation/ValidateFilePathAttribute.cs b/Source/Server/Showcase.Server.Infrastructure/Validation/ValidateFilePathAttribute.cs
@@ -17,6 +17,7 @@ public override void OnActionExecuting(HttpActionContext actionContext)
         {
             var routeData = actionContext.RequestContext.RouteData.Values;
 
+            //// TODO: routeData.FirstOrDefault() result can be null
             var folder = int.Parse(routeData.FirstOrDefault(a => a.Key == "folder").Value as string);
             var file = routeData.FirstOrDefault(a => a.Key == "file").Value as string;
 

diff --git a/Source/Services/Showcase.Services.Common/Properties/AssemblyInfo.cs b/Source/Services/Showcase.Services.Common/Properties/AssemblyInfo.cs
@@ -1,5 +1,4 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // General Information about an assembly is controlled through the following 

diff --git a/Source/Services/Showcase.Services.Data/DownloadableFilesService.cs b/Source/Services/Showcase.Services.Data/DownloadableFilesService.cs
@@ -35,7 +35,7 @@ public async Task<IEnumerable<File>> AddNew(IEnumerable<RawFile> rawFiles)
         {
             var addedFiles = await rawFiles.ForEachAsync(async rawFile =>
             {
-                var file = await base.SaveFileInfo<File>(rawFile);
+                var file = await this.SaveFileInfo<File>(rawFile);
                 file.Content = rawFile.Content;
                 return file;
             });

diff --git a/Source/Services/Showcase.Services.Data/ImagesService.cs b/Source/Services/Showcase.Services.Data/ImagesService.cs
@@ -24,7 +24,7 @@ public async Task<IEnumerable<ProcessedImage>> ProcessImages(IEnumerable<RawFile
         {
             var processedImages = await rawImages.ForEachAsync(async rawImage => 
             {
-                var image = await base.SaveFileInfo<Image>(rawImage);
+                var image = await this.SaveFileInfo<Image>(rawImage);
 
                 var thumbnailContent = await this.imageProcessor.Resize(rawImage.Content, ProcessedImage.ThumbnailImageWidth);
                 var highContent = await this.imageProcessor.Resize(rawImage.Content, ProcessedImage.HighResolutionWidth);

diff --git a/Source/Services/Showcase.Services.Data/Models/ProcessedImage.cs b/Source/Services/Showcase.Services.Data/Models/ProcessedImage.cs
@@ -14,16 +14,16 @@ public class ProcessedImage : Image
         public const int HighResolutionWidth = 1360;
         public const string HighResolutionImage = "high";
 
-        private static IMappingService mappingService;
+        private static readonly IMappingService MappingService;
 
         static ProcessedImage()
         {
-            mappingService = ObjectFactory.Get<IMappingService>();
+            MappingService = ObjectFactory.Get<IMappingService>();
         }
 
         public static Func<ProcessedImage, Image> ToImage
         {
-            get { return pi => mappingService.Map<Image>(pi); }
+            get { return pi => MappingService.Map<Image>(pi); }
         }
 
         public byte[] ThumbnailContent { get; set; }
@@ -32,7 +32,7 @@ static ProcessedImage()
 
         public static ProcessedImage FromImage(Image image, byte[] thumbnailContent, byte[] highResolutionContent)
         {
-            var result = mappingService.Map<ProcessedImage>(image);
+            var result = MappingService.Map<ProcessedImage>(image);
             result.ThumbnailContent = thumbnailContent;
             result.HighResolutionContent = highResolutionContent;
             return result;

diff --git a/Source/Services/Showcase.Services.Data/Properties/AssemblyInfo.cs b/Source/Services/Showcase.Services.Data/Properties/AssemblyInfo.cs
@@ -1,5 +1,4 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // General Information about an assembly is controlled through the following 

diff --git a/Source/Services/Showcase.Services.Logic/Properties/AssemblyInfo.cs b/Source/Services/Showcase.Services.Logic/Properties/AssemblyInfo.cs
@@ -1,5 +1,4 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // General Information about an assembly is controlled through the following 

diff --git a/Source/Tests/ShowcaseSystem.Services.Data.Tests/Properties/AssemblyInfo.cs b/Source/Tests/ShowcaseSystem.Services.Data.Tests/Properties/AssemblyInfo.cs
@@ -1,5 +1,4 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // General Information about an assembly is controlled through the following