change the namespace name of each type in Smdn.Net.EchonetLite to the…

… new one
smdn · Mar 31, 2024 · a507c28 · a507c28
1 parent 3833dcb
commit a507c28
Show file tree

Hide file tree

Showing 34 changed files with 47 additions and 69 deletions.
diff --git a/src/Smdn.Net.EchonetLite/Smdn.Net.EchonetLite.Extensions/Extentions.cs b/src/Smdn.Net.EchonetLite/Smdn.Net.EchonetLite.Extensions/Extentions.cs
@@ -1,14 +1,13 @@
 // SPDX-FileCopyrightText: 2018 HiroyukiSakoh
 // SPDX-FileCopyrightText: 2023 smdn <smdn@smdn.jp>
 // SPDX-License-Identifier: MIT
-using EchoDotNetLite.Models;
 using System;
 using System.Collections.Specialized;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Text;
 
-namespace EchoDotNetLite.Common
+namespace Smdn.Net.EchonetLite.Extensions
 {
     public static class Extentions
     {

diff --git a/src/Smdn.Net.EchonetLite/Smdn.Net.EchonetLite.Protocol/EDATA1.cs b/src/Smdn.Net.EchonetLite/Smdn.Net.EchonetLite.Protocol/EDATA1.cs
@@ -1,16 +1,16 @@
 // SPDX-FileCopyrightText: 2018 HiroyukiSakoh
 // SPDX-FileCopyrightText: 2023 smdn <smdn@smdn.jp>
 // SPDX-License-Identifier: MIT
-using EchoDotNetLite.Enums;
-using EchoDotNetLite.Serialization;
 using System;
 using System.Collections.Generic;
 #if SYSTEM_DIAGNOSTICS_CODEANALYSIS_MEMBERNOTNULLWHENATTRIBUTE
 using System.Diagnostics.CodeAnalysis;
 #endif
 using System.Text.Json.Serialization;
 
-namespace EchoDotNetLite.Models
+using Smdn.Net.EchonetLite.Serialization.Json;
+
+namespace Smdn.Net.EchonetLite.Protocol
 {
 
     /// <summary>

diff --git a/src/Smdn.Net.EchonetLite/Smdn.Net.EchonetLite.Protocol/EDATA2.cs b/src/Smdn.Net.EchonetLite/Smdn.Net.EchonetLite.Protocol/EDATA2.cs
@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: MIT
 using System;
 
-namespace EchoDotNetLite.Models
+namespace Smdn.Net.EchonetLite.Protocol
 {
 
     /// <summary>

diff --git a/src/Smdn.Net.EchonetLite/Smdn.Net.EchonetLite.Protocol/EHD1.cs b/src/Smdn.Net.EchonetLite/Smdn.Net.EchonetLite.Protocol/EHD1.cs
@@ -1,7 +1,7 @@
 // SPDX-FileCopyrightText: 2018 HiroyukiSakoh
 // SPDX-FileCopyrightText: 2024 smdn <smdn@smdn.jp>
 // SPDX-License-Identifier: MIT
-namespace EchoDotNetLite.Enums
+namespace Smdn.Net.EchonetLite.Protocol
 {
     public enum EHD1 : byte
     {

diff --git a/src/Smdn.Net.EchonetLite/Smdn.Net.EchonetLite.Protocol/EHD2.cs b/src/Smdn.Net.EchonetLite/Smdn.Net.EchonetLite.Protocol/EHD2.cs
@@ -1,7 +1,7 @@
 // SPDX-FileCopyrightText: 2018 HiroyukiSakoh
 // SPDX-FileCopyrightText: 2024 smdn <smdn@smdn.jp>
 // SPDX-License-Identifier: MIT
-namespace EchoDotNetLite.Enums
+namespace Smdn.Net.EchonetLite.Protocol
 {
     public enum EHD2 : byte
     {

diff --git a/src/Smdn.Net.EchonetLite/Smdn.Net.EchonetLite.Protocol/EOJ.cs b/src/Smdn.Net.EchonetLite/Smdn.Net.EchonetLite.Protocol/EOJ.cs
@@ -1,11 +1,12 @@
 // SPDX-FileCopyrightText: 2018 HiroyukiSakoh
 // SPDX-FileCopyrightText: 2023 smdn <smdn@smdn.jp>
 // SPDX-License-Identifier: MIT
-using EchoDotNetLite.Serialization;
 using System;
 using System.Text.Json.Serialization;
 
-namespace EchoDotNetLite.Models
+using Smdn.Net.EchonetLite.Serialization.Json;
+
+namespace Smdn.Net.EchonetLite.Protocol
 {
     /// <summary>
     /// ECHONET オブジェクト（EOJ）

diff --git a/src/Smdn.Net.EchonetLite/Smdn.Net.EchonetLite.Protocol/ESV.cs b/src/Smdn.Net.EchonetLite/Smdn.Net.EchonetLite.Protocol/ESV.cs
@@ -1,7 +1,7 @@
 // SPDX-FileCopyrightText: 2018 HiroyukiSakoh
 // SPDX-FileCopyrightText: 2024 smdn <smdn@smdn.jp>
 // SPDX-License-Identifier: MIT
-namespace EchoDotNetLite.Enums
+namespace Smdn.Net.EchonetLite.Protocol
 {
 #pragma warning disable CA1707
     public enum ESV : byte

diff --git a/src/Smdn.Net.EchonetLite/Smdn.Net.EchonetLite.Protocol/Frame.cs b/src/Smdn.Net.EchonetLite/Smdn.Net.EchonetLite.Protocol/Frame.cs
@@ -1,12 +1,12 @@
 // SPDX-FileCopyrightText: 2018 HiroyukiSakoh
 // SPDX-FileCopyrightText: 2023 smdn <smdn@smdn.jp>
 // SPDX-License-Identifier: MIT
-using EchoDotNetLite.Enums;
-using EchoDotNetLite.Serialization;
 using System;
 using System.Text.Json.Serialization;
 
-namespace EchoDotNetLite.Models
+using Smdn.Net.EchonetLite.Serialization.Json;
+
+namespace Smdn.Net.EchonetLite.Protocol
 {
     /// <summary>
     /// ECHONET Liteフレーム

diff --git a/src/Smdn.Net.EchonetLite/Smdn.Net.EchonetLite.Protocol/FrameSerializer.cs b/src/Smdn.Net.EchonetLite/Smdn.Net.EchonetLite.Protocol/FrameSerializer.cs
@@ -1,15 +1,13 @@
 // SPDX-FileCopyrightText: 2018 HiroyukiSakoh
 // SPDX-FileCopyrightText: 2023 smdn <smdn@smdn.jp>
 // SPDX-License-Identifier: MIT
-using EchoDotNetLite.Enums;
-using EchoDotNetLite.Models;
 using System;
 using System.Buffers;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 
-namespace EchoDotNetLite
+namespace Smdn.Net.EchonetLite.Protocol
 {
     public static class FrameSerializer
     {

diff --git a/src/Smdn.Net.EchonetLite/Smdn.Net.EchonetLite.Protocol/IEDATA.cs b/src/Smdn.Net.EchonetLite/Smdn.Net.EchonetLite.Protocol/IEDATA.cs
@@ -1,7 +1,7 @@
 // SPDX-FileCopyrightText: 2018 HiroyukiSakoh
 // SPDX-FileCopyrightText: 2024 smdn <smdn@smdn.jp>
 // SPDX-License-Identifier: MIT
-namespace EchoDotNetLite.Models
+namespace Smdn.Net.EchonetLite.Protocol
 {
     public interface IEDATA
     {

diff --git a/src/Smdn.Net.EchonetLite/Smdn.Net.EchonetLite.Protocol/PropertyContentSerializer.cs b/src/Smdn.Net.EchonetLite/Smdn.Net.EchonetLite.Protocol/PropertyContentSerializer.cs
@@ -4,9 +4,7 @@
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 
-using EchoDotNetLite.Models;
-
-namespace EchoDotNetLite;
+namespace Smdn.Net.EchonetLite.Protocol;
 
 public static class PropertyContentSerializer
 {

diff --git a/src/Smdn.Net.EchonetLite/Smdn.Net.EchonetLite.Protocol/PropertyRequest.cs b/src/Smdn.Net.EchonetLite/Smdn.Net.EchonetLite.Protocol/PropertyRequest.cs
@@ -1,11 +1,12 @@
 // SPDX-FileCopyrightText: 2018 HiroyukiSakoh
 // SPDX-FileCopyrightText: 2023 smdn <smdn@smdn.jp>
 // SPDX-License-Identifier: MIT
-using EchoDotNetLite.Serialization;
 using System;
 using System.Text.Json.Serialization;
 
-namespace EchoDotNetLite.Models
+using Smdn.Net.EchonetLite.Serialization.Json;
+
+namespace Smdn.Net.EchonetLite.Protocol
 {
     public readonly struct PropertyRequest
     {

diff --git a/...Smdn.Net.EchonetLite/Smdn.Net.EchonetLite.Serialization.Json/ByteSequenceJsonConverter.cs b/...Smdn.Net.EchonetLite/Smdn.Net.EchonetLite.Serialization.Json/ByteSequenceJsonConverter.cs
@@ -7,7 +7,7 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-namespace EchoDotNetLite.Serialization;
+namespace Smdn.Net.EchonetLite.Serialization.Json;
 
 internal sealed class ByteSequenceJsonConverter : JsonConverter<ReadOnlyMemory<byte>>
 {

diff --git a/src/Smdn.Net.EchonetLite/Smdn.Net.EchonetLite.Serialization.Json/Hexadecimals.cs b/src/Smdn.Net.EchonetLite/Smdn.Net.EchonetLite.Serialization.Json/Hexadecimals.cs
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: MIT
 using System;
 
-namespace EchoDotNetLite.Serialization;
+namespace Smdn.Net.EchonetLite.Serialization.Json;
 
 internal static class Hexadecimals
 {

diff --git a/src/Smdn.Net.EchonetLite/Smdn.Net.EchonetLite.Serialization.Json/SingleByteJsonConverter.cs b/src/Smdn.Net.EchonetLite/Smdn.Net.EchonetLite.Serialization.Json/SingleByteJsonConverter.cs
@@ -4,7 +4,7 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-namespace EchoDotNetLite.Serialization;
+namespace Smdn.Net.EchonetLite.Serialization.Json;
 
 internal sealed class SingleByteJsonConverter<TByte> : JsonConverter<TByte>
 // where TByte : System.Numerics.IUnsignedNumber<byte>

diff --git a/...Net.EchonetLite/Smdn.Net.EchonetLite.Serialization.Json/SingleByteJsonConverterFactory.cs b/...Net.EchonetLite/Smdn.Net.EchonetLite.Serialization.Json/SingleByteJsonConverterFactory.cs
@@ -7,7 +7,7 @@
 using System.Text.Json.Serialization;
 using System.Reflection;
 
-namespace EchoDotNetLite.Serialization;
+namespace Smdn.Net.EchonetLite.Serialization.Json;
 
 internal sealed class SingleByteJsonConverterFactory : JsonConverterFactory
 {

diff --git a/...Smdn.Net.EchonetLite/Smdn.Net.EchonetLite.Serialization.Json/SingleUInt16JsonConverter.cs b/...Smdn.Net.EchonetLite/Smdn.Net.EchonetLite.Serialization.Json/SingleUInt16JsonConverter.cs
@@ -6,7 +6,7 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-namespace EchoDotNetLite.Serialization;
+namespace Smdn.Net.EchonetLite.Serialization.Json;
 
 internal sealed class SingleUInt16JsonConverter : JsonConverter<ushort>
 {

diff --git a/src/Smdn.Net.EchonetLite/Smdn.Net.EchonetLite/EchonetClient.Extensions.cs b/src/Smdn.Net.EchonetLite/Smdn.Net.EchonetLite/EchonetClient.Extensions.cs
@@ -1,10 +1,9 @@
 // SPDX-FileCopyrightText: 2023 smdn <smdn@smdn.jp>
 // SPDX-License-Identifier: MIT
-using EchoDotNetLite.Models;
 using System;
 using System.Collections.Generic;
 
-namespace EchoDotNetLite
+namespace Smdn.Net.EchonetLite
 {
 #pragma warning disable IDE0040
     partial class EchoClient

diff --git a/src/Smdn.Net.EchonetLite/Smdn.Net.EchonetLite/EchonetClient.cs b/src/Smdn.Net.EchonetLite/Smdn.Net.EchonetLite/EchonetClient.cs
@@ -1,9 +1,6 @@
 // SPDX-FileCopyrightText: 2018 HiroyukiSakoh
 // SPDX-FileCopyrightText: 2023 smdn <smdn@smdn.jp>
 // SPDX-License-Identifier: MIT
-using EchoDotNetLite.Common;
-using EchoDotNetLite.Enums;
-using EchoDotNetLite.Models;
 using Microsoft.Extensions.Logging;
 using System;
 using System.Buffers;
@@ -15,9 +12,10 @@
 using System.Threading;
 using System.Threading.Tasks;
 
-using Smdn.Net.EchonetLite;
+using Smdn.Net.EchonetLite.Protocol;
+using Smdn.Net.EchonetLite.Extensions;
 
-namespace EchoDotNetLite
+namespace Smdn.Net.EchonetLite
 {
     public partial class EchoClient : IDisposable, IAsyncDisposable
     {

diff --git a/src/Smdn.Net.EchonetLite/Smdn.Net.EchonetLite/EchonetNode.cs b/src/Smdn.Net.EchonetLite/Smdn.Net.EchonetLite/EchonetNode.cs
@@ -8,10 +8,9 @@
 using System.Linq;
 using System.Net;
 
-using Smdn.Net.EchonetLite;
 using Smdn.Net.EchonetLite.Appendix;
 
-namespace EchoDotNetLite.Models
+namespace Smdn.Net.EchonetLite
 {
     /// <summary>
     /// ECHONET Liteノード

diff --git a/src/Smdn.Net.EchonetLite/Smdn.Net.EchonetLite/EchonetObject.cs b/src/Smdn.Net.EchonetLite/Smdn.Net.EchonetLite/EchonetObject.cs
@@ -7,9 +7,9 @@
 using System.Collections.ObjectModel;
 using System.Linq;
 
-using Smdn.Net.EchonetLite;
+using Smdn.Net.EchonetLite.Protocol;
 
-namespace EchoDotNetLite.Models
+namespace Smdn.Net.EchonetLite
 {
 
     /// <summary>

diff --git a/src/Smdn.Net.EchonetLite/Smdn.Net.EchonetLite/EchonetProperty.cs b/src/Smdn.Net.EchonetLite/Smdn.Net.EchonetLite/EchonetProperty.cs
@@ -6,7 +6,7 @@
 
 using Smdn.Net.EchonetLite.Appendix;
 
-namespace EchoDotNetLite.Models
+namespace Smdn.Net.EchonetLite
 {
 
     /// <summary>

diff --git a/src/Smdn.Net.EchonetLite/Smdn.Net.EchonetLite/IEchonetLiteHandler.cs b/src/Smdn.Net.EchonetLite/Smdn.Net.EchonetLite/IEchonetLiteHandler.cs
@@ -6,7 +6,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace EchoDotNetLite
+namespace Smdn.Net.EchonetLite
 {
 
     /// <summary>

diff --git a/src/Smdn.Net.EchonetLite/Smdn.Net.EchonetLite/UdpEchonetLiteHandler.cs b/src/Smdn.Net.EchonetLite/Smdn.Net.EchonetLite/UdpEchonetLiteHandler.cs
@@ -1,7 +1,6 @@
 // SPDX-FileCopyrightText: 2018 HiroyukiSakoh
 // SPDX-FileCopyrightText: 2023 smdn <smdn@smdn.jp>
 // SPDX-License-Identifier: MIT
-using EchoDotNetLite;
 using Microsoft.Extensions.Logging;
 using System;
 using System.Linq;
@@ -14,7 +13,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace EchoDotNetLiteLANBridge
+namespace Smdn.Net.EchonetLite
 {
     public class UdpEchonetLiteHandler : IEchonetLiteHandler, IDisposable
     {

diff --git a/tests/Smdn.Net.EchonetLite/Smdn.Net.EchonetLite.Protocol/EDATA1.cs b/tests/Smdn.Net.EchonetLite/Smdn.Net.EchonetLite.Protocol/EDATA1.cs
@@ -5,9 +5,7 @@
 
 using NUnit.Framework;
 
-using EchoDotNetLite.Enums;
-
-namespace EchoDotNetLite.Models;
+namespace Smdn.Net.EchonetLite.Protocol;
 
 [TestFixture]
 public class EDATA1Tests {

diff --git a/tests/Smdn.Net.EchonetLite/Smdn.Net.EchonetLite.Protocol/EOJ.cs b/tests/Smdn.Net.EchonetLite/Smdn.Net.EchonetLite.Protocol/EOJ.cs
@@ -4,7 +4,7 @@
 
 using NUnit.Framework;
 
-namespace EchoDotNetLite.Models;
+namespace Smdn.Net.EchonetLite.Protocol;
 
 [TestFixture]
 public class EOJTests {

diff --git a/tests/Smdn.Net.EchonetLite/Smdn.Net.EchonetLite.Protocol/Frame.cs b/tests/Smdn.Net.EchonetLite/Smdn.Net.EchonetLite.Protocol/Frame.cs
@@ -1,13 +1,11 @@
 // SPDX-FileCopyrightText: 2023 smdn <smdn@smdn.jp>
 // SPDX-License-Identifier: MIT
-using EchoDotNetLite.Enums;
-
 using System;
 using System.Text.Json;
 
 using NUnit.Framework;
 
-namespace EchoDotNetLite.Models;
+namespace Smdn.Net.EchonetLite.Protocol;
 
 [TestFixture]
 public class FrameTests {

diff --git a/tests/Smdn.Net.EchonetLite/Smdn.Net.EchonetLite.Protocol/FrameSerializer.Deserialize.cs b/tests/Smdn.Net.EchonetLite/Smdn.Net.EchonetLite.Protocol/FrameSerializer.Deserialize.cs
@@ -4,14 +4,11 @@
 using System.Collections.Generic;
 using System.Linq;
 
-using EchoDotNetLite.Models;
-using EchoDotNetLite.Enums;
-
 using NUnit.Framework;
 
 using SequenceIs = Smdn.Test.NUnit.Constraints.Buffers.Is;
 
-namespace EchoDotNetLite;
+namespace Smdn.Net.EchonetLite.Protocol;
 
 partial class FrameSerializerTests {
   private const byte EHD1_ECHONETLite = 0x10;

diff --git a/tests/Smdn.Net.EchonetLite/Smdn.Net.EchonetLite.Protocol/FrameSerializer.Serialize.cs b/tests/Smdn.Net.EchonetLite/Smdn.Net.EchonetLite.Protocol/FrameSerializer.Serialize.cs
@@ -4,14 +4,11 @@
 using System.Buffers;
 using System.Collections.Generic;
 
-using EchoDotNetLite.Models;
-using EchoDotNetLite.Enums;
-
 using NUnit.Framework;
 
 using SequenceIs = Smdn.Test.NUnit.Constraints.Buffers.Is;
 
-namespace EchoDotNetLite;
+namespace Smdn.Net.EchonetLite.Protocol;
 
 partial class FrameSerializerTests {
   private class PseudoBufferWriter : IBufferWriter<byte> {

diff --git a/tests/Smdn.Net.EchonetLite/Smdn.Net.EchonetLite.Protocol/FrameSerializer.cs b/tests/Smdn.Net.EchonetLite/Smdn.Net.EchonetLite.Protocol/FrameSerializer.cs
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: MIT
 using NUnit.Framework;
 
-namespace EchoDotNetLite;
+namespace Smdn.Net.EchonetLite.Protocol;
 
 [TestFixture]
 public partial class FrameSerializerTests {

diff --git a/tests/Smdn.Net.EchonetLite/Smdn.Net.EchonetLite.Protocol/PropertyContentSerializer.cs b/tests/Smdn.Net.EchonetLite/Smdn.Net.EchonetLite.Protocol/PropertyContentSerializer.cs
@@ -5,11 +5,9 @@
 
 using NUnit.Framework;
 
-using EchoDotNetLite.Models;
-
 using SequenceIs = Smdn.Test.NUnit.Constraints.Buffers.Is;
 
-namespace EchoDotNetLite;
+namespace Smdn.Net.EchonetLite.Protocol;
 
 [TestFixture]
 public partial class PropertyContentSerializerTests {

diff --git a/tests/Smdn.Net.EchonetLite/Smdn.Net.EchonetLite.Protocol/PropertyRequest.cs b/tests/Smdn.Net.EchonetLite/Smdn.Net.EchonetLite.Protocol/PropertyRequest.cs
@@ -2,11 +2,9 @@
 // SPDX-License-Identifier: MIT
 using System.Text.Json;
 
-using EchoDotNetLite.Enums;
-
 using NUnit.Framework;
 
-namespace EchoDotNetLite.Models;
+namespace Smdn.Net.EchonetLite.Protocol;
 
 [TestFixture]
 public class PropertyRequestTests {