fixing bugs

mqtt-mapping-service/src/main/java/mqtt/mapping/model/MappingRepresentation.java

@@ -29,6 +29,8 @@
 import java.util.function.BiFunction;
 import java.util.regex.Pattern;
 
+import javax.validation.constraints.NotNull;
+
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.json.JSONTokener;
@@ -151,14 +153,49 @@ static public List<ValidationError> isTemplateTopicUnique(List<Mapping> mappings
   static public List<ValidationError> isMappingValid(List<Mapping> mappings, Mapping mapping) {
     ArrayList<ValidationError> result = new ArrayList<ValidationError>();
     result.addAll(isSubstituionValid(mapping));
-    result.addAll(isSubscriptionTopicValid(mapping.subscriptionTopic));
     result.addAll(isTemplateTopicValid(mapping.templateTopic));
-    result.addAll(isTemplateTopicTemplateAndTopicSampleValid(mapping.templateTopic, mapping.templateTopicSample));
+    if (mapping.direction.equals(Direction.INBOUND)) {
+      result.addAll(isSubscriptionTopicValid(mapping.subscriptionTopic));
+      result.addAll(isTemplateTopicTemplateAndTopicSampleValid(mapping.templateTopic, mapping.templateTopicSample));
+    } else {
+      // test if we can attach multiple outbound mappings to the same filterOutbound
+      // result.addAll(isFilterOutboundUnique(mappings,mapping));
+      result.addAll(isPublishTopicTemplateAndTopicSampleValid(mapping.publishTopic, mapping.templateTopicSample));
+    }
+
     result.addAll(areJSONTemplatesValid(mapping));
     // result.addAll(isTemplateTopicUnique(mappings, mapping));
     return result;
   }
 
+  private static Collection<? extends ValidationError> isPublishTopicTemplateAndTopicSampleValid(
+      @NotNull String publishTopic, @NotNull String templateTopicSample) {
+    ArrayList<ValidationError> result = new ArrayList<ValidationError>();
+    String[] splitPT = Mapping.splitTopicIncludingSeparatorAsArray(publishTopic);
+    String[] splitTTS = Mapping.splitTopicIncludingSeparatorAsArray(templateTopicSample);
+    if (splitPT.length != splitTTS.length) {
+      result.add(ValidationError.PublishTopic_And_TemplateTopicSample_Do_Not_Have_Same_Number_Of_Levels_In_Topic_Name);
+    } else {
+      for (int i = 0; i < splitPT.length; i++) {
+        if (("/").equals(splitPT[i]) && !("/").equals(splitTTS[i])) {
+          result.add(ValidationError.PublishTopic_And_TemplateTopicSample_Do_Not_Have_Same_Structure_In_Topic_Name);
+          break;
+        }
+        if (("/").equals(splitTTS[i]) && !("/").equals(splitPT[i])) {
+          result.add(ValidationError.PublishTopic_And_TemplateTopicSample_Do_Not_Have_Same_Structure_In_Topic_Name);
+          break;
+        }
+        if (!("/").equals(splitPT[i]) && !("+").equals(splitPT[i]) && !("#").equals(splitPT[i])) {
+          if (!splitPT[i].equals(splitTTS[i])) {
+            result.add(ValidationError.PublishTopic_And_TemplateTopicSample_Do_Not_Have_Same_Structure_In_Topic_Name);
+            break;
+          }
+        }
+      }
+    }
+    return result;
+  }
+
   /*
    * test if mapping.templateTopic and mapping.templateTopicSample have the same
    * structure and same number of levels

mqtt-mapping-service/src/main/java/mqtt/mapping/model/ValidationError.java

@@ -36,4 +36,7 @@ public enum ValidationError {
   Device_Identifier_Must_Be_Selected, 
   TemplateTopic_And_TemplateTopicSample_Do_Not_Have_Same_Number_Of_Levels_In_Topic_Name,
   TemplateTopic_And_TemplateTopicSample_Do_Not_Have_Same_Structure_In_Topic_Name,
+  PublishTopic_And_TemplateTopicSample_Do_Not_Have_Same_Number_Of_Levels_In_Topic_Name,
+  PublishTopic_And_TemplateTopicSample_Do_Not_Have_Same_Structure_In_Topic_Name,
+  FilterOutbound_Must_Be_Unique
 }

mqtt-mapping-ui/mqtt-mapping/package.json

@@ -1,14 +1,14 @@
 {
   "name": "mqtt-mapping",
-  "version": "3.3.5",
+  "version": "3.3.6",
   "description": "Cumulocity plugin to map custom JSON payloads to C8Y payloads.The lugin support both directions: inbound/outbound.",
   "repository": {
     "type": "git",
     "url": "[email protected]:SoftwareAG/cumulocity-dynamic-mqtt-mapper.git"
   },
   "scripts": {
     "start": "c8ycli server",
-    "start:admin": "npm start -- --shell administration",
+    "start:admin": "npm start -- --shell administration -u https://ck2.eu-latest.cumulocity.com",
     "build": "c8ycli build",
     "deploy": "c8ycli deploy",
     "postinstall": "ngcc"

pom.xml

@@ -36,7 +36,7 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <revision>3.3.5-SNAPSHOT</revision>
+        <revision>3.3.6-SNAPSHOT</revision>
         <c8y.version>1016.0.214</c8y.version>
         <lombok.version>1.18.24</lombok.version>
         <maven.compiler.source>11</maven.compiler.source>