Merge branch 'main' into develop

# Conflicts: # dynamic-mapping-service/src/main/java/dynamic/mapping/core/MappingComponent.java # dynamic-mapping-service/src/main/java/dynamic/mapping/processor/inbound/AsynchronousDispatcherInbound.java # dynamic-mapping-service/src/main/java/dynamic/mapping/processor/outbound/AsynchronousDispatcherOutbound.java # dynamic-mapping-ui/src/configuration/service-configuration.component.html # dynamic-mapping-ui/src/mapping/mapping-type/mapping-type.component.html # dynamic-mapping-ui/src/mapping/mapping.module.ts # dynamic-mapping-ui/src/mapping/step-topic/mapping-properties.component.ts # dynamic-mapping-ui/src/shared/navigation.factory.ts
Cumulocity-IoT · Sep 5, 2024 · ae7aa9a · ae7aa9a
2 parents 9de20c6 + b811e05
commit ae7aa9a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/...ervice/src/main/java/dynamic/mapping/processor/inbound/AsynchronousDispatcherInbound.java b/...ervice/src/main/java/dynamic/mapping/processor/inbound/AsynchronousDispatcherInbound.java
@@ -122,7 +122,7 @@ public MappingInboundTask(ConfigurationRegistry configurationRegistry, List<Mapp
 					.tag("tenant", connectorMessage.getTenant()).description("Total number of inbound messages")
 					.tag("connector", connectorMessage.getConnectorIdent()).register(Metrics.globalRegistry);
 
-		}
+        }
 
 		@Override
 		public List<ProcessingContext<?>> call() throws Exception {

diff --git a/dynamic-mapping-ui/src/mapping/mapping.module.ts b/dynamic-mapping-ui/src/mapping/mapping.module.ts
@@ -20,7 +20,7 @@
  */
 import { NgModule } from '@angular/core';
 import {
-	CommonModule,
+  CommonModule,
   CoreModule,
   DynamicFormsModule,
   hookRoute,