Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
*/
package com.google.api.core;

import com.google.common.base.MoreObjects;
import com.google.common.util.concurrent.ListenableFuture;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.Executor;
Expand Down Expand Up @@ -74,4 +75,11 @@ public V get(long l, TimeUnit timeUnit)
throws InterruptedException, ExecutionException, TimeoutException {
return apiFuture.get(l, timeUnit);
}

@Override
public String toString() {
return MoreObjects.toStringHelper(ApiFutureToListenableFuture.class.getSimpleName())
.add("apiFuture", apiFuture)
.toString();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
*/
package com.google.api.core;

import com.google.common.base.MoreObjects;
import com.google.common.util.concurrent.ForwardingListenableFuture.SimpleForwardingListenableFuture;
import com.google.common.util.concurrent.ListenableFuture;

Expand All @@ -39,4 +40,10 @@ public class ListenableFutureToApiFuture<V> extends SimpleForwardingListenableFu
public ListenableFutureToApiFuture(ListenableFuture<V> delegate) {
super(delegate);
}

public String toString() {
return MoreObjects.toStringHelper(ListenableFutureToApiFuture.class)
.add("delegate", delegate())
.toString();
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
/*
* Copyright 2024, Google Inc.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
* met:
*
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the following disclaimer
* in the documentation and/or other materials provided with the
* distribution.
* * Neither the name of Google Inc. nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package com.google.api.core;

import static com.google.common.truth.Truth.assertThat;

import org.junit.jupiter.api.Test;

class ApiFutureToListenableFutureTest {
@Test
void testThatInnerToStringIsNotLost() {
String customInnerToString = "my-custom-inner-tostring";
ApiFuture<String> apiFuture =
new AbstractApiFuture<String>() {
@Override
public String toString() {
return customInnerToString;
}
};
ApiFutureToListenableFuture<String> listenableFuture =
new ApiFutureToListenableFuture<>(apiFuture);
assertThat(listenableFuture.toString()).contains(customInnerToString);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@
package com.google.api.core;

import com.google.common.truth.Truth;
import com.google.common.util.concurrent.AbstractFuture;
import com.google.common.util.concurrent.ListenableFuture;
import com.google.common.util.concurrent.SettableFuture;
import org.junit.jupiter.api.Test;

Expand All @@ -42,4 +44,20 @@ void testGet() throws Exception {
future.set(3);
Truth.assertThat(apiFuture.get()).isEqualTo(3);
}

@Test
void testToStringShowsUnderlyingFutureToString() {
String customInnerFutureDesc = "my-custom-toString-impl";
ListenableFuture<String> listenableFuture =
new AbstractFuture<String>() {
@Override
public String toString() {
return customInnerFutureDesc;
}
};

ListenableFutureToApiFuture<String> apiFuture =
new ListenableFutureToApiFuture<>(listenableFuture);
Truth.assertThat(apiFuture.toString()).contains(customInnerFutureDesc);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
import com.google.api.core.ApiFuture;
import com.google.api.core.ApiFutures;
import com.google.api.gax.tracing.ApiTracer;
import com.google.common.base.MoreObjects;
import com.google.common.util.concurrent.AbstractFuture;
import com.google.common.util.concurrent.MoreExecutors;
import java.util.concurrent.Callable;
Expand Down Expand Up @@ -265,6 +266,16 @@ private void setAttemptResult(Throwable throwable, ResponseT response, boolean s
}
}

@Override
public String toString() {
return MoreObjects.toStringHelper(this.getClass())
.add("super", pendingToString())
.add("latestCompletedAttemptResult", this.latestCompletedAttemptResult)
.add("attemptResult", this.attemptResult)
.add("attemptSettings", this.attemptSettings)
.toString();
}

private class CompletionListener implements Runnable {
@Override
public void run() {
Expand Down