From f82f4017fd5057e7167a761ae388a9312ac307ba Mon Sep 17 00:00:00 2001 From: Nikita Mazurenko Date: Mon, 2 Feb 2026 15:52:35 +0200 Subject: [PATCH] Fix version comparison in EdgeVersionUtils --- .../service/edge/rpc/utils/EdgeVersionUtils.java | 3 ++- .../thingsboard/server/edge/EdgeLatestVersionTest.java | 10 ++-------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/utils/EdgeVersionUtils.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/utils/EdgeVersionUtils.java index b2b72db5ad..ca35b30e59 100644 --- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/utils/EdgeVersionUtils.java +++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/utils/EdgeVersionUtils.java @@ -16,13 +16,14 @@ package org.thingsboard.server.service.edge.rpc.utils; import lombok.extern.slf4j.Slf4j; +import org.thingsboard.edge.rpc.EdgeVersionComparator; import org.thingsboard.server.gen.edge.v1.EdgeVersion; @Slf4j public final class EdgeVersionUtils { public static boolean isEdgeVersionOlderThan(EdgeVersion currentVersion, EdgeVersion requiredVersion) { - return currentVersion.ordinal() < requiredVersion.ordinal(); + return EdgeVersionComparator.INSTANCE.compare(currentVersion, requiredVersion) < 0; } } diff --git a/application/src/test/java/org/thingsboard/server/edge/EdgeLatestVersionTest.java b/application/src/test/java/org/thingsboard/server/edge/EdgeLatestVersionTest.java index 84c90f6b63..3852fe2ff0 100644 --- a/application/src/test/java/org/thingsboard/server/edge/EdgeLatestVersionTest.java +++ b/application/src/test/java/org/thingsboard/server/edge/EdgeLatestVersionTest.java @@ -17,20 +17,14 @@ package org.thingsboard.server.edge; import org.junit.Assert; import org.junit.Test; +import org.thingsboard.edge.rpc.EdgeVersionComparator; import org.thingsboard.server.gen.edge.v1.EdgeVersion; -import java.util.Arrays; -import java.util.Comparator; - public class EdgeLatestVersionTest { @Test public void edgeLatestVersionIsSynchronizedTest() { - EdgeVersion currentHighestEdgeVersion = Arrays.stream(EdgeVersion.values()) - .filter(v -> v != EdgeVersion.UNRECOGNIZED) - .filter(v -> v != EdgeVersion.V_LATEST) - .max(Comparator.comparingInt(EdgeVersion::getNumber)) - .orElseThrow(); + EdgeVersion currentHighestEdgeVersion = EdgeVersionComparator.getNewestEdgeVersion(); String projectVersion = EdgeLatestVersionTest.class.getPackage().getImplementationVersion(); if (projectVersion == null || projectVersion.isBlank()) {