Revize 2940440d

Problem fixes based on static analysis

sources/src/main/java/cz/zcu/kiv/offscreen/api/Graph.java

@@ -1 +1 @@
 package cz.zcu.kiv.offscreen.api;
 
-import java.util.*;
-
 import org.apache.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.
@@ -87 +87 @@
 
     public void setPossibleEnumValues(Map<Integer, List<String>> possibleEnumValues) {
         this.possibleEnumValues = new HashMap<>();
-        for (Integer index : possibleEnumValues.keySet()) {
-            this.possibleEnumValues.put("" + index, possibleEnumValues.get(index));
+        for (Map.Entry<Integer, List<String>> entry : possibleEnumValues.entrySet()) {
+            this.possibleEnumValues.put("" + entry.getKey(), entry.getValue());
         }
     }
 

sources/src/main/java/cz/zcu/kiv/offscreen/graph/EdgeArchetypeInfo.java

@@ -29 +29 @@
 
     @Override
     public boolean equals(Object obj) {
+        if(!(obj instanceof  EdgeArchetypeInfo)) return false;
+        
         EdgeArchetypeInfo info = (EdgeArchetypeInfo)obj;
-        return (info.fromArchetypeIndex == fromArchetypeIndex) && (info.edgeArchetypeIndex == edgeArchetypeIndex) && (info.toArchetypeIndex == toArchetypeIndex);
+        return (info.fromArchetypeIndex == fromArchetypeIndex) &&
+                (info.edgeArchetypeIndex == edgeArchetypeIndex) &&
+                (info.toArchetypeIndex == toArchetypeIndex);
     }
 }

sources/src/main/java/cz/zcu/kiv/offscreen/graph/GraphManager.java

@@ -361 +361 @@
         List<Integer> archetypesFiltered = vertexArchetypeFilter.archetypeIndeces;
         switch (vertexArchetypeFilter.matchType) {
             case MATCHING:
-                for (Integer vertexArchetypeIndex : vertices.keySet()){
-                    if (archetypesFiltered.contains(vertexArchetypeIndex)) {
-                        resultVertices.addAll(vertices.get(vertexArchetypeIndex));
+                for (Map.Entry<Integer, HashSet<VertexImpl>> vertexArchetypeEntry : vertices.entrySet()){
+                    if (archetypesFiltered.contains(vertexArchetypeEntry.getKey())) {
+                        resultVertices.addAll(vertexArchetypeEntry.getValue());
                     }
                 }
                 break;
             case NON_MATCHING:
-                for (Integer vertexArchetypeIndex : vertices.keySet()){
-                    if (!archetypesFiltered.contains(vertexArchetypeIndex)) {
-                        resultVertices.addAll(vertices.get(vertexArchetypeIndex));
+                for (Map.Entry<Integer, HashSet<VertexImpl>> vertexArchetypeEntry : vertices.entrySet()){
+                    if (!archetypesFiltered.contains(vertexArchetypeEntry.getKey())) {
+                        resultVertices.addAll(vertexArchetypeEntry.getValue());
                     }
                 }
                 break;
@@ -394 +394 @@
         List<EdgeArchetypeInfo> edgeInfosFiltered = edgeArchetypeFilter.archetypeIndeces;
         switch (edgeArchetypeFilter.matchType) {
             case MATCHING:
-                for (EdgeArchetypeInfo edgeInfo : edges.keySet()){
-                    if (edgeInfosFiltered.contains(edgeInfo)) {
-                        resultEdges.addAll(edges.get(edgeInfo));
+                for (Map.Entry<EdgeArchetypeInfo, List<EdgeImpl>> edgeEntry : edges.entrySet()){
+                    if (edgeInfosFiltered.contains(edgeEntry.getKey())) {
+                        resultEdges.addAll(edgeEntry.getValue());
                     }
                 }
                 break;
             case NON_MATCHING:
-                for (EdgeArchetypeInfo edgeInfo : edges.keySet()){
-                    if (!edgeInfosFiltered.contains(edgeInfo)) {
-                        resultEdges.addAll(edges.get(edgeInfo));
+                for (Map.Entry<EdgeArchetypeInfo, List<EdgeImpl>> edgeEntry : edges.entrySet()){
+                    if (!edgeInfosFiltered.contains(edgeEntry.getKey())) {
+                        resultEdges.addAll(edgeEntry.getValue());
                     }
                 }
                 break;
@@ -450 +450 @@
         }
 
         int idCounter = 1;
-        for (EdgeImpl edgeImpl : edgeSet.keySet()) {
-            Edge edge = new Edge(idCounter++, edgeImpl.getFrom(), edgeImpl.getTo(), edgeImpl.getText(), edgeSet.get(edgeImpl));
+        for (Map.Entry<EdgeImpl, List<SubedgeInfo>> edgeEntry : edgeSet.entrySet()) {
+            EdgeImpl edgeImpl = edgeEntry.getKey();
+            Edge edge = new Edge(idCounter++, edgeImpl.getFrom(), edgeImpl.getTo(), edgeImpl.getText(), edgeEntry.getValue());
             graph.getEdges().add(edge);
         }
     }
@@ -465 +466 @@
     private void addVertexArchetypes(Graph graph, Map<String, String> archetypeIcons){
 
         for(VertexArchetype archetype : vertexArchetypes){
-            for(String archetypeName : archetypeIcons.keySet()){
+            for(Map.Entry<String, String> archetypeIconEntry : archetypeIcons.entrySet()){
 
-                if(archetype.name.equals(archetypeName)){
-                    archetype.icon = archetypeIcons.get(archetypeName);
+                if(archetype.name.equals(archetypeIconEntry.getKey())){
+                    archetype.icon = archetypeIconEntry.getValue();
                     break;
                 }
             }

sources/src/main/java/cz/zcu/kiv/offscreen/graph/filter/DateAttributeFilter.java

@@ -10 +10 @@
     private GraphFilter.DateMatchType matchType;
 
     public DateAttributeFilter(Date min, Date max, boolean minInclusive, boolean maxInclusive, GraphFilter.DateMatchType matchType) {
-        this.min = min;
-        this.max = max;
+        this.min = new Date(min.getTime());
+        this.max = new Date(max.getTime());
         this.minInclusive = minInclusive;
         this.maxInclusive = maxInclusive;
         this.matchType = matchType;
@@ -36 +36 @@
     }
 
     public Date getMin() {
-        return min;
+        return new Date(min.getTime());
     }
 
     public Date getMax() {
-        return max;
+        return new Date(max.getTime());
     }
 
     public boolean isMinInclusive() {

sources/src/main/java/cz/zcu/kiv/offscreen/graph/loader/GraphJSONDataLoader.java

@@ -52 +52 @@
      *
      * @return GraphManager of loaded graph or null.
      */
-    public GraphManager LoadData() {
+    public GraphManager loadData() {
         this.graphManager = new GraphManager();
 
         if(Strings.isNullOrEmpty(loadedJSON)) {

sources/src/main/java/cz/zcu/kiv/offscreen/servlets/api/GetSessionDiagram.java

@@ -67 +67 @@
      * Convert input spade JSON to frontend backend JSON and return it.
      */
     private String convertSpadeToRawJson(String spadeJson) {
-        GraphManager graphManager = new GraphJSONDataLoader(spadeJson).LoadData();
+        GraphManager graphManager = new GraphJSONDataLoader(spadeJson).loadData();
         JSONConfigLoader configLoader = new JSONConfigLoader(graphManager);
 
         Graph graph = graphManager.createGraph(configLoader);

sources/src/main/java/cz/zcu/kiv/offscreen/session/SessionManager.java

@@ -3 +3 @@
 import org.apache.log4j.Logger;
 
 import javax.servlet.http.*;
+import java.util.Arrays;
 
 /**
  *
@@ -21 +22 @@
     public static String getSessionValue(HttpServletRequest request, String sessionName) {
         String sessionValue = "";
         Cookie[] cookies = request.getCookies();
-        logger.debug("*" + cookies + "*");
+        logger.debug("*" + Arrays.toString(cookies)+ "*");
 
         if (cookies != null) {
             logger.debug(cookies.length);

sources/src/test/java/cz/zcu/kiv/imiger/tests/backend/GraphFilterTest.java

@@ -21 +21 @@
 
     @BeforeAll
     static void initTest() {
-        graphManager = new GraphJSONDataLoader(new File("data/test1.json")).LoadData();
+        graphManager = new GraphJSONDataLoader(new File("data/test1.json")).loadData();
     }
 
     @Test