enrico.ottonello
/
dnet-hadoop
forked from D-Net/dnet-hadoop
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

http entity as json string

This commit is contained in:
Michele Artini 2021-02-05 09:45:39 +01:00
parent 730973679a
commit 2ee0c3e47e
2 changed files with 56 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dhp-common/src/main/java/eu/dnetlib/dhp/message/Message.java
View File

@ -10,7 +10,6 @@ public class Message implements Serializable {
public static String CURRENT_PARAM = "current"; public static String CURRENT_PARAM = "current";
public static String TOTAL_PARAM = "total"; public static String TOTAL_PARAM = "total";
/** /**
* *
*/ */

23
dhp-common/src/main/java/eu/dnetlib/dhp/message/MessageSender.java
View File

@ -4,14 +4,15 @@ package eu.dnetlib.dhp.message;
import org.apache.http.client.config.RequestConfig; import org.apache.http.client.config.RequestConfig;
import org.apache.http.client.methods.CloseableHttpResponse; import org.apache.http.client.methods.CloseableHttpResponse;
import org.apache.http.client.methods.HttpPut; import org.apache.http.client.methods.HttpPut;
import org.apache.http.entity.SerializableEntity; import org.apache.http.entity.ContentType;
import org.apache.http.entity.StringEntity;
import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.HttpClients; import org.apache.http.impl.client.HttpClients;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import java.util.concurrent.atomic.AtomicInteger; import com.fasterxml.jackson.core.JsonProcessingException;
import java.util.function.Function; import com.fasterxml.jackson.databind.ObjectMapper;
public class MessageSender { public class MessageSender {
@ -23,11 +24,12 @@ public class MessageSender {
private static final int CONNTECTION_TIMEOUT_MS = 2000; private static final int CONNTECTION_TIMEOUT_MS = 2000;
private final ObjectMapper objectMapper = new ObjectMapper();
private final String dnetMessageEndpoint; private final String dnetMessageEndpoint;
private final String workflowId; private final String workflowId;
public MessageSender(final String dnetMessageEndpoint, final String workflowId) { public MessageSender(final String dnetMessageEndpoint, final String workflowId) {
this.workflowId = workflowId; this.workflowId = workflowId;
this.dnetMessageEndpoint = dnetMessageEndpoint; this.dnetMessageEndpoint = dnetMessageEndpoint;
@ -41,21 +43,23 @@ public class MessageSender {
sendMessage(createMessage(current, total)); sendMessage(createMessage(current, total));
} }
private Message createMessage(final Long current, final Long total) { private Message createMessage(final Long current, final Long total) {
final Message m = new Message(); final Message m = new Message();
m.setWorkflowId(workflowId); m.setWorkflowId(workflowId);
m.getBody().put(Message.CURRENT_PARAM, current.toString()); m.getBody().put(Message.CURRENT_PARAM, current.toString());
if (total != null) if (total != null) {
m.getBody().put(Message.TOTAL_PARAM, total.toString()); m.getBody().put(Message.TOTAL_PARAM, total.toString());
}
return m; return m;
} }
private void _sendMessage(final Message message) { private void _sendMessage(final Message message) {
try {
final String json = objectMapper.writeValueAsString(message);
final HttpPut req = new HttpPut(dnetMessageEndpoint); final HttpPut req = new HttpPut(dnetMessageEndpoint);
req.setEntity(new SerializableEntity(message)); req.setEntity(new StringEntity(json, ContentType.APPLICATION_JSON));
final RequestConfig requestConfig = RequestConfig final RequestConfig requestConfig = RequestConfig
.custom() .custom()
@ -75,6 +79,9 @@ public class MessageSender {
} catch (final Throwable e) { } catch (final Throwable e) {
log.error("Error sending message to " + dnetMessageEndpoint + ", message content: " + message, e); log.error("Error sending message to " + dnetMessageEndpoint + ", message content: " + message, e);
} }
} catch (final JsonProcessingException e) {
log.error("Error sending message to " + dnetMessageEndpoint + ", message content: " + message, e);
}
} }
} }