Bump unirest version

Author: vogti

build.gradle

@@ -30,10 +30,7 @@ java {
 
 
 dependencies {
-    /* ChronosJob.ChronosJob(org.json.JSONObject) is exposed to overwriting classes */
-    api group: 'org.json', name: 'json', version: '20220320' /* version '20160212' is used by com.mashape.unirest:unirest-java:1.4.9 */
-
-    implementation group: 'com.mashape.unirest', name: 'unirest-java', version: '1.4.9'
+    api group: 'com.konghq', name: 'unirest-java', version: '3.13.10'
     implementation group: 'com.google.guava', name: 'guava', version: '31.1-jre'
 
     implementation group: 'commons-validator', name: 'commons-validator', version: '1.7'

src/main/java/ch/unibas/dmi/dbis/chronos/agent/AbstractChronosAgent.java

@@ -45,13 +45,13 @@ of this software and associated documentation files (the "Software"), to deal
 import java.util.TimerTask;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.TimeUnit;
+import kong.unirest.json.JSONObject;
 import lombok.extern.slf4j.Slf4j;
 import net.lingala.zip4j.ZipFile;
 import net.lingala.zip4j.model.ZipParameters;
 import net.lingala.zip4j.model.enums.CompressionLevel;
 import net.lingala.zip4j.model.enums.CompressionMethod;
 import org.apache.commons.io.FileUtils;
-import org.json.JSONObject;
 
 
 /**

src/main/java/ch/unibas/dmi/dbis/chronos/agent/ChronosHttpClient.java

@@ -24,15 +24,9 @@ of this software and associated documentation files (the "Software"), to deal
 
 package ch.unibas.dmi.dbis.chronos.agent;
 
-
-import com.mashape.unirest.http.HttpResponse;
-import com.mashape.unirest.http.JsonNode;
-import com.mashape.unirest.http.Unirest;
-import com.mashape.unirest.http.exceptions.UnirestException;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
-import java.io.StringWriter;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.util.Arrays;
@@ -47,13 +41,16 @@ of this software and associated documentation files (the "Software"), to deal
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
+import kong.unirest.ContentType;
+import kong.unirest.HttpResponse;
+import kong.unirest.JsonNode;
+import kong.unirest.Unirest;
+import kong.unirest.UnirestException;
+import kong.unirest.json.JSONObject;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.io.IOUtils;
 import org.apache.commons.net.ftp.FTP;
 import org.apache.commons.net.ftp.FTPClient;
 import org.apache.commons.validator.routines.InetAddressValidator;
-import org.apache.http.entity.ContentType;
-import org.json.JSONObject;
 
 
 /**
@@ -64,13 +61,9 @@ of this software and associated documentation files (the "Software"), to deal
 public class ChronosHttpClient {
 
     static {
-        Runtime.getRuntime().addShutdownHook( new Thread( () -> {
-            try {
-                Unirest.shutdown();
-            } catch ( IOException ex ) {
-                log.warn( "Exception while shutting down Unirest.", ex );
-            }
-        }, ChronosHttpClient.class.getSimpleName() + "-ShutdownHook" ) );
+        Runtime.getRuntime().addShutdownHook(
+                new Thread( Unirest::shutDown, ChronosHttpClient.class.getSimpleName() + "-ShutdownHook" )
+        );
     }
 
 
@@ -562,9 +555,7 @@ private void httpUpload( final ChronosJob job, final File file, final Properties
                     .field( "result", fis, ContentType.APPLICATION_OCTET_STREAM, "results.zip" )
                     .asJson();
             // Get result
-            StringWriter writer = new StringWriter();
-            IOUtils.copy( jsonResponse.getRawBody(), writer );
-            String resultString = writer.toString();
+            String resultString = jsonResponse.getBody().toString();
             if ( jsonResponse.getStatus() != ChronosRestApi.STATUS_CODE__SUCCESS ) {
                 log.warn( resultString );
             }

src/main/java/ch/unibas/dmi/dbis/chronos/agent/ChronosJob.java

@@ -39,7 +39,7 @@ of this software and associated documentation files (the "Software"), to deal
 import javax.xml.xpath.XPathExpression;
 import javax.xml.xpath.XPathExpressionException;
 import javax.xml.xpath.XPathFactory;
-import org.json.JSONObject;
+import kong.unirest.json.JSONObject;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;