diff --git a/pom.xml b/pom.xml index a51bed26..9652f12a 100644 --- a/pom.xml +++ b/pom.xml @@ -72,7 +72,6 @@ 4.8.1 2.14.0 2.14.0 - 20220924 2.0.3 2.1.1 1.18.24 @@ -135,11 +134,6 @@ slf4j-api ${slf4j.version} - - org.json - json - ${json.version} - jakarta.annotation diff --git a/telegrambots-abilities/src/main/java/org/telegram/abilitybots/api/objects/Stats.java b/telegrambots-abilities/src/main/java/org/telegram/abilitybots/api/objects/Stats.java index 43b6b350..9abc4819 100644 --- a/telegrambots-abilities/src/main/java/org/telegram/abilitybots/api/objects/Stats.java +++ b/telegrambots-abilities/src/main/java/org/telegram/abilitybots/api/objects/Stats.java @@ -3,7 +3,6 @@ package org.telegram.abilitybots.api.objects; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.MoreObjects; -import org.json.JSONPropertyIgnore; import java.io.Serializable; import java.util.Objects; diff --git a/telegrambots-meta/pom.xml b/telegrambots-meta/pom.xml index 1d22e0fa..092982c1 100644 --- a/telegrambots-meta/pom.xml +++ b/telegrambots-meta/pom.xml @@ -90,10 +90,6 @@ com.google.guava guava - - org.json - json - org.projectlombok lombok diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/exceptions/TelegramApiRequestException.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/exceptions/TelegramApiRequestException.java index d2f69e60..8add108b 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/exceptions/TelegramApiRequestException.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/exceptions/TelegramApiRequestException.java @@ -18,7 +18,6 @@ package org.telegram.telegrambots.meta.exceptions; import com.fasterxml.jackson.databind.ObjectMapper; -import org.json.JSONObject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.telegram.telegrambots.meta.api.objects.ApiResponse; @@ -48,20 +47,7 @@ public class TelegramApiRequestException extends TelegramApiException { super(message); } - public TelegramApiRequestException(String message, JSONObject object) { - super(message); - apiResponse = object.getString(ERRORDESCRIPTIONFIELD); - errorCode = object.getInt(ERRORCODEFIELD); - if (object.has(PARAMETERSFIELD)) { - try { - parameters = OBJECT_MAPPER.readValue(object.getJSONObject(PARAMETERSFIELD).toString(), ResponseParameters.class); - } catch (IOException e) { - log.error(e.getLocalizedMessage(), e); - } - } - } - - public TelegramApiRequestException(String message, ApiResponse response) { + public TelegramApiRequestException(String message, ApiResponse response) { super(message); apiResponse = response.getErrorDescription(); errorCode = response.getErrorCode(); diff --git a/telegrambots/pom.xml b/telegrambots/pom.xml index e9e82d8a..3744592a 100644 --- a/telegrambots/pom.xml +++ b/telegrambots/pom.xml @@ -152,10 +152,6 @@ - - org.json - json - org.apache.httpcomponents httpclient diff --git a/telegrambots/src/main/java/org/telegram/telegrambots/updatesreceivers/DefaultBotSession.java b/telegrambots/src/main/java/org/telegram/telegrambots/updatesreceivers/DefaultBotSession.java index fec34b3e..6848f391 100644 --- a/telegrambots/src/main/java/org/telegram/telegrambots/updatesreceivers/DefaultBotSession.java +++ b/telegrambots/src/main/java/org/telegram/telegrambots/updatesreceivers/DefaultBotSession.java @@ -8,7 +8,6 @@ import org.apache.http.entity.ContentType; import org.apache.http.entity.StringEntity; import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.util.EntityUtils; -import org.json.JSONException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.telegram.telegrambots.bots.DefaultBotOptions; @@ -256,13 +255,9 @@ public class DefaultBotSession implements BotSession { lock.wait(500); } } else { - try { - List updates = request.deserializeResponse(responseContent); - backOff.reset(); - return updates; - } catch (JSONException e) { - log.error("Error deserializing update: " + responseContent, e); - } + List updates = request.deserializeResponse(responseContent); + backOff.reset(); + return updates; } } catch (SocketException | InvalidObjectException | TelegramApiRequestException e) { log.error(e.getLocalizedMessage(), e); diff --git a/telegrambots/src/main/java/org/telegram/telegrambots/util/WebhookUtils.java b/telegrambots/src/main/java/org/telegram/telegrambots/util/WebhookUtils.java index 3f26566f..2a95601d 100644 --- a/telegrambots/src/main/java/org/telegram/telegrambots/util/WebhookUtils.java +++ b/telegrambots/src/main/java/org/telegram/telegrambots/util/WebhookUtils.java @@ -1,5 +1,7 @@ package org.telegram.telegrambots.util; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Strings; import org.apache.http.HttpEntity; import org.apache.http.client.config.RequestConfig; @@ -9,8 +11,6 @@ import org.apache.http.entity.ContentType; import org.apache.http.entity.mime.MultipartEntityBuilder; import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.util.EntityUtils; -import org.json.JSONArray; -import org.json.JSONException; import org.telegram.telegrambots.Constants; import org.telegram.telegrambots.bots.DefaultAbsSender; import org.telegram.telegrambots.bots.DefaultBotOptions; @@ -29,6 +29,7 @@ import static org.telegram.telegrambots.Constants.SOCKET_TIMEOUT; public final class WebhookUtils { private static final ContentType TEXT_PLAIN_CONTENT_TYPE = ContentType.create("text/plain", StandardCharsets.UTF_8); + private static final ObjectMapper objectMapper = new ObjectMapper(); private WebhookUtils() { @@ -66,7 +67,7 @@ public final class WebhookUtils { builder.addTextBody(SetWebhook.MAXCONNECTIONS_FIELD, setWebhook.getMaxConnections().toString(), TEXT_PLAIN_CONTENT_TYPE); } if (setWebhook.getAllowedUpdates() != null) { - builder.addTextBody(SetWebhook.ALLOWEDUPDATES_FIELD, new JSONArray(setWebhook.getAllowedUpdates()).toString(), TEXT_PLAIN_CONTENT_TYPE); + builder.addTextBody(SetWebhook.ALLOWEDUPDATES_FIELD, objectMapper.writeValueAsString(setWebhook.getAllowedUpdates()), TEXT_PLAIN_CONTENT_TYPE); } if (setWebhook.getIpAddress() != null) { builder.addTextBody(SetWebhook.IPADDRESS_FIELD, setWebhook.getIpAddress(), TEXT_PLAIN_CONTENT_TYPE); @@ -95,7 +96,7 @@ public final class WebhookUtils { throw new TelegramApiRequestException("Error setting webhook:" + responseContent); } } - } catch (JSONException e) { + } catch (JsonProcessingException e) { throw new TelegramApiRequestException("Error deserializing setWebhook method response", e); } catch (IOException e) { throw new TelegramApiRequestException("Error executing setWebook method", e);