refactor: adjust some namespaces in connector-csharp

camunda-community-hub · Feb 28, 2024 · 617d200 · 617d200
1 parent e5174e7
commit 617d200
Show file tree

Hide file tree

Showing 25 changed files with 125 additions and 86 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -7,6 +7,7 @@ on:
 
 jobs:
   build:
+    name: Build Java
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -26,3 +27,22 @@ jobs:
 
       - name: Run Maven
         run: mvn -B clean verify com.mycila:license-maven-plugin:check
+  build-net:
+    name: Build .NET
+    runs-on: ubuntu-latest
+    timeout-minutes: 5
+    steps:
+    - name: Pull Zeebe
+      run: docker pull ghcr.io/camunda-community-hub/zeebe-with-redis-exporter:latest
+    - name: Pull Redis
+      run: docker pull redis:7-alpine
+    - name: Checkout
+      uses: actions/checkout@v4
+    - name: Setup
+      uses: actions/[email protected]
+      with:
+        dotnet-version: 8.x
+    - name: Build
+      run: dotnet build --configuration Release
+    - name: Test
+      run: dotnet test --configuration Release --no-build    
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -11,6 +11,7 @@ on:
       - 'main'
     paths-ignore:
       - 'README.md'
+      - 'connector-csharp/**'
   release:
     types: [published]
 jobs:

diff --git a/connector-csharp/zeebe-redis-connector-test/HostedServiceTest.cs b/connector-csharp/zeebe-redis-connector-test/HostedServiceTest.cs
@@ -12,8 +12,8 @@
 using Io.Zeebe.Exporter.Proto;
 using Microsoft.Extensions.DependencyInjection;
 using Io.Zeebe.Redis.Connect.Csharp;
-using NLog.Extensions.Hosting;
 using Io.Zeebe.Redis.Connect.Csharp.Hosting;
+using NLog.Extensions.Hosting;
 
 using static PleaseWait.Dsl;
 using static PleaseWait.TimeUnit;

diff --git a/connector-csharp/zeebe-redis-connector/ZeebeRedis.cs b/connector-csharp/zeebe-redis-connector/ZeebeRedis.cs
@@ -1,4 +1,5 @@
 using Io.Zeebe.Exporter.Proto;
+using Io.Zeebe.Redis.Connect.Csharp.Consumer;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using StackExchange.Redis;
@@ -7,8 +8,6 @@
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using zeebe_redis_connector;
-using zeebe_redis_connector.consumer;
 
 namespace Io.Zeebe.Redis.Connect.Csharp
 {
@@ -17,7 +16,7 @@ public class ZeebeRedis
         private readonly ILogger? _logger;
         private CancellationTokenSource? _cancellationTokenSource = null;
         private readonly ConnectionMultiplexer _redisConnection;
-        private readonly String _consumerGroup;
+        private readonly string _consumerGroup;
         private readonly bool _deleteConsumerGroupOnDispose = false;
         private readonly IDatabase _database;
         private readonly List<StreamPosition> _streamPositions = new List<StreamPosition>();
@@ -31,7 +30,7 @@ public class ZeebeRedis
         // Constructors
         //---------------------------------------------------------------------
 
-        public ZeebeRedis(ConnectionMultiplexer redisConnection, String? consumerGroup = null, ILoggerFactory? loggerFactory = null, int pollIntervalMillis = 500, bool closeRedisConnectionOnDispose = false)
+        public ZeebeRedis(ConnectionMultiplexer redisConnection, string? consumerGroup = null, ILoggerFactory? loggerFactory = null, int pollIntervalMillis = 500, bool closeRedisConnectionOnDispose = false)
         {
             _redisConnection = redisConnection ?? throw new ArgumentNullException(nameof(redisConnection));
             _consumerGroup = consumerGroup ?? Guid.NewGuid().ToString();
@@ -247,8 +246,10 @@ public async Task StartConsumeEvents(CancellationTokenSource? cancellationTokenS
                                 id = entry.Id;
                                 var record = Record.Parser.ParseFrom(entry.Values.First().Value);
 
+#pragma warning disable CS8600, CS8602
                                 _consumer.TryGetValue(result.Key, out IRecordConsumer consumer);
                                 consumer.Consume(record);
+#pragma warning restore CS8600, CS8602
                                 if (!string.IsNullOrEmpty(id))
                                 {
                                     _database.StreamAcknowledge(result.Key, _consumerGroup, id);

diff --git a/connector-csharp/zeebe-redis-connector/ZeebeRedisOptions.cs b/connector-csharp/zeebe-redis-connector/ZeebeRedisOptions.cs
@@ -14,12 +14,14 @@ public class ZeebeRedisOptions
         private string _redisConfigString = "localhost";
         public virtual string RedisConfigString
         {
+#pragma warning disable CS8603 // Possible null reference return.
             get { return GetEnvironmentVariable("REDIS_CONFIG_STRING", _redisConfigString); }
+#pragma warning restore CS8603 // Possible null reference return.
             set { _redisConfigString = value; }
         }
 
-        private string _redisConsumerGroup = Guid.NewGuid().ToString();
-        public virtual string RedisConsumerGroup
+        private string? _redisConsumerGroup = null;
+        public virtual string? RedisConsumerGroup
         {
             get { return GetEnvironmentVariable("REDIS_CONSUMER_GROUP", _redisConsumerGroup); }
             set { _redisConsumerGroup = value; }
@@ -39,7 +41,7 @@ public bool Validate()
             return true;
         }
 
-        public static string GetEnvironmentVariable(string name, string defaultValue)
+        public static string? GetEnvironmentVariable(string name, string? defaultValue)
             => Environment.GetEnvironmentVariable(name) is string v && v.Length > 0 ? v : defaultValue;
 
         public static int GetEnvironmentVariable(string name, int defaultValue)

diff --git a/connector-csharp/zeebe-redis-connector/consumer/DeploymentDistributionRecordConsumer.cs b/connector-csharp/zeebe-redis-connector/consumer/DeploymentDistributionRecordConsumer.cs
@@ -1,16 +1,17 @@
 using Io.Zeebe.Exporter.Proto;
 using System;
 
-namespace zeebe_redis_connector.consumer
+namespace Io.Zeebe.Redis.Connect.Csharp.Consumer
 {
     public class DeploymentDistributionRecordConsumer : IRecordConsumer
     {
-        public static String STREAM = "zeebe:DEPLOYMENT_DISTRIBUTION";
+        public static string STREAM = "zeebe:DEPLOYMENT_DISTRIBUTION";
 
         private readonly Action<DeploymentDistributionRecord> _consumer;
 
-        public DeploymentDistributionRecordConsumer(Action<DeploymentDistributionRecord> action) {
-            this._consumer = action;
+        public DeploymentDistributionRecordConsumer(Action<DeploymentDistributionRecord> action)
+        {
+            _consumer = action;
         }
 
         public void Consume(Record record)

diff --git a/connector-csharp/zeebe-redis-connector/consumer/DeploymentRecordConsumer.cs b/connector-csharp/zeebe-redis-connector/consumer/DeploymentRecordConsumer.cs
@@ -1,16 +1,17 @@
 using Io.Zeebe.Exporter.Proto;
 using System;
 
-namespace zeebe_redis_connector.consumer
+namespace Io.Zeebe.Redis.Connect.Csharp.Consumer
 {
     public class DeploymentRecordConsumer : IRecordConsumer
     {
-        public static String STREAM = "zeebe:DEPLOYMENT";
+        public static string STREAM = "zeebe:DEPLOYMENT";
 
         private readonly Action<DeploymentRecord> _consumer;
 
-        public DeploymentRecordConsumer(Action<DeploymentRecord> action) {
-            this._consumer = action;
+        public DeploymentRecordConsumer(Action<DeploymentRecord> action)
+        {
+            _consumer = action;
         }
 
         public void Consume(Record record)

diff --git a/connector-csharp/zeebe-redis-connector/consumer/ErrorRecordConsumer.cs b/connector-csharp/zeebe-redis-connector/consumer/ErrorRecordConsumer.cs
@@ -1,16 +1,17 @@
 using Io.Zeebe.Exporter.Proto;
 using System;
 
-namespace zeebe_redis_connector.consumer
+namespace Io.Zeebe.Redis.Connect.Csharp.Consumer
 {
     public class ErrorRecordConsumer : IRecordConsumer
     {
-        public static String STREAM = "zeebe:ERROR";
+        public static string STREAM = "zeebe:ERROR";
 
         private readonly Action<ErrorRecord> _consumer;
 
-        public ErrorRecordConsumer(Action<ErrorRecord> action) {
-            this._consumer = action;
+        public ErrorRecordConsumer(Action<ErrorRecord> action)
+        {
+            _consumer = action;
         }
 
         public void Consume(Record record)

diff --git a/connector-csharp/zeebe-redis-connector/consumer/IRecordConsumer.cs b/connector-csharp/zeebe-redis-connector/consumer/IRecordConsumer.cs
@@ -1,6 +1,6 @@
 using Io.Zeebe.Exporter.Proto;
 
-namespace zeebe_redis_connector.consumer
+namespace Io.Zeebe.Redis.Connect.Csharp.Consumer
 {
     public interface IRecordConsumer
     {

diff --git a/connector-csharp/zeebe-redis-connector/consumer/IncidentRecordConsumer.cs b/connector-csharp/zeebe-redis-connector/consumer/IncidentRecordConsumer.cs
@@ -1,16 +1,17 @@
 using Io.Zeebe.Exporter.Proto;
 using System;
 
-namespace zeebe_redis_connector.consumer
+namespace Io.Zeebe.Redis.Connect.Csharp.Consumer
 {
     public class IncidentRecordConsumer : IRecordConsumer
     {
-        public static String STREAM = "zeebe:INCIDENT";
+        public static string STREAM = "zeebe:INCIDENT";
 
         private readonly Action<IncidentRecord> _consumer;
 
-        public IncidentRecordConsumer(Action<IncidentRecord> action) {
-            this._consumer = action;
+        public IncidentRecordConsumer(Action<IncidentRecord> action)
+        {
+            _consumer = action;
         }
 
         public void Consume(Record record)

diff --git a/connector-csharp/zeebe-redis-connector/consumer/JobBatchRecordConsumer.cs b/connector-csharp/zeebe-redis-connector/consumer/JobBatchRecordConsumer.cs
@@ -1,16 +1,17 @@
 using Io.Zeebe.Exporter.Proto;
 using System;
 
-namespace zeebe_redis_connector.consumer
+namespace Io.Zeebe.Redis.Connect.Csharp.Consumer
 {
     public class JobBatchRecordConsumer : IRecordConsumer
     {
-        public static String STREAM = "zeebe:JOB_BATCH";
+        public static string STREAM = "zeebe:JOB_BATCH";
 
         private readonly Action<JobBatchRecord> _consumer;
 
-        public JobBatchRecordConsumer(Action<JobBatchRecord> action) {
-            this._consumer = action;
+        public JobBatchRecordConsumer(Action<JobBatchRecord> action)
+        {
+            _consumer = action;
         }
 
         public void Consume(Record record)

diff --git a/connector-csharp/zeebe-redis-connector/consumer/JobRecordConsumer.cs b/connector-csharp/zeebe-redis-connector/consumer/JobRecordConsumer.cs
@@ -1,16 +1,17 @@
 using Io.Zeebe.Exporter.Proto;
 using System;
 
-namespace zeebe_redis_connector.consumer
+namespace Io.Zeebe.Redis.Connect.Csharp.Consumer
 {
     public class JobRecordConsumer : IRecordConsumer
     {
-        public static String STREAM = "zeebe:JOB";
+        public static string STREAM = "zeebe:JOB";
 
         private readonly Action<JobRecord> _consumer;
 
-        public JobRecordConsumer(Action<JobRecord> action) {
-            this._consumer = action;
+        public JobRecordConsumer(Action<JobRecord> action)
+        {
+            _consumer = action;
         }
 
         public void Consume(Record record)

diff --git a/connector-csharp/zeebe-redis-connector/consumer/MessageRecordConsumer.cs b/connector-csharp/zeebe-redis-connector/consumer/MessageRecordConsumer.cs
@@ -1,16 +1,17 @@
 using Io.Zeebe.Exporter.Proto;
 using System;
 
-namespace zeebe_redis_connector.consumer
+namespace Io.Zeebe.Redis.Connect.Csharp.Consumer
 {
     public class MessageRecordConsumer : IRecordConsumer
     {
-        public static String STREAM = "zeebe:MESSAGE";
+        public static string STREAM = "zeebe:MESSAGE";
 
         private readonly Action<MessageRecord> _consumer;
 
-        public MessageRecordConsumer(Action<MessageRecord> action) {
-            this._consumer = action;
+        public MessageRecordConsumer(Action<MessageRecord> action)
+        {
+            _consumer = action;
         }
 
         public void Consume(Record record)

diff --git a/...ctor-csharp/zeebe-redis-connector/consumer/MessageStartEventSubscriptionRecordConsumer.cs b/...ctor-csharp/zeebe-redis-connector/consumer/MessageStartEventSubscriptionRecordConsumer.cs
@@ -1,16 +1,17 @@
 using Io.Zeebe.Exporter.Proto;
 using System;
 
-namespace zeebe_redis_connector.consumer
+namespace Io.Zeebe.Redis.Connect.Csharp.Consumer
 {
     public class MessageStartEventSubscriptionRecordConsumer : IRecordConsumer
     {
-        public static String STREAM = "zeebe:MESSAGE_START_EVENT_SUBSCRIPTION";
+        public static string STREAM = "zeebe:MESSAGE_START_EVENT_SUBSCRIPTION";
 
         private readonly Action<MessageStartEventSubscriptionRecord> _consumer;
 
-        public MessageStartEventSubscriptionRecordConsumer(Action<MessageStartEventSubscriptionRecord> action) {
-            this._consumer = action;
+        public MessageStartEventSubscriptionRecordConsumer(Action<MessageStartEventSubscriptionRecord> action)
+        {
+            _consumer = action;
         }
 
         public void Consume(Record record)

diff --git a/connector-csharp/zeebe-redis-connector/consumer/MessageSubscriptionRecordConsumer.cs b/connector-csharp/zeebe-redis-connector/consumer/MessageSubscriptionRecordConsumer.cs
@@ -1,16 +1,17 @@
 using Io.Zeebe.Exporter.Proto;
 using System;
 
-namespace zeebe_redis_connector.consumer
+namespace Io.Zeebe.Redis.Connect.Csharp.Consumer
 {
     public class MessageSubscriptionRecordConsumer : IRecordConsumer
     {
-        public static String STREAM = "zeebe:MESSAGE_SUBSCRIPTION";
+        public static string STREAM = "zeebe:MESSAGE_SUBSCRIPTION";
 
         private readonly Action<MessageSubscriptionRecord> _consumer;
 
-        public MessageSubscriptionRecordConsumer(Action<MessageSubscriptionRecord> action) {
-            this._consumer = action;
+        public MessageSubscriptionRecordConsumer(Action<MessageSubscriptionRecord> action)
+        {
+            _consumer = action;
         }
 
         public void Consume(Record record)

diff --git a/connector-csharp/zeebe-redis-connector/consumer/ProcessEventRecordConsumer.cs b/connector-csharp/zeebe-redis-connector/consumer/ProcessEventRecordConsumer.cs
@@ -1,16 +1,17 @@
 using Io.Zeebe.Exporter.Proto;
 using System;
 
-namespace zeebe_redis_connector.consumer
+namespace Io.Zeebe.Redis.Connect.Csharp.Consumer
 {
     public class ProcessEventRecordConsumer : IRecordConsumer
     {
-        public static String STREAM = "zeebe:PROCESS_EVENT";
+        public static string STREAM = "zeebe:PROCESS_EVENT";
 
         private readonly Action<ProcessEventRecord> _consumer;
 
-        public ProcessEventRecordConsumer(Action<ProcessEventRecord> action) {
-            this._consumer = action;
+        public ProcessEventRecordConsumer(Action<ProcessEventRecord> action)
+        {
+            _consumer = action;
         }
 
         public void Consume(Record record)

diff --git a/connector-csharp/zeebe-redis-connector/consumer/ProcessInstanceCreationRecordConsumer.cs b/connector-csharp/zeebe-redis-connector/consumer/ProcessInstanceCreationRecordConsumer.cs
@@ -1,16 +1,17 @@
 using Io.Zeebe.Exporter.Proto;
 using System;
 
-namespace zeebe_redis_connector.consumer
+namespace Io.Zeebe.Redis.Connect.Csharp.Consumer
 {
     public class ProcessInstanceCreationRecordConsumer : IRecordConsumer
     {
-        public static String STREAM = "zeebe:PROCESS_INSTANCE_CREATION";
+        public static string STREAM = "zeebe:PROCESS_INSTANCE_CREATION";
 
         private readonly Action<ProcessInstanceCreationRecord> _consumer;
 
-        public ProcessInstanceCreationRecordConsumer(Action<ProcessInstanceCreationRecord> action) {
-            this._consumer = action;
+        public ProcessInstanceCreationRecordConsumer(Action<ProcessInstanceCreationRecord> action)
+        {
+            _consumer = action;
         }
 
         public void Consume(Record record)

diff --git a/connector-csharp/zeebe-redis-connector/consumer/ProcessInstanceRecordConsumer.cs b/connector-csharp/zeebe-redis-connector/consumer/ProcessInstanceRecordConsumer.cs
@@ -1,16 +1,17 @@
 using Io.Zeebe.Exporter.Proto;
 using System;
 
-namespace zeebe_redis_connector.consumer
+namespace Io.Zeebe.Redis.Connect.Csharp.Consumer
 {
     public class ProcessInstanceRecordConsumer : IRecordConsumer
     {
-        public static String STREAM = "zeebe:PROCESS_INSTANCE";
+        public static string STREAM = "zeebe:PROCESS_INSTANCE";
 
         private readonly Action<ProcessInstanceRecord> _consumer;
 
-        public ProcessInstanceRecordConsumer(Action<ProcessInstanceRecord> action) {
-            this._consumer = action;
+        public ProcessInstanceRecordConsumer(Action<ProcessInstanceRecord> action)
+        {
+            _consumer = action;
         }
 
         public void Consume(Record record)