D-Net
/
dnet-hadoop
14
5
Fork 11
Code Issues 14 Pull Requests 10 Projects 2 Releases 2 Wiki Activity

-

This commit is contained in:
Miriam Baglioni 2020-07-07 18:09:06 +02:00
parent 0208bc18f3
commit 4c8d86493c
2 changed files with 39 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
dhp-workflows/dhp-graph-mapper/src/main/java/eu/dnetlib/dhp/oa/graph/dump/APIClient.java
View File

@ -3,10 +3,11 @@ package eu.dnetlib.dhp.oa.graph.dump;
import java.io.*;
import java.io.IOException;
import okhttp3.*;
import com.google.gson.Gson;
import eu.dnetlib.dhp.oa.graph.dump.zenodo.ZenodoModel;
import com.google.gson.Gson;
import eu.dnetlib.dhp.oa.graph.dump.zenodo.ZenodoModel;
import okhttp3.*;
public class APIClient implements Serializable {
@ -16,11 +17,9 @@ public class APIClient implements Serializable {
String deposition_id;
String access_token;
public static final MediaType MEDIA_TYPE_JSON
= MediaType.parse("application/json; charset=utf-8");
public static final MediaType MEDIA_TYPE_JSON = MediaType.parse("application/json; charset=utf-8");
private static final MediaType MEDIA_TYPE_ZIP
= MediaType.parse("application/zip");
private static final MediaType MEDIA_TYPE_ZIP = MediaType.parse("application/zip");
public String getUrlString() {
return urlString;
@ -44,11 +43,11 @@ public class APIClient implements Serializable {
this.access_token = access_token;
}
public int connect() throws IOException{
public int connect() throws IOException {
String json = "{}";
OkHttpClient httpClient = new OkHttpClient();
RequestBody body = RequestBody.create(json, MEDIA_TYPE_JSON);
RequestBody body = RequestBody.create(MEDIA_TYPE_JSON, json);
Request request = new Request.Builder()
.url(urlString)
@ -57,11 +56,10 @@ public class APIClient implements Serializable {
.post(body)
.build();
try (Response response = httpClient.newCall(request).execute()) {
if (!response.isSuccessful()) throw new IOException("Unexpected code " + response + response.body().string());
if (!response.isSuccessful())
throw new IOException("Unexpected code " + response + response.body().string());
// Get response body
json = response.body().string();
@ -76,8 +74,7 @@ public class APIClient implements Serializable {
}
public int upload(File file, String file_name){
public int upload(File file, String file_name) {
OkHttpClient httpClient = new OkHttpClient();
@ -85,11 +82,12 @@ public class APIClient implements Serializable {
.url(bucket + "/" + file_name)
.addHeader("Content-Type", "application/zip") // add request headers
.addHeader("Authorization", "Bearer " + access_token)
.put(RequestBody.create(file, MEDIA_TYPE_ZIP))
.put(RequestBody.create(MEDIA_TYPE_ZIP, file))
.build();
try (Response response = httpClient.newCall(request).execute()) {
if (!response.isSuccessful()) throw new IOException("Unexpected code " + response + response.body().string());
if (!response.isSuccessful())
throw new IOException("Unexpected code " + response + response.body().string());
return response.code();
} catch (IOException e) {
e.printStackTrace();
@ -99,12 +97,11 @@ public class APIClient implements Serializable {
return -1;
}
public int sendMretadata(String metadata) throws IOException {
OkHttpClient httpClient = new OkHttpClient();
RequestBody body = RequestBody.create(metadata, MEDIA_TYPE_JSON);
RequestBody body = RequestBody.create(MEDIA_TYPE_JSON, metadata);
Request request = new Request.Builder()
.url(urlString + "/" + deposition_id)
@ -113,10 +110,10 @@ public class APIClient implements Serializable {
.put(body)
.build();
try (Response response = httpClient.newCall(request).execute()) {
if (!response.isSuccessful()) throw new IOException("Unexpected code " + response + response.body().string());
if (!response.isSuccessful())
throw new IOException("Unexpected code " + response + response.body().string());
return response.code();
@ -130,16 +127,16 @@ public class APIClient implements Serializable {
OkHttpClient httpClient = new OkHttpClient();
Request request = new Request.Builder()
.url(urlString + "/" + deposition_id + "/actions/publish")
.addHeader("Authorization", "Bearer " + access_token)
.post(RequestBody.create(json, MEDIA_TYPE_JSON))
.post(RequestBody.create(MEDIA_TYPE_JSON, json))
.build();
try (Response response = httpClient.newCall(request).execute()) {
if (!response.isSuccessful()) throw new IOException("Unexpected code " + response + response.body().string());
if (!response.isSuccessful())
throw new IOException("Unexpected code " + response + response.body().string());
return response.code();

2
dhp-workflows/dhp-graph-mapper/src/main/java/eu/dnetlib/dhp/oa/graph/dump/Mapper.java
View File

@ -137,7 +137,7 @@ public class Mapper implements Serializable {
Optional<eu.dnetlib.dhp.schema.oaf.Qualifier> oar = Optional.ofNullable(input.getBestaccessright());
if (oar.isPresent()) {
if (Constants.accessRightsCoarMap.containsKey(oar.get().getClassid())) {
String code = Constants.accessRightsCoarMap.get(oar.get().getClassid());
String code = Constants.accessRightsCoarMap.get(oar.get().getClassname());
out
.setBestaccessright(
AccessRight