Browse Source

Minor changes

pull/14529/head
Andrii Landiak 10 months ago
parent
commit
a2f196dc39
  1. 8
      msa/black-box-tests/src/test/java/org/thingsboard/server/msa/connectivity/JavaRestClientTest.java
  2. 2
      rest-client/src/main/java/org/thingsboard/rest/client/RestClient.java

8
msa/black-box-tests/src/test/java/org/thingsboard/server/msa/connectivity/JavaRestClientTest.java

@ -94,8 +94,8 @@ import java.util.Arrays;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Optional;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import java.util.stream.Stream;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
import static org.thingsboard.server.common.data.notification.NotificationDeliveryMethod.EMAIL; import static org.thingsboard.server.common.data.notification.NotificationDeliveryMethod.EMAIL;
@ -357,7 +357,7 @@ public class JavaRestClientTest extends AbstractContainerTest {
filter.setUsersIds(Arrays.stream(usersIds).map(UUIDBased::getId).toList()); filter.setUsersIds(Arrays.stream(usersIds).map(UUIDBased::getId).toList());
NotificationTarget notificationTarget = new NotificationTarget(); NotificationTarget notificationTarget = new NotificationTarget();
notificationTarget.setName(filter.toString() + org.apache.commons.lang3.RandomStringUtils.randomNumeric(5)); notificationTarget.setName(filter + RandomStringUtils.randomNumeric(5));
PlatformUsersNotificationTargetConfig targetConfig = new PlatformUsersNotificationTargetConfig(); PlatformUsersNotificationTargetConfig targetConfig = new PlatformUsersNotificationTargetConfig();
targetConfig.setUsersFilter(filter); targetConfig.setUsersFilter(filter);
notificationTarget.setConfiguration(targetConfig); notificationTarget.setConfiguration(targetConfig);
@ -407,7 +407,7 @@ public class JavaRestClientTest extends AbstractContainerTest {
NotificationRequestConfig config = new NotificationRequestConfig(); NotificationRequestConfig config = new NotificationRequestConfig();
config.setSendingDelayInSec(0); config.setSendingDelayInSec(0);
NotificationRequest notificationRequest = NotificationRequest.builder() NotificationRequest notificationRequest = NotificationRequest.builder()
.targets(List.of(targetId).stream().map(UUIDBased::getId).collect(Collectors.toList())) .targets(Stream.of(targetId).map(UUIDBased::getId).collect(Collectors.toList()))
.templateId(notificationTemplateId) .templateId(notificationTemplateId)
.additionalConfig(config) .additionalConfig(config)
.build(); .build();
@ -440,7 +440,7 @@ public class JavaRestClientTest extends AbstractContainerTest {
// Update API key description // Update API key description
String updatedDescription = "Updated description " + RandomStringUtils.randomAlphabetic(5); String updatedDescription = "Updated description " + RandomStringUtils.randomAlphabetic(5);
ApiKeyInfo updatedApiKeyInfo = restClient.updateApiKeyDescription(savedApiKey.getId(), Optional.of(updatedDescription)); ApiKeyInfo updatedApiKeyInfo = restClient.updateApiKeyDescription(savedApiKey.getId(), updatedDescription);
assertThat(updatedApiKeyInfo).isNotNull(); assertThat(updatedApiKeyInfo).isNotNull();
assertThat(updatedApiKeyInfo.getDescription()).isEqualTo(updatedDescription); assertThat(updatedApiKeyInfo.getDescription()).isEqualTo(updatedDescription);

2
rest-client/src/main/java/org/thingsboard/rest/client/RestClient.java

@ -3065,7 +3065,7 @@ public class RestClient implements Closeable {
new ParameterizedTypeReference<PageData<ApiKeyInfo>>() {}, params).getBody(); new ParameterizedTypeReference<PageData<ApiKeyInfo>>() {}, params).getBody();
} }
public ApiKeyInfo updateApiKeyDescription(ApiKeyId apiKeyId, Optional<String> description) { public ApiKeyInfo updateApiKeyDescription(ApiKeyId apiKeyId, String description) {
return restTemplate.exchange( return restTemplate.exchange(
baseURL + "/api/apiKey/{id}/description", baseURL + "/api/apiKey/{id}/description",
HttpMethod.PUT, HttpMethod.PUT,

Loading…
Cancel
Save