akkadotnet · Arkatufus · Feb 20, 2020 · Feb 20, 2020 · Feb 20, 2020 · Feb 20, 2020
diff --git a/.gitignore b/.gitignore
@@ -301,3 +301,4 @@ __pycache__/
 *.odx.cs
 *.xsd.cs
 PerfResults/
+src/Hocon.API.Tests/HoconAPISpec.ApproveCore.received.txt
diff --git a/Hocon.sln b/Hocon.sln
@@ -29,10 +29,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Hocon.Extensions.Configurat
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Hocon.Extensions.Configuration.Tests", "src\Hocon.Extensions.Configuration.Tests\Hocon.Extensions.Configuration.Tests.csproj", "{F7862234-3330-43DE-86BB-D6E67F2146BC}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Hocon.Immutable", "src\Hocon.Immutable\Hocon.Immutable.csproj", "{FB439177-CA10-4BA8-993D-A51D1BEE2A0E}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Hocon.Immutable.Tests", "src\Hocon.Immutable.Tests\Hocon.Immutable.Tests.csproj", "{FEEC6F6B-2511-4BEC-9568-4E6AE6C1D275}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SerializationDebug", "src\examples\SerializationDebug\SerializationDebug.csproj", "{6D1D4813-7AB6-4268-A9DF-627A60E08FB1}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Hocon.API.Tests", "src\Hocon.API.Tests\Hocon.API.Tests.csproj", "{2EC48C29-E5A7-4C3F-AB26-1C121E098867}"
@@ -95,14 +91,6 @@ Global
 		{F7862234-3330-43DE-86BB-D6E67F2146BC}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F7862234-3330-43DE-86BB-D6E67F2146BC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F7862234-3330-43DE-86BB-D6E67F2146BC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FB439177-CA10-4BA8-993D-A51D1BEE2A0E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FB439177-CA10-4BA8-993D-A51D1BEE2A0E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FB439177-CA10-4BA8-993D-A51D1BEE2A0E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FB439177-CA10-4BA8-993D-A51D1BEE2A0E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FEEC6F6B-2511-4BEC-9568-4E6AE6C1D275}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FEEC6F6B-2511-4BEC-9568-4E6AE6C1D275}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FEEC6F6B-2511-4BEC-9568-4E6AE6C1D275}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FEEC6F6B-2511-4BEC-9568-4E6AE6C1D275}.Release|Any CPU.Build.0 = Release|Any CPU
 		{6D1D4813-7AB6-4268-A9DF-627A60E08FB1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{6D1D4813-7AB6-4268-A9DF-627A60E08FB1}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{6D1D4813-7AB6-4268-A9DF-627A60E08FB1}.Release|Any CPU.ActiveCfg = Release|Any CPU

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,9 +1,10 @@
-### 2.0.3 February 28 2020 ####
-Bugfixes and improvements made to HOCON 2.0.0
+### 3.0.0 March 02 2020 ####
+Major changes on the HOCON surface API
 
-* [Bugfix: HoconValue.TryGetObject can throw System.ArgumentNullException](https://github.com/akkadotnet/HOCON/issues/233)
-* [Bugfix: System.InvalidOperationException : Collection was modified; enumeration operation may not execute](https://github.com/akkadotnet/HOCON/issues/234)
-* [Bugfix: unquoted key error during serialization](https://github.com/akkadotnet/HOCON/pull/223)
-* [Fixed NuGet symbol package publication](https://github.com/akkadotnet/HOCON/issues/222)
-
-For more details, please [see the issues in the HOCON v2.0.1 milestone here](https://github.com/akkadotnet/HOCON/milestone/7).
+* Major restructure of HOCON public class and API to conform to HOCON immutability 
+* Most of the API are backward compatible with HOCON 2.0 with the following exceptions:
+  * All access APIs are declared in static extension classes, in order to access the values
+    inside a `Config` or `HoconObject`, you will need to declare `using Hocon` in your .cs file.
+  * The class structure of the public HOCON classes havee beeen simplified and a few have been
+    removed. If you referenced the `HoconValue` or `HoconField` classes in your code, you will
+    have to change your code to conform to the new API.
diff --git a/build.fsx b/build.fsx
@@ -329,5 +329,6 @@ Target "LocalNuget" DoNothing
 "RunTests" ==> "All"
 "NBench" ==> "All"
 "Nuget" ==> "All"
+"LocalNuget" ==> "All"
 
 RunTargetOrDefault "Help"
diff --git a/src/Hocon.Immutable.Tests/ApiTest.cs → src/HOCON.Tests/ApiTest.cs b/src/Hocon.Immutable.Tests/ApiTest.cs → src/HOCON.Tests/ApiTest.cs
diff --git a/src/HOCON.Tests/Extensions/IsStringTests.cs b/src/HOCON.Tests/Extensions/IsStringTests.cs
@@ -24,7 +24,7 @@ public class IsStringTests
             }
         ";
 
-        public HoconRoot TestHocon => HoconParser.Parse(RawTestHocon);
+        public HoconObject TestHocon => HoconParser.Parse(RawTestHocon);
 
         [Fact]
         public void IsString_should_detect_String_literals()

diff --git a/src/HOCON.Tests/QuotedString.cs b/src/HOCON.Tests/QuotedString.cs
@@ -26,11 +26,11 @@ public void Bugfix_190_should_unquote_quotedstrings_on_parse()
             ";
 
             var parsed = HoconParser.Parse(hocon);
-            var unwrapped = parsed.GetObject("adapters").ToDictionary(x => x.Key, v => v.Value.GetString());
+            var unwrapped = parsed.GetObject("adapters").Unwrapped;
 
             // check to make sure these strings aren't quoted
-            unwrapped["gremlin"].Should().Be("Akka.Remote.Transport.FailureInjectorProvider,Akka.Remote");
-            unwrapped["trttl"].Should().Be("Akka.Remote.Transport.ThrottlerProvider,Akka.Remote");
+            unwrapped["gremlin"].Should().Equals("Akka.Remote.Transport.FailureInjectorProvider,Akka.Remote");
+            unwrapped["trttl"].Should().Equals("Akka.Remote.Transport.ThrottlerProvider,Akka.Remote");
         }
     }
 }
diff --git a/src/Hocon.API.Tests/Hocon.API.Tests.csproj b/src/Hocon.API.Tests/Hocon.API.Tests.csproj
@@ -45,7 +45,6 @@
   <ItemGroup>
     <ProjectReference Include="..\Hocon.Configuration\Hocon.Configuration.csproj" />
     <ProjectReference Include="..\Hocon.Extensions.Configuration\Hocon.Extensions.Configuration.csproj" />
-    <ProjectReference Include="..\Hocon.Immutable\Hocon.Immutable.csproj" />
     <ProjectReference Include="..\Hocon\Hocon.csproj" />
   </ItemGroup>
 

diff --git a/src/Hocon.API.Tests/HoconAPISpec.ApproveConfiguration.approved.txt b/src/Hocon.API.Tests/HoconAPISpec.ApproveConfiguration.approved.txt
@@ -7,30 +7,29 @@ namespace Hocon
         protected CDataConfigurationElement() { }
         protected override void DeserializeElement(System.Xml.XmlReader reader, bool serializeCollectionKey) { }
     }
-    public class Config : Hocon.HoconRoot, System.IEquatable<Hocon.Config>, System.Runtime.Serialization.ISerializable
+    public class Config : Hocon.HoconObject, System.IEquatable<Hocon.Config>, System.Runtime.Serialization.ISerializable
     {
-        [System.ObsoleteAttribute("For json serialization/deserialization only", true)]
-        protected Config() { }
-        protected Config(Hocon.HoconValue value) { }
-        protected Config(Hocon.HoconValue value, Hocon.Config fallback) { }
-        public Config(Hocon.HoconRoot root) { }
-        public Config(Hocon.HoconRoot root, Hocon.Config fallback) { }
+        public Config(Hocon.HoconElement root) { }
         [System.ObsoleteAttribute("Used for serialization only", true)]
-        public Config(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context) { }
+        protected Config(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context) { }
         public static Hocon.Config Empty { get; }
-        public virtual System.Collections.Generic.IReadOnlyList<Hocon.HoconValue> Fallbacks { get; }
+        public virtual System.Collections.Generic.IReadOnlyList<Hocon.HoconObject> Fallbacks { get; }
         public virtual bool IsEmpty { get; }
-        public Hocon.HoconValue Root { get; }
-        protected System.Collections.Generic.List<Hocon.HoconValue> _fallbacks { get; }
-        public override System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<string, Hocon.HoconField>> AsEnumerable() { }
+        public Hocon.HoconObject Root { get; }
+        protected System.Collections.Generic.List<Hocon.HoconObject> _fallbacks { get; }
+        public override System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<string, Hocon.HoconElement>> AsEnumerable() { }
+        public static Hocon.Config Create(Hocon.HoconElement root) { }
+        public static Hocon.Config Deserialize(string raw) { }
+        public override bool Equals(Hocon.HoconElement other) { }
         public virtual bool Equals(Hocon.Config other) { }
-        public override bool Equals(object obj) { }
         public virtual Hocon.Config GetConfig(string path) { }
         public virtual Hocon.Config GetConfig(Hocon.HoconPath path) { }
-        protected override Hocon.HoconValue GetNode(Hocon.HoconPath path) { }
+        [System.ObsoleteAttribute("Used for serialization only", true)]
         public void GetObjectData(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context) { }
+        public override Hocon.HoconElement GetValue(Hocon.HoconPath path) { }
+        public string Serialize() { }
         public string ToString(bool useFallbackValues) { }
-        protected override bool TryGetNode(Hocon.HoconPath path, out Hocon.HoconValue result) { }
+        public override bool TryGetValue(Hocon.HoconPath path, out Hocon.HoconElement result) { }
         public virtual Hocon.Config WithFallback(Hocon.Config fallback) { }
         public static Hocon.Config +(Hocon.Config config, string fallback) { }
         public static Hocon.Config +(string configHocon, Hocon.Config fallbackConfig) { }
@@ -66,7 +65,6 @@ namespace Hocon
         public static Hocon.Config FromResource(string resourceName, object instanceInAssembly) { }
         public static Hocon.Config FromResource<TAssembly>(string resourceName) { }
         public static Hocon.Config FromResource(string resourceName, System.Reflection.Assembly assembly) { }
-        [System.ObsoleteAttribute("Call the ConfigurationFactory.Default method instead.")]
         public static Hocon.Config Load() { }
         public static Hocon.Config Load(string sectionName) { }
         public static Hocon.Config ParseString(string hocon, Hocon.HoconIncludeCallbackAsync includeCallback) { }
-Original file line number
+Diff line change
@@ Expand Up / @@ -24,7 +24,7 @@ public class IsStringTests @@
                 }
             ";
-            public HoconRoot TestHocon => HoconParser.Parse(RawTestHocon);
+            public HoconObject TestHocon => HoconParser.Parse(RawTestHocon);
             [Fact]
             public void IsString_should_detect_String_literals()
@@ Expand Down @@