Browse Source

make X509 certificate doc link be always available

pull/8803/head
dashevchenko 3 years ago
parent
commit
0d55ac9760
  1. 6
      dao/src/main/java/org/thingsboard/server/dao/device/DeviceServiceImpl.java
  2. 8
      dao/src/main/java/org/thingsboard/server/dao/util/DeviceConnectivityUtil.java

6
dao/src/main/java/org/thingsboard/server/dao/device/DeviceServiceImpl.java

@ -755,6 +755,9 @@ public class DeviceServiceImpl extends AbstractCachedEntityService<DeviceCacheKe
}
private String getMqttPublishCommand(String protocol, String defaultHostname, String deviceTelemetryTopic, DeviceCredentials deviceCredentials, String payload) {
if (deviceCredentials.getCredentialsType() == DeviceCredentialsType.X509_CERTIFICATE) {
return CHECK_DOCUMENTATION;
}
DeviceConnectivityInfo properties = deviceConnectivityConfiguration.getConnectivity().get(protocol);
if (properties == null || !properties.getEnabled()) {
return null;
@ -765,6 +768,9 @@ public class DeviceServiceImpl extends AbstractCachedEntityService<DeviceCacheKe
}
private String getCoapPublishCommand(String protocol, String defaultHostname, DeviceCredentials deviceCredentials) {
if (deviceCredentials.getCredentialsType() == DeviceCredentialsType.X509_CERTIFICATE) {
return CHECK_DOCUMENTATION;
}
DeviceConnectivityInfo properties = deviceConnectivityConfiguration.getConnectivity().get(protocol);
if (properties == null || !properties.getEnabled()) {
return null;

8
dao/src/main/java/org/thingsboard/server/dao/util/DeviceConnectivityUtil.java

@ -64,10 +64,6 @@ public class DeviceConnectivityUtil {
return null;
}
break;
case X509_CERTIFICATE:
if (MQTTS.equals(protocol)) {
return CHECK_DOCUMENTATION;
}
default:
return null;
}
@ -81,10 +77,6 @@ public class DeviceConnectivityUtil {
String client = COAPS.equals(protocol) ? "coap-client-openssl -v 9" : "coap-client";
return String.format("%s -m POST %s://%s%s/api/v1/%s/telemetry -t json -e %s",
client, protocol, host, port, deviceCredentials.getCredentialsId(), JSON_EXAMPLE_PAYLOAD);
case X509_CERTIFICATE:
if (COAPS.equals(protocol)) {
return CHECK_DOCUMENTATION;
}
default:
return null;
}

Loading…
Cancel
Save