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

…ix to the new one
smdn · Mar 31, 2024 · 1f6b640 · 1f6b640
1 parent 6ef2b2f
commit 1f6b640
Show file tree

Hide file tree

Showing 22 changed files with 55 additions and 38 deletions.
diff --git a/....Net.EchonetLite.Appendix/Smdn.Net.EchonetLite.Appendix/EchonetClassGroupSpecification.cs b/....Net.EchonetLite.Appendix/Smdn.Net.EchonetLite.Appendix/EchonetClassGroupSpecification.cs
@@ -5,7 +5,7 @@
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
-namespace EchoDotNetLite.Specifications
+namespace Smdn.Net.EchonetLite.Appendix
 {
     /// <summary>
     /// クラスグループ

diff --git a/src/Smdn.Net.EchonetLite.Appendix/Smdn.Net.EchonetLite.Appendix/EchonetClassSpecification.cs b/src/Smdn.Net.EchonetLite.Appendix/Smdn.Net.EchonetLite.Appendix/EchonetClassSpecification.cs
@@ -4,7 +4,7 @@
 using System;
 using System.Text.Json.Serialization;
 
-namespace EchoDotNetLite.Specifications
+namespace Smdn.Net.EchonetLite.Appendix
 {
     /// <summary>
     /// クラス

diff --git a/...Smdn.Net.EchonetLite.Appendix/Smdn.Net.EchonetLite.Appendix/EchonetObjectSpecification.cs b/...Smdn.Net.EchonetLite.Appendix/Smdn.Net.EchonetLite.Appendix/EchonetObjectSpecification.cs
@@ -6,7 +6,7 @@
 using System.Linq;
 using System.Text.Json;
 
-namespace EchoDotNetLite.Specifications
+namespace Smdn.Net.EchonetLite.Appendix
 {
     internal class EchonetObject : IEchonetObject
     {

diff --git a/...dn.Net.EchonetLite.Appendix/Smdn.Net.EchonetLite.Appendix/EchonetPropertySpecification.cs b/...dn.Net.EchonetLite.Appendix/Smdn.Net.EchonetLite.Appendix/EchonetPropertySpecification.cs
@@ -8,7 +8,7 @@
 #endif
 using System.Text.Json.Serialization;
 
-namespace EchoDotNetLite.Specifications
+namespace Smdn.Net.EchonetLite.Appendix
 {
 
     /// <summary>

diff --git a/src/Smdn.Net.EchonetLite.Appendix/Smdn.Net.EchonetLite.Appendix/JsonValidationUtils.cs b/src/Smdn.Net.EchonetLite.Appendix/Smdn.Net.EchonetLite.Appendix/JsonValidationUtils.cs
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: MIT
 using System;
 
-namespace EchoDotNetLite.Specifications;
+namespace Smdn.Net.EchonetLite.Appendix;
 
 internal static class JsonValidationUtils {
     public static string ThrowIfValueIsNullOrEmpty(string? value, string paramName)

diff --git a/src/Smdn.Net.EchonetLite.Appendix/Smdn.Net.EchonetLite.Appendix/PropertyMaster.cs b/src/Smdn.Net.EchonetLite.Appendix/Smdn.Net.EchonetLite.Appendix/PropertyMaster.cs
@@ -7,7 +7,7 @@
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
-namespace EchoDotNetLite.Specifications
+namespace Smdn.Net.EchonetLite.Appendix
 {
     internal sealed class PropertyMaster
     {

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

diff --git a/src/Smdn.Net.EchonetLite.Appendix/Smdn.Net.EchonetLite.Appendix/SpecificationMaster.cs b/src/Smdn.Net.EchonetLite.Appendix/Smdn.Net.EchonetLite.Appendix/SpecificationMaster.cs
@@ -10,7 +10,7 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-namespace EchoDotNetLite.Specifications
+namespace Smdn.Net.EchonetLite.Appendix
 {
     /// <summary>
     /// ECHONETオブジェクト詳細マスタ

diff --git a/src/Smdn.Net.EchonetLite.Appendix/Smdn.Net.EchonetLite/ApplicationServiceName.cs b/src/Smdn.Net.EchonetLite.Appendix/Smdn.Net.EchonetLite/ApplicationServiceName.cs
@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: MIT
 using System.Text.Json.Serialization;
 
-namespace EchoDotNetLite.Specifications
+namespace Smdn.Net.EchonetLite
 {
 
     /// <summary>

diff --git a/src/Smdn.Net.EchonetLite.Appendix/Smdn.Net.EchonetLite/DeviceClasses.cs b/src/Smdn.Net.EchonetLite.Appendix/Smdn.Net.EchonetLite/DeviceClasses.cs
@@ -3,7 +3,9 @@
 // SPDX-License-Identifier: MIT
 using System.Collections.Generic;
 
-namespace EchoDotNetLite.Specifications
+using Smdn.Net.EchonetLite.Appendix;
+
+namespace Smdn.Net.EchonetLite
 {
 
     /// <summary>

diff --git a/src/Smdn.Net.EchonetLite.Appendix/Smdn.Net.EchonetLite/IEchonetObject.cs b/src/Smdn.Net.EchonetLite.Appendix/Smdn.Net.EchonetLite/IEchonetObject.cs
@@ -3,7 +3,9 @@
 // SPDX-License-Identifier: MIT
 using System.Collections.Generic;
 
-namespace EchoDotNetLite.Specifications
+using Smdn.Net.EchonetLite.Appendix;
+
+namespace Smdn.Net.EchonetLite
 {
     /// <summary>
     /// ECHONET Lite オブジェクト

diff --git a/src/Smdn.Net.EchonetLite.Appendix/Smdn.Net.EchonetLite/Profiles.cs b/src/Smdn.Net.EchonetLite.Appendix/Smdn.Net.EchonetLite/Profiles.cs
@@ -3,7 +3,9 @@
 // SPDX-License-Identifier: MIT
 using System.Collections.Generic;
 
-namespace EchoDotNetLite.Specifications
+using Smdn.Net.EchonetLite.Appendix;
+
+namespace Smdn.Net.EchonetLite
 {
     /// <summary>
     /// ECHONET Lite クラスグループ定義

diff --git a/src/Smdn.Net.EchonetLite/EchoDotNetLite.Models/EchoNode.cs b/src/Smdn.Net.EchonetLite/EchoDotNetLite.Models/EchoNode.cs
@@ -1,14 +1,16 @@
 // SPDX-FileCopyrightText: 2018 HiroyukiSakoh
 // SPDX-FileCopyrightText: 2023 smdn <smdn@smdn.jp>
 // SPDX-License-Identifier: MIT
-using EchoDotNetLite.Specifications;
 using System;
 using System.Collections.Generic;
 using System.Collections.Specialized;
 using System.Collections.ObjectModel;
 using System.Linq;
 using System.Net;
 
+using Smdn.Net.EchonetLite;
+using Smdn.Net.EchonetLite.Appendix;
+
 namespace EchoDotNetLite.Models
 {
     /// <summary>
@@ -61,12 +63,12 @@ private void OnDevicesChanged(NotifyCollectionChangedEventArgs e)
 
     internal static class SpecificationUtil
     {
-        public static Specifications.EchoProperty? FindProperty(byte classGroupCode, byte classCode, byte epc)
+        public static EchoProperty? FindProperty(byte classGroupCode, byte classCode, byte epc)
         {
             var @class = FindClass(classGroupCode, classCode);
             if (@class is not null)
             {
-                Specifications.EchoProperty? property;
+                EchoProperty? property;
                  property = @class.AnnoProperties.FirstOrDefault(p => p.Code == epc);
                 if (property is not null)
                 {
@@ -125,16 +127,16 @@ public UnknownEchoObject(EchoClassGroup classGroup, EchoClass @class)
             public IEnumerable<EchoProperty> AnnoProperties => Enumerable.Empty<EchoProperty>();
         }
 
-        public static Specifications.IEchonetObject? FindClass(byte classGroupCode, byte classCode)
+        public static IEchonetObject? FindClass(byte classGroupCode, byte classCode)
         {
-            var profileClass = Specifications.プロファイル.クラス一覧.FirstOrDefault(
+            var profileClass = プロファイル.クラス一覧.FirstOrDefault(
                                 g => g.ClassGroup.ClassGroupCode == classGroupCode
                                 && g.Class.ClassCode == classCode);
             if (profileClass != null)
             {
                 return profileClass;
             }
-            var deviceClass = Specifications.機器.クラス一覧.FirstOrDefault(
+            var deviceClass = 機器.クラス一覧.FirstOrDefault(
                                 g => g.ClassGroup.ClassGroupCode == classGroupCode
                                 && g.Class.ClassCode == classCode);
             if (deviceClass != null)

diff --git a/src/Smdn.Net.EchonetLite/EchoDotNetLite.Models/EchoObjectInstance.cs b/src/Smdn.Net.EchonetLite/EchoDotNetLite.Models/EchoObjectInstance.cs
@@ -6,7 +6,8 @@
 using System.Collections.Specialized;
 using System.Collections.ObjectModel;
 using System.Linq;
-using EchoDotNetLite.Specifications;
+
+using Smdn.Net.EchonetLite;
 
 namespace EchoDotNetLite.Models
 {
@@ -108,7 +109,7 @@ internal void ResetProperties(IEnumerable<EchoPropertyInstance> props)
         /// クラスグループコード、クラスグループ名
         /// ECHONET機器オブジェクト詳細規定がある場合、詳細仕様
         /// </summary>
-        public Specifications.IEchonetObject Spec { get; }
+        public IEchonetObject Spec { get; }
         /// <summary>
         /// インスタンスコード
         /// </summary>

diff --git a/src/Smdn.Net.EchonetLite/EchoDotNetLite.Models/EchoPropertyInstance.cs b/src/Smdn.Net.EchonetLite/EchoDotNetLite.Models/EchoPropertyInstance.cs
@@ -4,6 +4,8 @@
 using System;
 using System.Buffers;
 
+using Smdn.Net.EchonetLite.Appendix;
+
 namespace EchoDotNetLite.Models
 {
 
@@ -12,7 +14,7 @@ namespace EchoDotNetLite.Models
     /// </summary>
     public sealed class EchoPropertyInstance
     {
-        internal static Specifications.EchoProperty GenerateUnknownProperty(byte epc)
+        internal static EchoProperty GenerateUnknownProperty(byte epc)
             => new
             (
                 code: epc,
@@ -73,7 +75,7 @@ bool isPropertyGet
         {
         }
 
-        public EchoPropertyInstance(Specifications.EchoProperty spec)
+        public EchoPropertyInstance(EchoProperty spec)
             : this
             (
                 spec: spec,
@@ -86,7 +88,7 @@ public EchoPropertyInstance(Specifications.EchoProperty spec)
 
         public EchoPropertyInstance
         (
-            Specifications.EchoProperty spec,
+            EchoProperty spec,
             bool isPropertyAnno,
             bool isPropertySet,
             bool isPropertyGet
@@ -102,7 +104,7 @@ bool isPropertyGet
         /// EPC
         /// ECHONET機器オブジェクト詳細規定がある場合、詳細仕様
         /// </summary>
-        public Specifications.EchoProperty Spec { get; }
+        public EchoProperty Spec { get; }
         /// <summary>
         /// プロパティ値の読み出し・通知要求のサービスを処理する。
         /// プロパティ値読み出し要求(0x62)、プロパティ値書き込み・読み出し要求(0x6E)、プロパティ値通知要求(0x63)の要求受付処理を実施する。

diff --git a/src/Smdn.Net.EchonetLite/EchoDotNetLite/Client.cs b/src/Smdn.Net.EchonetLite/EchoDotNetLite/Client.cs
@@ -15,6 +15,8 @@
 using System.Threading;
 using System.Threading.Tasks;
 
+using Smdn.Net.EchonetLite;
+
 namespace EchoDotNetLite
 {
     public partial class EchoClient : IDisposable, IAsyncDisposable
@@ -108,7 +110,7 @@ public EchoClient
             SelfNode = new EchoNode
             (
                 address: nodeAddress ?? throw new ArgumentNullException(nameof(nodeAddress)),
-                nodeProfile: new EchoObjectInstance(Specifications.プロファイル.ノードプロファイル, 0x01)
+                nodeProfile: new EchoObjectInstance(プロファイル.ノードプロファイル, 0x01)
             );
             Nodes = new List<EchoNode>();
             //自己消費用
@@ -250,8 +252,8 @@ private ushort GetNewTid()
                 SelfNode.NodeProfile//ノードプロファイルから
                 , null//一斉通知
                 , new EchoObjectInstance(new EOJ(
-                    classGroupCode: Specifications.プロファイル.ノードプロファイル.ClassGroup.ClassGroupCode,
-                    classCode: Specifications.プロファイル.ノードプロファイル.Class.ClassCode,
+                    classGroupCode: プロファイル.ノードプロファイル.ClassGroup.ClassGroupCode,
+                    classCode: プロファイル.ノードプロファイル.Class.ClassCode,
                     instanceCode: 0x01
                 ))
                 , Enumerable.Repeat(property, 1)
@@ -276,8 +278,8 @@ private ushort GetNewTid()
             (
                 new EchoPropertyInstance
                 (
-                    Specifications.プロファイル.ノードプロファイル.ClassGroup.ClassGroupCode,
-                    Specifications.プロファイル.ノードプロファイル.Class.ClassCode,
+                    プロファイル.ノードプロファイル.ClassGroup.ClassGroupCode,
+                    プロファイル.ノードプロファイル.Class.ClassCode,
                     0xD5//インスタンスリスト通知
                 ),
                 1
@@ -287,8 +289,8 @@ private ushort GetNewTid()
                 SelfNode.NodeProfile//ノードプロファイルから
                 , null//一斉通知
                 , new EchoObjectInstance(new EOJ(
-                    classGroupCode: Specifications.プロファイル.ノードプロファイル.ClassGroup.ClassGroupCode,
-                    classCode: Specifications.プロファイル.ノードプロファイル.Class.ClassCode,
+                    classGroupCode: プロファイル.ノードプロファイル.ClassGroup.ClassGroupCode,
+                    classCode: プロファイル.ノードプロファイル.Class.ClassCode,
                     instanceCode: 0x01
                 ))
                 , properties
@@ -1267,7 +1269,7 @@ private void HandleFrameReceived(object? sender, (IPAddress address, Frame frame
                     sourceNode = new EchoNode
                     (
                         address: value.address,
-                        nodeProfile: new EchoObjectInstance(Specifications.プロファイル.ノードプロファイル, 0x01)
+                        nodeProfile: new EchoObjectInstance(プロファイル.ノードプロファイル, 0x01)
                     );
                     Nodes.Add(sourceNode);
                     NodeJoined?.Invoke(this,sourceNode);

diff --git a/....Net.EchonetLite.Appendix/Smdn.Net.EchonetLite.Appendix/EchonetClassGroupSpecification.cs b/....Net.EchonetLite.Appendix/Smdn.Net.EchonetLite.Appendix/EchonetClassGroupSpecification.cs
@@ -9,7 +9,7 @@
 
 using NUnit.Framework;
 
-namespace EchoDotNetLite.Specifications;
+namespace Smdn.Net.EchonetLite.Appendix;
 
 [TestFixture]
 public class EchoClassGroupTests {

diff --git a/.../Smdn.Net.EchonetLite.Appendix/Smdn.Net.EchonetLite.Appendix/EchonetClassSpecification.cs b/.../Smdn.Net.EchonetLite.Appendix/Smdn.Net.EchonetLite.Appendix/EchonetClassSpecification.cs
@@ -8,7 +8,7 @@
 
 using NUnit.Framework;
 
-namespace EchoDotNetLite.Specifications;
+namespace Smdn.Net.EchonetLite.Appendix;
 
 [TestFixture]
 public class EchoClassTests {

diff --git a/...dn.Net.EchonetLite.Appendix/Smdn.Net.EchonetLite.Appendix/EchonetPropertySpecification.cs b/...dn.Net.EchonetLite.Appendix/Smdn.Net.EchonetLite.Appendix/EchonetPropertySpecification.cs
@@ -9,7 +9,7 @@
 
 using NUnit.Framework;
 
-namespace EchoDotNetLite.Specifications;
+namespace Smdn.Net.EchonetLite.Appendix;
 
 [TestFixture]
 public class EchoPropertyTests {

diff --git a/tests/Smdn.Net.EchonetLite.Appendix/Smdn.Net.EchonetLite/ApplicationServiceName.cs b/tests/Smdn.Net.EchonetLite.Appendix/Smdn.Net.EchonetLite/ApplicationServiceName.cs
@@ -4,7 +4,7 @@
 
 using NUnit.Framework;
 
-namespace EchoDotNetLite.Specifications;
+namespace Smdn.Net.EchonetLite;
 
 [TestFixture]
 public class ApplicationServiceTests {

diff --git a/tests/Smdn.Net.EchonetLite.Appendix/Smdn.Net.EchonetLite/DeviceClasses.cs b/tests/Smdn.Net.EchonetLite.Appendix/Smdn.Net.EchonetLite/DeviceClasses.cs
@@ -5,7 +5,9 @@
 
 using NUnit.Framework;
 
-namespace EchoDotNetLite.Specifications;
+using Smdn.Net.EchonetLite.Appendix;
+
+namespace Smdn.Net.EchonetLite;
 
 [TestFixture]
 public class 機器Tests {

diff --git a/tests/Smdn.Net.EchonetLite.Appendix/Smdn.Net.EchonetLite/Profiles.cs b/tests/Smdn.Net.EchonetLite.Appendix/Smdn.Net.EchonetLite/Profiles.cs
@@ -4,7 +4,9 @@
 
 using NUnit.Framework;
 
-namespace EchoDotNetLite.Specifications;
+using Smdn.Net.EchonetLite.Appendix;
+
+namespace Smdn.Net.EchonetLite;
 
 [TestFixture]
 public class プロファイルTests {