diff options
| author | Jon Bratseth <bratseth@gmail.com> | 2023-01-17 19:31:53 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-17 19:31:53 +0100 |
| commit | af6638281ff5a4d3d4273b5c3aa3285f296ea402 (patch) | |
| tree | 314c8cf5ce4f8d3751613aac4d7aa6d2c1eda7d1 | |
| parent | b900a9deea5c100c3621bec4f49efb976ca13462 (diff) | |
| parent | 52a321205c0fdfab146c867ee821e705fdb7dc80 (diff) | |
Merge pull request #25604 from vespa-engine/bratseth/preserve-return-type
Preserve return type
| -rw-r--r-- | documentapi/abi-spec.json | 3 | ||||
| -rwxr-xr-x | documentapi/src/main/java/com/yahoo/documentapi/SyncParameters.java | 12 |
2 files changed, 10 insertions, 5 deletions
diff --git a/documentapi/abi-spec.json b/documentapi/abi-spec.json index 7277e58d0c5..37b8eb6a75d 100644 --- a/documentapi/abi-spec.json +++ b/documentapi/abi-spec.json @@ -542,7 +542,8 @@ ], "methods" : [ "public void <init>()", - "public com.yahoo.documentapi.SyncParameters$Builder setDefaultTimeout(java.time.Duration)", + "public void setDefaultTimeout(java.time.Duration)", + "public com.yahoo.documentapi.SyncParameters$Builder defaultTimeout(java.time.Duration)", "public com.yahoo.documentapi.SyncParameters build()" ], "fields" : [ ] diff --git a/documentapi/src/main/java/com/yahoo/documentapi/SyncParameters.java b/documentapi/src/main/java/com/yahoo/documentapi/SyncParameters.java index 1d6fc52d94b..f26bb0087d8 100755 --- a/documentapi/src/main/java/com/yahoo/documentapi/SyncParameters.java +++ b/documentapi/src/main/java/com/yahoo/documentapi/SyncParameters.java @@ -30,10 +30,14 @@ public class SyncParameters extends Parameters { private Duration defaultTimeout; - /** - * Set default timeout for all messagebus operations. - */ - public Builder setDefaultTimeout(Duration defaultTimeout) { + /** @deprecated use {@link #defaultTimeout} */ + @Deprecated // TODO: Remove on Vespa 9 + public void setDefaultTimeout(Duration defaultTimeout) { + defaultTimeout(defaultTimeout); + } + + /** Set default timeout for all messagebus operations. */ + public Builder defaultTimeout(Duration defaultTimeout) { this.defaultTimeout = defaultTimeout; return this; } |