Fix conflicts

@@ -23,8 +23,6 @@ public class MqttDeviceProfileTransportConfiguration implements DeviceProfileTra
 
     private String deviceTelemetryTopic = MqttTopics.DEVICE_TELEMETRY_TOPIC;
     private String deviceAttributesTopic = MqttTopics.DEVICE_ATTRIBUTES_TOPIC;
-    private String deviceRpcRequestTopic = MqttTopics.DEVICE_RPC_REQUESTS_TOPIC;
-    private String deviceRpcResponseTopic = MqttTopics.DEVICE_RPC_RESPONSE_TOPIC;
 
     @Override
     public DeviceTransportType getType() {

@@ -18,6 +18,7 @@ package org.thingsboard.server.common.data.security;
 public enum DeviceCredentialsType {
 
     ACCESS_TOKEN,
-    X509_CERTIFICATE
+    X509_CERTIFICATE,
+    MQTT_BASIC
 
 }

@@ -15,6 +15,8 @@
  */
 package org.thingsboard.server.common.msg.session;
 
+import org.thingsboard.server.common.data.DeviceProfile;
+
 import java.util.UUID;
 
 public interface SessionContext {
@@ -22,4 +24,6 @@ public interface SessionContext {
     UUID getSessionId();
 
     int nextMsgId();
+
+    void onProfileUpdate(DeviceProfile deviceProfile);
 }

@@ -99,9 +99,8 @@ public class MqttTransportHandler extends ChannelInboundHandlerAdapter implement
     private final SslHandler sslHandler;
     private final ConcurrentMap<MqttTopicMatcher, Integer> mqttQoSMap;
 
-    private volatile SessionInfoProto sessionInfo;
+    private final DeviceSessionCtx deviceSessionCtx;
     private volatile InetSocketAddress address;
-    private volatile DeviceSessionCtx deviceSessionCtx;
     private volatile GatewaySessionHandler gatewaySessionHandler;
 
     MqttTransportHandler(MqttTransportContext context, SslHandler sslHandler) {
@@ -152,7 +151,7 @@ public class MqttTransportHandler extends ChannelInboundHandlerAdapter implement
             case PINGREQ:
                 if (checkConnected(ctx, msg)) {
                     ctx.writeAndFlush(new MqttMessage(new MqttFixedHeader(PINGRESP, false, AT_MOST_ONCE, false, 0)));
-                    transportService.reportActivity(sessionInfo);
+                    transportService.reportActivity(deviceSessionCtx.getSessionInfo());
                 }
                 break;
             case DISCONNECT:
@@ -176,7 +175,7 @@ public class MqttTransportHandler extends ChannelInboundHandlerAdapter implement
         if (topicName.startsWith(MqttTopics.BASE_GATEWAY_API_TOPIC)) {
             if (gatewaySessionHandler != null) {
                 handleGatewayPublishMsg(topicName, msgId, mqttMsg);
-                transportService.reportActivity(sessionInfo);
+                transportService.reportActivity(deviceSessionCtx.getSessionInfo());
             }
         } else {
             processDevicePublish(ctx, mqttMsg, topicName, msgId);
@@ -215,26 +214,26 @@ public class MqttTransportHandler extends ChannelInboundHandlerAdapter implement
 
     private void processDevicePublish(ChannelHandlerContext ctx, MqttPublishMessage mqttMsg, String topicName, int msgId) {
         try {
-            if (topicName.equals(MqttTopics.DEVICE_TELEMETRY_TOPIC)) {
+            if (deviceSessionCtx.isDeviceTelemetryTopic(topicName)) {
                 TransportProtos.PostTelemetryMsg postTelemetryMsg = adaptor.convertToPostTelemetry(deviceSessionCtx, mqttMsg);
-                transportService.process(sessionInfo, postTelemetryMsg, getPubAckCallback(ctx, msgId, postTelemetryMsg));
-            } else if (topicName.equals(MqttTopics.DEVICE_ATTRIBUTES_TOPIC)) {
+                transportService.process(deviceSessionCtx.getSessionInfo(), postTelemetryMsg, getPubAckCallback(ctx, msgId, postTelemetryMsg));
+            } else if (deviceSessionCtx.isDeviceAttributesTopic(topicName)) {
                 TransportProtos.PostAttributeMsg postAttributeMsg = adaptor.convertToPostAttributes(deviceSessionCtx, mqttMsg);
-                transportService.process(sessionInfo, postAttributeMsg, getPubAckCallback(ctx, msgId, postAttributeMsg));
+                transportService.process(deviceSessionCtx.getSessionInfo(), postAttributeMsg, getPubAckCallback(ctx, msgId, postAttributeMsg));
             } else if (topicName.startsWith(MqttTopics.DEVICE_ATTRIBUTES_REQUEST_TOPIC_PREFIX)) {
                 TransportProtos.GetAttributeRequestMsg getAttributeMsg = adaptor.convertToGetAttributes(deviceSessionCtx, mqttMsg);
-                transportService.process(sessionInfo, getAttributeMsg, getPubAckCallback(ctx, msgId, getAttributeMsg));
+                transportService.process(deviceSessionCtx.getSessionInfo(), getAttributeMsg, getPubAckCallback(ctx, msgId, getAttributeMsg));
             } else if (topicName.startsWith(MqttTopics.DEVICE_RPC_RESPONSE_TOPIC)) {
                 TransportProtos.ToDeviceRpcResponseMsg rpcResponseMsg = adaptor.convertToDeviceRpcResponse(deviceSessionCtx, mqttMsg);
-                transportService.process(sessionInfo, rpcResponseMsg, getPubAckCallback(ctx, msgId, rpcResponseMsg));
+                transportService.process(deviceSessionCtx.getSessionInfo(), rpcResponseMsg, getPubAckCallback(ctx, msgId, rpcResponseMsg));
             } else if (topicName.startsWith(MqttTopics.DEVICE_RPC_REQUESTS_TOPIC)) {
                 TransportProtos.ToServerRpcRequestMsg rpcRequestMsg = adaptor.convertToServerRpcRequest(deviceSessionCtx, mqttMsg);
-                transportService.process(sessionInfo, rpcRequestMsg, getPubAckCallback(ctx, msgId, rpcRequestMsg));
+                transportService.process(deviceSessionCtx.getSessionInfo(), rpcRequestMsg, getPubAckCallback(ctx, msgId, rpcRequestMsg));
             } else if (topicName.equals(MqttTopics.DEVICE_CLAIM_TOPIC)) {
                 TransportProtos.ClaimDeviceMsg claimDeviceMsg = adaptor.convertToClaimDevice(deviceSessionCtx, mqttMsg);
-                transportService.process(sessionInfo, claimDeviceMsg, getPubAckCallback(ctx, msgId, claimDeviceMsg));
+                transportService.process(deviceSessionCtx.getSessionInfo(), claimDeviceMsg, getPubAckCallback(ctx, msgId, claimDeviceMsg));
             } else {
-                transportService.reportActivity(sessionInfo);
+                transportService.reportActivity(deviceSessionCtx.getSessionInfo());
             }
         } catch (AdaptorException e) {
             log.warn("[{}] Failed to process publish msg [{}][{}]", sessionId, topicName, msgId, e);
@@ -274,13 +273,13 @@ public class MqttTransportHandler extends ChannelInboundHandlerAdapter implement
             try {
                 switch (topic) {
                     case MqttTopics.DEVICE_ATTRIBUTES_TOPIC: {
-                        transportService.process(sessionInfo, TransportProtos.SubscribeToAttributeUpdatesMsg.newBuilder().build(), null);
+                        transportService.process(deviceSessionCtx.getSessionInfo(), TransportProtos.SubscribeToAttributeUpdatesMsg.newBuilder().build(), null);
                         registerSubQoS(topic, grantedQoSList, reqQoS);
                         activityReported = true;
                         break;
                     }
                     case MqttTopics.DEVICE_RPC_REQUESTS_SUB_TOPIC: {
-                        transportService.process(sessionInfo, TransportProtos.SubscribeToRPCMsg.newBuilder().build(), null);
+                        transportService.process(deviceSessionCtx.getSessionInfo(), TransportProtos.SubscribeToRPCMsg.newBuilder().build(), null);
                         registerSubQoS(topic, grantedQoSList, reqQoS);
                         activityReported = true;
                         break;
@@ -303,7 +302,7 @@ public class MqttTransportHandler extends ChannelInboundHandlerAdapter implement
             }
         }
         if (!activityReported) {
-            transportService.reportActivity(sessionInfo);
+            transportService.reportActivity(deviceSessionCtx.getSessionInfo());
         }
         ctx.writeAndFlush(createSubAckMessage(mqttMsg.variableHeader().messageId(), grantedQoSList));
     }
@@ -324,12 +323,14 @@ public class MqttTransportHandler extends ChannelInboundHandlerAdapter implement
             try {
                 switch (topicName) {
                     case MqttTopics.DEVICE_ATTRIBUTES_TOPIC: {
-                        transportService.process(sessionInfo, TransportProtos.SubscribeToAttributeUpdatesMsg.newBuilder().setUnsubscribe(true).build(), null);
+                        transportService.process(deviceSessionCtx.getSessionInfo(),
+                                TransportProtos.SubscribeToAttributeUpdatesMsg.newBuilder().setUnsubscribe(true).build(), null);
                         activityReported = true;
                         break;
                     }
                     case MqttTopics.DEVICE_RPC_REQUESTS_SUB_TOPIC: {
-                        transportService.process(sessionInfo, TransportProtos.SubscribeToRPCMsg.newBuilder().setUnsubscribe(true).build(), null);
+                        transportService.process(deviceSessionCtx.getSessionInfo(),
+                                TransportProtos.SubscribeToRPCMsg.newBuilder().setUnsubscribe(true).build(), null);
                         activityReported = true;
                         break;
                     }
@@ -339,7 +340,7 @@ public class MqttTransportHandler extends ChannelInboundHandlerAdapter implement
             }
         }
         if (!activityReported) {
-            transportService.reportActivity(sessionInfo);
+            transportService.reportActivity(deviceSessionCtx.getSessionInfo());
         }
         ctx.writeAndFlush(createUnSubAckMessage(mqttMsg.variableHeader().messageId()));
     }
@@ -499,8 +500,8 @@ public class MqttTransportHandler extends ChannelInboundHandlerAdapter implement
 
     private void doDisconnect() {
         if (deviceSessionCtx.isConnected()) {
-            transportService.process(sessionInfo, DefaultTransportService.getSessionEventMsg(SessionEvent.CLOSED), null);
-            transportService.deregisterSession(sessionInfo);
+            transportService.process(deviceSessionCtx.getSessionInfo(), DefaultTransportService.getSessionEventMsg(SessionEvent.CLOSED), null);
+            transportService.deregisterSession(deviceSessionCtx.getSessionInfo());
             if (gatewaySessionHandler != null) {
                 gatewaySessionHandler.onGatewayDisconnect();
             }
@@ -515,11 +516,11 @@ public class MqttTransportHandler extends ChannelInboundHandlerAdapter implement
         } else {
             deviceSessionCtx.setDeviceInfo(msg.getDeviceInfo());
             deviceSessionCtx.setDeviceProfile(msg.getDeviceProfile());
-            sessionInfo = SessionInfoCreator.create(msg, context, sessionId);
-            transportService.process(sessionInfo, DefaultTransportService.getSessionEventMsg(SessionEvent.OPEN), new TransportServiceCallback<Void>() {
+            deviceSessionCtx.setSessionInfo(SessionInfoCreator.create(msg, context, sessionId));
+            transportService.process(deviceSessionCtx.getSessionInfo(), DefaultTransportService.getSessionEventMsg(SessionEvent.OPEN), new TransportServiceCallback<Void>() {
                 @Override
                 public void onSuccess(Void msg) {
-                    transportService.registerAsyncSession(sessionInfo, MqttTransportHandler.this);
+                    transportService.registerAsyncSession(deviceSessionCtx.getSessionInfo(), MqttTransportHandler.this);
                     checkGatewaySession();
                     ctx.writeAndFlush(createMqttConnAckMsg(CONNECTION_ACCEPTED));
                     log.info("[{}] Client connected!", sessionId);
@@ -581,7 +582,6 @@ public class MqttTransportHandler extends ChannelInboundHandlerAdapter implement
 
     @Override
     public void onProfileUpdate(DeviceProfile deviceProfile) {
-        deviceSessionCtx.getDeviceInfo().setDeviceType(deviceProfile.getName());
-        sessionInfo = SessionInfoProto.newBuilder().mergeFrom(sessionInfo).setDeviceType(deviceProfile.getName()).build();
+        deviceSessionCtx.onProfileUpdate(deviceProfile);
     }
 }

@@ -18,6 +18,13 @@ package org.thingsboard.server.transport.mqtt.session;
 import io.netty.channel.ChannelHandlerContext;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
+import org.thingsboard.server.common.data.DeviceProfile;
+import org.thingsboard.server.common.data.DeviceTransportType;
+import org.thingsboard.server.common.data.device.profile.DeviceProfileTransportConfiguration;
+import org.thingsboard.server.common.data.device.profile.MqttDeviceProfileTransportConfiguration;
+import org.thingsboard.server.common.data.device.profile.MqttTopics;
+import org.thingsboard.server.transport.mqtt.util.MqttTopicFilter;
+import org.thingsboard.server.transport.mqtt.util.MqttTopicFilterFactory;
 
 import java.util.UUID;
 import java.util.concurrent.ConcurrentMap;
@@ -31,7 +38,11 @@ public class DeviceSessionCtx extends MqttDeviceAwareSessionContext {
 
     @Getter
     private ChannelHandlerContext channel;
-    private AtomicInteger msgIdSeq = new AtomicInteger(0);
+    private final AtomicInteger msgIdSeq = new AtomicInteger(0);
+
+    private volatile MqttTopicFilter telemetryTopicFilter = MqttTopicFilterFactory.getDefaultTelemetryFilter();
+    private volatile MqttTopicFilter attributesTopicFilter = MqttTopicFilterFactory.getDefaultAttributesFilter();
+
 
     public DeviceSessionCtx(UUID sessionId, ConcurrentMap<MqttTopicMatcher, Integer> mqttQoSMap) {
         super(sessionId, mqttQoSMap);
@@ -44,4 +55,37 @@ public class DeviceSessionCtx extends MqttDeviceAwareSessionContext {
     public int nextMsgId() {
         return msgIdSeq.incrementAndGet();
     }
+
+    public boolean isDeviceTelemetryTopic(String topicName) {
+        return telemetryTopicFilter.filter(topicName);
+    }
+
+    public boolean isDeviceAttributesTopic(String topicName) {
+        return attributesTopicFilter.filter(topicName);
+    }
+
+    @Override
+    public void setDeviceProfile(DeviceProfile deviceProfile) {
+        super.setDeviceProfile(deviceProfile);
+        updateTopicFilters(deviceProfile);
+    }
+
+    @Override
+    public void onProfileUpdate(DeviceProfile deviceProfile) {
+        super.onProfileUpdate(deviceProfile);
+        updateTopicFilters(deviceProfile);
+    }
+
+    private void updateTopicFilters(DeviceProfile deviceProfile) {
+        DeviceProfileTransportConfiguration transportConfiguration = deviceProfile.getProfileData().getTransportConfiguration();
+        if (transportConfiguration.getType().equals(DeviceTransportType.MQTT) &&
+                transportConfiguration instanceof MqttDeviceProfileTransportConfiguration) {
+            MqttDeviceProfileTransportConfiguration mqttConfig = (MqttDeviceProfileTransportConfiguration) transportConfiguration;
+            telemetryTopicFilter = MqttTopicFilterFactory.toFilter(mqttConfig.getDeviceTelemetryTopic());
+            attributesTopicFilter = MqttTopicFilterFactory.toFilter(mqttConfig.getDeviceAttributesTopic());
+        } else {
+            telemetryTopicFilter = MqttTopicFilterFactory.getDefaultTelemetryFilter();
+            attributesTopicFilter = MqttTopicFilterFactory.getDefaultAttributesFilter();
+        }
+    }
 }

@@ -33,12 +33,12 @@ import java.util.concurrent.ConcurrentMap;
 public class GatewayDeviceSessionCtx extends MqttDeviceAwareSessionContext implements SessionMsgListener {
 
     private final GatewaySessionHandler parent;
-    private volatile SessionInfoProto sessionInfo;
 
-    public GatewayDeviceSessionCtx(GatewaySessionHandler parent, TransportDeviceInfo deviceInfo, DeviceProfile deviceProfile, ConcurrentMap<MqttTopicMatcher, Integer> mqttQoSMap) {
+    public GatewayDeviceSessionCtx(GatewaySessionHandler parent, TransportDeviceInfo deviceInfo,
+                                   DeviceProfile deviceProfile, ConcurrentMap<MqttTopicMatcher, Integer> mqttQoSMap) {
         super(UUID.randomUUID(), mqttQoSMap);
         this.parent = parent;
-        this.sessionInfo = SessionInfoProto.newBuilder()
+        setSessionInfo(SessionInfoProto.newBuilder()
                 .setNodeId(parent.getNodeId())
                 .setSessionIdMSB(sessionId.getMostSignificantBits())
                 .setSessionIdLSB(sessionId.getLeastSignificantBits())
@@ -52,7 +52,7 @@ public class GatewayDeviceSessionCtx extends MqttDeviceAwareSessionContext imple
                 .setGwSessionIdLSB(parent.getSessionId().getLeastSignificantBits())
                 .setDeviceProfileIdMSB(deviceInfo.getDeviceProfileId().getId().getMostSignificantBits())
                 .setDeviceProfileIdLSB(deviceInfo.getDeviceProfileId().getId().getLeastSignificantBits())
-                .build();
+                .build());
         setDeviceInfo(deviceInfo);
         setDeviceProfile(deviceProfile);
     }
@@ -67,10 +67,6 @@ public class GatewayDeviceSessionCtx extends MqttDeviceAwareSessionContext imple
         return parent.nextMsgId();
     }
 
-    SessionInfoProto getSessionInfo() {
-        return sessionInfo;
-    }
-
     @Override
     public void onGetAttributesResponse(TransportProtos.GetAttributeResponseMsg response) {
         try {
@@ -107,10 +103,4 @@ public class GatewayDeviceSessionCtx extends MqttDeviceAwareSessionContext imple
     public void onToServerRpcResponse(TransportProtos.ToServerRpcResponseMsg toServerResponse) {
         // This feature is not supported in the TB IoT Gateway yet.
     }
-
-    @Override
-    public void onProfileUpdate(DeviceProfile deviceProfile) {
-        deviceInfo.setDeviceType(deviceProfile.getName());
-        sessionInfo = SessionInfoProto.newBuilder().mergeFrom(sessionInfo).setDeviceType(deviceProfile.getName()).build();
-    }
 }

+/**
+ * Copyright © 2016-2020 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.transport.mqtt.util;
+
+import lombok.Data;
+
+@Data
+public class EqualsTopicFilter implements MqttTopicFilter {
+
+    private final String filter;
+
+    @Override
+    public boolean filter(String topic) {
+        return filter.equals(topic);
+    }
+}

@@ -15,20 +15,8 @@
  */
 package org.thingsboard.server.transport.mqtt.util;
 
-import lombok.extern.slf4j.Slf4j;
+public interface MqttTopicFilter {
 
-import java.util.regex.Pattern;
-
-@Slf4j
-public class MqttTopicRegexUtil {
-
-    public static Pattern toRegex(String topicFilter) {
-        String regex = topicFilter
-                .replace("\\", "\\\\")
-                .replace("+", "[^/]+")
-                .replace("/#", "($|/.*)");
-        log.debug("Converting [{}] to [{}]", topicFilter, regex);
-        return Pattern.compile(regex);
-    }
+    boolean filter(String topic);
 
 }

+/**
+ * Copyright © 2016-2020 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.transport.mqtt.util;
+
+import lombok.extern.slf4j.Slf4j;
+import org.thingsboard.server.common.data.device.profile.MqttTopics;
+
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import java.util.regex.Pattern;
+
+@Slf4j
+public class MqttTopicFilterFactory {
+
+    private static final ConcurrentMap<String, MqttTopicFilter> filters = new ConcurrentHashMap<>();
+    private static final MqttTopicFilter DEFAULT_TELEMETRY_TOPIC_FILTER = toFilter(MqttTopics.DEVICE_TELEMETRY_TOPIC);
+    private static final MqttTopicFilter DEFAULT_ATTRIBUTES_TOPIC_FILTER = toFilter(MqttTopics.DEVICE_ATTRIBUTES_TOPIC);
+
+    public static MqttTopicFilter toFilter(String topicFilter) {
+        if (topicFilter == null || topicFilter.isEmpty()) {
+            throw new IllegalArgumentException("Topic filter can't be empty!");
+        }
+        return filters.computeIfAbsent(topicFilter, filter -> {
+            if (filter.contains("+") || filter.contains("#")) {
+                String regex = filter
+                        .replace("\\", "\\\\")
+                        .replace("+", "[^/]+")
+                        .replace("/#", "($|/.*)");
+                log.debug("Converting [{}] to [{}]", filter, regex);
+                return new RegexTopicFilter(regex);
+            } else {
+                return new EqualsTopicFilter(filter);
+            }
+        });
+    }
+
+    public static MqttTopicFilter getDefaultTelemetryFilter() {
+        return DEFAULT_TELEMETRY_TOPIC_FILTER;
+    }
+
+    public static MqttTopicFilter getDefaultAttributesFilter() {
+        return DEFAULT_ATTRIBUTES_TOPIC_FILTER;
+    }
+}

+/**
+ * Copyright © 2016-2020 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.transport.mqtt.util;
+
+import lombok.Data;
+
+import java.util.regex.Pattern;
+
+@Data
+public class RegexTopicFilter implements MqttTopicFilter {
+
+    private final Pattern regex;
+
+    public RegexTopicFilter(String regex) {
+        this.regex = Pattern.compile(regex);
+    }
+
+    @Override
+    public boolean filter(String topic) {
+        return regex.matcher(topic).matches();
+    }
+}

@@ -26,7 +26,7 @@ import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
 @RunWith(MockitoJUnitRunner.class)
-public class MqttTopicRegexUtilTest {
+public class MqttTopicFilterFactoryTest {
 
     private static String TEST_STR_1 = "Sensor/Temperature/House/48";
     private static String TEST_STR_2 = "Sensor/Temperature";
@@ -34,23 +34,23 @@ public class MqttTopicRegexUtilTest {
 
     @Test
     public void metadataCanBeUpdated() throws ScriptException {
-        Pattern filter = MqttTopicRegexUtil.toRegex("Sensor/Temperature/House/+");
-        assertTrue(filter.matcher(TEST_STR_1).matches());
-        assertFalse(filter.matcher(TEST_STR_2).matches());
-
-        filter = MqttTopicRegexUtil.toRegex("Sensor/+/House/#");
-        assertTrue(filter.matcher(TEST_STR_1).matches());
-        assertFalse(filter.matcher(TEST_STR_2).matches());
-
-        filter = MqttTopicRegexUtil.toRegex("Sensor/#");
-        assertTrue(filter.matcher(TEST_STR_1).matches());
-        assertTrue(filter.matcher(TEST_STR_2).matches());
-        assertTrue(filter.matcher(TEST_STR_3).matches());
-
-        filter = MqttTopicRegexUtil.toRegex("Sensor/Temperature/#");
-        assertTrue(filter.matcher(TEST_STR_1).matches());
-        assertTrue(filter.matcher(TEST_STR_2).matches());
-        assertFalse(filter.matcher(TEST_STR_3).matches());
+        MqttTopicFilter filter = MqttTopicFilterFactory.toFilter("Sensor/Temperature/House/+");
+        assertTrue(filter.filter(TEST_STR_1));
+        assertFalse(filter.filter(TEST_STR_2));
+
+        filter = MqttTopicFilterFactory.toFilter("Sensor/+/House/#");
+        assertTrue(filter.filter(TEST_STR_1));
+        assertFalse(filter.filter(TEST_STR_2));
+
+        filter = MqttTopicFilterFactory.toFilter("Sensor/#");
+        assertTrue(filter.filter(TEST_STR_1));
+        assertTrue(filter.filter(TEST_STR_2));
+        assertTrue(filter.filter(TEST_STR_3));
+
+        filter = MqttTopicFilterFactory.toFilter("Sensor/Temperature/#");
+        assertTrue(filter.filter(TEST_STR_1));
+        assertTrue(filter.filter(TEST_STR_2));
+        assertFalse(filter.filter(TEST_STR_3));
     }
 
 }

@@ -22,6 +22,7 @@ import org.thingsboard.server.common.data.DeviceProfile;
 import org.thingsboard.server.common.data.id.DeviceId;
 import org.thingsboard.server.common.msg.session.SessionContext;
 import org.thingsboard.server.common.transport.auth.TransportDeviceInfo;
+import org.thingsboard.server.gen.transport.TransportProtos;
 import org.thingsboard.server.gen.transport.TransportProtos.DeviceInfoProto;
 
 import java.util.UUID;
@@ -41,6 +42,9 @@ public abstract class DeviceAwareSessionContext implements SessionContext {
     @Getter
     @Setter
     protected volatile DeviceProfile deviceProfile;
+    @Getter
+    @Setter
+    private volatile TransportProtos.SessionInfoProto sessionInfo;
 
     private volatile boolean connected;
 
@@ -54,6 +58,13 @@ public abstract class DeviceAwareSessionContext implements SessionContext {
         this.deviceId = deviceInfo.getDeviceId();
     }
 
+    @Override
+    public void onProfileUpdate(DeviceProfile deviceProfile) {
+        this.deviceProfile = deviceProfile;
+        this.deviceInfo.setDeviceType(deviceProfile.getName());
+        this.sessionInfo = TransportProtos.SessionInfoProto.newBuilder().mergeFrom(sessionInfo).setDeviceType(deviceProfile.getName()).build();
+    }
+
     public boolean isConnected() {
         return connected;
     }

@@ -19,7 +19,6 @@
   <section formGroupName="configuration">
     <fieldset class="fields-group">
       <legend class="group-title" translate>device-profile.mqtt-device-topic-filters</legend>
-      <h6 class="mat-body" innerHTML="{{ 'device-profile.support-level-wildcards' | translate }}"></h6>
       <div fxLayoutGap="8px" fxLayout="column">
         <div fxLayout="row" fxLayoutGap="8px" fxLayout.xs="column">
           <mat-form-field fxFlex>
@@ -30,24 +29,13 @@
             <mat-error *ngIf="mqttDeviceProfileTransportConfigurationFormGroup.get('configuration.deviceTelemetryTopic').hasError('required')">
               {{ 'device-profile.telemetry-topic-filter-required' | translate}}
             </mat-error>
-            <mat-error *ngIf="mqttDeviceProfileTransportConfigurationFormGroup.get('configuration.deviceTelemetryTopic').hasError('pattern')">
-              {{ 'device-profile.not-valid-pattern-topic-filter' | translate}}
+            <mat-error *ngIf="mqttDeviceProfileTransportConfigurationFormGroup.get('configuration.deviceTelemetryTopic').hasError('invalidSingleTopicCharacter')">
+              {{ 'device-profile.not-valid-single-character' | translate}}
             </mat-error>
-          </mat-form-field>
-          <mat-form-field fxFlex>
-            <mat-label translate>device-profile.rpc-request-topic-filter</mat-label>
-            <input matInput required
-                   formControlName="deviceRpcRequestTopic"
-                   type="text">
-            <mat-error *ngIf="mqttDeviceProfileTransportConfigurationFormGroup.get('configuration.deviceRpcRequestTopic').hasError('required')">
-              {{ 'device-profile.rpc-request-topic-filter-required' | translate}}
-            </mat-error>
-            <mat-error *ngIf="mqttDeviceProfileTransportConfigurationFormGroup.get('configuration.deviceRpcRequestTopic').hasError('pattern')">
-              {{ 'device-profile.not-valid-pattern-topic-filter' | translate}}
+            <mat-error *ngIf="mqttDeviceProfileTransportConfigurationFormGroup.get('configuration.deviceTelemetryTopic').hasError('invalidMultiTopicCharacter')">
+              {{ 'device-profile.not-valid-multi-character' | translate}}
             </mat-error>
           </mat-form-field>
-        </div>
-        <div fxLayout="row" fxLayoutGap="8px" fxLayout.xs="column">
           <mat-form-field fxFlex>
             <mat-label translate>device-profile.attributes-topic-filter</mat-label>
             <input matInput required
@@ -56,23 +44,17 @@
             <mat-error *ngIf="mqttDeviceProfileTransportConfigurationFormGroup.get('configuration.deviceAttributesTopic').hasError('required')">
               {{ 'device-profile.attributes-topic-filter-required' | translate}}
             </mat-error>
-            <mat-error *ngIf="mqttDeviceProfileTransportConfigurationFormGroup.get('configuration.deviceAttributesTopic').hasError('pattern')">
-              {{ 'device-profile.not-valid-pattern-topic-filter' | translate}}
-            </mat-error>
-          </mat-form-field>
-          <mat-form-field fxFlex>
-            <mat-label translate>device-profile.rpc-response-topic-filter</mat-label>
-            <input matInput required
-                   formControlName="deviceRpcResponseTopic"
-                   type="text">
-            <mat-error *ngIf="mqttDeviceProfileTransportConfigurationFormGroup.get('configuration.deviceRpcResponseTopic').hasError('required')">
-              {{ 'device-profile.rpc-response-topic-filter-required' | translate}}
+            <mat-error *ngIf="mqttDeviceProfileTransportConfigurationFormGroup.get('configuration.deviceAttributesTopic').hasError('invalidSingleTopicCharacter')">
+              {{ 'device-profile.not-valid-single-character' | translate}}
             </mat-error>
-            <mat-error *ngIf="mqttDeviceProfileTransportConfigurationFormGroup.get('configuration.deviceRpcResponseTopic').hasError('pattern')">
-              {{ 'device-profile.not-valid-pattern-topic-filter' | translate}}
+            <mat-error *ngIf="mqttDeviceProfileTransportConfigurationFormGroup.get('configuration.deviceAttributesTopic').hasError('invalidMultiTopicCharacter')">
+              {{ 'device-profile.not-valid-multi-character' | translate}}
             </mat-error>
           </mat-form-field>
         </div>
+        <div class="tb-hint" innerHTML="{{ 'device-profile.support-level-wildcards' | translate }}"></div>
+        <div class="tb-hint" innerHTML="{{ 'device-profile.single-level-wildcards-hint' | translate }}"></div>
+        <div class="tb-hint" innerHTML="{{ 'device-profile.multi-level-wildcards-hint' | translate }}"></div>
       </div>
     </fieldset>
   </section>

@@ -23,5 +23,9 @@
     legend {
       color: rgba(0, 0, 0, .7);
     }
+
+    .tb-hint{
+      padding: 0;
+    }
   }
 }

@@ -15,15 +15,24 @@
 ///
 
 import { Component, forwardRef, Input, OnInit } from '@angular/core';
-import { ControlValueAccessor, FormBuilder, FormGroup, NG_VALUE_ACCESSOR, Validators } from '@angular/forms';
+import {
+  ControlValueAccessor,
+  FormBuilder,
+  FormControl,
+  FormGroup,
+  NG_VALUE_ACCESSOR,
+  ValidatorFn,
+  Validators
+} from '@angular/forms';
 import { Store } from '@ngrx/store';
 import { AppState } from '@app/core/core.state';
 import { coerceBooleanProperty } from '@angular/cdk/coercion';
 import {
   DeviceProfileTransportConfiguration,
-  DeviceTransportType, MqttDeviceProfileTransportConfiguration
+  DeviceTransportType,
+  MqttDeviceProfileTransportConfiguration
 } from '@shared/models/device.models';
-import { isDefinedAndNotNull } from '../../../../../core/utils';
+import { isDefinedAndNotNull } from '@core/utils';
 
 @Component({
   selector: 'tb-mqtt-device-profile-transport-configuration',
@@ -41,11 +50,10 @@ export class MqttDeviceProfileTransportConfigurationComponent implements Control
 
   private requiredValue: boolean;
 
-  private MQTTTopicPattern = new RegExp('^((?![#+]).)*$|^(.*[^#]\/|^)#$|^(.*\/|^)\+(\/.*|$)$');
-
   get required(): boolean {
     return this.requiredValue;
   }
+
   @Input()
   set required(value: boolean) {
     this.requiredValue = coerceBooleanProperty(value);
@@ -70,10 +78,8 @@ export class MqttDeviceProfileTransportConfigurationComponent implements Control
   ngOnInit() {
     this.mqttDeviceProfileTransportConfigurationFormGroup = this.fb.group({
       configuration: this.fb.group({
-        deviceAttributesTopic: [null, [Validators.required, Validators.pattern(this.MQTTTopicPattern)]],
-        deviceTelemetryTopic: [null, [Validators.required, Validators.pattern(this.MQTTTopicPattern)]],
-        deviceRpcRequestTopic: [null, [Validators.required, Validators.pattern(this.MQTTTopicPattern)]],
-        deviceRpcResponseTopic: [null, [Validators.required, Validators.pattern(this.MQTTTopicPattern)]]
+        deviceAttributesTopic: [null, [Validators.required, this.validationMQTTTopic()]],
+        deviceTelemetryTopic: [null, [Validators.required, this.validationMQTTTopic()]]
       })
     });
     this.mqttDeviceProfileTransportConfigurationFormGroup.valueChanges.subscribe(() => {
@@ -104,4 +110,34 @@ export class MqttDeviceProfileTransportConfigurationComponent implements Control
     }
     this.propagateChange(configuration);
   }
+
+  private validationMQTTTopic(): ValidatorFn {
+    return (c: FormControl) => {
+      const newTopic = c.value;
+      const wildcardSymbols = /[#+]/g;
+      let findSymbol = wildcardSymbols.exec(newTopic);
+      while (findSymbol) {
+        const index = findSymbol.index;
+        const currentSymbol = findSymbol[0];
+        const prevSymbol = index > 0 ? newTopic[index - 1] : null;
+        const nextSymbol = index < (newTopic.length - 1) ? newTopic[index + 1] : null;
+        if (currentSymbol === '#' && (index !== (newTopic.length - 1) || (prevSymbol !== null && prevSymbol !== '/'))) {
+          return {
+            invalidMultiTopicCharacter: {
+              valid: false
+            }
+          };
+        }
+        if (currentSymbol === '+' && ((prevSymbol !== null && prevSymbol !== '/') || (nextSymbol !== null && nextSymbol !== '/'))) {
+          return {
+            invalidSingleTopicCharacter: {
+              valid: false
+            }
+          };
+        }
+        findSymbol = wildcardSymbols.exec(newTopic);
+      }
+      return null;
+    };
+  }
 }

@@ -110,8 +110,6 @@ export interface DefaultDeviceProfileTransportConfiguration {
 export interface MqttDeviceProfileTransportConfiguration {
   deviceTelemetryTopic?: string;
   deviceAttributesTopic?: string;
-  deviceRpcRequestTopic?: string;
-  deviceRpcResponseTopic?: string;
   [key: string]: any;
 }
 
@@ -164,9 +162,7 @@ export function createDeviceProfileTransportConfiguration(type: DeviceTransportT
       case DeviceTransportType.MQTT:
         const mqttTransportConfiguration: MqttDeviceProfileTransportConfiguration = {
           deviceTelemetryTopic: 'v1/devices/me/telemetry',
-          deviceAttributesTopic: 'v1/devices/me/attributes',
-          deviceRpcRequestTopic: 'v1/devices/me/rpc/request/',
-          deviceRpcResponseTopic: 'v1/devices/me/rpc/response/'
+          deviceAttributesTopic: 'v1/devices/me/attributes'
         };
         transportConfiguration = {...mqttTransportConfiguration, type: DeviceTransportType.MQTT};
         break;

@@ -792,16 +792,18 @@
         "no-device-profiles-found": "No device profiles found.",
         "create-new-device-profile": "Create a new one!",
         "mqtt-device-topic-filters": "MQTT device topic filters",
-        "support-level-wildcards": "Support single <code>(+)</code> and multi <code>(#)</code> level wildcards",
+        "support-level-wildcards": "Single <code>[+]</code> and multi-level <code>[#]</code> wildcards supported.",
         "telemetry-topic-filter": "Telemetry topic filter",
         "telemetry-topic-filter-required": "Telemetry topic filter is required.",
-        "rpc-request-topic-filter": "RPC request topic filter",
-        "rpc-request-topic-filter-required": "RPC request topic filter is required.",
         "attributes-topic-filter": "Attributes topic filter",
         "attributes-topic-filter-required": "Attributes topic filter is required.",
         "rpc-response-topic-filter": "RPC response topic filter",
         "rpc-response-topic-filter-required": "RPC response topic filter is required.",
         "not-valid-pattern-topic-filter": "Not valid pattern topic filter",
+        "not-valid-single-character": "Invalid use of a single-level wildcard character",
+        "not-valid-multi-character": "Invalid use of a multi-level wildcard character",
+        "single-level-wildcards-hint": "<code>[+]</code> is suitable for any topic filter level. Ex.: <b>v1/devices/+/telemetry</b> or <b>+/devices/+/attributes</b>.",
+        "multi-level-wildcards-hint": "<code>[#]</code> can replace the topic filter itself and must be the last symbol of the topic. Ex.: <b>#</b> or <b>v1/devices/me/#</b>.",
         "alarm-rules": "Alarm rules ({{count}})",
         "add-alarm-rule": "Add alarm rule",
         "edit-alarm-rule": "Edit alarm rule",