From fa8ef3d286c564dcbc2999e866137dbc7c754612 Mon Sep 17 00:00:00 2001
From: Simon Gockner <simon.gockner@gmail.com>
Date: Mon, 10 Feb 2020 14:17:35 +0100
Subject: [PATCH] - move serverProtocol to GBase.Api - inherit
 ICommunicationSettings base interface

---
 .../Communication}/ServerProtocol.cs                     | 2 +-
 GBase.Server/GBase.Server.csproj                         | 1 +
 GBase.Server/GBaseServerSettings.cs                      | 1 +
 GBase.Server/Interfaces/IGBaseServerSettings.cs          | 9 ++-------
 GBase.Server/Program.cs                                  | 1 +
 5 files changed, 6 insertions(+), 8 deletions(-)
 rename {GBase.Server => GBase.Api/Communication}/ServerProtocol.cs (97%)

diff --git a/GBase.Server/ServerProtocol.cs b/GBase.Api/Communication/ServerProtocol.cs
similarity index 97%
rename from GBase.Server/ServerProtocol.cs
rename to GBase.Api/Communication/ServerProtocol.cs
index a272a65..b914513 100644
--- a/GBase.Server/ServerProtocol.cs
+++ b/GBase.Api/Communication/ServerProtocol.cs
@@ -4,7 +4,7 @@
 
 using System;
 
-namespace GBase.Server
+namespace GBase.Api.Communication
 {
     public enum ServerProtocol //TODO: Decide which protocols should be usable
     {
diff --git a/GBase.Server/GBase.Server.csproj b/GBase.Server/GBase.Server.csproj
index c069b9b..2140094 100644
--- a/GBase.Server/GBase.Server.csproj
+++ b/GBase.Server/GBase.Server.csproj
@@ -12,6 +12,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\GBase.Api\GBase.Api.csproj" />
     <ProjectReference Include="..\GBase.Logging\GBase.Logging.csproj" />
   </ItemGroup>
 
diff --git a/GBase.Server/GBaseServerSettings.cs b/GBase.Server/GBaseServerSettings.cs
index 4297d2f..306d9d4 100644
--- a/GBase.Server/GBaseServerSettings.cs
+++ b/GBase.Server/GBaseServerSettings.cs
@@ -6,6 +6,7 @@ using System;
 using System.IO;
 using System.Net;
 using System.Threading.Tasks;
+using GBase.Api.Communication;
 using GBase.Logging;
 using GBase.Server.Exceptions;
 using GBase.Server.Interfaces;
diff --git a/GBase.Server/Interfaces/IGBaseServerSettings.cs b/GBase.Server/Interfaces/IGBaseServerSettings.cs
index 96c27bf..4cbb031 100644
--- a/GBase.Server/Interfaces/IGBaseServerSettings.cs
+++ b/GBase.Server/Interfaces/IGBaseServerSettings.cs
@@ -2,18 +2,13 @@
 // Created: 2020-02-08
 // Copyright(c) 2020 SimonG. All Rights Reserved.
 
-using System.Net;
 using System.Threading.Tasks;
+using GBase.Api.Communication;
 
 namespace GBase.Server.Interfaces
 {
-    public interface IGBaseServerSettings
+    public interface IGBaseServerSettings : ICommunicationSettings
     {
-        ServerProtocol Protocol { get; }
-        IPAddress IpAddress { get; }
-        int Port { get; }
-        string Endpoint { get; }
-
         string LogFilePath { get; }
         string LogFileName { get; }
 
diff --git a/GBase.Server/Program.cs b/GBase.Server/Program.cs
index a203faf..8430e0e 100644
--- a/GBase.Server/Program.cs
+++ b/GBase.Server/Program.cs
@@ -4,6 +4,7 @@
 
 using System;
 using System.Threading.Tasks;
+using GBase.Api.Communication;
 using GBase.Logging;
 using GBase.Logging.Interfaces;
 using GBase.Server.Interfaces;