Skip to content

Commit bb4e7d9

Browse files
Reintroduce old HOCON, lay groundwork for gradual introduction of HOCON 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
1 parent 8850f8d commit bb4e7d9

File tree

437 files changed

+4498
-989
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

437 files changed

+4498
-989
lines changed

docs/articles/hocon/index.md

Lines changed: 3 additions & 0 deletions

src/benchmark/Akka.Benchmarks/Hocon/HoconBenchmarks.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
using System;
99
using System.Collections.Generic;
1010
using Akka.Benchmarks.Configurations;
11-
using Hocon; using Akka.Configuration;
11+
using Akka.Configuration;
1212
using BenchmarkDotNet.Attributes;
1313

1414
namespace Akka.Benchmarks.Hocon

src/benchmark/PersistenceBenchmark/Program.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
using System.Linq;
1111
using System.Threading.Tasks;
1212
using Akka.Actor;
13-
using Hocon; using Akka.Configuration;
13+
using Akka.Configuration;
1414
using Akka.Pattern;
1515
using ConfigurationFactory = Akka.Configuration.ConfigurationFactory;
1616

src/benchmark/PingPong/Program.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
using System.Threading;
1515
using System.Threading.Tasks;
1616
using Akka.Actor;
17-
using Hocon; using Akka.Configuration;
17+
using Akka.Configuration;
1818
using Akka.Util.Internal;
1919

2020
namespace PingPong

src/benchmark/RemotePingPong/Program.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
using System.Threading;
1515
using System.Threading.Tasks;
1616
using Akka.Actor;
17-
using Hocon; using Akka.Configuration;
17+
using Akka.Configuration;
1818
using Akka.Util.Internal;
1919

2020
namespace RemotePingPong

src/benchmark/SpawnBenchmark/Program.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
//-----------------------------------------------------------------------
77

88
using Akka.Actor;
9-
using Hocon; using Akka.Configuration;
9+
using Akka.Configuration;
1010
using System;
1111
using System.Runtime;
1212

src/contrib/cluster/Akka.Cluster.Metrics.Tests.MultiNode/ClusterMetricsExtensionSpec.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
using Akka.Configuration;
1515
using Akka.Remote.TestKit;
1616
using FluentAssertions;
17-
using Hocon; using Akka.Configuration;
17+
using Akka.Configuration;
1818
using ConfigurationFactory = Akka.Configuration.ConfigurationFactory;
1919

2020
namespace Akka.Cluster.Metrics.Tests.MultiNode

src/contrib/cluster/Akka.Cluster.Metrics.Tests.MultiNode/ClustetMetricsRoutingSpec.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
using Akka.Remote.TestKit;
2222
using Akka.Routing;
2323
using FluentAssertions;
24-
using Hocon; using Akka.Configuration;
24+
using Akka.Configuration;
2525
using Address = Akka.Actor.Address;
2626
using ConfigurationFactory = Akka.Configuration.ConfigurationFactory;
2727

src/contrib/cluster/Akka.Cluster.Metrics.Tests.MultiNode/Sample/StatsSampleSpec.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
using Akka.Configuration;
1414
using Akka.Remote.TestKit;
1515
using FluentAssertions;
16-
using Hocon; using Akka.Configuration;
16+
using Akka.Configuration;
1717
using ConfigurationFactory = Akka.Configuration.ConfigurationFactory;
1818

1919
namespace Akka.Cluster.Metrics.Tests.MultiNode

src/contrib/cluster/Akka.Cluster.Metrics.Tests/ClusterMetricsSettingsSpec.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
using Xunit;
1616
using FluentAssertions;
1717
using FsCheck;
18-
using Hocon; using Akka.Configuration;
18+
using Akka.Configuration;
1919
using ConfigurationFactory = Akka.Configuration.ConfigurationFactory;
2020

2121
namespace Akka.Cluster.Metrics.Tests

src/contrib/cluster/Akka.Cluster.Metrics.Tests/WeightedRouteesSpec.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
using Akka.TestKit;
1717
using Akka.Util.Internal;
1818
using FluentAssertions;
19-
using Hocon; using Akka.Configuration;
19+
using Akka.Configuration;
2020
using Xunit;
2121
using ConfigurationFactory = Akka.Configuration.ConfigurationFactory;
2222

src/contrib/cluster/Akka.Cluster.Metrics/ClusterMetrics.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
using Akka.Cluster.Metrics.Events;
1313
using Akka.Cluster.Metrics.Helpers;
1414
using Akka.Cluster.Metrics.Serialization;
15+
using Akka.Configuration;
1516
using Akka.Util;
16-
using Hocon;
1717
using ConfigurationFactory = Akka.Configuration.ConfigurationFactory;
1818

1919
namespace Akka.Cluster.Metrics

src/contrib/cluster/Akka.Cluster.Metrics/ClusterMetricsStrategy.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
using System;
99
using Akka.Actor;
1010
using Akka.Configuration;
11-
using Hocon; using Akka.Configuration;
11+
using Akka.Configuration;
1212

1313
namespace Akka.Cluster.Metrics
1414
{

src/contrib/cluster/Akka.Cluster.Metrics/Configuration/ClusterMetricsSettings.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
//-----------------------------------------------------------------------
77

88
using System;
9-
using Hocon; using Akka.Configuration;
9+
using Akka.Configuration;
1010

1111
namespace Akka.Cluster.Metrics.Configuration
1212
{

src/contrib/cluster/Akka.Cluster.Metrics/MetricsCollectorBuilder.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
using Akka.Cluster.Metrics.Helpers;
1313
using Akka.Event;
1414
using Akka.Util;
15-
using Hocon; using Akka.Configuration;
15+
using Akka.Configuration;
1616

1717
namespace Akka.Cluster.Metrics
1818
{

src/contrib/cluster/Akka.Cluster.Metrics/Routing/ClusterMetricsRouting.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
using Akka.Routing;
1919
using Akka.Util;
2020
using Akka.Util.Extensions;
21-
using Hocon; using Akka.Configuration;
21+
using Akka.Configuration;
2222

2323
namespace Akka.Cluster.Metrics
2424
{

src/contrib/cluster/Akka.Cluster.Metrics/Routing/MetricSelectors.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
using Akka.Cluster.Metrics.Serialization;
1313
using Akka.Configuration;
1414
using Akka.Util;
15-
using Hocon; using Akka.Configuration;
15+
using Akka.Configuration;
1616

1717
namespace Akka.Cluster.Metrics
1818
{

src/contrib/cluster/Akka.Cluster.Sharding.Tests.MultiNode/ClusterShardingCustomShardAllocationSpec.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
using System;
99
using Akka.Actor;
1010
using Akka.Cluster.TestKit;
11-
using Hocon; using Akka.Configuration;
11+
using Akka.Configuration;
1212
using Akka.Remote.TestKit;
1313
using System.Collections.Immutable;
1414
using System.Threading.Tasks;

src/contrib/cluster/Akka.Cluster.Sharding.Tests.MultiNode/ClusterShardingFailureSpec.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
using System.Linq;
1212
using Akka.Actor;
1313
using Akka.Cluster.TestKit;
14-
using Hocon; using Akka.Configuration;
14+
using Akka.Configuration;
1515
using Akka.Remote.TestKit;
1616
using Akka.Remote.Transport;
1717
using Akka.Util;

src/contrib/cluster/Akka.Cluster.Sharding.Tests.MultiNode/ClusterShardingGetStateSpec.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
using System.Linq;
1010
using Akka.Actor;
1111
using Akka.Cluster.TestKit;
12-
using Hocon; using Akka.Configuration;
12+
using Akka.Configuration;
1313
using Akka.Remote.TestKit;
1414
using System.Collections.Immutable;
1515
using Akka.Util;

src/contrib/cluster/Akka.Cluster.Sharding.Tests.MultiNode/ClusterShardingGetStatsSpec.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
using System.Linq;
1010
using Akka.Actor;
1111
using Akka.Cluster.TestKit;
12-
using Hocon; using Akka.Configuration;
12+
using Akka.Configuration;
1313
using Akka.Remote.TestKit;
1414
using Akka.Util;
1515
using FluentAssertions;

src/contrib/cluster/Akka.Cluster.Sharding.Tests.MultiNode/ClusterShardingGracefulShutdownSpec.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
using System.Linq;
1111
using Akka.Actor;
1212
using Akka.Cluster.TestKit;
13-
using Hocon; using Akka.Configuration;
13+
using Akka.Configuration;
1414
using Akka.Remote.TestKit;
1515
using System.Collections.Immutable;
1616
using System.IO;

src/contrib/cluster/Akka.Cluster.Sharding.Tests.MultiNode/ClusterShardingLeavingSpec.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
using System.Linq;
1111
using Akka.Actor;
1212
using Akka.Cluster.TestKit;
13-
using Hocon; using Akka.Configuration;
13+
using Akka.Configuration;
1414
using Akka.Remote.TestKit;
1515
using System.Collections.Immutable;
1616
using System.IO;

src/contrib/cluster/Akka.Cluster.Sharding.Tests.MultiNode/ClusterShardingMinMembersSpec.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
using System.Linq;
1212
using Akka.Actor;
1313
using Akka.Cluster.TestKit;
14-
using Hocon; using Akka.Configuration;
14+
using Akka.Configuration;
1515
using Akka.Remote.TestKit;
1616
using Akka.Util;
1717
using FluentAssertions;

src/contrib/cluster/Akka.Cluster.Sharding.Tests.MultiNode/ClusterShardingRememberEntitiesNewExtractorSpec.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
using System.Linq;
1212
using Akka.Actor;
1313
using Akka.Cluster.TestKit;
14-
using Hocon; using Akka.Configuration;
14+
using Akka.Configuration;
1515
using Akka.Remote.TestKit;
1616
using Akka.Util;
1717
using FluentAssertions;

src/contrib/cluster/Akka.Cluster.Sharding.Tests.MultiNode/ClusterShardingRememberEntitiesSpec.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
using System.Threading;
1212
using Akka.Actor;
1313
using Akka.Cluster.TestKit;
14-
using Hocon; using Akka.Configuration;
14+
using Akka.Configuration;
1515
using Akka.Remote.TestKit;
1616
using Akka.Util;
1717
using FluentAssertions;

src/contrib/cluster/Akka.Cluster.Sharding.Tests.MultiNode/ClusterShardingSpec.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
using System.Collections.Generic;
1010
using System.IO;
1111
using System.Threading;
12-
using Hocon; using Akka.Configuration;
12+
using Akka.Configuration;
1313
using Akka.Persistence;
1414
using Akka.Remote.TestKit;
1515
using Akka.Actor;

src/contrib/cluster/Akka.Cluster.Sharding.Tests/ClusterShardingConfigSpec.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
//-----------------------------------------------------------------------
77

88
using System;
9-
using Hocon; using Akka.Configuration;
9+
using Akka.Configuration;
1010
using Xunit;
1111

1212
namespace Akka.Cluster.Sharding.Tests

src/contrib/cluster/Akka.Cluster.Sharding.Tests/ClusterShardingInternalsSpec.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
using System;
99
using Akka.Actor;
1010
using Akka.Cluster.Tools.Singleton;
11-
using Hocon; using Akka.Configuration;
11+
using Akka.Configuration;
1212
using Akka.Util;
1313
using FluentAssertions;
1414
using Xunit;

src/contrib/cluster/Akka.Cluster.Sharding.Tests/ClusterShardingMessageSerializerSpec.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
using Akka.Actor;
1111
using Akka.Cluster.Sharding.Serialization;
1212
using Akka.Cluster.Tools.Singleton;
13-
using Hocon; using Akka.Configuration;
13+
using Akka.Configuration;
1414
using Akka.Serialization;
1515
using Akka.TestKit;
1616
using Akka.Util.Internal;

src/contrib/cluster/Akka.Cluster.Sharding.Tests/ClusterShardingSettingsSpec.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
using System;
99
using Akka.Cluster.Tools.Singleton;
10-
using Hocon; using Akka.Configuration;
10+
using Akka.Configuration;
1111
using Akka.TestKit;
1212
using Xunit;
1313

src/contrib/cluster/Akka.Cluster.Sharding.Tests/CoordinatedShutdownShardingSpec.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
using System.Threading.Tasks;
1111
using Akka.Actor;
1212
using Akka.Cluster.Tools.Singleton;
13-
using Hocon; using Akka.Configuration;
13+
using Akka.Configuration;
1414
using Akka.TestKit;
1515
using Akka.Util;
1616
using FluentAssertions;

src/contrib/cluster/Akka.Cluster.Sharding.Tests/DDataClusterShardingConfigSpec.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
// </copyright>
66
//-----------------------------------------------------------------------
77

8-
using Hocon; using Akka.Configuration;
8+
using Akka.Configuration;
99
using Akka.DistributedData;
1010
using Akka.DistributedData.Internal;
1111
using Akka.DistributedData.Serialization;

src/contrib/cluster/Akka.Cluster.Sharding.Tests/GetShardTypeNamesSpec.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
using System;
99
using Akka.Cluster.Tools.Singleton;
10-
using Hocon; using Akka.Configuration;
10+
using Akka.Configuration;
1111
using Akka.TestKit.TestActors;
1212
using Akka.Util;
1313
using FluentAssertions;

src/contrib/cluster/Akka.Cluster.Sharding.Tests/InactiveEntityPassivationSpec.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
using System.Threading.Tasks;
1313
using Akka.Actor;
1414
using Akka.Cluster.Tools.Singleton;
15-
using Hocon; using Akka.Configuration;
15+
using Akka.Configuration;
1616
using Akka.TestKit;
1717
using Akka.Util;
1818
using FluentAssertions;

src/contrib/cluster/Akka.Cluster.Sharding.Tests/PersistentShardSpec.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
using System.Threading.Tasks;
1111
using Akka.Actor;
1212
using Akka.Cluster.Tools.Singleton;
13-
using Hocon; using Akka.Configuration;
13+
using Akka.Configuration;
1414
using Akka.TestKit;
1515
using Akka.Util.Extensions;
1616
using FluentAssertions;

src/contrib/cluster/Akka.Cluster.Sharding.Tests/ProxyShardingSpec.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
using System;
99
using Akka.Actor;
1010
using Akka.Cluster.Tools.Singleton;
11-
using Hocon; using Akka.Configuration;
11+
using Akka.Configuration;
1212
using Akka.TestKit.TestActors;
1313
using Akka.Util;
1414
using FluentAssertions;

src/contrib/cluster/Akka.Cluster.Sharding.Tests/SupervisionSpec.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
using System;
99
using System.Globalization;
1010
using Akka.Actor;
11-
using Hocon; using Akka.Configuration;
11+
using Akka.Configuration;
1212
using Akka.Event;
1313
using Akka.Pattern;
1414
using Akka.Util;

src/contrib/cluster/Akka.Cluster.Sharding/ClusterSharding.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
using System.Threading.Tasks;
1515
using Akka.Actor;
1616
using Akka.Cluster.Tools.Singleton;
17-
using Hocon; using Akka.Configuration;
17+
using Akka.Configuration;
1818
using Akka.Dispatch;
1919
using Akka.Event;
2020
using Akka.Pattern;

src/contrib/cluster/Akka.Cluster.Sharding/ClusterShardingSettings.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
using System;
99
using Akka.Actor;
1010
using Akka.Cluster.Tools.Singleton;
11-
using Hocon; using Akka.Configuration;
11+
using Akka.Configuration;
1212

1313
namespace Akka.Cluster.Sharding
1414
{

src/contrib/cluster/Akka.Cluster.Tools.Tests.MultiNode/ClusterClient/ClusterClientHandoverSpec.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
using Akka.Cluster.TestKit;
1616
using Akka.Cluster.Tools.Client;
1717
using Akka.Cluster.Tools.PublishSubscribe;
18-
using Hocon; using Akka.Configuration;
18+
using Akka.Configuration;
1919
using Akka.Remote.TestKit;
2020
using Akka.TestKit.TestActors;
2121
using FluentAssertions;

src/contrib/cluster/Akka.Cluster.Tools.Tests.MultiNode/ClusterClient/ClusterClientSpec.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
using Akka.Cluster.Tools.Client;
1717
using Akka.Cluster.Tools.PublishSubscribe;
1818
using Akka.Cluster.Tools.PublishSubscribe.Internal;
19-
using Hocon; using Akka.Configuration;
19+
using Akka.Configuration;
2020
using Akka.Remote.TestKit;
2121
using Akka.Remote.Transport;
2222
using Akka.Util.Internal;

src/contrib/cluster/Akka.Cluster.Tools.Tests.MultiNode/ClusterClient/ClusterClientStartSpecConfig.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
using Akka.Cluster.TestKit;
1212
using Akka.Cluster.Tools.Client;
1313
using Akka.Cluster.Tools.PublishSubscribe;
14-
using Hocon; using Akka.Configuration;
14+
using Akka.Configuration;
1515
using Akka.Remote.TestKit;
1616
using FluentAssertions;
1717

src/contrib/cluster/Akka.Cluster.Tools.Tests.MultiNode/ClusterClient/ClusterClientStopSpec.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
using Akka.Cluster.Tools.Client;
1313
using Akka.Cluster.Tools.PublishSubscribe;
1414
using Akka.Cluster.Tools.PublishSubscribe.Internal;
15-
using Hocon; using Akka.Configuration;
15+
using Akka.Configuration;
1616
using Akka.Remote.TestKit;
1717
using FluentAssertions;
1818

0 commit comments

Comments
 (0)