Viacheslav Klimov
7 months ago
committed by
GitHub
GitHub
36 changed files with 508 additions and 114 deletions
@ -0,0 +1,43 @@ |
|||||
|
/** |
||||
|
* Copyright © 2016-2026 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.edge.rpc; |
||||
|
|
||||
|
import com.google.common.util.concurrent.FutureCallback; |
||||
|
import jakarta.annotation.Nullable; |
||||
|
import lombok.AllArgsConstructor; |
||||
|
import lombok.extern.slf4j.Slf4j; |
||||
|
import org.thingsboard.server.common.data.id.EdgeId; |
||||
|
import org.thingsboard.server.common.data.id.TenantId; |
||||
|
|
||||
|
@Slf4j |
||||
|
@AllArgsConstructor |
||||
|
public class AttributeSaveCallback implements FutureCallback<Void> { |
||||
|
|
||||
|
private final TenantId tenantId; |
||||
|
private final EdgeId edgeId; |
||||
|
private final String key; |
||||
|
private final Object value; |
||||
|
|
||||
|
@Override |
||||
|
public void onSuccess(@Nullable Void result) { |
||||
|
log.trace("[{}][{}] Successfully updated attribute [{}] with value [{}]", tenantId, edgeId, key, value); |
||||
|
} |
||||
|
|
||||
|
@Override |
||||
|
public void onFailure(Throwable t) { |
||||
|
log.warn("[{}][{}] Failed to update attribute [{}] with value [{}]", tenantId, edgeId, key, value, t); |
||||
|
} |
||||
|
} |
||||
@ -0,0 +1,79 @@ |
|||||
|
/** |
||||
|
* Copyright © 2016-2026 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.edge; |
||||
|
|
||||
|
import com.fasterxml.jackson.databind.node.ObjectNode; |
||||
|
import com.google.protobuf.AbstractMessage; |
||||
|
import org.junit.Assert; |
||||
|
import org.junit.Test; |
||||
|
import org.springframework.beans.factory.annotation.Autowired; |
||||
|
import org.thingsboard.common.util.JacksonUtil; |
||||
|
import org.thingsboard.server.common.data.AdminSettings; |
||||
|
import org.thingsboard.server.dao.service.DaoSqlTest; |
||||
|
import org.thingsboard.server.dao.settings.AdminSettingsService; |
||||
|
import org.thingsboard.server.gen.edge.v1.AdminSettingsUpdateMsg; |
||||
|
|
||||
|
@DaoSqlTest |
||||
|
public class AdminSettingsEdgeTest extends AbstractEdgeTest { |
||||
|
|
||||
|
@Autowired |
||||
|
private AdminSettingsService adminSettingsService; |
||||
|
|
||||
|
@Test |
||||
|
public void testAdminSettings() throws Exception { |
||||
|
loginSysAdmin(); |
||||
|
|
||||
|
// save
|
||||
|
AdminSettings adminSettings = new AdminSettings(); |
||||
|
adminSettings.setKey("edgeTest"); |
||||
|
ObjectNode jsonValue = JacksonUtil.newObjectNode(); |
||||
|
jsonValue.put("key1", "value1"); |
||||
|
adminSettings.setJsonValue(jsonValue); |
||||
|
|
||||
|
edgeImitator.expectMessageAmount(1); |
||||
|
AdminSettings savedAdminSettings = doPost("/api/admin/settings", adminSettings, AdminSettings.class); |
||||
|
Assert.assertTrue(edgeImitator.waitForMessages()); |
||||
|
|
||||
|
AbstractMessage latestMessage = edgeImitator.getLatestMessage(); |
||||
|
Assert.assertTrue(latestMessage instanceof AdminSettingsUpdateMsg); |
||||
|
AdminSettingsUpdateMsg adminSettingsUpdateMsg = (AdminSettingsUpdateMsg) latestMessage; |
||||
|
AdminSettings adminSettingsMsg = JacksonUtil.fromString(adminSettingsUpdateMsg.getEntity(), AdminSettings.class, true); |
||||
|
Assert.assertNotNull(adminSettingsMsg); |
||||
|
Assert.assertEquals("edgeTest", adminSettingsMsg.getKey()); |
||||
|
Assert.assertEquals("value1", adminSettingsMsg.getJsonValue().get("key1").asText()); |
||||
|
|
||||
|
// update
|
||||
|
ObjectNode updatedJsonValue = (ObjectNode) savedAdminSettings.getJsonValue(); |
||||
|
updatedJsonValue.put("key2", "value2"); |
||||
|
savedAdminSettings.setJsonValue(updatedJsonValue); |
||||
|
|
||||
|
edgeImitator.expectMessageAmount(1); |
||||
|
doPost("/api/admin/settings", savedAdminSettings, AdminSettings.class); |
||||
|
Assert.assertTrue(edgeImitator.waitForMessages()); |
||||
|
|
||||
|
latestMessage = edgeImitator.getLatestMessage(); |
||||
|
Assert.assertTrue(latestMessage instanceof AdminSettingsUpdateMsg); |
||||
|
adminSettingsUpdateMsg = (AdminSettingsUpdateMsg) latestMessage; |
||||
|
adminSettingsMsg = JacksonUtil.fromString(adminSettingsUpdateMsg.getEntity(), AdminSettings.class, true); |
||||
|
Assert.assertNotNull(adminSettingsMsg); |
||||
|
Assert.assertEquals("edgeTest", adminSettingsMsg.getKey()); |
||||
|
Assert.assertEquals("value1", adminSettingsMsg.getJsonValue().get("key1").asText()); |
||||
|
Assert.assertEquals("value2", adminSettingsMsg.getJsonValue().get("key2").asText()); |
||||
|
|
||||
|
adminSettingsService.deleteAdminSettingsByTenantIdAndKey(savedAdminSettings.getTenantId(), "edgeTest"); |
||||
|
} |
||||
|
|
||||
|
} |
||||
Loading…
Reference in new issue