implab/ImplabNet Commit - r265:74e048cbaac8

Restored lost JsonXmlCaseTransform from version 2.1

cin -

r265:74e048cbaac8 v3.0.10 v3

parent child

Context file:

r265:74e048cbaac8

Collapse all files

Implab/Xml/JsonXmlCaseTransform.cs created 644 +11 0

			@@ -0,0 +1,11
		1	using System;
		2
		3	namespace Implab.Xml
		4	{
		5	public enum JsonXmlCaseTransform
		6	{
		7	None,
		8	UcFirst,
		9	LcFirst
		10	}
		11	} No newline at end of file

Implab.Test/JsonTests.cs +1 -1

                              CloseOutput = false,
                              ConformanceLevel = ConformanceLevel.Document
                          }))
-                         using (var xmlReader = new JsonXmlReader(JsonReader.ParseString(json), new JsonXmlReaderOptions { NamespaceUri = "JsonXmlReaderSimpleTest", NodesPrefix = "json" })) {
+                         using (var xmlReader = new JsonXmlReader(JsonReader.ParseString(json), new JsonXmlReaderOptions { NamespaceUri = "JsonXmlReaderSimpleTest", RootName = "Data", NodesPrefix = "json", CaseTransform = JsonXmlCaseTransform.UcFirst, ArrayItemName = "Item" })) {
                              xmlWriter.WriteNode(xmlReader, false);
                          }
                          Console.WriteLine();

Implab/Implab.csproj +1 -1

                  and SharedLock, Trace helpers on top of System.Diagnostics, ObjectPool etc.
                  </Description>
                  <Copyright>2012-2018 Sergey Smirnov</Copyright>
-                 <Version>3.0.8</Version>
+                 <Version>3.0.10</Version>
                  <PackageLicenseUrl>https://hg.implab.org/pub/ImplabNet/file/tip/Implab/license.txt</PackageLicenseUrl>
                  <PackageProjectUrl>https://implab.org</PackageProjectUrl>
                  <RepositoryUrl>https://hg.implab.org/pub/ImplabNet/</RepositoryUrl>

Implab/Xml/JsonXmlReader.cs +32 -4

                      readonly string m_xmlnsNamespace;
                      readonly string m_xsiPrefix;
                      readonly string m_xsiNamespace;
+                     readonly JsonXmlCaseTransform m_caseTransform;
                      public JsonXmlReader(JsonReader parser, JsonXmlReaderOptions options) {
                          m_xsiPrefix = m_nameTable.Add(XmlNameContext.XsiPrefix);
                          m_xsiNamespace = m_nameTable.Add(XmlNameContext.XsiNamespace);
+                         m_caseTransform = m_options.CaseTransform;
                          // TODO validate m_jsonRootName, m_jsonArrayItemName
                          m_context = new XmlNameContext(null, 0);
                              return m_value;
                          }
                      }
                      public override string GetAttribute(int i) {
                          Safe.ArgumentInRange(i >= 0 && i < AttributeCount, nameof(i));
                          return m_attributes[i].Value;
                              m_elementIsEmpty = m_isEmpty;
                              m_isAttribute = true;
                          }
                          var attr = m_attributes[i];
                              foreach (var attr in attrs) {
                                  if (attr.QName.Name == "xmlns") {
                                      if (context == m_context)
-                                          context = new XmlNameContext(m_context, m_xmlDepth);
+                                         context = new XmlNameContext(m_context, m_xmlDepth);
                                      context.DefinePrefix(attr.Value, string.Empty);
                                  } else if (attr.Prefix == m_xmlnsPrefix) {
                                      if (context == m_context)
                              }
                              while (m_parser.Read()) {
-                                 var jsonName = m_nameTable.Add(m_parser.ElementName);
+                                 var jsonName = m_nameTable.Add(TransformJsonName(m_parser.ElementName));
                                  switch (m_parser.ElementType) {
                                      case JsonElementType.BeginObject:
                          return !skip;
                      }
+                     private string TransformJsonName(string name) {
+                         if (m_caseTransform == JsonXmlCaseTransform.None || string.IsNullOrEmpty(name)) {
+                             return name;
+                         } else if (m_caseTransform == JsonXmlCaseTransform.UcFirst) {
+                             return JsonXmlReader.UppercaseFirst(name);
+                         } else {
+                             return JsonXmlReader.LowercaseFirst(name);
+                         }
+                     }
                      protected override void Dispose(bool disposing) {
                          if (disposing)
                              Safe.Dispose(m_parser);
                      #region static methods
+                     //
+                     // Static Methods
+                     //
+                     private static string LowercaseFirst(string s) {
+                         char[] array = s.ToCharArray();
+                         array[0] = char.ToLower(array[0]);
+                         return new string(array);
+                     }
+                     private static string UppercaseFirst(string s) {
+                         char[] array = s.ToCharArray();
+                         array[0] = char.ToUpper(array[0]);
+                         return new string(array);
+                     }
                      public static JsonXmlReader CreateJsonXmlReader(TextReader textReader, JsonXmlReaderOptions options = null) {
                          var jsonReader = JsonReader.Create(textReader);
                          return new JsonXmlReader(jsonReader, options);

Implab/Xml/JsonXmlReaderOptions.cs +2 0

                          set;
                      }
+                     public JsonXmlCaseTransform CaseTransform { get; set; }
                      public object Clone() {
                          return MemberwiseClone();
                      }

General Comments 3

sergey

|

Auto status change to "Under Review"

sergey

|

ok, latest stable version should be in default

Write
Preview

You need to be logged in to leave comments. Login now

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages