Author: brane
Date: Sun May 10 03:53:48 2026
New Revision: 1934015
Log:
On the javahl-1.15 branch: Update uses of deprecated SVNClient.list.
* BRANCH-README: Update TODO and DONE lists.
[in subversion/bindings/javahl/tests/org/apache/subversion/javahl/]
* BasicTests.java (BasicTests.collectDirEntries),
ExceptionTests.java (ExceptionTests.testListCallback): Update calls to
SVNClient.list and the custom callbacks.
Modified:
subversion/branches/javahl-1.15/BRANCH-README
subversion/branches/javahl-1.15/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
subversion/branches/javahl-1.15/subversion/bindings/javahl/tests/org/apache/subversion/javahl/ExceptionTests.java
Modified: subversion/branches/javahl-1.15/BRANCH-README
==============================================================================
--- subversion/branches/javahl-1.15/BRANCH-README Sun May 10 03:26:36
2026 (r1934014)
+++ subversion/branches/javahl-1.15/BRANCH-README Sun May 10 03:53:48
2026 (r1934015)
@@ -10,14 +10,18 @@ TODO:
- svn_client_diff_peg6 -> svn_client_diff_peg7
- svn_client_revert3 -> svn_client_revert4
* Add Java wrappers for some new functionality
+ * Update use of deprecated JavaHL APIs
* Fix Java warnings where possible without breaking the JRE ABI
DONE:
* Update use of deprecated Subversion APIs:
- svn_client_checkout3 -> svn_client_checkout4
* Add Java wrappers for some new functionality
- + .types.VersionNumber extends Version (package scope)
- + .types.Version::getInstance(int major, int minor, int patch)
- + SVNClient.defaultWcVersion()
- + SVNClient.oldestWcVersion()
- + SVNClient.latestWcVersion()
+ - .types.VersionNumber extends Version (package scope)
+ - .types.Version::getInstance(int major, int minor, int patch)
+ - SVNClient.defaultWcVersion()
+ - SVNClient.oldestWcVersion()
+ - SVNClient.latestWcVersion()
+ * Update use of deprecated JavaHL APIs:
+ - SVNClient.checkout
+ - SVNClient.list, .callback.ListCallback
Modified:
subversion/branches/javahl-1.15/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
==============================================================================
---
subversion/branches/javahl-1.15/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
Sun May 10 03:26:36 2026 (r1934014)
+++
subversion/branches/javahl-1.15/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
Sun May 10 03:53:48 2026 (r1934015)
@@ -5080,11 +5080,13 @@ public class BasicTests extends SVNTests
int direntFields, boolean fetchLocks)
throws ClientException
{
- class MyListCallback implements ListCallback
+ class MyListItemCallback implements ListItemCallback
{
private List<DirEntry> dirents = new ArrayList<DirEntry>();
- public void doEntry(DirEntry dirent, Lock lock)
+ public void doEntry(DirEntry dirent, Lock lock,
+ String externalParentURL,
+ String externalTarget)
{
// All of this is meant to retain backward compatibility with
// the old svn_client_ls-style API. For further information
@@ -5118,9 +5120,9 @@ public class BasicTests extends SVNTests
}
}
- MyListCallback callback = new MyListCallback();
- client.list(url, revision, pegRevision, depth, direntFields,
- fetchLocks, callback);
+ MyListItemCallback callback = new MyListItemCallback();
+ client.list(url, revision, pegRevision, null, depth, direntFields,
+ fetchLocks, false, callback);
return callback.getDirEntryArray();
}
Modified:
subversion/branches/javahl-1.15/subversion/bindings/javahl/tests/org/apache/subversion/javahl/ExceptionTests.java
==============================================================================
---
subversion/branches/javahl-1.15/subversion/bindings/javahl/tests/org/apache/subversion/javahl/ExceptionTests.java
Sun May 10 03:26:36 2026 (r1934014)
+++
subversion/branches/javahl-1.15/subversion/bindings/javahl/tests/org/apache/subversion/javahl/ExceptionTests.java
Sun May 10 03:53:48 2026 (r1934015)
@@ -172,15 +172,17 @@ public class ExceptionTests extends SVNT
// Test status of non-existent file
try
{
- client.list(thisTest.getWorkingCopy() + "/A", null, null,
Depth.immediates,
- 7, false,
- new ListCallback()
+ client.list(thisTest.getWorkingCopy() + "/A", null, null, null,
+ Depth.immediates, 7, false, false,
+ new ListItemCallback()
+ {
+ public void doEntry(DirEntry dirent, Lock lock,
+ String externalParentURL,
+ String externalTarget)
{
- public void doEntry(DirEntry dirent, Lock lock)
- {
- throw new TestException("inner", theException);
- }
- });
+ throw new TestException("inner", theException);
+ }
+ });
}
catch (ClientException e)
{
