Browse Source

fix typos

pull/3740/head
ShvaykaD 6 years ago
parent
commit
1f2719e321
  1. 3
      application/src/main/java/org/thingsboard/server/controller/DeviceProfileController.java
  2. 2
      common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/adaptors/ProtoMqttAdaptor.java
  3. 4
      common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/session/DeviceSessionCtx.java

3
application/src/main/java/org/thingsboard/server/controller/DeviceProfileController.java

@ -101,8 +101,7 @@ public class DeviceProfileController extends BaseController {
if (transportConfiguration instanceof MqttProtoDeviceProfileTransportConfiguration) { if (transportConfiguration instanceof MqttProtoDeviceProfileTransportConfiguration) {
MqttProtoDeviceProfileTransportConfiguration protoTransportConfiguration = (MqttProtoDeviceProfileTransportConfiguration) transportConfiguration; MqttProtoDeviceProfileTransportConfiguration protoTransportConfiguration = (MqttProtoDeviceProfileTransportConfiguration) transportConfiguration;
if (protoTransportConfiguration.getTransportPayloadType().equals(TransportPayloadType.PROTOBUF)) checkProtoSchemas(protoTransportConfiguration);
checkProtoSchemas(protoTransportConfiguration);
} }
DeviceProfile savedDeviceProfile = checkNotNull(deviceProfileService.saveDeviceProfile(deviceProfile)); DeviceProfile savedDeviceProfile = checkNotNull(deviceProfileService.saveDeviceProfile(deviceProfile));

2
common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/adaptors/ProtoMqttAdaptor.java

@ -67,7 +67,7 @@ public class ProtoMqttAdaptor implements MqttTransportAdaptor {
Descriptors.Descriptor attributesDynamicMessage = getDescriptor(deviceSessionCtx.getAttributesDynamicMessageDescriptor()); Descriptors.Descriptor attributesDynamicMessage = getDescriptor(deviceSessionCtx.getAttributesDynamicMessageDescriptor());
try { try {
return JsonConverter.convertToAttributesProto(new JsonParser().parse(dynamicMsgToJson(bytes, attributesDynamicMessage))); return JsonConverter.convertToAttributesProto(new JsonParser().parse(dynamicMsgToJson(bytes, attributesDynamicMessage)));
} catch (InvalidProtocolBufferException | IllegalArgumentException e) { } catch (Exception e) {
throw new AdaptorException(e); throw new AdaptorException(e);
} }
} }

4
common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/session/DeviceSessionCtx.java

@ -80,9 +80,7 @@ public class DeviceSessionCtx extends MqttDeviceAwareSessionContext {
return telemetryTopicFilter.filter(topicName); return telemetryTopicFilter.filter(topicName);
} }
public boolean isDeviceAttributesTopic(String topicName) { public boolean isDeviceAttributesTopic(String topicName) { return attributesTopicFilter.filter(topicName); }
return attributesTopicFilter.filter(topicName);
}
public MqttTransportAdaptor getPayloadAdaptor() { public MqttTransportAdaptor getPayloadAdaptor() {
return payloadType.equals(TransportPayloadType.JSON) ? context.getJsonMqttAdaptor() : context.getProtoMqttAdaptor(); return payloadType.equals(TransportPayloadType.JSON) ? context.getJsonMqttAdaptor() : context.getProtoMqttAdaptor();

Loading…
Cancel
Save