dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:thingsboard/thingsboard

Browse Source
This commit is contained in:
Igor Kulikov 2025-03-13 12:45:10 +02:00
commit fb0ac70ec7
6 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/src/main/java/org/thingsboard/server/actors/ActorSystemContext.java
View File

@ -552,7 +552,7 @@ public class ActorSystemContext {
@Value("${actors.session.max_concurrent_sessions_per_device:1}") @Value("${actors.session.max_concurrent_sessions_per_device:1}")
@Getter @Getter
private long maxConcurrentSessionsPerDevice; private int maxConcurrentSessionsPerDevice;
@Value("${actors.session.sync.timeout:10000}") @Value("${actors.session.sync.timeout:10000}")
@Getter @Getter

3
application/src/main/java/org/thingsboard/server/service/sync/vc/DefaultEntitiesVersionControlService.java
View File

@ -500,10 +500,9 @@ public class DefaultEntitiesVersionControlService implements EntitiesVersionCont
@Override @Override
public ListenableFuture<EntityDataInfo> getEntityDataInfo(User user, EntityId entityId, String versionId) { public ListenableFuture<EntityDataInfo> getEntityDataInfo(User user, EntityId entityId, String versionId) {
return Futures.transform(gitServiceQueue.getEntity(user.getTenantId(), versionId, entityId), return Futures.transform(gitServiceQueue.getEntity(user.getTenantId(), versionId, entityId),
entity -> new EntityDataInfo(entity.hasRelations(), entity.hasAttributes(), entity.hasCredentials()), MoreExecutors.directExecutor()); entity -> new EntityDataInfo(entity.hasRelations(), entity.hasAttributes(), entity.hasCredentials(), entity.hasCalculatedFields()), MoreExecutors.directExecutor());
} }
@Override @Override
public ListenableFuture<List<BranchInfo>> listBranches(TenantId tenantId) { public ListenableFuture<List<BranchInfo>> listBranches(TenantId tenantId) {
return gitServiceQueue.listBranches(tenantId); return gitServiceQueue.listBranches(tenantId);

4
application/src/test/java/org/thingsboard/server/actors/device/DeviceActorMessageProcessorTest.java
View File

@ -49,7 +49,7 @@ public class DeviceActorMessageProcessorTest {
public void setUp() { public void setUp() {
systemContext = mock(ActorSystemContext.class); systemContext = mock(ActorSystemContext.class);
deviceService = mock(DeviceService.class); deviceService = mock(DeviceService.class);
willReturn((long)MAX_CONCURRENT_SESSIONS_PER_DEVICE).given(systemContext).getMaxConcurrentSessionsPerDevice(); willReturn(MAX_CONCURRENT_SESSIONS_PER_DEVICE).given(systemContext).getMaxConcurrentSessionsPerDevice();
willReturn(deviceService).given(systemContext).getDeviceService(); willReturn(deviceService).given(systemContext).getDeviceService();
processor = new DeviceActorMessageProcessor(systemContext, tenantId, deviceId); processor = new DeviceActorMessageProcessor(systemContext, tenantId, deviceId);
willReturn(mock(TbCoreToTransportService.class)).given(systemContext).getTbCoreToTransportService(); willReturn(mock(TbCoreToTransportService.class)).given(systemContext).getTbCoreToTransportService();
@ -58,7 +58,7 @@ public class DeviceActorMessageProcessorTest {
@Test @Test
public void givenSystemContext_whenNewInstance_thenVerifySessionMapMaxSize() { public void givenSystemContext_whenNewInstance_thenVerifySessionMapMaxSize() {
assertThat(processor.sessions, instanceOf(LinkedHashMapRemoveEldest.class)); assertThat(processor.sessions, instanceOf(LinkedHashMapRemoveEldest.class));
assertThat(processor.sessions.getMaxEntries(), is((long)MAX_CONCURRENT_SESSIONS_PER_DEVICE)); assertThat(processor.sessions.getMaxEntries(), is(MAX_CONCURRENT_SESSIONS_PER_DEVICE));
assertThat(processor.sessions.getRemovalConsumer(), notNullValue()); assertThat(processor.sessions.getRemovalConsumer(), notNullValue());
} }

1
common/data/src/main/java/org/thingsboard/server/common/data/sync/vc/EntityDataInfo.java
View File

@ -26,4 +26,5 @@ public class EntityDataInfo {
boolean hasRelations; boolean hasRelations;
boolean hasAttributes; boolean hasAttributes;
boolean hasCredentials; boolean hasCredentials;
boolean hasCalculatedFields;
} }

4
common/util/src/main/java/org/thingsboard/common/util/LinkedHashMapRemoveEldest.java
View File

@ -34,10 +34,10 @@ import java.util.function.BiConsumer;
@ToString(callSuper = true) @ToString(callSuper = true)
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
public class LinkedHashMapRemoveEldest<K, V> extends LinkedHashMap<K, V> { public class LinkedHashMapRemoveEldest<K, V> extends LinkedHashMap<K, V> {
final long maxEntries; final int maxEntries;
final BiConsumer<K, V> removalConsumer; final BiConsumer<K, V> removalConsumer;
public LinkedHashMapRemoveEldest(long maxEntries, BiConsumer<K, V> removalConsumer) { public LinkedHashMapRemoveEldest(int maxEntries, BiConsumer<K, V> removalConsumer) {
this.maxEntries = maxEntries; this.maxEntries = maxEntries;
this.removalConsumer = removalConsumer; this.removalConsumer = removalConsumer;
} }

14
common/util/src/test/java/org/thingsboard/common/util/LinkedHashMapRemoveEldestTest.java
View File

@ -27,10 +27,10 @@ import static org.hamcrest.MatcherAssert.assertThat;
public class LinkedHashMapRemoveEldestTest { public class LinkedHashMapRemoveEldestTest {
public static final long MAX_ENTRIES = 10L; public static final int MAX_ENTRIES = 10;
long removeCount = 0; int removeCount = 0;
void removalConsumer(Long id, String name) { void removalConsumer(Integer id, String name) {
removeCount++; removeCount++;
assertThat(id, is(Matchers.lessThan(MAX_ENTRIES))); assertThat(id, is(Matchers.lessThan(MAX_ENTRIES)));
assertThat(name, is(id.toString())); assertThat(name, is(id.toString()));
@ -39,7 +39,7 @@ public class LinkedHashMapRemoveEldestTest {
@Test @Test
public void givenMap_whenOverSized_thenVerifyRemovedEldest() { public void givenMap_whenOverSized_thenVerifyRemovedEldest() {
//given //given
LinkedHashMapRemoveEldest<Long, String> map = LinkedHashMapRemoveEldest<Integer, String> map =
new LinkedHashMapRemoveEldest<>(MAX_ENTRIES, this::removalConsumer); new LinkedHashMapRemoveEldest<>(MAX_ENTRIES, this::removalConsumer);
assertThat(map.getMaxEntries(), is(MAX_ENTRIES)); assertThat(map.getMaxEntries(), is(MAX_ENTRIES));
@ -49,14 +49,14 @@ public class LinkedHashMapRemoveEldestTest {
assertThat(map.size(), is(0)); assertThat(map.size(), is(0));
//when //when
for (long i = 0; i < MAX_ENTRIES * 2; i++) { for (int i = 0; i < MAX_ENTRIES * 2; i++) {
map.put(i, String.valueOf(i)); map.put(i, String.valueOf(i));
} }
//then //then
assertThat((long) map.size(), is(MAX_ENTRIES)); assertThat( map.size(), is(MAX_ENTRIES));
assertThat(removeCount, is(MAX_ENTRIES)); assertThat(removeCount, is(MAX_ENTRIES));
for (long i = MAX_ENTRIES; i < MAX_ENTRIES * 2; i++) { for (int i = MAX_ENTRIES; i < MAX_ENTRIES * 2; i++) {
assertThat(map.get(i), is(String.valueOf(i))); assertThat(map.get(i), is(String.valueOf(i)));
} }
} }