From eae065aa74408d4ecec7f61125e64090a113b760 Mon Sep 17 00:00:00 2001 From: Nikita Mazurenko Date: Fri, 26 Jun 2026 09:58:20 +0300 Subject: [PATCH 1/3] Fix dashboard config changes not syncing to edge by removing transient from Dashboard.configuration --- .../rpc/processor/BaseEdgeProcessorTest.java | 236 ++++++++++++++++++ .../server/common/data/Dashboard.java | 2 +- 2 files changed, 237 insertions(+), 1 deletion(-) create mode 100644 application/src/test/java/org/thingsboard/server/service/edge/rpc/processor/BaseEdgeProcessorTest.java diff --git a/application/src/test/java/org/thingsboard/server/service/edge/rpc/processor/BaseEdgeProcessorTest.java b/application/src/test/java/org/thingsboard/server/service/edge/rpc/processor/BaseEdgeProcessorTest.java new file mode 100644 index 0000000000..55f975b1ea --- /dev/null +++ b/application/src/test/java/org/thingsboard/server/service/edge/rpc/processor/BaseEdgeProcessorTest.java @@ -0,0 +1,236 @@ +/** + * ThingsBoard, Inc. ("COMPANY") CONFIDENTIAL + * + * Copyright © 2016-2026 ThingsBoard, Inc. All Rights Reserved. + * + * NOTICE: All information contained herein is, and remains + * the property of ThingsBoard, Inc. and its suppliers, + * if any. The intellectual and technical concepts contained + * herein are proprietary to ThingsBoard, Inc. + * and its suppliers and may be covered by U.S. and Foreign Patents, + * patents in process, and are protected by trade secret or copyright law. + * + * Dissemination of this information or reproduction of this material is strictly forbidden + * unless prior written permission is obtained from COMPANY. + * + * Access to the source code contained herein is hereby forbidden to anyone except current COMPANY employees, + * managers or contractors who have executed Confidentiality and Non-disclosure agreements + * explicitly covering such access. + * + * The copyright notice above does not evidence any actual or intended publication + * or disclosure of this source code, which includes + * information that is confidential and/or proprietary, and is a trade secret, of COMPANY. + * ANY REPRODUCTION, MODIFICATION, DISTRIBUTION, PUBLIC PERFORMANCE, + * OR PUBLIC DISPLAY OF OR THROUGH USE OF THIS SOURCE CODE WITHOUT + * THE EXPRESS WRITTEN CONSENT OF COMPANY IS STRICTLY PROHIBITED, + * AND IN VIOLATION OF APPLICABLE LAWS AND INTERNATIONAL TREATIES. + * THE RECEIPT OR POSSESSION OF THIS SOURCE CODE AND/OR RELATED INFORMATION + * DOES NOT CONVEY OR IMPLY ANY RIGHTS TO REPRODUCE, DISCLOSE OR DISTRIBUTE ITS CONTENTS, + * OR TO MANUFACTURE, USE, OR SELL ANYTHING THAT IT MAY DESCRIBE, IN WHOLE OR IN PART. + */ +package org.thingsboard.server.service.edge.rpc.processor; + +import com.google.common.util.concurrent.Futures; +import com.google.common.util.concurrent.ListenableFuture; +import org.junit.jupiter.api.Test; +import org.thingsboard.common.util.JacksonUtil; +import org.thingsboard.server.common.data.Dashboard; +import org.thingsboard.server.common.data.Device; +import org.thingsboard.server.common.data.EntityView; +import org.thingsboard.server.common.data.User; +import org.thingsboard.server.common.data.asset.Asset; +import org.thingsboard.server.common.data.device.data.DeviceData; +import org.thingsboard.server.common.data.device.data.DefaultDeviceConfiguration; +import org.thingsboard.server.common.data.device.data.DefaultDeviceTransportConfiguration; +import org.thingsboard.server.common.data.id.AssetId; +import org.thingsboard.server.common.data.id.DashboardId; +import org.thingsboard.server.common.data.id.DeviceId; +import org.thingsboard.server.common.data.id.EntityViewId; +import org.thingsboard.server.common.data.id.TenantId; +import org.thingsboard.server.common.data.id.UserId; +import org.thingsboard.server.gen.transport.TransportProtos; + +import java.util.UUID; + +import static org.assertj.core.api.Assertions.assertThat; + +public class BaseEdgeProcessorTest { + + private final BaseEdgeProcessor processor = new BaseEdgeProcessor() { + @Override + public ListenableFuture processEntityNotification(TenantId tenantId, TransportProtos.EdgeNotificationMsgProto msg) { + return Futures.immediateFuture(null); + } + }; + + @Test + public void dashboardSaveRequiredWhenConfigurationChanges() { + DashboardId dashboardId = new DashboardId(UUID.randomUUID()); + Dashboard current = new Dashboard(dashboardId); + current.setTitle("Dashboard"); + current.setConfiguration(JacksonUtil.toJsonNode("{\"widgets\":{\"w1\":{\"type\":\"timeseries\"}}}")); + + Dashboard updated = new Dashboard(current); + updated.setConfiguration(JacksonUtil.toJsonNode("{\"widgets\":{\"w1\":{\"type\":\"latest\"}}}")); + + assertThat(processor.isSaveRequired(current, updated)).isTrue(); + } + + @Test + public void dashboardSaveNotRequiredWhenOnlyVersionChanges() { + DashboardId dashboardId = new DashboardId(UUID.randomUUID()); + Dashboard current = new Dashboard(dashboardId); + current.setTitle("Dashboard"); + current.setConfiguration(JacksonUtil.toJsonNode("{\"widgets\":{\"w1\":{\"type\":\"timeseries\"}}}")); + current.setVersion(1L); + + Dashboard updated = new Dashboard(current); + updated.setVersion(2L); + + assertThat(processor.isSaveRequired(current, updated)).isFalse(); + } + + @Test + public void dashboardSaveNotRequiredWhenIdentical() { + DashboardId dashboardId = new DashboardId(UUID.randomUUID()); + Dashboard current = new Dashboard(dashboardId); + current.setTitle("Dashboard"); + current.setConfiguration(JacksonUtil.toJsonNode("{\"widgets\":{\"w1\":{\"type\":\"timeseries\"}}}")); + + Dashboard updated = new Dashboard(current); + + assertThat(processor.isSaveRequired(current, updated)).isFalse(); + } + + @Test + public void deviceSaveRequiredWhenDeviceDataChanges() { + DeviceId deviceId = new DeviceId(UUID.randomUUID()); + Device current = new Device(deviceId); + current.setName("Device"); + current.setDeviceData(deviceDataWithTransport()); + + Device updated = new Device(current); + DeviceData withoutTransport = new DeviceData(); + withoutTransport.setConfiguration(new DefaultDeviceConfiguration()); + updated.setDeviceData(withoutTransport); + + assertThat(processor.isSaveRequired(current, updated)).isTrue(); + } + + @Test + public void deviceSaveRequiredWhenAdditionalInfoChanges() { + DeviceId deviceId = new DeviceId(UUID.randomUUID()); + Device current = new Device(deviceId); + current.setName("Device"); + current.setAdditionalInfo(JacksonUtil.toJsonNode("{\"description\":\"old\"}")); + + Device updated = new Device(current); + updated.setAdditionalInfo(JacksonUtil.toJsonNode("{\"description\":\"new\"}")); + + assertThat(processor.isSaveRequired(current, updated)).isTrue(); + } + + @Test + public void deviceSaveNotRequiredWhenOnlyVersionChanges() { + DeviceId deviceId = new DeviceId(UUID.randomUUID()); + Device current = new Device(deviceId); + current.setName("Device"); + current.setDeviceData(deviceDataWithTransport()); + current.setAdditionalInfo(JacksonUtil.toJsonNode("{\"description\":\"same\"}")); + current.setVersion(1L); + + Device updated = new Device(current); + updated.setVersion(2L); + + assertThat(processor.isSaveRequired(current, updated)).isFalse(); + } + + @Test + public void assetSaveRequiredWhenAdditionalInfoChanges() { + AssetId assetId = new AssetId(UUID.randomUUID()); + Asset current = new Asset(assetId); + current.setName("Asset"); + current.setAdditionalInfo(JacksonUtil.toJsonNode("{\"description\":\"old\"}")); + + Asset updated = new Asset(current); + updated.setAdditionalInfo(JacksonUtil.toJsonNode("{\"description\":\"new\"}")); + + assertThat(processor.isSaveRequired(current, updated)).isTrue(); + } + + @Test + public void assetSaveNotRequiredWhenOnlyVersionChanges() { + AssetId assetId = new AssetId(UUID.randomUUID()); + Asset current = new Asset(assetId); + current.setName("Asset"); + current.setAdditionalInfo(JacksonUtil.toJsonNode("{\"description\":\"same\"}")); + current.setVersion(1L); + + Asset updated = new Asset(current); + updated.setVersion(2L); + + assertThat(processor.isSaveRequired(current, updated)).isFalse(); + } + + @Test + public void entityViewSaveRequiredWhenAdditionalInfoChanges() { + EntityViewId entityViewId = new EntityViewId(UUID.randomUUID()); + EntityView current = new EntityView(entityViewId); + current.setName("EntityView"); + current.setAdditionalInfo(JacksonUtil.toJsonNode("{\"description\":\"old\"}")); + + EntityView updated = new EntityView(current); + updated.setAdditionalInfo(JacksonUtil.toJsonNode("{\"description\":\"new\"}")); + + assertThat(processor.isSaveRequired(current, updated)).isTrue(); + } + + @Test + public void entityViewSaveNotRequiredWhenOnlyVersionChanges() { + EntityViewId entityViewId = new EntityViewId(UUID.randomUUID()); + EntityView current = new EntityView(entityViewId); + current.setName("EntityView"); + current.setAdditionalInfo(JacksonUtil.toJsonNode("{\"description\":\"same\"}")); + current.setVersion(1L); + + EntityView updated = new EntityView(current); + updated.setVersion(2L); + + assertThat(processor.isSaveRequired(current, updated)).isFalse(); + } + + @Test + public void userSaveRequiredWhenAdditionalInfoChanges() { + UserId userId = new UserId(UUID.randomUUID()); + User current = new User(userId); + current.setEmail("user@thingsboard.io"); + current.setAdditionalInfo(JacksonUtil.toJsonNode("{\"description\":\"old\"}")); + + User updated = new User(current); + updated.setAdditionalInfo(JacksonUtil.toJsonNode("{\"description\":\"new\"}")); + + assertThat(processor.isSaveRequired(current, updated)).isTrue(); + } + + @Test + public void userSaveNotRequiredWhenOnlyVersionChanges() { + UserId userId = new UserId(UUID.randomUUID()); + User current = new User(userId); + current.setEmail("user@thingsboard.io"); + current.setAdditionalInfo(JacksonUtil.toJsonNode("{\"description\":\"same\"}")); + current.setVersion(1L); + + User updated = new User(current); + updated.setVersion(2L); + + assertThat(processor.isSaveRequired(current, updated)).isFalse(); + } + + private static DeviceData deviceDataWithTransport() { + DeviceData deviceData = new DeviceData(); + deviceData.setConfiguration(new DefaultDeviceConfiguration()); + deviceData.setTransportConfiguration(new DefaultDeviceTransportConfiguration()); + return deviceData; + } + +} diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/Dashboard.java b/common/data/src/main/java/org/thingsboard/server/common/data/Dashboard.java index 2c65a3dfc8..2666663d97 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/Dashboard.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/Dashboard.java @@ -38,7 +38,7 @@ public class Dashboard extends DashboardInfo implements ExportableEntity Date: Fri, 26 Jun 2026 10:56:01 +0300 Subject: [PATCH 2/3] Fix license header on BaseEdgeProcessorTest --- .../rpc/processor/BaseEdgeProcessorTest.java | 35 ++++++------------- 1 file changed, 10 insertions(+), 25 deletions(-) diff --git a/application/src/test/java/org/thingsboard/server/service/edge/rpc/processor/BaseEdgeProcessorTest.java b/application/src/test/java/org/thingsboard/server/service/edge/rpc/processor/BaseEdgeProcessorTest.java index 55f975b1ea..430df22548 100644 --- a/application/src/test/java/org/thingsboard/server/service/edge/rpc/processor/BaseEdgeProcessorTest.java +++ b/application/src/test/java/org/thingsboard/server/service/edge/rpc/processor/BaseEdgeProcessorTest.java @@ -1,32 +1,17 @@ /** - * ThingsBoard, Inc. ("COMPANY") CONFIDENTIAL + * Copyright © 2016-2026 The Thingsboard Authors * - * Copyright © 2016-2026 ThingsBoard, Inc. All Rights Reserved. + * 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 * - * NOTICE: All information contained herein is, and remains - * the property of ThingsBoard, Inc. and its suppliers, - * if any. The intellectual and technical concepts contained - * herein are proprietary to ThingsBoard, Inc. - * and its suppliers and may be covered by U.S. and Foreign Patents, - * patents in process, and are protected by trade secret or copyright law. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dissemination of this information or reproduction of this material is strictly forbidden - * unless prior written permission is obtained from COMPANY. - * - * Access to the source code contained herein is hereby forbidden to anyone except current COMPANY employees, - * managers or contractors who have executed Confidentiality and Non-disclosure agreements - * explicitly covering such access. - * - * The copyright notice above does not evidence any actual or intended publication - * or disclosure of this source code, which includes - * information that is confidential and/or proprietary, and is a trade secret, of COMPANY. - * ANY REPRODUCTION, MODIFICATION, DISTRIBUTION, PUBLIC PERFORMANCE, - * OR PUBLIC DISPLAY OF OR THROUGH USE OF THIS SOURCE CODE WITHOUT - * THE EXPRESS WRITTEN CONSENT OF COMPANY IS STRICTLY PROHIBITED, - * AND IN VIOLATION OF APPLICABLE LAWS AND INTERNATIONAL TREATIES. - * THE RECEIPT OR POSSESSION OF THIS SOURCE CODE AND/OR RELATED INFORMATION - * DOES NOT CONVEY OR IMPLY ANY RIGHTS TO REPRODUCE, DISCLOSE OR DISTRIBUTE ITS CONTENTS, - * OR TO MANUFACTURE, USE, OR SELL ANYTHING THAT IT MAY DESCRIBE, IN WHOLE OR IN PART. + * 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.processor; From 632193cbdfb5cfac54dfcfb3bc79882e556111f8 Mon Sep 17 00:00:00 2001 From: Viacheslav Klimov Date: Tue, 30 Jun 2026 12:30:42 +0300 Subject: [PATCH 3/3] Reserve dynamic ports for OpenAPI spec generation to avoid port conflicts --- application/pom.xml | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/application/pom.xml b/application/pom.xml index f6ceba95a1..6a976bf846 100644 --- a/application/pom.xml +++ b/application/pom.xml @@ -507,12 +507,31 @@ + + org.codehaus.mojo + build-helper-maven-plugin + + + + reserve-openapi-ports + initialize + reserve-network-port + + + jmx.port + http.port + + + + + org.springframework.boot spring-boot-maven-plugin org.thingsboard.server.ThingsboardServerApplication - 9001 + ${jmx.port} @@ -532,6 +551,7 @@ --spring.config.name=thingsboard --spring.profiles.active=openapi + --server.port=${http.port} 180 2000 @@ -557,7 +577,7 @@ - http://localhost:8080/v3/api-docs/thingsboard + http://localhost:${http.port}/v3/api-docs/thingsboard openapi.json ${project.build.directory}