diff --git a/ZeroExample/App.config b/ZeroExample/App.config
deleted file mode 100644
index f0a74bb..0000000
--- a/ZeroExample/App.config
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/ZeroExample/Program.cs b/ZeroExample/Program.cs
deleted file mode 100644
index cd11890..0000000
--- a/ZeroExample/Program.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-using ZeroLevel;
-using ZeroLevel.Services.Applications;
-
-namespace ZeroExample
-{
- public sealed class MyFirstApp
- : BaseWindowsService, IZeroService
- {
- public MyFirstApp() : base("MyApp")
- {
- Log.AddConsoleLogger();
- }
-
- public override void PauseAction()
- {
- }
-
- public override void ResumeAction()
- {
- }
-
- public override void StartAction()
- {
- Log.Info("Started");
- }
-
- public override void StopAction()
- {
- }
- }
-
- internal class Program
- {
- private static void Main(string[] args)
- {
- Bootstrap.Startup(args);
- }
- }
-}
\ No newline at end of file
diff --git a/ZeroExample/Properties/AssemblyInfo.cs b/ZeroExample/Properties/AssemblyInfo.cs
deleted file mode 100644
index c6ca6bc..0000000
--- a/ZeroExample/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using System.Reflection;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("ZeroExample")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("ZeroExample")]
-[assembly: AssemblyCopyright("Copyright © 2019")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components. If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("50cebec2-2571-4592-afd2-970bdb41947b")]
-
-// Version information for an assembly consists of the following four values:
-//
-// Major Version
-// Minor Version
-// Build Number
-// Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
\ No newline at end of file
diff --git a/ZeroExample/ZeroExample.csproj b/ZeroExample/ZeroExample.csproj
deleted file mode 100644
index 4734f4b..0000000
--- a/ZeroExample/ZeroExample.csproj
+++ /dev/null
@@ -1,62 +0,0 @@
-
-
-
-
- Debug
- AnyCPU
- {50CEBEC2-2571-4592-AFD2-970BDB41947B}
- Exe
- ZeroExample
- ZeroExample
- v4.7.2
- 512
- true
- true
-
-
- AnyCPU
- true
- full
- false
- bin\Debug\
- DEBUG;TRACE
- prompt
- 4
-
-
- AnyCPU
- pdbonly
- true
- bin\Release\
- TRACE
- prompt
- 4
-
-
-
-
-
-
-
-
-
-
-
-
- ..\packages\ZeroLevel.1.0.3\lib\net47\ZeroLevel.dll
-
-
-
-
- Component
-
-
-
-
-
- Designer
-
-
-
-
-
\ No newline at end of file
diff --git a/ZeroExample/packages.config b/ZeroExample/packages.config
deleted file mode 100644
index c024b44..0000000
--- a/ZeroExample/packages.config
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/ZeroLevel.Discovery/DiscoveryService.cs b/ZeroLevel.Discovery/DiscoveryService.cs
index 5665a7c..846fe22 100644
--- a/ZeroLevel.Discovery/DiscoveryService.cs
+++ b/ZeroLevel.Discovery/DiscoveryService.cs
@@ -37,7 +37,7 @@ namespace ZeroLevel.Discovery
var socketPort = Configuration.Default.First("socketport");
_exInbox = ExchangeTransportFactory.GetServer("socket", socketPort);
_exInbox.RegisterInbox>("services", (_, __) => routeTable.Get());
- _exInbox.RegisterInbox("register", (info, _, __) => routeTable.Append(info));
+ _exInbox.RegisterInbox("register", (info, _, __) => routeTable.Append(info));
Log.Info($"TCP server started on port {socketPort}");
}
diff --git a/ZeroLevel.Discovery/RouteTable.cs b/ZeroLevel.Discovery/RouteTable.cs
index 2d46f5d..3426f93 100644
--- a/ZeroLevel.Discovery/RouteTable.cs
+++ b/ZeroLevel.Discovery/RouteTable.cs
@@ -166,7 +166,7 @@ namespace ZeroLevel.Discovery
Save();
}
- public InvokeResult Append(MicroserviceInfo serviceInfo)
+ public InvokeResult Append(ExServiceInfo serviceInfo)
{
InvokeResult result = null;
if (Ping(serviceInfo.Protocol, serviceInfo.Endpoint, serviceInfo.ServiceKey))
diff --git a/ZeroLevel.sln b/ZeroLevel.sln
index 444fdaa..279e1a3 100644
--- a/ZeroLevel.sln
+++ b/ZeroLevel.sln
@@ -7,8 +7,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ZeroLevel", "ZeroLevel\Zero
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ZeroLevel.Discovery", "ZeroLevel.Discovery\ZeroLevel.Discovery.csproj", "{4F55B23F-938C-4DA2-B6DC-B6BC66D36073}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ZeroExample", "ZeroExample\ZeroExample.csproj", "{50CEBEC2-2571-4592-AFD2-970BDB41947B}"
-EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -43,18 +41,6 @@ Global
{4F55B23F-938C-4DA2-B6DC-B6BC66D36073}.Release|x64.Build.0 = Release|Any CPU
{4F55B23F-938C-4DA2-B6DC-B6BC66D36073}.Release|x86.ActiveCfg = Release|Any CPU
{4F55B23F-938C-4DA2-B6DC-B6BC66D36073}.Release|x86.Build.0 = Release|Any CPU
- {50CEBEC2-2571-4592-AFD2-970BDB41947B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {50CEBEC2-2571-4592-AFD2-970BDB41947B}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {50CEBEC2-2571-4592-AFD2-970BDB41947B}.Debug|x64.ActiveCfg = Debug|Any CPU
- {50CEBEC2-2571-4592-AFD2-970BDB41947B}.Debug|x64.Build.0 = Debug|Any CPU
- {50CEBEC2-2571-4592-AFD2-970BDB41947B}.Debug|x86.ActiveCfg = Debug|Any CPU
- {50CEBEC2-2571-4592-AFD2-970BDB41947B}.Debug|x86.Build.0 = Debug|Any CPU
- {50CEBEC2-2571-4592-AFD2-970BDB41947B}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {50CEBEC2-2571-4592-AFD2-970BDB41947B}.Release|Any CPU.Build.0 = Release|Any CPU
- {50CEBEC2-2571-4592-AFD2-970BDB41947B}.Release|x64.ActiveCfg = Release|Any CPU
- {50CEBEC2-2571-4592-AFD2-970BDB41947B}.Release|x64.Build.0 = Release|Any CPU
- {50CEBEC2-2571-4592-AFD2-970BDB41947B}.Release|x86.ActiveCfg = Release|Any CPU
- {50CEBEC2-2571-4592-AFD2-970BDB41947B}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/ZeroLevel/Services/Network/Microservices/IDiscoveryClient.cs b/ZeroLevel/Services/Network/Contract/IDiscoveryClient.cs
similarity index 84%
rename from ZeroLevel/Services/Network/Microservices/IDiscoveryClient.cs
rename to ZeroLevel/Services/Network/Contract/IDiscoveryClient.cs
index 482dfd8..70e94f3 100644
--- a/ZeroLevel/Services/Network/Microservices/IDiscoveryClient.cs
+++ b/ZeroLevel/Services/Network/Contract/IDiscoveryClient.cs
@@ -1,11 +1,10 @@
using System.Collections.Generic;
-using ZeroLevel.Network.Microservices;
namespace ZeroLevel.Network
{
public interface IDiscoveryClient
{
- bool Register(MicroserviceInfo info);
+ bool Register(ExServiceInfo info);
IEnumerable GetServiceEndpoints(string serviceKey);
diff --git a/ZeroLevel/Services/Network/Contract/IExClient.cs b/ZeroLevel/Services/Network/Contract/IExClient.cs
index a4f7193..1a9b8b9 100644
--- a/ZeroLevel/Services/Network/Contract/IExClient.cs
+++ b/ZeroLevel/Services/Network/Contract/IExClient.cs
@@ -2,7 +2,7 @@
using System.Net;
using ZeroLevel.Models;
-namespace ZeroLevel.Services.Network
+namespace ZeroLevel.Network
{
public interface IExClient
: IDisposable
diff --git a/ZeroLevel/Services/Network/Contract/IExService.cs b/ZeroLevel/Services/Network/Contract/IExService.cs
index c0ffe7d..c8437e7 100644
--- a/ZeroLevel/Services/Network/Contract/IExService.cs
+++ b/ZeroLevel/Services/Network/Contract/IExService.cs
@@ -1,7 +1,7 @@
using System;
using System.Net;
-namespace ZeroLevel.Services.Network
+namespace ZeroLevel.Network
{
public interface IExService
: IDisposable
diff --git a/ZeroLevel/Services/Network/Microservices/IExchangeService.cs b/ZeroLevel/Services/Network/Contract/IExchangeService.cs
similarity index 100%
rename from ZeroLevel/Services/Network/Microservices/IExchangeService.cs
rename to ZeroLevel/Services/Network/Contract/IExchangeService.cs
diff --git a/ZeroLevel/Services/Network/Contract/IZBackward.cs b/ZeroLevel/Services/Network/Contract/IZBackward.cs
index 284b778..8b9f7ef 100644
--- a/ZeroLevel/Services/Network/Contract/IZBackward.cs
+++ b/ZeroLevel/Services/Network/Contract/IZBackward.cs
@@ -1,6 +1,6 @@
using System.Net;
-namespace ZeroLevel.Services.Network
+namespace ZeroLevel.Network
{
public interface IZBackward
{
diff --git a/ZeroLevel/Services/Network/Contract/IZObservableServer.cs b/ZeroLevel/Services/Network/Contract/IZObservableServer.cs
index 2e73b1d..bf36edb 100644
--- a/ZeroLevel/Services/Network/Contract/IZObservableServer.cs
+++ b/ZeroLevel/Services/Network/Contract/IZObservableServer.cs
@@ -2,7 +2,7 @@
using System.Collections.Generic;
using System.Net;
-namespace ZeroLevel.Services.Network.Contract
+namespace ZeroLevel.Network
{
public interface IZObservableServer
: IDisposable
diff --git a/ZeroLevel/Services/Network/Contract/IZTransport.cs b/ZeroLevel/Services/Network/Contract/IZTransport.cs
index 73d09e6..01ec4d6 100644
--- a/ZeroLevel/Services/Network/Contract/IZTransport.cs
+++ b/ZeroLevel/Services/Network/Contract/IZTransport.cs
@@ -1,7 +1,7 @@
using System;
using System.Net;
-namespace ZeroLevel.Services.Network.Contract
+namespace ZeroLevel.Network
{
public interface IZTransport
: IDisposable
diff --git a/ZeroLevel/Services/Network/ExchangeTransportFactory.cs b/ZeroLevel/Services/Network/ExchangeTransportFactory.cs
index 48c0806..1293ce4 100644
--- a/ZeroLevel/Services/Network/ExchangeTransportFactory.cs
+++ b/ZeroLevel/Services/Network/ExchangeTransportFactory.cs
@@ -2,9 +2,6 @@
using System.Collections.Concurrent;
using System.Collections.Generic;
using System.Reflection;
-using ZeroLevel.Network.Microservices;
-using ZeroLevel.Services.Network;
-using ZeroLevel.Services.Network.Contract;
namespace ZeroLevel.Network
{
@@ -64,6 +61,7 @@ namespace ZeroLevel.Network
}
throw new NotSupportedException($"Protocol {protocol} not supported");
}
+
///
/// Creates a client to access the server using the specified protocol
///
diff --git a/ZeroLevel/Services/Network/Microservices/Checkpoint.cs b/ZeroLevel/Services/Network/Models/Checkpoint.cs
similarity index 98%
rename from ZeroLevel/Services/Network/Microservices/Checkpoint.cs
rename to ZeroLevel/Services/Network/Models/Checkpoint.cs
index 7d313b1..5983808 100644
--- a/ZeroLevel/Services/Network/Microservices/Checkpoint.cs
+++ b/ZeroLevel/Services/Network/Models/Checkpoint.cs
@@ -2,7 +2,7 @@
using System.Runtime.Serialization;
using ZeroLevel.Services.Serialization;
-namespace ZeroLevel.Network.Microservices
+namespace ZeroLevel.Network
{
[DataContract]
public class Checkpoint :
diff --git a/ZeroLevel/Services/Network/Microservices/CheckpointArc.cs b/ZeroLevel/Services/Network/Models/CheckpointArc.cs
similarity index 93%
rename from ZeroLevel/Services/Network/Microservices/CheckpointArc.cs
rename to ZeroLevel/Services/Network/Models/CheckpointArc.cs
index 8d0d59d..5ac9d0f 100644
--- a/ZeroLevel/Services/Network/Microservices/CheckpointArc.cs
+++ b/ZeroLevel/Services/Network/Models/CheckpointArc.cs
@@ -1,6 +1,6 @@
using System.Runtime.Serialization;
-namespace ZeroLevel.Network.Microservices
+namespace ZeroLevel.Network
{
[DataContract]
public sealed class CheckpointArc
diff --git a/ZeroLevel/Services/Network/Microservices/CheckpointType.cs b/ZeroLevel/Services/Network/Models/CheckpointType.cs
similarity index 73%
rename from ZeroLevel/Services/Network/Microservices/CheckpointType.cs
rename to ZeroLevel/Services/Network/Models/CheckpointType.cs
index 352b702..d5d99c2 100644
--- a/ZeroLevel/Services/Network/Microservices/CheckpointType.cs
+++ b/ZeroLevel/Services/Network/Models/CheckpointType.cs
@@ -1,4 +1,4 @@
-namespace ZeroLevel.Network.Microservices
+namespace ZeroLevel.Network
{
public enum CheckpointType
{
diff --git a/ZeroLevel/Services/Network/Models/MicroserviceInfo.cs b/ZeroLevel/Services/Network/Models/ExServiceInfo.cs
similarity index 94%
rename from ZeroLevel/Services/Network/Models/MicroserviceInfo.cs
rename to ZeroLevel/Services/Network/Models/ExServiceInfo.cs
index 3ad94fc..536a00b 100644
--- a/ZeroLevel/Services/Network/Models/MicroserviceInfo.cs
+++ b/ZeroLevel/Services/Network/Models/ExServiceInfo.cs
@@ -2,12 +2,12 @@
using System.Runtime.Serialization;
using ZeroLevel.Services.Serialization;
-namespace ZeroLevel.Network.Microservices
+namespace ZeroLevel.Network
{
[Serializable]
[DataContract]
- public sealed class MicroserviceInfo :
- IEquatable, IBinarySerializable
+ public sealed class ExServiceInfo :
+ IEquatable, IBinarySerializable
{
public const string DEFAULT_GROUP_NAME = "__service_default_group__";
public const string DEFAULT_TYPE_NAME = "__service_default_type__";
@@ -49,7 +49,7 @@ namespace ZeroLevel.Network.Microservices
[DataMember]
public string Version { get; set; }
- public bool Equals(MicroserviceInfo other)
+ public bool Equals(ExServiceInfo other)
{
if (other == null) return false;
if (object.ReferenceEquals(this, other)) return true;
diff --git a/ZeroLevel/Services/Network/Models/ExchangeAttributes.cs b/ZeroLevel/Services/Network/Models/ExchangeAttributes.cs
index b35a151..b813a2f 100644
--- a/ZeroLevel/Services/Network/Models/ExchangeAttributes.cs
+++ b/ZeroLevel/Services/Network/Models/ExchangeAttributes.cs
@@ -1,6 +1,6 @@
using System;
-namespace ZeroLevel.Network.Microservices
+namespace ZeroLevel.Network
{
[AttributeUsage(AttributeTargets.All, AllowMultiple = false)]
public abstract class ExchangeAttribute : Attribute { }
diff --git a/ZeroLevel/Services/Network/Models/Frame.cs b/ZeroLevel/Services/Network/Models/Frame.cs
index 2c35547..e516bdb 100644
--- a/ZeroLevel/Services/Network/Models/Frame.cs
+++ b/ZeroLevel/Services/Network/Models/Frame.cs
@@ -6,7 +6,7 @@ using System.Threading;
using ZeroLevel.Services.Pools;
using ZeroLevel.Services.Serialization;
-namespace ZeroLevel.Services.Network
+namespace ZeroLevel.Network
{
[Serializable]
[DataContract]
diff --git a/ZeroLevel/Services/Network/Models/RequestInfo.cs b/ZeroLevel/Services/Network/Models/RequestInfo.cs
index 4b364e1..9443ba0 100644
--- a/ZeroLevel/Services/Network/Models/RequestInfo.cs
+++ b/ZeroLevel/Services/Network/Models/RequestInfo.cs
@@ -1,6 +1,6 @@
using System;
-namespace ZeroLevel.Services.Network.Models
+namespace ZeroLevel.Network
{
internal sealed class RequestInfo
{
diff --git a/ZeroLevel/Services/Network/Models/ServiceEndpointInfo.cs b/ZeroLevel/Services/Network/Models/ServiceEndpointInfo.cs
index f95021a..6983b56 100644
--- a/ZeroLevel/Services/Network/Models/ServiceEndpointInfo.cs
+++ b/ZeroLevel/Services/Network/Models/ServiceEndpointInfo.cs
@@ -1,6 +1,6 @@
using System;
-namespace ZeroLevel.Network.Microservices
+namespace ZeroLevel.Network
{
///
/// Endpoint
diff --git a/ZeroLevel/Services/Network/Models/ServiceEndpointsInfo.cs b/ZeroLevel/Services/Network/Models/ServiceEndpointsInfo.cs
index 25cb458..191e57a 100644
--- a/ZeroLevel/Services/Network/Models/ServiceEndpointsInfo.cs
+++ b/ZeroLevel/Services/Network/Models/ServiceEndpointsInfo.cs
@@ -1,7 +1,7 @@
using System;
using System.Collections.Generic;
-namespace ZeroLevel.Network.Microservices
+namespace ZeroLevel.Network
{
///
/// Information about service connection points
diff --git a/ZeroLevel/Services/Network/Models/ZTransportStatus.cs b/ZeroLevel/Services/Network/Models/ZTransportStatus.cs
index bdf8ed9..afd80e2 100644
--- a/ZeroLevel/Services/Network/Models/ZTransportStatus.cs
+++ b/ZeroLevel/Services/Network/Models/ZTransportStatus.cs
@@ -1,4 +1,4 @@
-namespace ZeroLevel.Services.Network
+namespace ZeroLevel.Network
{
public enum ZTransportStatus
: int
diff --git a/ZeroLevel/Services/Network/NetUtils.cs b/ZeroLevel/Services/Network/NetUtils.cs
index d554b82..f1ff5de 100644
--- a/ZeroLevel/Services/Network/NetUtils.cs
+++ b/ZeroLevel/Services/Network/NetUtils.cs
@@ -4,7 +4,7 @@ using System.Net;
using System.Net.NetworkInformation;
using System.Net.Sockets;
-namespace ZeroLevel.Services.Network
+namespace ZeroLevel.Network
{
public static class NetUtils
{
diff --git a/ZeroLevel/Services/Network/NetworkStats.cs b/ZeroLevel/Services/Network/NetworkStats.cs
index 294a5c0..1f4dfc5 100644
--- a/ZeroLevel/Services/Network/NetworkStats.cs
+++ b/ZeroLevel/Services/Network/NetworkStats.cs
@@ -1,4 +1,4 @@
-namespace ZeroLevel.Services.Network
+namespace ZeroLevel.Network
{/*
public static class NetworkStats
{
diff --git a/ZeroLevel/Services/Network/NetworkStreamDataObfuscator.cs b/ZeroLevel/Services/Network/NetworkStreamDataObfuscator.cs
index 3ce085c..9ad795b 100644
--- a/ZeroLevel/Services/Network/NetworkStreamDataObfuscator.cs
+++ b/ZeroLevel/Services/Network/NetworkStreamDataObfuscator.cs
@@ -1,6 +1,6 @@
using System;
-namespace ZeroLevel.Services.Network
+namespace ZeroLevel.Network
{
public static class NetworkStreamFastObfuscator
{
diff --git a/ZeroLevel/Services/Network/Microservices/DiscoveryClient.cs b/ZeroLevel/Services/Network/Services/DiscoveryClient.cs
similarity index 96%
rename from ZeroLevel/Services/Network/Microservices/DiscoveryClient.cs
rename to ZeroLevel/Services/Network/Services/DiscoveryClient.cs
index 8b52894..76041fe 100644
--- a/ZeroLevel/Services/Network/Microservices/DiscoveryClient.cs
+++ b/ZeroLevel/Services/Network/Services/DiscoveryClient.cs
@@ -4,11 +4,9 @@ using System.Collections.Generic;
using System.Linq;
using System.Threading;
using ZeroLevel.Models;
-using ZeroLevel.Network;
-using ZeroLevel.Network.Microservices;
using ZeroLevel.Services.Collections;
-namespace ZeroLevel.Services.Network.Microservices
+namespace ZeroLevel.Network
{
public class DiscoveryClient
: IDiscoveryClient
@@ -121,7 +119,7 @@ namespace ZeroLevel.Services.Network.Microservices
}
}
- public bool Register(MicroserviceInfo info)
+ public bool Register(ExServiceInfo info)
{
_discoveryServerClient.ForceConnect();
if (_discoveryServerClient.Status == ZTransportStatus.Working)
@@ -129,7 +127,7 @@ namespace ZeroLevel.Services.Network.Microservices
bool result = false;
try
{
- _discoveryServerClient.Request("register", info, r =>
+ _discoveryServerClient.Request("register", info, r =>
{
result = r.Success;
if (!result)
diff --git a/ZeroLevel/Services/Network/Services/ExClient.cs b/ZeroLevel/Services/Network/Services/ExClient.cs
index 713af59..8798f56 100644
--- a/ZeroLevel/Services/Network/Services/ExClient.cs
+++ b/ZeroLevel/Services/Network/Services/ExClient.cs
@@ -1,10 +1,8 @@
using System;
using System.Net;
using ZeroLevel.Models;
-using ZeroLevel.Services.Network.Contract;
-using ZeroLevel.Services.Network.Services;
-namespace ZeroLevel.Services.Network
+namespace ZeroLevel.Network
{
internal sealed class ExClient
: ZBaseNetwork, IExClient, IZBackward
diff --git a/ZeroLevel/Services/Network/Services/ExRouter.cs b/ZeroLevel/Services/Network/Services/ExRouter.cs
index 8485913..b4aa9fa 100644
--- a/ZeroLevel/Services/Network/Services/ExRouter.cs
+++ b/ZeroLevel/Services/Network/Services/ExRouter.cs
@@ -6,7 +6,7 @@ using System.Reflection;
using ZeroLevel.Services.Invokation;
using ZeroLevel.Services.Serialization;
-namespace ZeroLevel.Services.Network.Services
+namespace ZeroLevel.Network
{
internal sealed class ExRouter
{
diff --git a/ZeroLevel/Services/Network/Services/ExService.cs b/ZeroLevel/Services/Network/Services/ExService.cs
index b6bf69a..8b13dc7 100644
--- a/ZeroLevel/Services/Network/Services/ExService.cs
+++ b/ZeroLevel/Services/Network/Services/ExService.cs
@@ -1,9 +1,7 @@
using System;
using System.Net;
-using ZeroLevel.Services.Network.Contract;
-using ZeroLevel.Services.Network.Services;
-namespace ZeroLevel.Services.Network
+namespace ZeroLevel.Network
{
internal sealed class ExService
: ZBaseNetwork, IExService
diff --git a/ZeroLevel/Services/Network/Microservices/ExServiceHost.cs b/ZeroLevel/Services/Network/Services/ExServiceHost.cs
similarity index 97%
rename from ZeroLevel/Services/Network/Microservices/ExServiceHost.cs
rename to ZeroLevel/Services/Network/Services/ExServiceHost.cs
index 7f631e7..01c7e23 100644
--- a/ZeroLevel/Services/Network/Microservices/ExServiceHost.cs
+++ b/ZeroLevel/Services/Network/Services/ExServiceHost.cs
@@ -4,18 +4,15 @@ using System.Collections.Generic;
using System.Linq;
using System.Linq.Expressions;
using System.Reflection;
-using ZeroLevel.Network;
-using ZeroLevel.Network.Microservices;
-using ZeroLevel.Services.Network;
-namespace ZeroLevel.Microservices
+namespace ZeroLevel.Network
{
public sealed class ExServiceHost
: IDisposable
{
private class MetaService
{
- public MicroserviceInfo ServiceInfo { get; set; }
+ public ExServiceInfo ServiceInfo { get; set; }
public IExService Server { get; set; }
}
@@ -50,7 +47,7 @@ namespace ZeroLevel.Microservices
if (false == _services.TryAdd(key, new MetaService
{
Server = server,
- ServiceInfo = new MicroserviceInfo
+ ServiceInfo = new ExServiceInfo
{
Endpoint = $"{server.Endpoint.Address}:{server.Endpoint.Port}",
Protocol = service.Protocol,
@@ -76,7 +73,7 @@ namespace ZeroLevel.Microservices
}
}
- public IExService RegisterService(MicroserviceInfo serviceInfo)
+ public IExService RegisterService(ExServiceInfo serviceInfo)
{
try
{
@@ -94,7 +91,7 @@ namespace ZeroLevel.Microservices
if (false == _services.TryAdd(key, new MetaService
{
Server = server,
- ServiceInfo = new MicroserviceInfo
+ ServiceInfo = new ExServiceInfo
{
Endpoint = $"{server.Endpoint.Address}:{server.Endpoint.Port}",
Protocol = serviceInfo.Protocol,
@@ -131,7 +128,7 @@ namespace ZeroLevel.Microservices
}
}
- private void ValidateService(MicroserviceInfo service)
+ private void ValidateService(ExServiceInfo service)
{
if (string.IsNullOrWhiteSpace(service.Protocol))
{
diff --git a/ZeroLevel/Services/Network/Microservices/Exchange.cs b/ZeroLevel/Services/Network/Services/Exchange.cs
similarity index 99%
rename from ZeroLevel/Services/Network/Microservices/Exchange.cs
rename to ZeroLevel/Services/Network/Services/Exchange.cs
index d61d83d..63ce946 100644
--- a/ZeroLevel/Services/Network/Microservices/Exchange.cs
+++ b/ZeroLevel/Services/Network/Services/Exchange.cs
@@ -3,11 +3,8 @@ using System.Collections.Generic;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
-using ZeroLevel.Network;
-using ZeroLevel.Network.Microservices;
-using ZeroLevel.Services.Network;
-namespace ZeroLevel.Microservices
+namespace ZeroLevel.Network
{
///
/// Provides data exchange between services
@@ -36,7 +33,7 @@ namespace ZeroLevel.Microservices
return _host.RegisterService(service);
}
- public IExService RegisterService(MicroserviceInfo service)
+ public IExService RegisterService(ExServiceInfo service)
{
return _host.RegisterService(service);
}
diff --git a/ZeroLevel/Services/Network/Services/FrameBuilder.cs b/ZeroLevel/Services/Network/Services/FrameBuilder.cs
index 3f87192..0fe4754 100644
--- a/ZeroLevel/Services/Network/Services/FrameBuilder.cs
+++ b/ZeroLevel/Services/Network/Services/FrameBuilder.cs
@@ -1,6 +1,6 @@
using ZeroLevel.Services.Serialization;
-namespace ZeroLevel.Services.Network
+namespace ZeroLevel.Network
{
public static class FrameBuilder
{
diff --git a/ZeroLevel/Services/Network/Services/FrameExchange.cs b/ZeroLevel/Services/Network/Services/FrameExchange.cs
index 1bb135b..e259e04 100644
--- a/ZeroLevel/Services/Network/Services/FrameExchange.cs
+++ b/ZeroLevel/Services/Network/Services/FrameExchange.cs
@@ -1,9 +1,8 @@
using System;
using System.Net;
using ZeroLevel.Models;
-using ZeroLevel.Services.Network.Contract;
-namespace ZeroLevel.Services.Network.Services
+namespace ZeroLevel.Network
{
internal sealed class FrameExchange
: IDisposable
diff --git a/ZeroLevel/Services/Network/Services/FrameParser.cs b/ZeroLevel/Services/Network/Services/FrameParser.cs
index 3b82541..406a985 100644
--- a/ZeroLevel/Services/Network/Services/FrameParser.cs
+++ b/ZeroLevel/Services/Network/Services/FrameParser.cs
@@ -2,7 +2,7 @@
using System.Threading.Tasks;
using ZeroLevel.Services.Serialization;
-namespace ZeroLevel.Services.Network
+namespace ZeroLevel.Network
{
public sealed class FrameParser
{
diff --git a/ZeroLevel/Services/Network/Services/ZExSocketObservableServer.cs b/ZeroLevel/Services/Network/Services/ZExSocketObservableServer.cs
index 11a2420..e17d6f4 100644
--- a/ZeroLevel/Services/Network/Services/ZExSocketObservableServer.cs
+++ b/ZeroLevel/Services/Network/Services/ZExSocketObservableServer.cs
@@ -1,8 +1,7 @@
using System;
using System.Net;
-using ZeroLevel.Services.Network.Contract;
-namespace ZeroLevel.Services.Network
+namespace ZeroLevel.Network
{
public class ZExSocketObservableServer :
ZSocketServer, IZObservableServer
diff --git a/ZeroLevel/Services/Network/ZBaseNetwork.cs b/ZeroLevel/Services/Network/ZBaseNetwork.cs
index b81cf36..a61bbe0 100644
--- a/ZeroLevel/Services/Network/ZBaseNetwork.cs
+++ b/ZeroLevel/Services/Network/ZBaseNetwork.cs
@@ -1,6 +1,6 @@
using System;
-namespace ZeroLevel.Services.Network
+namespace ZeroLevel.Network
{
public abstract class ZBaseNetwork
: IDisposable
diff --git a/ZeroLevel/Services/Network/ZSocketClient.cs b/ZeroLevel/Services/Network/ZSocketClient.cs
index 504a980..6bae51d 100644
--- a/ZeroLevel/Services/Network/ZSocketClient.cs
+++ b/ZeroLevel/Services/Network/ZSocketClient.cs
@@ -4,12 +4,10 @@ using System.Collections.Generic;
using System.Net;
using System.Net.Sockets;
using System.Threading;
-using ZeroLevel.Services.Network.Contract;
-using ZeroLevel.Services.Network.Models;
using ZeroLevel.Services.Pools;
using ZeroLevel.Services.Serialization;
-namespace ZeroLevel.Services.Network
+namespace ZeroLevel.Network
{
public class ZSocketClient
: ZBaseNetwork, IZTransport
diff --git a/ZeroLevel/Services/Network/ZSocketServer.cs b/ZeroLevel/Services/Network/ZSocketServer.cs
index 2531432..f63d8ab 100644
--- a/ZeroLevel/Services/Network/ZSocketServer.cs
+++ b/ZeroLevel/Services/Network/ZSocketServer.cs
@@ -5,7 +5,7 @@ using System.Net;
using System.Net.Sockets;
using System.Threading;
-namespace ZeroLevel.Services.Network
+namespace ZeroLevel.Network
{
public abstract class ZSocketServer
: ZBaseNetwork
diff --git a/ZeroLevel/Services/Network/ZSocketServerClient.cs b/ZeroLevel/Services/Network/ZSocketServerClient.cs
index 09b5993..93f9c38 100644
--- a/ZeroLevel/Services/Network/ZSocketServerClient.cs
+++ b/ZeroLevel/Services/Network/ZSocketServerClient.cs
@@ -5,7 +5,7 @@ using System.Net.Sockets;
using System.Threading;
using ZeroLevel.Services.Serialization;
-namespace ZeroLevel.Services.Network
+namespace ZeroLevel.Network
{
internal sealed class ZSocketServerClient
: ZBaseNetwork, IZBackward, IEquatable
diff --git a/ZeroLevel/ZeroLevel.csproj b/ZeroLevel/ZeroLevel.csproj
index c1ee42e..9464011 100644
--- a/ZeroLevel/ZeroLevel.csproj
+++ b/ZeroLevel/ZeroLevel.csproj
@@ -239,16 +239,16 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
+
diff --git a/ZeroLevel/obj/Debug/ZeroLevel.csproj.CoreCompileInputs.cache b/ZeroLevel/obj/Debug/ZeroLevel.csproj.CoreCompileInputs.cache
index 5d7709e..7af6f21 100644
--- a/ZeroLevel/obj/Debug/ZeroLevel.csproj.CoreCompileInputs.cache
+++ b/ZeroLevel/obj/Debug/ZeroLevel.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-34e7ecccf08c9607e57fb18cb5dd41e7bc1a3610
+ee06969e2b1f87052733e2a64f8bf6d27363d162