quality(sonar): complete issues

resgroup · Apr 19, 2016 · 1177e70 · 1177e70
1 parent baa0826
commit 1177e70
Show file tree

Hide file tree

Showing 57 changed files with 329 additions and 371 deletions.
diff --git a/Nimrod.Console/ConsoleLogger.cs b/Nimrod.Console/ConsoleLogger.cs
diff --git a/Nimrod.Console/DateTimeConsoleTracer.cs b/Nimrod.Console/DateTimeConsoleTracer.cs
@@ -0,0 +1,30 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Text;
+
+namespace Nimrod.Console
+{
+    public class DateTimeConsoleTracer : ILogger, IDisposable
+    {
+        public TraceListener Tracer { get; }
+        public DateTimeConsoleTracer(TraceListener tracer)
+        {
+            this.Tracer = tracer.ThrowIfNull(nameof(tracer));
+        }
+
+        public void WriteLine(string message)
+        {
+            this.Tracer.WriteLine($"{DateTime.Now.ToLocalTime()} - {message}");
+        }
+
+        public void Dispose()
+        {
+            if (this.Tracer != null)
+            {
+                this.Tracer.Dispose();
+            }
+        }
+    }
+}
diff --git a/Nimrod.Console/Nimrod.Console.csproj b/Nimrod.Console/Nimrod.Console.csproj
@@ -51,7 +51,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="ConsoleLogger.cs" />
+    <Compile Include="DateTimeConsoleTracer.cs" />
     <Compile Include="Options.cs" />
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />

diff --git a/Nimrod.Console/Program.cs b/Nimrod.Console/Program.cs
@@ -3,50 +3,52 @@
 using System.Linq;
 using System.Text;
 using System.IO.Abstractions;
+using System.Diagnostics;
 
 namespace Nimrod.Console
 {
     static class Program
     {
         static int Main(string[] args)
         {
+            var tracer = new ConsoleTraceListener();
             try
             {
                 var options = new Options();
                 if (CommandLine.Parser.Default.ParseArguments(args, options))
                 {
-                    OnOptionsSuccessful(options);
+                    OnOptionsSuccessful(options, tracer);
                 }
                 else
                 {
-                    OnOptionsFailed(args);
+                    OnOptionsFailed(args, tracer);
                 }
                 return 0;
             }
             catch (Exception exception)
             {
-                System.Console.WriteLine(exception.ToString());
+                tracer.WriteLine(exception.ToString());
                 return -1;
             }
         }
 
-        private static void OnOptionsFailed(string[] args)
+        private static void OnOptionsFailed(string[] args, TraceListener tracer)
         {
-            System.Console.WriteLine($"Error in the command line arguments {string.Join(" ", args)}");
+            tracer.WriteLine($"Error in the command line arguments {string.Join(" ", args)}");
             string helpText = CommandLine.Text.HelpText.AutoBuild(new Options()).ToString();
-            System.Console.WriteLine(helpText);
+            tracer.WriteLine(helpText);
         }
 
-        static void OnOptionsSuccessful(Options options)
+        static void OnOptionsSuccessful(Options options, TraceListener tracer)
         {
             if (options.Help)
             {
                 string helpText = CommandLine.Text.HelpText.AutoBuild(options);
-                System.Console.WriteLine(helpText);
+                tracer.WriteLine(helpText);
             }
             else
             {
-                var logger = options.Verbose ? new ConsoleLogger() : null;
+                var logger = options.Verbose ? new DateTimeConsoleTracer(tracer) : null;
                 var ioOperations = new IoOperations(new FileSystem(), options.OutputPath, logger);
                 var generator = new Generator(ioOperations);
                 generator.Generate(options.Files, options.ModuleType);

diff --git a/Nimrod.Demo/WebClient/Gruntfile.js b/Nimrod.Demo/WebClient/Gruntfile.js
@@ -10,7 +10,7 @@ var customScripts = [
     'src/**/*.directive.ts',
     'src/**/*.component.ts',
     'src/**/*.filter.ts',
-    'src/**/*.controller.ts',
+    'src/**/*.controller.ts'
 ];
 
 module.exports = function (grunt) {

diff --git a/Nimrod.Demo/WebClient/src/ServerApi.Generated/IRestApi.ts b/Nimrod.Demo/WebClient/src/ServerApi.Generated/IRestApi.ts
@@ -1,5 +1,5 @@
 
-module Nimrod {
+namespace Nimrod {
     export interface IRestApi {
         Delete<T>(url: string, config?: IRequestShortcutConfig): IPromise<T>;
         Get<T>(url: string, config?: IRequestShortcutConfig): IPromise<T>;

diff --git a/Nimrod.Demo/WebClient/src/ServerApi.Generated/Nimrod.Demo.Controllers.MovieService.ts b/Nimrod.Demo/WebClient/src/ServerApi.Generated/Nimrod.Demo.Controllers.MovieService.ts
@@ -1,14 +1,14 @@
 namespace Nimrod.Demo.Controllers {
     export interface IMovieService {
-        Movie(restApi: Nimrod.IRestApi, id: number, config?: Nimrod.IRequestShortcutConfig): Nimrod.IPromise<Nimrod.Demo.Models.IMovie>;
+        Movie(restApi: Nimrod.IRestApi, guid: string, config?: Nimrod.IRequestShortcutConfig): Nimrod.IPromise<Nimrod.Demo.Models.IMovie>;
         Movies(restApi: Nimrod.IRestApi, config?: Nimrod.IRequestShortcutConfig): Nimrod.IPromise<Nimrod.Demo.Models.IMovie[]>;
         Add(restApi: Nimrod.IRestApi, movie: Nimrod.Demo.Models.IMovie, config?: Nimrod.IRequestShortcutConfig): Nimrod.IPromise<Nimrod.Demo.Models.IMovie>;
-        Delete(restApi: Nimrod.IRestApi, id: number, config?: Nimrod.IRequestShortcutConfig): Nimrod.IPromise<boolean>;
+        Delete(restApi: Nimrod.IRestApi, guid: string, config?: Nimrod.IRequestShortcutConfig): Nimrod.IPromise<boolean>;
     }
     export class MovieService implements IMovieService {
-        public Movie(restApi: Nimrod.IRestApi, id: number, config?: Nimrod.IRequestShortcutConfig): Nimrod.IPromise<Nimrod.Demo.Models.IMovie> {
+        public Movie(restApi: Nimrod.IRestApi, guid: string, config?: Nimrod.IRequestShortcutConfig): Nimrod.IPromise<Nimrod.Demo.Models.IMovie> {
             (config || (config = {})).params = {
-                id: id
+                guid: guid
             };
             return restApi.Get<Nimrod.Demo.Models.IMovie>('/Movie/Movie', config);
         }
@@ -23,9 +23,9 @@ namespace Nimrod.Demo.Controllers {
             };
             return restApi.Post<Nimrod.Demo.Models.IMovie>('/Movie/Add', data, config);
         }
-        public Delete(restApi: Nimrod.IRestApi, id: number, config?: Nimrod.IRequestShortcutConfig): Nimrod.IPromise<boolean> {
+        public Delete(restApi: Nimrod.IRestApi, guid: string, config?: Nimrod.IRequestShortcutConfig): Nimrod.IPromise<boolean> {
             let data = {
-                id: id
+                guid: guid
             };
             return restApi.Post<boolean>('/Movie/Delete', data, config);
         }

diff --git a/Nimrod.Demo/WebClient/src/ServerApi.Generated/Nimrod.Demo.Models.Movie.ts b/Nimrod.Demo/WebClient/src/ServerApi.Generated/Nimrod.Demo.Models.Movie.ts
@@ -1,6 +1,6 @@
 namespace Nimrod.Demo.Models {
     export interface IMovie {
-        Id: number;
+        Guid: string;
         Name: string;
         Rating: number;
         Actors: string[];

diff --git a/Nimrod.Demo/WebClient/src/ServerApi/restApi.service.ts b/Nimrod.Demo/WebClient/src/ServerApi/restApi.service.ts
@@ -1,5 +1,4 @@
-module Nimrod.Demo.RestApi {
-    "use strict";
+namespace Nimrod.Demo.RestApi {
 
     class RestApi implements Nimrod.IRestApi {
         static $inject = [
@@ -27,5 +26,5 @@
         }
     }
 
-    service("restApi", RestApi);
+    service('restApi', RestApi);
 }
diff --git a/Nimrod.Demo/WebClient/src/components/movies.component.ts b/Nimrod.Demo/WebClient/src/components/movies.component.ts
@@ -1,4 +1,4 @@
-module Nimrod.Demo {
+namespace Nimrod.Demo {
 
     class MoviesController {
 
@@ -7,7 +7,7 @@
         static $inject = [
             'restApi',
             'serverApi.MovieService'
-        ]
+        ];
         constructor(
             private restApi: IRestApi,
             private moviesApi: Controllers.IMovieService
@@ -22,18 +22,18 @@
         }
 
         addMovie() {
-            var newMovie: Models.IMovie = {
-                Name: "The God Father",
-                Id: null,
+            let newMovie: Models.IMovie = {
+                Name: 'The God Father',
+                Guid: null,
                 Actors: [],
                 Rating: 8
             };
             this.moviesApi.Add(this.restApi, newMovie).then(response => {
                 this.loadMovies();
             });
         }
-        deleteMovie(id: number) {
-            this.moviesApi.Delete(this.restApi, id).then(response => {
+        deleteMovie(movie: Models.IMovie) {
+            this.moviesApi.Delete(this.restApi, movie.Guid).then(response => {
                 this.loadMovies();
             });
         }
@@ -44,29 +44,29 @@
 
     }
 
-    component("ndMovies", {
+    component('ndMovies', {
         controller: MoviesController,
         bindings: {
         },
         template: `
-            <div ng-repeat="movie in $ctrl.movies">
+            <div ng-repeat='movie in $ctrl.movies'>
                 <h1>{{movie.Name}}
-                    <ul class="star-rating"> 
-                        <li ng-repeat="star in $ctrl.range(movie.Rating) track by $index" 
-                            class="star"> 
-                            <i class="glyphicon glyphicon-star"></i> 
+                    <ul class='star-rating'> 
+                        <li ng-repeat='star in $ctrl.range(movie.Rating) track by $index' 
+                            class='star'> 
+                            <i class='glyphicon glyphicon-star'></i> 
                         </li> 
                     </ul>
                 </h1>
-                <div ng-if="movie.Actors.length > 0">
+                <div ng-if='movie.Actors.length > 0'>
                     <h2>Actors</h2>
                     <ul>
-                        <li ng-repeat="actor in movie.Actors">{{actor}}</li>
+                        <li ng-repeat='actor in movie.Actors'>{{actor}}</li>
                     </ul>
                 </div>
-                <button ng-click="$ctrl.deleteMovie(movie.Id)">Delete</button>    
+                <button ng-click='$ctrl.deleteMovie(movie)'>Delete</button>    
             </div>
-            <button ng-click="$ctrl.addMovie()">Add One</button>
+            <button ng-click='$ctrl.addMovie()'>Add One</button>
         `
     });
-}
+}
diff --git a/Nimrod.Demo/WebClient/src/nimrod.demo.module.ts b/Nimrod.Demo/WebClient/src/nimrod.demo.module.ts
@@ -1,12 +1,11 @@
-module Nimrod.Demo {
-    "use strict";
+namespace Nimrod.Demo {
 
     // Create the module and define its dependencies.
-    angular.module("nimrod.demo", []);
+    angular.module('nimrod.demo', []);
 
 
     function ngModule(): ng.IModule {
-        return angular.module("nimrod.demo");
+        return angular.module('nimrod.demo');
     }
 
     export function controller(camelCaseName: string, controllerConstructor: Function) {

diff --git a/Nimrod.Demo/WebServer/Controllers/MovieController.cs b/Nimrod.Demo/WebServer/Controllers/MovieController.cs
@@ -10,16 +10,20 @@ namespace Nimrod.Demo.Controllers
 
     public class MovieController : Controller
     {
-        private static int IdIncrement = 2;
-        public readonly static List<Movie> MoviesPersistence = new List<Movie>() {
-                new Movie { Id = 1, Name = "Pulp Fiction", Rating= 9, Actors = new List<string>() { "John Travolta", "Samuel L. Jackson"} }
+        // fake database
+        public readonly static List<Movie> MoviesPersistence = new List<Movie> {
+                new Movie {
+                    Guid = new Guid().ToString(),
+                    Name = "Pulp Fiction",
+                    Rating = 9,
+                    Actors = new List<string> { "John Travolta", "Samuel L. Jackson"}
+                }
             };
 
-
         [HttpGet]
-        public JsonNetResult<Movie> Movie(int id)
+        public JsonNetResult<Movie> Movie(string guid)
         {
-            var movie = MoviesPersistence.Where(m => m.Id == id).FirstOrDefault();
+            var movie = MoviesPersistence.FirstOrDefault(m => m.Guid == guid);
             return JsonNetResult.Create(movie);
         }
 
@@ -33,16 +37,16 @@ public JsonNetResult<List<Movie>> Movies()
         [HttpPost]
         public JsonNetResult<Movie> Add(Movie movie)
         {
-            movie.Id = IdIncrement++;
+            movie.Guid = new Guid().ToString();
 
             MoviesPersistence.Add(movie);
             return JsonNetResult.Create(movie);
         }
 
         [HttpPost]
-        public JsonNetResult<bool> Delete(int id)
+        public JsonNetResult<bool> Delete(string guid)
         {
-            MoviesPersistence.RemoveAll(m => m.Id == id);
+            MoviesPersistence.RemoveAll(m => m.Guid == guid);
             return JsonNetResult.Create(true);
         }
     }

diff --git a/Nimrod.Demo/WebServer/Extensions.cs b/Nimrod.Demo/WebServer/Extensions.cs
@@ -15,12 +15,12 @@ public static string ToJson(this object obj)
         {
             using (var stringWriter = new StringWriter())
             {
-                var settings = new JsonSerializerSettings()
+                var settings = new JsonSerializerSettings
                 {
                     ReferenceLoopHandling = ReferenceLoopHandling.Ignore,
                     DateTimeZoneHandling = DateTimeZoneHandling.Utc
                 };
-                settings.Converters.Add(new IsoDateTimeConverter() { DateTimeStyles = DateTimeStyles.AdjustToUniversal });
+                settings.Converters.Add(new IsoDateTimeConverter { DateTimeStyles = DateTimeStyles.AdjustToUniversal });
                 var serializer = JsonSerializer.Create(settings);
                 serializer.Serialize(stringWriter, obj);
                 return stringWriter.ToString();