From 883cc34000e1be440f2e78cb500c4d3ceeca5bc4 Mon Sep 17 00:00:00 2001 From: Dunestorm Date: Sat, 4 Jul 2020 20:01:17 +0100 Subject: [PATCH] Refactoring --- DevConsole/Program.cs | 6 +++--- FireLance/FireLanceCRUD.cs | 16 ++++++++-------- FireLance/FirelanceMgr.cs | 8 ++++---- ...lcDbConnection.cs => IFlcBaseDBConnection.cs} | 2 +- FireLance/Interfaces/IFlcMongoConnecton.cs | 9 --------- FireLance/Interfaces/IFlcMongoDBConnecton.cs | 9 +++++++++ GSMParser/GsmDB.cs | 2 +- 7 files changed, 26 insertions(+), 26 deletions(-) rename FireLance/Interfaces/{IFlcDbConnection.cs => IFlcBaseDBConnection.cs} (82%) delete mode 100644 FireLance/Interfaces/IFlcMongoConnecton.cs create mode 100644 FireLance/Interfaces/IFlcMongoDBConnecton.cs diff --git a/DevConsole/Program.cs b/DevConsole/Program.cs index a421553..160f0f8 100644 --- a/DevConsole/Program.cs +++ b/DevConsole/Program.cs @@ -63,7 +63,7 @@ namespace DevConsole private static void ConnectToFirelanceManager() { flcMgr.OpenConnection("sr3", 27017); - flcCRUD = new FirelanceCRUD(flcMgr.DBInstance); + flcCRUD = new FirelanceCRUD(flcMgr.Database); Console.WriteLine($"FireLance Connection State: {flcMgr.IsConnectionOpen()}"); } @@ -261,7 +261,7 @@ namespace DevConsole private static void FlcUploadToGridFsAction() { - var flcGFS = new FirelanceGFS(flcMgr.DBInstance); + var flcGFS = new FirelanceGFS(flcMgr.Database); var ulResult = flcGFS.UploadFile("TestFile", @"C:\Users\Dunestorm\Downloads\OpenMW-0.46.0-win64.exe"); Console.WriteLine(ulResult.Result); } @@ -270,7 +270,7 @@ namespace DevConsole { var objId = "5f00a560b65a2f02d0c7996e"; - var flcGFC = new FirelanceGFS(flcMgr.DBInstance); + var flcGFC = new FirelanceGFS(flcMgr.Database); var dlResult = flcGFC.DownloadFile(new MongoDB.Bson.ObjectId(objId), @$"D:\Temp\{objId}.exe"); Console.WriteLine($"Download Successful: {dlResult.Result}"); } diff --git a/FireLance/FireLanceCRUD.cs b/FireLance/FireLanceCRUD.cs index 443c2bd..4f8023c 100644 --- a/FireLance/FireLanceCRUD.cs +++ b/FireLance/FireLanceCRUD.cs @@ -5,23 +5,23 @@ using System.Collections.Generic; namespace FireLance { - public class FirelanceCRUD : IFlcMongoConnecton + public class FirelanceCRUD : IFlcMongoDBConnecton { - public IMongoDatabase DBInstance { get; set; } + public IMongoDatabase Database { get; set; } public FirelanceCRUD(IMongoDatabase db) { - DBInstance = db; + Database = db; } public void InsertRecord(string table, T record) { - var collection = DBInstance.GetCollection(table); + var collection = Database.GetCollection(table); collection.InsertOne(record); } public void UpsertRecordById(string table, Guid id, T record) { - var collection = DBInstance.GetCollection(table); + var collection = Database.GetCollection(table); collection.ReplaceOne( new BsonDocument("_id", id), record, @@ -30,13 +30,13 @@ namespace FireLance public List LoadRecordsFromTable(string table) { - var collection = DBInstance.GetCollection(table); + var collection = Database.GetCollection(table); return collection.Find(new BsonDocument()).ToList(); } public T LoadRecordById(string table, Guid id) { - var collection = DBInstance.GetCollection(table); + var collection = Database.GetCollection(table); var filter = Builders.Filter.Eq("Id", id); return collection.Find(filter).First(); @@ -44,7 +44,7 @@ namespace FireLance public void DeleteRecordById(string table, Guid id) { - var collection = DBInstance.GetCollection(table); + var collection = Database.GetCollection(table); var filter = Builders.Filter.Eq("Id", id); collection.DeleteOne(filter); } diff --git a/FireLance/FirelanceMgr.cs b/FireLance/FirelanceMgr.cs index 68d00b7..f4778d6 100644 --- a/FireLance/FirelanceMgr.cs +++ b/FireLance/FirelanceMgr.cs @@ -5,23 +5,23 @@ using System; namespace FireLance { - public class FirelanceMgr : IFlcDbConnection, IFlcMongoConnecton + public class FirelanceMgr : IFlcBaseDBConnection, IFlcMongoDBConnecton { - public IMongoDatabase DBInstance { get; private set; } + public IMongoDatabase Database { get; private set; } public void OpenConnection(string dbLocation, int port) { var client = new MongoClient($"mongodb://{dbLocation}:{port}"); var settings = new MongoDatabaseSettings { GuidRepresentation = GuidRepresentation.Standard }; - DBInstance = client.GetDatabase(dbLocation, settings); + Database = client.GetDatabase(dbLocation, settings); } public bool IsConnectionOpen() { int connectionCnt = 0; - try { connectionCnt = DBInstance.Client.ListDatabases().ToList().Count; } + try { connectionCnt = Database.Client.ListDatabases().ToList().Count; } catch { } return (connectionCnt > 0) ? true : false; diff --git a/FireLance/Interfaces/IFlcDbConnection.cs b/FireLance/Interfaces/IFlcBaseDBConnection.cs similarity index 82% rename from FireLance/Interfaces/IFlcDbConnection.cs rename to FireLance/Interfaces/IFlcBaseDBConnection.cs index 8d313f0..e0c4d24 100644 --- a/FireLance/Interfaces/IFlcDbConnection.cs +++ b/FireLance/Interfaces/IFlcBaseDBConnection.cs @@ -1,6 +1,6 @@ namespace FireLance.Interfaces { - public interface IFlcDbConnection + public interface IFlcBaseDBConnection { public void OpenConnection(string dbLocation, int port); public void CloseCurrentConnection(); diff --git a/FireLance/Interfaces/IFlcMongoConnecton.cs b/FireLance/Interfaces/IFlcMongoConnecton.cs deleted file mode 100644 index d463583..0000000 --- a/FireLance/Interfaces/IFlcMongoConnecton.cs +++ /dev/null @@ -1,9 +0,0 @@ -using MongoDB.Driver; - -namespace FireLance -{ - public interface IFlcMongoConnecton - { - public IMongoDatabase DBInstance { get; } - } -} \ No newline at end of file diff --git a/FireLance/Interfaces/IFlcMongoDBConnecton.cs b/FireLance/Interfaces/IFlcMongoDBConnecton.cs new file mode 100644 index 0000000..98676e1 --- /dev/null +++ b/FireLance/Interfaces/IFlcMongoDBConnecton.cs @@ -0,0 +1,9 @@ +using MongoDB.Driver; + +namespace FireLance +{ + public interface IFlcMongoDBConnecton + { + public IMongoDatabase Database { get; } + } +} \ No newline at end of file diff --git a/GSMParser/GsmDB.cs b/GSMParser/GsmDB.cs index 8807652..cb9ee0a 100644 --- a/GSMParser/GsmDB.cs +++ b/GSMParser/GsmDB.cs @@ -5,7 +5,7 @@ using FireLance.Interfaces; namespace Gsm { - public abstract class GsmDB : IFlcDbConnection + public abstract class GsmDB : IFlcBaseDBConnection { internal SqliteConnection DBConnection = new SqliteConnection();