nfs4: simplify stateid4 class

Motivation:
stateid4 is a struct that holds a byte array and int. No need
for extra wrapper around int.

Modification:
use plain int to reduce object creation.

Result:
simpler code.

Acked-by: Paul Millar
Acked-by: Svenja Meyer
Target: master

Author: kofemann

core/src/main/java/org/dcache/nfs/v4/FileTracker.java

@@ -180,7 +180,7 @@ public stateid4 downgradeOpen(NFS4Client client, stateid4 stateid, Inode inode,
             os.shareAccess = shareAccess;
             os.shareDeny = shareDeny;
 
-            os.stateid.seqid.value++;
+            os.stateid.seqid++;
             return os.stateid;
         } finally {
             lock.unlock();

core/src/main/java/org/dcache/nfs/v4/NFS4State.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009 - 2017 Deutsches Elektronen-Synchroton,
+ * Copyright (c) 2009 - 2020 Deutsches Elektronen-Synchroton,
  * Member of the Helmholtz Association, (DESY), HAMBURG, GERMANY
  *
  * This library is free software; you can redistribute it and/or modify
@@ -74,7 +74,7 @@ public NFS4State(NFS4State openState, StateOwner owner, stateid4 stateid) {
         _disposeListeners = new ArrayList<>();
     }
 
-    public void bumpSeqid() { ++ _stateid.seqid.value; }
+    public void bumpSeqid() { ++ _stateid.seqid; }
 
     public stateid4 stateid() {
         return _stateid;

core/src/main/java/org/dcache/nfs/v4/OperationOPEN.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009 - 2018 Deutsches Elektronen-Synchroton,
+ * Copyright (c) 2009 - 2020 Deutsches Elektronen-Synchroton,
  * Member of the Helmholtz Association, (DESY), HAMBURG, GERMANY
  *
  * This library is free software; you can redistribute it and/or modify
@@ -271,7 +271,7 @@ public void process(CompoundContext context, nfs_resop4 result) throws ChimeraNF
                 _args.opopen.share_access.value,
                 _args.opopen.share_deny.value);
 
-        stateid.seqid.value++;
+        stateid.seqid++;
         context.currentStateid(stateid);
         res.resok4.stateid = stateid;
         res.status = nfsstat.NFS_OK;

core/src/main/java/org/dcache/nfs/v4/OperationTEST_STATEID.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015 Deutsches Elektronen-Synchroton,
+ * Copyright (c) 2015 - 2020 Deutsches Elektronen-Synchroton,
  * Member of the Helmholtz Association, (DESY), HAMBURG, GERMANY
  *
  * This library is free software; you can redistribute it and/or modify
@@ -51,7 +51,7 @@ public void process(CompoundContext context, nfs_resop4 result) throws ChimeraNF
             stateid4 statid = _args.optest_stateid.ts_stateids[i];
             try {
                 NFS4State state = client.state(statid);
-                if (state.stateid().seqid.value < statid.seqid.value) {
+                if (state.stateid().seqid < statid.seqid) {
                     res.tsr_resok4.tsr_status_codes[i] = nfsstat.NFSERR_OLD_STATEID;
                 } else {
                     res.tsr_resok4.tsr_status_codes[i] = nfsstat.NFS_OK;

core/src/main/java/org/dcache/nfs/v4/Stateids.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009 - 2014 Deutsches Elektronen-Synchroton,
+ * Copyright (c) 2009 - 2020 Deutsches Elektronen-Synchroton,
  * Member of the Helmholtz Association, (DESY), HAMBURG, GERMANY
  *
  * This library is free software; you can redistribute it and/or modify
@@ -64,16 +64,16 @@ public static boolean isStateLess(stateid4 stateid) {
     }
 
     public static void checkStateId(stateid4 expected, stateid4 stateid) throws ChimeraNFSException {
-        if (stateid.seqid.value == 0) {
+        if (stateid.seqid == 0) {
             // so called 'most up-to-date seqid', see https://tools.ietf.org/html/rfc5661#section-8.2.2
             return;
         }
 
-        if (expected.seqid.value > stateid.seqid.value) {
+        if (expected.seqid > stateid.seqid) {
             throw new OldStateidException();
         }
 
-        if (expected.seqid.value < stateid.seqid.value) {
+        if (expected.seqid < stateid.seqid) {
             throw new BadStateidException();
         }
     }

core/src/main/java/org/dcache/nfs/v4/xdr/stateid4.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009 - 2018 Deutsches Elektronen-Synchroton,
+ * Copyright (c) 2009 - 2020 Deutsches Elektronen-Synchroton,
  * Member of the Helmholtz Association, (DESY), HAMBURG, GERMANY
  *
  * This library is free software; you can redistribute it and/or modify
@@ -32,15 +32,15 @@ public class stateid4 implements XdrAble, Serializable {
 
     static final long serialVersionUID = -6677150504723505919L;
 
-    public uint32_t seqid;
+    public int seqid;
     public byte [] other;
 
     public stateid4() {
     }
 
     public stateid4(byte[] other, int seq) {
         this.other = other;
-        seqid = new uint32_t(seq);
+        seqid = seq;
     }
 
     public stateid4(XdrDecodingStream xdr)
@@ -50,13 +50,13 @@ public stateid4(XdrDecodingStream xdr)
 
     public void xdrEncode(XdrEncodingStream xdr)
            throws OncRpcException, IOException {
-        seqid.xdrEncode(xdr);
+        xdr.xdrEncodeInt(seqid);
         xdr.xdrEncodeOpaque(other, 12);
     }
 
     public void xdrDecode(XdrDecodingStream xdr)
            throws OncRpcException, IOException {
-        seqid = new uint32_t(xdr);
+        seqid = xdr.xdrDecodeInt();
         other = xdr.xdrDecodeOpaque(12);
     }
 
@@ -83,7 +83,7 @@ public boolean equalsWithSeq(stateid4 otherState) {
             return true;
         }
 
-        return otherState.seqid.value == this.seqid.value && Arrays.equals(this.other, otherState.other);
+        return otherState.seqid == this.seqid && Arrays.equals(this.other, otherState.other);
     }
 
     @Override
@@ -97,7 +97,7 @@ public String toString() {
 
         sb.append("[");
         sb.append(BaseEncoding.base16().lowerCase().encode(other));
-        sb.append(", seq: ").append(seqid.value).append("]");
+        sb.append(", seq: ").append(seqid).append("]");
         return sb.toString();
     }
 

core/src/test/java/org/dcache/nfs/v4/xdr/stateid4Test.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009 - 2012 Deutsches Elektronen-Synchroton,
+ * Copyright (c) 2009 - 2020 Deutsches Elektronen-Synchroton,
  * Member of the Helmholtz Association, (DESY), HAMBURG, GERMANY
  *
  * This library is free software; you can redistribute it and/or modify
@@ -31,11 +31,11 @@ public class stateid4Test {
     public void testEqualsTrue() {
 
         stateid4 stateidA = new stateid4();
-        stateidA.seqid = new uint32_t(1);
+        stateidA.seqid = 1;
         stateidA.other = "state".getBytes();
 
         stateid4 stateidB = new stateid4();
-        stateidB.seqid = new uint32_t(1);
+        stateidB.seqid = 1;
         stateidB.other = "state".getBytes();
 
         assertTrue("equal keys not equal", stateidA.equals(stateidB));
@@ -47,7 +47,7 @@ public void testEqualsTrue() {
     public void testEqualsSame() {
 
         stateid4 stateidA = new stateid4();
-        stateidA.seqid = new uint32_t(1);
+        stateidA.seqid = 1;
         stateidA.other = "state".getBytes();
 
         assertTrue("equal keys not equal", stateidA.equals(stateidA));
@@ -57,11 +57,11 @@ public void testEqualsSame() {
     public void testDifferSequence() {
 
         stateid4 stateidA = new stateid4();
-        stateidA.seqid = new uint32_t(1);
+        stateidA.seqid = 1;
         stateidA.other = "state".getBytes();
 
         stateid4 stateidB = new stateid4();
-        stateidB.seqid = new uint32_t(2);
+        stateidB.seqid = 2;
         stateidB.other = "state".getBytes();
 
         assertTrue("differ by sequence should still be equal", stateidA.equals(stateidB));
@@ -72,11 +72,11 @@ public void testDifferSequence() {
     public void testDifferOther() {
 
         stateid4 stateidA = new stateid4();
-        stateidA.seqid = new uint32_t(1);
+        stateidA.seqid = 1;
         stateidA.other = "stateA".getBytes();
 
         stateid4 stateidB = new stateid4();
-        stateidB.seqid = new uint32_t(1);
+        stateidB.seqid = 1;
         stateidB.other = "stateB".getBytes();
 
         assertFalse("differ by other not detected", stateidA.equals(stateidB));