core: remove deprecated method CompoundContextBuilder#withExportFile

Acked-by: Lea Morschel Acked-by: Albert Rossi Acked-by: Paul Millar Target: master
dCache · Jul 10, 2020 · 40ef150 · 40ef150
1 parent fd1561c
commit 40ef150
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 14 deletions.
diff --git a/core/src/main/java/org/dcache/nfs/v4/CompoundContextBuilder.java b/core/src/main/java/org/dcache/nfs/v4/CompoundContextBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009 - 2019 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
@@ -51,14 +51,6 @@ public CompoundContextBuilder withDeviceManager(NFSv41DeviceManager deviceManage
         return this;
     }
 
-    /**
-     * @deprecated Use {@link #withExportTable}
-     */
-    @Deprecated
-    public CompoundContextBuilder withExportFile(ExportFile exportFile) {
-        return withExportTable(exportFile);
-    }
-
     public CompoundContextBuilder withExportTable(ExportTable exportTable) {
         this.exportTable = exportTable;
         return this;

diff --git a/core/src/test/java/org/dcache/nfs/v4/OperationGETATTRTest.java b/core/src/test/java/org/dcache/nfs/v4/OperationGETATTRTest.java
@@ -42,7 +42,7 @@ public void testDefaultLayoutType() throws IOException, URISyntaxException {
         CompoundContext context = new CompoundContextBuilder()
                 .withDeviceManager(dm)
                 .withCall(call)
-                .withExportFile(exportFile)
+                .withExportTable(exportFile)
                 .build();
 
         Optional<fattr4_fs_layout_types> res = (Optional<fattr4_fs_layout_types>) OperationGETATTR.fattr2xdr(nfs4_prot.FATTR4_FS_LAYOUT_TYPES, null, null, null, context);

diff --git a/core/src/test/java/org/dcache/nfs/v4/OperationSECINFO_NO_NAMETest.java b/core/src/test/java/org/dcache/nfs/v4/OperationSECINFO_NO_NAMETest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009 - 2016 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
@@ -55,7 +55,7 @@ public void testSecUnix() throws Exception {
 
         ExportFile exportFile = new ExportFile(ClassLoader.getSystemResource("org/dcache/nfs/exports.sys").toURI());
         CompoundContext context = new CompoundContextBuilder()
-                .withExportFile(exportFile)
+                .withExportTable(exportFile)
                 .withCall(generateRpcCall())
                 .build();
         context.currentInode(inode);
@@ -70,7 +70,7 @@ public void testSecKrb() throws Exception {
 
         ExportFile exportFile = new ExportFile(ClassLoader.getSystemResource("org/dcache/nfs/exports.krb").toURI());
         CompoundContext context = new CompoundContextBuilder()
-                .withExportFile(exportFile)
+                .withExportTable(exportFile)
                 .withCall(generateRpcCall())
                 .build();
         context.currentInode(inode);
@@ -85,7 +85,7 @@ public void testSecMix() throws Exception {
 
         ExportFile exportFile = new ExportFile(ClassLoader.getSystemResource("org/dcache/nfs/exports.mix").toURI());
         CompoundContext context = new CompoundContextBuilder()
-                .withExportFile(exportFile)
+                .withExportTable(exportFile)
                 .withCall(generateRpcCall())
                 .build();
         context.currentInode(inode);