Revert "Remove dependency on org.json:json"

This reverts commit 490756c.
rubenlagus · Jan 2, 2023 · a1a8925 · a1a8925
1 parent 7c7ba29
commit a1a8925
Show file tree

Hide file tree

Showing 7 changed files with 42 additions and 9 deletions.
diff --git a/pom.xml b/pom.xml
@@ -72,6 +72,7 @@
         <mockitojupiter.version>4.8.1</mockitojupiter.version>
         <jacksonanotation.version>2.14.0</jacksonanotation.version>
         <jackson.version>2.14.0</jackson.version>
+        <json.version>20220924</json.version>
         <slf4j.version>2.0.3</slf4j.version>
         <jakarta.annotation.version>2.1.1</jakarta.annotation.version>
         <lombok.version>1.18.24</lombok.version>
@@ -134,6 +135,11 @@
                 <artifactId>slf4j-api</artifactId>
                 <version>${slf4j.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.json</groupId>
+                <artifactId>json</artifactId>
+                <version>${json.version}</version>
+            </dependency>
             <!-- Included to enforce common version-->
             <dependency>
                 <groupId>jakarta.annotation</groupId>

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
@@ -3,6 +3,7 @@
 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
@@ -90,6 +90,10 @@
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.json</groupId>
+            <artifactId>json</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>

diff --git a/.../src/main/java/org/telegram/telegrambots/meta/exceptions/TelegramApiRequestException.java b/.../src/main/java/org/telegram/telegrambots/meta/exceptions/TelegramApiRequestException.java
@@ -18,6 +18,7 @@
 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;
@@ -47,7 +48,20 @@ public TelegramApiRequestException(String message) {
         super(message);
     }
 
-    public TelegramApiRequestException(String message, ApiResponse<?> response) {
+    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) {
         super(message);
         apiResponse = response.getErrorDescription();
         errorCode = response.getErrorCode();

diff --git a/telegrambots/pom.xml b/telegrambots/pom.xml
@@ -152,6 +152,10 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>org.json</groupId>
+            <artifactId>json</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>

diff --git a/telegrambots/src/main/java/org/telegram/telegrambots/updatesreceivers/DefaultBotSession.java b/telegrambots/src/main/java/org/telegram/telegrambots/updatesreceivers/DefaultBotSession.java
@@ -8,6 +8,7 @@
 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;
@@ -255,9 +256,13 @@ private List<Update> getUpdatesFromServer() throws IOException {
                         lock.wait(500);
                     }
                 } else {
-                    List<Update> updates = request.deserializeResponse(responseContent);
-                    backOff.reset();
-                    return updates;
+                    try {
+                        List<Update> updates = request.deserializeResponse(responseContent);
+                        backOff.reset();
+                        return updates;
+                    } catch (JSONException e) {
+                        log.error("Error deserializing update: " + responseContent, e);
+                    }
                 }
             } 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
@@ -1,7 +1,5 @@
 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;
@@ -11,6 +9,8 @@
 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,7 +29,6 @@
 
 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() {
 
@@ -67,7 +66,7 @@ public static void setWebhook(DefaultAbsSender bot, WebhookBot webhookBot, SetWe
         builder.addTextBody(SetWebhook.MAXCONNECTIONS_FIELD, setWebhook.getMaxConnections().toString(), TEXT_PLAIN_CONTENT_TYPE);
       }
       if (setWebhook.getAllowedUpdates() != null) {
-        builder.addTextBody(SetWebhook.ALLOWEDUPDATES_FIELD, objectMapper.writeValueAsString(setWebhook.getAllowedUpdates()), TEXT_PLAIN_CONTENT_TYPE);
+        builder.addTextBody(SetWebhook.ALLOWEDUPDATES_FIELD, new JSONArray(setWebhook.getAllowedUpdates()).toString(), TEXT_PLAIN_CONTENT_TYPE);
       }
       if (setWebhook.getIpAddress() != null) {
         builder.addTextBody(SetWebhook.IPADDRESS_FIELD, setWebhook.getIpAddress(), TEXT_PLAIN_CONTENT_TYPE);
@@ -96,7 +95,7 @@ public static void setWebhook(DefaultAbsSender bot, WebhookBot webhookBot, SetWe
           throw new TelegramApiRequestException("Error setting webhook:" + responseContent);
         }
       }
-    } catch (JsonProcessingException e) {
+    } catch (JSONException e) {
       throw new TelegramApiRequestException("Error deserializing setWebhook method response", e);
     } catch (IOException e) {
       throw new TelegramApiRequestException("Error executing setWebook method", e);