From 73f77575bd4c22a88f0fbd16a0273eef4a82538c Mon Sep 17 00:00:00 2001 From: "miriam.baglioni" Date: Tue, 18 Apr 2023 10:25:27 +0200 Subject: [PATCH] [ZenodoApiClient] align with master version --- .../dhp/common/api/ZenodoAPIClient.java | 287 +++++++++++------- .../dhp/common/api/ZenodoAPIClientTest.java | 8 +- 2 files changed, 173 insertions(+), 122 deletions(-) diff --git a/dhp-common/src/main/java/eu/dnetlib/dhp/common/api/ZenodoAPIClient.java b/dhp-common/src/main/java/eu/dnetlib/dhp/common/api/ZenodoAPIClient.java index 63f890a10..2aeccfcf2 100644 --- a/dhp-common/src/main/java/eu/dnetlib/dhp/common/api/ZenodoAPIClient.java +++ b/dhp-common/src/main/java/eu/dnetlib/dhp/common/api/ZenodoAPIClient.java @@ -3,6 +3,8 @@ package eu.dnetlib.dhp.common.api; import java.io.*; import java.io.IOException; +import java.net.HttpURLConnection; +import java.net.URL; import java.util.concurrent.TimeUnit; import org.apache.http.HttpHeaders; @@ -13,6 +15,7 @@ import com.google.gson.Gson; import eu.dnetlib.dhp.common.api.zenodo.ZenodoModel; import eu.dnetlib.dhp.common.api.zenodo.ZenodoModelList; import okhttp3.*; +import org.jetbrains.annotations.NotNull; public class ZenodoAPIClient implements Serializable { @@ -60,33 +63,31 @@ public class ZenodoAPIClient implements Serializable { */ public int newDeposition() throws IOException { String json = "{}"; - OkHttpClient httpClient = new OkHttpClient.Builder().connectTimeout(600, TimeUnit.SECONDS).build(); - - RequestBody body = RequestBody.create(json, MEDIA_TYPE_JSON); - - Request request = new Request.Builder() - .url(urlString) - .addHeader(HttpHeaders.CONTENT_TYPE, ContentType.APPLICATION_JSON.toString()) // add request headers - .addHeader(HttpHeaders.AUTHORIZATION, "Bearer " + access_token) - .post(body) - .build(); - - try (Response response = httpClient.newCall(request).execute()) { - - if (!response.isSuccessful()) - throw new IOException("Unexpected code " + response + response.body().string()); - - // Get response body - json = response.body().string(); - - ZenodoModel newSubmission = new Gson().fromJson(json, ZenodoModel.class); - this.bucket = newSubmission.getLinks().getBucket(); - this.deposition_id = newSubmission.getId(); - - return response.code(); + URL url = new URL(urlString); + HttpURLConnection conn = (HttpURLConnection) url.openConnection(); + conn.setRequestProperty(HttpHeaders.CONTENT_TYPE, ContentType.APPLICATION_JSON.toString()); + conn.setRequestProperty(HttpHeaders.AUTHORIZATION, "Bearer " + access_token); + conn.setRequestMethod("POST"); + conn.setDoOutput(true); + try (OutputStream os = conn.getOutputStream()) { + byte[] input = json.getBytes("utf-8"); + os.write(input, 0, input.length); } + String body = getBody(conn); + + int responseCode = conn.getResponseCode(); + conn.disconnect(); + + if(!checkOKStatus(responseCode)) + throw new IOException("Unexpected code " + responseCode + body); + + ZenodoModel newSubmission = new Gson().fromJson(body, ZenodoModel.class); + this.bucket = newSubmission.getLinks().getBucket(); + this.deposition_id = newSubmission.getId(); + + return responseCode; } /** @@ -94,28 +95,48 @@ public class ZenodoAPIClient implements Serializable { * * @param is the inputStream for the file to upload * @param file_name the name of the file as it will appear on Zenodo - * @param len the size of the file * @return the response code */ - public int uploadIS(InputStream is, String file_name, long len) throws IOException { - OkHttpClient httpClient = new OkHttpClient.Builder() - .writeTimeout(600, TimeUnit.SECONDS) - .readTimeout(600, TimeUnit.SECONDS) - .connectTimeout(600, TimeUnit.SECONDS) - .build(); + public int uploadIS(InputStream is, String file_name) throws IOException { - Request request = new Request.Builder() - .url(bucket + "/" + file_name) - .addHeader(HttpHeaders.CONTENT_TYPE, "application/zip") // add request headers - .addHeader(HttpHeaders.AUTHORIZATION, "Bearer " + access_token) - .put(InputStreamRequestBody.create(MEDIA_TYPE_ZIP, is, len)) - .build(); + URL url = new URL(bucket + "/" + file_name); + HttpURLConnection conn = (HttpURLConnection) url.openConnection(); + conn.setRequestProperty(HttpHeaders.CONTENT_TYPE, "application/zip"); + conn.setRequestProperty(HttpHeaders.AUTHORIZATION, "Bearer " + access_token); + conn.setDoOutput(true); + conn.setRequestMethod("PUT"); + + byte[] buf = new byte[8192]; + int length; + try (OutputStream os = conn.getOutputStream()) { + while ((length = is.read(buf)) != -1) { + os.write(buf, 0, length); + } - try (Response response = httpClient.newCall(request).execute()) { - if (!response.isSuccessful()) - throw new IOException("Unexpected code " + response + response.body().string()); - return response.code(); } + int responseCode = conn.getResponseCode(); + if(! checkOKStatus(responseCode)){ + throw new IOException("Unexpected code " + responseCode + getBody(conn)); + } + + return responseCode; + } + + @NotNull + private String getBody(HttpURLConnection conn) throws IOException { + String body = "{}"; + try (BufferedReader br = new BufferedReader( + new InputStreamReader(conn.getInputStream(), "utf-8"))) { + StringBuilder response = new StringBuilder(); + String responseLine = null; + while ((responseLine = br.readLine()) != null) { + response.append(responseLine.trim()); + } + + body = response.toString(); + + } + return body; } /** @@ -127,26 +148,36 @@ public class ZenodoAPIClient implements Serializable { */ public int sendMretadata(String metadata) throws IOException { - OkHttpClient httpClient = new OkHttpClient.Builder().connectTimeout(600, TimeUnit.SECONDS).build(); + URL url = new URL(urlString + "/" + deposition_id); + HttpURLConnection conn = (HttpURLConnection) url.openConnection(); + conn.setRequestProperty(HttpHeaders.CONTENT_TYPE, ContentType.APPLICATION_JSON.toString()); + conn.setRequestProperty(HttpHeaders.AUTHORIZATION, "Bearer " + access_token); + conn.setDoOutput(true); + conn.setRequestMethod("PUT"); - RequestBody body = RequestBody.create(metadata, MEDIA_TYPE_JSON); - Request request = new Request.Builder() - .url(urlString + "/" + deposition_id) - .addHeader(HttpHeaders.CONTENT_TYPE, ContentType.APPLICATION_JSON.toString()) // add request headers - .addHeader(HttpHeaders.AUTHORIZATION, "Bearer " + access_token) - .put(body) - .build(); - - try (Response response = httpClient.newCall(request).execute()) { - - if (!response.isSuccessful()) - throw new IOException("Unexpected code " + response + response.body().string()); - - return response.code(); + try (OutputStream os = conn.getOutputStream()) { + byte[] input = metadata.getBytes("utf-8"); + os.write(input, 0, input.length); } + final int responseCode = conn.getResponseCode(); + conn.disconnect(); + if(!checkOKStatus(responseCode)) + throw new IOException("Unexpected code " + responseCode + getBody(conn)); + + return responseCode; + + + } + + private boolean checkOKStatus(int responseCode) { + + if(HttpURLConnection.HTTP_OK != responseCode || + HttpURLConnection.HTTP_CREATED != responseCode) + return true ; + return false; } /** @@ -155,6 +186,7 @@ public class ZenodoAPIClient implements Serializable { * @return response code * @throws IOException */ + @Deprecated public int publish() throws IOException { String json = "{}"; @@ -194,28 +226,35 @@ public class ZenodoAPIClient implements Serializable { setDepositionId(concept_rec_id, 1); String json = "{}"; - OkHttpClient httpClient = new OkHttpClient.Builder().connectTimeout(600, TimeUnit.SECONDS).build(); + URL url = new URL(urlString + "/" + deposition_id + "/actions/newversion"); + HttpURLConnection conn = (HttpURLConnection) url.openConnection(); - RequestBody body = RequestBody.create(json, MEDIA_TYPE_JSON); + conn.setRequestProperty(HttpHeaders.AUTHORIZATION, "Bearer " + access_token); + conn.setDoOutput(true); + conn.setRequestMethod("POST"); - Request request = new Request.Builder() - .url(urlString + "/" + deposition_id + "/actions/newversion") - .addHeader(HttpHeaders.AUTHORIZATION, "Bearer " + access_token) - .post(body) - .build(); - try (Response response = httpClient.newCall(request).execute()) { - - if (!response.isSuccessful()) - throw new IOException("Unexpected code " + response + response.body().string()); - - ZenodoModel zenodoModel = new Gson().fromJson(response.body().string(), ZenodoModel.class); - String latest_draft = zenodoModel.getLinks().getLatest_draft(); - deposition_id = latest_draft.substring(latest_draft.lastIndexOf("/") + 1); - bucket = getBucket(latest_draft); - return response.code(); + try (OutputStream os = conn.getOutputStream()) { + byte[] input = json.getBytes("utf-8"); + os.write(input, 0, input.length); } + + String body = getBody(conn); + + int responseCode = conn.getResponseCode(); + + conn.disconnect(); + if(!checkOKStatus(responseCode)) + throw new IOException("Unexpected code " + responseCode + body); + + ZenodoModel zenodoModel = new Gson().fromJson(body, ZenodoModel.class); + String latest_draft = zenodoModel.getLinks().getLatest_draft(); + deposition_id = latest_draft.substring(latest_draft.lastIndexOf("/") + 1); + bucket = getBucket(latest_draft); + + return responseCode; + } /** @@ -233,24 +272,33 @@ public class ZenodoAPIClient implements Serializable { this.deposition_id = deposition_id; - OkHttpClient httpClient = new OkHttpClient.Builder().connectTimeout(600, TimeUnit.SECONDS).build(); + String json = "{}"; - Request request = new Request.Builder() - .url(urlString + "/" + deposition_id) - .addHeader("Authorization", "Bearer " + access_token) - .build(); - - try (Response response = httpClient.newCall(request).execute()) { - - if (!response.isSuccessful()) - throw new IOException("Unexpected code " + response + response.body().string()); - - ZenodoModel zenodoModel = new Gson().fromJson(response.body().string(), ZenodoModel.class); - bucket = zenodoModel.getLinks().getBucket(); - return response.code(); + URL url = new URL(urlString + "/" + deposition_id); + HttpURLConnection conn = (HttpURLConnection) url.openConnection(); + conn.setRequestProperty(HttpHeaders.AUTHORIZATION, "Bearer " + access_token); + conn.setRequestMethod("POST"); + conn.setDoOutput(true); + try (OutputStream os = conn.getOutputStream()) { + byte[] input = json.getBytes("utf-8"); + os.write(input, 0, input.length); } + String body = getBody(conn); + + int responseCode = conn.getResponseCode(); + conn.disconnect(); + + if(!checkOKStatus(responseCode)) + throw new IOException("Unexpected code " + responseCode + body); + + ZenodoModel zenodoModel = new Gson().fromJson(body, ZenodoModel.class); + bucket = zenodoModel.getLinks().getBucket(); + + + return responseCode; + } private void setDepositionId(String concept_rec_id, Integer page) throws IOException, MissingConceptDoiException { @@ -273,53 +321,56 @@ public class ZenodoAPIClient implements Serializable { private String getPrevDepositions(String page) throws IOException { - OkHttpClient httpClient = new OkHttpClient.Builder().connectTimeout(600, TimeUnit.SECONDS).build(); - HttpUrl.Builder urlBuilder = HttpUrl.parse(urlString).newBuilder(); urlBuilder.addQueryParameter("page", page); - String url = urlBuilder.build().toString(); - Request request = new Request.Builder() - .url(url) - .addHeader(HttpHeaders.CONTENT_TYPE, ContentType.APPLICATION_JSON.toString()) // add request headers - .addHeader(HttpHeaders.AUTHORIZATION, "Bearer " + access_token) - .get() - .build(); + URL url = new URL(urlBuilder.build().toString()); + HttpURLConnection conn = (HttpURLConnection) url.openConnection(); + conn.setRequestProperty(HttpHeaders.CONTENT_TYPE, ContentType.APPLICATION_JSON.toString()); + conn.setRequestProperty(HttpHeaders.AUTHORIZATION, "Bearer " + access_token); + conn.setDoOutput(true); + conn.setRequestMethod("GET"); - try (Response response = httpClient.newCall(request).execute()) { - if (!response.isSuccessful()) - throw new IOException("Unexpected code " + response + response.body().string()); - return response.body().string(); + String body = getBody(conn); + + int responseCode = conn.getResponseCode(); + + conn.disconnect(); + if(!checkOKStatus(responseCode)) + throw new IOException("Unexpected code " + responseCode + body); + + + + return body; + - } } - private String getBucket(String url) throws IOException { - OkHttpClient httpClient = new OkHttpClient.Builder() - .connectTimeout(600, TimeUnit.SECONDS) - .build(); + private String getBucket(String inputUurl) throws IOException { - Request request = new Request.Builder() - .url(url) - .addHeader(HttpHeaders.CONTENT_TYPE, ContentType.APPLICATION_JSON.toString()) // add request headers - .addHeader(HttpHeaders.AUTHORIZATION, "Bearer " + access_token) - .get() - .build(); + URL url = new URL(inputUurl); + HttpURLConnection conn = (HttpURLConnection) url.openConnection(); + conn.setRequestProperty(HttpHeaders.CONTENT_TYPE, ContentType.APPLICATION_JSON.toString()); + conn.setRequestProperty(HttpHeaders.AUTHORIZATION, "Bearer " + access_token); + conn.setDoOutput(true); + conn.setRequestMethod("GET"); - try (Response response = httpClient.newCall(request).execute()) { + String body = getBody(conn); - if (!response.isSuccessful()) - throw new IOException("Unexpected code " + response + response.body().string()); + int responseCode = conn.getResponseCode(); - // Get response body - ZenodoModel zenodoModel = new Gson().fromJson(response.body().string(), ZenodoModel.class); + conn.disconnect(); + if(!checkOKStatus(responseCode)) + throw new IOException("Unexpected code " + responseCode + body); + + ZenodoModel zenodoModel = new Gson().fromJson(body, ZenodoModel.class); + + return zenodoModel.getLinks().getBucket(); - return zenodoModel.getLinks().getBucket(); - } } diff --git a/dhp-common/src/test/java/eu/dnetlib/dhp/common/api/ZenodoAPIClientTest.java b/dhp-common/src/test/java/eu/dnetlib/dhp/common/api/ZenodoAPIClientTest.java index 2ccaed3e4..92c1dcda3 100644 --- a/dhp-common/src/test/java/eu/dnetlib/dhp/common/api/ZenodoAPIClientTest.java +++ b/dhp-common/src/test/java/eu/dnetlib/dhp/common/api/ZenodoAPIClientTest.java @@ -33,7 +33,7 @@ class ZenodoAPIClientTest { InputStream is = new FileInputStream(file); - Assertions.assertEquals(200, client.uploadIS(is, "COVID-19.json.gz", file.length())); + Assertions.assertEquals(200, client.uploadIS(is, "COVID-19.json.gz")); String metadata = IOUtils.toString(getClass().getResourceAsStream("/eu/dnetlib/dhp/common/api/metadata.json")); @@ -56,7 +56,7 @@ class ZenodoAPIClientTest { InputStream is = new FileInputStream(file); - Assertions.assertEquals(200, client.uploadIS(is, "COVID-19.json.gz", file.length())); + Assertions.assertEquals(200, client.uploadIS(is, "COVID-19.json.gz")); String metadata = IOUtils.toString(getClass().getResourceAsStream("/eu/dnetlib/dhp/common/api/metadata.json")); @@ -80,7 +80,7 @@ class ZenodoAPIClientTest { InputStream is = new FileInputStream(file); - Assertions.assertEquals(200, client.uploadIS(is, "newVersion_deposition", file.length())); + Assertions.assertEquals(200, client.uploadIS(is, "newVersion_deposition")); Assertions.assertEquals(202, client.publish()); @@ -100,7 +100,7 @@ class ZenodoAPIClientTest { InputStream is = new FileInputStream(file); - Assertions.assertEquals(200, client.uploadIS(is, "newVersion_deposition", file.length())); + Assertions.assertEquals(200, client.uploadIS(is, "newVersion_deposition")); Assertions.assertEquals(202, client.publish());