Merge pull request #719 from FgForrest/717-client-and-server-timeouts…

…-are-not-aligned

fix(#717): Client and server timeouts are not aligned

evita_external_api/evita_external_api_grpc/client/src/main/java/io/evitadb/driver/EvitaClient.java

@@ -125,7 +125,7 @@ public class EvitaClient implements EvitaContract {
 	/**
 	 * Created evita service stub that returns futures.
 	 */
-	private final StubTimeoutProxy<EvitaServiceFutureStub> evitaServiceFutureStub;
+	private final EvitaServiceFutureStub evitaServiceFutureStub;
 	/**
 	 * The configuration of the evitaDB client.
 	 */
@@ -311,7 +311,7 @@ public EvitaClient(
 
 		ofNullable(grpcConfigurator).ifPresent(it -> it.accept(grpcClientBuilder));
 		this.grpcClientBuilder = grpcClientBuilder;
-		this.evitaServiceFutureStub = new StubTimeoutProxy<>(grpcClientBuilder.build(EvitaServiceFutureStub.class));
+		this.evitaServiceFutureStub = grpcClientBuilder.build(EvitaServiceFutureStub.class);
 		this.reflectionLookup = new ReflectionLookup(configuration.reflectionLookupBehaviour());
 		this.timeout = ThreadLocal.withInitial(() -> {
 			final LinkedList<Timeout> timeouts = new LinkedList<>();
@@ -789,7 +789,7 @@ private <T> T executeWithEvitaService(
 	) {
 		final Timeout timeout = this.timeout.get().peek();
 		try {
-			return lambda.apply(this.evitaServiceFutureStub.get(timeout))
+			return lambda.apply(this.evitaServiceFutureStub.withDeadlineAfter(timeout.timeout(), timeout.timeoutUnit()))
 				.get(timeout.timeout(), timeout.timeoutUnit());
 		} catch (ExecutionException e) {
 			throw EvitaClient.transformException(

evita_external_api/evita_external_api_grpc/client/src/main/java/io/evitadb/driver/EvitaClientManagement.java

@@ -96,11 +96,11 @@ public class EvitaClientManagement implements EvitaManagementContract, Closeable
 	/**
 	 * Created evita service stub.
 	 */
-	private final StubTimeoutProxy<EvitaManagementServiceStub> evitaManagementServiceStub;
+	private final EvitaManagementServiceStub evitaManagementServiceStub;
 	/**
 	 * Created evita service stub that returns futures.
 	 */
-	private final StubTimeoutProxy<EvitaManagementServiceFutureStub> evitaManagementServiceFutureStub;
+	private final EvitaManagementServiceFutureStub evitaManagementServiceFutureStub;
 
 	public EvitaClientManagement(@Nonnull EvitaClient evitaClient, @Nonnull GrpcClientBuilder grpcClientBuilder) {
 		this.evitaClient = evitaClient;
@@ -109,8 +109,8 @@ public EvitaClientManagement(@Nonnull EvitaClient evitaClient, @Nonnull GrpcClie
 			evitaClient.getConfiguration().trackedTaskLimit(),
 			2000
 		);
-		this.evitaManagementServiceStub = new StubTimeoutProxy<>(grpcClientBuilder.build(EvitaManagementServiceStub.class));
-		this.evitaManagementServiceFutureStub = new StubTimeoutProxy<>(grpcClientBuilder.build(EvitaManagementServiceFutureStub.class));
+		this.evitaManagementServiceStub = grpcClientBuilder.build(EvitaManagementServiceStub.class);
+		this.evitaManagementServiceFutureStub = grpcClientBuilder.build(EvitaManagementServiceFutureStub.class);
 	}
 
 	@Nonnull
@@ -513,7 +513,7 @@ private <T> T executeWithEvitaBlockingService(
 		final Timeout timeout = this.evitaClient.timeout.get().peek();
 		try {
 			return lambda.apply(
-				this.evitaManagementServiceStub.get(timeout)
+				this.evitaManagementServiceStub.withDeadlineAfter(timeout.timeout(), timeout.timeoutUnit())
 			);
 		} catch (ExecutionException e) {
 			throw EvitaClient.transformException(
@@ -543,7 +543,7 @@ private <T> T executeWithEvitaService(
 	) {
 		final Timeout timeout = this.evitaClient.timeout.get().peek();
 		try {
-			return lambda.apply(this.evitaManagementServiceFutureStub.get(timeout))
+			return lambda.apply(this.evitaManagementServiceFutureStub.withDeadlineAfter(timeout.timeout(), timeout.timeoutUnit()))
 				.get(timeout.timeout(), timeout.timeoutUnit());
 		} catch (ExecutionException e) {
 			throw EvitaClient.transformException(

evita_external_api/evita_external_api_grpc/client/src/main/java/io/evitadb/driver/EvitaClientSession.java

@@ -183,11 +183,11 @@ public class EvitaClientSession implements EvitaSessionContract {
 	/**
 	 * Entity session service that works with futures.
 	 */
-	private final StubTimeoutProxy<EvitaSessionServiceFutureStub> evitaSessionServiceFutureStub;
+	private final EvitaSessionServiceFutureStub evitaSessionServiceFutureStub;
 	/**
 	 * Entity session service.
 	 */
-	private final StubTimeoutProxy<EvitaSessionServiceStub> evitaSessionServiceStub;
+	private final EvitaSessionServiceStub evitaSessionServiceStub;
 	/**
 	 * Contains reference to the catalog name targeted by queries / mutations from this session.
 	 */
@@ -292,8 +292,8 @@ public EvitaClientSession(
 		this.reflectionLookup = evita.getReflectionLookup();
 		this.proxyFactory = schemaCache.getProxyFactory();
 		this.schemaCache = schemaCache;
-		this.evitaSessionServiceFutureStub = new StubTimeoutProxy<>(grpcClientBuilder.build(EvitaSessionServiceFutureStub.class));
-		this.evitaSessionServiceStub = new StubTimeoutProxy<>(grpcClientBuilder.build(EvitaSessionServiceStub.class));
+		this.evitaSessionServiceFutureStub = grpcClientBuilder.build(EvitaSessionServiceFutureStub.class);
+		this.evitaSessionServiceStub = grpcClientBuilder.build(EvitaSessionServiceStub.class);
 		this.catalogName = catalogName;
 		this.catalogState = catalogState;
 		this.commitBehaviour = commitBehaviour;
@@ -1647,7 +1647,7 @@ private <T> T executeWithBlockingEvitaSessionService(
 		final Timeout timeout = this.callTimeout.peek();
 		try {
 			SessionIdHolder.setSessionId(getId().toString());
-			return lambda.apply(this.evitaSessionServiceFutureStub.get(timeout))
+			return lambda.apply(this.evitaSessionServiceFutureStub.withDeadlineAfter(timeout.timeout(), timeout.timeoutUnit()))
 				.get(timeout.timeout(), timeout.timeoutUnit());
 		} catch (ExecutionException e) {
 			throw EvitaClient.transformException(
@@ -1682,7 +1682,7 @@ private <T> T executeWithAsyncEvitaSessionService(
 		final Timeout timeout = this.callTimeout.peek();
 		try {
 			SessionIdHolder.setSessionId(getId().toString());
-			return lambda.apply(this.evitaSessionServiceStub.get(timeout));
+			return lambda.apply(this.evitaSessionServiceStub.withDeadlineAfter(timeout.timeout(), timeout.timeoutUnit()));
 		} catch (ExecutionException e) {
 			throw EvitaClient.transformException(
 				e.getCause() == null ? e : e.getCause(),

evita_functional_tests/src/test/java/io/evitadb/driver/EvitaClientReadWriteTest.java

@@ -1759,8 +1759,7 @@ private static EvitaManagementServiceFutureStub getManagementStubInternal(
 			final EvitaManagementContract management = evitaClient.management();
 			final Field evitaManagementServiceStub = management.getClass().getDeclaredField("evitaManagementServiceFutureStub");
 			evitaManagementServiceStub.setAccessible(true);
-			return ((StubTimeoutProxy<EvitaManagementServiceFutureStub>) evitaManagementServiceStub.get(management))
-				.get(evitaClient.timeout.get().peek());
+			return (EvitaManagementServiceFutureStub) evitaManagementServiceStub.get(management);
 		} catch (Exception ex) {
 			throw new RuntimeException(ex);
 		}