Fixed Issue When Using Dependency Injection

LiquidThinking · Oct 30, 2013 · 8d9be3d · 8d9be3d
1 parent c4a2a0f
commit 8d9be3d
Show file tree

Hide file tree

Showing 31 changed files with 4,890 additions and 43,639 deletions.
diff --git a/ApiDocumentation/CamelCaseContractResolver.cs b/ApiDocumentation/CamelCaseContractResolver.cs
@@ -1,12 +1,16 @@
-using Newtonsoft.Json.Serialization;
+using System;
+using System.Collections.Generic;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Serialization;
+using SwaggerAPIDocumentation.ViewModels;
 
 namespace SwaggerAPIDocumentation
 {
 	internal class CamelCaseContractResolver : DefaultContractResolver
 	{
 		protected override string ResolvePropertyName( string propertyName )
 		{
-			return char.ToLower(propertyName[0]) + propertyName.Substring( 1 );
+			return char.ToLower( propertyName[ 0 ] ) + propertyName.Substring( 1 );
 		}
 	}
 }
diff --git a/ApiDocumentation/Implementations/JsonSerializer.cs b/ApiDocumentation/Implementations/JsonSerializer.cs
@@ -10,7 +10,8 @@ public String SerializeObject( Object objectToBeEncoded )
 		{
 			return JsonConvert.SerializeObject( objectToBeEncoded, Formatting.Indented, new JsonSerializerSettings
 			{
-				ContractResolver = new CamelCaseContractResolver()
+				ContractResolver = new CamelCaseContractResolver(),
+
 			} );
 		}
 	}

diff --git a/ApiDocumentation/Interfaces/IJsonSerializer.cs b/ApiDocumentation/Interfaces/IJsonSerializer.cs
@@ -2,7 +2,7 @@
 
 namespace SwaggerAPIDocumentation.Interfaces
 {
-	internal interface IJsonSerializer
+	public interface IJsonSerializer
 	{
 		String SerializeObject( Object objectToBeEncoded );
 	}

diff --git a/ApiDocumentation/SwaggerAPIDocumentation.csproj b/ApiDocumentation/SwaggerAPIDocumentation.csproj
@@ -31,8 +31,9 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Newtonsoft.Json">
-      <HintPath>..\packages\Newtonsoft.Json.5.0.8\lib\net40\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=3.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Newtonsoft.Json.3.5.8\lib\35\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

diff --git a/ApiDocumentation/SwaggerApiDocumentation.cs b/ApiDocumentation/SwaggerApiDocumentation.cs
@@ -14,6 +14,8 @@ public class SwaggerApiDocumentation<TBaseApiControllerType> : ISwaggerApiDocume
 
 		public SwaggerApiDocumentation() : this( new SwaggerDocumentationAssemblyTools(), new SwaggerDocumentationCreator(), new JsonSerializer() ) {}
 
+		public SwaggerApiDocumentation( IJsonSerializer jsonSerializer ) : this( new SwaggerDocumentationAssemblyTools(), new SwaggerDocumentationCreator(), jsonSerializer ) {}
+
 		internal SwaggerApiDocumentation(
 			ISwaggerDocumentationAssemblyTools swaggerDocumentationAssemblyTools,
 			ISwaggerDocumentationCreator swaggerDocumentationCreator,

diff --git a/ApiDocumentation/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache b/ApiDocumentation/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache
diff --git a/ApiDocumentation/packages.config b/ApiDocumentation/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Newtonsoft.Json" version="5.0.8" targetFramework="net40" />
+  <package id="Newtonsoft.Json" version="3.5.8" targetFramework="net40" />
 </packages>
diff --git a/SwaggerAPIDocumentation.v11.suo b/SwaggerAPIDocumentation.v11.suo
diff --git a/SwaggerAPIDocumentationTests/NewtonSoftTests.cs b/SwaggerAPIDocumentationTests/NewtonSoftTests.cs
@@ -0,0 +1,33 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using NUnit.Framework;
+using SwaggerAPIDocumentation.Implementations;
+using SwaggerAPIDocumentation.ViewModels;
+
+namespace SwaggerAPIDocumentationTests
+{
+	[TestFixture]
+	public class NewtonSoftTests
+	{
+		[Test]
+		public void CanSerializeDictionary()
+		{
+			SwaggerApiResource swaggerApiResource = new SwaggerApiResource
+			{
+				Models = new Dictionary<String, ApiDocModel>
+				{
+					{
+						"Test", new ApiDocModel()
+					}
+				}
+			};
+
+			JsonSerializer jsonSerializer = new JsonSerializer();
+			var result = jsonSerializer.SerializeObject( swaggerApiResource );
+			Assert.IsNotNull( result );
+		}
+	}
+}
diff --git a/SwaggerAPIDocumentationTests/SwaggerAPIDocumentationTests.csproj b/SwaggerAPIDocumentationTests/SwaggerAPIDocumentationTests.csproj
@@ -49,6 +49,7 @@
     <Compile Include="BaseAutomatedMockWireupTest.cs" />
     <Compile Include="MockDictionary.cs" />
     <Compile Include="ModelsGeneratorTests.cs" />
+    <Compile Include="NewtonSoftTests.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="SwaggerAPIDocumentationTests.cs" />
     <Compile Include="SwaggerDocumentationAssemblyToolsTests.cs" />

diff --git a/packages/Newtonsoft.Json.3.5.8/Newtonsoft.Json.3.5.8.nupkg b/packages/Newtonsoft.Json.3.5.8/Newtonsoft.Json.3.5.8.nupkg
diff --git a/...t.Json.5.0.8/Newtonsoft.Json.5.0.8.nuspec → ...t.Json.3.5.8/Newtonsoft.Json.3.5.8.nuspec b/...t.Json.5.0.8/Newtonsoft.Json.5.0.8.nuspec → ...t.Json.3.5.8/Newtonsoft.Json.3.5.8.nuspec
@@ -2,15 +2,14 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata>
     <id>Newtonsoft.Json</id>
-    <version>5.0.8</version>
+    <version>3.5.8</version>
     <title>Json.NET</title>
     <authors>James Newton-King</authors>
     <owners>James Newton-King</owners>
-    <licenseUrl>https://raw.github.com/JamesNK/Newtonsoft.Json/master/LICENSE.md</licenseUrl>
-    <projectUrl>http://james.newtonking.com/json</projectUrl>
+    <projectUrl>http://james.newtonking.com/projects/json-net.aspx</projectUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>Json.NET is a popular high-performance JSON framework for .NET</description>
-    <language>en-US</language>
+    <summary>Json.NET is a popular high-performance JSON framework for .NET</summary>
     <tags>json</tags>
   </metadata>
 </package>
diff --git a/packages/Newtonsoft.Json.3.5.8/lib/20/Newtonsoft.Json.Net20.dll b/packages/Newtonsoft.Json.3.5.8/lib/20/Newtonsoft.Json.Net20.dll
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,7 +10,8 @@ public String SerializeObject( Object objectToBeEncoded ) @@
     		{
     			return JsonConvert.SerializeObject( objectToBeEncoded, Formatting.Indented, new JsonSerializerSettings
     			{
-    				ContractResolver = new CamelCaseContractResolver()
+    				ContractResolver = new CamelCaseContractResolver(),
     			} );
     		}
     	}
@@ Expand Down @@