Fix scoping and add more defaults

Liu, Shabai · Liu, Shabai · commit b3e447e406de · 2014-07-30T15:03:18.000-04:00
diff --git a/Source/Cvent.SchemaToPoco.Core.UnitTests/FunctionalTests/DefaultTest.cs b/Source/Cvent.SchemaToPoco.Core.UnitTests/FunctionalTests/DefaultTest.cs
@@ -29,9 +29,9 @@ public void TestBasic()
     public class DefaultClassName
     {
 
-        public string _foo;
+        private string _foo;
 
-        public int _number;
+        private int _number;
 
         public DefaultClassName()
         {
diff --git a/Source/Cvent.SchemaToPoco.Core.UnitTests/FunctionalTests/DescriptionTest.cs b/Source/Cvent.SchemaToPoco.Core.UnitTests/FunctionalTests/DescriptionTest.cs
@@ -29,7 +29,7 @@ public class NewClassName
     {
 
         // Description for foo!
-        public string _foo;
+        private string _foo;
 
         // Description for foo!
         public virtual string Foo
diff --git a/Source/Cvent.SchemaToPoco.Core.UnitTests/FunctionalTests/ExclusiveMinMaxTest.cs b/Source/Cvent.SchemaToPoco.Core.UnitTests/FunctionalTests/ExclusiveMinMaxTest.cs
@@ -29,7 +29,7 @@ public void TestBasic()
     public class DefaultClassName
     {
 
-        public int _foo;
+        private int _foo;
 
         [MinValue(11)]
         [MaxValue(15)]
diff --git a/Source/Cvent.SchemaToPoco.Core.UnitTests/FunctionalTests/ItemTest.cs b/Source/Cvent.SchemaToPoco.Core.UnitTests/FunctionalTests/ItemTest.cs
@@ -27,7 +27,7 @@ public void TestBasic()
     public class DefaultClassName
     {
 
-        public List<string> _foo;
+        private List<string> _foo;
 
         public virtual List<string> Foo
         {
diff --git a/Source/Cvent.SchemaToPoco.Core.UnitTests/FunctionalTests/MinMaxItems.cs b/Source/Cvent.SchemaToPoco.Core.UnitTests/FunctionalTests/MinMaxItems.cs
@@ -31,7 +31,7 @@ public void TestBasic()
     public class DefaultClassName
     {
 
-        public List<string> _foo;
+        private List<string> _foo;
 
         [MinLength(10)]
         [MaxLength(20)]
diff --git a/Source/Cvent.SchemaToPoco.Core.UnitTests/FunctionalTests/MinMaxLengthTest.cs b/Source/Cvent.SchemaToPoco.Core.UnitTests/FunctionalTests/MinMaxLengthTest.cs
@@ -27,7 +27,7 @@ public void TestBasic()
     public class DefaultClassName
     {
 
-        public string _foo;
+        private string _foo;
 
         [StringLength(10, MinimumLength=2)]
         public virtual string Foo
diff --git a/Source/Cvent.SchemaToPoco.Core.UnitTests/FunctionalTests/MinMaxTest.cs b/Source/Cvent.SchemaToPoco.Core.UnitTests/FunctionalTests/MinMaxTest.cs
@@ -27,7 +27,7 @@ public void TestBasic()
     public class DefaultClassName
     {
 
-        public int _foo;
+        private int _foo;
 
         [MinValue(10)]
         [MaxValue(15)]
diff --git a/Source/Cvent.SchemaToPoco.Core.UnitTests/FunctionalTests/PatternTest.cs b/Source/Cvent.SchemaToPoco.Core.UnitTests/FunctionalTests/PatternTest.cs
@@ -28,7 +28,7 @@ public class DefaultClassName
     {
 
         // Match the regex ""dev""'[a-c]
-        public string _foo;
+        private string _foo;
 
         // Match the regex ""dev""'[a-c]
         [RegularExpression(@""^\\\""""dev\""""\'[a-c]\s$"")]
diff --git a/Source/Cvent.SchemaToPoco.Core.UnitTests/FunctionalTests/PropertyTest.cs b/Source/Cvent.SchemaToPoco.Core.UnitTests/FunctionalTests/PropertyTest.cs
@@ -24,7 +24,7 @@ public void TestBasic()
     public class DefaultClassName
     {
 
-        public string _foo;
+        private string _foo;
 
         public virtual string Foo
         {
diff --git a/Source/Cvent.SchemaToPoco.Core.UnitTests/FunctionalTests/RequiredTest.cs b/Source/Cvent.SchemaToPoco.Core.UnitTests/FunctionalTests/RequiredTest.cs
@@ -26,7 +26,7 @@ public void TestBasic()
     public class DefaultClassName
     {
 
-        public string _foo;
+        private string _foo;
 
         [Required()]
         public virtual string Foo
diff --git a/Source/Cvent.SchemaToPoco.Core.UnitTests/FunctionalTests/UniqueItemsTest.cs b/Source/Cvent.SchemaToPoco.Core.UnitTests/FunctionalTests/UniqueItemsTest.cs
@@ -29,7 +29,7 @@ public void TestBasic()
     public class DefaultClassName
     {
 
-        public HashSet<string> _foo;
+        private HashSet<string> _foo;
 
         public virtual HashSet<string> Foo
         {
diff --git a/Source/Cvent.SchemaToPoco.Core/JsonSchemaToCodeUnit.cs b/Source/Cvent.SchemaToPoco.Core/JsonSchemaToCodeUnit.cs
@@ -141,7 +141,7 @@ public CodeCompileUnit Execute()
 
                         var field = new CodeMemberField
                         {
-                            Attributes = MemberAttributes.Public,
+                            Attributes = MemberAttributes.Private,
                             Name = "_" + i.Key,
                             Type =
                                 TypeUtils.IsPrimitive(type) && !JsonSchemaUtils.IsArray(schema)
@@ -168,7 +168,7 @@ public CodeCompileUnit Execute()
                         // Add default, if any
                         if (schema.Default != null)
                         {
-                            clWrap.AddDefault(field.Name, field.Type, schema.Default.ToObject(typeof (object)));
+                            clWrap.AddDefault(field.Name, field.Type, schema.Default.ToString());
                         }
 
                         clWrap.Property.Members.Add(property);
diff --git a/Source/Cvent.SchemaToPoco.Core/JsonSchemaToPoco.cs b/Source/Cvent.SchemaToPoco.Core/JsonSchemaToPoco.cs
@@ -1,7 +1,6 @@
 ﻿using System;
 using System.CodeDom;
 using System.Collections.Generic;
-using System.IO;
 using Cvent.SchemaToPoco.Console;
 using Cvent.SchemaToPoco.Core.CodeToLanguage;
 using Cvent.SchemaToPoco.Core.Types;
diff --git a/Source/Cvent.SchemaToPoco.Core/Types/ClassWrapper.cs b/Source/Cvent.SchemaToPoco.Core/Types/ClassWrapper.cs
@@ -33,8 +33,7 @@ public void AddInterface(string name)
         /// <param name="property">The property name.</param>
         /// <param name="type">The type of the property.</param>
         /// <param name="value">The value to initialize with.</param>
-        /// TODO
-        public void AddDefault(string property, CodeTypeReference type, object value)
+        public void AddDefault(string property, CodeTypeReference type, string value)
         {
             // Create constructor if doesn't already exist
             if (Constructor == null)
@@ -43,9 +42,32 @@ public void AddDefault(string property, CodeTypeReference type, object value)
                 Property.Members.Add(Constructor);
             }
 
-            //value.GetType()
             var reference = new CodeFieldReferenceExpression(null, property);
-            Constructor.Statements.Add(new CodeAssignStatement(reference, new CodePrimitiveExpression(value)));
+            CodeExpression exp;
+            int n;
+            double m;
+
+            // Check for int
+            if (int.TryParse(value, out n))
+            {
+                exp = new CodePrimitiveExpression(n);
+            }
+            // Check for double
+            else if (double.TryParse(value, out m))
+            {
+                exp = new CodePrimitiveExpression(m);
+            }
+            // Check for {}
+            else if (value.Equals("{}"))
+            {
+                exp = new CodeObjectCreateExpression(type);
+            }
+            else
+            {
+                exp = new CodePrimitiveExpression(value);
+            }
+
+            Constructor.Statements.Add(new CodeAssignStatement(reference, exp));
         }
     }
 }
diff --git a/Source/Cvent.SchemaToPoco.Core/Util/JsonSchemaUtils.cs b/Source/Cvent.SchemaToPoco.Core/Util/JsonSchemaUtils.cs
@@ -1,5 +1,4 @@
 ﻿using System;
-using System.Collections.Generic;
 using Cvent.SchemaToPoco.Core.Types;
 using Newtonsoft.Json.Schema;
 
@@ -101,7 +100,7 @@ public static Type GetType(JsonSchema schema, string ns)
                 {
                     return builder.GetCustomType(schema.Title, true);
                 }
-                if (schema.Items.Count > 0)
+                if (schema.Items != null && schema.Items.Count > 0)
                 {
                     // Set the type to the title of the items
                     if (schema.Items[0].Title != null)
diff --git a/Source/Cvent.SchemaToPoco.Core/Util/TypeUtils.cs b/Source/Cvent.SchemaToPoco.Core/Util/TypeUtils.cs
@@ -1,8 +1,5 @@
 ﻿using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using Newtonsoft.Json.Schema;
 
 namespace Cvent.SchemaToPoco.Core.Util

Original file line number	Diff line number	Diff line change
`@@ -29,9 +29,9 @@ public void TestBasic()`
`29`	`29`	`public class DefaultClassName`
`30`	`30`	`{`
`31`	`31`
`32`		`- public string _foo;`
	`32`	`+ private string _foo;`
`33`	`33`
`34`		`- public int _number;`
	`34`	`+ private int _number;`
`35`	`35`
`36`	`36`	`public DefaultClassName()`
`37`	`37`	`{`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ public class NewClassName`
`29`	`29`	`{`
`30`	`30`
`31`	`31`	`// Description for foo!`
`32`		`- public string _foo;`
	`32`	`+ private string _foo;`
`33`	`33`
`34`	`34`	`// Description for foo!`
`35`	`35`	`public virtual string Foo`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ public void TestBasic()`
`29`	`29`	`public class DefaultClassName`
`30`	`30`	`{`
`31`	`31`
`32`		`- public int _foo;`
	`32`	`+ private int _foo;`
`33`	`33`
`34`	`34`	`[MinValue(11)]`
`35`	`35`	`[MaxValue(15)]`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ public void TestBasic()`
`27`	`27`	`public class DefaultClassName`
`28`	`28`	`{`
`29`	`29`
`30`		`- public List<string> _foo;`
	`30`	`+ private List<string> _foo;`
`31`	`31`
`32`	`32`	`public virtual List<string> Foo`
`33`	`33`	`{`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ public void TestBasic()`
`31`	`31`	`public class DefaultClassName`
`32`	`32`	`{`
`33`	`33`
`34`		`- public List<string> _foo;`
	`34`	`+ private List<string> _foo;`
`35`	`35`
`36`	`36`	`[MinLength(10)]`
`37`	`37`	`[MaxLength(20)]`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ public class DefaultClassName`
`28`	`28`	`{`
`29`	`29`
`30`	`30`	`// Match the regex ""dev""'[a-c]`
`31`		`- public string _foo;`
	`31`	`+ private string _foo;`
`32`	`32`
`33`	`33`	`// Match the regex ""dev""'[a-c]`
`34`	`34`	`[RegularExpression(@""^\\\""""dev\""""\'[a-c]\s$"")]`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ public void TestBasic()`
`24`	`24`	`public class DefaultClassName`
`25`	`25`	`{`
`26`	`26`
`27`		`- public string _foo;`
	`27`	`+ private string _foo;`
`28`	`28`
`29`	`29`	`public virtual string Foo`
`30`	`30`	`{`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ public void TestBasic()`
`26`	`26`	`public class DefaultClassName`
`27`	`27`	`{`
`28`	`28`
`29`		`- public string _foo;`
	`29`	`+ private string _foo;`
`30`	`30`
`31`	`31`	`[Required()]`
`32`	`32`	`public virtual string Foo`