简柏林 / thingskit · Commits

Commit 0f71d0d8fc528a01d5c1cdb08f14dd43429cc2b3

Authored by ShvaykaD
1 parent 75c1185d

fix typos

Inline Side-by-side
Showing 3 changed files with 6 additions and 37 deletions
@@ -40,7 +40,7 @@ public class BackwardCompatibilityAdaptor implements MqttTransportAdaptor { @@ -40,7 +40,7 @@ public class BackwardCompatibilityAdaptor implements MqttTransportAdaptor {
40 try { 40 try {
41 return protoAdaptor.convertToPostTelemetry(ctx, inbound); 41 return protoAdaptor.convertToPostTelemetry(ctx, inbound);
42 } catch (AdaptorException e) { 42 } catch (AdaptorException e) {
43 - log.trace("failed to process post telemetry request msg {} due to: ", inbound, e); 43 + log.trace("failed to process post telemetry request msg: {} due to: ", inbound, e);
44 return jsonAdaptor.convertToPostTelemetry(ctx, inbound); 44 return jsonAdaptor.convertToPostTelemetry(ctx, inbound);
45 } 45 }
46 } 46 }
@@ -50,7 +50,7 @@ public class BackwardCompatibilityAdaptor implements MqttTransportAdaptor { @@ -50,7 +50,7 @@ public class BackwardCompatibilityAdaptor implements MqttTransportAdaptor {
50 try { 50 try {
51 return protoAdaptor.convertToPostAttributes(ctx, inbound); 51 return protoAdaptor.convertToPostAttributes(ctx, inbound);
52 } catch (AdaptorException e) { 52 } catch (AdaptorException e) {
53 - log.trace("failed to process post attributes request msg {} due to: ", inbound, e); 53 + log.trace("failed to process post attributes request msg: {} due to: ", inbound, e);
54 return jsonAdaptor.convertToPostAttributes(ctx, inbound); 54 return jsonAdaptor.convertToPostAttributes(ctx, inbound);
55 } 55 }
56 } 56 }
@@ -60,7 +60,7 @@ public class BackwardCompatibilityAdaptor implements MqttTransportAdaptor { @@ -60,7 +60,7 @@ public class BackwardCompatibilityAdaptor implements MqttTransportAdaptor {
60 try { 60 try {
61 return protoAdaptor.convertToGetAttributes(ctx, inbound, topicBase); 61 return protoAdaptor.convertToGetAttributes(ctx, inbound, topicBase);
62 } catch (AdaptorException e) { 62 } catch (AdaptorException e) {
63 - log.trace("failed to process get attributes request msg {} due to: ", inbound, e); 63 + log.trace("failed to process get attributes request msg: {} due to: ", inbound, e);
64 return jsonAdaptor.convertToGetAttributes(ctx, inbound, topicBase); 64 return jsonAdaptor.convertToGetAttributes(ctx, inbound, topicBase);
65 } 65 }
66 } 66 }
@@ -70,7 +70,7 @@ public class BackwardCompatibilityAdaptor implements MqttTransportAdaptor { @@ -70,7 +70,7 @@ public class BackwardCompatibilityAdaptor implements MqttTransportAdaptor {
70 try { 70 try {
71 return protoAdaptor.convertToDeviceRpcResponse(ctx, mqttMsg, topicBase); 71 return protoAdaptor.convertToDeviceRpcResponse(ctx, mqttMsg, topicBase);
72 } catch (AdaptorException e) { 72 } catch (AdaptorException e) {
73 - log.trace("failed to process to device rpc response msg {} due to: ", mqttMsg, e); 73 + log.trace("failed to process to device rpc response msg: {} due to: ", mqttMsg, e);
74 return jsonAdaptor.convertToDeviceRpcResponse(ctx, mqttMsg, topicBase); 74 return jsonAdaptor.convertToDeviceRpcResponse(ctx, mqttMsg, topicBase);
75 } 75 }
76 } 76 }
@@ -80,7 +80,7 @@ public class BackwardCompatibilityAdaptor implements MqttTransportAdaptor { @@ -80,7 +80,7 @@ public class BackwardCompatibilityAdaptor implements MqttTransportAdaptor {
80 try { 80 try {
81 return protoAdaptor.convertToServerRpcRequest(ctx, mqttMsg, topicBase); 81 return protoAdaptor.convertToServerRpcRequest(ctx, mqttMsg, topicBase);
82 } catch (AdaptorException e) { 82 } catch (AdaptorException e) {
83 - log.trace("failed to process to server rpc request msg {} due to: ", mqttMsg, e); 83 + log.trace("failed to process to server rpc request msg: {} due to: ", mqttMsg, e);
84 return jsonAdaptor.convertToServerRpcRequest(ctx, mqttMsg, topicBase); 84 return jsonAdaptor.convertToServerRpcRequest(ctx, mqttMsg, topicBase);
85 } 85 }
86 } 86 }
@@ -90,7 +90,7 @@ public class BackwardCompatibilityAdaptor implements MqttTransportAdaptor { @@ -90,7 +90,7 @@ public class BackwardCompatibilityAdaptor implements MqttTransportAdaptor {
90 try { 90 try {
91 return protoAdaptor.convertToClaimDevice(ctx, inbound); 91 return protoAdaptor.convertToClaimDevice(ctx, inbound);
92 } catch (AdaptorException e) { 92 } catch (AdaptorException e) {
93 - log.trace("failed to process claim device request msg {} due to: ", inbound, e); 93 + log.trace("failed to process claim device request msg: {} due to: ", inbound, e);
94 return jsonAdaptor.convertToClaimDevice(ctx, inbound); 94 return jsonAdaptor.convertToClaimDevice(ctx, inbound);
95 } 95 }
96 } 96 }
@@ -85,7 +85,6 @@ public class DeviceSessionCtx extends MqttDeviceAwareSessionContext { @@ -85,7 +85,6 @@ public class DeviceSessionCtx extends MqttDeviceAwareSessionContext {
85 private volatile boolean jsonPayloadFormatCompatibilityEnabled; 85 private volatile boolean jsonPayloadFormatCompatibilityEnabled;
86 private volatile boolean useJsonPayloadFormatForDefaultDownlinkTopics; 86 private volatile boolean useJsonPayloadFormatForDefaultDownlinkTopics;
87 87
88 -  
89 @Getter 88 @Getter
90 @Setter 89 @Setter
91 private TransportPayloadType provisionPayloadType = payloadType; 90 private TransportPayloadType provisionPayloadType = payloadType;
@@ -162,36 +162,6 @@ export class MqttDeviceProfileTransportConfigurationComponent implements Control @@ -162,36 +162,6 @@ export class MqttDeviceProfileTransportConfigurationComponent implements Control
162 this.propagateChange(configuration); 162 this.propagateChange(configuration);
163 } 163 }
164 164
165 - private updateTest(type: TransportPayloadType, forceUpdated = false) {  
166 - const transportPayloadTypeForm = this.mqttDeviceProfileTransportConfigurationFormGroup  
167 - .get('transportPayloadTypeConfiguration') as FormGroup;  
168 - if (forceUpdated) {  
169 - transportPayloadTypeForm.patchValue({  
170 - deviceTelemetryProtoSchema: defaultTelemetrySchema,  
171 - deviceAttributesProtoSchema: defaultAttributesSchema,  
172 - deviceRpcRequestProtoSchema: defaultRpcRequestSchema,  
173 - deviceRpcResponseProtoSchema: defaultRpcResponseSchema,  
174 - enableCompatibilityWithJsonPayloadFormat: false,  
175 - useJsonPayloadFormatForDefaultDownlinkTopics: false  
176 - }, {emitEvent: false});  
177 - }  
178 - if (type === TransportPayloadType.PROTOBUF && !this.disabled) {  
179 - transportPayloadTypeForm.get('deviceTelemetryProtoSchema').enable({emitEvent: false});  
180 - transportPayloadTypeForm.get('deviceAttributesProtoSchema').enable({emitEvent: false});  
181 - transportPayloadTypeForm.get('deviceRpcRequestProtoSchema').enable({emitEvent: false});  
182 - transportPayloadTypeForm.get('deviceRpcResponseProtoSchema').enable({emitEvent: false});  
183 - transportPayloadTypeForm.get('enableCompatibilityWithJsonPayloadFormat').enable({emitEvent: false});  
184 - transportPayloadTypeForm.get('useJsonPayloadFormatForDefaultDownlinkTopics').enable({emitEvent: false});  
185 - } else {  
186 - transportPayloadTypeForm.get('deviceTelemetryProtoSchema').disable({emitEvent: false});  
187 - transportPayloadTypeForm.get('deviceAttributesProtoSchema').disable({emitEvent: false});  
188 - transportPayloadTypeForm.get('deviceRpcRequestProtoSchema').disable({emitEvent: false});  
189 - transportPayloadTypeForm.get('deviceRpcResponseProtoSchema').disable({emitEvent: false});  
190 - transportPayloadTypeForm.get('enableCompatibilityWithJsonPayloadFormat').disable({emitEvent: false});  
191 - transportPayloadTypeForm.get('useJsonPayloadFormatForDefaultDownlinkTopics').disable({emitEvent: false});  
192 - }  
193 - }  
194 -  
195 private updateTransportPayloadBasedControls(type: TransportPayloadType, forceUpdated = false) { 165 private updateTransportPayloadBasedControls(type: TransportPayloadType, forceUpdated = false) {
196 const transportPayloadTypeForm = this.mqttDeviceProfileTransportConfigurationFormGroup 166 const transportPayloadTypeForm = this.mqttDeviceProfileTransportConfigurationFormGroup
197 .get('transportPayloadTypeConfiguration') as FormGroup; 167 .get('transportPayloadTypeConfiguration') as FormGroup;