Vladyslav_Prykhodko
1 year ago
253 changed files with 6236 additions and 2621 deletions
|
Before Width: | Height: | Size: 9.0 KiB After Width: | Height: | Size: 7.4 KiB |
|
Before Width: | Height: | Size: 17 KiB After Width: | Height: | Size: 16 KiB |
|
Before Width: | Height: | Size: 21 KiB After Width: | Height: | Size: 19 KiB |
|
Before Width: | Height: | Size: 10 KiB After Width: | Height: | Size: 8.9 KiB |
|
Before Width: | Height: | Size: 9.0 KiB After Width: | Height: | Size: 7.4 KiB |
|
Before Width: | Height: | Size: 17 KiB After Width: | Height: | Size: 16 KiB |
|
Before Width: | Height: | Size: 9.0 KiB After Width: | Height: | Size: 7.4 KiB |
|
Before Width: | Height: | Size: 10 KiB After Width: | Height: | Size: 8.9 KiB |
|
Before Width: | Height: | Size: 10 KiB After Width: | Height: | Size: 8.9 KiB |
|
Before Width: | Height: | Size: 17 KiB After Width: | Height: | Size: 16 KiB |
|
Before Width: | Height: | Size: 9.0 KiB After Width: | Height: | Size: 7.4 KiB |
|
Before Width: | Height: | Size: 17 KiB After Width: | Height: | Size: 16 KiB |
|
Before Width: | Height: | Size: 10 KiB After Width: | Height: | Size: 8.9 KiB |
@ -0,0 +1,37 @@ |
|||||
|
/** |
||||
|
* Copyright © 2016-2025 The Thingsboard Authors |
||||
|
* |
||||
|
* Licensed under the Apache License, Version 2.0 (the "License"); |
||||
|
* you may not use this file except in compliance with the License. |
||||
|
* You may obtain a copy of the License at |
||||
|
* |
||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
* |
||||
|
* Unless required by applicable law or agreed to in writing, software |
||||
|
* distributed under the License is distributed on an "AS IS" BASIS, |
||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
||||
|
* See the License for the specific language governing permissions and |
||||
|
* limitations under the License. |
||||
|
*/ |
||||
|
package org.thingsboard.server.config.mqtt; |
||||
|
|
||||
|
import jakarta.validation.constraints.PositiveOrZero; |
||||
|
import lombok.Data; |
||||
|
import org.springframework.boot.context.properties.ConfigurationProperties; |
||||
|
import org.springframework.context.annotation.Configuration; |
||||
|
import org.springframework.validation.annotation.Validated; |
||||
|
|
||||
|
@Data |
||||
|
@Validated |
||||
|
@Configuration |
||||
|
@ConfigurationProperties(prefix = "mqtt.client.retransmission") |
||||
|
public class MqttClientRetransmissionSettingsComponent { |
||||
|
|
||||
|
@PositiveOrZero |
||||
|
private int maxAttempts; |
||||
|
@PositiveOrZero |
||||
|
private long initialDelayMillis; |
||||
|
@PositiveOrZero |
||||
|
private double jitterFactor; |
||||
|
|
||||
|
} |
||||
@ -0,0 +1,47 @@ |
|||||
|
/** |
||||
|
* Copyright © 2016-2025 The Thingsboard Authors |
||||
|
* |
||||
|
* Licensed under the Apache License, Version 2.0 (the "License"); |
||||
|
* you may not use this file except in compliance with the License. |
||||
|
* You may obtain a copy of the License at |
||||
|
* |
||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
* |
||||
|
* Unless required by applicable law or agreed to in writing, software |
||||
|
* distributed under the License is distributed on an "AS IS" BASIS, |
||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
||||
|
* See the License for the specific language governing permissions and |
||||
|
* limitations under the License. |
||||
|
*/ |
||||
|
package org.thingsboard.server.config.mqtt; |
||||
|
|
||||
|
import lombok.EqualsAndHashCode; |
||||
|
import lombok.RequiredArgsConstructor; |
||||
|
import lombok.ToString; |
||||
|
import org.springframework.context.annotation.Configuration; |
||||
|
import org.thingsboard.rule.engine.api.MqttClientSettings; |
||||
|
|
||||
|
@ToString |
||||
|
@EqualsAndHashCode |
||||
|
@Configuration |
||||
|
@RequiredArgsConstructor |
||||
|
public class MqttClientSettingsComponent implements MqttClientSettings { |
||||
|
|
||||
|
private final MqttClientRetransmissionSettingsComponent retransmissionSettingsComponent; |
||||
|
|
||||
|
@Override |
||||
|
public int getRetransmissionMaxAttempts() { |
||||
|
return retransmissionSettingsComponent.getMaxAttempts(); |
||||
|
} |
||||
|
|
||||
|
@Override |
||||
|
public long getRetransmissionInitialDelayMillis() { |
||||
|
return retransmissionSettingsComponent.getInitialDelayMillis(); |
||||
|
} |
||||
|
|
||||
|
@Override |
||||
|
public double getRetransmissionJitterFactor() { |
||||
|
return retransmissionSettingsComponent.getJitterFactor(); |
||||
|
} |
||||
|
|
||||
|
} |
||||
@ -0,0 +1,80 @@ |
|||||
|
/** |
||||
|
* Copyright © 2016-2025 The Thingsboard Authors |
||||
|
* |
||||
|
* Licensed under the Apache License, Version 2.0 (the "License"); |
||||
|
* you may not use this file except in compliance with the License. |
||||
|
* You may obtain a copy of the License at |
||||
|
* |
||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
* |
||||
|
* Unless required by applicable law or agreed to in writing, software |
||||
|
* distributed under the License is distributed on an "AS IS" BASIS, |
||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
||||
|
* See the License for the specific language governing permissions and |
||||
|
* limitations under the License. |
||||
|
*/ |
||||
|
package org.thingsboard.server.controller; |
||||
|
|
||||
|
import lombok.RequiredArgsConstructor; |
||||
|
import org.springframework.security.access.prepost.PreAuthorize; |
||||
|
import org.springframework.security.core.annotation.AuthenticationPrincipal; |
||||
|
import org.springframework.web.bind.annotation.GetMapping; |
||||
|
import org.springframework.web.bind.annotation.PostMapping; |
||||
|
import org.springframework.web.bind.annotation.RequestBody; |
||||
|
import org.springframework.web.bind.annotation.RequestMapping; |
||||
|
import org.springframework.web.bind.annotation.RestController; |
||||
|
import org.thingsboard.server.common.data.exception.ThingsboardException; |
||||
|
import org.thingsboard.server.common.data.id.TenantId; |
||||
|
import org.thingsboard.server.common.data.trendz.TrendzSettings; |
||||
|
import org.thingsboard.server.config.annotations.ApiOperation; |
||||
|
import org.thingsboard.server.dao.trendz.TrendzSettingsService; |
||||
|
import org.thingsboard.server.queue.util.TbCoreComponent; |
||||
|
import org.thingsboard.server.service.security.model.SecurityUser; |
||||
|
import org.thingsboard.server.service.security.permission.Operation; |
||||
|
import org.thingsboard.server.service.security.permission.Resource; |
||||
|
|
||||
|
import static org.thingsboard.server.controller.ControllerConstants.MARKDOWN_CODE_BLOCK_END; |
||||
|
import static org.thingsboard.server.controller.ControllerConstants.MARKDOWN_CODE_BLOCK_START; |
||||
|
import static org.thingsboard.server.controller.ControllerConstants.NEW_LINE; |
||||
|
import static org.thingsboard.server.controller.ControllerConstants.TENANT_AUTHORITY_PARAGRAPH; |
||||
|
import static org.thingsboard.server.controller.ControllerConstants.TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH; |
||||
|
|
||||
|
@RestController |
||||
|
@TbCoreComponent |
||||
|
@RequiredArgsConstructor |
||||
|
@RequestMapping("/api") |
||||
|
public class TrendzController extends BaseController { |
||||
|
|
||||
|
private final TrendzSettingsService trendzSettingsService; |
||||
|
|
||||
|
@ApiOperation(value = "Save Trendz settings (saveTrendzSettings)", |
||||
|
notes = "Saves Trendz settings for this tenant.\n" + NEW_LINE + |
||||
|
"Here is an example of the Trendz settings:\n" + |
||||
|
MARKDOWN_CODE_BLOCK_START + |
||||
|
"{\n" + |
||||
|
" \"enabled\": true,\n" + |
||||
|
" \"baseUrl\": \"https://some.domain.com:18888/also_necessary_prefix\"\n" + |
||||
|
"}" + |
||||
|
MARKDOWN_CODE_BLOCK_END + |
||||
|
TENANT_AUTHORITY_PARAGRAPH) |
||||
|
@PostMapping("/trendz/settings") |
||||
|
@PreAuthorize("hasAnyAuthority('TENANT_ADMIN')") |
||||
|
public TrendzSettings saveTrendzSettings(@RequestBody TrendzSettings trendzSettings, |
||||
|
@AuthenticationPrincipal SecurityUser user) throws ThingsboardException { |
||||
|
accessControlService.checkPermission(user, Resource.ADMIN_SETTINGS, Operation.WRITE); |
||||
|
TenantId tenantId = user.getTenantId(); |
||||
|
trendzSettingsService.saveTrendzSettings(tenantId, trendzSettings); |
||||
|
return trendzSettings; |
||||
|
} |
||||
|
|
||||
|
@ApiOperation(value = "Get Trendz Settings (getTrendzSettings)", |
||||
|
notes = "Retrieves Trendz settings for this tenant." + |
||||
|
TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH) |
||||
|
@GetMapping("/trendz/settings") |
||||
|
@PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')") |
||||
|
public TrendzSettings getTrendzSettings(@AuthenticationPrincipal SecurityUser user) { |
||||
|
TenantId tenantId = user.getTenantId(); |
||||
|
return trendzSettingsService.findTrendzSettings(tenantId); |
||||
|
} |
||||
|
|
||||
|
} |
||||
@ -0,0 +1,46 @@ |
|||||
|
/** |
||||
|
* Copyright © 2016-2025 The Thingsboard Authors |
||||
|
* |
||||
|
* Licensed under the Apache License, Version 2.0 (the "License"); |
||||
|
* you may not use this file except in compliance with the License. |
||||
|
* You may obtain a copy of the License at |
||||
|
* |
||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
* |
||||
|
* Unless required by applicable law or agreed to in writing, software |
||||
|
* distributed under the License is distributed on an "AS IS" BASIS, |
||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
||||
|
* See the License for the specific language governing permissions and |
||||
|
* limitations under the License. |
||||
|
*/ |
||||
|
package org.thingsboard.server.service.security.auth; |
||||
|
|
||||
|
import jakarta.servlet.FilterChain; |
||||
|
import jakarta.servlet.http.HttpServletRequest; |
||||
|
import jakarta.servlet.http.HttpServletResponse; |
||||
|
import lombok.RequiredArgsConstructor; |
||||
|
import lombok.extern.slf4j.Slf4j; |
||||
|
import org.springframework.security.core.AuthenticationException; |
||||
|
import org.springframework.stereotype.Component; |
||||
|
import org.springframework.web.filter.OncePerRequestFilter; |
||||
|
import org.thingsboard.server.exception.ThingsboardErrorResponseHandler; |
||||
|
|
||||
|
@Component |
||||
|
@RequiredArgsConstructor |
||||
|
@Slf4j |
||||
|
public class AuthExceptionHandler extends OncePerRequestFilter { |
||||
|
|
||||
|
private final ThingsboardErrorResponseHandler errorResponseHandler; |
||||
|
|
||||
|
@Override |
||||
|
protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain) { |
||||
|
try { |
||||
|
filterChain.doFilter(request, response); |
||||
|
} catch (AuthenticationException e) { |
||||
|
throw e; |
||||
|
} catch (Exception e) { |
||||
|
errorResponseHandler.handle(e, response); |
||||
|
} |
||||
|
} |
||||
|
|
||||
|
} |
||||
File diff suppressed because one or more lines are too long
@ -0,0 +1,77 @@ |
|||||
|
/** |
||||
|
* Copyright © 2016-2025 The Thingsboard Authors |
||||
|
* |
||||
|
* Licensed under the Apache License, Version 2.0 (the "License"); |
||||
|
* you may not use this file except in compliance with the License. |
||||
|
* You may obtain a copy of the License at |
||||
|
* |
||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
* |
||||
|
* Unless required by applicable law or agreed to in writing, software |
||||
|
* distributed under the License is distributed on an "AS IS" BASIS, |
||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
||||
|
* See the License for the specific language governing permissions and |
||||
|
* limitations under the License. |
||||
|
*/ |
||||
|
package org.thingsboard.server.controller; |
||||
|
|
||||
|
import org.junit.Before; |
||||
|
import org.junit.Test; |
||||
|
import org.thingsboard.server.common.data.trendz.TrendzSettings; |
||||
|
import org.thingsboard.server.dao.service.DaoSqlTest; |
||||
|
|
||||
|
import static org.assertj.core.api.Assertions.assertThat; |
||||
|
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; |
||||
|
|
||||
|
@DaoSqlTest |
||||
|
public class TrendzControllerTest extends AbstractControllerTest { |
||||
|
|
||||
|
private final String trendzUrl = "https://some.domain.com:18888/also_necessary_prefix"; |
||||
|
|
||||
|
@Before |
||||
|
public void setUp() throws Exception { |
||||
|
loginTenantAdmin(); |
||||
|
|
||||
|
TrendzSettings trendzSettings = new TrendzSettings(); |
||||
|
trendzSettings.setEnabled(true); |
||||
|
trendzSettings.setBaseUrl(trendzUrl); |
||||
|
|
||||
|
doPost("/api/trendz/settings", trendzSettings).andExpect(status().isOk()); |
||||
|
} |
||||
|
|
||||
|
@Test |
||||
|
public void testTrendzSettingsWhenTenant() throws Exception { |
||||
|
loginTenantAdmin(); |
||||
|
|
||||
|
TrendzSettings trendzSettings = doGet("/api/trendz/settings", TrendzSettings.class); |
||||
|
|
||||
|
assertThat(trendzSettings).isNotNull(); |
||||
|
assertThat(trendzSettings.isEnabled()).isTrue(); |
||||
|
assertThat(trendzSettings.getBaseUrl()).isEqualTo(trendzUrl); |
||||
|
|
||||
|
String updatedUrl = "https://some.domain.com:18888/tenant_trendz"; |
||||
|
trendzSettings.setBaseUrl(updatedUrl); |
||||
|
|
||||
|
doPost("/api/trendz/settings", trendzSettings).andExpect(status().isOk()); |
||||
|
|
||||
|
TrendzSettings updatedTrendzSettings = doGet("/api/trendz/settings", TrendzSettings.class); |
||||
|
assertThat(updatedTrendzSettings).isEqualTo(trendzSettings); |
||||
|
} |
||||
|
|
||||
|
@Test |
||||
|
public void testTrendzSettingsWhenCustomer() throws Exception { |
||||
|
loginCustomerUser(); |
||||
|
|
||||
|
TrendzSettings newTrendzSettings = new TrendzSettings(); |
||||
|
newTrendzSettings.setEnabled(true); |
||||
|
newTrendzSettings.setBaseUrl("https://some.domain.com:18888/customer_trendz"); |
||||
|
|
||||
|
doPost("/api/trendz/settings", newTrendzSettings).andExpect(status().isForbidden()); |
||||
|
|
||||
|
TrendzSettings fetchedTrendzSettings = doGet("/api/trendz/settings", TrendzSettings.class); |
||||
|
assertThat(fetchedTrendzSettings).isNotNull(); |
||||
|
assertThat(fetchedTrendzSettings.isEnabled()).isTrue(); |
||||
|
assertThat(fetchedTrendzSettings.getBaseUrl()).isEqualTo(trendzUrl); |
||||
|
} |
||||
|
|
||||
|
} |
||||
@ -0,0 +1,42 @@ |
|||||
|
/** |
||||
|
* Copyright © 2016-2025 The Thingsboard Authors |
||||
|
* |
||||
|
* Licensed under the Apache License, Version 2.0 (the "License"); |
||||
|
* you may not use this file except in compliance with the License. |
||||
|
* You may obtain a copy of the License at |
||||
|
* |
||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
* |
||||
|
* Unless required by applicable law or agreed to in writing, software |
||||
|
* distributed under the License is distributed on an "AS IS" BASIS, |
||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
||||
|
* See the License for the specific language governing permissions and |
||||
|
* limitations under the License. |
||||
|
*/ |
||||
|
package org.thingsboard.server.transport.lwm2m.transportConfiguration; |
||||
|
|
||||
|
import org.junit.Assert; |
||||
|
import org.junit.Test; |
||||
|
import org.thingsboard.server.common.data.device.profile.Lwm2mDeviceProfileTransportConfiguration; |
||||
|
import org.thingsboard.server.transport.lwm2m.security.AbstractSecurityLwM2MIntegrationTest; |
||||
|
|
||||
|
import static org.thingsboard.server.common.data.device.profile.lwm2m.TelemetryObserveStrategy.COMPOSITE_ALL; |
||||
|
import static org.thingsboard.server.common.data.device.profile.lwm2m.TelemetryObserveStrategy.SINGLE; |
||||
|
import static org.thingsboard.server.transport.lwm2m.Lwm2mTestHelper.LwM2MProfileBootstrapConfigType.NONE; |
||||
|
|
||||
|
public class ObserveStrategyTransportConfigurationTest extends AbstractSecurityLwM2MIntegrationTest { |
||||
|
|
||||
|
@Test |
||||
|
public void testTransportConfigurationObserveStrategyBeforeParseNullAfterParseNotNull_STRATEGY_SINGLE() throws Exception { |
||||
|
Lwm2mDeviceProfileTransportConfiguration transportConfiguration = getTransportConfiguration(TELEMETRY_WITHOUT_OBSERVE, getBootstrapServerCredentialsNoSec(NONE)); |
||||
|
Assert.assertNotNull(transportConfiguration.getObserveAttr().getObserveStrategy()); |
||||
|
Assert.assertEquals(SINGLE, transportConfiguration.getObserveAttr().getObserveStrategy()); |
||||
|
} |
||||
|
|
||||
|
@Test |
||||
|
public void testTransportConfigurationObserveStrategyBeforeParseNotNullAfterParseNotNull_STRATEGY_COMPOSITE_ALL() throws Exception { |
||||
|
Lwm2mDeviceProfileTransportConfiguration transportConfiguration = getTransportConfiguration(TELEMETRY_WITH_COMPOSITE_ALL_OBSERVE_ID_3_ID_19, getBootstrapServerCredentialsNoSec(NONE)); |
||||
|
Assert.assertNotNull(transportConfiguration.getObserveAttr().getObserveStrategy()); |
||||
|
Assert.assertEquals(COMPOSITE_ALL, transportConfiguration.getObserveAttr().getObserveStrategy()); |
||||
|
} |
||||
|
} |
||||
@ -0,0 +1,63 @@ |
|||||
|
/** |
||||
|
* Copyright © 2016-2025 The Thingsboard Authors |
||||
|
* |
||||
|
* Licensed under the Apache License, Version 2.0 (the "License"); |
||||
|
* you may not use this file except in compliance with the License. |
||||
|
* You may obtain a copy of the License at |
||||
|
* |
||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
* |
||||
|
* Unless required by applicable law or agreed to in writing, software |
||||
|
* distributed under the License is distributed on an "AS IS" BASIS, |
||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
||||
|
* See the License for the specific language governing permissions and |
||||
|
* limitations under the License. |
||||
|
*/ |
||||
|
package org.thingsboard.server.transport.lwm2m.transportConfiguration; |
||||
|
|
||||
|
import org.junit.Test; |
||||
|
import org.thingsboard.server.common.data.device.credentials.lwm2m.LwM2MDeviceCredentials; |
||||
|
import org.thingsboard.server.common.data.device.profile.Lwm2mDeviceProfileTransportConfiguration; |
||||
|
import org.thingsboard.server.transport.lwm2m.security.AbstractSecurityLwM2MIntegrationTest; |
||||
|
|
||||
|
import static org.thingsboard.server.common.data.device.profile.lwm2m.TelemetryObserveStrategy.COMPOSITE_ALL; |
||||
|
import static org.thingsboard.server.common.data.device.profile.lwm2m.TelemetryObserveStrategy.COMPOSITE_BY_OBJECT; |
||||
|
import static org.thingsboard.server.transport.lwm2m.Lwm2mTestHelper.LwM2MProfileBootstrapConfigType.NONE; |
||||
|
|
||||
|
public class ObserveStrategyWithNoSecQueueModeConnectTest extends AbstractSecurityLwM2MIntegrationTest { |
||||
|
|
||||
|
@Test |
||||
|
public void testWithNoSecQueueModeConnectLwm2mSuccessAndObserveSingleTelemetryUpdateProfileAfterConnected() throws Exception { |
||||
|
String clientEndpoint = CLIENT_ENDPOINT_NO_SEC + "_ObserveSingle"; |
||||
|
LwM2MDeviceCredentials clientCredentials = getDeviceCredentialsNoSec(createNoSecClientCredentials(clientEndpoint)); |
||||
|
super.basicTestConnectionObserveSingleTelemetry(SECURITY_NO_SEC, clientCredentials, clientEndpoint, true, true); |
||||
|
} |
||||
|
|
||||
|
@Test |
||||
|
public void testWithNoSecQueueModeConnectLwm2mSuccessAndObserveCompositeAllTelemetry_Both_UpdateProfileAfterConnected() throws Exception { |
||||
|
String clientEndpoint = CLIENT_ENDPOINT_NO_SEC + "_ObserveCompositeAll"; |
||||
|
LwM2MDeviceCredentials clientCredentials = getDeviceCredentialsNoSec(createNoSecClientCredentials(clientEndpoint)); |
||||
|
Lwm2mDeviceProfileTransportConfiguration transportConfiguration = super.getTransportConfiguration(TELEMETRY_WITH_SINGLE_PARAMS_OBJECT_ID_5_ID_3, getBootstrapServerCredentialsNoSec(NONE)); |
||||
|
transportConfiguration.getObserveAttr().setObserveStrategy(COMPOSITE_ALL); |
||||
|
super.basicTestConnectionObserveCompositeTelemetry(SECURITY_NO_SEC, clientCredentials, clientEndpoint, transportConfiguration, 1, 0); |
||||
|
} |
||||
|
|
||||
|
@Test |
||||
|
public void testWithNoSecQueueModeConnectLwm2mSuccessAndObserveCompositeByObjectTelemetry_Both_UpdateProfileAfterConnected() throws Exception { |
||||
|
String clientEndpoint = CLIENT_ENDPOINT_NO_SEC + "_ObserveCompositeByObject"; |
||||
|
LwM2MDeviceCredentials clientCredentials = getDeviceCredentialsNoSec(createNoSecClientCredentials(clientEndpoint)); |
||||
|
Lwm2mDeviceProfileTransportConfiguration transportConfiguration = super.getTransportConfiguration(TELEMETRY_WITH_SINGLE_PARAMS_OBJECT_ID_5_ID_3, getBootstrapServerCredentialsNoSec(NONE)); |
||||
|
transportConfiguration.getObserveAttr().setObserveStrategy(COMPOSITE_BY_OBJECT); |
||||
|
super.basicTestConnectionObserveCompositeTelemetry(SECURITY_NO_SEC, clientCredentials, clientEndpoint, transportConfiguration, 2, 1); |
||||
|
} |
||||
|
|
||||
|
@Test |
||||
|
public void testWithNoSecQueueModeConnectLwm2mSuccessAndObserveCompositeByObjectTelemetry_Single_UpdateProfileAfterConnected() throws Exception { |
||||
|
String clientEndpoint = CLIENT_ENDPOINT_NO_SEC + "_ObserveCompositeByObject_Single"; |
||||
|
LwM2MDeviceCredentials clientCredentials = getDeviceCredentialsNoSec(createNoSecClientCredentials(clientEndpoint)); |
||||
|
Lwm2mDeviceProfileTransportConfiguration transportConfiguration = super.getTransportConfiguration(TELEMETRY_WITH_SINGLE_PARAMS_OBJECT_ID_5_ID_3, getBootstrapServerCredentialsNoSec(NONE)); |
||||
|
transportConfiguration.getObserveAttr().setObserveStrategy(COMPOSITE_BY_OBJECT); |
||||
|
super.basicTestConnectionObserveCompositeTelemetry(SECURITY_NO_SEC, clientCredentials, clientEndpoint, transportConfiguration, 2, 2); |
||||
|
} |
||||
|
} |
||||
|
|
||||
@ -0,0 +1,29 @@ |
|||||
|
/** |
||||
|
* Copyright © 2016-2025 The Thingsboard Authors |
||||
|
* |
||||
|
* Licensed under the Apache License, Version 2.0 (the "License"); |
||||
|
* you may not use this file except in compliance with the License. |
||||
|
* You may obtain a copy of the License at |
||||
|
* |
||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
* |
||||
|
* Unless required by applicable law or agreed to in writing, software |
||||
|
* distributed under the License is distributed on an "AS IS" BASIS, |
||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
||||
|
* See the License for the specific language governing permissions and |
||||
|
* limitations under the License. |
||||
|
*/ |
||||
|
package org.thingsboard.server.dao.trendz; |
||||
|
|
||||
|
import org.thingsboard.server.common.data.id.TenantId; |
||||
|
import org.thingsboard.server.common.data.trendz.TrendzSettings; |
||||
|
|
||||
|
public interface TrendzSettingsService { |
||||
|
|
||||
|
void saveTrendzSettings(TenantId tenantId, TrendzSettings settings); |
||||
|
|
||||
|
TrendzSettings findTrendzSettings(TenantId tenantId); |
||||
|
|
||||
|
void deleteTrendzSettings(TenantId tenantId); |
||||
|
|
||||
|
} |
||||
@ -0,0 +1,59 @@ |
|||||
|
/** |
||||
|
* Copyright © 2016-2025 The Thingsboard Authors |
||||
|
* |
||||
|
* Licensed under the Apache License, Version 2.0 (the "License"); |
||||
|
* you may not use this file except in compliance with the License. |
||||
|
* You may obtain a copy of the License at |
||||
|
* |
||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
* |
||||
|
* Unless required by applicable law or agreed to in writing, software |
||||
|
* distributed under the License is distributed on an "AS IS" BASIS, |
||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
||||
|
* See the License for the specific language governing permissions and |
||||
|
* limitations under the License. |
||||
|
*/ |
||||
|
package org.thingsboard.server.common.data.device.profile.lwm2m; |
||||
|
|
||||
|
import lombok.Getter; |
||||
|
|
||||
|
public enum TelemetryObserveStrategy { |
||||
|
|
||||
|
SINGLE("One resource equals one single observe request", 0), |
||||
|
COMPOSITE_ALL("All resources in one composite observe request", 1), |
||||
|
COMPOSITE_BY_OBJECT("Grouped composite observe requests by object", 2); |
||||
|
|
||||
|
@Getter |
||||
|
private final String description; |
||||
|
|
||||
|
@Getter |
||||
|
private final int id; |
||||
|
|
||||
|
TelemetryObserveStrategy(String description, int id) { |
||||
|
this.description = description; |
||||
|
this.id = id; |
||||
|
} |
||||
|
|
||||
|
public static TelemetryObserveStrategy fromDescription(String description) { |
||||
|
for (TelemetryObserveStrategy strategy : values()) { |
||||
|
if (strategy.description.equalsIgnoreCase(description)) { |
||||
|
return strategy; |
||||
|
} |
||||
|
} |
||||
|
throw new IllegalArgumentException("Unknown TelemetryObserveStrategy id: " + description); |
||||
|
} |
||||
|
|
||||
|
public static TelemetryObserveStrategy fromId(int id) { |
||||
|
for (TelemetryObserveStrategy strategy : values()) { |
||||
|
if (strategy.id == id) { |
||||
|
return strategy; |
||||
|
} |
||||
|
} |
||||
|
throw new IllegalArgumentException("Unknown TelemetryObserveStrategy id: " + id); |
||||
|
} |
||||
|
|
||||
|
@Override |
||||
|
public String toString() { |
||||
|
return name() + " (" + id + "): " + description; |
||||
|
} |
||||
|
} |
||||
@ -0,0 +1,26 @@ |
|||||
|
/** |
||||
|
* Copyright © 2016-2025 The Thingsboard Authors |
||||
|
* |
||||
|
* Licensed under the Apache License, Version 2.0 (the "License"); |
||||
|
* you may not use this file except in compliance with the License. |
||||
|
* You may obtain a copy of the License at |
||||
|
* |
||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
* |
||||
|
* Unless required by applicable law or agreed to in writing, software |
||||
|
* distributed under the License is distributed on an "AS IS" BASIS, |
||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
||||
|
* See the License for the specific language governing permissions and |
||||
|
* limitations under the License. |
||||
|
*/ |
||||
|
package org.thingsboard.server.common.data.trendz; |
||||
|
|
||||
|
import lombok.Data; |
||||
|
|
||||
|
@Data |
||||
|
public class TrendzSettings { |
||||
|
|
||||
|
private boolean enabled; |
||||
|
private String baseUrl; |
||||
|
|
||||
|
} |
||||
Some files were not shown because too many files changed in this diff
Loading…
Reference in new issue