简柏林 / thingskit · Commits

Commit fc93d93b62f54364dd264b85ffe5ccfccbd26e1d

Authored by Andrew Shvayka
1 parent 633f8b0b

JSON type cast enhancements

Inline Side-by-side
Showing 5 changed files with 13 additions and 17 deletions
... ... @@ -406,6 +406,9 @@ transport:
406 406 enabled: "${TB_TRANSPORT_RATE_LIMITS_ENABLED:false}"
407 407 tenant: "${TB_TRANSPORT_RATE_LIMITS_TENANT:1000:1,20000:60}"
408 408 device: "${TB_TRANSPORT_RATE_LIMITS_DEVICE:10:1,300:60}"
  409 + json:
  410 + # Cast String data types to Numeric if possible when processing Telemetry/Attributes JSON
  411 + type_cast_enabled: "${JSON_TYPE_CAST_ENABLED:true}"
409 412 # Local HTTP transport parameters
410 413 http:
411 414 enabled: "${HTTP_ENABLED:true}"
... ... @@ -443,7 +446,3 @@ transport:
443 446 bind_address: "${COAP_BIND_ADDRESS:0.0.0.0}"
444 447 bind_port: "${COAP_BIND_PORT:5683}"
445 448 timeout: "${COAP_TIMEOUT:10000}"
446   -
447   -json:
448   - # Cast String data types to Numeric if possible when processing Telemetry/Attributes JSON
449   - type_cast_enabled: "${JSON_TYPE_CAST_ENABLED:false}"
\ No newline at end of file
... ...
... ... @@ -23,7 +23,7 @@ import org.springframework.context.annotation.Configuration;
23 23 @Slf4j
24 24 public class JsonConverterConfig {
25 25
26   - @Value("${json.type_cast_enabled}")
  26 + @Value("${transport.json.type_cast_enabled:true}")
27 27 public void setIsJsonTypeCastEnabled(boolean jsonTypeCastEnabled) {
28 28 JsonConverter.setTypeCastEnabled(jsonTypeCastEnabled);
29 29 log.info("JSON type cast enabled = {}", jsonTypeCastEnabled);
... ...
... ... @@ -30,6 +30,9 @@ transport:
30 30 enabled: "${TB_TRANSPORT_RATE_LIMITS_ENABLED:false}"
31 31 tenant: "${TB_TRANSPORT_RATE_LIMITS_TENANT:1000:1,20000:60}"
32 32 device: "${TB_TRANSPORT_RATE_LIMITS_DEVICE:10:1,300:60}"
  33 + json:
  34 + # Cast String data types to Numeric if possible when processing Telemetry/Attributes JSON
  35 + type_cast_enabled: "${JSON_TYPE_CAST_ENABLED:true}"
33 36
34 37 kafka:
35 38 enabled: true
... ... @@ -52,7 +55,3 @@ kafka:
52 55 topic: "${TB_TRANSPORT_NOTIFICATIONS_TOPIC:tb.transport.notifications}"
53 56 poll_interval: "${TB_TRANSPORT_NOTIFICATIONS_POLL_INTERVAL_MS:25}"
54 57 auto_commit_interval: "${TB_TRANSPORT_NOTIFICATIONS_AUTO_COMMIT_INTERVAL_MS:100}"
55   -
56   -json:
57   - # Cast String data types to Numeric if possible when processing Telemetry/Attributes JSON
58   - type_cast_enabled: "${JSON_TYPE_CAST_ENABLED:true}"
\ No newline at end of file
... ...
... ... @@ -31,6 +31,9 @@ transport:
31 31 enabled: "${TB_TRANSPORT_RATE_LIMITS_ENABLED:false}"
32 32 tenant: "${TB_TRANSPORT_RATE_LIMITS_TENANT:1000:1,20000:60}"
33 33 device: "${TB_TRANSPORT_RATE_LIMITS_DEVICE:10:1,300:60}"
  34 + json:
  35 + # Cast String data types to Numeric if possible when processing Telemetry/Attributes JSON
  36 + type_cast_enabled: "${JSON_TYPE_CAST_ENABLED:true}"
34 37
35 38 kafka:
36 39 enabled: true
... ... @@ -53,7 +56,3 @@ kafka:
53 56 topic: "${TB_TRANSPORT_NOTIFICATIONS_TOPIC:tb.transport.notifications}"
54 57 poll_interval: "${TB_TRANSPORT_NOTIFICATIONS_POLL_INTERVAL_MS:25}"
55 58 auto_commit_interval: "${TB_TRANSPORT_NOTIFICATIONS_AUTO_COMMIT_INTERVAL_MS:100}"
56   -
57   -json:
58   - # Cast String data types to Numeric if possible when processing Telemetry/Attributes JSON
59   - type_cast_enabled: "${JSON_TYPE_CAST_ENABLED:true}"
\ No newline at end of file
... ...
... ... @@ -50,6 +50,9 @@ transport:
50 50 enabled: "${TB_TRANSPORT_RATE_LIMITS_ENABLED:false}"
51 51 tenant: "${TB_TRANSPORT_RATE_LIMITS_TENANT:1000:1,20000:60}"
52 52 device: "${TB_TRANSPORT_RATE_LIMITS_DEVICE:10:1,300:60}"
  53 + json:
  54 + # Cast String data types to Numeric if possible when processing Telemetry/Attributes JSON
  55 + type_cast_enabled: "${JSON_TYPE_CAST_ENABLED:true}"
53 56
54 57 kafka:
55 58 enabled: true
... ... @@ -72,7 +75,3 @@ kafka:
72 75 topic: "${TB_TRANSPORT_NOTIFICATIONS_TOPIC:tb.transport.notifications}"
73 76 poll_interval: "${TB_TRANSPORT_NOTIFICATIONS_POLL_INTERVAL_MS:25}"
74 77 auto_commit_interval: "${TB_TRANSPORT_NOTIFICATIONS_AUTO_COMMIT_INTERVAL_MS:100}"
75   -
76   -json:
77   - # Cast String data types to Numeric if possible when processing Telemetry/Attributes JSON
78   - type_cast_enabled: "${JSON_TYPE_CAST_ENABLED:true}"
\ No newline at end of file
... ...