From d42ad30ca210b45fcd64ba6e88b9533dc94fe1f1 Mon Sep 17 00:00:00 2001 From: ruben Date: Thu, 11 Apr 2024 10:22:09 +0100 Subject: [PATCH] Add extra helper --- .../util/TelegramOkHttpClientFactory.java | 27 ++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/telegrambots-longpolling/src/main/java/org/telegram/telegrambots/longpolling/util/TelegramOkHttpClientFactory.java b/telegrambots-longpolling/src/main/java/org/telegram/telegrambots/longpolling/util/TelegramOkHttpClientFactory.java index c8dbd514c..38468e350 100644 --- a/telegrambots-longpolling/src/main/java/org/telegram/telegrambots/longpolling/util/TelegramOkHttpClientFactory.java +++ b/telegrambots-longpolling/src/main/java/org/telegram/telegrambots/longpolling/util/TelegramOkHttpClientFactory.java @@ -45,7 +45,7 @@ protected static OkHttpClient.Builder getBaseClient() { } @RequiredArgsConstructor - public static class ProxyOkHttpClientCreator extends DefaultOkHttpClientCreator { + public static class HttpProxyOkHttpClientCreator extends DefaultOkHttpClientCreator { private final Supplier proxySupplier; private final Supplier authenticatorSupplier; @@ -60,4 +60,29 @@ public OkHttpClient get() { return okHttpClientBuilder.build(); } } + + @RequiredArgsConstructor + public static class SocksProxyOkHttpClientCreator extends DefaultOkHttpClientCreator { + private final Supplier proxySupplier; + + @Override + public OkHttpClient get() { + OkHttpClient.Builder okHttpClientBuilder = getBaseClient(); + + // Proxy + ofNullable(proxySupplier.get()).ifPresent(okHttpClientBuilder::proxy); + + return okHttpClientBuilder.build(); + } + } + + /** + * @deprecated Use {@link HttpProxyOkHttpClientCreator} instead + */ + @Deprecated + public static class ProxyOkHttpClientCreator extends HttpProxyOkHttpClientCreator { + public ProxyOkHttpClientCreator(Supplier proxySupplier, Supplier authenticatorSupplier) { + super(proxySupplier, authenticatorSupplier); + } + } }