Merge pull request #42 from vshcryabets/feature/update-messages

vshcryabets · web-flow · commit 7227787d0261 · 2025-08-05T15:08:58.000+03:00
Move few more message classes to factory
diff --git a/java/v2styx-lib/src/main/java/com/v2soft/styxlib/handlers/TMessagesProcessor.java b/java/v2styx-lib/src/main/java/com/v2soft/styxlib/handlers/TMessagesProcessor.java
@@ -6,17 +6,14 @@
 import com.v2soft.styxlib.exceptions.StyxUnknownClientIdException;
 import com.v2soft.styxlib.l5.dev.MetricsAndStats;
 import com.v2soft.styxlib.l5.enums.MessageType;
-import com.v2soft.styxlib.l5.messages.StyxRReadMessage;
-import com.v2soft.styxlib.l5.messages.StyxRWalkMessage;
-import com.v2soft.styxlib.l5.messages.StyxRWriteMessage;
-import com.v2soft.styxlib.l5.messages.StyxTCreateMessage;
-import com.v2soft.styxlib.l5.messages.v9p2000.StyxTOpenMessage;
-import com.v2soft.styxlib.l5.messages.StyxTReadMessage;
+import com.v2soft.styxlib.l5.messages.v9p2000.StyxTCreateMessage;
 import com.v2soft.styxlib.l5.messages.base.StyxMessage;
 import com.v2soft.styxlib.l5.messages.base.StyxTMessageFID;
 import com.v2soft.styxlib.l5.messages.v9p2000.BaseMessage;
 import com.v2soft.styxlib.l5.messages.v9p2000.StyxTAttachMessage;
 import com.v2soft.styxlib.l5.messages.v9p2000.StyxTAuthMessage;
+import com.v2soft.styxlib.l5.messages.v9p2000.StyxTOpenMessage;
+import com.v2soft.styxlib.l5.messages.v9p2000.StyxTReadMessage;
 import com.v2soft.styxlib.l5.messages.v9p2000.StyxTWStatMessage;
 import com.v2soft.styxlib.l5.messages.v9p2000.StyxTWalkMessage;
 import com.v2soft.styxlib.l5.messages.v9p2000.StyxTWriteMessage;
@@ -164,7 +161,7 @@ private StyxMessage processWalk(int clientId, StyxTWalkMessage msg) throws StyxE
                 qidsList);
         if (walkFile != null) {
             mDi.getClientsRepo().getClient(clientId).registerOpenedFile(msg.mNewFID, walkFile);
-            return new StyxRWalkMessage(msg.getTag(), qidsList);
+            return mDi.getMessageFactory().constructRWalkMessage(msg.getTag(), qidsList);
         } else {
             return mDi.getMessageFactory().constructRerror(msg.getTag(),
                     String.format("file \"%s\" does not exist", msg.mPathElements));
@@ -206,7 +203,7 @@ private StyxMessage processWStat(StyxTWStatMessage msg) {
 
     private StyxMessage processWrite(int clientId, StyxTWriteMessage msg) throws StyxException {
         long fid = msg.getFID();
-        return new StyxRWriteMessage(msg.getTag(),
+        return mDi.getMessageFactory().constructRWriteMessage(msg.getTag(),
                 mDi.getClientsRepo().getAssignedFile(clientId, fid).write(clientId, msg.data, msg.offset));
     }
 
@@ -217,7 +214,7 @@ private StyxMessage processRead(int clientId, StyxTReadMessage msg) throws StyxE
         long fid = msg.getFID();
         byte[] buffer = new byte[(int) msg.count];
         MetricsAndStats.byteArrayAllocationRRead++;
-        return new StyxRReadMessage(msg.getTag(), buffer,
+        return mDi.getMessageFactory().constructRReadMessage(msg.getTag(), buffer,
                 mDi.getClientsRepo()
                         .getAssignedFile(clientId, fid)
                         .read(clientId, buffer, msg.offset, msg.count));
diff --git a/java/v2styx-lib/src/main/java/com/v2soft/styxlib/l5/messages/base/Factory.java b/java/v2styx-lib/src/main/java/com/v2soft/styxlib/l5/messages/base/Factory.java
@@ -21,4 +21,9 @@ public interface Factory {
     StyxMessage constructRStatMessage(int tag, StyxStat stat);
     StyxMessage constructTFlushMessage(int tag);
     StyxMessage constructTOpenMessage(long fid, int mode);
+    StyxMessage constructRWriteMessage(int tag, long count);
+    StyxMessage constructTReadMessage(long fid, long offset, int count);
+    StyxMessage constructRWalkMessage(int tag, List<StyxQID> empty);
+    StyxMessage constructRReadMessage(int tag, byte[] data, int size);
+    StyxMessage constructTCreateMessage(long fid, String name, long permissions, int mode);
 }
diff --git a/java/v2styx-lib/src/main/java/com/v2soft/styxlib/l5/messages/v9p2000/FactoryImpl.java b/java/v2styx-lib/src/main/java/com/v2soft/styxlib/l5/messages/v9p2000/FactoryImpl.java
@@ -82,4 +82,29 @@ public StyxMessage constructTFlushMessage(int tag) {
     public StyxMessage constructTOpenMessage(long fid, int mode) {
         return new StyxTOpenMessage(fid, mode);
     }
+
+    @Override
+    public StyxMessage constructRWriteMessage(int tag, long count) {
+        return new StyxRWriteMessage(tag, count);
+    }
+
+    @Override
+    public StyxMessage constructTReadMessage(long fid, long offset, int count) {
+        return new StyxTReadMessage(fid, offset, count);
+    }
+
+    @Override
+    public StyxMessage constructRWalkMessage(int tag, List<StyxQID> empty) {
+        return new StyxRWalkMessage(tag, empty);
+    }
+
+    @Override
+    public StyxMessage constructRReadMessage(int tag, byte[] data, int size) {
+        return new StyxRReadMessage(tag, data, size);
+    }
+
+    @Override
+    public StyxMessage constructTCreateMessage(long fid, String name, long permissions, int mode) {
+        return new StyxTCreateMessage(fid, name, permissions, mode);
+    }
 }
diff --git a/java/v2styx-lib/src/main/java/com/v2soft/styxlib/l5/messages/v9p2000/StyxRReadMessage.java b/java/v2styx-lib/src/main/java/com/v2soft/styxlib/l5/messages/v9p2000/StyxRReadMessage.java
@@ -1,15 +1,14 @@
-package com.v2soft.styxlib.l5.messages;
+package com.v2soft.styxlib.l5.messages.v9p2000;
 
 import com.v2soft.styxlib.Config;
 import com.v2soft.styxlib.l5.dev.Operations;
 import com.v2soft.styxlib.l5.enums.MessageType;
-import com.v2soft.styxlib.l5.messages.v9p2000.BaseMessage;
 
 public class StyxRReadMessage extends BaseMessage {
     public final byte[] data;
     public final int dataLength;
 
-    public StyxRReadMessage(int tag, byte[] data, int length) {
+    protected StyxRReadMessage(int tag, byte[] data, int length) {
         super(MessageType.Rread, tag, null);
         if (length < 0) {
             throw new IllegalArgumentException("length is negative " + length);
diff --git a/java/v2styx-lib/src/main/java/com/v2soft/styxlib/l5/messages/v9p2000/StyxRWalkMessage.java b/java/v2styx-lib/src/main/java/com/v2soft/styxlib/l5/messages/v9p2000/StyxRWalkMessage.java
@@ -1,15 +1,14 @@
-package com.v2soft.styxlib.l5.messages;
+package com.v2soft.styxlib.l5.messages.v9p2000;
 
 import com.v2soft.styxlib.l5.enums.MessageType;
-import com.v2soft.styxlib.l5.messages.v9p2000.BaseMessage;
 import com.v2soft.styxlib.l5.structs.StyxQID;
 
 import java.util.List;
 
 public class StyxRWalkMessage extends BaseMessage {
 	public final List<StyxQID> qidList;
 
-	public StyxRWalkMessage(int tag, List<StyxQID> qids) {
+	protected StyxRWalkMessage(int tag, List<StyxQID> qids) {
 		super(MessageType.Rwalk, tag, null);
 		qidList = qids;
 	}
diff --git a/java/v2styx-lib/src/main/java/com/v2soft/styxlib/l5/messages/v9p2000/StyxRWriteMessage.java b/java/v2styx-lib/src/main/java/com/v2soft/styxlib/l5/messages/v9p2000/StyxRWriteMessage.java
@@ -1,12 +1,11 @@
-package com.v2soft.styxlib.l5.messages;
+package com.v2soft.styxlib.l5.messages.v9p2000;
 
 import com.v2soft.styxlib.l5.enums.MessageType;
-import com.v2soft.styxlib.l5.messages.v9p2000.BaseMessage;
 
 public class StyxRWriteMessage extends BaseMessage {
 	public final long count;
 
-	public StyxRWriteMessage(int tag, long count) {
+	protected StyxRWriteMessage(int tag, long count) {
 		super(MessageType.Rwrite, tag, null);
 		this.count = count;
 	}
diff --git a/java/v2styx-lib/src/main/java/com/v2soft/styxlib/l5/messages/v9p2000/StyxTCreateMessage.java b/java/v2styx-lib/src/main/java/com/v2soft/styxlib/l5/messages/v9p2000/StyxTCreateMessage.java
@@ -1,4 +1,4 @@
-package com.v2soft.styxlib.l5.messages;
+package com.v2soft.styxlib.l5.messages.v9p2000;
 
 import com.v2soft.styxlib.l5.enums.MessageType;
 import com.v2soft.styxlib.l5.messages.base.StyxTMessageFID;
@@ -8,7 +8,7 @@ public class StyxTCreateMessage extends StyxTMessageFID {
     public final long permissions;
     public final int mode;
 
-    public StyxTCreateMessage(long fid, String name, long permissions, int mode) {
+    protected StyxTCreateMessage(long fid, String name, long permissions, int mode) {
         super(MessageType.Tcreate, fid);
         this.name = name;
         this.permissions = permissions;
diff --git a/java/v2styx-lib/src/main/java/com/v2soft/styxlib/l5/messages/v9p2000/StyxTReadMessage.java b/java/v2styx-lib/src/main/java/com/v2soft/styxlib/l5/messages/v9p2000/StyxTReadMessage.java
@@ -1,4 +1,4 @@
-package com.v2soft.styxlib.l5.messages;
+package com.v2soft.styxlib.l5.messages.v9p2000;
 
 import com.v2soft.styxlib.l5.enums.MessageType;
 import com.v2soft.styxlib.l5.messages.base.StyxTMessageFID;
@@ -7,7 +7,7 @@ public class StyxTReadMessage extends StyxTMessageFID {
 	public final long offset;
 	public final int count;
 
-	public StyxTReadMessage(long fid, long offset, int count)	{
+	protected StyxTReadMessage(long fid, long offset, int count)	{
 		super(MessageType.Tread, fid);
 		this.offset = offset;
 		this.count = count;
diff --git a/java/v2styx-lib/src/main/java/com/v2soft/styxlib/l5/v9p2000/StyxDeserializerImpl.java b/java/v2styx-lib/src/main/java/com/v2soft/styxlib/l5/v9p2000/StyxDeserializerImpl.java
@@ -3,11 +3,6 @@
 import com.v2soft.styxlib.exceptions.StyxException;
 import com.v2soft.styxlib.l5.dev.MetricsAndStats;
 import com.v2soft.styxlib.l5.enums.MessageType;
-import com.v2soft.styxlib.l5.messages.StyxRReadMessage;
-import com.v2soft.styxlib.l5.messages.StyxRWalkMessage;
-import com.v2soft.styxlib.l5.messages.StyxRWriteMessage;
-import com.v2soft.styxlib.l5.messages.StyxTCreateMessage;
-import com.v2soft.styxlib.l5.messages.StyxTReadMessage;
 import com.v2soft.styxlib.l5.messages.base.Factory;
 import com.v2soft.styxlib.l5.messages.base.StyxMessage;
 import com.v2soft.styxlib.l5.messages.base.StyxTMessageFID;
@@ -72,22 +67,23 @@ public StyxMessage deserializeMessage(IBufferReader buffer, int io_unit) throws
                 for (int i = 0; i < count; i++) {
                     qids.add(deserializeQid(buffer));
                 }
-                result = new StyxRWalkMessage(tag, qids);
+                result = messageFactory.constructRWalkMessage(tag, qids);
             }
             case MessageType.Topen -> result = messageFactory.constructTOpenMessage(buffer.readUInt32(),
                     buffer.readUInt8());
             case MessageType.Ropen -> result = messageFactory.constructROpenMessage(tag,
                     deserializeQid(buffer),
                     buffer.readUInt32());
-            case MessageType.Tcreate -> result = new StyxTCreateMessage(buffer.readUInt32(),
+            case MessageType.Tcreate -> result = messageFactory.constructTCreateMessage(
+                    buffer.readUInt32(),
                     buffer.readUTFString(),
                     buffer.readUInt32(),
                     buffer.readUInt8());
             case MessageType.Rcreate -> result = messageFactory.constructRCreateMessage(
                     tag,
                     deserializeQid(buffer),
                     buffer.readUInt32());
-            case MessageType.Tread -> result = new StyxTReadMessage(
+            case MessageType.Tread -> result = messageFactory.constructTReadMessage(
                     buffer.readUInt32(),
                     buffer.readUInt64(),
                     (int) buffer.readUInt32());
@@ -96,7 +92,7 @@ public StyxMessage deserializeMessage(IBufferReader buffer, int io_unit) throws
                 MetricsAndStats.byteArrayAllocationRRead++;
                 var data = new byte[dataLength];
                 buffer.readData(data, 0, dataLength);
-                result = new StyxRReadMessage(tag,
+                result = messageFactory.constructRReadMessage(tag,
                         data,
                         dataLength);
             }
@@ -113,7 +109,7 @@ public StyxMessage deserializeMessage(IBufferReader buffer, int io_unit) throws
                         0,
                         0);
             }
-            case MessageType.Rwrite -> result = new StyxRWriteMessage(tag, buffer.readUInt32());
+            case MessageType.Rwrite -> result = messageFactory.constructRWriteMessage(tag, buffer.readUInt32());
             case MessageType.Tclunk -> result = new StyxTMessageFID(
                     MessageType.Tclunk,
                     buffer.readUInt32());
diff --git a/java/v2styx-lib/src/main/java/com/v2soft/styxlib/l5/v9p2000/StyxSerializerImpl.java b/java/v2styx-lib/src/main/java/com/v2soft/styxlib/l5/v9p2000/StyxSerializerImpl.java
@@ -3,7 +3,6 @@
 import com.v2soft.styxlib.exceptions.StyxException;
 import com.v2soft.styxlib.l5.enums.Checks;
 import com.v2soft.styxlib.l5.enums.MessageType;
-import com.v2soft.styxlib.l5.messages.*;
 import com.v2soft.styxlib.l5.messages.base.StyxMessage;
 import com.v2soft.styxlib.l5.messages.base.StyxTMessageFID;
 import com.v2soft.styxlib.l5.messages.v9p2000.*;
diff --git a/java/v2styx-lib/src/main/java/com/v2soft/styxlib/l6/StyxFile.java b/java/v2styx-lib/src/main/java/com/v2soft/styxlib/l6/StyxFile.java
@@ -9,7 +9,6 @@
 import com.v2soft.styxlib.l5.enums.FileMode;
 import com.v2soft.styxlib.l5.enums.MessageType;
 import com.v2soft.styxlib.l5.enums.ModeType;
-import com.v2soft.styxlib.l5.messages.StyxTCreateMessage;
 import com.v2soft.styxlib.l5.messages.base.StyxMessage;
 import com.v2soft.styxlib.l5.messages.base.StyxTMessageFID;
 import com.v2soft.styxlib.l5.messages.v9p2000.StyxRErrorMessage;
@@ -96,7 +95,8 @@ public List<StyxStat> listStat()
         var iounit = open(ModeType.OREAD, tempFID);
         var stats = new ArrayList<StyxStat>();
         try {
-            var is = new StyxFileBufferedInputStream(mTransmitter, tempFID, iounit, mClientId);
+            var is = new StyxFileBufferedInputStream(mTransmitter, tempFID, iounit, mClientId,
+                    mDI.getGetMessagesFactoryUseCase());
             var sis = new StyxDataInputStream(is);
             while (true) {
                 stats.add(mDI.getDataDeserializer().deserializeStat(sis));
@@ -125,7 +125,8 @@ public StyxFileBufferedInputStream openForRead()
             throws StyxException {
         long tempFID = getCloneFID();
         int iounit = open(ModeType.OREAD, tempFID);
-        return new StyxFileBufferedInputStream(mTransmitter, tempFID, iounit, mClientId);
+        return new StyxFileBufferedInputStream(mTransmitter, tempFID, iounit, mClientId,
+                mDI.getGetMessagesFactoryUseCase());
     }
 
     /**
@@ -136,7 +137,8 @@ public StyxFileBufferedInputStream openForRead()
     public StyxUnbufferedInputStream openForReadUnbuffered() throws StyxException {
         long tempFID = getCloneFID();
         int iounit = open(ModeType.OREAD, tempFID);
-        return new StyxUnbufferedInputStream(tempFID, mTransmitter, iounit, mClientId);
+        return new StyxUnbufferedInputStream(tempFID, mTransmitter, iounit, mClientId,
+                mDI.getGetMessagesFactoryUseCase());
     }
 
     public OutputStream openForWrite()
@@ -158,7 +160,10 @@ public StyxUnbufferedOutputStream openForWriteUnbuffered()
     public void create(long permissions) throws StyxException {
         // reserve FID
         long tempFID = sendWalkMessage(mParentFID, "");
-        var tCreate = new StyxTCreateMessage(tempFID, mPath, permissions, ModeType.OWRITE);
+        var tCreate = mDI.getMessageFactory().constructTCreateMessage(tempFID,
+                mPath,
+                permissions,
+                ModeType.OWRITE);
         mTransmitter
             .sendMessage(tCreate, mClientId)
 //                .exceptionally()
@@ -226,7 +231,11 @@ public void renameTo(String name)
 
     public void mkdir(long permissions) throws InterruptedException, StyxException {
         permissions = permissions & FileMode.PERMISSION_BITMASK | FileMode.Directory;
-        StyxTCreateMessage tCreate = new StyxTCreateMessage(mParentFID, getName(), permissions, ModeType.OREAD);
+        final var tCreate = mDI.getMessageFactory().constructTCreateMessage(
+                mParentFID,
+                getName(),
+                permissions,
+                ModeType.OREAD);
         mTransmitter.sendMessage(tCreate, mClientId).getResult(mTimeout);
     }
 
diff --git a/java/v2styx-lib/src/main/java/com/v2soft/styxlib/l6/io/StyxFileBufferedInputStream.java b/java/v2styx-lib/src/main/java/com/v2soft/styxlib/l6/io/StyxFileBufferedInputStream.java
@@ -1,7 +1,7 @@
 package com.v2soft.styxlib.l6.io;
 
-import com.v2soft.styxlib.server.ClientDetails;
 import com.v2soft.styxlib.handlers.IMessageTransmitter;
+import com.v2soft.styxlib.utils.GetMessagesFactoryUseCase;
 
 import java.io.BufferedInputStream;
 import java.io.IOException;
@@ -21,10 +21,12 @@ public class StyxFileBufferedInputStream extends InputStream {
      * @param iounit maximal block size.
      */
     public StyxFileBufferedInputStream(IMessageTransmitter messenger,
-            long fid,
-            int iounit,
-            int clientId) {
-        mUnbufferedInput = new StyxUnbufferedInputStream(fid, messenger, iounit, clientId);
+                                       long fid,
+                                       int iounit,
+                                       int clientId,
+                                       GetMessagesFactoryUseCase getMessagesFactoryUseCase) {
+        mUnbufferedInput = new StyxUnbufferedInputStream(fid, messenger, iounit, clientId,
+                getMessagesFactoryUseCase);
         mBufferedInput = new CBufferedInputStream(mUnbufferedInput, iounit);
     }
 
diff --git a/java/v2styx-lib/src/main/java/com/v2soft/styxlib/l6/io/StyxUnbufferedInputStream.java b/java/v2styx-lib/src/main/java/com/v2soft/styxlib/l6/io/StyxUnbufferedInputStream.java
@@ -1,12 +1,13 @@
 package com.v2soft.styxlib.l6.io;
 
-import com.v2soft.styxlib.l5.Connection;
-import com.v2soft.styxlib.l5.messages.StyxRReadMessage;
-import com.v2soft.styxlib.l5.messages.StyxTReadMessage;
-import com.v2soft.styxlib.l5.messages.base.StyxTMessageFID;
-import com.v2soft.styxlib.l5.enums.MessageType;
 import com.v2soft.styxlib.handlers.IMessageTransmitter;
+import com.v2soft.styxlib.l5.Connection;
 import com.v2soft.styxlib.l5.dev.MetricsAndStats;
+import com.v2soft.styxlib.l5.enums.MessageType;
+import com.v2soft.styxlib.l5.messages.v9p2000.StyxRReadMessage;
+import com.v2soft.styxlib.l5.messages.base.StyxMessage;
+import com.v2soft.styxlib.l5.messages.base.StyxTMessageFID;
+import com.v2soft.styxlib.utils.GetMessagesFactoryUseCase;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -24,17 +25,20 @@ public class StyxUnbufferedInputStream extends InputStream {
     private long mFileOffset = 0;
     private int mIOUnitSize;
     protected int mRecepient;
+    private GetMessagesFactoryUseCase getMessagesFactoryUseCase;
 
     public StyxUnbufferedInputStream(long file,
                                      IMessageTransmitter messenger,
                                      int iounit,
-                                     int clientId) {
+                                     int clientId,
+                                     GetMessagesFactoryUseCase getMessagesFactoryUseCase) {
         if ( clientId < 0 ) {
             throw new NullPointerException("clientId is negative");
         }
         if ( messenger == null ) {
             throw new NullPointerException("messenger is null");
         }
+        this.getMessagesFactoryUseCase = getMessagesFactoryUseCase;
         MetricsAndStats.byteArrayAllocationIo++;
         mRecepient = clientId;
         mIOUnitSize = iounit;
@@ -58,7 +62,8 @@ public int read(byte[] b, int off, int len) throws IOException {
         int read = 0;
         try {
             // send Tread
-            final StyxTReadMessage tRead = new StyxTReadMessage(mFID, mFileOffset, len);
+            final StyxMessage tRead = getMessagesFactoryUseCase.get()
+                    .constructTReadMessage(mFID, mFileOffset, len);
             final var rRead = mMessenger.<StyxRReadMessage>sendMessage(tRead, mRecepient)
                     .getResult(mTimeout);
             read = rRead.dataLength;
diff --git a/java/v2styx-lib/src/main/java/com/v2soft/styxlib/l6/io/StyxUnbufferedOutputStream.java b/java/v2styx-lib/src/main/java/com/v2soft/styxlib/l6/io/StyxUnbufferedOutputStream.java
@@ -4,7 +4,7 @@
 import com.v2soft.styxlib.l5.Connection;
 import com.v2soft.styxlib.l5.dev.MetricsAndStats;
 import com.v2soft.styxlib.l5.enums.MessageType;
-import com.v2soft.styxlib.l5.messages.StyxRWriteMessage;
+import com.v2soft.styxlib.l5.messages.v9p2000.StyxRWriteMessage;
 import com.v2soft.styxlib.l5.messages.base.StyxMessage;
 import com.v2soft.styxlib.l5.messages.base.StyxTMessageFID;
 import com.v2soft.styxlib.utils.GetMessagesFactoryUseCase;
diff --git a/java/v2styx-lib/src/test/java/com/v2soft/styxlib/l5/messages/v9p2000/FactoryImplTests.java b/java/v2styx-lib/src/test/java/com/v2soft/styxlib/l5/messages/v9p2000/FactoryImplTests.java
diff --git a/java/v2styx-lib/src/test/java/com/v2soft/styxlib/l5/serialization/MessageSerializerImplTest.java b/java/v2styx-lib/src/test/java/com/v2soft/styxlib/l5/serialization/MessageSerializerImplTest.java
diff --git a/java/v2styx-lib/src/test/java/com/v2soft/styxlib/l5/v9p2000/StyxSerializerImplTest.java b/java/v2styx-lib/src/test/java/com/v2soft/styxlib/l5/v9p2000/StyxSerializerImplTest.java
