Merge branch 'master' into issue-940

Author: artem-v

pom.xml

@@ -9,7 +9,7 @@
   </parent>
 
   <artifactId>scalecube-services-parent</artifactId>
-  <version>2.13.11-SNAPSHOT</version>
+  <version>2.13.12-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>${project.artifactId}</name>
 

services-api/pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.scalecube</groupId>
     <artifactId>scalecube-services-parent</artifactId>
-    <version>2.13.11-SNAPSHOT</version>
+    <version>2.13.12-SNAPSHOT</version>
   </parent>
 
   <artifactId>scalecube-services-api</artifactId>

services-api/src/main/java/io/scalecube/services/MaskUtil.java

@@ -1,7 +1,9 @@
 package io.scalecube.services;
 
+import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.Set;
 import java.util.UUID;
 import java.util.stream.Collectors;
 
@@ -48,4 +50,33 @@ public static String mask(Map<String, String> map) {
         .collect(Collectors.toMap(Entry::getKey, entry -> mask(entry.getValue())))
         .toString();
   }
+
+  /**
+   * Mask sensitive data by replacing part of string with an asterisk symbol.
+   *
+   * @param map map sensitive data to be masked
+   * @param sensitiveKeys keys whose corresponding values should be masked
+   * @return string representation
+   */
+  public static String mask(Map<?, ?> map, Set<String> sensitiveKeys) {
+    if (map == null || map.isEmpty()) {
+      return String.valueOf(map);
+    }
+
+    return map.entrySet().stream()
+        .collect(
+            Collectors.toMap(
+                entry -> String.valueOf(entry.getKey()),
+                entry -> {
+                  final var key = String.valueOf(entry.getKey());
+                  final var value = String.valueOf(entry.getValue());
+                  if (entry.getKey() == null || entry.getValue() == null) {
+                    return value;
+                  }
+                  return sensitiveKeys.contains(key) ? MaskUtil.mask(value) : value;
+                },
+                (v1, v2) -> v1,
+                LinkedHashMap::new))
+        .toString();
+  }
 }

services-discovery/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.scalecube</groupId>
     <artifactId>scalecube-services-parent</artifactId>
-    <version>2.13.11-SNAPSHOT</version>
+    <version>2.13.12-SNAPSHOT</version>
   </parent>
 
   <artifactId>scalecube-services-discovery</artifactId>

services-examples/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.scalecube</groupId>
     <artifactId>scalecube-services-parent</artifactId>
-    <version>2.13.11-SNAPSHOT</version>
+    <version>2.13.12-SNAPSHOT</version>
   </parent>
 
   <artifactId>scalecube-services-examples</artifactId>

services-gateway/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.scalecube</groupId>
     <artifactId>scalecube-services-parent</artifactId>
-    <version>2.13.11-SNAPSHOT</version>
+    <version>2.13.12-SNAPSHOT</version>
   </parent>
 
   <artifactId>scalecube-services-gateway</artifactId>

services-security/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.scalecube</groupId>
     <artifactId>scalecube-services-parent</artifactId>
-    <version>2.13.11-SNAPSHOT</version>
+    <version>2.13.12-SNAPSHOT</version>
   </parent>
 
   <artifactId>scalecube-services-security</artifactId>

services-transport-parent/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.scalecube</groupId>
     <artifactId>scalecube-services-parent</artifactId>
-    <version>2.13.11-SNAPSHOT</version>
+    <version>2.13.12-SNAPSHOT</version>
   </parent>
 
   <artifactId>scalecube-services-transport-parent</artifactId>

services-transport-parent/services-transport-jackson/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.scalecube</groupId>
     <artifactId>scalecube-services-transport-parent</artifactId>
-    <version>2.13.11-SNAPSHOT</version>
+    <version>2.13.12-SNAPSHOT</version>
   </parent>
 
   <artifactId>scalecube-services-transport-jackson</artifactId>

services-transport-parent/services-transport-rsocket/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.scalecube</groupId>
     <artifactId>scalecube-services-transport-parent</artifactId>
-    <version>2.13.11-SNAPSHOT</version>
+    <version>2.13.12-SNAPSHOT</version>
   </parent>
 
   <artifactId>scalecube-services-transport-rsocket</artifactId>