nfs: add CompoundContextBuilder#withSession

to keep fluent syntax

Acked-by: Paul Millar
Target: master

Author: kofemann

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

@@ -118,6 +118,7 @@ public CompoundContext(CompoundContextBuilder builder) {
         _exchangeIdFlags = builder.getExchangeIdFlags();
         _rebootVerifier = builder.getRebootVerifier();
         _implId = builder.getImplementationId();
+        _session = builder.getSession();
     }
 
     public RpcCall getRpcCall() {

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009 - 2023 Deutsches Elektronen-Synchroton,
+ * Copyright (c) 2009 - 2025 Deutsches Elektronen-Synchroton,
  * Member of the Helmholtz Association, (DESY), HAMBURG, GERMANY
  *
  * This library is free software; you can redistribute it and/or modify
@@ -40,6 +40,7 @@ public class CompoundContextBuilder {
     private ExportTable exportTable = null;
     private int exchangeIdFlags = nfs4_prot.EXCHGID4_FLAG_USE_NON_PNFS;
     private verifier4 rebootVerifier;
+    private NFSv41Session session;
 
     private nfs_impl_id4 implId;
 
@@ -151,4 +152,13 @@ public CompoundContextBuilder withRebootVerifier(verifier4 verifier) {
     public verifier4 getRebootVerifier() {
         return rebootVerifier;
     }
+
+    public CompoundContextBuilder withSession(NFSv41Session session) {
+        this.session = session;
+        return this;
+    }
+
+    public NFSv41Session getSession() {
+        return session;
+    }
 }

core/src/test/java/org/dcache/nfs/v4/OperationREADTest.java

@@ -70,12 +70,12 @@ public void testLeaseUpdateForV40Client() throws UnknownHostException, ChimeraNF
 
         CompoundContext context = new CompoundContextBuilder()
                 .withStateHandler(stateHandler)
+                .withSession(session)
                 .withFs(vfs)
                 .withMinorversion(0)
                 .withCall(generateRpcCall())
                 .build();
 
-        context.setSession(session);
         execute(context, readArgs);
         verify(stateHandler, times(1)).updateClientLeaseTime(stateid);
     }
@@ -106,12 +106,12 @@ public void testNoLeaseUpdateForV41Client() throws UnknownHostException, Chimera
 
         CompoundContext context = new CompoundContextBuilder()
                 .withStateHandler(stateHandler)
+                .withSession(session)
                 .withFs(vfs)
                 .withMinorversion(1)
                 .withCall(generateRpcCall())
                 .build();
 
-        context.setSession(session);
         execute(context, readArgs);
         verify(stateHandler, never()).updateClientLeaseTime(stateid);
     }

core/src/test/java/org/dcache/nfs/v4/OperationWRITETest.java

@@ -73,12 +73,12 @@ public void testLeaseUpdateForV40Client() throws UnknownHostException, ChimeraNF
 
         CompoundContext context = new CompoundContextBuilder()
                 .withStateHandler(stateHandler)
+                .withSession(session)
                 .withFs(vfs)
                 .withMinorversion(0)
                 .withCall(generateRpcCall())
                 .build();
 
-        context.setSession(session);
         execute(context, writeArgs);
         verify(stateHandler, times(1)).updateClientLeaseTime(stateid);
     }
@@ -109,12 +109,12 @@ public void testNoLeaseUpdateForV41Client() throws UnknownHostException, Chimera
 
         CompoundContext context = new CompoundContextBuilder()
                 .withStateHandler(stateHandler)
+                .withSession(session)
                 .withFs(vfs)
                 .withMinorversion(1)
                 .withCall(generateRpcCall())
                 .build();
 
-        context.setSession(session);
         execute(context, writeArgs);
         verify(stateHandler, never()).updateClientLeaseTime(stateid);
     }
@@ -147,12 +147,12 @@ public void testReturnWriteVerifier() throws UnknownHostException, ChimeraNFSExc
 
         CompoundContext context = new CompoundContextBuilder()
                 .withStateHandler(stateHandler)
+                .withSession(session)
                 .withFs(vfs)
                 .withMinorversion(1)
                 .withRebootVerifier(verifier)
                 .withCall(generateRpcCall())
                 .build();
-        context.setSession(session);
 
         COMPOUND4res res = execute(context, writeArgs);
         assertSame(verifier, res.resarray.get(1).opwrite.resok4.writeverf);