Fix parsing errors

src/main/java/de/monticore/lang/embeddedmontiarc/tagging/middleware/mqtt/MqttConnectionSymbolCreator.java

@@ -48,7 +48,8 @@ public class MqttConnectionSymbolCreator implements TagSymbolCreator {
      * at http://www.regexplanet.com/advanced/java/index.html
      */
 
-    public static final Pattern pattern = Pattern.compile("\\s*\\{\\s*topic\\s*=\\s*\\(\\s*([a-z|A-Z|~|/][0-9|a-z|A-Z|_|/]*)\\s*,\\s*([a-z|A-Z][0-9|a-z|A-Z|_|/]*)\\s*\\)\\s*(s*,\\s*msgField\\s*=\\s*([a-z|A-Z][a-z|A-Z|1-9|_|\\.|::|\\(|\\)]*)\\s*)?\\s*\\}\\s*");
+	// \s*\{\s*topic\s*=\s*([a-z|A-Z|~|/][0-9|a-z|A-Z|_|/]*)\s*(s*,\s*msgField\s*=\s*([a-z|A-Z][a-z|A-Z|1-9|_|\.|::|\(|\)]*)\s*)?\s*\}\s*
+    public static final Pattern pattern = Pattern.compile("\\s*\\{\\s*topic\\s*=\\s*([a-z|A-Z|~|/][0-9|a-z|A-Z|_|/]*)\\s*(s*,\\s*msgField\\s*=\\s*([a-z|A-Z][a-z|A-Z|1-9|_|\\.|::|\\(|\\)]*)\\s*)?\\s*\\}\\s*");
 
     public static Scope getGlobalScope(final Scope scope) {
         Scope s = scope;
@@ -124,7 +125,7 @@ public class MqttConnectionSymbolCreator implements TagSymbolCreator {
                     .forEachOrdered(m ->
                             taggedSymbols.stream()
                                     .forEachOrdered(s -> {
-                                    	MqttConnectionSymbol tmpSymbol = new MqttConnectionSymbol(m.group(1), m.group(4)); // topicName, msgField
+                                    	MqttConnectionSymbol tmpSymbol = new MqttConnectionSymbol(m.group(1), m.group(3)); // topicName, msgField
                                         tagging.addTag(s, tmpSymbol);
                                         if (s.isKindOf(EMAPortSymbol.KIND)) {
                                             EMAPortSymbol p = (EMAPortSymbol) s;

src/test/java/de/monticore/lang/embeddedmontiarc/middleware/mqtt/TaggingTest.java

@@ -54,7 +54,7 @@ public class TaggingTest extends AbstractTaggingResolverTest {
         MqttConnectionSymbol tag = (MqttConnectionSymbol) tags.iterator().next();
         assertEquals(tag.getTopicName().get(), "/clock");
         assertEquals(tag.getMsgField().get(), "clock.toSec()");
-
+        
         //mqttOut
         EMAPortSymbol mqttOut = component.getPortInstance("mqttOut").orElse(null);
         assertNotNull(mqttOut);
@@ -65,17 +65,18 @@ public class TaggingTest extends AbstractTaggingResolverTest {
         tag = (MqttConnectionSymbol) tags.iterator().next();
         assertEquals(tag.getTopicName().get(), "/echo");
         assertEquals(tag.getMsgField().get(), "data");
-
+        
         //emptyTagIn
         EMAPortSymbol emptyTagIn = component.getPortInstance("emptyTagIn").orElse(null);
         assertNotNull(emptyTagIn);
 
         tags = symtab.getTags(emptyTagIn, MqttConnectionSymbol.KIND);
         assertTrue(tags.size() == 1);
-
+        
         tag = (MqttConnectionSymbol) tags.iterator().next();
         assertEquals(tag.getTopicName(), Optional.empty());
         assertEquals(tag.getMsgField(), Optional.empty());
+        
     }
 
     @Test

src/test/resources/middleware/mqtt/BasicParsing.ema

+package middleware.mqtt;
+
+component BasicParsing{
+    port in Q mqttIn;
+    port in Q noMqttIn;
+    port in Q emptyTagIn;
+    port out Q mqttOut;
+    port out Q noMqttOut;
+}
\ No newline at end of file

src/test/resources/middleware/mqtt/BasicParsing.tag

+package middleware.mqtt;
+conforms to middleware.mqtt.MqttToEmamTagSchema;
+
+tags Echo {
+tag basicParsing.mqttIn with MqttConnection = {topic = /clock, msgField = clock.toSec()};
+tag basicParsing.mqttOut with MqttConnection = {topic = /echo, msgField = data};
+tag basicParsing.emptyTagIn with MqttConnection;
+}
\ No newline at end of file

src/test/resources/middleware/mqtt/OptionalMsgField.ema

+package middleware.mqtt;
+
+component OptionalMsgField{
+    port in Q in1;
+    port out Q out1;
+}
\ No newline at end of file

src/test/resources/middleware/mqtt/OptionalMsgField.tag

+package middleware.mqtt;
+conforms to middleware.mqtt.MqttToEmamTagSchema;
+
+tags OptionalMsgField{
+tag optionalMsgField.in1 with MqttConnection = {topic = name1};
+tag optionalMsgField.out1 with MqttConnection = {topic = name1, msgField = msgField1};
+}
\ No newline at end of file