Repository: ignite Updated Branches: refs/heads/ignite-1282 d90d1e2ec -> 13db2daaf
IGNITE-1282: .Net: Minor method renames. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/13db2daa Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/13db2daa Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/13db2daa Branch: refs/heads/ignite-1282 Commit: 13db2daaf87d34600bd63f8e14f05e2db5032e0c Parents: d90d1e2 Author: vozerov-gridgain <[email protected]> Authored: Thu Oct 8 17:15:16 2015 +0300 Committer: vozerov-gridgain <[email protected]> Committed: Thu Oct 8 17:15:16 2015 +0300 ---------------------------------------------------------------------- .../Portable/PortableStructureTest.cs | 2 +- .../Impl/Portable/PortableBuilderImpl.cs | 4 ++-- .../Impl/Portable/PortableMarshaller.cs | 10 +++++----- .../Impl/Portable/PortableUserObject.cs | 10 +++++----- .../Impl/Portable/PortableWriterImpl.cs | 6 +++--- .../Apache.Ignite.Core/Impl/Portable/PortablesImpl.cs | 14 +++++++------- 6 files changed, 23 insertions(+), 23 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/13db2daa/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Portable/PortableStructureTest.cs ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Portable/PortableStructureTest.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Portable/PortableStructureTest.cs index 1212ea0..580522e 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Portable/PortableStructureTest.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Portable/PortableStructureTest.cs @@ -80,7 +80,7 @@ namespace Apache.Ignite.Core.Tests.Portable Console.WriteLine(); // 4. Ensure that all fields are recorded. - IPortableTypeDescriptor desc = marsh.Descriptor(typeof (BranchedType)); + IPortableTypeDescriptor desc = marsh.GetDescriptor(typeof (BranchedType)); PortableStructure typeStruct = desc.TypeStructure; http://git-wip-us.apache.org/repos/asf/ignite/blob/13db2daa/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableBuilderImpl.cs ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableBuilderImpl.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableBuilderImpl.cs index d18434a..9723f79 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableBuilderImpl.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableBuilderImpl.cs @@ -210,7 +210,7 @@ namespace Apache.Ignite.Core.Impl.Portable /// <returns>Child builder.</returns> public PortableBuilderImpl Child(PortableUserObject obj) { - var desc = _portables.Marshaller.Descriptor(true, obj.TypeId); + var desc = _portables.Marshaller.GetDescriptor(true, obj.TypeId); return new PortableBuilderImpl(_portables, null, obj, desc); } @@ -292,7 +292,7 @@ namespace Apache.Ignite.Core.Impl.Portable try { // Prepare fields. - IPortableMetadataHandler metaHnd = _portables.Marshaller.MetadataHandler(desc); + IPortableMetadataHandler metaHnd = _portables.Marshaller.GetMetadataHandler(desc); IDictionary<int, object> vals0; http://git-wip-us.apache.org/repos/asf/ignite/blob/13db2daa/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableMarshaller.cs ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableMarshaller.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableMarshaller.cs index c7262e1..2b87fbb 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableMarshaller.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableMarshaller.cs @@ -260,7 +260,7 @@ namespace Apache.Ignite.Core.Impl.Portable /// </summary> /// <param name="typeId">Type ID.</param> /// <returns>Metadata or null.</returns> - public IPortableMetadata Metadata(int typeId) + public IPortableMetadata GetMetadata(int typeId) { if (Ignite != null) { @@ -278,7 +278,7 @@ namespace Apache.Ignite.Core.Impl.Portable /// </summary> /// <param name="desc">Type descriptor.</param> /// <returns>Metadata handler.</returns> - public IPortableMetadataHandler MetadataHandler(IPortableTypeDescriptor desc) + public IPortableMetadataHandler GetMetadataHandler(IPortableTypeDescriptor desc) { PortableMetadataHolder holder; @@ -342,7 +342,7 @@ namespace Apache.Ignite.Core.Impl.Portable /// </summary> /// <param name="type">Type.</param> /// <returns>Descriptor.</returns> - public IPortableTypeDescriptor Descriptor(Type type) + public IPortableTypeDescriptor GetDescriptor(Type type) { IPortableTypeDescriptor desc; @@ -356,7 +356,7 @@ namespace Apache.Ignite.Core.Impl.Portable /// </summary> /// <param name="typeName">Type name.</param> /// <returns>Descriptor.</returns> - public IPortableTypeDescriptor Descriptor(string typeName) + public IPortableTypeDescriptor GetDescriptor(string typeName) { IPortableTypeDescriptor desc; @@ -370,7 +370,7 @@ namespace Apache.Ignite.Core.Impl.Portable /// <param name="userType"></param> /// <param name="typeId"></param> /// <returns></returns> - public IPortableTypeDescriptor Descriptor(bool userType, int typeId) + public IPortableTypeDescriptor GetDescriptor(bool userType, int typeId) { IPortableTypeDescriptor desc; http://git-wip-us.apache.org/repos/asf/ignite/blob/13db2daa/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableUserObject.cs ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableUserObject.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableUserObject.cs index 66e70ee..891f261 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableUserObject.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableUserObject.cs @@ -106,7 +106,7 @@ namespace Apache.Ignite.Core.Impl.Portable T res = _marsh.Unmarshal<T>(stream, mode); - IPortableTypeDescriptor desc = _marsh.Descriptor(true, _typeId); + IPortableTypeDescriptor desc = _marsh.GetDescriptor(true, _typeId); if (!desc.KeepDeserialized) return res; @@ -120,7 +120,7 @@ namespace Apache.Ignite.Core.Impl.Portable /** <inheritdoc /> */ public IPortableMetadata GetMetadata() { - return _marsh.Metadata(_typeId); + return _marsh.GetMetadata(_typeId); } /// <summary> @@ -148,7 +148,7 @@ namespace Apache.Ignite.Core.Impl.Portable /// <returns></returns> public T Field<T>(string fieldName, PortableBuilderImpl builder) { - IPortableTypeDescriptor desc = _marsh.Descriptor(true, _typeId); + IPortableTypeDescriptor desc = _marsh.GetDescriptor(true, _typeId); InitializeFields(); @@ -295,13 +295,13 @@ namespace Apache.Ignite.Core.Impl.Portable StringBuilder sb; - IPortableTypeDescriptor desc = _marsh.Descriptor(true, _typeId); + IPortableTypeDescriptor desc = _marsh.GetDescriptor(true, _typeId); IPortableMetadata meta; try { - meta = _marsh.Metadata(_typeId); + meta = _marsh.GetMetadata(_typeId); } catch (IgniteException) { http://git-wip-us.apache.org/repos/asf/ignite/blob/13db2daa/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableWriterImpl.cs ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableWriterImpl.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableWriterImpl.cs index 2090496..0ff4c64 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableWriterImpl.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableWriterImpl.cs @@ -1287,7 +1287,7 @@ namespace Apache.Ignite.Core.Impl.Portable return; // Suppose that we faced normal object and perform descriptor lookup. - IPortableTypeDescriptor desc = _marsh.Descriptor(type); + IPortableTypeDescriptor desc = _marsh.GetDescriptor(type); if (desc != null) { @@ -1347,7 +1347,7 @@ namespace Apache.Ignite.Core.Impl.Portable { desc.UpdateStructure(_curStruct, _curStructPath, _curStructUpdates); - IPortableMetadataHandler metaHnd = _marsh.MetadataHandler(desc); + IPortableMetadataHandler metaHnd = _marsh.GetMetadataHandler(desc); if (metaHnd != null) { @@ -1611,7 +1611,7 @@ namespace Apache.Ignite.Core.Impl.Portable // Collections, Enums and non-primitive arrays do not have descriptors // and this is fine here because we cannot know whether their members // are portable. - return _marsh.Descriptor(type) != null || PortableSystemHandlers.GetWriteHandler(type) != null; + return _marsh.GetDescriptor(type) != null || PortableSystemHandlers.GetWriteHandler(type) != null; } return true; http://git-wip-us.apache.org/repos/asf/ignite/blob/13db2daa/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortablesImpl.cs ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortablesImpl.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortablesImpl.cs index b120041..5b73171 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortablesImpl.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortablesImpl.cs @@ -74,7 +74,7 @@ namespace Apache.Ignite.Core.Impl.Portable { IgniteArgumentCheck.NotNull(type, "type"); - IPortableTypeDescriptor desc = _marsh.Descriptor(type); + IPortableTypeDescriptor desc = _marsh.GetDescriptor(type); if (desc == null) throw new IgniteException("Type is not portable (add it to PortableConfiguration): " + @@ -88,7 +88,7 @@ namespace Apache.Ignite.Core.Impl.Portable { IgniteArgumentCheck.NotNullOrEmpty(typeName, "typeName"); - IPortableTypeDescriptor desc = _marsh.Descriptor(typeName); + IPortableTypeDescriptor desc = _marsh.GetDescriptor(typeName); return Builder0(null, PortableFromDescriptor(desc), desc); } @@ -103,7 +103,7 @@ namespace Apache.Ignite.Core.Impl.Portable if (obj0 == null) throw new ArgumentException("Unsupported object type: " + obj.GetType()); - IPortableTypeDescriptor desc = _marsh.Descriptor(true, obj0.TypeId); + IPortableTypeDescriptor desc = _marsh.GetDescriptor(true, obj0.TypeId); return Builder0(null, obj0, desc); } @@ -113,7 +113,7 @@ namespace Apache.Ignite.Core.Impl.Portable { IgniteArgumentCheck.NotNullOrEmpty(typeName, "typeName"); - return Marshaller.Descriptor(typeName).TypeId; + return Marshaller.GetDescriptor(typeName).TypeId; } /** <inheritDoc /> */ @@ -125,7 +125,7 @@ namespace Apache.Ignite.Core.Impl.Portable /** <inheritDoc /> */ public IPortableMetadata GetMetadata(int typeId) { - return Marshaller.Metadata(typeId); + return Marshaller.GetMetadata(typeId); } /** <inheritDoc /> */ @@ -141,9 +141,9 @@ namespace Apache.Ignite.Core.Impl.Portable { IgniteArgumentCheck.NotNull(type, "type"); - var desc = Marshaller.Descriptor(type); + var desc = Marshaller.GetDescriptor(type); - return desc == null ? null : Marshaller.Metadata(desc.TypeId); + return desc == null ? null : Marshaller.GetMetadata(desc.TypeId); } /// <summary>
