From d765da1683406425852bc4e2922b84bdb2943f01 Mon Sep 17 00:00:00 2001 From: Christopher Heiting <50258863+krozzus@users.noreply.github.com> Date: Thu, 7 May 2020 12:14:12 +0200 Subject: [PATCH] TSK-1233: Removed the seriazation directory and its subclasses --- .../DistributionTargetDeserializer.java | 60 ------------------- .../DistributionTargetSerializer.java | 36 ----------- .../rest/serialization/WorkbasketMixIn.java | 17 ------ 3 files changed, 113 deletions(-) delete mode 100644 rest/taskana-rest-spring/src/main/java/pro/taskana/rest/serialization/DistributionTargetDeserializer.java delete mode 100644 rest/taskana-rest-spring/src/main/java/pro/taskana/rest/serialization/DistributionTargetSerializer.java delete mode 100644 rest/taskana-rest-spring/src/main/java/pro/taskana/rest/serialization/WorkbasketMixIn.java diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/serialization/DistributionTargetDeserializer.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/serialization/DistributionTargetDeserializer.java deleted file mode 100644 index 7da5ec3eb..000000000 --- a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/serialization/DistributionTargetDeserializer.java +++ /dev/null @@ -1,60 +0,0 @@ -package pro.taskana.rest.serialization; - -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.core.JsonToken; -import com.fasterxml.jackson.databind.DeserializationContext; -import com.fasterxml.jackson.databind.deser.std.StdDeserializer; -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.context.support.SpringBeanAutowiringSupport; - -import pro.taskana.common.api.exceptions.NotAuthorizedException; -import pro.taskana.workbasket.api.WorkbasketService; -import pro.taskana.workbasket.api.exceptions.WorkbasketNotFoundException; -import pro.taskana.workbasket.api.models.Workbasket; - -/** This class deserializes the string list to real workbaskets. */ -public class DistributionTargetDeserializer extends StdDeserializer> { - - private static final long serialVersionUID = 4226950057149602129L; - - private static final Logger LOGGER = - LoggerFactory.getLogger(DistributionTargetDeserializer.class); - - @Autowired private WorkbasketService workbasketService; - - public DistributionTargetDeserializer() { - this(null); - SpringBeanAutowiringSupport.processInjectionBasedOnCurrentContext(this); - } - - public DistributionTargetDeserializer(Class vc) { - super(vc); - } - - @Override - public List deserialize(JsonParser jsonparser, DeserializationContext context) - throws IOException, JsonProcessingException { - List distributionTargets = new ArrayList(); - while (jsonparser.nextToken() != JsonToken.END_ARRAY) { - String id = jsonparser.getText(); - try { - distributionTargets.add(workbasketService.getWorkbasket(id)); - } catch (WorkbasketNotFoundException e) { - LOGGER.error("The workbasket with the id ' {} ' is not found in database.", id); - } catch (NotAuthorizedException e) { - LOGGER.error( - "The user misses some required permissions for " - + "the workbasket with ID ' {} '. Exception = {}.", - id, - e); - } - } - return distributionTargets; - } -} diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/serialization/DistributionTargetSerializer.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/serialization/DistributionTargetSerializer.java deleted file mode 100644 index a89626500..000000000 --- a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/serialization/DistributionTargetSerializer.java +++ /dev/null @@ -1,36 +0,0 @@ -package pro.taskana.rest.serialization; - -import com.fasterxml.jackson.core.JsonGenerator; -import com.fasterxml.jackson.databind.SerializerProvider; -import com.fasterxml.jackson.databind.ser.std.StdSerializer; -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; - -import pro.taskana.workbasket.api.models.Workbasket; - -/** This class serializes the distribution targets to an string array with ids. */ -public class DistributionTargetSerializer extends StdSerializer> { - - private static final long serialVersionUID = -4655804943794734821L; - - public DistributionTargetSerializer() { - this(null); - } - - public DistributionTargetSerializer(Class> t) { - super(t); - } - - @Override - public void serialize( - List workbaskets, JsonGenerator gen, SerializerProvider provider) - throws IOException { - List ids = new ArrayList<>(); - - for (Workbasket item : workbaskets) { - ids.add(item.getId()); - } - gen.writeObject(ids); - } -} diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/serialization/WorkbasketMixIn.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/serialization/WorkbasketMixIn.java deleted file mode 100644 index f3b483dc5..000000000 --- a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/serialization/WorkbasketMixIn.java +++ /dev/null @@ -1,17 +0,0 @@ -package pro.taskana.rest.serialization; - -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import java.util.List; - -import pro.taskana.workbasket.api.models.Workbasket; - -/** - * This class is used to override the distributiontargets with non standard serialization classes. - */ -public abstract class WorkbasketMixIn { - - @JsonSerialize(using = DistributionTargetSerializer.class) - @JsonDeserialize(using = DistributionTargetDeserializer.class) - abstract List getDistributionTargets(); -}