From a42de79292d9541db7865b54e93be2d0b6e6a094 Mon Sep 17 00:00:00 2001
From: "serena.spinoso" <serena.spinoso@polito.it>
Date: Thu, 7 Sep 2017 10:22:39 +0200
Subject: update verigraph

JIRA: PARSER-154

code optimizations about graph manipulation and formula generation.

Change-Id: Idebef19b128281aa2bc40d1aeab6e208c7ddd93d
Signed-off-by: serena.spinoso <serena.spinoso@polito.it>
---
 .../deserializer/NodeCustomDeserializer.java       | 92 ----------------------
 1 file changed, 92 deletions(-)
 delete mode 100644 verigraph/src/main/java/it/polito/escape/verify/deserializer/NodeCustomDeserializer.java

(limited to 'verigraph/src/main/java/it/polito/escape/verify/deserializer/NodeCustomDeserializer.java')

diff --git a/verigraph/src/main/java/it/polito/escape/verify/deserializer/NodeCustomDeserializer.java b/verigraph/src/main/java/it/polito/escape/verify/deserializer/NodeCustomDeserializer.java
deleted file mode 100644
index fb451db..0000000
--- a/verigraph/src/main/java/it/polito/escape/verify/deserializer/NodeCustomDeserializer.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2017 Politecnico di Torino and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Apache License, Version 2.0
- * which accompanies this distribution, and is available at
- * http://www.apache.org/licenses/LICENSE-2.0
- *******************************************************************************/
-
-package it.polito.escape.verify.deserializer;
-
-import java.io.IOException;
-import java.util.List;
-import java.util.Map;
-
-import com.fasterxml.jackson.core.JsonParseException;
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.JsonDeserializer;
-import com.fasterxml.jackson.databind.JsonMappingException;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.type.TypeFactory;
-
-import it.polito.escape.verify.exception.BadRequestException;
-import it.polito.escape.verify.exception.InternalServerErrorException;
-import it.polito.escape.verify.model.Configuration;
-import it.polito.escape.verify.model.Neighbour;
-import it.polito.escape.verify.model.Node;
-
-public class NodeCustomDeserializer extends JsonDeserializer<Node> {
-
-	@Override
-	public Node deserialize(JsonParser jp, DeserializationContext context) {
-
-		try {
-			JsonNode root = jp.getCodec().readTree(jp);
-			JsonNode neighboursJson = root.get("neighbours");
-			JsonNode configurationJson = root.get("configuration");
-
-			String nodeName = root.get("name").asText();
-			String functionalType = root.get("functional_type").asText();
-
-			Node node = new Node();
-			if(root.get("id") != null){
-				long nodeId = root.get("id").asLong();
-				node.setId(nodeId);
-			}
-			node.setName(nodeName);
-			node.setFunctional_type(functionalType);
-
-			if (configurationJson == null)
-				node.setConfiguration(new Configuration(node.getName(), "", new ObjectMapper().createArrayNode()));
-			else {
-				Configuration conf = node.getConfiguration();
-				conf.setId(node.getName());
-				conf.setDescription("");
-				conf.setConfiguration(configurationJson);
-			}
-
-			try {
-				List<Neighbour> neighbourList = new ObjectMapper().readValue(	neighboursJson.toString(),
-																				TypeFactory	.defaultInstance()
-																							.constructCollectionType(	List.class,
-																														Neighbour.class));
-				Map<Long, Neighbour> neighbours = node.getNeighbours();
-
-				long numberOfNeighbours = 0;
-				for (Neighbour neighbour : neighbourList) {
-					neighbours.put(++numberOfNeighbours, neighbour);
-				}
-
-				return node;
-			}
-			catch (JsonParseException e) {
-				throw new BadRequestException("Invalid content for a node: " + e.getMessage());
-			}
-			catch (JsonMappingException e) {
-				throw new BadRequestException("Invalid input json structure for a node: " + e.getMessage());
-			}
-		}
-		catch (JsonProcessingException e) {
-			throw new InternalServerErrorException("Error parsing a node: " + e.getMessage());
-		}
-		catch (IOException e) {
-			throw new InternalServerErrorException("I/O error parsing a node: " + e.getMessage());
-		}
-
-	}
-
-}
-- 
cgit 1.2.3-korg