Merge pull request #40 from vshcryabets/fix/update-styx-messages

vshcryabets · web-flow · commit b0d8192944ed · 2025-08-04T21:08:20.000+03:00
Update styx messages in Java
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
@@ -13,8 +13,8 @@
 import com.v2soft.styxlib.l5.messages.StyxTCreateMessage;
 import com.v2soft.styxlib.l5.messages.StyxTOpenMessage;
 import com.v2soft.styxlib.l5.messages.StyxTReadMessage;
-import com.v2soft.styxlib.l5.messages.StyxTWStatMessage;
-import com.v2soft.styxlib.l5.messages.StyxTWalkMessage;
+import com.v2soft.styxlib.l5.messages.v9p2000.StyxTWStatMessage;
+import com.v2soft.styxlib.l5.messages.v9p2000.StyxTWalkMessage;
 import com.v2soft.styxlib.l5.messages.v9p2000.StyxTWriteMessage;
 import com.v2soft.styxlib.l5.messages.base.StyxMessage;
 import com.v2soft.styxlib.l5.messages.base.StyxTMessageFID;
@@ -161,14 +161,14 @@ private StyxMessage processWalk(int clientId, StyxTWalkMessage msg) throws StyxE
         final List<StyxQID> qidsList = new LinkedList<StyxQID>();
         final IVirtualStyxFile walkFile = mDi.getClientsRepo().getAssignedFile(clientId, fid).walk(
                 clientId,
-                new LinkedList<>(msg.getPathElements()),
+                new LinkedList<>(msg.mPathElements),
                 qidsList);
         if (walkFile != null) {
-            mDi.getClientsRepo().getClient(clientId).registerOpenedFile(msg.getNewFID(), walkFile);
+            mDi.getClientsRepo().getClient(clientId).registerOpenedFile(msg.mNewFID, walkFile);
             return new StyxRWalkMessage(msg.getTag(), qidsList);
         } else {
             return mDi.getMessageFactory().constructRerror(msg.getTag(),
-                    String.format("file \"%s\" does not exist", msg.getPathElements()));
+                    String.format("file \"%s\" does not exist", msg.mPathElements));
         }
     }
 
diff --git a/java/v2styx-lib/src/main/java/com/v2soft/styxlib/l5/dev/Operations.java b/java/v2styx-lib/src/main/java/com/v2soft/styxlib/l5/dev/Operations.java
@@ -2,7 +2,6 @@
 
 import com.v2soft.styxlib.Logger;
 import com.v2soft.styxlib.l5.enums.MessageType;
-import com.v2soft.styxlib.l5.messages.StyxTWStatMessage;
 import com.v2soft.styxlib.l5.messages.base.StyxMessage;
 import com.v2soft.styxlib.l5.messages.base.StyxTMessageFID;
 import com.v2soft.styxlib.l5.messages.v9p2000.StyxRErrorMessage;
@@ -44,11 +43,6 @@ public static String toString(StyxMessage message) {
                 result.append(" Error:");
                 result.append(((StyxRErrorMessage)message).mError);
                 break;
-            case MessageType.Twstat: {
-                result.append(" Stat: ");
-                result.append(((StyxTWStatMessage) message).stat.toString());
-            }
-            break;
             case MessageType.Tattach:
                 result.append("AuthFID: ");
                 result.append(((StyxTAttachMessage) message).authFID);
diff --git a/java/v2styx-lib/src/main/java/com/v2soft/styxlib/l5/messages/StyxTWalkMessage.java b/java/v2styx-lib/src/main/java/com/v2soft/styxlib/l5/messages/StyxTWalkMessage.java
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
@@ -1,6 +1,9 @@
 package com.v2soft.styxlib.l5.messages.base;
 
 import com.v2soft.styxlib.l5.structs.StyxQID;
+import com.v2soft.styxlib.l5.structs.StyxStat;
+
+import java.util.List;
 
 public interface Factory {
     StyxMessage constructTVersion(long iounit, String version);
@@ -13,4 +16,6 @@ public interface Factory {
     StyxMessage constructROpenMessage(int tag, StyxQID qid, long iounit);
     StyxMessage constructRCreateMessage(int tag, StyxQID qid, long iounit);
     StyxMessage constructTWriteMessage(long fid, long fileOffset, byte[] data, int dataOffset, int dataLength);
+    StyxMessage constructTWalkMessage(long fid, long new_fid, List<String> path);
+    StyxMessage constructTWStatMessage(long fid, StyxStat stat);
 }
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
@@ -3,6 +3,9 @@
 import com.v2soft.styxlib.l5.messages.base.Factory;
 import com.v2soft.styxlib.l5.messages.base.StyxMessage;
 import com.v2soft.styxlib.l5.structs.StyxQID;
+import com.v2soft.styxlib.l5.structs.StyxStat;
+
+import java.util.List;
 
 public class FactoryImpl implements Factory  {
     @Override
@@ -54,4 +57,14 @@ public StyxMessage constructRCreateMessage(int tag, StyxQID qid, long iounit) {
     public StyxMessage constructTWriteMessage(long fid, long fileOffset, byte[] data, int dataOffset, int dataLength) {
         return new StyxTWriteMessage(fid, fileOffset, data, dataOffset, dataLength);
     }
+
+    @Override
+    public StyxMessage constructTWalkMessage(long fid, long new_fid, List<String> path) {
+        return new StyxTWalkMessage(fid, new_fid, path);
+    }
+
+    @Override
+    public StyxMessage constructTWStatMessage(long fid, StyxStat stat) {
+        return new StyxTWStatMessage(fid, stat);
+    }
 }
diff --git a/java/v2styx-lib/src/main/java/com/v2soft/styxlib/l5/messages/v9p2000/StyxTWStatMessage.java b/java/v2styx-lib/src/main/java/com/v2soft/styxlib/l5/messages/v9p2000/StyxTWStatMessage.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 StyxTWStatMessage extends StyxTMessageFID {
     public final StyxStat stat;
 
-    public StyxTWStatMessage(long fid, StyxStat stat) {
+    protected StyxTWStatMessage(long fid, StyxStat stat) {
         super(MessageType.Twstat, fid);
         this.stat = stat;
     }
diff --git a/java/v2styx-lib/src/main/java/com/v2soft/styxlib/l5/messages/v9p2000/StyxTWalkMessage.java b/java/v2styx-lib/src/main/java/com/v2soft/styxlib/l5/messages/v9p2000/StyxTWalkMessage.java
@@ -0,0 +1,23 @@
+package com.v2soft.styxlib.l5.messages.v9p2000;
+
+import com.v2soft.styxlib.l5.enums.MessageType;
+import com.v2soft.styxlib.l5.messages.base.StyxTMessageFID;
+
+import java.util.List;
+
+/**
+ *
+ * @author V.Shcriyabets (vshcryabets@gmail.com)
+ *
+ */
+public class StyxTWalkMessage
+extends StyxTMessageFID {
+    public final long mNewFID;
+    public final List<String> mPathElements;
+
+    protected StyxTWalkMessage(long fid, long new_fid, List<String> path){
+        super(MessageType.Twalk, fid);
+        mNewFID = new_fid;
+        mPathElements = path;
+    }
+}
diff --git a/java/v2styx-lib/src/main/java/com/v2soft/styxlib/l5/v9p2000/StringSerializerImpl.java b/java/v2styx-lib/src/main/java/com/v2soft/styxlib/l5/v9p2000/StringSerializerImpl.java
@@ -1,13 +1,14 @@
 package com.v2soft.styxlib.l5.v9p2000;
 
-import com.v2soft.styxlib.exceptions.StyxException;
 import com.v2soft.styxlib.l5.dev.StringSerializer;
 import com.v2soft.styxlib.l5.enums.MessageType;
 import com.v2soft.styxlib.l5.messages.base.StyxMessage;
 import com.v2soft.styxlib.l5.messages.v9p2000.BaseMessage;
 import com.v2soft.styxlib.l5.messages.v9p2000.StyxROpenMessage;
 import com.v2soft.styxlib.l5.messages.v9p2000.StyxRVersionMessage;
 import com.v2soft.styxlib.l5.messages.v9p2000.StyxTVersionMessage;
+import com.v2soft.styxlib.l5.messages.v9p2000.StyxTWStatMessage;
+import com.v2soft.styxlib.l5.messages.v9p2000.StyxTWalkMessage;
 import com.v2soft.styxlib.l5.messages.v9p2000.StyxTWriteMessage;
 import com.v2soft.styxlib.l5.structs.StyxQID;
 import com.v2soft.styxlib.l5.structs.StyxStat;
@@ -20,7 +21,7 @@ public String serializeQid(StyxQID qid) {
     }
 
     @Override
-    public String serializeStat(StyxStat stat) throws StyxException {
+    public String serializeStat(StyxStat stat) {
         StringBuilder result = new StringBuilder();
         result.append("Stat ")
                 .append(String.format("0x%x,0x%x,", stat.type(), stat.dev()))
@@ -73,6 +74,20 @@ public String serializeMessage(StyxMessage message) {
                 result.append(",iounit:");
                 result.append(((StyxROpenMessage)message).ioUnit);
                 break;
+            case MessageType.Twalk:
+                result.append(",fid:");
+                result.append(((StyxTWalkMessage)message).mFID);
+                result.append(",newFid:");
+                result.append(((StyxTWalkMessage)message).mNewFID);
+                result.append(",pathElements:");
+                result.append(((StyxTWalkMessage)message).mPathElements);
+                break;
+            case MessageType.Twstat:
+                result.append(",fid:");
+                result.append(((StyxTWStatMessage)message).mFID);
+                result.append(",Stat:");
+                result.append(serializeStat(((StyxTWStatMessage)message).stat));
+                break;
             default:
                 result.append(" (not implemented for this message type)");
                 break;
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
@@ -11,8 +11,6 @@
 import com.v2soft.styxlib.l5.messages.StyxTFlushMessage;
 import com.v2soft.styxlib.l5.messages.StyxTOpenMessage;
 import com.v2soft.styxlib.l5.messages.StyxTReadMessage;
-import com.v2soft.styxlib.l5.messages.StyxTWStatMessage;
-import com.v2soft.styxlib.l5.messages.StyxTWalkMessage;
 import com.v2soft.styxlib.l5.messages.base.Factory;
 import com.v2soft.styxlib.l5.messages.base.StyxMessage;
 import com.v2soft.styxlib.l5.messages.base.StyxTMessageFID;
@@ -63,7 +61,7 @@ public StyxMessage deserializeMessage(IBufferReader buffer, int io_unit) throws
                 for (int i = 0; i < count; i++) {
                     pathElements.add(buffer.readUTFString());
                 }
-                result = new StyxTWalkMessage(fid,
+                result = messageFactory.constructTWalkMessage(fid,
                         newFid,
                         pathElements);
             }
@@ -136,7 +134,7 @@ public StyxMessage deserializeMessage(IBufferReader buffer, int io_unit) throws
                 var fid = buffer.readUInt32();
                 buffer.readUInt16(); // ???
                 var stat = deserializeStat(buffer);
-                result = new StyxTWStatMessage(fid, stat);
+                result = messageFactory.constructTWStatMessage(fid, stat);
             }
             case MessageType.Rwstat -> result = new BaseMessage(MessageType.Rwstat, tag, null);
             default ->
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
@@ -44,7 +44,7 @@ public int getMessageSize(StyxMessage message) {
             case MessageType.Twalk -> {
                 var walkMessage = (StyxTWalkMessage)message;
                 size += 4 + 2;
-                for (var pathElement : walkMessage.getPathElements())
+                for (var pathElement : walkMessage.mPathElements)
                     size += UTF.getUTFSize(pathElement);
             }
             case MessageType.Topen -> size++;
@@ -104,10 +104,10 @@ private void serializeTMessage(StyxMessage message, IBufferWriter output) throws
                 break;
             case MessageType.Twalk:
                 StyxTWalkMessage tWalk = (StyxTWalkMessage) message;
-                output.writeUInt32(tWalk.getNewFID());
-                if (tWalk.getPathElements() != null) {
-                    output.writeUInt16(tWalk.getPathElements().size());
-                    for (String pathElement : tWalk.getPathElements())
+                output.writeUInt32(tWalk.mNewFID);
+                if (tWalk.mPathElements != null) {
+                    output.writeUInt16(tWalk.mPathElements.size());
+                    for (String pathElement : tWalk.mPathElements)
                         output.writeUTFString(pathElement);
                 } else {
                     output.writeUInt16(0);
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,9 @@
 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.*;
+import com.v2soft.styxlib.l5.messages.StyxRStatMessage;
+import com.v2soft.styxlib.l5.messages.StyxTCreateMessage;
+import com.v2soft.styxlib.l5.messages.StyxTOpenMessage;
 import com.v2soft.styxlib.l5.messages.base.StyxMessage;
 import com.v2soft.styxlib.l5.messages.base.StyxTMessageFID;
 import com.v2soft.styxlib.l5.messages.v9p2000.StyxRErrorMessage;
@@ -219,7 +221,7 @@ public void renameTo(String name)
                 stat.userName(),
                 stat.groupName(),
                 stat.modificationUser());
-        StyxTWStatMessage tWStat = new StyxTWStatMessage(getFID(), newStat);
+        StyxMessage tWStat = mDI.getMessageFactory().constructTWStatMessage(getFID(), newStat);
         mTransmitter.sendMessage(tWStat, mClientId).getResult(mTimeout);
     }
 
@@ -317,14 +319,12 @@ public String getName() throws StyxException, InterruptedException {
     private long sendWalkMessage(long parentFID, String path)
             throws StyxException {
         long newFID = mDI.getClientsRepo().getFidPoll(mClientId).getFreeItem();
-        final StyxTWalkMessage tWalk = new StyxTWalkMessage(parentFID,
+        final StyxMessage tWalk = mDI.getMessageFactory().constructTWalkMessage(parentFID,
                 newFID, StyxSerializerImpl.splitPath(path));
         final var feature = mTransmitter.sendMessage(tWalk, mClientId);
         final StyxMessage rWalk = feature.getResult(mTimeout);
         if (rWalk.getType() == MessageType.Rerror)
             throw StyxErrorMessageException.newInstance(((StyxRErrorMessage) rWalk).mError + " at " + mPath);
-        if (((StyxRWalkMessage) rWalk).qidList.size() != tWalk.getPathLength())
-            throw new StyxException("File not found " + mPath);
         return newFID;
     }
 
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
@@ -5,9 +5,12 @@
 import com.v2soft.styxlib.l5.messages.base.Factory;
 import com.v2soft.styxlib.l5.structs.StyxQID;
 
+import com.v2soft.styxlib.l5.structs.StyxStat;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
+import java.util.List;
+
 public class FactoryImplTests {
     final Factory factory = new FactoryImpl();
 
@@ -110,4 +113,28 @@ public void testCreateTWrite() {
         Assertions.assertEquals(0x123, ((StyxTWriteMessage) message).offset);
         Assertions.assertArrayEquals(data, ((StyxTWriteMessage) message).data);
     }
+
+    @Test
+    public void testCreateTWalk() {
+        var message = factory.constructTWalkMessage(1080, 23432,
+                List.of("path1", "path2", "path3"));
+        Assertions.assertNotNull(message);
+        Assertions.assertEquals(Constants.NOTAG, message.getTag());
+        Assertions.assertInstanceOf(StyxTWalkMessage.class, message);
+        Assertions.assertEquals(MessageType.Twalk, message.getType());
+        Assertions.assertEquals(1080, ((StyxTWalkMessage) message).mFID);
+        Assertions.assertEquals(23432, ((StyxTWalkMessage) message).mNewFID);
+        Assertions.assertEquals(3, ((StyxTWalkMessage) message).mPathElements.size());
+    }
+
+    @Test
+    public void testCreateTWStat() {
+        var message = factory.constructTWStatMessage(1080, StyxStat.EMPTY);
+        Assertions.assertNotNull(message);
+        Assertions.assertEquals(Constants.NOTAG, message.getTag());
+        Assertions.assertInstanceOf(StyxTWStatMessage.class, message);
+        Assertions.assertEquals(MessageType.Twstat, message.getType());
+        Assertions.assertEquals(1080, ((StyxTWStatMessage) message).mFID);
+        Assertions.assertEquals(StyxStat.EMPTY, ((StyxTWStatMessage) message).stat);
+    }
 }
diff --git a/java/v2styx-lib/src/test/java/com/v2soft/styxlib/l5/v9p2000/StringSerializerImplTests.java b/java/v2styx-lib/src/test/java/com/v2soft/styxlib/l5/v9p2000/StringSerializerImplTests.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
