Fix for code analysis warnings.

Marc Sallin · Marc Sallin · commit 0b66b5f0f9c5 · 2016-04-26T13:57:56.000+02:00
diff --git a/SQLite.CodeFirst/Attributes/CollateAttribute.cs b/SQLite.CodeFirst/Attributes/CollateAttribute.cs
@@ -9,11 +9,16 @@ namespace SQLite.CodeFirst
     [AttributeUsage(AttributeTargets.Property)]
     public sealed class CollateAttribute : Attribute
     {
-        public CollateAttribute(CollationFunction collation = CollationFunction.None)
+        public CollateAttribute()
+        {
+            Collation = CollationFunction.None;
+        }
+
+        public CollateAttribute(CollationFunction collation)
         {
             Collation = collation;
         }
 
-        public CollationFunction Collation { get; set; }
+        public CollationFunction Collation { get; private set; }
     }
 }
diff --git a/SQLite.CodeFirst/Attributes/UniqueAttribute.cs b/SQLite.CodeFirst/Attributes/UniqueAttribute.cs
@@ -8,11 +8,16 @@ namespace SQLite.CodeFirst
     [AttributeUsage(AttributeTargets.Property)]
     public sealed class UniqueAttribute : Attribute
     {
-        public UniqueAttribute(OnConflictAction onConflict = OnConflictAction.None)
+        public UniqueAttribute()
+        {
+            OnConflict = OnConflictAction.None;
+        }
+
+        public UniqueAttribute(OnConflictAction onConflict)
         {
             OnConflict = onConflict;
         }
 
-        public OnConflictAction OnConflict { get; set; }
+        public OnConflictAction OnConflict { get; private set; }
     }
 }
diff --git a/SQLite.CodeFirst/DbInitializers/SqliteDropCreateDatabaseWhenModelChanges.cs b/SQLite.CodeFirst/DbInitializers/SqliteDropCreateDatabaseWhenModelChanges.cs
@@ -6,6 +6,7 @@
 using System.IO;
 using System.Linq;
 using SQLite.CodeFirst.Utility;
+using System.Diagnostics.CodeAnalysis;
 
 namespace SQLite.CodeFirst
 {
@@ -88,6 +89,7 @@ public override void InitializeDatabase(TContext context)
             }
         }
 
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Reliability", "CA2001:AvoidCallingProblematicMethods", MessageId = "System.GC.Collect", Justification = "Required.")]
         private static void DeleteDatabase(TContext context, string databseFilePath)
         {
             context.Database.Connection.Close();
@@ -120,6 +122,7 @@ private void SaveHistory(TContext context)
             context.SaveChanges();
         }
 
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes")]
         private bool IsSameModel(TContext context)
         {
 
diff --git a/SQLite.CodeFirst/DbInitializers/SqliteInitializerBase.cs b/SQLite.CodeFirst/DbInitializers/SqliteInitializerBase.cs
@@ -22,7 +22,7 @@ namespace SQLite.CodeFirst
     public abstract class SqliteInitializerBase<TContext> : IDatabaseInitializer<TContext>
         where TContext : DbContext
     {
-        protected readonly DbModelBuilder ModelBuilder;
+        protected DbModelBuilder ModelBuilder { get; }
 
         protected SqliteInitializerBase(DbModelBuilder modelBuilder)
         {
diff --git a/SQLite.CodeFirst/Internal/Builder/ColumnStatementCollectionBuilder.cs b/SQLite.CodeFirst/Internal/Builder/ColumnStatementCollectionBuilder.cs
@@ -57,7 +57,7 @@ private static void AdjustDatatypeForAutogenerationIfNecessary(EdmProperty prope
             if (property.StoreGeneratedPattern == StoreGeneratedPattern.Identity)
             {
                 // Must be INTEGER else SQLite will not generate the Ids
-                columnStatement.TypeName = columnStatement.TypeName.ToLower(CultureInfo.InvariantCulture) == "int" ? "INTEGER" : columnStatement.TypeName;
+                columnStatement.TypeName = columnStatement.TypeName.ToUpperInvariant() == "INT" ? "INTEGER" : columnStatement.TypeName;
             }
         }
 
diff --git a/SQLite.CodeFirst/Internal/Convention/SqliteForeignKeyIndexConvention.cs b/SQLite.CodeFirst/Internal/Convention/SqliteForeignKeyIndexConvention.cs
@@ -6,6 +6,7 @@
 using System.Data.Entity.Infrastructure;
 using System.Data.Entity.Infrastructure.Annotations;
 using System.Data.Entity.ModelConfiguration.Conventions;
+using System.Globalization;
 using System.Linq;
 using SQLite.CodeFirst.Builder.NameCreators;
 
@@ -76,7 +77,7 @@ private static IndexAnnotation CreateIndexAnnotation(string tableName, string pr
             // To be honest, it should never happen. But because its possible by using the API, it should be covered.
             if (count > 0)
             {
-                indexName = String.Format("{0}_{1}", indexName, count);
+                indexName = String.Format(CultureInfo.InvariantCulture, "{0}_{1}", indexName, count);
             }
 
             var indexAttribute = new IndexAttribute(indexName);
diff --git a/SQLite.CodeFirst/Internal/Utility/ConnectionStringParser.cs b/SQLite.CodeFirst/Internal/Utility/ConnectionStringParser.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using System.Globalization;
 
 namespace SQLite.CodeFirst.Utility
@@ -12,6 +13,7 @@ internal static class ConnectionStringParser
         private const int KeyPosition = 0;
         private const int ValuePosition = 1;
 
+        [SuppressMessage("Microsoft.Globalization", "CA1308:NormalizeStringsToUppercase", Justification = "ToUppercase makes no sense.")]
         public static IDictionary<string, string> ParseConnectionString(string connectionString)
         {
             connectionString = connectionString.Trim();
diff --git a/SQLite.CodeFirst/Internal/Utility/HashCreator.cs b/SQLite.CodeFirst/Internal/Utility/HashCreator.cs
@@ -9,10 +9,12 @@ internal static class HashCreator
         public static string CreateHash(string data)
         {
             byte[] dataBytes = Encoding.ASCII.GetBytes(data);
-            SHA512 sha512 = new SHA512Managed();
-            byte[] hashBytes = sha512.ComputeHash(dataBytes);
-            string hash = Convert.ToBase64String(hashBytes);
-            return hash;
+            using (SHA512 sha512 = new SHA512Managed())
+            {
+                byte[] hashBytes = sha512.ComputeHash(dataBytes);
+                string hash = Convert.ToBase64String(hashBytes);
+                return hash;
+            }
         }
     }
 }
diff --git a/SQLite.CodeFirst/SqliteDatabaseCreator.cs b/SQLite.CodeFirst/SqliteDatabaseCreator.cs
@@ -1,4 +1,5 @@
-﻿using System.Data.Entity;
+﻿using System;
+using System.Data.Entity;
 using System.Data.Entity.Infrastructure;
 
 namespace SQLite.CodeFirst
@@ -14,6 +15,9 @@ public class SqliteDatabaseCreator : IDatabaseCreator
         /// </summary>
         public void Create(Database db, DbModel model)
         {
+            if (db == null) throw new ArgumentNullException("db");
+            if (model == null) throw new ArgumentNullException("model");
+
             var sqliteSqlGenerator = new SqliteSqlGenerator();
             string sql = sqliteSqlGenerator.Generate(model.StoreModel);
             db.ExecuteSqlCommand(TransactionalBehavior.EnsureTransaction, sql);
diff --git a/Shared/SQLite.CodeFirst.ruleset b/Shared/SQLite.CodeFirst.ruleset
@@ -21,7 +21,7 @@
     <Rule Id="CA1017" Action="Warning" />
     <Rule Id="CA1018" Action="Warning" />
     <Rule Id="CA1019" Action="Warning" />
-    <Rule Id="CA1020" Action="Warning" />
+    <Rule Id="CA1020" Action="None" />
     <Rule Id="CA1021" Action="Warning" />
     <Rule Id="CA1023" Action="Warning" />
     <Rule Id="CA1024" Action="Warning" />
@@ -101,7 +101,7 @@
     <Rule Id="CA1701" Action="Warning" />
     <Rule Id="CA1702" Action="Warning" />
     <Rule Id="CA1703" Action="Warning" />
-    <Rule Id="CA1704" Action="Warning" />
+    <Rule Id="CA1704" Action="None" />
     <Rule Id="CA1707" Action="Warning" />
     <Rule Id="CA1708" Action="Warning" />
     <Rule Id="CA1709" Action="Warning" />
@@ -152,7 +152,7 @@
     <Rule Id="CA2101" Action="Warning" />
     <Rule Id="CA2102" Action="Warning" />
     <Rule Id="CA2103" Action="Warning" />
-    <Rule Id="CA2104" Action="Warning" />
+    <Rule Id="CA2104" Action="None" />
     <Rule Id="CA2105" Action="Warning" />
     <Rule Id="CA2106" Action="Warning" />
     <Rule Id="CA2107" Action="Warning" />
@@ -195,7 +195,7 @@
     <Rule Id="CA2200" Action="Warning" />
     <Rule Id="CA2201" Action="Warning" />
     <Rule Id="CA2202" Action="Warning" />
-    <Rule Id="CA2204" Action="Warning" />
+    <Rule Id="CA2204" Action="None" />
     <Rule Id="CA2205" Action="Warning" />
     <Rule Id="CA2207" Action="Warning" />
     <Rule Id="CA2208" Action="Warning" />

Original file line number	Diff line number	Diff line change
`@@ -9,11 +9,16 @@ namespace SQLite.CodeFirst`
`9`	`9`	`[AttributeUsage(AttributeTargets.Property)]`
`10`	`10`	`public sealed class CollateAttribute : Attribute`
`11`	`11`	`{`
`12`		`- public CollateAttribute(CollationFunction collation = CollationFunction.None)`
	`12`	`+ public CollateAttribute()`
	`13`	`+ {`
	`14`	`+ Collation = CollationFunction.None;`
	`15`	`+ }`
	`16`	`+`
	`17`	`+ public CollateAttribute(CollationFunction collation)`
`13`	`18`	`{`
`14`	`19`	`Collation = collation;`
`15`	`20`	`}`
`16`	`21`
`17`		`- public CollationFunction Collation { get; set; }`
	`22`	`+ public CollationFunction Collation { get; private set; }`
`18`	`23`	`}`
`19`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,11 +8,16 @@ namespace SQLite.CodeFirst`
`8`	`8`	`[AttributeUsage(AttributeTargets.Property)]`
`9`	`9`	`public sealed class UniqueAttribute : Attribute`
`10`	`10`	`{`
`11`		`- public UniqueAttribute(OnConflictAction onConflict = OnConflictAction.None)`
	`11`	`+ public UniqueAttribute()`
	`12`	`+ {`
	`13`	`+ OnConflict = OnConflictAction.None;`
	`14`	`+ }`
	`15`	`+`
	`16`	`+ public UniqueAttribute(OnConflictAction onConflict)`
`12`	`17`	`{`
`13`	`18`	`OnConflict = onConflict;`
`14`	`19`	`}`
`15`	`20`
`16`		`- public OnConflictAction OnConflict { get; set; }`
	`21`	`+ public OnConflictAction OnConflict { get; private set; }`
`17`	`22`	`}`
`18`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@`
`6`	`6`	`using System.IO;`
`7`	`7`	`using System.Linq;`
`8`	`8`	`using SQLite.CodeFirst.Utility;`
	`9`	`+using System.Diagnostics.CodeAnalysis;`
`9`	`10`
`10`	`11`	`namespace SQLite.CodeFirst`
`11`	`12`	`{`
`@@ -88,6 +89,7 @@ public override void InitializeDatabase(TContext context)`
`88`	`89`	`}`
`89`	`90`	`}`
`90`	`91`
	`92`	`+ [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Reliability", "CA2001:AvoidCallingProblematicMethods", MessageId = "System.GC.Collect", Justification = "Required.")]`
`91`	`93`	`private static void DeleteDatabase(TContext context, string databseFilePath)`
`92`	`94`	`{`
`93`	`95`	`context.Database.Connection.Close();`
`@@ -120,6 +122,7 @@ private void SaveHistory(TContext context)`
`120`	`122`	`context.SaveChanges();`
`121`	`123`	`}`
`122`	`124`
	`125`	`+ [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes")]`
`123`	`126`	`private bool IsSameModel(TContext context)`
`124`	`127`	`{`
`125`	`128`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ namespace SQLite.CodeFirst`
`22`	`22`	`public abstract class SqliteInitializerBase<TContext> : IDatabaseInitializer<TContext>`
`23`	`23`	`where TContext : DbContext`
`24`	`24`	`{`
`25`		`- protected readonly DbModelBuilder ModelBuilder;`
	`25`	`+ protected DbModelBuilder ModelBuilder { get; }`
`26`	`26`
`27`	`27`	`protected SqliteInitializerBase(DbModelBuilder modelBuilder)`
`28`	`28`	`{`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ private static void AdjustDatatypeForAutogenerationIfNecessary(EdmProperty prope`
`57`	`57`	`if (property.StoreGeneratedPattern == StoreGeneratedPattern.Identity)`
`58`	`58`	`{`
`59`	`59`	`// Must be INTEGER else SQLite will not generate the Ids`
`60`		`- columnStatement.TypeName = columnStatement.TypeName.ToLower(CultureInfo.InvariantCulture) == "int" ? "INTEGER" : columnStatement.TypeName;`
	`60`	`+ columnStatement.TypeName = columnStatement.TypeName.ToUpperInvariant() == "INT" ? "INTEGER" : columnStatement.TypeName;`
`61`	`61`	`}`
`62`	`62`	`}`
`63`	`63`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@`
`6`	`6`	`using System.Data.Entity.Infrastructure;`
`7`	`7`	`using System.Data.Entity.Infrastructure.Annotations;`
`8`	`8`	`using System.Data.Entity.ModelConfiguration.Conventions;`
	`9`	`+using System.Globalization;`
`9`	`10`	`using System.Linq;`
`10`	`11`	`using SQLite.CodeFirst.Builder.NameCreators;`
`11`	`12`
`@@ -76,7 +77,7 @@ private static IndexAnnotation CreateIndexAnnotation(string tableName, string pr`
`76`	`77`	`// To be honest, it should never happen. But because its possible by using the API, it should be covered.`
`77`	`78`	`if (count > 0)`
`78`	`79`	`{`
`79`		`- indexName = String.Format("{0}_{1}", indexName, count);`
	`80`	`+ indexName = String.Format(CultureInfo.InvariantCulture, "{0}_{1}", indexName, count);`
`80`	`81`	`}`
`81`	`82`
`82`	`83`	`var indexAttribute = new IndexAttribute(indexName);`
Original file line number	Diff line number	Diff line change
`@@ -9,10 +9,12 @@ internal static class HashCreator`
`9`	`9`	`public static string CreateHash(string data)`
`10`	`10`	`{`
`11`	`11`	`byte[] dataBytes = Encoding.ASCII.GetBytes(data);`
`12`		`- SHA512 sha512 = new SHA512Managed();`
`13`		`- byte[] hashBytes = sha512.ComputeHash(dataBytes);`
`14`		`- string hash = Convert.ToBase64String(hashBytes);`
`15`		`- return hash;`
	`12`	`+ using (SHA512 sha512 = new SHA512Managed())`
	`13`	`+ {`
	`14`	`+ byte[] hashBytes = sha512.ComputeHash(dataBytes);`
	`15`	`+ string hash = Convert.ToBase64String(hashBytes);`
	`16`	`+ return hash;`
	`17`	`+ }`
`16`	`18`	`}`
`17`	`19`	`}`
`18`	`20`	`}`