31 12 25

Сделал что бы запускалось. Поправил мелкие ошибки

shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/JsonHandlerRegistry.java

@@ -1,13 +1,12 @@
 package server.logic.ws_protocol.JSON;
 
 import server.logic.ws_protocol.JSON.entyties.Net_Request;
-import server.logic.ws_protocol.JSON.entyties.Auth.Net_AuthChallenge_Request;
-import server.logic.ws_protocol.JSON.entyties.Auth.Net_CreateAuthSession_Request;
-import server.logic.ws_protocol.JSON.entyties.Auth.Net_RefreshSession_Request;
-import server.logic.ws_protocol.JSON.entyties.Auth.Net_CloseActiveSession_Request;
-import server.logic.ws_protocol.JSON.entyties.Auth.Net_ListSessions_Request;
-import server.logic.ws_protocol.JSON.entyties.blockchain.Net_AddBlock_Request;
-import server.logic.ws_protocol.JSON.entyties.tempToTest.Net_AddUser_Request;
+import server.logic.ws_protocol.JSON.entyties.*;
+import server.logic.ws_protocol.JSON.handlers.auth.entyties.*;
+import server.logic.ws_protocol.JSON.handlers.blockchain.entyties.*;
+import server.logic.ws_protocol.JSON.handlers.tempToTest.entyties.*;
+import server.logic.ws_protocol.JSON.handlers.blockchain.entyties.Net_AddBlock_Request;
+import server.logic.ws_protocol.JSON.handlers.tempToTest.entyties.Net_AddUser_Request;
 import server.logic.ws_protocol.JSON.handlers.JsonMessageHandler;
 import server.logic.ws_protocol.JSON.handlers.auth.Net_AuthChallenge_Handler;
 import server.logic.ws_protocol.JSON.handlers.auth.Net_CreateAuthSession__Handler;

shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/auth/Net_AuthChallenge_Handler.java

@@ -2,8 +2,7 @@ package server.logic.ws_protocol.JSON.handlers.auth;
 
 import server.logic.ws_protocol.JSON.ConnectionContext;
 import server.logic.ws_protocol.JSON.entyties.*;
-import server.logic.ws_protocol.JSON.entyties.Auth.Net_AuthChallenge_Request;
-import server.logic.ws_protocol.JSON.entyties.Auth.Net_AuthChallenge_Response;
+import server.logic.ws_protocol.JSON.handlers.auth.entyties.*;
 import server.logic.ws_protocol.JSON.handlers.JsonMessageHandler;
 import server.logic.ws_protocol.JSON.utils.NetExceptionResponseFactory;
 import server.logic.ws_protocol.WireCodes;

shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/auth/Net_CloseActiveSession_Handler.java

@@ -4,8 +4,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import server.logic.ws_protocol.JSON.ActiveConnectionsRegistry;
 import server.logic.ws_protocol.JSON.ConnectionContext;
-import server.logic.ws_protocol.JSON.entyties.Auth.Net_CloseActiveSession_Request;
-import server.logic.ws_protocol.JSON.entyties.Auth.Net_CloseActiveSession_Response;
+import server.logic.ws_protocol.JSON.handlers.auth.entyties.*;
 import server.logic.ws_protocol.JSON.entyties.Net_Request;
 import server.logic.ws_protocol.JSON.entyties.Net_Response;
 import server.logic.ws_protocol.JSON.handlers.JsonMessageHandler;

shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/auth/Net_CreateAuthSession__Handler.java

@@ -5,10 +5,9 @@ import org.slf4j.LoggerFactory;
 import org.eclipse.jetty.websocket.api.Session;
 import server.logic.ws_protocol.JSON.ActiveConnectionsRegistry;
 import server.logic.ws_protocol.JSON.ConnectionContext;
-import server.logic.ws_protocol.JSON.entyties.Auth.Net_CreateAuthSession_Response;
+import server.logic.ws_protocol.JSON.handlers.auth.entyties.*;
 import server.logic.ws_protocol.JSON.entyties.Net_Request;
 import server.logic.ws_protocol.JSON.entyties.Net_Response;
-import server.logic.ws_protocol.JSON.entyties.Auth.Net_CreateAuthSession_Request;
 import server.logic.ws_protocol.JSON.handlers.JsonMessageHandler;
 import server.logic.ws_protocol.JSON.utils.NetExceptionResponseFactory;
 import server.logic.ws_protocol.WireCodes;

shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/auth/Net_ListSessions_Handler.java

@@ -3,13 +3,12 @@ package server.logic.ws_protocol.JSON.handlers.auth;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import server.logic.ws_protocol.JSON.ConnectionContext;
-import server.logic.ws_protocol.JSON.entyties.Auth.Net_ListSessions_Request;
-import server.logic.ws_protocol.JSON.entyties.Auth.Net_ListSessions_Response;
-import server.logic.ws_protocol.JSON.entyties.Auth.Net_ListSessions_Response.SessionInfo;
+import server.logic.ws_protocol.JSON.handlers.auth.entyties.*;
 import server.logic.ws_protocol.JSON.entyties.Net_Request;
 import server.logic.ws_protocol.JSON.entyties.Net_Response;
 import server.logic.ws_protocol.JSON.handlers.JsonMessageHandler;
 import server.logic.ws_protocol.JSON.utils.NetExceptionResponseFactory;
+import server.logic.ws_protocol.JSON.handlers.auth.entyties.Net_ListSessions_Response.SessionInfo;
 import server.logic.ws_protocol.WireCodes;
 import shine.db.dao.ActiveSessionsDAO;
 import shine.db.entities.ActiveSessionEntry;
@@ -144,7 +143,7 @@ public class Net_ListSessions_Handler implements JsonMessageHandler {
         // 4) Собираем DTO с геолокацией
         List<SessionInfo> resultList = new ArrayList<>();
         for (ActiveSessionEntry s : sessions) {
-            SessionInfo info = new SessionInfo();
+            SessionInfo info = new Net_ListSessions_Response.SessionInfo();
             info.setSessionId(s.getSessionId());
             info.setClientInfoFromClient(s.getClientInfoFromClient());
             info.setClientInfoFromRequest(s.getClientInfoFromRequest());

shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/auth/Net_RefreshSession_Handler.java

@@ -4,8 +4,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import server.logic.ws_protocol.JSON.ActiveConnectionsRegistry;
 import server.logic.ws_protocol.JSON.ConnectionContext;
-import server.logic.ws_protocol.JSON.entyties.Auth.Net_RefreshSession_Request;
-import server.logic.ws_protocol.JSON.entyties.Auth.Net_RefreshSession_Response;
+import server.logic.ws_protocol.JSON.handlers.auth.entyties.*;
 import server.logic.ws_protocol.JSON.entyties.Net_Request;
 import server.logic.ws_protocol.JSON.entyties.Net_Response;
 import server.logic.ws_protocol.JSON.handlers.JsonMessageHandler;

shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/auth/entyties/Net_AuthChallenge_Request.java

@@ -1,4 +1,4 @@
-package server.logic.ws_protocol.JSON.entyties.Auth;
+package server.logic.ws_protocol.JSON.handlers.auth.entyties;
 
 import server.logic.ws_protocol.JSON.entyties.Net_Request;
 

shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/auth/entyties/Net_AuthChallenge_Response.java

@@ -1,4 +1,4 @@
-package server.logic.ws_protocol.JSON.entyties.Auth;
+package server.logic.ws_protocol.JSON.handlers.auth.entyties;
 
 import server.logic.ws_protocol.JSON.entyties.Net_Response;
 

shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/auth/entyties/Net_CloseActiveSession_Request.java

@@ -1,4 +1,4 @@
-package server.logic.ws_protocol.JSON.entyties.Auth;
+package server.logic.ws_protocol.JSON.handlers.auth.entyties;
 
 import server.logic.ws_protocol.JSON.entyties.Net_Request;
 

shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/auth/entyties/Net_CloseActiveSession_Response.java

@@ -1,4 +1,4 @@
-package server.logic.ws_protocol.JSON.entyties.Auth;
+package server.logic.ws_protocol.JSON.handlers.auth.entyties;
 
 import server.logic.ws_protocol.JSON.entyties.Net_Response;
 

shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/auth/entyties/Net_CreateAuthSession_Request.java

@@ -1,4 +1,4 @@
-package server.logic.ws_protocol.JSON.entyties.Auth;
+package server.logic.ws_protocol.JSON.handlers.auth.entyties;
 
 import server.logic.ws_protocol.JSON.entyties.Net_Request;
 

shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/auth/entyties/Net_CreateAuthSession_Response.java

@@ -1,4 +1,4 @@
-package server.logic.ws_protocol.JSON.entyties.Auth;
+package server.logic.ws_protocol.JSON.handlers.auth.entyties;
 
 import server.logic.ws_protocol.JSON.entyties.Net_Response;
 

shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/auth/entyties/Net_ListSessions_Request.java

@@ -1,4 +1,4 @@
-package server.logic.ws_protocol.JSON.entyties.Auth;
+package server.logic.ws_protocol.JSON.handlers.auth.entyties;
 
 import server.logic.ws_protocol.JSON.entyties.Net_Request;
 

shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/auth/entyties/Net_ListSessions_Response.java

@@ -1,4 +1,4 @@
-package server.logic.ws_protocol.JSON.entyties.Auth;
+package server.logic.ws_protocol.JSON.handlers.auth.entyties;
 
 import server.logic.ws_protocol.JSON.entyties.Net_Response;
 

shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/auth/entyties/Net_RefreshSession_Request.java

@@ -1,4 +1,4 @@
-package server.logic.ws_protocol.JSON.entyties.Auth;
+package server.logic.ws_protocol.JSON.handlers.auth.entyties;
 
 import server.logic.ws_protocol.JSON.entyties.Net_Request;
 

shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/auth/entyties/Net_RefreshSession_Response.java

@@ -1,4 +1,4 @@
-package server.logic.ws_protocol.JSON.entyties.Auth;
+package server.logic.ws_protocol.JSON.handlers.auth.entyties;
 
 import server.logic.ws_protocol.JSON.entyties.Net_Response;
 

shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/blockchain/Net_AddBlock_Handler.java

@@ -7,8 +7,10 @@ import org.slf4j.LoggerFactory;
 import server.logic.ws_protocol.JSON.ConnectionContext;
 import server.logic.ws_protocol.JSON.entyties.Net_Request;
 import server.logic.ws_protocol.JSON.entyties.Net_Response;
-import server.logic.ws_protocol.JSON.entyties.blockchain.Net_AddBlock_Request;
-import server.logic.ws_protocol.JSON.entyties.blockchain.Net_AddBlock_Response;
+import server.logic.ws_protocol.JSON.handlers.blockchain.Net_AddBlock_Handler_utils.BlockchainLocks;
+import server.logic.ws_protocol.JSON.handlers.blockchain.Net_AddBlock_Handler_utils.BlockchainWriter;
+import server.logic.ws_protocol.JSON.handlers.blockchain.entyties.Net_AddBlock_Request;
+import server.logic.ws_protocol.JSON.handlers.blockchain.entyties.Net_AddBlock_Response;
 import server.logic.ws_protocol.JSON.handlers.JsonMessageHandler;
 import server.logic.ws_protocol.WireCodes;
 import shine.db.dao.BlockchainStateDAO;

shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/blockchain/Net_AddBlock_Handler_utils/BlockchainLocks.java

@@ -1,4 +1,4 @@
-package server.logic.ws_protocol.JSON.handlers.blockchain;
+package server.logic.ws_protocol.JSON.handlers.blockchain.Net_AddBlock_Handler_utils;
 
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.locks.ReentrantLock;

shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/blockchain/Net_AddBlock_Handler_utils/BlockchainWriter.java

@@ -1,4 +1,4 @@
-package server.logic.ws_protocol.JSON.handlers.blockchain;
+package server.logic.ws_protocol.JSON.handlers.blockchain.Net_AddBlock_Handler_utils;
 
 import blockchain.BchBlockEntry;
 import blockchain.body.ReactionBody;

shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/blockchain/entyties/Net_AddBlock_Request.java

@@ -1,4 +1,4 @@
-package server.logic.ws_protocol.JSON.entyties.blockchain;
+package server.logic.ws_protocol.JSON.handlers.blockchain.entyties;
 
 import server.logic.ws_protocol.JSON.entyties.Net_Request;
 

shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/blockchain/entyties/Net_AddBlock_Response.java

@@ -1,4 +1,4 @@
-package server.logic.ws_protocol.JSON.entyties.blockchain;
+package server.logic.ws_protocol.JSON.handlers.blockchain.entyties;
 
 import server.logic.ws_protocol.JSON.entyties.Net_Response;
 

shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/tempToTest/Net_AddUser_Handler.java

@@ -5,8 +5,8 @@ import org.slf4j.LoggerFactory;
 import server.logic.ws_protocol.JSON.ConnectionContext;
 import server.logic.ws_protocol.JSON.entyties.Net_Request;
 import server.logic.ws_protocol.JSON.entyties.Net_Response;
-import server.logic.ws_protocol.JSON.entyties.tempToTest.Net_AddUser_Request;
-import server.logic.ws_protocol.JSON.entyties.tempToTest.Net_AddUser_Response;
+import server.logic.ws_protocol.JSON.handlers.tempToTest.entyties.Net_AddUser_Request;
+import server.logic.ws_protocol.JSON.handlers.tempToTest.entyties.Net_AddUser_Response;
 import server.logic.ws_protocol.JSON.handlers.JsonMessageHandler;
 import server.logic.ws_protocol.JSON.utils.NetExceptionResponseFactory;
 import server.logic.ws_protocol.WireCodes;

shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/tempToTest/entyties/Net_AddUser_Request.java

@@ -1,4 +1,4 @@
-package server.logic.ws_protocol.JSON.entyties.tempToTest;
+package server.logic.ws_protocol.JSON.handlers.tempToTest.entyties;
 
 import server.logic.ws_protocol.JSON.entyties.Net_Request;
 

shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/tempToTest/entyties/Net_AddUser_Response.java

@@ -1,4 +1,4 @@
-package server.logic.ws_protocol.JSON.entyties.tempToTest;
+package server.logic.ws_protocol.JSON.handlers.tempToTest.entyties;
 
 import server.logic.ws_protocol.JSON.entyties.Net_Response;