Move few more message classes to factory

vshcryabets · vshcryabets · commit c3c664e65120 · 2025-08-05T13:11:50.000+03:00
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
@@ -8,15 +8,14 @@
 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.StyxTReadMessage;
 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.StyxTWStatMessage;
 import com.v2soft.styxlib.l5.messages.v9p2000.StyxTWalkMessage;
 import com.v2soft.styxlib.l5.messages.v9p2000.StyxTWriteMessage;
@@ -206,7 +205,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));
     }
 
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,6 @@ 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);
 }
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,14 @@ 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);
+    }
 }
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/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
@@ -5,9 +5,7 @@
 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;
@@ -87,7 +85,7 @@ public StyxMessage deserializeMessage(IBufferReader buffer, int io_unit) throws
                     tag,
                     deserializeQid(buffer),
                     buffer.readUInt32());
-            case MessageType.Tread -> result = new StyxTReadMessage(
+            case MessageType.Tread -> result = messageFactory.constructTReadMessage(
                     buffer.readUInt32(),
                     buffer.readUInt64(),
                     (int) buffer.readUInt32());
@@ -113,7 +111,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/l6/StyxFile.java b/java/v2styx-lib/src/main/java/com/v2soft/styxlib/l6/StyxFile.java
@@ -96,7 +96,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 +126,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 +138,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()
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.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.StyxRReadMessage;
-import com.v2soft.styxlib.l5.messages.StyxTReadMessage;
+import com.v2soft.styxlib.l5.messages.base.StyxMessage;
 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.dev.MetricsAndStats;
+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
@@ -167,4 +167,26 @@ public void testCreateTOpen() {
         Assertions.assertInstanceOf(StyxTOpenMessage.class, message);
         Assertions.assertEquals(MessageType.Topen, message.getType());
     }
+
+    @Test
+    public void testCreateRWrite() {
+        var message = factory.constructRWriteMessage(1, 12345);
+        Assertions.assertNotNull(message);
+        Assertions.assertEquals(1, ((StyxRWriteMessage)message).getTag());
+        Assertions.assertEquals(12345, ((StyxRWriteMessage)message).count);
+        Assertions.assertInstanceOf(StyxRWriteMessage.class, message);
+        Assertions.assertEquals(MessageType.Rwrite, message.getType());
+    }
+
+    @Test
+    public void testCreateTRead() {
+        var message = factory.constructTReadMessage(1, 12345, 67890);
+        Assertions.assertNotNull(message);
+        Assertions.assertEquals(1, ((StyxTReadMessage)message).getFID());
+        Assertions.assertEquals(12345, ((StyxTReadMessage)message).offset);
+        Assertions.assertEquals(67890, ((StyxTReadMessage)message).count);
+        Assertions.assertInstanceOf(StyxTReadMessage.class, message);
+        Assertions.assertEquals(MessageType.Tread, message.getType());
+    }
+
 }
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
@@ -8,9 +8,7 @@
 import com.v2soft.styxlib.l5.enums.QidType;
 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.StyxTMessageFID;
 import com.v2soft.styxlib.l5.messages.v9p2000.BaseMessage;
@@ -108,10 +106,10 @@ void testGetSize() {
                         )));
 
         assertEquals(IDataSerializer.BASE_BINARY_SIZE + 4 + 8 + 4,
-                serializer.getMessageSize(new StyxTReadMessage(0x1111, 0x2222, 0x3333)));
+                serializer.getMessageSize(messageFactory.constructTReadMessage(0x1111, 0x2222, 0x3333)));
 
         assertEquals(IDataSerializer.BASE_BINARY_SIZE + 4,
-                serializer.getMessageSize(new StyxRWriteMessage(0x1111, 0x2222)));
+                serializer.getMessageSize(messageFactory.constructRWriteMessage(0x1111, 0x2222)));
 
         assertEquals(IDataSerializer.BASE_BINARY_SIZE + 51,
                 serializer.getMessageSize(messageFactory.constructRStatMessage(

Original file line number	Diff line number	Diff line change
`@@ -21,4 +21,6 @@ public interface Factory {`
`21`	`21`	`StyxMessage constructRStatMessage(int tag, StyxStat stat);`
`22`	`22`	`StyxMessage constructTFlushMessage(int tag);`
`23`	`23`	`StyxMessage constructTOpenMessage(long fid, int mode);`
	`24`	`+ StyxMessage constructRWriteMessage(int tag, long count);`
	`25`	`+ StyxMessage constructTReadMessage(long fid, long offset, int count);`
`24`	`26`	`}`