Index: Application/Ringtoets/src/Application.Ringtoets.Storage/StorageSqLite.cs
===================================================================
diff -u -rbece78e24185a5156bc10f7ec7875e4510b6934c -r0fbb881c5c82f540f01772234b3c1faadfab07f9
--- Application/Ringtoets/src/Application.Ringtoets.Storage/StorageSqLite.cs (.../StorageSqLite.cs) (revision bece78e24185a5156bc10f7ec7875e4510b6934c)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/StorageSqLite.cs (.../StorageSqLite.cs) (revision 0fbb881c5c82f540f01772234b3c1faadfab07f9)
@@ -92,7 +92,7 @@
try
{
- BackedUpFileWriter writer = new BackedUpFileWriter(databaseFilePath);
+ var writer = new BackedUpFileWriter(databaseFilePath);
writer.Perform(() => { SaveProjectInDatabase(databaseFilePath); });
}
catch (IOException e)
@@ -111,7 +111,7 @@
public IProject LoadProject(string databaseFilePath)
{
- var connectionString = GetConnectionToExistingFile(databaseFilePath);
+ string connectionString = GetConnectionToExistingFile(databaseFilePath);
try
{
RingtoetsProject project;
@@ -157,14 +157,12 @@
return true;
}
- var connectionString = GetConnectionToExistingFile(filePath);
+ string connectionString = GetConnectionToExistingFile(filePath);
try
{
byte[] originalHash;
using (var dbContext = new RingtoetsEntities(connectionString))
- {
originalHash = dbContext.VersionEntities.Select(v => v.FingerPrint).First();
- }
byte[] hash = FingerprintHelper.Get(stagedProject.Entity);
return !FingerprintHelper.AreEqual(originalHash, hash);
@@ -177,7 +175,7 @@
private void SaveProjectInDatabase(string databaseFilePath)
{
- var connectionString = GetConnectionToNewFile(databaseFilePath);
+ string connectionString = GetConnectionToNewFile(databaseFilePath);
using (var dbContext = new RingtoetsEntities(connectionString))
{
try
@@ -220,21 +218,21 @@
{
string m = string.Format(Resources.StorageSqLite_ValidateDatabaseVersion_DatabaseVersion_0_is_invalid,
databaseVersion);
- var message = new FileReaderErrorMessageBuilder(databaseFilePath).Build(m);
+ string message = new FileReaderErrorMessageBuilder(databaseFilePath).Build(m);
throw new StorageValidationException(message);
}
if (RingtoetsVersionHelper.IsNewerThanCurrent(databaseVersion))
{
string m = string.Format(Resources.StorageSqLite_ValidateDatabaseVersion_DatabaseVersion_0_higher_then_current_DatabaseVersion_1_,
databaseVersion, RingtoetsVersionHelper.GetCurrentDatabaseVersion());
- var message = new FileReaderErrorMessageBuilder(databaseFilePath).Build(m);
+ string message = new FileReaderErrorMessageBuilder(databaseFilePath).Build(m);
throw new StorageValidationException(message);
}
}
catch (InvalidOperationException e)
{
- var message = new FileReaderErrorMessageBuilder(databaseFilePath).Build(Resources.StorageSqLite_ValidateDatabaseVersion_Database_must_have_one_VersionEntity_row);
+ string message = new FileReaderErrorMessageBuilder(databaseFilePath).Build(Resources.StorageSqLite_ValidateDatabaseVersion_Database_must_have_one_VersionEntity_row);
throw new StorageValidationException(message, e);
}
}
@@ -284,7 +282,7 @@
{
if (!File.Exists(databaseFilePath))
{
- var message = new FileReaderErrorMessageBuilder(databaseFilePath).Build(UtilsResources.Error_File_does_not_exist);
+ string message = new FileReaderErrorMessageBuilder(databaseFilePath).Build(UtilsResources.Error_File_does_not_exist);
throw new CouldNotConnectException(message);
}
@@ -298,7 +296,7 @@
/// Thrown when the database does not contain the table version.
private static string GetConnectionToStorage(string databaseFilePath)
{
- var connectionString = SqLiteEntityConnectionStringBuilder.BuildSqLiteEntityConnectionString(databaseFilePath);
+ string connectionString = SqLiteEntityConnectionStringBuilder.BuildSqLiteEntityConnectionString(databaseFilePath);
using (var dbContext = new RingtoetsEntities(connectionString))
{
@@ -309,7 +307,7 @@
}
catch (Exception exception)
{
- var message = new FileReaderErrorMessageBuilder(databaseFilePath).Build(Resources.StorageSqLite_LoadProject_Invalid_Ringtoets_database_file);
+ string message = new FileReaderErrorMessageBuilder(databaseFilePath).Build(Resources.StorageSqLite_LoadProject_Invalid_Ringtoets_database_file);
throw new StorageValidationException(message, exception);
}
}
@@ -325,7 +323,7 @@
/// Returns a new .
private static StorageException CreateStorageWriterException(string databaseFilePath, string errorMessage, Exception innerException)
{
- var message = new FileWriterErrorMessageBuilder(databaseFilePath).Build(errorMessage);
+ string message = new FileWriterErrorMessageBuilder(databaseFilePath).Build(errorMessage);
return new StorageException(message, innerException);
}
@@ -338,7 +336,7 @@
/// Returns a new .
private static StorageException CreateStorageReaderException(string databaseFilePath, string errorMessage, Exception innerException = null)
{
- var message = new FileReaderErrorMessageBuilder(databaseFilePath).Build(errorMessage);
+ string message = new FileReaderErrorMessageBuilder(databaseFilePath).Build(errorMessage);
return new StorageException(message, innerException);
}