Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@
*/
package org.ceskaexpedice.processplatform.worker.config;

import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;

import java.nio.charset.StandardCharsets;
import java.util.Base64;
import java.util.HashMap;
Expand Down Expand Up @@ -85,10 +89,11 @@ public String getOrDefault(String key, String defaultValue) {
return props.getProperty(key, defaultValue);
}

public static Map<String, String> getPluginPayload(ProcessConfiguration processConfig) {
public static Map<String, String> getPluginPayload(ProcessConfiguration processConfig) throws JsonProcessingException {
String payloadBase64 = processConfig.get(PLUGIN_PAYLOAD_BASE64_KEY);
String payloadJson = new String(Base64.getDecoder().decode(payloadBase64), StandardCharsets.UTF_8);
Map<String, String> pluginPayload = parseSimpleJson(payloadJson);
ObjectMapper mapper = new ObjectMapper();
Map<String, String> pluginPayload = mapper.readValue(payloadJson, new TypeReference<Map<String, String>>() {});
return pluginPayload;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
*/
package org.ceskaexpedice.processplatform.worker.plugin.executor;

import com.fasterxml.jackson.core.JsonProcessingException;
import org.ceskaexpedice.processplatform.api.context.PluginContext;
import org.ceskaexpedice.processplatform.api.context.PluginContextHolder;
import org.ceskaexpedice.processplatform.common.ApplicationException;
Expand Down Expand Up @@ -150,7 +151,7 @@ private static void updatePID(ProcessConfiguration processConfiguration, Manager
}

private static void runPlugin(ProcessConfiguration processConfig, WorkerConfiguration workerConfig)
throws ClassNotFoundException, IllegalAccessException, InvocationTargetException {
throws ClassNotFoundException, IllegalAccessException, InvocationTargetException, JsonProcessingException {
Map<String, String> pluginPayload = getPluginPayload(processConfig);
String pluginId = processConfig.get(PLUGIN_ID_KEY);
String mainClass = processConfig.get(MAIN_CLASS_KEY);
Expand Down
Loading