dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #12725 from YevhenBondarenko/fix/coap-config

Browse Source 
Fix CoAP enabled properties
This commit is contained in:
Viacheslav Klimov 2025-02-25 11:45:31 +02:00 committed by GitHub
commit ff2ccefa66
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
application/src/main/resources/thingsboard.yml
View File

@ -1279,8 +1279,9 @@ transport:
# CoAP server parameters # CoAP server parameters
coap: coap:
# Enable/disable coap server. server:
enabled: "${COAP_SERVER_ENABLED:true}" # Enable/disable coap server.
enabled: "${COAP_SERVER_ENABLED:true}"
# CoAP bind address # CoAP bind address
bind_address: "${COAP_BIND_ADDRESS:0.0.0.0}" bind_address: "${COAP_BIND_ADDRESS:0.0.0.0}"
# CoAP bind port # CoAP bind port

2
application/src/test/java/org/thingsboard/server/transport/coap/AbstractCoapIntegrationTest.java
View File

@ -45,7 +45,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNotNull;
@TestPropertySource(properties = { @TestPropertySource(properties = {
"coap.enabled=true", "coap.server.enabled=true",
"service.integrations.supported=ALL", "service.integrations.supported=ALL",
"transport.coap.enabled=true", "transport.coap.enabled=true",
}) })

2
application/src/test/java/org/thingsboard/server/transport/coap/security/AbstractCoapSecurityIntegrationTest.java
View File

@ -61,7 +61,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
@Slf4j @Slf4j
@TestPropertySource(properties = { @TestPropertySource(properties = {
"coap.enabled=true", "coap.server.enabled=true",
"coap.dtls.enabled=true", "coap.dtls.enabled=true",
"coap.dtls.credentials.pem.cert_file=coap/credentials/server/cert.pem", "coap.dtls.credentials.pem.cert_file=coap/credentials/server/cert.pem",
"device.connectivity.coaps.enabled=true", "device.connectivity.coaps.enabled=true",

2
application/src/test/resources/application-test.properties
View File

@ -19,7 +19,7 @@ transport.mqtt.enabled=false
transport.coap.enabled=false transport.coap.enabled=false
transport.lwm2m.enabled=false transport.lwm2m.enabled=false
transport.snmp.enabled=false transport.snmp.enabled=false
coap.enabled=false coap.server.enabled=false
integrations.rpc.enabled=false integrations.rpc.enabled=false
service.integrations.supported=NONE service.integrations.supported=NONE

2
common/coap-server/src/main/java/org/thingsboard/server/coapserver/TbCoapServerComponent.java
View File

@ -21,6 +21,6 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;
@Retention(RetentionPolicy.RUNTIME) @Retention(RetentionPolicy.RUNTIME)
@ConditionalOnExpression("'${service.type:null}'=='tb-transport' || ('${service.type:null}'=='monolith' && '${transport.api_enabled:true}'=='true' && '${coap.enabled}'=='true')") @ConditionalOnExpression("'${service.type:null}'=='tb-transport' || ('${service.type:null}'=='monolith' && '${transport.api_enabled:true}'=='true' && '${coap.server.enabled}'=='true')")
public @interface TbCoapServerComponent { public @interface TbCoapServerComponent {
} }

2
common/coap-server/src/main/java/org/thingsboard/server/coapserver/TbCoapTransportComponent.java
View File

@ -22,6 +22,6 @@ import java.lang.annotation.RetentionPolicy;
@Retention(RetentionPolicy.RUNTIME) @Retention(RetentionPolicy.RUNTIME)
@ConditionalOnExpression("'${service.type:null}'=='tb-transport' || " + @ConditionalOnExpression("'${service.type:null}'=='tb-transport' || " +
"('${service.type:null}'=='monolith' && '${transport.api_enabled:true}'=='true' && '${coap.enabled}'=='true' && '${transport.coap.enabled}'=='true')") "('${service.type:null}'=='monolith' && '${transport.api_enabled:true}'=='true' && '${coap.server.enabled}'=='true' && '${transport.coap.enabled}'=='true')")
public @interface TbCoapTransportComponent { public @interface TbCoapTransportComponent {
} }