From a06640d3447bb6d2734398f64be63fb9ed1e8d09 Mon Sep 17 00:00:00 2001 From: "miriam.baglioni" Date: Fri, 28 Jul 2023 11:31:42 +0200 Subject: [PATCH] [dumpSubset] wf for the creation of the dump per country start from the beginning --- .../dhp/oa/zenodoapi/ZenodoAPIClient.java | 34 +++++++++---------- .../countryresults/oozie_app/workflow.xml | 2 +- .../dhp/oa/graph/dump/ZenodoUploadTest.java | 13 ++++--- 3 files changed, 24 insertions(+), 25 deletions(-) diff --git a/dump/src/main/java/eu/dnetlib/dhp/oa/zenodoapi/ZenodoAPIClient.java b/dump/src/main/java/eu/dnetlib/dhp/oa/zenodoapi/ZenodoAPIClient.java index 1b3bb7a..e5d2353 100644 --- a/dump/src/main/java/eu/dnetlib/dhp/oa/zenodoapi/ZenodoAPIClient.java +++ b/dump/src/main/java/eu/dnetlib/dhp/oa/zenodoapi/ZenodoAPIClient.java @@ -18,7 +18,7 @@ import org.apache.http.entity.ContentType; import org.apache.http.entity.InputStreamEntity; import org.apache.http.entity.StringEntity; import org.apache.http.impl.client.CloseableHttpClient; -//import org.apache.http.impl.client.HttpClients; +// import org.apache.http.impl.client.HttpClients; import org.apache.http.util.EntityUtils; import org.jetbrains.annotations.NotNull; @@ -108,11 +108,11 @@ public class ZenodoAPIClient implements Serializable { RequestBody body = RequestBody.create(json, MEDIA_TYPE_JSON); Request request = new Request.Builder() - .url(urlString) - .addHeader("Content-Type", "application/json") // add request headers - .addHeader("Authorization", "Bearer " + access_token) - .post(body) - .build(); + .url(urlString) + .addHeader("Content-Type", "application/json") // add request headers + .addHeader("Authorization", "Bearer " + access_token) + .post(body) + .build(); try (Response response = httpClient.newCall(request).execute()) { @@ -122,7 +122,8 @@ public class ZenodoAPIClient implements Serializable { // Get response body json = response.body().string(); - eu.dnetlib.dhp.common.api.zenodo.ZenodoModel newSubmission = new Gson().fromJson(json, eu.dnetlib.dhp.common.api.zenodo.ZenodoModel.class); + eu.dnetlib.dhp.common.api.zenodo.ZenodoModel newSubmission = new Gson() + .fromJson(json, eu.dnetlib.dhp.common.api.zenodo.ZenodoModel.class); this.bucket = newSubmission.getLinks().getBucket(); this.deposition_id = newSubmission.getId(); @@ -132,7 +133,6 @@ public class ZenodoAPIClient implements Serializable { } - // public int uploadIS2(InputStream is, String fileName) throws IOException { // // final String crlf = "\r\n"; @@ -340,10 +340,10 @@ public class ZenodoAPIClient implements Serializable { RequestBody body = RequestBody.create(json, MEDIA_TYPE_JSON); Request request = new Request.Builder() - .url(urlString + "/" + deposition_id + "/actions/newversion") - .addHeader(HttpHeaders.AUTHORIZATION, "Bearer " + access_token) - .post(body) - .build(); + .url(urlString + "/" + deposition_id + "/actions/newversion") + .addHeader(HttpHeaders.AUTHORIZATION, "Bearer " + access_token) + .post(body) + .build(); try (Response response = httpClient.newCall(request).execute()) { @@ -445,11 +445,11 @@ public class ZenodoAPIClient implements Serializable { 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) + .addHeader(HttpHeaders.CONTENT_TYPE, ContentType.APPLICATION_JSON.toString()) // add request headers + .addHeader(HttpHeaders.AUTHORIZATION, "Bearer " + access_token) + .get() + .build(); try (Response response = httpClient.newCall(request).execute()) { diff --git a/dump/src/main/resources/eu/dnetlib/dhp/oa/graph/dump/countryresults/oozie_app/workflow.xml b/dump/src/main/resources/eu/dnetlib/dhp/oa/graph/dump/countryresults/oozie_app/workflow.xml index 19ba128..0ec208b 100644 --- a/dump/src/main/resources/eu/dnetlib/dhp/oa/graph/dump/countryresults/oozie_app/workflow.xml +++ b/dump/src/main/resources/eu/dnetlib/dhp/oa/graph/dump/countryresults/oozie_app/workflow.xml @@ -81,7 +81,7 @@ - + diff --git a/dump/src/test/java/eu/dnetlib/dhp/oa/graph/dump/ZenodoUploadTest.java b/dump/src/test/java/eu/dnetlib/dhp/oa/graph/dump/ZenodoUploadTest.java index f119274..7117d00 100644 --- a/dump/src/test/java/eu/dnetlib/dhp/oa/graph/dump/ZenodoUploadTest.java +++ b/dump/src/test/java/eu/dnetlib/dhp/oa/graph/dump/ZenodoUploadTest.java @@ -7,8 +7,6 @@ import java.io.IOException; import java.io.InputStream; import java.nio.file.Files; -import eu.dnetlib.dhp.oa.zenodoapi.ZenodoAPIClient; -import eu.dnetlib.dhp.oa.zenodoapi.MissingConceptDoiException; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.*; import org.junit.jupiter.api.Assertions; @@ -19,7 +17,8 @@ import org.junit.jupiter.api.Test; import com.google.gson.Gson; import eu.dnetlib.dhp.oa.graph.dump.community.CommunityMap; - +import eu.dnetlib.dhp.oa.zenodoapi.MissingConceptDoiException; +import eu.dnetlib.dhp.oa.zenodoapi.ZenodoAPIClient; @Disabled public class ZenodoUploadTest { @@ -86,8 +85,7 @@ public class ZenodoUploadTest { System.out.println(client.sendMretadata(metadata)); - - //System.out.println(client.publish()); + // System.out.println(client.publish()); } @@ -138,7 +136,7 @@ public class ZenodoUploadTest { } - //System.out.println(client.publish()); + // System.out.println(client.publish()); } @@ -146,7 +144,7 @@ public class ZenodoUploadTest { void testNewVersion2() throws Exception, MissingConceptDoiException { ZenodoAPIClient client = new ZenodoAPIClient(URL_STRING, - ACCESS_TOKEN); + ACCESS_TOKEN); client.newVersion("1210237"); @@ -162,6 +160,7 @@ public class ZenodoUploadTest { // Assertions.assertEquals(202, client.publish()); } + @Test void readCommunityMap() throws IOException { LocalFileSystem fs = FileSystem.getLocal(new Configuration());