Skip to content

WIP: #496: Update JDK version to 11. Remove okhttp dependency and replace … #674

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 3 commits into
base: master
Choose a base branch
from
Draft

WIP: #496: Update JDK version to 11. Remove okhttp dependency and replace … #674

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2c67e17
#496: Update JDK version to 11. Remove okhttp dependency and replace …
cavazosjoe Feb 2, 2025
34b92d0
#496: Add test for CxfSseEventStream.
cavazosjoe Feb 7, 2025
012971e
#496: Add tests for UriBuilder. Fix bug in UriBuilder where query par…
cavazosjoe Feb 7, 2025
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
11 changes: 7 additions & 4 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ group = "network.lightsail"
version = "1.0.0"

java {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
}

spotless {
Expand All @@ -33,12 +33,15 @@ repositories {
dependencies {
val okhttpVersion = "4.12.0"

implementation("com.squareup.okhttp3:okhttp:${okhttpVersion}")
implementation("com.squareup.okhttp3:okhttp-sse:${okhttpVersion}")
implementation("com.moandjiezana.toml:toml4j:0.7.2")
implementation("com.google.code.gson:gson:2.11.0")
implementation("org.bouncycastle:bcprov-jdk18on:1.79")
implementation("commons-codec:commons-codec:1.17.1")
implementation("org.jetbrains:annotations:26.0.2")

// Dependencies for SSE.
implementation("org.apache.cxf:cxf-rt-rs-sse:4.1.0")
implementation("org.apache.cxf:cxf-rt-rs-client:4.1.0")

testImplementation("org.mockito:mockito-core:5.14.2")
testImplementation("com.squareup.okhttp3:mockwebserver:${okhttpVersion}")
Expand Down
172 changes: 102 additions & 70 deletions src/main/java/org/stellar/sdk/Server.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,34 +4,37 @@
import java.io.Closeable;
import java.io.IOException;
import java.net.SocketTimeoutException;
import java.net.URI;
import java.net.URISyntaxException;
import java.time.temporal.ChronoUnit;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.TimeUnit;
import lombok.Getter;
import lombok.Setter;
import okhttp3.*;
import okhttp3.Response;
import org.stellar.sdk.exception.AccountRequiresMemoException;
import org.stellar.sdk.exception.BadRequestException;
import org.stellar.sdk.exception.ConnectionErrorException;
import org.stellar.sdk.exception.RequestTimeoutException;
import org.stellar.sdk.exception.TooManyRequestsException;
import org.stellar.sdk.operations.AccountMergeOperation;
import org.stellar.sdk.operations.Operation;
import org.stellar.sdk.operations.PathPaymentStrictReceiveOperation;
import org.stellar.sdk.operations.PathPaymentStrictSendOperation;
import org.stellar.sdk.operations.PaymentOperation;
import org.stellar.sdk.exception.*;
import org.stellar.sdk.http.IHttpClient;
import org.stellar.sdk.http.Jdk11HttpClient;
import org.stellar.sdk.http.PostRequest;
import org.stellar.sdk.http.StringResponse;
import org.stellar.sdk.http.sse.ISseClient;
import org.stellar.sdk.operations.*;
import org.stellar.sdk.requests.*;
import org.stellar.sdk.responses.*;
import org.stellar.sdk.responses.AccountResponse;
import org.stellar.sdk.responses.FeeStatsResponse;
import org.stellar.sdk.responses.SubmitTransactionAsyncResponse;
import org.stellar.sdk.responses.TransactionResponse;
import org.stellar.sdk.xdr.CryptoKeyType;

/** Main class used to connect to Horizon server. */
public class Server implements Closeable {
private final HttpUrl serverURI;
@Getter @Setter private OkHttpClient httpClient;
private final URI serverURI;
@Getter @Setter private IHttpClient httpClient;

/** submitHttpClient is used only for submitting transactions. The read timeout is longer. */
@Getter @Setter private OkHttpClient submitHttpClient;
@Getter @Setter private IHttpClient submitHttpClient;

@Getter @Setter private ISseClient sseClient;

/**
* HORIZON_SUBMIT_TIMEOUT is a time in seconds after Horizon sends a timeout response after
Expand All @@ -54,31 +57,43 @@ public class Server implements Closeable {
* @param uri The URI of the Horizon server.
*/
public Server(String uri) {
this(
uri,
new OkHttpClient.Builder()
.addInterceptor(new ClientIdentificationInterceptor())
.connectTimeout(10, TimeUnit.SECONDS)
.readTimeout(30, TimeUnit.SECONDS)
.retryOnConnectionFailure(true)
.build(),
new OkHttpClient.Builder()
.addInterceptor(new ClientIdentificationInterceptor())
.connectTimeout(10, TimeUnit.SECONDS)
.readTimeout(HORIZON_SUBMIT_TIMEOUT + 5, TimeUnit.SECONDS)
.retryOnConnectionFailure(true)
.build());
this(uri, normalHttpClient(), submitHttpClient());
}

private static IHttpClient normalHttpClient() {
return new Jdk11HttpClient.Builder()
.withDefaultHeader("X-Client-Name", "java-stellar-sdk")
.withDefaultHeader("X-Client-Version", Util.getSdkVersion())
.withConnectTimeout(10, ChronoUnit.SECONDS)
.withReadTimeout(30, ChronoUnit.SECONDS)
.withRetryOnConnectionFailure(true)
.build();
}

private static IHttpClient submitHttpClient() {
return new Jdk11HttpClient.Builder()
.withDefaultHeader("X-Client-Name", "java-stellar-sdk")
.withDefaultHeader("X-Client-Version", Util.getSdkVersion())
.withConnectTimeout(10, ChronoUnit.SECONDS)
.withReadTimeout(HORIZON_SUBMIT_TIMEOUT + 5, ChronoUnit.SECONDS)
.withRetryOnConnectionFailure(true)
.build();
}

/**
* Constructs a new Server object with custom HTTP clients.
*
* @param serverURI The URI of the Horizon server.
* @param httpClient The OkHttpClient to use for general requests.
* @param submitHttpClient The OkHttpClient to use for submitting transactions.
* @param httpClient The IHttpClient to use for general requests.
* @param submitHttpClient The IHttpClient to use for submitting transactions.
*/
public Server(String serverURI, OkHttpClient httpClient, OkHttpClient submitHttpClient) {
this.serverURI = HttpUrl.parse(serverURI);
public Server(String serverURI, IHttpClient httpClient, IHttpClient submitHttpClient) {
try {
this.serverURI = new URI(serverURI);
} catch (URISyntaxException e) {
throw new RuntimeException("Invalid URI: " + serverURI);
}

this.httpClient = httpClient;
this.submitHttpClient = submitHttpClient;
}
Expand Down Expand Up @@ -114,77 +129,77 @@ public TransactionBuilderAccount loadAccount(String address) {
* @return {@link RootRequestBuilder} instance.
*/
public RootRequestBuilder root() {
return new RootRequestBuilder(httpClient, serverURI);
return new RootRequestBuilder(httpClient, sseClient, serverURI);
}

/**
* @return {@link AccountsRequestBuilder} instance.
*/
public AccountsRequestBuilder accounts() {
return new AccountsRequestBuilder(httpClient, serverURI);
return new AccountsRequestBuilder(httpClient, sseClient, serverURI);
}

/**
* @return {@link AssetsRequestBuilder} instance.
*/
public AssetsRequestBuilder assets() {
return new AssetsRequestBuilder(httpClient, serverURI);
return new AssetsRequestBuilder(httpClient, sseClient, serverURI);
}

/**
* @return {@link ClaimableBalancesRequestBuilder} instance.
*/
public ClaimableBalancesRequestBuilder claimableBalances() {
return new ClaimableBalancesRequestBuilder(httpClient, serverURI);
return new ClaimableBalancesRequestBuilder(httpClient, sseClient, serverURI);
}

/**
* @return {@link EffectsRequestBuilder} instance.
*/
public EffectsRequestBuilder effects() {
return new EffectsRequestBuilder(httpClient, serverURI);
return new EffectsRequestBuilder(httpClient, sseClient, serverURI);
}

/**
* @return {@link LedgersRequestBuilder} instance.
*/
public LedgersRequestBuilder ledgers() {
return new LedgersRequestBuilder(httpClient, serverURI);
return new LedgersRequestBuilder(httpClient, sseClient, serverURI);
}

/**
* @return {@link OffersRequestBuilder} instance.
*/
public OffersRequestBuilder offers() {
return new OffersRequestBuilder(httpClient, serverURI);
return new OffersRequestBuilder(httpClient, sseClient, serverURI);
}

/**
* @return {@link OperationsRequestBuilder} instance.
*/
public OperationsRequestBuilder operations() {
return new OperationsRequestBuilder(httpClient, serverURI);
return new OperationsRequestBuilder(httpClient, sseClient, serverURI);
}

/**
* @return {@link FeeStatsResponse} instance.
*/
public FeeStatsRequestBuilder feeStats() {
return new FeeStatsRequestBuilder(httpClient, serverURI);
return new FeeStatsRequestBuilder(httpClient, sseClient, serverURI);
}

/**
* @return {@link OrderBookRequestBuilder} instance.
*/
public OrderBookRequestBuilder orderBook() {
return new OrderBookRequestBuilder(httpClient, serverURI);
return new OrderBookRequestBuilder(httpClient, sseClient, serverURI);
}

/**
* @return {@link TradesRequestBuilder} instance.
*/
public TradesRequestBuilder trades() {
return new TradesRequestBuilder(httpClient, serverURI);
return new TradesRequestBuilder(httpClient, sseClient, serverURI);
}

/**
Expand All @@ -198,42 +213,50 @@ public TradeAggregationsRequestBuilder tradeAggregations(
long resolution,
long offset) {
return new TradeAggregationsRequestBuilder(
httpClient, serverURI, baseAsset, counterAsset, startTime, endTime, resolution, offset);
httpClient,
sseClient,
serverURI,
baseAsset,
counterAsset,
startTime,
endTime,
resolution,
offset);
}

/**
* @return {@link StrictReceivePathsRequestBuilder} instance.
*/
public StrictReceivePathsRequestBuilder strictReceivePaths() {
return new StrictReceivePathsRequestBuilder(httpClient, serverURI);
return new StrictReceivePathsRequestBuilder(httpClient, sseClient, serverURI);
}

/**
* @return {@link StrictSendPathsRequestBuilder} instance.
*/
public StrictSendPathsRequestBuilder strictSendPaths() {
return new StrictSendPathsRequestBuilder(httpClient, serverURI);
return new StrictSendPathsRequestBuilder(httpClient, sseClient, serverURI);
}

/**
* @return {@link PaymentsRequestBuilder} instance.
*/
public PaymentsRequestBuilder payments() {
return new PaymentsRequestBuilder(httpClient, serverURI);
return new PaymentsRequestBuilder(httpClient, sseClient, serverURI);
}

/**
* @return {@link TransactionsRequestBuilder} instance.
*/
public TransactionsRequestBuilder transactions() {
return new TransactionsRequestBuilder(httpClient, serverURI);
return new TransactionsRequestBuilder(httpClient, sseClient, serverURI);
}

/**
* @return {@link LiquidityPoolsRequestBuilder} instance.
*/
public LiquidityPoolsRequestBuilder liquidityPools() {
return new LiquidityPoolsRequestBuilder(httpClient, serverURI);
return new LiquidityPoolsRequestBuilder(httpClient, sseClient, serverURI);
}

/**
Expand All @@ -259,20 +282,22 @@ public LiquidityPoolsRequestBuilder liquidityPools() {
* due to cancellation or connectivity problems, etc.
*/
public TransactionResponse submitTransactionXdr(String transactionXdr) {
HttpUrl transactionsURI = serverURI.newBuilder().addPathSegment("transactions").build();
RequestBody requestBody = new FormBody.Builder().add("tx", transactionXdr).build();
Request submitTransactionRequest =
new Request.Builder().url(transactionsURI).post(requestBody).build();
final var transactionsURI = new UriBuilder(serverURI).addPathSegment("transactions").build();
final var form = Map.of("tx", transactionXdr);
final var post = PostRequest.formBody(transactionsURI, form);
TypeToken<TransactionResponse> type = new TypeToken<TransactionResponse>() {};

ResponseHandler<TransactionResponse> responseHandler = new ResponseHandler<>(type);
Response response;
StringResponse response;
try {
response = this.submitHttpClient.newCall(submitTransactionRequest).execute();
response = this.submitHttpClient.post(post);
} catch (SocketTimeoutException e) {
throw new RequestTimeoutException(e);
} catch (IOException e) {
throw new ConnectionErrorException(e);
if (e.getMessage().contains("request timed out")) {
throw new RequestTimeoutException(e);
} else {
throw new ConnectionErrorException(e);
}
}
return responseHandler.handleResponse(response);
}
Expand Down Expand Up @@ -431,17 +456,17 @@ public TransactionResponse submitTransaction(FeeBumpTransaction transaction) {
* a Transaction Asynchronously</a>
*/
public SubmitTransactionAsyncResponse submitTransactionXdrAsync(String transactionXdr) {
HttpUrl transactionsURI = serverURI.newBuilder().addPathSegment("transactions_async").build();
RequestBody requestBody = new FormBody.Builder().add("tx", transactionXdr).build();
Request submitTransactionRequest =
new Request.Builder().url(transactionsURI).post(requestBody).build();
final var transactionsURI =
new UriBuilder(serverURI).addPathSegment("transactions_async").build();
final var form = Map.of("tx", transactionXdr);
final var post = PostRequest.formBody(transactionsURI, form);
TypeToken<SubmitTransactionAsyncResponse> type =
new TypeToken<SubmitTransactionAsyncResponse>() {};

ResponseHandler<SubmitTransactionAsyncResponse> responseHandler = new ResponseHandler<>(type);
Response response;
StringResponse response;
try {
response = this.submitHttpClient.newCall(submitTransactionRequest).execute();
response = this.submitHttpClient.post(post);
} catch (SocketTimeoutException e) {
throw new RequestTimeoutException(e);
} catch (IOException e) {
Expand Down Expand Up @@ -653,9 +678,16 @@ private void checkMemoRequired(Transaction transaction) {

@Override
public void close() {
// workaround for https://github.com/square/okhttp/issues/3372
// sometimes, the connection pool keeps running and this can prevent a clean shut down.
this.httpClient.connectionPool().evictAll();
this.submitHttpClient.connectionPool().evictAll();
try {
this.httpClient.close();
} catch (Exception e) {
e.printStackTrace();
}

try {
this.submitHttpClient.close();
} catch (Exception e) {
e.printStackTrace();
}
}
}
Loading
Loading