Browse Source
Merge pull request #13243 from thingsboard/fix_bug_lwm2m_404_profile
Fixed 404 error when accessing LwM2M Profile Transport Configuration with LwM2M disabled
pull/13258/head
Viacheslav Klimov
1 year ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with
6 additions and
6 deletions
-
application/src/main/java/org/thingsboard/server/controller/Lwm2mController.java
-
application/src/main/java/org/thingsboard/server/service/lwm2m/LwM2MServiceImpl.java
-
common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/config/LwM2MTransportBootstrapConfig.java
-
common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/config/LwM2MTransportServerConfig.java
|
|
|
@ -18,7 +18,6 @@ package org.thingsboard.server.controller; |
|
|
|
import io.swagger.v3.oas.annotations.Parameter; |
|
|
|
import lombok.extern.slf4j.Slf4j; |
|
|
|
import org.springframework.beans.factory.annotation.Autowired; |
|
|
|
import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression; |
|
|
|
import org.springframework.security.access.prepost.PreAuthorize; |
|
|
|
import org.springframework.web.bind.annotation.PathVariable; |
|
|
|
import org.springframework.web.bind.annotation.RequestBody; |
|
|
|
@ -33,6 +32,7 @@ import org.thingsboard.server.common.data.device.profile.lwm2m.bootstrap.LwM2MSe |
|
|
|
import org.thingsboard.server.common.data.exception.ThingsboardException; |
|
|
|
import org.thingsboard.server.common.data.security.DeviceCredentials; |
|
|
|
import org.thingsboard.server.config.annotations.ApiOperation; |
|
|
|
import org.thingsboard.server.queue.util.TbCoreComponent; |
|
|
|
import org.thingsboard.server.service.lwm2m.LwM2MService; |
|
|
|
|
|
|
|
import java.util.Map; |
|
|
|
@ -42,7 +42,7 @@ import static org.thingsboard.server.controller.ControllerConstants.TENANT_OR_CU |
|
|
|
|
|
|
|
@Slf4j |
|
|
|
@RestController |
|
|
|
@ConditionalOnExpression("('${service.type:null}'=='monolith' || '${service.type:null}'=='tb-core') && '${transport.lwm2m.enabled:false}'=='true'") |
|
|
|
@TbCoreComponent |
|
|
|
@RequestMapping("/api") |
|
|
|
public class Lwm2mController extends BaseController { |
|
|
|
|
|
|
|
|
|
|
|
@ -18,10 +18,10 @@ package org.thingsboard.server.service.lwm2m; |
|
|
|
import lombok.RequiredArgsConstructor; |
|
|
|
import lombok.extern.slf4j.Slf4j; |
|
|
|
import org.apache.commons.codec.binary.Base64; |
|
|
|
import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression; |
|
|
|
import org.springframework.stereotype.Service; |
|
|
|
import org.thingsboard.server.common.data.device.profile.lwm2m.bootstrap.LwM2MServerSecurityConfigDefault; |
|
|
|
import org.thingsboard.server.common.transport.config.ssl.SslCredentials; |
|
|
|
import org.thingsboard.server.queue.util.TbCoreComponent; |
|
|
|
import org.thingsboard.server.transport.lwm2m.config.LwM2MSecureServerConfig; |
|
|
|
import org.thingsboard.server.transport.lwm2m.config.LwM2MTransportBootstrapConfig; |
|
|
|
import org.thingsboard.server.transport.lwm2m.config.LwM2MTransportServerConfig; |
|
|
|
@ -31,7 +31,7 @@ import java.util.Optional; |
|
|
|
@Slf4j |
|
|
|
@Service |
|
|
|
@RequiredArgsConstructor |
|
|
|
@ConditionalOnExpression("('${service.type:null}'=='monolith' || '${service.type:null}'=='tb-core') && '${transport.lwm2m.enabled:false}'=='true'") |
|
|
|
@TbCoreComponent |
|
|
|
public class LwM2MServiceImpl implements LwM2MService { |
|
|
|
|
|
|
|
private final LwM2MTransportServerConfig serverConfig; |
|
|
|
|
|
|
|
@ -29,7 +29,7 @@ import org.thingsboard.server.common.transport.config.ssl.SslCredentialsConfig; |
|
|
|
|
|
|
|
@Slf4j |
|
|
|
@Component |
|
|
|
@ConditionalOnExpression("('${service.type:null}'=='tb-transport' || '${service.type:null}'=='monolith' || '${service.type:null}'=='tb-core') && '${transport.lwm2m.enabled:false}'=='true' && '${transport.lwm2m.bootstrap.enabled:false}'=='true'") |
|
|
|
@ConditionalOnExpression("'${service.type:null}'=='tb-transport' || '${service.type:null}'=='monolith' || '${service.type:null}'=='tb-core'") |
|
|
|
public class LwM2MTransportBootstrapConfig implements LwM2MSecureServerConfig { |
|
|
|
|
|
|
|
@Getter |
|
|
|
|
|
|
|
@ -34,7 +34,7 @@ import java.util.List; |
|
|
|
|
|
|
|
@Slf4j |
|
|
|
@Component |
|
|
|
@ConditionalOnExpression("('${service.type:null}'=='tb-transport' || '${service.type:null}'=='monolith' || '${service.type:null}'=='tb-core') && '${transport.lwm2m.enabled:false}'=='true'") |
|
|
|
@ConditionalOnExpression("'${service.type:null}'=='tb-transport' || '${service.type:null}'=='monolith' || '${service.type:null}'=='tb-core'") |
|
|
|
@ConfigurationProperties(prefix = "transport.lwm2m") |
|
|
|
public class LwM2MTransportServerConfig implements LwM2MSecureServerConfig { |
|
|
|
|
|
|
|
|
