Revize 5aeb7fe0

[imiger-spade-converter] use imiger-vo classes instead of own copies

sources/imiger-spade-converter/pom.xml

@@ -42 +42 @@
     </build>
 
     <dependencies>
+        <dependency>
+            <groupId>cz.zcu.kiv</groupId>
+            <artifactId>imiger-vo</artifactId>
+            <version>0.1.2-SNAPSHOT</version>
+        </dependency>
+
         <!-- Libs for JSON handling -->
         <dependency>
             <groupId>com.google.code.gson</groupId>

sources/imiger-spade-converter/src/main/java/cz/zcu/kiv/imiger/plugin/spade/Spade.java

@@ -1 +1 @@
 package cz.zcu.kiv.imiger.plugin.spade;
 
-import cz.zcu.kiv.imiger.plugin.spade.api.Graph;
+import cz.zcu.kiv.imiger.vo.Graph;
 import cz.zcu.kiv.imiger.plugin.spade.graph.GraphManager;
 import cz.zcu.kiv.imiger.plugin.spade.graph.loader.GraphJSONDataLoader;
 import cz.zcu.kiv.imiger.plugin.spade.graph.loader.JSONConfigLoader;

sources/imiger-spade-converter/src/main/java/cz/zcu/kiv/imiger/plugin/spade/api/AttributeDataType.java

@@ -1 @@
-package cz.zcu.kiv.imiger.plugin.spade.api;
-
-public enum AttributeDataType {
-    NUMBER {
-        @Override
-        public String toString() {
-            return "number";
-        }
-    },
-    DATE {
-        @Override
-        public String toString() {
-            return "date";
-        }
-    },
-    ENUM {
-        @Override
-        public String toString() {
-            return "enum";
-        }
-    },
-    STRING {
-        @Override
-        public String toString() {
-            return "string";
-        }
-    };
-
-    public static AttributeDataType getEnum(String value){
-        switch (value) {
-            case "number": return AttributeDataType.NUMBER;
-            case "date": return AttributeDataType.DATE;
-            case "enum": return AttributeDataType.ENUM;
-            default: return AttributeDataType.STRING;
-        }
-    }
-}

sources/imiger-spade-converter/src/main/java/cz/zcu/kiv/imiger/plugin/spade/api/AttributeType.java

@@ -1 @@
-package cz.zcu.kiv.imiger.plugin.spade.api;
-
-/**
- * Class represents one attribute type which is used in input JSON file and in output JSON file (file between frontend
- * and backend).
- */
-public class AttributeType {
-    /** name of attribute */
-    public String name;
-    /** data type of attribute */
-    public AttributeDataType dataType;
-    /** additional info */
-    public String text;
-
-    public AttributeType(String name, AttributeDataType dataType, String text) {
-        this.name = name;
-        this.dataType = dataType;
-        this.text = text;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public AttributeDataType getDataType() {
-        return dataType;
-    }
-
-    public String getText() {
-        return text;
-    }
-}

sources/imiger-spade-converter/src/main/java/cz/zcu/kiv/imiger/plugin/spade/api/BaseEdge.java

@@ -1 @@
-package cz.zcu.kiv.imiger.plugin.spade.api;
-
-/**
- * Class represents edge. Class contains attributes which are common for input JSON format and for
- * output JSON format (JSON between frontend and backend)
- */
-public class BaseEdge {
-    /** identification number of edge */
-    private int id;
-    /** original ID of vertex from edge leads */
-    private int from;
-    /** original ID of vertex where edge leads */
-    private int to;
-    /** additional info */
-    private String text;
-
-    public BaseEdge(int id, int from, int to, String text) {
-        this.id = id;
-        this.from = from;
-        this.to = to;
-        this.text = text;
-    }
-
-    public int getId() {
-        return id;
-    }
-
-    public void setId(int id) {
-        this.id = id;
-    }
-
-    public int getFrom() {
-        return from;
-    }
-
-    public void setFrom(int from) {
-        this.from = from;
-    }
-
-    public int getTo() {
-        return to;
-    }
-
-    public void setTo(int to) {
-        this.to = to;
-    }
-
-    public String getText() {
-        return text;
-    }
-
-    public void setText(String text) {
-        this.text = text;
-    }
-
-    /**
-     * Generate hash code based on attributes {@code from} and {@code to}.
-     * @return generated hash code.
-     */
-    @Override
-    public int hashCode() {
-        return from * 100000 + to;
-    }
-
-    /**
-     * Two edges are equals where their {@code from} and {@code to} are equals.
-     *
-     * @param edge which will be compared with this instance
-     * @return tru if edges are equal, false otherwise
-     */
-    @Override
-    public boolean equals(Object edge) {
-        if (!(edge instanceof BaseEdge)) return false;
-
-        BaseEdge cmpEdge = (BaseEdge) edge;
-        return from == cmpEdge.from && to == cmpEdge.to;
-    }
-}

sources/imiger-spade-converter/src/main/java/cz/zcu/kiv/imiger/plugin/spade/api/BaseVertex.java

@@ -1 @@
-package cz.zcu.kiv.imiger.plugin.spade.api;
-
-/**
- * Class represents vertex. Class contains attributes which are common for input JSON format and for
- * output JSON format (JSON between frontend and backend)
- */
-public class BaseVertex {
-
-    /** New generated identification number. */
-    private int id;
-    /** Name of vertex. */
-    private String name;
-    /** Index of vertex archetype. */
-    private int archetypeIndex;
-    /** Additional info. */
-    private String text;
-
-    public BaseVertex(int id, String name, int archetypeIndex, String text) {
-        this.id = id;
-        this.name = name;
-        this.archetypeIndex = archetypeIndex;
-        this.text = text;
-    }
-
-    public int getId() {
-        return id;
-    }
-
-    public void setId(int id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public int getArchetype() {
-        return archetypeIndex;
-    }
-
-    public void setArchetype(int archetypeIndex) {
-        this.archetypeIndex = archetypeIndex;
-    }
-
-    public String getText() {
-        return text;
-    }
-
-    public void setText(String text) {
-        this.text = text;
-    }
-
-    /**
-     * Generate hash code which is based on {@code originalId}.
-     * @return generated has code
-     */
-    @Override
-    public int hashCode() {
-        return id;
-    }
-
-    /**
-     * Two vertices are equals when their {@code originalId} is equals.
-     * @param vertex which will be compared with this instance
-     * @return true if vertices are equal, false otherwise
-     */
-    @Override
-    public boolean equals(Object vertex) {
-        if (!(vertex instanceof BaseVertex)) return false;
-        return id == ((BaseVertex) vertex).id;
-    }
-}

sources/imiger-spade-converter/src/main/java/cz/zcu/kiv/imiger/plugin/spade/api/Edge.java

@@ -1 @@
-package cz.zcu.kiv.imiger.plugin.spade.api;
-
-import java.util.List;
-
-/**
- * Class represents edge which is used for output JSON format (JSON between frontend and backend).
- */
-public class Edge extends BaseEdge {
-
-    /**
-     * List of subedgeInfo.
-     * When two input edges are equals, in output their are in one record and their differences are in subedgeInfo.
-     */
-    private List<SubedgeInfo> subedgeInfo;
-
-    /**
-     * Create new edge.
-     * @param id new generated identification number
-     * @param from original ID of vertex from edge leads
-     * @param to original ID of vertex where edge leads
-     * @param text additional info
-     * @param subedgeInfo list which contains differences between equals edges
-     */
-    public Edge(int id, int from, int to, String text, List<SubedgeInfo> subedgeInfo) {
-        super(id, from, to, text);
-        this.subedgeInfo = subedgeInfo;
-    }
-
-    public List<SubedgeInfo> getSubedgeInfo(){
-        return subedgeInfo;
-    }
-
-    public void setSubedgeInfo(List<SubedgeInfo> subedgeInfo) {
-        this.subedgeInfo = subedgeInfo;
-    }
-}

sources/imiger-spade-converter/src/main/java/cz/zcu/kiv/imiger/plugin/spade/api/EdgeArchetype.java

@@ -1 @@
-package cz.zcu.kiv.imiger.plugin.spade.api;
-
-public class EdgeArchetype {
-    public String name;
-    public String text;
-
-    public EdgeArchetype(String name, String text) {
-        this.name = name;
-        this.text = text;
-    }
-
-    public String getName() {
-        return  name;
-    }
-
-    public String getText() {
-        return text;
-    }
-}

sources/imiger-spade-converter/src/main/java/cz/zcu/kiv/imiger/plugin/spade/api/Graph.java

@@ -1 @@
-package cz.zcu.kiv.imiger.plugin.spade.api;
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-
-import java.util.*;
-
-/**
- * Class represents graph with all information about graph plus information about state in which used store graph.
- * Class is used for creating of JSON which is send to frontend.
- */
-public class Graph {
-
-    private Set<Vertex> vertices;
-    private List<Edge> edges;
-    private List<VertexArchetype> vertexArchetypes;
-    private List<EdgeArchetype> edgeArchetypes;
-    private List<AttributeType> attributeTypes;
-    private Map<String, List<String>> possibleEnumValues;
-
-    private List<Group> groups;
-    private List<SideBar> sideBar;
-    private String highlightedVertex; // group-ID, vertex-ID
-    private String highlightedEdge;
-
-    private static final Logger logger = LogManager.getLogger();
-
-    public Graph() {
-        vertices = new HashSet<>();
-        edges = new LinkedList<>();
-    }
-
-    public List<Edge> getEdges() {
-        logger.trace("ENTRY");
-        logger.trace("EXIT");
-        return edges;
-    }
-
-    public Set<Vertex> getVertices() {
-        logger.trace("ENTRY");
-        logger.trace("EXIT");
-        return vertices;
-    }
-
-    public List<VertexArchetype> getVertexArchetypes() {
-        return vertexArchetypes;
-    }
-
-    public List<EdgeArchetype> getEdgeArchetypes() {
-        return edgeArchetypes;
-    }
-
-    public List<AttributeType> getAttributeTypes() {
-        return attributeTypes;
-    }
-
-    public Map<String, List<String>> getPossibleEnumValues() {
-        return possibleEnumValues;
-    }
-
-    public List<Group> getGroups() {
-        return groups;
-    }
-
-    public List<SideBar> getSideBar() {
-        return sideBar;
-    }
-
-    public String getHighlightedVertex() {
-        return highlightedVertex;
-    }
-
-    public String getHighlightedEdge() {
-        return highlightedEdge;
-    }
-
-    public void setVertexArchetypes(List<VertexArchetype> vertexArchetypes) {
-        this.vertexArchetypes = vertexArchetypes;
-    }
-
-    public void setEdgeArchetypes(List<EdgeArchetype> edgeArchetypes) {
-        this.edgeArchetypes = edgeArchetypes;
-    }
-
-    public void setAttributeTypes(List<AttributeType> attributeTypes) {
-        this.attributeTypes = attributeTypes;
-    }
-
-    public void setPossibleEnumValues(Map<Integer, List<String>> possibleEnumValues) {
-        this.possibleEnumValues = new HashMap<>();
-        for (Map.Entry<Integer, List<String>> entry : possibleEnumValues.entrySet()) {
-            this.possibleEnumValues.put("" + entry.getKey(), entry.getValue());
-        }
-    }
-
-    public void setGroups(List<Group> groups) {
-        this.groups = groups;
-    }
-
-    public void setSideBar(List<SideBar> sideBar) {
-        this.sideBar = sideBar;
-    }
-
-    public void setHighlightedVertex(String highlightedVertex) {
-        this.highlightedVertex = highlightedVertex;
-    }
-
-    public void setHighlightedEdge(String highlightedEdge) {
-        this.highlightedEdge = highlightedEdge;
-    }
-}

sources/imiger-spade-converter/src/main/java/cz/zcu/kiv/imiger/plugin/spade/api/Group.java

@@ -1 @@
-package cz.zcu.kiv.imiger.plugin.spade.api;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Class represents group of edges and their settings. Used in JSON between frontend and backend.
- */
-public class Group {
-
-    /** Generated id of group. */
-    private int id;
-    /** Name of group */
-    private String name;
-    /** List of vertices id which belongs to this group */
-    private List<Integer> verticesId;
-    /** List of vertices id whose outgoing edges are visible. */
-    private List<Integer> verticesEdgeFromId;
-    /** List of vertices id whose incoming edges are visible. */
-    private List<Integer> verticesEdgeToId;
-    /** Relative position in graph */
-    private Position position;
-
-    public Group(int id, String name){
-        this.id = id;
-        this.name = name;
-        this.verticesId = new ArrayList<>();
-        this.verticesEdgeFromId = new ArrayList<>();
-        this.verticesEdgeToId = new ArrayList<>();
-        this.position = null;
-    }
-
-    public Group(int id, String name, List<Integer> verticesId, List<Integer> verticesEdgeFromId, List<Integer> verticesEdgeToId) {
-        this.id = id;
-        this.name = name;
-        this.verticesId = verticesId;
-        this.verticesEdgeFromId = verticesEdgeFromId;
-        this.verticesEdgeToId = verticesEdgeToId;
-        this.position = null;
-    }
-
-    public int getId() {
-        return id;
-    }
-
-    public void setId(int id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public List<Integer> getVerticesId() {
-        return verticesId;
-    }
-
-    public void setVerticesId(List<Integer> verticesId) {
-        this.verticesId = verticesId;
-    }
-
-    public List<Integer> getVerticesEdgeFromId() {
-        return verticesEdgeFromId;
-    }
-
-    public void setVerticesEdgeFromId(List<Integer> verticesEdgeFromId) {
-        this.verticesEdgeFromId = verticesEdgeFromId;
-    }
-
-    public List<Integer> getVerticesEdgeToId() {
-        return verticesEdgeToId;
-    }
-
-    public void setVerticesEdgeToId(List<Integer> verticesEdgeToId) {
-        this.verticesEdgeToId = verticesEdgeToId;
-    }
-
-    public void addVertexId(int vertexId){
-        this.verticesId.add(vertexId);
-    }
-
-    public void addVetexEdgeToId(int vertexId){
-        this.verticesEdgeToId.add(vertexId);
-    }
-
-    public void addVetexEdgeFromId(int vertexId){
-        this.verticesEdgeFromId.add(vertexId);
-    }
-
-    public Position getPosition() {
-        return position;
-    }
-
-    public void setPosition(Position position) {
-        this.position = position;
-    }
-}

sources/imiger-spade-converter/src/main/java/cz/zcu/kiv/imiger/plugin/spade/api/Position.java

@@ -1 @@
-package cz.zcu.kiv.imiger.plugin.spade.api;
-
-/**
- * Class is used for storing information about vertex/group relative position.
- */
-public class Position {
-
-    /** Relative X position. */
-    private float x;
-    /** Relative Y position */
-    private float y;
-
-    public Position(float x, float y) {
-        this.x = x;
-        this.y = y;
-    }
-
-    public float getX() {
-        return x;
-    }
-
-    public void setX(float x) {
-        this.x = x;
-    }
-
-    public float getY() {
-        return y;
-    }
-
-    public void setY(float y) {
-        this.y = y;
-    }
-}

sources/imiger-spade-converter/src/main/java/cz/zcu/kiv/imiger/plugin/spade/api/SideBar.java

@@ -1 @@
-package cz.zcu.kiv.imiger.plugin.spade.api;
-
-/**
- * Class store information about item in side bar.
- */
-public class SideBar {
-
-    /** Identification number of vertex or group which was generated in application. */
-    private int vertexId;
-    /** Indicates if related vertexes of this item have visible icon which shows relation with this item. */
-    private boolean isIconsDisplayed;
-
-    public SideBar(int vertexId, boolean isIconsDisplayed) {
-        this.vertexId = vertexId;
-        this.isIconsDisplayed = isIconsDisplayed;
-    }
-
-    public int getVertexId() {
-        return vertexId;
-    }
-
-    public void setVertexId(int vertexId) {
-        this.vertexId = vertexId;
-    }
-
-    public boolean isIconsDisplayed() {
-        return isIconsDisplayed;
-    }
-
-    public void setIconsDisplayed(boolean iconsDisplayed) {
-        this.isIconsDisplayed = iconsDisplayed;
-    }
-}

sources/imiger-spade-converter/src/main/java/cz/zcu/kiv/imiger/plugin/spade/api/SubedgeInfo.java

@@ -1 @@
-package cz.zcu.kiv.imiger.plugin.spade.api;
-
-import java.util.List;
-
-public class SubedgeInfo {
-
-    /** Edge archetype index. */
-    private int archetype;
-    /** Original id of edge which is taken from input JSON file. */
-    private int id;
-    /** List of all tributes. Every attribute is stored in String array in pair as {attribute name, attribute value}. */
-    private List<String[]> attributes;
-
-    /**
-     * Create new subedgeInfo
-     * @param id Original id of edge which is taken from input JSON file.
-     * @param archetype Edge archetype index.
-     * @param attributes  List of all tributes. Every attribute is stored in String array in pair as {attribute name, attribute value}.
-     */
-    public SubedgeInfo(int id, int archetype, List<String[]> attributes) {
-        this.id = id;
-        this.archetype = archetype;
-        this.attributes = attributes;
-    }
-
-    public int getId() {
-        return id;
-    }
-
-    public int getArchetype() {
-        return archetype;
-    }
-
-    public List<String[]> getAttributes() {
-        return attributes;
-    }
-}

sources/imiger-spade-converter/src/main/java/cz/zcu/kiv/imiger/plugin/spade/api/Vertex.java

@@ -1 @@
-package cz.zcu.kiv.imiger.plugin.spade.api;
-
-import cz.zcu.kiv.imiger.plugin.spade.graph.VertexImpl;
-
-import java.util.List;
-
-/**
- * Class represents vertex which is used for output JSON format (JSON between frontend and backend)
- */
-public class Vertex extends BaseVertex {
-
-    /** List of all tributes. Every attribute is stored in String array in pair as {attribute name, attribute value}. */
-    private List<String[]> attributes;
-    /** Relative position in graph */
-    private Position position;
-
-    /**
-     * Create new vertex.
-     * @param id original identification number from input file
-     * @param name of vertex
-     * @param archetypeIndex index of vertex archetype
-     * @param text additional info
-     * @param attributes List of all attributes. Every attribute is stored in String array in pair as {attribute name, attribute value}.
-     */
-    public Vertex(int id, String name, int archetypeIndex, String text, List<String[]> attributes) {
-        super(id, name, archetypeIndex, text);
-        this.attributes = attributes;
-        this.position = null;
-    }
-
-    /**
-     * Create new vertex.
-     * @param vertex instance of VertexImpl with set all parameters
-     * @param attributes ist of all attributes. Every attribute is stored in String array in pair as {attribute name, attribute value}.
-     */
-    public Vertex(VertexImpl vertex, List<String[]> attributes){
-        this(vertex.getId(), vertex.getName(), vertex.getArchetype(), vertex.getText(), attributes);
-    }
-
-    public List<String[]> getAttributes() {
-        return attributes;
-    }
-
-    public void setAttributes(List<String[]> attributes) {
-        this.attributes = attributes;
-    }
-
-    public Position getPosition() {
-        return position;
-    }
-
-    public void setPosition(Position position) {
-        this.position = position;
-    }
-}

sources/imiger-spade-converter/src/main/java/cz/zcu/kiv/imiger/plugin/spade/api/VertexArchetype.java

@@ -1 @@
-package cz.zcu.kiv.imiger.plugin.spade.api;
-
-public class VertexArchetype {
-    public String name;
-    public String text;
-    public String icon;
-
-    public VertexArchetype(String name, String text, String icon) {
-        this.name = name;
-        this.text = text;
-        this.icon = icon;
-    }
-
-    public VertexArchetype(String name, String text) {
-        this(name, text, "");
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public String getText() {
-        return text;
-    }
-
-    public String getIcon() {
-        return icon;
-    }
-}

sources/imiger-spade-converter/src/main/java/cz/zcu/kiv/imiger/plugin/spade/graph/EdgeImpl.java

@@ -1 +1 @@
 package cz.zcu.kiv.imiger.plugin.spade.graph;
 
-import cz.zcu.kiv.imiger.plugin.spade.api.BaseEdge;
+import cz.zcu.kiv.imiger.vo.BaseEdge;
 
 import java.util.*;
 

sources/imiger-spade-converter/src/main/java/cz/zcu/kiv/imiger/plugin/spade/graph/GraphManager.java

@@ -1 +1 @@
 package cz.zcu.kiv.imiger.plugin.spade.graph;
 
-import cz.zcu.kiv.imiger.plugin.spade.api.*;
 import cz.zcu.kiv.imiger.plugin.spade.graph.filter.*;
 import cz.zcu.kiv.imiger.plugin.spade.graph.loader.JSONConfigLoader;
+import cz.zcu.kiv.imiger.vo.*;
 
 import java.util.*;
 

sources/imiger-spade-converter/src/main/java/cz/zcu/kiv/imiger/plugin/spade/graph/VertexImpl.java

@@ -1 +1 @@
 package cz.zcu.kiv.imiger.plugin.spade.graph;
 
-import cz.zcu.kiv.imiger.plugin.spade.api.BaseVertex;
+import cz.zcu.kiv.imiger.vo.BaseVertex;
 
 import java.util.*;
 

sources/imiger-spade-converter/src/main/java/cz/zcu/kiv/imiger/plugin/spade/graph/loader/GraphJSONDataLoader.java

@@ -4 +4 @@
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
-import cz.zcu.kiv.imiger.plugin.spade.api.AttributeDataType;
+import cz.zcu.kiv.imiger.vo.AttributeDataType;
 import cz.zcu.kiv.imiger.plugin.spade.graph.Attribute;
 import cz.zcu.kiv.imiger.plugin.spade.graph.EdgeArchetypeInfo;
 import cz.zcu.kiv.imiger.plugin.spade.graph.GraphManager;

sources/imiger-spade-converter/src/main/java/cz/zcu/kiv/imiger/plugin/spade/graph/loader/JSONConfigLoader.java

@@ -1 +1 @@
 package cz.zcu.kiv.imiger.plugin.spade.graph.loader;
 
-import cz.zcu.kiv.imiger.plugin.spade.api.AttributeDataType;
-import cz.zcu.kiv.imiger.plugin.spade.api.AttributeType;
+import cz.zcu.kiv.imiger.vo.AttributeDataType;
+import cz.zcu.kiv.imiger.vo.AttributeType;
 import cz.zcu.kiv.imiger.plugin.spade.graph.EdgeArchetypeInfo;
 import cz.zcu.kiv.imiger.plugin.spade.graph.GraphManager;
 import cz.zcu.kiv.imiger.plugin.spade.graph.filter.*;

sources/imiger-spade-converter/src/test/java/cz/zcu/kiv/imiger/plugin/spade/backend/GraphFilterTest.java

@@ -1 +1 @@
 package cz.zcu.kiv.imiger.plugin.spade.backend;
 
-import cz.zcu.kiv.imiger.plugin.spade.api.Edge;
-import cz.zcu.kiv.imiger.plugin.spade.api.Graph;
-import cz.zcu.kiv.imiger.plugin.spade.api.Vertex;
+import cz.zcu.kiv.imiger.vo.Edge;
+import cz.zcu.kiv.imiger.vo.Graph;
+import cz.zcu.kiv.imiger.vo.Vertex;
 import cz.zcu.kiv.imiger.plugin.spade.graph.GraphManager;
 import cz.zcu.kiv.imiger.plugin.spade.graph.loader.GraphJSONDataLoader;
 import cz.zcu.kiv.imiger.plugin.spade.graph.loader.JSONConfigLoader;
-import cz.zcu.kiv.imiger.plugin.spade.api.SubedgeInfo;
+import cz.zcu.kiv.imiger.vo.SubedgeInfo;
 import org.apache.commons.io.IOUtils;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeAll;