17 12 25

Промежуточная версия

shine-server-db/src/main/java/shine/db/entities/ActiveSessionEntry.java

@@ -20,7 +20,7 @@ package shine.db.entities;
  *     FOREIGN KEY (loginId) REFERENCES solana_users(loginId)
  * );
  */
-public class ActiveSession {
+public class ActiveSessionEntry {
 
     private String sessionId;               // TEXT base64(32 bytes)
     private long   loginId;                 // INTEGER
@@ -38,22 +38,22 @@ public class ActiveSession {
     private String clientInfoFromRequest;   // строка, собранная на сервере
     private String userLanguage;            // prefer-language (например, "ru-RU")
 
-    public ActiveSession() {
+    public ActiveSessionEntry() {
     }
 
-    public ActiveSession(String sessionId,
-                         long loginId,
-                         String sessionPwd,
-                         String storagePwd,
-                         long sessionCreatedAtMs,
-                         long lastAuthirificatedAtMs,
-                         String pushEndpoint,
-                         String pushP256dhKey,
-                         String pushAuthKey,
-                         String clientIp,
-                         String clientInfoFromClient,
-                         String clientInfoFromRequest,
-                         String userLanguage) {
+    public ActiveSessionEntry(String sessionId,
+                              long loginId,
+                              String sessionPwd,
+                              String storagePwd,
+                              long sessionCreatedAtMs,
+                              long lastAuthirificatedAtMs,
+                              String pushEndpoint,
+                              String pushP256dhKey,
+                              String pushAuthKey,
+                              String clientIp,
+                              String clientInfoFromClient,
+                              String clientInfoFromRequest,
+                              String userLanguage) {
         this.sessionId = sessionId;
         this.loginId = loginId;
         this.sessionPwd = sessionPwd;

shine-server-db/src/main/java/shine/db/entities/SolanaUserEntry.java

@@ -10,7 +10,7 @@ package shine.db.entities;
  *  - deviceKey — публичный ключ устройства (второй ключ);
  *  - bchLimit  — лимит по количеству блоков / размеру цепочки (может быть null).
  */
-public class SolanaUser {
+public class SolanaUserEntry {
 
     private long loginId;
     private String login;
@@ -19,15 +19,15 @@ public class SolanaUser {
     private String deviceKey;  // раньше pubkey1
     private Integer bchLimit;  // может быть null
 
-    public SolanaUser() {
+    public SolanaUserEntry() {
     }
 
-    public SolanaUser(long loginId,
-                      String login,
-                      long bchId,
-                      String loginKey,
-                      String deviceKey,
-                      Integer bchLimit) {
+    public SolanaUserEntry(long loginId,
+                           String login,
+                           long bchId,
+                           String loginKey,
+                           String deviceKey,
+                           Integer bchLimit) {
         this.loginId = loginId;
         this.login = login;
         this.bchId = bchId;

shine-server-db/src/main/java/shine/db/entities/UserParamEntry.java

@@ -1,6 +1,6 @@
 package shine.db.entities;
 
-public class UserParam {
+public class UserParamEntry {
 
     private long loginId;
     private String param;
@@ -10,16 +10,16 @@ public class UserParam {
     private short pubkeyNum;
     private String signature;
 
-    public UserParam() {
+    public UserParamEntry() {
     }
 
-    public UserParam(long loginId,
-                     String param,
-                     long bchChannelId,
-                     String value,
-                     long timeMs,
-                     short pubkeyNum,
-                     String signature) {
+    public UserParamEntry(long loginId,
+                          String param,
+                          long bchChannelId,
+                          String value,
+                          long timeMs,
+                          short pubkeyNum,
+                          String signature) {
         this.loginId = loginId;
         this.param = param;
         this.bchChannelId = bchChannelId;