re

Author: codingforkind

mirror-common/src/main/java/cn/com/mirror/analyser/visitor/ControlEdgeVisitor.java

@@ -7,7 +7,6 @@
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 import org.eclipse.jdt.core.dom.*;
-import org.neo4j.cypher.internal.compiler.v2_3.commands.AstNode;
 
 import java.util.Arrays;
 import java.util.HashMap;
@@ -26,7 +25,6 @@
 public class ControlEdgeVisitor extends ASTVisitor {
     private String targetPath;
 
-    private Map<Integer, Integer> controlEdges = new HashMap<>();
     private Map<Vertex, Vertex> ctrlEdges = new HashMap<>();
 
     public ControlEdgeVisitor(String targetPath) {
@@ -44,8 +42,6 @@ private ASTNode searchDirectParentControlNode(ASTNode astNode) {
         // mark the s between astNode and statements and return
         int currentLine = AstUtils.getSpecificStartLine(astNode);
         int directParentStartLine = AstUtils.getSpecificStartLine(parent);
-        markEdges(currentLine, directParentStartLine);
-
         markCtrlEdge(currentLine, astNode, directParentStartLine, parent);
         return parent;
     }
@@ -98,52 +94,29 @@ private boolean markCtrlEdge(int curLine,
             return false;
         }
 
-        VertexTypeEnum headType = null;
-        if (astNode instanceof MethodDeclaration) {
-            headType = VertexTypeEnum.METHOD;
-        } else {
-            headType = VertexTypeEnum.STATEMENT;
-        }
-
-        Vertex head = new Vertex(this.targetPath, curLine, headType);
-
-        VertexTypeEnum tailType = null;
-        if (parent instanceof MethodDeclaration) {
-            tailType = VertexTypeEnum.METHOD;
-        } else {
-            tailType = VertexTypeEnum.STATEMENT;
-        }
-        Vertex tail = new Vertex(this.targetPath, parentLine, tailType);
+        Vertex head = new Vertex(this.targetPath, curLine, checkVertexType(astNode), null, -1);
+        Vertex tail = new Vertex(this.targetPath, parentLine, checkVertexType(parent), null, -1);
         ctrlEdges.put(head, tail);
 
         return true;
     }
 
-    private boolean markEdges(int curLine, int parentLine) {
-        if (-1 != parentLine &&
-                curLine != parentLine) {
-            controlEdges.put(curLine, parentLine);
-            return true;
-        }
-
-        return false;
+    private VertexTypeEnum checkVertexType(ASTNode node) {
+        if (node instanceof TypeDeclaration) return VertexTypeEnum.CLASS;
+        if (node instanceof MethodDeclaration) return VertexTypeEnum.METHOD;
+        if (node instanceof FieldDeclaration) return VertexTypeEnum.FIELD;
+        return VertexTypeEnum.STATEMENT;
     }
 
-//    @Override
-//    public boolean visit(SimpleName node) {
-//        searchDirectParentControlNode(node);
-//        return super.visit(node);
-//    }
-
     @Override
     public boolean visit(TypeDeclaration node) {
         int typeDecLine = AstUtils.getStartLine(node.getName());
         Arrays.stream(node.getFields()).forEach(fieldDeclaration -> {
-            markEdges(AstUtils.getSpecificStartLine(fieldDeclaration.getType()), typeDecLine);
+            markCtrlEdge(AstUtils.getSpecificStartLine(fieldDeclaration), fieldDeclaration, typeDecLine, node);
         });
 
         Arrays.stream(node.getMethods()).forEach(methodDeclaration -> {
-            markEdges(AstUtils.getSpecificStartLine(methodDeclaration.getName()), typeDecLine);
+            markCtrlEdge(AstUtils.getSpecificStartLine(methodDeclaration), methodDeclaration, typeDecLine, node);
         });
 
         return super.visit(node);

mirror-common/src/main/java/cn/com/mirror/project/pair/Vertex.java

@@ -16,11 +16,20 @@ public class Vertex implements Serializable {
     private String targetPath;
     private int lineNum;
     private VertexTypeEnum vertexType;
+    private String host;
+    private int port;
+
+    public Vertex(String targetPath,
+                  int lineNum,
+                  VertexTypeEnum vertexType,
+                  String host,
+                  int port) {
 
-    public Vertex(String targetPath, int lineNum, VertexTypeEnum vertexType) {
         this.targetPath = targetPath;
         this.lineNum = lineNum;
         this.vertexType = vertexType;
+        this.host = host;
+        this.port = port;
     }
 
     @Override

mirror-common/src/main/java/cn/com/mirror/project/pair/VertexTypeEnum.java

@@ -10,7 +10,9 @@
 @Getter
 public enum VertexTypeEnum {
     STATEMENT(1, "statement"),
-    METHOD(2, "method");
+    FIELD(2, "field"),
+    METHOD(3, "method"),
+    CLASS(4, "class");
 
     private Integer key;
     private String desc;

mirror-common/src/main/java/cn/com/mirror/project/pair/factory/PairFactory.java

@@ -23,7 +23,6 @@ public Pair newPair(String repositoryUrl) {
             ControlEdgeVisitor controlEdgeVisitor = new ControlEdgeVisitor(targetPath);
             CompilationUnit compilationUnit = AstUtils.getCompUnitResolveBinding(targetPath);
             compilationUnit.accept(controlEdgeVisitor);
-            pair.addDirectCtrlEdges(targetPath, controlEdgeVisitor.getControlEdges());
             pair.addCtrlEdge(targetPath, controlEdgeVisitor.getCtrlEdges());
         });
 

mirror-common/src/test/cn/com/mirror/analyser/UnitAnalyserTests.java

@@ -1,12 +1,10 @@
 package cn.com.mirror.analyser;
 
-import cn.com.mirror.analyser.visitor.ControlEdgeVisitor;
 import cn.com.mirror.project.unit.Unit;
 import cn.com.mirror.project.unit.element.Class;
 import cn.com.mirror.project.unit.element.Method;
 import cn.com.mirror.project.unit.element.Statement;
 import lombok.extern.slf4j.Slf4j;
-import org.eclipse.jdt.core.dom.CompilationUnit;
 import org.junit.Test;
 
 import java.util.Map;
@@ -27,19 +25,6 @@ public void init() {
         this.unit = unitAnalyser.analyze();
     }
 
-    @Test
-    public void testControlDependenceVisitor() {
-        init();
-
-        unit.getTargets().stream().forEach(targetPah -> {
-            ControlEdgeVisitor controlDependenceVisitor = new ControlEdgeVisitor(targetPah);
-            CompilationUnit compilationUnit = unit.getCompilationUnits().get(targetPah);
-            compilationUnit.accept(controlDependenceVisitor);
-            log.info("Target path: {}", targetPah);
-            log.info("Control edges: {}", controlDependenceVisitor.getControlEdges());
-        });
-    }
-
     @Test
     public void testCls() {
         init();