Reintroduce old HOCON, lay groundwork for gradual introduction of HOC…

…ON stand-alone (#4299) * added original HOCON back to Akka.NET v1.4 * Extracted IHoconConfig interface as a proof of concept * API approvals * Revert "Extracted IHoconConfig interface as a proof of concept" This reverts commit d1561be. * disabled HOCON specs * added warning about HOCON spec * added API approval * make Logs_config_on_start spec cross-platform * fixed bug with Akka.Configuration.Config serialization binding * fixed issues with ActorMaterializer settings
akkadotnet · Mar 10, 2020 · bb4e7d9 · bb4e7d9
1 parent 8850f8d
commit bb4e7d9
Show file tree

Hide file tree

Showing 437 changed files with 4,498 additions and 989 deletions.
diff --git a/docs/articles/hocon/index.md b/docs/articles/hocon/index.md
@@ -5,6 +5,9 @@ title: HOCON Syntax and Practices in Akka.NET
 
 # HOCON (Human-Optimized Config Object Notation)
 
+> [!WARNING]
+> This documentation pertains to the HOCON 3.0 specification, which is currently not in-use inside Akka.NET. [Subscribe to updates here](https://github.com/akkadotnet/akka.net) by clicking "Watch" on the repository.
+
 This is an abridged version of HOCON for its use in Akka.NET. A full .NET implementation of HOCON spec can be read [here](https://github.com/akkadotnet/HOCON/blob/dev/README.md)
 
 You can play around with HOCON syntax in real-time by going to [hocon-playground](https://hocon-playground.herokuapp.com/)

diff --git a/src/benchmark/Akka.Benchmarks/Hocon/HoconBenchmarks.cs b/src/benchmark/Akka.Benchmarks/Hocon/HoconBenchmarks.cs
@@ -8,7 +8,7 @@
 using System;
 using System.Collections.Generic;
 using Akka.Benchmarks.Configurations;
-using Hocon; using Akka.Configuration;
+using Akka.Configuration;
 using BenchmarkDotNet.Attributes;
 
 namespace Akka.Benchmarks.Hocon

diff --git a/src/benchmark/PersistenceBenchmark/Program.cs b/src/benchmark/PersistenceBenchmark/Program.cs
@@ -10,7 +10,7 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Akka.Actor;
-using Hocon; using Akka.Configuration;
+using Akka.Configuration;
 using Akka.Pattern;
 using ConfigurationFactory = Akka.Configuration.ConfigurationFactory;
 

diff --git a/src/benchmark/PingPong/Program.cs b/src/benchmark/PingPong/Program.cs
@@ -14,7 +14,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Akka.Actor;
-using Hocon; using Akka.Configuration;
+using Akka.Configuration;
 using Akka.Util.Internal;
 
 namespace PingPong

diff --git a/src/benchmark/RemotePingPong/Program.cs b/src/benchmark/RemotePingPong/Program.cs
@@ -14,7 +14,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Akka.Actor;
-using Hocon; using Akka.Configuration;
+using Akka.Configuration;
 using Akka.Util.Internal;
 
 namespace RemotePingPong

diff --git a/src/benchmark/SpawnBenchmark/Program.cs b/src/benchmark/SpawnBenchmark/Program.cs
@@ -6,7 +6,7 @@
 //-----------------------------------------------------------------------
 
 using Akka.Actor;
-using Hocon; using Akka.Configuration;
+using Akka.Configuration;
 using System;
 using System.Runtime;
 

diff --git a/src/contrib/cluster/Akka.Cluster.Metrics.Tests.MultiNode/ClusterMetricsExtensionSpec.cs b/src/contrib/cluster/Akka.Cluster.Metrics.Tests.MultiNode/ClusterMetricsExtensionSpec.cs
@@ -14,7 +14,7 @@
 using Akka.Configuration;
 using Akka.Remote.TestKit;
 using FluentAssertions;
-using Hocon; using Akka.Configuration;
+using Akka.Configuration;
 using ConfigurationFactory = Akka.Configuration.ConfigurationFactory;
 
 namespace Akka.Cluster.Metrics.Tests.MultiNode

diff --git a/src/contrib/cluster/Akka.Cluster.Metrics.Tests.MultiNode/ClustetMetricsRoutingSpec.cs b/src/contrib/cluster/Akka.Cluster.Metrics.Tests.MultiNode/ClustetMetricsRoutingSpec.cs
@@ -21,7 +21,7 @@
 using Akka.Remote.TestKit;
 using Akka.Routing;
 using FluentAssertions;
-using Hocon; using Akka.Configuration;
+using Akka.Configuration;
 using Address = Akka.Actor.Address;
 using ConfigurationFactory = Akka.Configuration.ConfigurationFactory;
 

diff --git a/src/contrib/cluster/Akka.Cluster.Metrics.Tests.MultiNode/Sample/StatsSampleSpec.cs b/src/contrib/cluster/Akka.Cluster.Metrics.Tests.MultiNode/Sample/StatsSampleSpec.cs
@@ -13,7 +13,7 @@
 using Akka.Configuration;
 using Akka.Remote.TestKit;
 using FluentAssertions;
-using Hocon; using Akka.Configuration;
+using Akka.Configuration;
 using ConfigurationFactory = Akka.Configuration.ConfigurationFactory;
 
 namespace Akka.Cluster.Metrics.Tests.MultiNode

diff --git a/src/contrib/cluster/Akka.Cluster.Metrics.Tests/ClusterMetricsSettingsSpec.cs b/src/contrib/cluster/Akka.Cluster.Metrics.Tests/ClusterMetricsSettingsSpec.cs
@@ -15,7 +15,7 @@
 using Xunit;
 using FluentAssertions;
 using FsCheck;
-using Hocon; using Akka.Configuration;
+using Akka.Configuration;
 using ConfigurationFactory = Akka.Configuration.ConfigurationFactory;
 
 namespace Akka.Cluster.Metrics.Tests

diff --git a/src/contrib/cluster/Akka.Cluster.Metrics.Tests/WeightedRouteesSpec.cs b/src/contrib/cluster/Akka.Cluster.Metrics.Tests/WeightedRouteesSpec.cs
@@ -16,7 +16,7 @@
 using Akka.TestKit;
 using Akka.Util.Internal;
 using FluentAssertions;
-using Hocon; using Akka.Configuration;
+using Akka.Configuration;
 using Xunit;
 using ConfigurationFactory = Akka.Configuration.ConfigurationFactory;
 

diff --git a/src/contrib/cluster/Akka.Cluster.Metrics/ClusterMetrics.cs b/src/contrib/cluster/Akka.Cluster.Metrics/ClusterMetrics.cs
@@ -12,8 +12,8 @@
 using Akka.Cluster.Metrics.Events;
 using Akka.Cluster.Metrics.Helpers;
 using Akka.Cluster.Metrics.Serialization;
+using Akka.Configuration;
 using Akka.Util;
-using Hocon;
 using ConfigurationFactory = Akka.Configuration.ConfigurationFactory;
 
 namespace Akka.Cluster.Metrics

diff --git a/src/contrib/cluster/Akka.Cluster.Metrics/ClusterMetricsStrategy.cs b/src/contrib/cluster/Akka.Cluster.Metrics/ClusterMetricsStrategy.cs
@@ -8,7 +8,7 @@
 using System;
 using Akka.Actor;
 using Akka.Configuration;
-using Hocon; using Akka.Configuration;
+using Akka.Configuration;
 
 namespace Akka.Cluster.Metrics
 {

diff --git a/src/contrib/cluster/Akka.Cluster.Metrics/Configuration/ClusterMetricsSettings.cs b/src/contrib/cluster/Akka.Cluster.Metrics/Configuration/ClusterMetricsSettings.cs
@@ -6,7 +6,7 @@
 //-----------------------------------------------------------------------
 
 using System;
-using Hocon; using Akka.Configuration;
+using Akka.Configuration;
 
 namespace Akka.Cluster.Metrics.Configuration
 {

diff --git a/src/contrib/cluster/Akka.Cluster.Metrics/MetricsCollectorBuilder.cs b/src/contrib/cluster/Akka.Cluster.Metrics/MetricsCollectorBuilder.cs
@@ -12,7 +12,7 @@
 using Akka.Cluster.Metrics.Helpers;
 using Akka.Event;
 using Akka.Util;
-using Hocon; using Akka.Configuration;
+using Akka.Configuration;
 
 namespace Akka.Cluster.Metrics
 {

diff --git a/src/contrib/cluster/Akka.Cluster.Metrics/Routing/ClusterMetricsRouting.cs b/src/contrib/cluster/Akka.Cluster.Metrics/Routing/ClusterMetricsRouting.cs
@@ -18,7 +18,7 @@
 using Akka.Routing;
 using Akka.Util;
 using Akka.Util.Extensions;
-using Hocon; using Akka.Configuration;
+using Akka.Configuration;
 
 namespace Akka.Cluster.Metrics
 {

diff --git a/src/contrib/cluster/Akka.Cluster.Metrics/Routing/MetricSelectors.cs b/src/contrib/cluster/Akka.Cluster.Metrics/Routing/MetricSelectors.cs
@@ -12,7 +12,7 @@
 using Akka.Cluster.Metrics.Serialization;
 using Akka.Configuration;
 using Akka.Util;
-using Hocon; using Akka.Configuration;
+using Akka.Configuration;
 
 namespace Akka.Cluster.Metrics
 {

diff --git a/...cluster/Akka.Cluster.Sharding.Tests.MultiNode/ClusterShardingCustomShardAllocationSpec.cs b/...cluster/Akka.Cluster.Sharding.Tests.MultiNode/ClusterShardingCustomShardAllocationSpec.cs
@@ -8,7 +8,7 @@
 using System;
 using Akka.Actor;
 using Akka.Cluster.TestKit;
-using Hocon; using Akka.Configuration;
+using Akka.Configuration;
 using Akka.Remote.TestKit;
 using System.Collections.Immutable;
 using System.Threading.Tasks;

diff --git a/src/contrib/cluster/Akka.Cluster.Sharding.Tests.MultiNode/ClusterShardingFailureSpec.cs b/src/contrib/cluster/Akka.Cluster.Sharding.Tests.MultiNode/ClusterShardingFailureSpec.cs
@@ -11,7 +11,7 @@
 using System.Linq;
 using Akka.Actor;
 using Akka.Cluster.TestKit;
-using Hocon; using Akka.Configuration;
+using Akka.Configuration;
 using Akka.Remote.TestKit;
 using Akka.Remote.Transport;
 using Akka.Util;

diff --git a/src/contrib/cluster/Akka.Cluster.Sharding.Tests.MultiNode/ClusterShardingGetStateSpec.cs b/src/contrib/cluster/Akka.Cluster.Sharding.Tests.MultiNode/ClusterShardingGetStateSpec.cs
@@ -9,7 +9,7 @@
 using System.Linq;
 using Akka.Actor;
 using Akka.Cluster.TestKit;
-using Hocon; using Akka.Configuration;
+using Akka.Configuration;
 using Akka.Remote.TestKit;
 using System.Collections.Immutable;
 using Akka.Util;

diff --git a/src/contrib/cluster/Akka.Cluster.Sharding.Tests.MultiNode/ClusterShardingGetStatsSpec.cs b/src/contrib/cluster/Akka.Cluster.Sharding.Tests.MultiNode/ClusterShardingGetStatsSpec.cs
@@ -9,7 +9,7 @@
 using System.Linq;
 using Akka.Actor;
 using Akka.Cluster.TestKit;
-using Hocon; using Akka.Configuration;
+using Akka.Configuration;
 using Akka.Remote.TestKit;
 using Akka.Util;
 using FluentAssertions;

diff --git a/...trib/cluster/Akka.Cluster.Sharding.Tests.MultiNode/ClusterShardingGracefulShutdownSpec.cs b/...trib/cluster/Akka.Cluster.Sharding.Tests.MultiNode/ClusterShardingGracefulShutdownSpec.cs
@@ -10,7 +10,7 @@
 using System.Linq;
 using Akka.Actor;
 using Akka.Cluster.TestKit;
-using Hocon; using Akka.Configuration;
+using Akka.Configuration;
 using Akka.Remote.TestKit;
 using System.Collections.Immutable;
 using System.IO;

diff --git a/src/contrib/cluster/Akka.Cluster.Sharding.Tests.MultiNode/ClusterShardingLeavingSpec.cs b/src/contrib/cluster/Akka.Cluster.Sharding.Tests.MultiNode/ClusterShardingLeavingSpec.cs
@@ -10,7 +10,7 @@
 using System.Linq;
 using Akka.Actor;
 using Akka.Cluster.TestKit;
-using Hocon; using Akka.Configuration;
+using Akka.Configuration;
 using Akka.Remote.TestKit;
 using System.Collections.Immutable;
 using System.IO;

diff --git a/src/contrib/cluster/Akka.Cluster.Sharding.Tests.MultiNode/ClusterShardingMinMembersSpec.cs b/src/contrib/cluster/Akka.Cluster.Sharding.Tests.MultiNode/ClusterShardingMinMembersSpec.cs
@@ -11,7 +11,7 @@
 using System.Linq;
 using Akka.Actor;
 using Akka.Cluster.TestKit;
-using Hocon; using Akka.Configuration;
+using Akka.Configuration;
 using Akka.Remote.TestKit;
 using Akka.Util;
 using FluentAssertions;

diff --git a/.../Akka.Cluster.Sharding.Tests.MultiNode/ClusterShardingRememberEntitiesNewExtractorSpec.cs b/.../Akka.Cluster.Sharding.Tests.MultiNode/ClusterShardingRememberEntitiesNewExtractorSpec.cs
@@ -11,7 +11,7 @@
 using System.Linq;
 using Akka.Actor;
 using Akka.Cluster.TestKit;
-using Hocon; using Akka.Configuration;
+using Akka.Configuration;
 using Akka.Remote.TestKit;
 using Akka.Util;
 using FluentAssertions;

diff --git a/...trib/cluster/Akka.Cluster.Sharding.Tests.MultiNode/ClusterShardingRememberEntitiesSpec.cs b/...trib/cluster/Akka.Cluster.Sharding.Tests.MultiNode/ClusterShardingRememberEntitiesSpec.cs
@@ -11,7 +11,7 @@
 using System.Threading;
 using Akka.Actor;
 using Akka.Cluster.TestKit;
-using Hocon; using Akka.Configuration;
+using Akka.Configuration;
 using Akka.Remote.TestKit;
 using Akka.Util;
 using FluentAssertions;

diff --git a/src/contrib/cluster/Akka.Cluster.Sharding.Tests.MultiNode/ClusterShardingSpec.cs b/src/contrib/cluster/Akka.Cluster.Sharding.Tests.MultiNode/ClusterShardingSpec.cs
@@ -9,7 +9,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Threading;
-using Hocon; using Akka.Configuration;
+using Akka.Configuration;
 using Akka.Persistence;
 using Akka.Remote.TestKit;
 using Akka.Actor;

diff --git a/src/contrib/cluster/Akka.Cluster.Sharding.Tests/ClusterShardingConfigSpec.cs b/src/contrib/cluster/Akka.Cluster.Sharding.Tests/ClusterShardingConfigSpec.cs
@@ -6,7 +6,7 @@
 //-----------------------------------------------------------------------
 
 using System;
-using Hocon; using Akka.Configuration;
+using Akka.Configuration;
 using Xunit;
 
 namespace Akka.Cluster.Sharding.Tests

diff --git a/src/contrib/cluster/Akka.Cluster.Sharding.Tests/ClusterShardingInternalsSpec.cs b/src/contrib/cluster/Akka.Cluster.Sharding.Tests/ClusterShardingInternalsSpec.cs
@@ -8,7 +8,7 @@
 using System;
 using Akka.Actor;
 using Akka.Cluster.Tools.Singleton;
-using Hocon; using Akka.Configuration;
+using Akka.Configuration;
 using Akka.Util;
 using FluentAssertions;
 using Xunit;

diff --git a/src/contrib/cluster/Akka.Cluster.Sharding.Tests/ClusterShardingMessageSerializerSpec.cs b/src/contrib/cluster/Akka.Cluster.Sharding.Tests/ClusterShardingMessageSerializerSpec.cs
@@ -10,7 +10,7 @@
 using Akka.Actor;
 using Akka.Cluster.Sharding.Serialization;
 using Akka.Cluster.Tools.Singleton;
-using Hocon; using Akka.Configuration;
+using Akka.Configuration;
 using Akka.Serialization;
 using Akka.TestKit;
 using Akka.Util.Internal;

diff --git a/src/contrib/cluster/Akka.Cluster.Sharding.Tests/ClusterShardingSettingsSpec.cs b/src/contrib/cluster/Akka.Cluster.Sharding.Tests/ClusterShardingSettingsSpec.cs
@@ -7,7 +7,7 @@
 
 using System;
 using Akka.Cluster.Tools.Singleton;
-using Hocon; using Akka.Configuration;
+using Akka.Configuration;
 using Akka.TestKit;
 using Xunit;
 

diff --git a/src/contrib/cluster/Akka.Cluster.Sharding.Tests/CoordinatedShutdownShardingSpec.cs b/src/contrib/cluster/Akka.Cluster.Sharding.Tests/CoordinatedShutdownShardingSpec.cs
@@ -10,7 +10,7 @@
 using System.Threading.Tasks;
 using Akka.Actor;
 using Akka.Cluster.Tools.Singleton;
-using Hocon; using Akka.Configuration;
+using Akka.Configuration;
 using Akka.TestKit;
 using Akka.Util;
 using FluentAssertions;

diff --git a/src/contrib/cluster/Akka.Cluster.Sharding.Tests/DDataClusterShardingConfigSpec.cs b/src/contrib/cluster/Akka.Cluster.Sharding.Tests/DDataClusterShardingConfigSpec.cs
@@ -5,7 +5,7 @@
 // </copyright>
 //-----------------------------------------------------------------------
 
-using Hocon; using Akka.Configuration;
+using Akka.Configuration;
 using Akka.DistributedData;
 using Akka.DistributedData.Internal;
 using Akka.DistributedData.Serialization;

diff --git a/src/contrib/cluster/Akka.Cluster.Sharding.Tests/GetShardTypeNamesSpec.cs b/src/contrib/cluster/Akka.Cluster.Sharding.Tests/GetShardTypeNamesSpec.cs
@@ -7,7 +7,7 @@
 
 using System;
 using Akka.Cluster.Tools.Singleton;
-using Hocon; using Akka.Configuration;
+using Akka.Configuration;
 using Akka.TestKit.TestActors;
 using Akka.Util;
 using FluentAssertions;

diff --git a/src/contrib/cluster/Akka.Cluster.Sharding.Tests/InactiveEntityPassivationSpec.cs b/src/contrib/cluster/Akka.Cluster.Sharding.Tests/InactiveEntityPassivationSpec.cs
@@ -12,7 +12,7 @@
 using System.Threading.Tasks;
 using Akka.Actor;
 using Akka.Cluster.Tools.Singleton;
-using Hocon; using Akka.Configuration;
+using Akka.Configuration;
 using Akka.TestKit;
 using Akka.Util;
 using FluentAssertions;

diff --git a/src/contrib/cluster/Akka.Cluster.Sharding.Tests/PersistentShardSpec.cs b/src/contrib/cluster/Akka.Cluster.Sharding.Tests/PersistentShardSpec.cs
@@ -10,7 +10,7 @@
 using System.Threading.Tasks;
 using Akka.Actor;
 using Akka.Cluster.Tools.Singleton;
-using Hocon; using Akka.Configuration;
+using Akka.Configuration;
 using Akka.TestKit;
 using Akka.Util.Extensions;
 using FluentAssertions;

diff --git a/src/contrib/cluster/Akka.Cluster.Sharding.Tests/ProxyShardingSpec.cs b/src/contrib/cluster/Akka.Cluster.Sharding.Tests/ProxyShardingSpec.cs
@@ -8,7 +8,7 @@
 using System;
 using Akka.Actor;
 using Akka.Cluster.Tools.Singleton;
-using Hocon; using Akka.Configuration;
+using Akka.Configuration;
 using Akka.TestKit.TestActors;
 using Akka.Util;
 using FluentAssertions;

diff --git a/src/contrib/cluster/Akka.Cluster.Sharding.Tests/SupervisionSpec.cs b/src/contrib/cluster/Akka.Cluster.Sharding.Tests/SupervisionSpec.cs
@@ -8,7 +8,7 @@
 using System;
 using System.Globalization;
 using Akka.Actor;
-using Hocon; using Akka.Configuration;
+using Akka.Configuration;
 using Akka.Event;
 using Akka.Pattern;
 using Akka.Util;

diff --git a/src/contrib/cluster/Akka.Cluster.Sharding/ClusterSharding.cs b/src/contrib/cluster/Akka.Cluster.Sharding/ClusterSharding.cs
@@ -14,7 +14,7 @@
 using System.Threading.Tasks;
 using Akka.Actor;
 using Akka.Cluster.Tools.Singleton;
-using Hocon; using Akka.Configuration;
+using Akka.Configuration;
 using Akka.Dispatch;
 using Akka.Event;
 using Akka.Pattern;

diff --git a/src/contrib/cluster/Akka.Cluster.Sharding/ClusterShardingSettings.cs b/src/contrib/cluster/Akka.Cluster.Sharding/ClusterShardingSettings.cs
@@ -8,7 +8,7 @@
 using System;
 using Akka.Actor;
 using Akka.Cluster.Tools.Singleton;
-using Hocon; using Akka.Configuration;
+using Akka.Configuration;
 
 namespace Akka.Cluster.Sharding
 {

diff --git a/...rib/cluster/Akka.Cluster.Tools.Tests.MultiNode/ClusterClient/ClusterClientHandoverSpec.cs b/...rib/cluster/Akka.Cluster.Tools.Tests.MultiNode/ClusterClient/ClusterClientHandoverSpec.cs
@@ -15,7 +15,7 @@
 using Akka.Cluster.TestKit;
 using Akka.Cluster.Tools.Client;
 using Akka.Cluster.Tools.PublishSubscribe;
-using Hocon; using Akka.Configuration;
+using Akka.Configuration;
 using Akka.Remote.TestKit;
 using Akka.TestKit.TestActors;
 using FluentAssertions;

diff --git a/src/contrib/cluster/Akka.Cluster.Tools.Tests.MultiNode/ClusterClient/ClusterClientSpec.cs b/src/contrib/cluster/Akka.Cluster.Tools.Tests.MultiNode/ClusterClient/ClusterClientSpec.cs
@@ -16,7 +16,7 @@
 using Akka.Cluster.Tools.Client;
 using Akka.Cluster.Tools.PublishSubscribe;
 using Akka.Cluster.Tools.PublishSubscribe.Internal;
-using Hocon; using Akka.Configuration;
+using Akka.Configuration;
 using Akka.Remote.TestKit;
 using Akka.Remote.Transport;
 using Akka.Util.Internal;

diff --git a/.../cluster/Akka.Cluster.Tools.Tests.MultiNode/ClusterClient/ClusterClientStartSpecConfig.cs b/.../cluster/Akka.Cluster.Tools.Tests.MultiNode/ClusterClient/ClusterClientStartSpecConfig.cs
@@ -11,7 +11,7 @@
 using Akka.Cluster.TestKit;
 using Akka.Cluster.Tools.Client;
 using Akka.Cluster.Tools.PublishSubscribe;
-using Hocon; using Akka.Configuration;
+using Akka.Configuration;
 using Akka.Remote.TestKit;
 using FluentAssertions;
 

diff --git a/...contrib/cluster/Akka.Cluster.Tools.Tests.MultiNode/ClusterClient/ClusterClientStopSpec.cs b/...contrib/cluster/Akka.Cluster.Tools.Tests.MultiNode/ClusterClient/ClusterClientStopSpec.cs
@@ -12,7 +12,7 @@
 using Akka.Cluster.Tools.Client;
 using Akka.Cluster.Tools.PublishSubscribe;
 using Akka.Cluster.Tools.PublishSubscribe.Internal;
-using Hocon; using Akka.Configuration;
+using Akka.Configuration;
 using Akka.Remote.TestKit;
 using FluentAssertions;