Implement reading BtrfsSubvolCommand

Author: gmta

btrfs-io/src/main/java/nl/gmta/btrfs/io/BtrfsStreamReader.java

@@ -11,6 +11,7 @@
 import nl.gmta.btrfs.structure.stream.BtrfsAttributeType;
 import nl.gmta.btrfs.structure.stream.BtrfsChmodCommand;
 import nl.gmta.btrfs.structure.stream.BtrfsChownCommand;
+import nl.gmta.btrfs.structure.stream.BtrfsCommandHeader;
 import nl.gmta.btrfs.structure.stream.BtrfsCommandType;
 import nl.gmta.btrfs.structure.stream.BtrfsEndCommand;
 import nl.gmta.btrfs.structure.stream.BtrfsInodeCommand;
@@ -23,9 +24,9 @@
 import nl.gmta.btrfs.structure.stream.BtrfsRenameCommand;
 import nl.gmta.btrfs.structure.stream.BtrfsSnapshotCommand;
 import nl.gmta.btrfs.structure.stream.BtrfsStreamCommand;
-import nl.gmta.btrfs.structure.stream.BtrfsCommandHeader;
 import nl.gmta.btrfs.structure.stream.BtrfsStreamElement;
 import nl.gmta.btrfs.structure.stream.BtrfsStreamHeader;
+import nl.gmta.btrfs.structure.stream.BtrfsSubvolCommand;
 import nl.gmta.btrfs.structure.stream.BtrfsSymlinkCommand;
 import nl.gmta.btrfs.structure.stream.BtrfsTimespec;
 import nl.gmta.btrfs.structure.stream.BtrfsTruncateCommand;
@@ -64,7 +65,7 @@ private Object readAttribute(BtrfsAttributeType type) throws IOException {
         // Read and verify attribute type
         int readType = this.reader.readLE16();
         if (readType != type.getId()) {
-            throw new BtrfsStructureException(String.format("Expected attribute type %04X but got %04X", type.getId(), readType));
+            throw new BtrfsStructureException(String.format("Expected attribute type %04x but got %04x", type.getId(), readType));
         }
 
         // Read attribute value
@@ -128,6 +129,8 @@ private BtrfsStreamCommand readCommand() throws IOException {
                 return this.readRenameCommand(header);
             case SNAPSHOT:
                 return this.readSnapshotCommand(header);
+            case SUBVOL:
+                return this.readSubvolCommand(header);
             case TRUNCATE:
                 return this.readTruncateCommand(header);
             case UPDATE_EXTENT:
@@ -270,6 +273,14 @@ private BtrfsSnapshotCommand readSnapshotCommand(BtrfsCommandHeader header) thro
         return new BtrfsSnapshotCommand(header, path, UUID, CTransID, cloneUUID, cloneCTransID);
     }
 
+    private BtrfsSubvolCommand readSubvolCommand(BtrfsCommandHeader header) throws IOException {
+        String path = (String) this.readAttribute(BtrfsAttributeType.PATH);
+        UUID UUID = (UUID) this.readAttribute(BtrfsAttributeType.UUID);
+        long CTransID = (Long) this.readAttribute(BtrfsAttributeType.CTRANSID);
+
+        return new BtrfsSubvolCommand(header, path, UUID, CTransID);
+    }
+
     private BtrfsTruncateCommand readTruncateCommand(BtrfsCommandHeader header) throws IOException {
         String path = (String) this.readAttribute(BtrfsAttributeType.PATH);
         long size = (Long) this.readAttribute(BtrfsAttributeType.SIZE);

btrfs-structures/src/main/java/nl/gmta/btrfs/structure/stream/BtrfsSnapshotCommand.java

@@ -3,35 +3,17 @@
 import java.util.Objects;
 import java.util.UUID;
 
-public class BtrfsSnapshotCommand extends BtrfsStreamCommand {
-    private final String path;
-    private final UUID UUID;
-    private final long CTransID;
+public class BtrfsSnapshotCommand extends BtrfsSubvolCommand {
     private final UUID cloneUUID;
     private final long cloneCTransID;
 
     public BtrfsSnapshotCommand(BtrfsCommandHeader header, String path, UUID UUID, long CTransID, UUID cloneUUID, long cloneCTransID) {
-        super(header);
+        super(header, path, UUID, CTransID);
 
-        this.path = Objects.requireNonNull(path);
-        this.UUID = Objects.requireNonNull(UUID);
-        this.CTransID = CTransID;
         this.cloneUUID = Objects.requireNonNull(cloneUUID);
         this.cloneCTransID = cloneCTransID;
     }
 
-    public String getPath() {
-        return this.path;
-    }
-
-    public UUID getUUID() {
-        return this.UUID;
-    }
-
-    public long getCTransID() {
-        return this.CTransID;
-    }
-
     public UUID getCloneUUID() {
         return this.cloneUUID;
     }

btrfs-structures/src/main/java/nl/gmta/btrfs/structure/stream/BtrfsSubvolCommand.java

@@ -0,0 +1,41 @@
+package nl.gmta.btrfs.structure.stream;
+
+import java.util.UUID;
+
+public class BtrfsSubvolCommand extends BtrfsStreamCommand {
+    protected final String path;
+    protected final UUID UUID;
+    protected final long CTransID;
+
+    public BtrfsSubvolCommand(BtrfsCommandHeader header, String path, UUID UUID, long CTransID) {
+        super(header);
+
+        this.path = path;
+        this.UUID = UUID;
+        this.CTransID = CTransID;
+    }
+
+    public String getPath() {
+        return this.path;
+    }
+
+    public UUID getUUID() {
+        return this.UUID;
+    }
+
+    public long getCTransID() {
+        return this.CTransID;
+    }
+
+    @Override
+    public String toString() {
+        return String.format(
+            "%s{header=%s path='%s' UUID=%s CTransID=%d}",
+            this.getClass().getSimpleName(),
+            this.header,
+            this.path,
+            this.UUID,
+            this.CTransID
+        );
+    }
+}