From 6fb7da883ea5b50e9876c150f06713c0e0925621 Mon Sep 17 00:00:00 2001
From: Nikita Mazurenko <nikitamazurenko42@gmail.com>
Date: Tue, 16 Dec 2025 14:41:33 +0200
Subject: [PATCH] Undo renaming edge session and edge service

---
 .../org/thingsboard/server/service/edge/rpc/GrpcServer.java   | 2 --
 .../service/{EdgeRpcServiceImpl.java => EdgeGrpcService.java} | 2 +-
 .../session/{BaseEdgeSession.java => EdgeGrpcSession.java}    | 2 +-
 .../rpc/session/manager/AbstractEdgeGrpcSessionManager.java   | 4 ++--
 4 files changed, 4 insertions(+), 6 deletions(-)
 rename application/src/main/java/org/thingsboard/server/service/edge/rpc/service/{EdgeRpcServiceImpl.java => EdgeGrpcService.java} (99%)
 rename application/src/main/java/org/thingsboard/server/service/edge/rpc/session/{BaseEdgeSession.java => EdgeGrpcSession.java} (99%)

diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/GrpcServer.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/GrpcServer.java
index 7da0aecc70..70fcdf1f5a 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/GrpcServer.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/GrpcServer.java
@@ -23,10 +23,8 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 import org.thingsboard.server.common.data.ResourceUtils;
-import org.thingsboard.server.gen.edge.v1.EdgeRpcServiceGrpc;
 import org.thingsboard.server.gen.edge.v1.EdgeRpcServiceGrpc.EdgeRpcServiceImplBase;
 import org.thingsboard.server.queue.util.AfterStartUp;
-import org.thingsboard.server.service.edge.rpc.service.EdgeRpcServiceImpl;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/service/EdgeRpcServiceImpl.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/service/EdgeGrpcService.java
similarity index 99%
rename from application/src/main/java/org/thingsboard/server/service/edge/rpc/service/EdgeRpcServiceImpl.java
rename to application/src/main/java/org/thingsboard/server/service/edge/rpc/service/EdgeGrpcService.java
index 14054adbd3..fea5ef4c82 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/service/EdgeRpcServiceImpl.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/service/EdgeGrpcService.java
@@ -77,7 +77,7 @@ import static org.thingsboard.server.service.state.DefaultDeviceStateService.LAS
 @Service
 @Slf4j
 @RequiredArgsConstructor
-public class EdgeRpcServiceImpl extends EdgeRpcServiceGrpc.EdgeRpcServiceImplBase implements EdgeRpcService {
+public class EdgeGrpcService extends EdgeRpcServiceGrpc.EdgeRpcServiceImplBase implements EdgeRpcService {
 
     @Value("${edges.send_scheduler_pool_size}")
     private int sendSchedulerPoolSize;
diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/session/BaseEdgeSession.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/session/EdgeGrpcSession.java
similarity index 99%
rename from application/src/main/java/org/thingsboard/server/service/edge/rpc/session/BaseEdgeSession.java
rename to application/src/main/java/org/thingsboard/server/service/edge/rpc/session/EdgeGrpcSession.java
index 6544128c4f..8bb2d36393 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/session/BaseEdgeSession.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/session/EdgeGrpcSession.java
@@ -78,7 +78,7 @@ import java.util.function.BiConsumer;
 
 @Slf4j
 @RequiredArgsConstructor
-public class BaseEdgeSession implements EdgeSession {
+public class EdgeGrpcSession implements EdgeSession {
 
     private static final int MAX_DOWNLINK_ATTEMPTS = 3;
     private static final String RATE_LIMIT_REACHED = "Rate limit reached";
diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/session/manager/AbstractEdgeGrpcSessionManager.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/session/manager/AbstractEdgeGrpcSessionManager.java
index bda54d5449..68d5152306 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/session/manager/AbstractEdgeGrpcSessionManager.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/session/manager/AbstractEdgeGrpcSessionManager.java
@@ -31,7 +31,7 @@ import org.thingsboard.server.service.edge.EdgeMsgConstructorUtils;
 import org.thingsboard.server.service.edge.rpc.DownlinkMessageMapper;
 import org.thingsboard.server.service.edge.rpc.EdgeSessionState;
 import org.thingsboard.server.service.edge.rpc.EdgeUplinkMessageDispatcher;
-import org.thingsboard.server.service.edge.rpc.session.BaseEdgeSession;
+import org.thingsboard.server.service.edge.rpc.session.EdgeGrpcSession;
 import org.thingsboard.server.service.edge.rpc.session.EdgeGrpcSessionDelegate;
 import org.thingsboard.server.service.edge.rpc.session.EdgeSession;
 import org.thingsboard.server.service.edge.rpc.session.ZombieSessionCleanupService;
@@ -79,7 +79,7 @@ public abstract class AbstractEdgeGrpcSessionManager extends EdgeGrpcSessionDele
         }
         initLock.lock();
         try {
-            this.session = new BaseEdgeSession(
+            this.session = new EdgeGrpcSession(
                     this, ctx, outputStream, downlinkMessageMapper, uplinkMessageDispatcher,
                     sessionOpenListener, sessionCloseListener,
                     sendDownlinkExecutorService, maxInboundMessageSize, maxHighPriorityQueueSizePerSession);