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
@@ -0,0 +1,4 @@
# internals/not for (manual) user extension
ProblemFilters.exclude[IncompatibleSignatureProblem]("akka.grpc.internal.JavaClientStreamingRequestBuilder.withRetry")
ProblemFilters.exclude[IncompatibleSignatureProblem]("akka.grpc.internal.JavaUnaryRequestBuilder.withRetry")
ProblemFilters.exclude[ReversedMissingMethodProblem]("akka.grpc.javadsl.SingleBlockingResponseRequestBuilder.withRetry")
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import akka.annotation.InternalApi
import akka.annotation.InternalStableApi
import akka.grpc.GrpcSingleResponse
import akka.grpc.javadsl.SingleBlockingResponseRequestBuilder
import akka.pattern.RetrySettings
import akka.stream.javadsl.{ Source => JavaSource }

import java.time.Duration
Expand Down Expand Up @@ -63,6 +64,12 @@ private[akka] final class JavaSingleBlockingResponseRequestBuilder[I, O](delegat
override def setDeadline(deadline: Duration): SingleBlockingResponseRequestBuilder[I, O] =
copy(delegate.setDeadline(deadline))

override def withRetry(retrySettings: RetrySettings): JavaSingleBlockingResponseRequestBuilder[I, O] =
copy(delegate.withRetry(retrySettings))

override def withRetry(maxRetries: Int): JavaSingleBlockingResponseRequestBuilder[I, O] =
copy(delegate.withRetry(maxRetries))

override def headers: MetadataImpl = delegate.headers

override def withHeaders(headers: MetadataImpl): JavaSingleBlockingResponseRequestBuilder[I, O] = copy(
Expand Down Expand Up @@ -109,6 +116,12 @@ private[akka] final class JavaClientStreamingBlockingResponseRequestBuilder[I, O
override def withHeaders(headers: MetadataImpl): JavaClientStreamingBlockingResponseRequestBuilder[I, O] =
copy(delegate.withHeaders(headers))

override def withRetry(retrySettings: RetrySettings): JavaClientStreamingBlockingResponseRequestBuilder[I, O] =
copy(delegate.withRetry(retrySettings))

override def withRetry(maxRetries: Int): JavaClientStreamingBlockingResponseRequestBuilder[I, O] =
copy(delegate.withRetry(maxRetries))

private def copy(
delegate: JavaClientStreamingRequestBuilder[I, O]): JavaClientStreamingBlockingResponseRequestBuilder[I, O] =
new JavaClientStreamingBlockingResponseRequestBuilder[I, O](delegate)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import java.util.concurrent.{ CompletionStage, TimeUnit }
import akka.NotUsed
import akka.actor.ClassicActorSystemProvider
import akka.annotation.{ InternalApi, InternalStableApi }
import akka.grpc.javadsl
import akka.grpc.scaladsl.SingleResponseRequestBuilder
import akka.grpc.{ GrpcClientSettings, GrpcResponseMetadata, GrpcServiceException, GrpcSingleResponse }
import akka.pattern.RetrySettings
Expand Down Expand Up @@ -152,11 +151,10 @@ final class JavaUnaryRequestBuilder[I, O](
if (deadline == null) defaultOptions.withDeadline(null)
else defaultOptions.withDeadlineAfter(deadline.toMillis, TimeUnit.MILLISECONDS))

override def withRetry(retrySettings: RetrySettings): javadsl.SingleResponseRequestBuilder[I, O] =
override def withRetry(retrySettings: RetrySettings): JavaUnaryRequestBuilder[I, O] =
copy(retrySettings = Some(retrySettings))

override def withRetry(maxRetries: Int): javadsl.SingleResponseRequestBuilder[I, O] = withRetry(
RetrySettings(maxRetries))
override def withRetry(maxRetries: Int): JavaUnaryRequestBuilder[I, O] = withRetry(RetrySettings(maxRetries))

private def copy(
defaultOptions: CallOptions = defaultOptions,
Expand Down Expand Up @@ -326,11 +324,10 @@ final class JavaClientStreamingRequestBuilder[I, O](
if (deadline == null) defaultOptions.withDeadline(null)
else defaultOptions.withDeadlineAfter(deadline.toMillis, TimeUnit.MILLISECONDS))

override def withRetry(
retrySettings: RetrySettings): javadsl.SingleResponseRequestBuilder[JavaSource[I, NotUsed], O] =
override def withRetry(retrySettings: RetrySettings): JavaClientStreamingRequestBuilder[I, O] =
copy(retrySettings = Some(retrySettings))

override def withRetry(maxRetries: Int): javadsl.SingleResponseRequestBuilder[JavaSource[I, NotUsed], O] =
override def withRetry(maxRetries: Int): JavaClientStreamingRequestBuilder[I, O] =
withRetry(RetrySettings(maxRetries))

private def copy(
Expand Down
12 changes: 12 additions & 0 deletions runtime/src/main/scala/akka/grpc/javadsl/RequestBuilder.scala
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,18 @@ trait SingleBlockingResponseRequestBuilder[Req, Res] {
* @return A new request builder, that will use the supplied deadline when invoked
*/
def setDeadline(deadline: Duration): SingleBlockingResponseRequestBuilder[Req, Res]

/**
* Use these retry settings to retry if the call fails.
*/
def withRetry(retrySettings: RetrySettings): SingleBlockingResponseRequestBuilder[Req, Res]

/**
* Set the retry settings for this call. A predifined backoff strategy will be calculated based on the number of maxRetries.
*
* @param maxRetries The number of retries to make
*/
def withRetry(maxRetries: Int): SingleBlockingResponseRequestBuilder[Req, Res]
}

/**
Expand Down
Loading